From 1cf66814711b428dd9782292d3403bb9c78b36a2 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 6 May 2025 17:06:09 +0700
Subject: <miqdad> fix when checkout different product category and add tnc

---
 indoteknik_custom/views/voucher.xml | 74 ++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 33 deletions(-)

(limited to 'indoteknik_custom/views/voucher.xml')

diff --git a/indoteknik_custom/views/voucher.xml b/indoteknik_custom/views/voucher.xml
index ae958f05..7f258c1c 100755
--- a/indoteknik_custom/views/voucher.xml
+++ b/indoteknik_custom/views/voucher.xml
@@ -27,63 +27,71 @@
                         <group>
                             <group>
                                 <field name="image" widget="image" width="120"/>
-                                <field name="name" required="1" />
-                                <field name="code" required="1" />
-                                <field name="visibility" required="1" />
+                                <field name="name" required="1"/>
+                                <field name="code" required="1"/>
+                                <field name="voucher_category" widget="many2many_tags"/>
+                                <field name="visibility" required="1"/>
                                 <field name="start_time" required="1"/>
                                 <field name="end_time" required="1"/>
                                 <field name="limit" required="1"/>
                                 <field name="limit_user" required="1"/>
-                                <field name="apply_type" required="1" />
-                                <field name="account_type" required="1" />
-                                <field name="show_on_email" />
-                                <field name="excl_pricelist_ids" widget="many2many_tags" domain="[('id', 'in', [4, 15037, 15038, 15039, 17023, 17024, 17025, 17026,17027])]"/>
+                                <field name="apply_type" required="1"/>
+                                <field name="account_type" required="1"/>
+                                <field name="show_on_email"/>
+                                <field name="excl_pricelist_ids" widget="many2many_tags"
+                                       domain="[('id', 'in', [4, 15037, 15038, 15039, 17023, 17024, 17025, 17026,17027])]"/>
                             </group>
-                            <group string="Discount Settings" attrs="{'invisible': [('apply_type', 'not in', ['all', 'shipping'])]}">
-                                <field name="min_purchase_amount" widget="monetary" required="1" />
-                                <field name="discount_type" attrs="{'invisible': [('apply_type','not in', ['all', 'shipping'])], 'required': [('apply_type', 'in', ['all', 'shipping'])]}" />
+                            <group string="Discount Settings"
+                                   attrs="{'invisible': [('apply_type', 'not in', ['all', 'shipping'])]}">
+                                <field name="min_purchase_amount" widget="monetary" required="1"/>
+                                <field name="discount_type"
+                                       attrs="{'invisible': [('apply_type','not in', ['all', 'shipping'])], 'required': [('apply_type', 'in', ['all', 'shipping'])]}"/>
 
-                                <label for="max_discount_amount" string="Discount Amount" />
+                                <label for="max_discount_amount" string="Discount Amount"/>
                                 <div class="d-flex align-items-center">
-                                    <span 
-                                        class="mr-1 font-weight-bold" 
-                                        attrs="{'invisible': [('discount_type', '!=', 'fixed_price')]}"
+                                    <span
+                                            class="mr-1 font-weight-bold"
+                                            attrs="{'invisible': [('discount_type', '!=', 'fixed_price')]}"
                                     >
                                         Rp
                                     </span>
-                                    <field class="mb-0" name="discount_amount" required="1" />
-                                    <span 
-                                        class="ml-1 font-weight-bold" 
-                                        attrs="{'invisible': [('discount_type', '!=', 'percentage')]}"
+                                    <field class="mb-0" name="discount_amount" required="1"/>
+                                    <span
+                                            class="ml-1 font-weight-bold"
+                                            attrs="{'invisible': [('discount_type', '!=', 'percentage')]}"
                                     >
                                         %
                                     </span>
                                 </div>
 
-                                <field name="max_discount_amount" widget="monetary" required="1" attrs="{'invisible': [('discount_type', '!=', 'percentage')]}"/>
+                                <field name="max_discount_amount" widget="monetary" required="1"
+                                       attrs="{'invisible': [('discount_type', '!=', 'percentage')]}"/>
                             </group>
                         </group>
                         <notebook>
-                            <page name="voucher_line" string="Voucher Line" attrs="{'invisible': [('apply_type', '!=', 'brand')]}">
+                            <page name="voucher_line" string="Voucher Line"
+                                  attrs="{'invisible': [('apply_type', '!=', 'brand')]}">
                                 <field name="voucher_line">
                                     <tree editable="bottom">
-                                        <field name="manufacture_id" required="1" />
-                                        <field name="min_purchase_amount" required="1" />
-                                        <field name="discount_type" required="1" />
-                                        <field name="discount_amount" required="1" />
-                                        <field name="max_discount_amount" required="1" attrs="{'readonly': [('discount_type', '!=', 'percentage')]}" />
+                                        <field name="manufacture_id" required="1"/>
+                                        <field name="min_purchase_amount" required="1"/>
+                                        <field name="discount_type" required="1"/>
+                                        <field name="discount_amount" required="1"/>
+                                        <field name="max_discount_amount" required="1"
+                                               attrs="{'readonly': [('discount_type', '!=', 'percentage')]}"/>
                                     </tree>
                                 </field>
                             </page>
                             <page name="description" string="Description">
-                                <label for="description" string="Max 120 characters:" class="font-weight-normal mb-2 oe_edit_only"/>
-                                <field name="description" placeholder="Insert short description..." />
+                                <label for="description" string="Max 120 characters:"
+                                       class="font-weight-normal mb-2 oe_edit_only"/>
+                                <field name="description" placeholder="Insert short description..."/>
                             </page>
                             <page name="terms_conditions" string="Terms and Conditions">
-                                <field name="terms_conditions" />
+                                <field name="terms_conditions"/>
                             </page>
                             <page name="order_page" string="Orders">
-                                <field name="order_ids" readonly="1" />
+                                <field name="order_ids" readonly="1"/>
                             </page>
                         </notebook>
                     </sheet>
@@ -92,10 +100,10 @@
         </record>
 
         <menuitem id="voucher"
-            name="Voucher"
-            parent="website_sale.menu_catalog"
-            sequence="1"
-            action="voucher_action"
+                  name="Voucher"
+                  parent="website_sale.menu_catalog"
+                  sequence="1"
+                  action="voucher_action"
         />
     </data>
 </odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From 1775e7907c905e85f40cecfef69c651c45e64de3 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 7 May 2025 09:18:32 +0700
Subject: <miqdad> remove logging

---
 indoteknik_custom/views/voucher.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indoteknik_custom/views/voucher.xml')

diff --git a/indoteknik_custom/views/voucher.xml b/indoteknik_custom/views/voucher.xml
index 7f258c1c..78e42969 100755
--- a/indoteknik_custom/views/voucher.xml
+++ b/indoteknik_custom/views/voucher.xml
@@ -29,7 +29,7 @@
                                 <field name="image" widget="image" width="120"/>
                                 <field name="name" required="1"/>
                                 <field name="code" required="1"/>
-                                <field name="voucher_category" widget="many2many_tags"/>
+                                <field name="voucher_category" widget="many2many"/>
                                 <field name="visibility" required="1"/>
                                 <field name="start_time" required="1"/>
                                 <field name="end_time" required="1"/>
-- 
cgit v1.2.3