Merge branch 'development_new_design_2.0' into haroon-new-design

lib/pages/pharmacies/screens/product-details/reviews_info.dart

@@ -83,7 +83,8 @@ class ReviewsInfo extends StatelessWidget {
             },
           )
         : Container(
-            padding: EdgeInsets.all(15),
+            padding: EdgeInsets.fromLTRB(15,15,15,20),
+            margin:  EdgeInsets.only(bottom: 20),
             alignment: Alignment.center,
             child: Text(
               TranslationBase.of(context).noReviewsAvailable,

lib/pages/pharmacy/order/Order.dart

@@ -528,11 +528,11 @@ class _OrderPageState extends State<OrderPage> with SingleTickerProviderStateMix
                                           left: 13.0, right: 13.0),
                                       decoration: BoxDecoration(
                                           border: Border.all(
-                                            color: Colors.grey[700],
+                                            color: Colors.grey[500],
                                             style: BorderStyle.solid,
                                             width: 5.0,
                                           ),
-                                          color: Colors.grey[700],
+                                          color: Colors.grey[500],
                                           borderRadius: BorderRadius.circular(
                                               30.0)),
                                       child: processingOrderList[

lib/pages/pharmacy/order/OrderDetails.dart

@@ -606,7 +606,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
     if (widget.orderModel.orderStatusId == 30 || widget.orderModel.orderStatusId == 997 || widget.orderModel.orderStatusId == 994)
       return Color(0xFF4CAF50);
     else if (widget.orderModel.orderStatusId == 20 || widget.orderModel.orderStatusId == 995 || widget.orderModel.orderStatusId == 998 || widget.orderModel.orderStatusId == 999)
-      return Colors.grey[700];
+      return Colors.grey[500];
     else if (widget.orderModel.orderStatusId == 10)
       return Colors.orange[300];
     else if (widget.orderModel.orderStatusId == 40 || widget.orderModel.orderStatusId == 996 || widget.orderModel.orderStatusId == 200) return Colors.red[900];