Merge branch 'production' into purchasing-job

1 files changed, 16 insertions, 6 deletions

diff --git a/indoteknik_api/controllers/controller.py b/indoteknik_api/controllers/controller.py
index 50e86b68..c4f323fe 100644
--- a/indoteknik_api/controllers/controller.py
+++ b/indoteknik_api/controllers/controller.py
@@ -193,8 +193,11 @@ class Controller(http.Controller):
         if model_name in ['product.template']:
             version = '1' if field in ['image_256', 'image_512', 'image_1024', 'image_1920'] else '2'
             ratio = kw.get('ratio', '')
+            variant = kw.get('variant', False)
+            
             image = model['image_256'] or ''
-            image = self.add_watermark_to_image(image, ratio, version)
+            if not variant:
+                image = self.add_watermark_to_image(image, ratio, version)
         
         response_headers = [
             ('Content-Type', 'image/jpg'), 
@@ -210,7 +213,12 @@ class Controller(http.Controller):
     def add_watermark_to_image(self, image, ratio, version = '1'):
         if not image: return ''
         
-        logo_path = get_module_resource('indoteknik_api', 'static', 'src', 'images', 'logo-indoteknik-gray.png')
+        LOGO_FILENAME = {
+            '1': 'logo-indoteknik-gray.png',
+            '2': 'logo-indoteknik.png'
+        }
+        
+        logo_path = get_module_resource('indoteknik_api', 'static', 'src', 'images', LOGO_FILENAME.get(version))
         logo_img = Image.open(logo_path).convert('RGBA')
         
         img_data = io.BytesIO(base64.b64decode(image))
@@ -238,13 +246,15 @@ class Controller(http.Controller):
             logo_footer_img = Image.open(logo__footer_path).convert('RGBA')
             logo_footer_img.thumbnail((img_width, img_height // 1))
             logo_footer_w, logo_footer_h = logo_footer_img.size
-            new_img.paste(logo_footer_img, (0, img_height - logo_footer_h - 20), logo_footer_img)
+            new_img.paste(logo_footer_img, (0, img_height - logo_footer_h), logo_footer_img)
+            
+            logo_img_w = img_width // 1.8
+            logo_img_h = img_height // 1.8
             
         logo_img.thumbnail((logo_img_w, logo_img_h))
         
-        if version == '1':
-            # Add watermark
-            new_img.paste(logo_img, (12, 10), logo_img)
+        # Add watermark
+        new_img.paste(logo_img, (12, 10), logo_img)
         
         buffered = io.BytesIO()
         new_img.save(buffered, format="PNG")