Merge branch 'pharmacy-bug-fixes' into 'development'

bug-fixes

See merge request Cloud_Solution/diplomatic-quarter!276

lib/core/model/pharmacies/Customer.dart

@@ -107,7 +107,12 @@ class Customer {
     lastLoginDateUtc = json['last_login_date_utc'];
     lastActivityDateUtc = json['last_activity_date_utc'];
     registeredInStoreId = json['registered_in_store_id'];
-    roleIds  = json['role_ids'].cast<int>();
+    if (json['role_ids'] != null) {
+      roleIds = new List<int>();
+      json['role_ids'].forEach((v) {
+        roleIds.add(v);
+      });
+    }
   }
 
   Map<String, dynamic> toJson() {

lib/pages/pharmacy/order/OrderDetails.dart

@@ -752,6 +752,10 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
           message: "شكراً\nPayment status for your order is Paid");
       Navigator.pop(context);
       Navigator.pop(context);
+    } else {
+      AppToast.showErrorToast(
+          message:
+              "Transaction Failed!\Your transaction is field to some reason please try again or contact to the administration");
     }
   }
 }