Merge branch 'fix_design' into 'development'

Fix design

See merge request Cloud_Solution/diplomatic-quarter!240

lib/pages/ErService/NearestEr.dart

@@ -42,6 +42,57 @@ class NearestEr extends StatelessWidget {
                             fontWeight: FontWeight.w900,
                             color: new Color(0xFF60686b))),
                     Container(
+                      margin: EdgeInsets.fromLTRB(2.0, 10.0, 0.0, 10.0),
+                      child: GridView.count(
+                        crossAxisCount: 2,
+                        // childAspectRatio: 2.2,
+                        crossAxisSpacing: 10,
+                        mainAxisSpacing: 10,
+                        controller:
+                            new ScrollController(keepScrollOffset: false),
+                        shrinkWrap: true,
+                        padding: const EdgeInsets.all(4.0),
+                        children: List.generate(7, (index) {
+                          return Container(
+                            child: Container(
+                              child: CardPosition(
+                                text: mode
+                                    .ProjectAvgERWaitingTimeModeList[index]
+                                    .projectName
+                                    .toString(),
+                                image:
+                                'assets/images/new-design/find_us_icon.png',
+                                subText: mode
+                                    .ProjectAvgERWaitingTimeModeList[index]
+                                    .distanceInKilometers
+                                    .toString(),
+                                type: mode
+                                    .ProjectAvgERWaitingTimeModeList[index].iD
+                                    .toString(),
+                                telephone: mode
+                                    .ProjectAvgERWaitingTimeModeList[index]
+                                    .phoneNumber
+                                    .toString(),
+                                networkImage: mode
+                                    .ProjectAvgERWaitingTimeModeList[index]
+                                    .projectImageURL
+                                    .toString(),
+                                latitude: mode
+                                    .ProjectAvgERWaitingTimeModeList[index]
+                                    .latitude,
+                                longitude: mode
+                                    .ProjectAvgERWaitingTimeModeList[index]
+                                    .longitude,
+                                projectname: mode
+                                    .ProjectAvgERWaitingTimeModeList[index]
+                                    .projectName,
+                              ),
+                            ),
+                          );
+                        }),
+                      ),
+                    ),
+                   /* Container(
                         margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0),
                         child: Column(
                           mainAxisAlignment: MainAxisAlignment.center,
@@ -85,7 +136,6 @@ class NearestEr extends StatelessWidget {
                                           .projectName,
                                     ),
                                   ),
-
                                 ),
                                 Expanded(
                                   child: Container(
@@ -122,7 +172,6 @@ class NearestEr extends StatelessWidget {
                                           .projectName,
                                     ),
                                   ),
-
                                 )
                               ],
                             ),
@@ -133,14 +182,12 @@ class NearestEr extends StatelessWidget {
                                 Expanded(
                                   child: Container(
                                     child: CardPosition(
-
                                       text: mode
                                           .ProjectAvgERWaitingTimeModeList[2]
                                           .projectName
                                           .toString(),
                                       image:
                                           'assets/images/new-design/find_us_icon.png',
-
                                       subText: mode
                                           .ProjectAvgERWaitingTimeModeList[2]
                                           .distanceInKilometers
@@ -167,19 +214,16 @@ class NearestEr extends StatelessWidget {
                                           .projectName,
                                     ),
                                   ),
-
                                 ),
                                 Expanded(
                                   child: Container(
                                     child: CardPosition(
-
                                       text: mode
                                           .ProjectAvgERWaitingTimeModeList[3]
                                           .projectName
                                           .toString(),
                                       image:
                                           'assets/images/new-design/find_us_icon.png',
-
                                       subText: mode
                                           .ProjectAvgERWaitingTimeModeList[3]
                                           .distanceInKilometers
@@ -217,14 +261,12 @@ class NearestEr extends StatelessWidget {
                                 Expanded(
                                   child: Container(
                                     child: CardPosition(
-
                                       text: mode
                                           .ProjectAvgERWaitingTimeModeList[4]
                                           .projectName
                                           .toString(),
                                       image:
                                           'assets/images/new-design/find_us_icon.png',
-
                                       subText: mode
                                           .ProjectAvgERWaitingTimeModeList[4]
                                           .distanceInKilometers
@@ -251,7 +293,6 @@ class NearestEr extends StatelessWidget {
                                           .projectName,
                                     ),
                                   ),
-
                                 ),
                                 Expanded(
                                   child: Container(
@@ -288,7 +329,6 @@ class NearestEr extends StatelessWidget {
                                           .projectName,
                                     ),
                                   ),
-
                                 )
                               ],
                             ),
@@ -336,7 +376,7 @@ class NearestEr extends StatelessWidget {
                               ],
                             ),
                           ],
-                        )),
+                        )),*/
                   ],
                 ),
               )
@@ -347,4 +387,3 @@ class NearestEr extends StatelessWidget {
     );
   }
 }
-

lib/pages/pharmacies/screens/cart-order-page.dart

@@ -28,7 +28,6 @@ class CartOrderPage extends StatelessWidget {
         child: AppScaffold(
           appBarTitle: TranslationBase.of(context).shoppingCart,
           isShowAppBar: true,
-          isShowDecPage: false,
           isPharmacy: true,
           baseViewModel: model,
           backgroundColor: Colors.white,