nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-12 17:51:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27332 from marination/paging-discount-fix

Browse Source 
fix: Paging and Discount filter
This commit is contained in:
Marica
2021-09-03 19:11:58 +05:30
committed by GitHub
parent d3330cec87 477870eb78
commit aee2e04a45
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/e_commerce/api.py
View File

@@ -29,6 +29,7 @@ def get_product_filter_data(query_args=None):
if isinstance(query_args, str): if isinstance(query_args, str):
query_args = json.loads(query_args) query_args = json.loads(query_args)
query_args = frappe._dict(query_args)
if query_args: if query_args:
search = query_args.get("search") search = query_args.get("search")
field_filters = query_args.get("field_filters", {}) field_filters = query_args.get("field_filters", {})

2
erpnext/e_commerce/product_data_engine/query.py
View File

@@ -289,7 +289,7 @@ class ProductQuery:
def filter_results_by_discount(self, fields, result): def filter_results_by_discount(self, fields, result):
if fields and fields.get("discount"): if fields and fields.get("discount"):
discount_percent = frappe.utils.flt(fields["discount"][0]) discount_percent = frappe.utils.flt(fields["discount"][0])
result = [row for row in result if row.get("discount_percent") and row.discount_percent >= discount_percent] result = [row for row in result if row.get("discount_percent") and row.discount_percent <= discount_percent]
if self.filter_with_discount: if self.filter_with_discount:
# no limit was added to results while querying # no limit was added to results while querying

7
erpnext/e_commerce/product_data_engine/test_product_data_engine.py
View File

@@ -274,10 +274,9 @@ class TestProductDataEngine(unittest.TestCase):
) )
items = result.get("items") items = result.get("items")
# check if only product with 10% and below discount are fetched in the right order # check if only product with 10% and below discount are fetched
self.assertEqual(len(items), 2) self.assertEqual(len(items), 1)
self.assertEqual(items[0].get("item_code"), "Test 13I Laptop") self.assertEqual(items[0].get("item_code"), "Test 12I Laptop")
self.assertEqual(items[1].get("item_code"), "Test 12I Laptop")
def test_product_list_with_api(self): def test_product_list_with_api(self):
"Test products listing using API." "Test products listing using API."