diff --git a/lib/config/config.dart b/lib/config/config.dart index 6658f8de..ee726db4 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -377,13 +377,12 @@ const TIMER_MIN = 10; const GOOGLE_API_KEY = "AIzaSyCmevVlr2Bh-c8W1VUzo8gt8JRY7n5PANw"; -const GET_BRANDS_LIST = - 'epharmacy/api/categoryManufacturer?categoryids=1&fields=id,name,image,namen'; +const GET_BRANDS_LIST = 'epharmacy/api/categoryManufacturer?categoryids='; const GET_SEARCH_PRODUCTS = 'epharmacy/api/searchproducts?fields=id,discount_ids,reviews,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&search_key='; -const SCAN_QR_CODE = 'epharmacy/api/productbysku/6440010010'; +const SCAN_QR_CODE = 'epharmacy/api/productbysku/'; class AppGlobal { static var context; diff --git a/lib/core/service/pharmacy_categorise_service.dart b/lib/core/service/pharmacy_categorise_service.dart index dfb93045..b55a755d 100644 --- a/lib/core/service/pharmacy_categorise_service.dart +++ b/lib/core/service/pharmacy_categorise_service.dart @@ -70,11 +70,12 @@ class PharmacyCategoriseService extends BaseService { ); } - Future scanQr() async { + Future scanQr({String id}) async { hasError = false; _scanList.clear(); + String endPoint = id != null ? SCAN_QR_CODE + "$id" : SCAN_QR_CODE + ""; await baseAppClient.get( - SCAN_QR_CODE, + endPoint, onSuccess: (dynamic response, int statusCode) { response['products'].forEach((item) { _scanList.add(ScanQrModel.fromJson(item)); diff --git a/lib/core/viewModels/pharmacy_categorise_view_model.dart b/lib/core/viewModels/pharmacy_categorise_view_model.dart index a2f5b654..81179091 100644 --- a/lib/core/viewModels/pharmacy_categorise_view_model.dart +++ b/lib/core/viewModels/pharmacy_categorise_view_model.dart @@ -67,11 +67,11 @@ class PharmacyCategoriseViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future scanQr() async { + Future scanQr({String id}) async { hasError = false; // _insuranceCardService.clearInsuranceCard(); setState(ViewState.Busy); - await _pharmacyCategoriseService.scanQr(); + await _pharmacyCategoriseService.scanQr(id: id); if (_pharmacyCategoriseService.hasError) { error = _pharmacyCategoriseService.error; setState(ViewState.ErrorLocal); diff --git a/lib/pages/offers_categorise_page.dart b/lib/pages/offers_categorise_page.dart index 45ae2696..039193f1 100644 --- a/lib/pages/offers_categorise_page.dart +++ b/lib/pages/offers_categorise_page.dart @@ -33,6 +33,8 @@ class _OffersCategorisePageState extends State { builder: (BuildContext context, OffersCategoriseViewModel model, Widget child) => AppScaffold( + appBarTitle: 'Offers', + isShowAppBar: false, backgroundColor: Colors.white, isShowDecPage: false, baseViewModel: model,