diff --git a/lib/core/model/pharmacies/Specifications.dart b/lib/core/model/pharmacies/Specifications.dart index f227de69..30a4a7cd 100644 --- a/lib/core/model/pharmacies/Specifications.dart +++ b/lib/core/model/pharmacies/Specifications.dart @@ -1,10 +1,10 @@ class Specifications { - int id; - int displayOrder; - String defaultValue; - String defaultValuen; - String name; - String nameN; + dynamic id; + dynamic displayOrder; + dynamic defaultValue; + dynamic defaultValuen; + dynamic name; + dynamic nameN; Specifications( {this.id, diff --git a/lib/core/service/parmacyModule/parmacy_module_service.dart b/lib/core/service/parmacyModule/parmacy_module_service.dart index 7c7afa30..c6fc6b72 100644 --- a/lib/core/service/parmacyModule/parmacy_module_service.dart +++ b/lib/core/service/parmacyModule/parmacy_module_service.dart @@ -137,7 +137,7 @@ class PharmacyModuleService extends BaseService { Map queryParams = { 'fields': - 'id,discount_ids,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage,reviews', + 'id,discount_ids,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage,reviews,specifications', }; try { await baseAppClient.getPharmacy(GET_PHARMACY_BEST_SELLER_PRODUCT, onSuccess: (dynamic response, int statusCode) { @@ -181,7 +181,7 @@ class PharmacyModuleService extends BaseService { hasError = false; Map queryParams = { 'fields': - 'id,discount_ids,name,reviews,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage', + 'id,discount_ids,name,reviews,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage,specifications', }; try { await baseAppClient.getPharmacy(GET_MOST_VIEWED_PRODUCTS, onSuccess: (dynamic response, int statusCode) { diff --git a/lib/core/service/pharmacy_categorise_service.dart b/lib/core/service/pharmacy_categorise_service.dart index ef8650c8..aa3c9e95 100644 --- a/lib/core/service/pharmacy_categorise_service.dart +++ b/lib/core/service/pharmacy_categorise_service.dart @@ -281,7 +281,7 @@ class PharmacyCategoriseService extends BaseService { Future getBestSellerProducts() async { Map queryParams = { 'fields': - 'id,discount_ids,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage,reviews', + 'id,discount_ids,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage,reviews,specifications', }; try { await baseAppClient.getPharmacy(GET_PHARMACY_BEST_SELLER_PRODUCT, @@ -353,7 +353,7 @@ class PharmacyCategoriseService extends BaseService { hasError = false; Map queryParams = { 'fields': - 'mostview?fields=id,discount_ids,name,reviews,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage', + 'mostview?fields=id,discount_ids,name,reviews,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage,specifications', }; try { await baseAppClient.getPharmacy(GET_MOST_VIEWED_PRODUCTS, diff --git a/lib/pages/pharmacies/compare-list.dart b/lib/pages/pharmacies/compare-list.dart index 0b1aa73d..be969678 100644 --- a/lib/pages/pharmacies/compare-list.dart +++ b/lib/pages/pharmacies/compare-list.dart @@ -16,7 +16,7 @@ class CompareList with ChangeNotifier { ); } else { for (int i = 0; i < _product.length; i++) { - if (_product.length < 4 && _product[i].id != data.id) { + if (_product.length < 3 && _product[i].id != data.id) { _product.add(data); AppToast.showSuccessToast(message:TranslationBase.of(context).addToCompareMsg // 'You have added a product to the Compare list' @@ -26,7 +26,7 @@ class CompareList with ChangeNotifier { AppToast.showErrorToast(message:TranslationBase.of(context).itInListMsg // 'the item is already in the list' ); - } else if(_product.length == 4){ + } else if(_product.length == 3){ AppToast.showErrorToast(message: TranslationBase.of(context).compareListFull // 'your compare list is full' ); diff --git a/lib/services/pharmacy_services/product_detail_service.dart b/lib/services/pharmacy_services/product_detail_service.dart index c16f2d90..97156e4c 100644 --- a/lib/services/pharmacy_services/product_detail_service.dart +++ b/lib/services/pharmacy_services/product_detail_service.dart @@ -48,7 +48,11 @@ class ProductDetailService extends BaseService { Future getProductReviews(productID) async { hasError = false; - await baseAppClient.getPharmacy(GET_PRODUCT_DETAIL + productID + "?fields=reviews,stock_quantity,stock_availability,stock_availabilityn,IsStockAvailable", onSuccess: (dynamic response, int statusCode) { + await baseAppClient.getPharmacy( + GET_PRODUCT_DETAIL + + productID + + "?fields=reviews,stock_quantity,stock_availability,stock_availabilityn,IsStockAvailable", + onSuccess: (dynamic response, int statusCode) { _productDetailList.clear(); response['products'].forEach((item) { _productDetailList.add(ProductDetail.fromJson(item)); @@ -82,7 +86,8 @@ class ProductDetailService extends BaseService { // "generalid": "Cs2020@2016\$2958", // "isDentalAllowedBackend": false }; - await baseAppClient.post(GET_LOCATION, onSuccess: (dynamic response, int statusCode) { + await baseAppClient.post(GET_LOCATION, + onSuccess: (dynamic response, int statusCode) { _productLocationList.clear(); response['PharmList'].forEach((item) { _productLocationList.add(LocationModel.fromJson(item)); @@ -101,23 +106,32 @@ class ProductDetailService extends BaseService { Map request; request = { - "shopping_cart_item": {"quantity": quantity, "shopping_cart_type": "1", "product_id": itemID, "customer_id": customerId, "language_id": 1} + "shopping_cart_item": { + "quantity": quantity, + "shopping_cart_type": "1", + "product_id": itemID, + "customer_id": customerId, + "language_id": 1 + } }; dynamic localRes; - await baseAppClient.pharmacyPost(GET_SHOPPING_CART, isExternal: false, onSuccess: (dynamic response, int statusCode) { + await baseAppClient.pharmacyPost(GET_SHOPPING_CART, isExternal: false, + onSuccess: (dynamic response, int statusCode) { _addToCartModel.clear(); response['shopping_carts'].forEach((item) { _addToCartModel.add(Wishlist.fromJson(item)); }); - AppToast.showSuccessToast(message: TranslationBase.of(context).addToCartMsg - // 'You have added a product to the cart' - ); + AppToast.showSuccessToast( + message: TranslationBase.of(context).addToCartMsg + // 'You have added a product to the cart' + ); localRes = response; }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - AppToast.showErrorToast(message: error ?? Utils.generateContactAdminMessage()); + AppToast.showErrorToast( + message: error ?? Utils.generateContactAdminMessage()); }, body: request); return Future.value(localRes); @@ -125,15 +139,19 @@ class ProductDetailService extends BaseService { Future notifyMe(customerId, itemID) async { hasError = false; - await baseAppClient.getPharmacy(SUBSCRIBE_PRODUCT + "SinceId=$customerId&ProductId=$itemID", onSuccess: (dynamic response, int statusCode) { - AppToast.showSuccessToast(message: TranslationBase.of(AppGlobal.context).notifyMeMsg - // TranslationBase.of(context).notifyMeMsg - //'You will be notified when product available' + await baseAppClient.getPharmacy( + SUBSCRIBE_PRODUCT + "SinceId=$customerId&ProductId=$itemID", + onSuccess: (dynamic response, int statusCode) { + AppToast.showSuccessToast( + message: TranslationBase.of(AppGlobal.context).notifyMeMsg + // TranslationBase.of(context).notifyMeMsg + //'You will be notified when product available' ); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - AppToast.showErrorToast(message: error ?? Utils.generateContactAdminMessage()); + AppToast.showErrorToast( + message: error ?? Utils.generateContactAdminMessage()); }); } @@ -143,20 +161,29 @@ class ProductDetailService extends BaseService { Map request; request = { - "shopping_cart_item": {"quantity": 1, "shopping_cart_type": "Wishlist", "product_id": itemID, "customer_id": customerId, "language_id": 1} + "shopping_cart_item": { + "quantity": 1, + "shopping_cart_type": "Wishlist", + "product_id": itemID, + "customer_id": customerId, + "language_id": 1 + } }; - await baseAppClient.pharmacyPost(GET_SHOPPING_CART, onSuccess: (dynamic response, int statusCode) { + await baseAppClient.pharmacyPost(GET_SHOPPING_CART, + onSuccess: (dynamic response, int statusCode) { _wishListProducts.clear(); response['shopping_carts'].forEach((item) { _wishListProducts.add(Wishlist.fromJson(item)); }); - AppToast.showSuccessToast(message: TranslationBase.of(context).addToWishlistMsg - // 'You have added a product to the Wishlist' - ); + AppToast.showSuccessToast( + message: TranslationBase.of(context).addToWishlistMsg + // 'You have added a product to the Wishlist' + ); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - AppToast.showErrorToast(message: error ?? Utils.generateContactAdminMessage()); + AppToast.showErrorToast( + message: error ?? Utils.generateContactAdminMessage()); }, body: request); } @@ -164,7 +191,9 @@ class ProductDetailService extends BaseService { var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID); var custGUID = await sharedPref.getObject(PHARMACY_CUSTOMER_GUID); hasError = false; - await baseAppClient.getPharmacy(GET_WISHLIST + customerId + "/$custGUID" + "?shopping_cart_type=2", onSuccess: (dynamic response, int statusCode) { + await baseAppClient.getPharmacy( + GET_WISHLIST + customerId + "/$custGUID" + "?shopping_cart_type=2", + onSuccess: (dynamic response, int statusCode) { _wishListProducts.clear(); response['shopping_carts'].forEach((item) { _wishListProducts.add(Wishlist.fromJson(item)); @@ -179,25 +208,35 @@ class ProductDetailService extends BaseService { var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID); var custGUID = await sharedPref.getObject(PHARMACY_CUSTOMER_GUID); hasError = false; - await baseAppClient.getPharmacy(DELETE_WISHLIST + customerId + "/$custGUID" + "+&product_id=" + itemID + "&cart_type=Wishlist", onSuccess: (dynamic response, int statusCode) { + await baseAppClient.getPharmacy( + DELETE_WISHLIST + + customerId + + "/$custGUID" + + "+&product_id=" + + itemID + + "&cart_type=Wishlist", + onSuccess: (dynamic response, int statusCode) { _wishListProducts.clear(); response['shopping_carts'].forEach((item) { _wishListProducts.add(Wishlist.fromJson(item)); }); - AppToast.showSuccessToast(message: TranslationBase.of(context).removeFromWishlistMsg - // 'You have removed a product from the Wishlist' - ); + AppToast.showSuccessToast( + message: TranslationBase.of(context).removeFromWishlistMsg + // 'You have removed a product from the Wishlist' + ); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - AppToast.showErrorToast(message: error ?? Utils.generateContactAdminMessage()); + AppToast.showErrorToast( + message: error ?? Utils.generateContactAdminMessage()); }); } Future productSpecificationData(itemID) async { hasError = false; - await baseAppClient.getPharmacy(GET_SPECIFICATION + itemID, onSuccess: (dynamic response, int statusCode) { + await baseAppClient.getPharmacy(GET_SPECIFICATION + itemID, + onSuccess: (dynamic response, int statusCode) { _productSpecification.clear(); response['specification'].forEach((item) { _productSpecification.add(SpecificationModel.fromJson(item));