From 444f292f31a06bbec51dffa44b4359ac9e3d5afb Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Fri, 4 Aug 2023 09:26:00 +0700 Subject: Fix checkout sale order bug voucher --- indoteknik_api/controllers/api_v1/sale_order.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indoteknik_api') diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py index cc7fd48f..28011d27 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -362,9 +362,9 @@ class SaleOrder(controller.Controller): line.amount_voucher_disc = voucher_disc_line voucher_disc_item = voucher_disc_line / line.product_uom_qty - voucher_disc_subtotal = line.price_subtotal - voucher_disc_item + voucher_disc_unit = line.price_unit - voucher_disc_item - line.discount = (line.price_unit - voucher_disc_subtotal) / line.price_unit * 100 + line.discount += (line.price_unit - voucher_disc_unit) / line.price_unit * 100 cart_ids = [x['cart_id'] for x in products] user_cart.browse(cart_ids).unlink() -- cgit v1.2.3 From d306603f418fe4d616226b8755e52f9dcdfdbbc9 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Fri, 4 Aug 2023 10:26:45 +0700 Subject: Add default sale order source from API --- indoteknik_api/controllers/api_v1/sale_order.py | 1 + 1 file changed, 1 insertion(+) (limited to 'indoteknik_api') diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py index 28011d27..1ad1ff51 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -276,6 +276,7 @@ class SaleOrder(controller.Controller): 'team_id': 2, 'company_id': 1, 'currency_id': 12, + 'source_id': 59, 'state': 'draft', 'picking_policy': 'direct', 'partner_id': params['value']['partner_id'], -- cgit v1.2.3 From dd0ee7ad460b0cfdbd863e9befc5408b88f81e1e Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Fri, 4 Aug 2023 10:56:31 +0700 Subject: Update flash sale tag on sync solr --- indoteknik_api/models/product_product.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indoteknik_api') diff --git a/indoteknik_api/models/product_product.py b/indoteknik_api/models/product_product.py index fb485bae..ff7c6498 100644 --- a/indoteknik_api/models/product_product.py +++ b/indoteknik_api/models/product_product.py @@ -250,6 +250,7 @@ class ProductProduct(models.Model): active_flash_sale = self.env['product.pricelist'].get_active_flash_sale() flashsale_id = 0 flashsale_name = '' + flashsale_tag = '' # loop pricelist items base_price = discount = price_flashsale = 0 for pricelist in active_flash_sale: @@ -261,6 +262,7 @@ class ProductProduct(models.Model): for item in pricelist_items: flashsale_id = pricelist.id flashsale_name = pricelist.name + flashsale_tag = pricelist.flashsale_tag base_price = self._get_website_price_exclude_tax() if item.price_discount > 0: discount = item.price_discount @@ -272,6 +274,7 @@ class ProductProduct(models.Model): data = { 'flashsale_id': flashsale_id, 'flashsale_name': flashsale_name, + 'flashsale_tag': flashsale_tag, 'flashsale_base_price': base_price, 'flashsale_discount': discount, 'flashsale_price': price_flashsale -- cgit v1.2.3