diff options
| author | Rafi Zadanly <zadanlyr@gmail.com> | 2023-06-13 10:05:46 +0700 |
|---|---|---|
| committer | Rafi Zadanly <zadanlyr@gmail.com> | 2023-06-13 10:05:46 +0700 |
| commit | 7fb9ffb595b27c0ee2ee51249e907dddf8603414 (patch) | |
| tree | fdf7f3fb56de5f75595e06f144f7af46a0c0e5be | |
| parent | a5e3151dc5afa25d9dc36d7448165eaa6654d4f9 (diff) | |
Fixing flash sale price
| -rw-r--r-- | indoteknik_api/controllers/api_v1/sale_order.py | 5 | ||||
| -rw-r--r-- | indoteknik_api/models/product_product.py | 7 | ||||
| -rw-r--r-- | indoteknik_api/models/product_template.py | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py index 2ac92bf9..35361ba4 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -293,6 +293,11 @@ class SaleOrder(controller.Controller): price = pricelist[price_tier]() discount_key = 'discount_%s' % price_tier if price[discount_key] > 0: discount = price[discount_key] + + flashsale = product._get_flashsale_price() + flashsale_discount = flashsale['flashsale_discount'] + if flashsale_discount > 0 and flashsale_discount > discount: + discount = flashsale_discount parameters.append({ 'company_id': 1, diff --git a/indoteknik_api/models/product_product.py b/indoteknik_api/models/product_product.py index 7913e37e..14fe68cb 100644 --- a/indoteknik_api/models/product_product.py +++ b/indoteknik_api/models/product_product.py @@ -54,6 +54,13 @@ class ProductProduct(models.Model): if price[discount_key] > 0: discount_percentage = price[discount_key] if price[price_key] > 0: price_discount = price[price_key] + flashsale = product_product._get_flashsale_price() + flashsale_price = flashsale['flashsale_price'] + flashsale_discount = flashsale['flashsale_discount'] + if flashsale_price > 0 and flashsale_price < price_discount: + price_discount = flashsale_price + discount_percentage = flashsale_discount + product_template = product_product.product_tmpl_id data = { 'id': product_product.id, diff --git a/indoteknik_api/models/product_template.py b/indoteknik_api/models/product_template.py index c3df97a5..1a345967 100644 --- a/indoteknik_api/models/product_template.py +++ b/indoteknik_api/models/product_template.py @@ -59,7 +59,6 @@ class ProductTemplate(models.Model): 'image': self.env['ir.attachment'].api_image('product.template', 'image_128', product_template.id), 'code': product_template.default_code or '', 'name': product_template.name, - 'lowest_price': self.env['product.pricelist'].get_lowest_product_variant_price(product_template, product_pricelist_default_discount_id), 'variant_total': len(product_template.product_variant_ids), 'stock_total': product_template.qty_stock_vendor, 'weight': product_template.weight, |