Update flashsale calculation price for web and odoo

2 files changed, 20 insertions, 8 deletions

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index b17c2231..8209c751 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -302,18 +302,19 @@ class SaleOrder(controller.Controller):
         source = params['value']['source']
         carts = user_cart.get_product_by_user(user_id=user_id, selected=True, source=source)
 
-        order_lines = []
         promotions = []
         for cart in carts:
             if cart['cart_type'] == 'product':
-                order_lines.append({
+                order_line = request.env['sale.order.line'].create({
                     'company_id': 1,
                     'order_id': sale_order.id,
-                    'price_unit': cart['price']['price'],
-                    'discount': cart['price']['discount_percentage'],
                     'product_id': cart['id'],
                     'product_uom_qty': cart['quantity']
                 })
+                order_line.product_id_change()
+                order_line.onchange_vendor_id()
+                order_line.price_unit = cart['price']['price']
+                order_line.discount = cart['price']['discount_percentage']
             elif cart['cart_type'] == 'promotion':
                 promotions.append({
                     'order_id': sale_order.id,
@@ -321,9 +322,6 @@ class SaleOrder(controller.Controller):
                     'quantity': cart['quantity']
                 })
 
-        lines = request.env['sale.order.line'].create(order_lines)
-        for line in lines:
-            line.product_id_change()
         request.env['sale.order.promotion'].create(promotions)
         
         if len(promotions) > 0:
diff --git a/indoteknik_api/models/product_product.py b/indoteknik_api/models/product_product.py
index bcba8cfc..d370e52b 100644
--- a/indoteknik_api/models/product_product.py
+++ b/indoteknik_api/models/product_product.py
@@ -251,6 +251,7 @@ class ProductProduct(models.Model):
         return data
 
     def _get_flashsale_price(self):
+        price_for = self.env.context.get('price_for', 'odoo')
         result = {}
 
         current_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
@@ -264,7 +265,16 @@ class ProductProduct(models.Model):
         if not item:
             return result
         
-        base_price = self._v2_get_website_price_exclude_tax()
+        tier1_id = self.env['ir.config_parameter'].get_param('product.pricelist.tier1_v2', 0)
+        base_pricelist = self.env['product.pricelist.item'].search([
+            ('pricelist_id', '=', int(tier1_id)),
+            ('product_id', '=', self.id)
+        ], limit=1)
+
+        base_price = 0
+        if base_pricelist:
+            base_price = base_pricelist.computed_price
+
         discount = 0
         price_flashsale = 0
         if item.price_discount > 0:
@@ -274,6 +284,10 @@ class ProductProduct(models.Model):
             price_flashsale = item.fixed_price # ask darren for include or exclude
             discount = (base_price - price_flashsale) // base_price * 100
 
+        if price_for == 'odoo':
+            base_price = self._v2_get_website_price_include_tax()
+            discount = (base_price - price_flashsale) / base_price * 100
+
         jkt_tz = pytz.timezone('Asia/Jakarta')
         result.update({
             'flashsale_id': item.pricelist_id.id,