From ddc94ab173b4bf01de9dfa900f951eed56fe77b6 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Thu, 10 Aug 2023 11:26:29 +0700 Subject: Update website user cart mail template --- indoteknik_api/models/product_product.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indoteknik_api') diff --git a/indoteknik_api/models/product_product.py b/indoteknik_api/models/product_product.py index ff7c6498..a2d2f8a2 100644 --- a/indoteknik_api/models/product_product.py +++ b/indoteknik_api/models/product_product.py @@ -55,8 +55,8 @@ class ProductProduct(models.Model): product_promotions = program_line.get_active_promotions(self.id) return True if len(product_promotions) > 0 else False - def calculate_website_price(self): - pricelist = self.env.user_pricelist + def calculate_website_price(self, pricelist=False): + pricelist = pricelist or self.env.user_pricelist config = self.env['ir.config_parameter'] product_pricelist_tier1 = int(config.get_param('product.pricelist.tier1')) -- cgit v1.2.3 From 659268250145b51e8700bc01871ae3bba34f76f3 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Thu, 10 Aug 2023 12:01:11 +0700 Subject: Update sort voucher by can apply on get voucher api --- indoteknik_api/controllers/api_v1/voucher.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indoteknik_api') diff --git a/indoteknik_api/controllers/api_v1/voucher.py b/indoteknik_api/controllers/api_v1/voucher.py index 3a2c798e..0b769ee7 100644 --- a/indoteknik_api/controllers/api_v1/voucher.py +++ b/indoteknik_api/controllers/api_v1/voucher.py @@ -75,5 +75,7 @@ class Voucher(controller.Controller): voucher['has_flashsale_products'] = has_flashsale_products voucher['discount_voucher'] = discount_voucher voucher['difference_to_apply'] = difference_to_apply + + sorted_vouchers = sorted(vouchers, key=lambda x: x['can_apply'], reverse=True) - return self.response(vouchers) + return self.response(sorted_vouchers) -- cgit v1.2.3