Merge branch 'change/feature/pricelist' into dev/pricelist

1 files changed, 14 insertions, 9 deletions

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'