From e6fd5293ca2b32b5b7fa4e81f86e4ef97c0070c8 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Mon, 22 Nov 2021 10:24:03 +0200 Subject: [PATCH] fix filited produvts API --- .../service/pharmacy_categorise_service.dart | 13 ++++++------ lib/pages/parent_categorise_page.dart | 6 +++--- lib/pages/sub_categorise_page.dart | 20 +++++++++++-------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/lib/core/service/pharmacy_categorise_service.dart b/lib/core/service/pharmacy_categorise_service.dart index be376c91..280022e0 100644 --- a/lib/core/service/pharmacy_categorise_service.dart +++ b/lib/core/service/pharmacy_categorise_service.dart @@ -5,6 +5,7 @@ import 'package:diplomaticquarterapp/core/model/pharmacy/categorise_parent_model import 'package:diplomaticquarterapp/core/model/pharmacy/final_products_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacy/pharmacy_categorise.dart'; import 'package:diplomaticquarterapp/core/model/pharmacy/scan_qr_model.dart'; +import 'package:diplomaticquarterapp/models/LiveCare/validators.dart'; import 'base_service.dart'; @@ -303,9 +304,9 @@ class PharmacyCategoriseService extends BaseService { _parentProductsList.clear(); endPoint = FILTERED_PRODUCTS + "$categoryId" + - "&manufacturerids=$brandId" + - "&price_min=$min" + - "&price_max=$max&page=1&limit=50"; + "$brandId" + + "$min" + + "$max&page=1&limit=50"; await baseAppClient.getPharmacy( endPoint, onSuccess: (dynamic response, int statusCode) { @@ -328,9 +329,9 @@ class PharmacyCategoriseService extends BaseService { _subProductsList.clear(); endPoint = FILTERED_PRODUCTS + "$categoryId" + - "&manufacturerids=$brandId" + - "&price_min=$min" + - "&price_max=$max&page=1&limit=50"; + "$brandId" + + "$min" + + "$max&page=1&limit=50"; await baseAppClient.getPharmacy( endPoint, onSuccess: (dynamic response, int statusCode) { diff --git a/lib/pages/parent_categorise_page.dart b/lib/pages/parent_categorise_page.dart index 5a917897..5dce885e 100644 --- a/lib/pages/parent_categorise_page.dart +++ b/lib/pages/parent_categorise_page.dart @@ -610,10 +610,10 @@ class _ParentCategorisePageState extends State { context); await model.getFilteredProducts( - min: minField.text.toString(), - max: maxField.text.toString(), + min: minField.text.isEmpty ? "" : "&price_min=" + minField.text.toString(), + max: maxField.text.isEmpty ? "" : "&price_max=" + maxField.text.toString(), categoryId: categoriesId, - brandId: brandIds); + brandId: brandIds.isEmpty ? "" : "&manufacturerids=" + brandIds); GifLoaderDialogUtils.hideDialog( context); diff --git a/lib/pages/sub_categorise_page.dart b/lib/pages/sub_categorise_page.dart index 4bc069dc..cf16e3a2 100644 --- a/lib/pages/sub_categorise_page.dart +++ b/lib/pages/sub_categorise_page.dart @@ -643,16 +643,20 @@ class _SubCategorisePageState extends State { context); await model.getFilteredSubProducts( - min: minField - .text - .toString(), - max: maxField - .text - .toString(), + min: minField.text.isEmpty + ? "" + : minField.text + .toString(), + max: maxField.text.isEmpty + ? "" + : maxField.text + .toString(), categoryId: categoriesId, - brandId: - brandIds); + brandId: brandIds.isEmpty + ? "" + : "&manufacturerids=" + + brandIds); GifLoaderDialogUtils .hideDialog( context);