Merge branch 'develop' of https://gitlab.2fellows.com/art/feelver into develop

lib/main.dart

@@ -15,6 +15,7 @@ import 'package:feelverapp/ui/splashscreen/splash_screen_page.dart';
 import 'package:flutter/material.dart';
 
 import 'ui/edit_profile/edit_profile.dart';
+import 'ui/shop/shop_main.dart';
 
 
 void main() => runApp(MyApp());
@@ -33,7 +34,8 @@ class MyApp extends StatelessWidget {
       ),
 
 
- home: SplashScreenPage()
+ home: MainShop()
+
 
 
 

lib/model/favorite/addfav_model.dart

+class AddfavModel {
+  String message;
+
+  AddfavModel({this.message});
+
+  AddfavModel.fromJson(Map<String, dynamic> json) {
+    message = json['message'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['message'] = this.message;
+    return data;
+  }
+}

lib/service/api.dart

@@ -5,6 +5,7 @@ import 'package:feelverapp/model/Login/login_model.dart';
 import 'package:feelverapp/model/base/base.dart';
 
 import 'package:feelverapp/model/editprofile/getprofilemodel.dart';
+import 'package:feelverapp/model/favorite/addfav_model.dart';
 import 'package:feelverapp/model/favorite/delete_favorite_Model.dart';
 import 'package:feelverapp/model/favorite/favorite_Model.dart';
 
@@ -23,6 +24,8 @@ import 'package:feelverapp/model/shoplistdetail/shoplistdetail_Model.dart';
 import 'package:feelverapp/model/shopservice/shop_service_Model.dart';
 import 'package:http/http.dart' as http;
 
+import '../model/booking_detail/booking_detail_model.dart';
+
 class Api<T> {
    final String _baseApi = "https://backend-uat.feelver.com/api";
 
@@ -35,6 +38,9 @@ class Api<T> {
   static final String baseApi = "https://backend-uat.feelver.com/api";
 
 
+<<<<<<< HEAD
+  static final String baseApiforimage = "https://backend.feelver.com/storage/";
+=======
   static final String baseApiforimage = "https://backend-uat.feelver.com/api/storage/";
   
   
@@ -56,6 +62,7 @@ class Api<T> {
     });
     return result;
   }
+>>>>>>> baadf91b2b909230e56f29edefbed7cfd2f5e949
 
 
    Future<Response<T>> deletefavorite(Object body) async {
@@ -188,11 +195,35 @@ class Api<T> {
       result = new Response<T>(_model, _fail);
     });
     return result;
-//    await _httpConnection(
-//        "${this._baseApi}product/getListsStoreFormat", this._headerApi, body)
-
   }
 
+   Future<Response<T>> getProductDetail(Object body) async{
+     var _model;
+     var _fail;
+     var result;
+     print("this is body " + body.toString());
+
+//  (body as Map)['lang'] = allTranslations.currentLanguage;
+     await http.get(Uri.encodeFull("https://backend.feelver.com/api/portal/product/?id=5"), headers: this._headerApi ).then((response) {
+       print("ผลลัพ เท่ากับบบบ2   " + "${response.body}");
+       print("statusCode=${response.statusCode}");
+       if (response.statusCode == 200) {
+
+         print("INif");
+
+
+         _model = ProductModel.fromJson(json.decode(response.body));
+       } else {
+
+         _fail = FailModel.fromJson(json.decode(response.body));
+       }
+
+       print("return");
+       result = new Response<T>(_model, _fail);
+     });
+     return result;
+   }
+
   Future<Response<T>> editProfile(Object body) async {
     var _model;
     var _fail;
@@ -337,6 +368,28 @@ class Api<T> {
     return result;
   }
 
+
+
+
+    Future<Response<T>> addfav(Object body) async {
+    var _model;
+    var _fail;
+    var result;
+
+    await _httpConnection(
+            "${this._baseApi}/wish-list/add", this._headerApi, body)
+        .then((response) {
+      print("ผลลัพท์ เท่ากับ  " "${response.body}");
+      if (response.statusCode == 200) {
+        _model = AddfavModel.fromJson(json.decode(response.body));
+      } else {
+        _fail = FailModel.fromJson(json.decode(response.body));
+      }
+      result = new Response<T>(_model, _fail);
+    });
+    return result;
+  }
+
   ///api environment
   Future<http.Response> _httpConnection(
       String url, Map<String, String> headers, Object body) async {

lib/ui/booking/booking_detail_presenter.dart

+import 'package:feelverapp/model/nearme/nearme_list_model.dart';
+import 'package:feelverapp/service/Loading.dart';
+
+import 'package:feelverapp/service/api.dart';
+import 'package:feelverapp/service/base_presenter.dart';
+import 'package:feelverapp/ui/home/home.dart';
+import 'package:feelverapp/util/Accout_util.dart';
+import 'package:flutter/material.dart';
+import 'package:rflutter_alert/rflutter_alert.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'package:feelverapp/ui/booking/booking_detail.dart';
+
+import '../../model/booking_detail/booking_detail_model.dart';
+
+class BookingDetailtPresenter extends BasePresenter<BookingDetail> {
+  final formkey = GlobalKey<FormState>();
+  Api _api;
+  String type = '3';
+  int getid;
+
+  ProductModel getmodel;
+
+  BookingDetailtPresenter(State<BookingDetail> state) : super(state);
+
+  getDetail() async {
+    print(getid);
+    _api = Api<ProductModel>();
+
+    var res = await _api.getProductDetail({getid});
+
+    if (res.fail == null) {
+      if (res.success.status) {
+        setState(
+          () {
+            print("AAAA :${res.success}");
+            getmodel = res.success;
+//        print(getmodel.results.data.length);
+//          print("getmodel" + getmodel[0].results.data[0].storeName);
+          },
+        );
+      }
+    } else {
+      Alert(
+          style: AlertStyle(
+            animationType: AnimationType.fromTop,
+            isCloseButton: false,
+          ),
+          context: state.context,
+          title: "ไม่พบข้อมูล",
+          content: Icon(
+            Icons.warning,
+            color: Colors.orange,
+            size: 80,
+          ),
+          buttons: [
+            DialogButton(
+              color: Color.fromRGBO(106, 179, 170, 1),
+              onPressed: () => Navigator.pop(state.context),
+              child: Text(
+                "ลองอีกครั้ง",
+                style: TextStyle(color: Colors.white, fontSize: 20),
+              ),
+            )
+          ]).show();
+    }
+  }
+
+//  getnearme() async {
+//    _api = Api<NearMeListModel>();
+//
+//    var res = await _api.getNearList({});
+//    print("Hii" + getmodel[0].storeName);
+//    print("Hii2" + res.success);
+//
+//    if (res.fail == null) {
+//      setState(() {
+//        NearMeListModel model = res.success;
+//
+////        getmodel = res.success
+//      }
+//      );
+//    } else {
+//      Alert(
+//          style: AlertStyle(
+//            animationType: AnimationType.fromTop,
+//            isCloseButton: false,
+//          ),
+//          context: state.context,
+//          title: "ไม่สามารถติดต่อ\nเซิร์ฟเวอร์ได้",
+//          content: Icon(
+//            Icons.warning,
+//            color: Colors.orange,
+//            size: 80,
+//          ),
+//          buttons: [
+//            DialogButton(
+//              color: Color.fromRGBO(106, 179, 170, 1),
+//              onPressed: () => Navigator.pop(state.context),
+//              child: Text(
+//                "ลองอีกครั้ง",
+//                style: TextStyle(color: Colors.white, fontSize: 20),
+//              ),
+//            )
+//          ]).show();
+//    }
+//  }
+}

lib/ui/shop/shop_Nearby_places.dart

@@ -8,15 +8,23 @@ import 'package:feelverapp/util/Util.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
+import '../splashscreen/splash_screen_page.dart';
+import 'shop_list_detail.dart';
+
 class ShopNearbyPlacesPage extends StatefulWidget {
   @override
   _ShopNearbyPlacesPageState createState() => _ShopNearbyPlacesPageState();
 }
 
-final List<String> detail = <String>['SPA Cenvaree @ centara Grand Centralworld', 'SPA Cenvaree @ centara Grand Centralworld', 'SPA Cenvaree @ centara Grand Centralworld'];
+final List<String> detail = <String>[
+  'SPA Cenvaree @ centara Grand Centralworld',
+  'SPA Cenvaree @ centara Grand Centralworld',
+  'SPA Cenvaree @ centara Grand Centralworld'
+];
 final List<String> place = <String>['พญาไทย', 'บางเขน', 'เกษตร'];
 
-class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage>with TickerProviderStateMixin {
+class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage>
+    with TickerProviderStateMixin {
   ShopNearByPlacePresenter presenter;
 
   @override
@@ -31,6 +39,7 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage>with TickerP
   void dispose() {
     super.dispose();
   }
+
   @override
   Widget build(BuildContext context) {
     SizeConfig(context);
@@ -44,11 +53,10 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage>with TickerP
                 Container(
 //                  color: Colors.blue,
                   padding: EdgeInsets.only(
-                    top: SizeConfig.getPadding(15),
-                    bottom: SizeConfig.getPadding(10),
-                    left: SizeConfig.getPadding(24),
-                    right: SizeConfig.getPadding(24)
-                  ),
+                      top: SizeConfig.getPadding(15),
+                      bottom: SizeConfig.getPadding(10),
+                      left: SizeConfig.getPadding(24),
+                      right: SizeConfig.getPadding(24)),
                   child: Row(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: <Widget>[
@@ -105,7 +113,7 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage>with TickerP
                               fontFamily: "SF_Pro_Text",
                               fontWeight: FontWeight.w500),
                         ),
-                        backgroundColor:Color.fromRGBO(69, 85, 79, 1),
+                        backgroundColor: Color.fromRGBO(69, 85, 79, 1),
                         shape: StadiumBorder(
                           side: BorderSide(color: Colors.white),
                         ),
@@ -122,7 +130,7 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage>with TickerP
                               fontFamily: "SF_Pro_Text",
                               fontWeight: FontWeight.w500),
                         ),
-                        backgroundColor:Color.fromRGBO(69, 85, 79, 1),
+                        backgroundColor: Color.fromRGBO(69, 85, 79, 1),
                         shape: StadiumBorder(
                           side: BorderSide(color: Colors.white),
                         ),
@@ -164,7 +172,6 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage>with TickerP
                           print("selected");
                         },
                       ),
-
                     ],
                   ),
                 ),
@@ -179,42 +186,53 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage>with TickerP
     print(presenter.getmodel);
     return presenter.getmodel == null
         ? Container(
-        child: Center(
-            child: CircularProgressIndicator(
-              valueColor: new AlwaysStoppedAnimation<Color>(Colors.teal),
-            )))
+            child: Center(
+                child: CircularProgressIndicator(
+            valueColor: new AlwaysStoppedAnimation<Color>(Colors.teal),
+          )))
         : Container(
-      padding: EdgeInsets.only(
-        top: SizeConfig.getPadding(80),
-        left: SizeConfig.getPadding(16),
-        right: SizeConfig.getPadding(16),
-        bottom: SizeConfig.getPadding(10),
-      ),
-      child: ListView.builder(
-        itemCount: presenter.getmodel.results.data.length,
-        itemBuilder: (context, i) {
-          return _nearByItem(
-              presenter.getmodel.results.data[i].storeName,
-              presenter.getmodel.results.data[i].detail,
-              presenter.getmodel.results.data[i].storeLogo,
-              presenter.getmodel.results.data[i].address,
-              presenter.getmodel.results.data[i].location,
-              presenter.getmodel.results.data[i].updatedAt,
-              presenter.getmodel.results.data[i].distanceWithLocation
-                  .toString());
-        }
-      ),
-    );
+            padding: EdgeInsets.only(
+              top: SizeConfig.getPadding(80),
+              left: SizeConfig.getPadding(16),
+              right: SizeConfig.getPadding(16),
+              bottom: SizeConfig.getPadding(10),
+            ),
+            child: ListView.builder(
+                itemCount: presenter.getmodel.results.data.length,
+                itemBuilder: (context, i) {
+                  return _nearByItem(
+                      presenter.getmodel.results.data[i].storeName,
+                      presenter.getmodel.results.data[i].detail,
+                      presenter.getmodel.results.data[i].storeLogo,
+                      presenter.getmodel.results.data[i].address,
+                      presenter.getmodel.results.data[i].location,
+                      presenter.getmodel.results.data[i].updatedAt,
+                      presenter.getmodel.results.data[i].distanceWithLocation
+                          .toString());
+                }),
+          );
   }
 
   Widget _nearByItem(String title, String detail, String img, String address,
       String latlng, String date_time, String distanceWithLocation) {
-
-    return Card(
+    return InkWell(
+      onTap: () {
+        setState(() {
+          Navigator.push(
+            context,
+            CupertinoPageRoute(
+              builder: (context) => ShopListDetail(
+//                id: id,
+              ),
+            ),
+          );
+        });
+      },
+      child: Card(
         margin: EdgeInsets.only(
             right: SizeConfig.getPadding(0),
             left: SizeConfig.getPadding(0),
-            top: SizeConfig.getPadding(10),
+            top: SizeConfig.getPadding(50),
             bottom: SizeConfig.getPadding(10)),
         child: Container(
 //        color: Colors.red,
@@ -231,13 +249,14 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage>with TickerP
                       height: SizeConfig.getHeight(250),
                       child: presenter.getmodel == null
                           ? Image.asset(
-                        "assets/images/demo_img.png",
-                        fit: BoxFit.cover,
-                      )
+                              "assets/images/demo_img.png",
+                              fit: BoxFit.cover,
+                            )
                           : Image.network(
-                       Api.baseApiforimage + img,
-                        fit: BoxFit.cover,
-                      ),),
+                              Api.baseApiforimage + img,
+                              fit: BoxFit.cover,
+                            ),
+                    ),
                   ),
                   Expanded(
                     flex: 5,
@@ -316,18 +335,14 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage>with TickerP
                                     SizedBox(
                                       width: 5,
                                     ),
-
                                   ],
                                 ),
                                 SizedBox(
                                   height: 10,
                                 ),
-
                                 SizedBox(
                                   height: SizeConfig.getHeight(5),
                                 ),
-
-
                               ],
                             ),
                           ),
@@ -340,7 +355,7 @@ class _ShopNearbyPlacesPageState extends State<ShopNearbyPlacesPage>with TickerP
             ],
           ),
         ),
-      );
-
+      ),
+    );
   }
 }

lib/ui/shop/shop_main.dart

@@ -9,10 +9,14 @@ import 'package:flutter/material.dart';
 import 'dart:math';
 
 class MainShop extends StatefulWidget {
-  MainShop({Key key, this.title}) : super(key: key);
+  int getid;
+
+
+  MainShop({Key key, this.title,this.getid}) : super(key: key);
 
   final String title;
 
+
   @override
   _MainShopState createState() => _MainShopState();
 }
@@ -172,7 +176,7 @@ class _MainShopState extends State<MainShop>
             controller: _controller,
             children: <Widget>[
               Container(
-                child: BookingDetail(),
+                child: BookingDetail(getid: widget.getid,),
                 // child: getlist(),
                 //width: 20,
               ),

lib/ui/shop/shoplistdetail_presenter.dart

+import 'package:feelverapp/model/favorite/addfav_model.dart';
 import 'package:feelverapp/model/shoplistdetail/shoplistdetail_Model.dart';
 import 'package:feelverapp/service/Loading.dart';
 import 'package:feelverapp/service/api.dart';
 import 'package:feelverapp/service/base_presenter.dart';
 import 'package:feelverapp/ui/shop/shop_list_detail.dart';
+import 'package:feelverapp/util/SizeConfig.dart';
 import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 
@@ -11,7 +14,13 @@ class ShoplistdetailPresenter extends BasePresenter<ShopListDetail>{
   Api _api;
   final formkey = GlobalKey<FormState>();
   shoplistdetailModel model;
+  AddfavModel addmodel;
+  bool fav=false;
   ShoplistdetailPresenter(State<ShopListDetail> state) : super(state);
+ String uid;
+
+
+
 
 
   Detai(String id) async{
@@ -33,6 +42,54 @@ class ShoplistdetailPresenter extends BasePresenter<ShopListDetail>{
       print('res Fail');
     }
   }
+
+ getid() async {
+    SharedPreferences pref = await SharedPreferences.getInstance();
+    setState(() {
+      uid = pref.getString('Id');
+    });
+    return uid;
+  }
+  Addfav(String id) async{
+   LoadingView(state.context).show();
+    _api = Api<AddfavModel>();
+    var res = await _api.addfav({
+      "customer_id": uid,
+      "store_id":id,
+      "vendor_id":id,
+      "product_id":id,
+
+    });
+       LoadingView(state.context).hide();
+    if (res.fail == null) {
+        setState(() {
+        addmodel = res.success;
+        print("complete");
+      fav=true;
+  
+      });
+         showDialog(
+                      context: state.context,
+                      builder: (context) {
+                        Future.delayed(Duration(seconds: 1), () {
+                          Navigator.of(context).pop(true);
+                        });
+                        return AlertDialog(
+                         content:ImageIcon(
+                    AssetImage('assets/images/ic_fav_list.png'),
+                    color:fav?Color(0xFFDD175F): Colors.grey,
+                    size: SizeConfig.getFontSize(30),
+                  ) ,
+                          title:Center(child: Text('บันทึกสำเร็จ')),
+                        );
+                      });
+    } else {
+      print('res Fail');
+    }
+  }
+
+
+
    gotoDirection(String lat,String lng){
 
 print("debug");

pubspec.lock

 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.13"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.6.0"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -43,34 +29,34 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.1"
-  charcode:
+  characters:
     dependency: transitive
     description:
-      name: charcode
+      name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.3"
-  collection:
+    version: "1.0.0"
+  charcode:
     dependency: transitive
     description:
-      name: collection
+      name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.12"
-  convert:
+    version: "1.1.3"
+  clock:
     dependency: transitive
     description:
-      name: convert
+      name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
-  crypto:
+    version: "1.0.1"
+  collection:
     dependency: transitive
     description:
-      name: crypto
+      name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "1.14.13"
   csslib:
     dependency: transitive
     description:
@@ -92,6 +78,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.8"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   file:
     dependency: transitive
     description:
@@ -156,13 +149,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.4"
-  image:
-    dependency: transitive
-    description:
-      name: image
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.12"
   image_cropper:
     dependency: "direct main"
     description:
@@ -211,7 +197,7 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.6"
+    version: "0.12.8"
   meta:
     dependency: transitive
     description:
@@ -225,7 +211,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.4"
+    version: "1.7.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -247,13 +233,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.9.0"
-  petitparser:
-    dependency: transitive
-    description:
-      name: petitparser
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.4.0"
   platform:
     dependency: transitive
     description:
@@ -289,13 +268,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.4.4"
-  quiver:
-    dependency: transitive
-    description:
-      name: quiver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.3"
   rflutter_alert:
     dependency: "direct main"
     description:
@@ -356,7 +328,7 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.3"
+    version: "1.9.5"
   stream_channel:
     dependency: transitive
     description:
@@ -384,14 +356,14 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.15"
+    version: "0.2.17"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.2.0"
   url_launcher:
     dependency: "direct main"
     description:
@@ -441,13 +413,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.0"
-  xml:
-    dependency: transitive
-    description:
-      name: xml
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.6.1"
 sdks:
-  dart: ">=2.6.0 <3.0.0"
+  dart: ">=2.9.0-14.0.dev <3.0.0"
   flutter: ">=1.12.13+hotfix.5 <2.0.0"