From 697bb1ffeaee2374ac39aa1c838958b6dfae40fd Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Thu, 31 Aug 2023 16:07:43 +0700
Subject: Update voucher model

- Add voucher line model
- Add voucher line on voucher view
- Add voucher relation to voucher line
---
 indoteknik_custom/views/voucher.xml | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/voucher.xml b/indoteknik_custom/views/voucher.xml
index 7b181c62..eb74f27d 100755
--- a/indoteknik_custom/views/voucher.xml
+++ b/indoteknik_custom/views/voucher.xml
@@ -28,8 +28,15 @@
                             <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="start_time" required="1"/>
+                                <field name="end_time" required="1"/>
+                                <field name="limit" required="1"/>
+                                <field name="apply_type" required="1" />
+                                <field name="excl_pricelist_ids" widget="many2many_tags" domain="[('id', 'in', [4, 15037, 15038, 15039])]"/>
                             </group>
-                            <group string="Discount Settings">
+                            <group string="Discount Settings" attrs="{'invisible': [('apply_type', '!=', 'all')]}">
                                 <field name="min_purchase_amount" widget="monetary" required="1" />
                                 <field name="discount_type" required="1" />
 
@@ -52,17 +59,19 @@
 
                                 <field name="max_discount_amount" widget="monetary" required="1" attrs="{'invisible': [('discount_type', '!=', 'percentage')]}"/>
                             </group>
-                            <group string="Rules">
-                                <field name="code" required="1" />
-                                <field name="visibility" required="1" />
-                                <field name="start_time" required="1"/>
-                                <field name="end_time" required="1"/>
-                                <field name="limit" required="1"/>
-                                <field name="manufacture_ids" widget="many2many_tags"/>
-                                <field name="excl_pricelist_ids" widget="many2many_tags" domain="[('id', 'in', [4, 15037, 15038, 15039])]"/>
-                            </group>
                         </group>
                         <notebook>
+                            <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')]}" />
+                                    </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..." />
-- 
cgit v1.2.3


From f5d3b28344f3b992377efbba556306b423bdf723 Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Thu, 31 Aug 2023 16:09:15 +0700
Subject: Add apply voucher function on sale order Update sale order view

---
 indoteknik_custom/views/sale_order.xml | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 14f3663f..bbfc9e3b 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -26,7 +26,17 @@
                     <field name="delivery_amt"/>
                     <field name="fee_third_party"/>
                     <field name="total_percent_margin"/>
-                    <field name="voucher_id" readonly="1" />
+                    <label for="voucher_id"/>
+                    <div class="o_row">
+                        <field name="voucher_id" id="voucher_id" attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'sent']), ('applied_voucher_id', '!=', False)]}"/>
+                        <field name="applied_voucher_id" invisible="1" />
+                        <button name="apply_voucher" type="object" string="Apply" confirm="Anda yakin untuk menggunakan voucher?" help="Apply the selected voucher" class="btn-link mb-1 px-0" icon="fa-plus" 
+                            attrs="{'invisible': ['|', '|', ('voucher_id', '=', False), ('state', 'not in', ['draft', 'sent']), ('applied_voucher_id', '!=', False)]}"
+                        />
+                        <button name="cancel_voucher" type="object" string="Cancel" confirm="Anda yakin untuk membatalkan penggunaan voucher?" help="Cancel applied voucher" class="btn-link mb-1 px-0" icon="fa-times" 
+                            attrs="{'invisible': ['|', ('applied_voucher_id', '=', False), ('state', 'not in', ['draft','sent'])]}"
+                        />
+                    </div>
                 </field>
                 <field name="source_id" position="attributes">
                     <attribute name="invisible">1</attribute>
@@ -49,6 +59,11 @@
                     <field name="date_doc_kirim" readonly="1"/>
                     <field name="notification" readonly="1"/>
                 </field>
+                <xpath expr="//form/sheet/notebook/page/field[@name='order_line']" position="attributes">
+                    <attribute name="attrs">
+                        {'readonly': ['|', ('applied_voucher_id', '!=', False), ('state', 'in', ('done','cancel'))]}
+                    </attribute>
+                </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="attributes">
                     <attribute name="attrs">
                         {
@@ -75,7 +90,7 @@
                     <field name="item_percent_margin"/>
                     <field name="note_procurement" optional="hide"/>
                     <field name="vendor_subtotal" optional="hide"/>
-                    <field name="amount_voucher_disc" string="Voucher" optional="hide"/>
+                    <field name="amount_voucher_disc" string="Voucher" readonly="1" optional="hide"/>
                     <field name="program_line_id" optional="1" />
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_id']" position="before">
@@ -85,7 +100,7 @@
                     <field name="grand_total"/>
                     <label for="amount_voucher_disc" string="Voucher" />
                     <div>
-                        <field class="mb-0" name="amount_voucher_disc" string="Voucher"/> 
+                        <field class="mb-0" name="amount_voucher_disc" string="Voucher" readonly="1"/> 
                         <div class="text-right mb-2"><small>*Hanya informasi</small></div>
                     </div>
                     <field name="total_margin"/>
-- 
cgit v1.2.3


From ea48748650d1abe7b9c09f961eaa3762750e21be Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Wed, 6 Sep 2023 10:33:34 +0700
Subject: Add voucher terms and conditions

Add voucher to sale order API
---
 indoteknik_custom/views/voucher.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/voucher.xml b/indoteknik_custom/views/voucher.xml
index eb74f27d..8da30d2e 100755
--- a/indoteknik_custom/views/voucher.xml
+++ b/indoteknik_custom/views/voucher.xml
@@ -76,6 +76,9 @@
                                 <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" />
+                            </page>
                             <page name="order_page" string="Orders">
                                 <field name="order_ids" readonly="1" />
                             </page>
-- 
cgit v1.2.3


From f73449303d21622036a7e69945836fbc01b8f951 Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Thu, 7 Sep 2023 15:49:55 +0700
Subject: Add apply voucher validation on sale order

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index d37b5d1e..f2cab699 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -30,7 +30,7 @@
                     <div class="o_row">
                         <field name="voucher_id" id="voucher_id" attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'sent']), ('applied_voucher_id', '!=', False)]}"/>
                         <field name="applied_voucher_id" invisible="1" />
-                        <button name="apply_voucher" type="object" string="Apply" confirm="Anda yakin untuk menggunakan voucher?" help="Apply the selected voucher" class="btn-link mb-1 px-0" icon="fa-plus" 
+                        <button name="action_apply_voucher" type="object" string="Apply" confirm="Anda yakin untuk menggunakan voucher?" help="Apply the selected voucher" class="btn-link mb-1 px-0" icon="fa-plus" 
                             attrs="{'invisible': ['|', '|', ('voucher_id', '=', False), ('state', 'not in', ['draft', 'sent']), ('applied_voucher_id', '!=', False)]}"
                         />
                         <button name="cancel_voucher" type="object" string="Cancel" confirm="Anda yakin untuk membatalkan penggunaan voucher?" help="Cancel applied voucher" class="btn-link mb-1 px-0" icon="fa-times" 
-- 
cgit v1.2.3


From 04464fd649e8e05269ae8b444d6aa8f6c68624ca Mon Sep 17 00:00:00 2001
From: Rafi Zadanly <zadanlyr@gmail.com>
Date: Thu, 7 Sep 2023 15:54:05 +0700
Subject: Add limit user on voucher view

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/voucher.xml b/indoteknik_custom/views/voucher.xml
index 8da30d2e..97634d7d 100755
--- a/indoteknik_custom/views/voucher.xml
+++ b/indoteknik_custom/views/voucher.xml
@@ -33,6 +33,7 @@
                                 <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="excl_pricelist_ids" widget="many2many_tags" domain="[('id', 'in', [4, 15037, 15038, 15039])]"/>
                             </group>
-- 
cgit v1.2.3