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

# Conflicts:
#	lib/ui/shop/shop_list_detail.dart

lib/service/api.dart

@@ -18,6 +18,7 @@ import 'package:feelverapp/model/home_search/searchhomepage_model.dart';
 
 import 'package:feelverapp/model/register/register_model.dart';
 import 'package:feelverapp/model/category/category_model.dart';
+import 'package:feelverapp/model/reviewshop/reviewshop_Model.dart';
 import 'package:feelverapp/model/shoplist/shoplist_Model.dart';
 import 'package:feelverapp/model/shoplistdetail/shoplistdetail_Model.dart';
 import 'package:feelverapp/model/shopservice/shop_service_Model.dart';
@@ -38,6 +39,26 @@ class Api<T> {
   static final String baseApiforimage = "https://backend-uat.feelver.com/api/storage/";
   
   
+  
+  Future<Response<T>> reviewshop(Object body) async {
+    var _model;
+    var _fail;
+    var result;
+    print("this is body" + body.toString());
+    
+    await _httpConnection("${this._baseApi}/store/detail", this._headerApi, body).then((response){
+      print("ผลลัพท์ เท่ากับ" + "${response.body}");
+      if(response.statusCode == 200){
+        _model = ReviewShopModel.fromJson(json.decode(response.body));
+      }else{
+        _fail = FailModel.fromJson(json.decode(response.body));
+      }
+      result = new Response<T>(_model, _fail);
+    });
+    return result;
+  }
+
+
    Future<Response<T>> deletefavorite(Object body) async {
      var _model;
      var _fail;

lib/ui/review_shop/review_shop_page.dart

+import 'package:feelverapp/ui/review_shop/review_shop_presenter.dart';
 import 'package:feelverapp/util/SizeConfig.dart';
 import 'package:feelverapp/util/rating_star.dart';
 import 'package:flutter/material.dart';
@@ -10,6 +11,23 @@ class ReviewShopPage extends StatefulWidget {
 class _ReviewShopPageState extends State<ReviewShopPage> {
   double rate1 = 0;
 
+  ReviewshopPresenter presenter;
+
+  @override
+  void initState() {
+    super.initState();
+
+    presenter = ReviewshopPresenter(this);
+    presenter.Commentlist();
+
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+
   @override
   Widget build(BuildContext context) {
     SizeConfig(context);
@@ -26,6 +44,7 @@ class _ReviewShopPageState extends State<ReviewShopPage> {
               fontFamily: "SF_Pro_Text",
               fontWeight: FontWeight.w500),
         ),
+
       ),
       body: _setupView(),
     );
@@ -46,10 +65,10 @@ class _ReviewShopPageState extends State<ReviewShopPage> {
   Widget containt() {
     return Expanded(
       child: Container(
-        child: ListView.builder(
-            itemCount: 3,
+        child: presenter.reviewShopModel == null ? Container():ListView.builder(
+            itemCount: presenter.reviewShopModel.result[0].comment.length,
             itemBuilder: (context, i) {
-              return list();
+              return list(presenter.reviewShopModel.result[i].comment[i].infoCustomer.name);
             }),
       ),
     );
@@ -227,7 +246,7 @@ class _ReviewShopPageState extends State<ReviewShopPage> {
     );
   }
 
-  Widget list() {
+  Widget list(String name,) {
     return Card(
       child: Container(
 //          color: Colors.deepPurpleAccent,
@@ -263,7 +282,7 @@ class _ReviewShopPageState extends State<ReviewShopPage> {
                             child: Row(
                               children: <Widget>[
                                 Text(
-                                  'Rattaya Pratumkan',
+                                  name,
                                   style: TextStyle(
                                       fontSize: SizeConfig.getFontSize(20),
                                       color: Colors.black),

lib/ui/review_shop/review_shop_presenter.dart

+import 'package:feelverapp/model/reviewshop/reviewshop_Model.dart';
+import 'package:feelverapp/service/api.dart';
+import 'package:feelverapp/service/base_presenter.dart';
+import 'package:feelverapp/ui/review_shop/review_shop_page.dart';
+import 'package:flutter/material.dart';
+
+
+class ReviewshopPresenter extends BasePresenter<ReviewShopPage>{
+  Api _api;
+  final formkey = GlobalKey<FormState>();
+  ReviewShopModel reviewShopModel;
+
+  ReviewshopPresenter(State<ReviewShopPage> state) : super(state);
+
+
+  Commentlist() async{
+    _api = Api<ReviewShopModel>();
+    var res = await _api.reviewshop({
+      "id": "284",
+    });
+    if(res.fail == null){
+      setState(() {
+        reviewShopModel = res.success;
+      });
+    }else{
+      print('res Fail');
+    }
+  }
+
+
+}
\ No newline at end of file