fixed issues

lib/config/localized_values.dart

@@ -899,7 +899,7 @@ const Map localizedValues = {
   "reset": {"en": "Reset", "ar": "اعادة تعيين"},
   "apply": {"en": "Apply", "ar": "تطبيق"},
   "viewCategorise": {"en": "View All Categories", "ar": "عرض جميع الفئات"},
-  "categorise": {"en": "Categories", "ar": "التطبيقات"},
+  "categorise": {"en": "Categories", "ar": "الفئات"},
   "wishList": {"en": "WishList", "ar": "المفضلة"},
   "myAccount": {"en": "My Account", "ar": "حسابي"},
   "cart": {"en": "Cart", "ar": "التسوق"},

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

@@ -207,7 +207,7 @@ class _CartOrderPageState extends State<CartOrderPage> {
                           endIndent: 0,
                         ),
                         Image.asset(
-                          "assets/images/pharmacy_module/payment_image.png",
+                          "assets/images/pharmacy_module/payment.png",
                           width: mediaQuery.size.width - 20,
                           height: 30.0,
                           fit: BoxFit.scaleDown,
@@ -348,6 +348,7 @@ class _OrderBottomWidgetState extends State<OrderBottomWidget> {
                           Icons.info,
                           size: 25,
                           color: Color(0xff005aff),
+//                          color: Color(0xff005aff),
                         ),
                       ),
                     ),
@@ -420,8 +421,9 @@ class _OrderBottomWidgetState extends State<OrderBottomWidget> {
                             isAgree ? Colors.white : Colors.grey.shade300,
                             fontSize: 14),
                       ),
-                      color: Color(0xff005aff),
-                      disabledColor: Color(0xff005aff),
+                      color: Color(0xFF4CAF50),
+                      disabledColor:Color(0xFF4CAF50),
+//                      disabledColor: Color(0xff005aff),
                     )
 //                      RaisedButton(
 //                      onPressed: isAgree

lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart

@@ -20,6 +20,7 @@ class FooterWidget extends StatefulWidget {
   final int quantityLimit;
   final PharmacyProduct item;
   final Function addToCartFunction;
+  final Function addToShoppingCartFunction;
   final ProductDetailViewModel model;
 
   int quantity;
@@ -30,6 +31,7 @@ class FooterWidget extends StatefulWidget {
       {this.quantity,
       this.isOverQuantity = false,
       this.addToCartFunction,
+        this.addToShoppingCartFunction,
       this.model});
 
   @override
@@ -217,7 +219,7 @@ class _FooterWidgetState extends State<FooterWidget> {
                       widget.quantity > widget.quantityLimit ||
                       widget.item.rxMessage != null,
                   onTap: () async {
-                    await widget.addToCartFunction(
+                    await widget.addToShoppingCartFunction(
                         quantity: widget.quantity,
                         itemID: widget.item.id,
                         model: widget.model);

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

@@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart'
 import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart';
 import 'package:diplomaticquarterapp/pages/base/base_view.dart';
 import 'package:diplomaticquarterapp/pages/pharmacies/compare-list.dart';
+import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-order-page.dart';
 import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-name-and-price.dart';
 import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/recommended_products.dart';
 import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/reviews_info.dart';
@@ -13,6 +14,7 @@ import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
+import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 import 'package:flutter/material.dart';
 
 import 'availability_info.dart';
@@ -331,6 +333,7 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
                 quantity: quantity,
                 isOverQuantity: isOverQuantity,
                 addToCartFunction: addToCartFunction,
+                addToShoppingCartFunction: addToShoppingCartFunction,
                 model: model,
               ),
             ));
@@ -355,6 +358,18 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
     await model.addToCartData(quantity, itemID);
     GifLoaderDialogUtils.hideDialog(context);
   }
+
+  addToShoppingCartFunction(
+      {quantity,
+        itemID,
+        ProductDetailViewModel model}) async {
+    GifLoaderDialogUtils.showMyDialog(context);
+    await model.addToCartData(quantity, itemID);
+    GifLoaderDialogUtils.hideDialog(context);
+    Navigator.push(
+        context,
+        FadePage(page: CartOrderPage()));
+  }
 }
 
 

lib/pages/pharmacies/widgets/home/GridViewButtons.dart

@@ -1,6 +1,7 @@
 import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart';
 import 'package:diplomaticquarterapp/pages/landing/home_page.dart';
 import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart';
+import 'package:diplomaticquarterapp/pages/search_products_page.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 import 'package:flutter/material.dart';
@@ -44,6 +45,9 @@ class GridViewButtons extends StatelessWidget {
               hasColorFilter: false,
               child: GridViewCard(TranslationBase.of(context).medicationRefill,
                   'assets/images/pharmacy_module/medication_icon.png', () {
+                    Navigator.push(
+                        context, FadePage(page: HomePrescriptionsPage()));
+
                     // model.checkUserIsActivated().then((isActivated) {
                     //   if (isActivated) {
                     //     Navigator.push(context, FadePage(page: LakumMainPage()));
@@ -71,7 +75,7 @@ class GridViewButtons extends StatelessWidget {
               child: GridViewCard(
                   TranslationBase.of(context).searchAndScanMedication,
                   'assets/images/pharmacy_module/search_scan_icon.png',
-                      () {}),
+                      () {Navigator.push(context, FadePage(page: SearchProductsPage()));}),
             ),
           ],
         ),