From 44287db553237b7bfec5d71797e276a9a7757fc1 Mon Sep 17 00:00:00 2001 From: mosazaid Date: Wed, 3 Mar 2021 12:13:41 +0200 Subject: [PATCH] bug-fixes --- lib/core/model/pharmacies/Customer.dart | 7 ++++++- lib/pages/pharmacy/order/OrderDetails.dart | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/core/model/pharmacies/Customer.dart b/lib/core/model/pharmacies/Customer.dart index 0462c0c2..9042930e 100644 --- a/lib/core/model/pharmacies/Customer.dart +++ b/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(); + if (json['role_ids'] != null) { + roleIds = new List(); + json['role_ids'].forEach((v) { + roleIds.add(v); + }); + } } Map toJson() { diff --git a/lib/pages/pharmacy/order/OrderDetails.dart b/lib/pages/pharmacy/order/OrderDetails.dart index ea74ed23..9d7f27bc 100644 --- a/lib/pages/pharmacy/order/OrderDetails.dart +++ b/lib/pages/pharmacy/order/OrderDetails.dart @@ -770,6 +770,10 @@ class _OrderDetailsPageState extends State { 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"); } } }