Update get product price for website

2 files changed, 23 insertions, 23 deletions

diff --git a/indoteknik_api/models/product_product.py b/indoteknik_api/models/product_product.py
index fdc90533..b49c419c 100644
--- a/indoteknik_api/models/product_product.py
+++ b/indoteknik_api/models/product_product.py
@@ -59,23 +59,18 @@ class ProductProduct(models.Model):
     
     def calculate_website_price(self, pricelist=False):
         pricelist = pricelist or self.env.user_pricelist
+        default_price_tier = '1_v2'
 
-        discount_percentage = self._get_website_disc(0)
-        price_discount = self._get_website_price_after_disc_and_tax()
+        price_tier = pricelist.get_tier_level()
+        price_tier = price_tier if price_tier else default_price_tier
 
-        pricelists = {
-            'tier1': self._get_pricelist_tier1,
-            'tier2': self._get_pricelist_tier2,
-            'tier3': self._get_pricelist_tier3,
-        }
+        price = self._get_pricelist_tier(price_tier)
+
+        discount_key = f'discount_tier{price_tier}'
+        price_key = f'price_tier{price_tier}'
 
-        price_tier = pricelist.get_tier_name()
-        if price_tier:
-            price = pricelists[price_tier]()
-            discount_key = 'discount_%s' % price_tier
-            price_key = 'price_%s' % price_tier
-            if price[discount_key] > 0: discount_percentage = price[discount_key]
-            if price[price_key] > 0: price_discount = price[price_key]
+        discount_percentage = price.get(discount_key, 0)
+        price_discount = price.get(price_key, 0)
 
         flashsale = self._get_flashsale_price()
         flashsale_price = flashsale.get('flashsale_price', 0)
diff --git a/indoteknik_custom/models/product_pricelist.py b/indoteknik_custom/models/product_pricelist.py
index 026977f8..384d1353 100644
--- a/indoteknik_custom/models/product_pricelist.py
+++ b/indoteknik_custom/models/product_pricelist.py
@@ -24,17 +24,22 @@ class ProductPricelist(models.Model):
         remaining_time = round(remaining_time)
         return max(remaining_time, 0)
     
-    def get_tier_name(self):
+    def get_tier_level(self):
         config = self.env['ir.config_parameter']
-        product_pricelist_tier1 = int(config.get_param('product.pricelist.tier1', 0))
-        product_pricelist_tier2 = int(config.get_param('product.pricelist.tier2', 0))
-        product_pricelist_tier3 = int(config.get_param('product.pricelist.tier3', 0))
+        tier_keys = ['1', '2', '3', '1_v2', '2_v2', '3_v2', '4_v2', '5_v2']
+
+        for tier in tier_keys:
+            tier_id = config.get_param('product.pricelist.tier' + tier, 0)
+            if self.id == int(tier_id):
+                return tier
         
-        price_tier = None
-        if self.id == product_pricelist_tier1: price_tier = 'tier1'
-        if self.id == product_pricelist_tier2: price_tier = 'tier2'
-        if self.id == product_pricelist_tier3: price_tier = 'tier3'
-        return price_tier
+        return None
+    
+    def get_tier_name(self):
+        tier_level = self.get_tier_level()
+        tier_name = f'tier{tier_level}' if tier_level else None
+
+        return tier_name
 
 class ProductPricelistItem(models.Model):
     _inherit = 'product.pricelist.item'