From 4396f171ef14513c8d2000fd141c76e9e052db3d Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Tue, 25 Jul 2023 12:32:02 +0000
Subject: [PATCH] [MOV] (_ => sale_)loyalty_delivery: merge modules

There is no need to have two bridges linking delivery & loyalty.
The two modules held the two parts of the same logic, making no
sense to keep the two modules separate.

Task-3420579

Part-of: odoo/odoo#129572
---
 addons/loyalty/views/loyalty_reward_views.xml | 12 ++--
 addons/loyalty_delivery/__init__.py           |  4 --
 addons/loyalty_delivery/__manifest__.py       | 15 ----
 .../i18n/loyalty_delivery.pot                 | 69 -------------------
 addons/loyalty_delivery/models/__init__.py    |  6 --
 addons/loyalty_delivery/models/sale_order.py  | 13 ----
 addons/loyalty_delivery/tests/__init__.py     |  4 --
 addons/sale_loyalty_delivery/__manifest__.py  |  6 +-
 .../sale_loyalty_delivery/models/__init__.py  |  2 +
 .../models/loyalty_program.py                 |  1 +
 .../models/loyalty_reward.py                  |  1 +
 .../models/sale_order.py                      | 10 +++
 .../sale_loyalty_delivery/tests/__init__.py   |  1 +
 .../tests/test_free_shipping_reward.py        |  2 +-
 .../tests/test_loyalty_delivery.py            |  4 +-
 .../views/loyalty_reward_views.xml            | 18 ++---
 16 files changed, 37 insertions(+), 131 deletions(-)
 delete mode 100644 addons/loyalty_delivery/__init__.py
 delete mode 100644 addons/loyalty_delivery/__manifest__.py
 delete mode 100644 addons/loyalty_delivery/i18n/loyalty_delivery.pot
 delete mode 100644 addons/loyalty_delivery/models/__init__.py
 delete mode 100644 addons/loyalty_delivery/models/sale_order.py
 delete mode 100644 addons/loyalty_delivery/tests/__init__.py
 rename addons/{loyalty_delivery => sale_loyalty_delivery}/models/loyalty_program.py (99%)
 rename addons/{loyalty_delivery => sale_loyalty_delivery}/models/loyalty_reward.py (99%)
 rename addons/{loyalty_delivery => sale_loyalty_delivery}/tests/test_loyalty_delivery.py (99%)
 rename addons/{loyalty_delivery => sale_loyalty_delivery}/views/loyalty_reward_views.xml (77%)

diff --git a/addons/loyalty/views/loyalty_reward_views.xml b/addons/loyalty/views/loyalty_reward_views.xml
index 2904f763ea3..707dffc1c6f 100644
--- a/addons/loyalty/views/loyalty_reward_views.xml
+++ b/addons/loyalty/views/loyalty_reward_views.xml
@@ -13,7 +13,7 @@
                 <field name="all_discount_product_ids" invisible="1"/>
                 <sheet>
                     <group>
-                        <group string="Reward" id="reward_type_group">
+                        <group string="Reward" name="reward_type_group">
                             <field name="reward_type" widget="selection" attrs="{'readonly' : [('program_type', '=', 'buy_x_get_y')]}"/>
                             <label for="discount" attrs="{'invisible': [('reward_type', '!=', 'discount')]}"/>
                             <div class="d-flex flex-row" attrs="{'invisible': [('reward_type', '!=', 'discount')]}">
@@ -94,12 +94,12 @@
                 <templates>
                     <t t-name="kanban-box">
                         <div class="oe_kanban_global_click_edit mx-0 d-flex flex-row">
-                            <div class="o_loyalty_kanban_card_left mw-75 flex-grow-1" id="reward_info">
+                            <div class="o_loyalty_kanban_card_left mw-75 flex-grow-1" name="reward_info">
                                 <t t-if="record.reward_type.raw_value === 'discount'">
 
                                     <t t-if="record.discount">
                                         <a><field name="discount"/><field name="discount_mode"/> discount <t t-if="record.discount_max_amount.raw_value > 0">( Max <field name="discount_max_amount"/> )</t></a>
-                                    </t> 
+                                    </t>
 
                                     <t t-if="record.discount_applicability.raw_value === 'specific'">
                                         <br/>
@@ -115,7 +115,7 @@
                                         </t>
                                         <t t-if="record.discount_product_tag_id.raw_value">
                                             <div class="d-flex"><i class="fa fa-tags fa-fw" title="Product Tags"/> <field name="discount_product_tag_id" class="d-inline"/></div>
-                                        </t>  
+                                        </t>
                                         <t t-if="record.discount_product_domain.raw_value &amp;&amp; record.discount_product_domain.raw_value !== '[]'" groups="base.group_no_one">
                                             <div class="d-flex"><i class="fa fa-search fa-fw" title="Product Domain"/> <field name="discount_product_domain" class="d-inline"/></div>
                                         </t>
@@ -132,7 +132,7 @@
                                     </t>
                                 </t>
 
-                                <t t-if="record.reward_type.raw_value === 'product'">
+                                <t t-elif="record.reward_type.raw_value === 'product'">
                                     <a>Free product</a>
                                     <br/>
                                     <br/>
@@ -141,7 +141,7 @@
                                     </t>
                                     <t t-if="record.reward_product_tag_id.raw_value">
                                         <div class="d-flex"><i class="fa fa-tags fa-fw" title="Product Tags"/> <field name="reward_product_tag_id" class="d-inline"/></div>
-                                    </t> 
+                                    </t>
                                 </t>
                             </div>
 
diff --git a/addons/loyalty_delivery/__init__.py b/addons/loyalty_delivery/__init__.py
deleted file mode 100644
index dc5e6b693d1..00000000000
--- a/addons/loyalty_delivery/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import models
diff --git a/addons/loyalty_delivery/__manifest__.py b/addons/loyalty_delivery/__manifest__.py
deleted file mode 100644
index 02ba164fe3b..00000000000
--- a/addons/loyalty_delivery/__manifest__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-{
-    'name': 'Coupons & Loyalty - Delivery',
-    'summary': "Add a free shipping option to your rewards",
-    'category': 'Sales',
-    'version': '1.0',
-    'depends': ['loyalty', 'delivery'],
-    'data': [
-        'views/loyalty_reward_views.xml',
-    ],
-    'installable': True,
-    'auto_install': True,
-    'license': 'LGPL-3',
-}
diff --git a/addons/loyalty_delivery/i18n/loyalty_delivery.pot b/addons/loyalty_delivery/i18n/loyalty_delivery.pot
deleted file mode 100644
index 9792c6e84a6..00000000000
--- a/addons/loyalty_delivery/i18n/loyalty_delivery.pot
+++ /dev/null
@@ -1,69 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* loyalty_delivery
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server saas~16.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-30 05:09+0000\n"
-"PO-Revision-Date: 2023-05-30 05:09+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: loyalty_delivery
-#. odoo-python
-#: code:addons/loyalty_delivery/models/loyalty_reward.py:0
-#, python-format
-msgid " (Max %s)"
-msgstr ""
-
-#. module: loyalty_delivery
-#: model_terms:ir.ui.view,arch_db:loyalty_delivery.loyalty_reward_view_kanban_inherit_loyalty_delivery
-msgid "( Max"
-msgstr ""
-
-#. module: loyalty_delivery
-#. odoo-python
-#: code:addons/loyalty_delivery/models/loyalty_program.py:0
-#, python-format
-msgid "Automatic promotion: free shipping on orders higher than $50"
-msgstr ""
-
-#. module: loyalty_delivery
-#: model:ir.model.fields.selection,name:loyalty_delivery.selection__loyalty_reward__reward_type__shipping
-msgid "Free Shipping"
-msgstr ""
-
-#. module: loyalty_delivery
-#. odoo-python
-#: code:addons/loyalty_delivery/models/loyalty_reward.py:0
-#: model_terms:ir.ui.view,arch_db:loyalty_delivery.loyalty_reward_view_form_inherit_loyalty_delivery
-#: model_terms:ir.ui.view,arch_db:loyalty_delivery.loyalty_reward_view_kanban_inherit_loyalty_delivery
-#, python-format
-msgid "Free shipping"
-msgstr ""
-
-#. module: loyalty_delivery
-#: model:ir.model,name:loyalty_delivery.model_loyalty_program
-msgid "Loyalty Program"
-msgstr ""
-
-#. module: loyalty_delivery
-#: model:ir.model,name:loyalty_delivery.model_loyalty_reward
-msgid "Loyalty Reward"
-msgstr ""
-
-#. module: loyalty_delivery
-#: model:ir.model.fields,field_description:loyalty_delivery.field_loyalty_reward__reward_type
-msgid "Reward Type"
-msgstr ""
-
-#. module: loyalty_delivery
-#: model:ir.model,name:loyalty_delivery.model_sale_order
-msgid "Sales Order"
-msgstr ""
diff --git a/addons/loyalty_delivery/models/__init__.py b/addons/loyalty_delivery/models/__init__.py
deleted file mode 100644
index 6911fa64a98..00000000000
--- a/addons/loyalty_delivery/models/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import loyalty_program
-from . import loyalty_reward
-from . import sale_order
diff --git a/addons/loyalty_delivery/models/sale_order.py b/addons/loyalty_delivery/models/sale_order.py
deleted file mode 100644
index 024c19d10c6..00000000000
--- a/addons/loyalty_delivery/models/sale_order.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import models
-
-
-class SaleOrder(models.Model):
-    _inherit = "sale.order"
-
-    def _compute_amount_total_without_delivery(self):
-        self.ensure_one()
-        lines = self.order_line.filtered(lambda l: l.coupon_id and l.coupon_id.program_type in ['ewallet', 'gift_card'])
-        return super()._compute_amount_total_without_delivery() - sum(lines.mapped('price_unit'))
diff --git a/addons/loyalty_delivery/tests/__init__.py b/addons/loyalty_delivery/tests/__init__.py
deleted file mode 100644
index 147bb08453a..00000000000
--- a/addons/loyalty_delivery/tests/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import test_loyalty_delivery
diff --git a/addons/sale_loyalty_delivery/__manifest__.py b/addons/sale_loyalty_delivery/__manifest__.py
index 8523b48fc1c..c7ddaebcca3 100644
--- a/addons/sale_loyalty_delivery/__manifest__.py
+++ b/addons/sale_loyalty_delivery/__manifest__.py
@@ -5,8 +5,10 @@
     'summary': 'Adds free shipping mechanism in sales orders',
     'description': 'Integrate free shipping in sales orders.',
     'category': 'Sales/Sales',
-    'version': '1.0',
-    'depends': ['sale_loyalty', 'loyalty_delivery'],
+    'data': [
+        'views/loyalty_reward_views.xml',
+    ],
+    'depends': ['sale_loyalty', 'delivery'],
     'auto_install': True,
     'license': 'LGPL-3',
 }
diff --git a/addons/sale_loyalty_delivery/models/__init__.py b/addons/sale_loyalty_delivery/models/__init__.py
index 9b5fa8c35d8..6d7898d162d 100644
--- a/addons/sale_loyalty_delivery/models/__init__.py
+++ b/addons/sale_loyalty_delivery/models/__init__.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+from . import loyalty_program
+from . import loyalty_reward
 from . import sale_order
 from . import sale_order_line
diff --git a/addons/loyalty_delivery/models/loyalty_program.py b/addons/sale_loyalty_delivery/models/loyalty_program.py
similarity index 99%
rename from addons/loyalty_delivery/models/loyalty_program.py
rename to addons/sale_loyalty_delivery/models/loyalty_program.py
index 550b49d2b55..b4205de66c8 100644
--- a/addons/loyalty_delivery/models/loyalty_program.py
+++ b/addons/sale_loyalty_delivery/models/loyalty_program.py
@@ -3,6 +3,7 @@
 
 from odoo import _, api, models
 
+
 class LoyaltyProgram(models.Model):
     _inherit = 'loyalty.program'
 
diff --git a/addons/loyalty_delivery/models/loyalty_reward.py b/addons/sale_loyalty_delivery/models/loyalty_reward.py
similarity index 99%
rename from addons/loyalty_delivery/models/loyalty_reward.py
rename to addons/sale_loyalty_delivery/models/loyalty_reward.py
index cbf35ac6b0e..0f52046bb99 100644
--- a/addons/loyalty_delivery/models/loyalty_reward.py
+++ b/addons/sale_loyalty_delivery/models/loyalty_reward.py
@@ -3,6 +3,7 @@
 
 from odoo import _, fields, models
 
+
 class LoyaltyReward(models.Model):
     _inherit = 'loyalty.reward'
 
diff --git a/addons/sale_loyalty_delivery/models/sale_order.py b/addons/sale_loyalty_delivery/models/sale_order.py
index c2c24926ca3..822707cd220 100644
--- a/addons/sale_loyalty_delivery/models/sale_order.py
+++ b/addons/sale_loyalty_delivery/models/sale_order.py
@@ -4,9 +4,19 @@
 from odoo import _, models
 from odoo.fields import Command
 
+
 class SaleOrder(models.Model):
     _inherit = 'sale.order'
 
+    # delivery overrides
+
+    def _compute_amount_total_without_delivery(self):
+        self.ensure_one()
+        lines = self.order_line.filtered(lambda l: l.coupon_id and l.coupon_id.program_type in ['ewallet', 'gift_card'])
+        return super()._compute_amount_total_without_delivery() - sum(lines.mapped('price_unit'))
+
+    # sale_loyalty overrides
+
     def _get_no_effect_on_threshold_lines(self):
         self.ensure_one()
         lines = self.order_line.filtered(lambda line:\
diff --git a/addons/sale_loyalty_delivery/tests/__init__.py b/addons/sale_loyalty_delivery/tests/__init__.py
index 87e11dd79b3..8fbd6804f16 100644
--- a/addons/sale_loyalty_delivery/tests/__init__.py
+++ b/addons/sale_loyalty_delivery/tests/__init__.py
@@ -2,3 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import test_free_shipping_reward
+from . import test_loyalty_delivery
diff --git a/addons/sale_loyalty_delivery/tests/test_free_shipping_reward.py b/addons/sale_loyalty_delivery/tests/test_free_shipping_reward.py
index 49dde39b5a9..4d040336e3f 100644
--- a/addons/sale_loyalty_delivery/tests/test_free_shipping_reward.py
+++ b/addons/sale_loyalty_delivery/tests/test_free_shipping_reward.py
@@ -10,7 +10,7 @@ class TestSaleCouponProgramRules(TestSaleCouponCommon):
 
     @classmethod
     def setUpClass(cls):
-        super(TestSaleCouponProgramRules, cls).setUpClass()
+        super().setUpClass()
         cls.iPadMini = cls.env['product.product'].create({'name': 'Large Cabinet', 'list_price': 320.0})
         tax_15pc_excl = cls.env['account.tax'].create({
             'name': "15% Tax excl",
diff --git a/addons/loyalty_delivery/tests/test_loyalty_delivery.py b/addons/sale_loyalty_delivery/tests/test_loyalty_delivery.py
similarity index 99%
rename from addons/loyalty_delivery/tests/test_loyalty_delivery.py
rename to addons/sale_loyalty_delivery/tests/test_loyalty_delivery.py
index cc2df1cb054..a95be789263 100644
--- a/addons/loyalty_delivery/tests/test_loyalty_delivery.py
+++ b/addons/sale_loyalty_delivery/tests/test_loyalty_delivery.py
@@ -10,7 +10,7 @@ class TestLoyaltyDeliveryCost(common.TransactionCase):
 
     @classmethod
     def setUpClass(cls):
-        super(TestLoyaltyDeliveryCost, cls).setUpClass()
+        super().setUpClass()
         cls.SaleOrder = cls.env['sale.order']
         cls.partner_1 = cls.env['res.partner'].create({'name': 'My Test Customer'})
         cls.pricelist = cls.env['product.pricelist'].create({
@@ -71,7 +71,6 @@ class TestLoyaltyDeliveryCost(common.TransactionCase):
 
         self.assertEqual(order.order_line.filtered('is_delivery').price_total, 0)
 
-
     def test_free_delivery_cost_with_ewallet(self):
         """
         Automatic free shipping of a delivery carrier should not be affected by the
@@ -154,7 +153,6 @@ class TestLoyaltyDeliveryCost(common.TransactionCase):
             self.product_delivery.list_price
         )
 
-
     def _apply_promo_code(self, order, code, no_reward_fail=True):
         status = order._try_apply_code(code)
         if 'error' in status:
diff --git a/addons/loyalty_delivery/views/loyalty_reward_views.xml b/addons/sale_loyalty_delivery/views/loyalty_reward_views.xml
similarity index 77%
rename from addons/loyalty_delivery/views/loyalty_reward_views.xml
rename to addons/sale_loyalty_delivery/views/loyalty_reward_views.xml
index 48dc345c704..034cbd376d7 100644
--- a/addons/loyalty_delivery/views/loyalty_reward_views.xml
+++ b/addons/sale_loyalty_delivery/views/loyalty_reward_views.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+
     <record id="loyalty_reward_view_form_inherit_loyalty_delivery" model="ir.ui.view">
         <field name="name">loyalty.reward.view.form.inherit.loyalty.delivery</field>
         <field name="model">loyalty.reward</field>
         <field name="inherit_id" ref="loyalty.loyalty_reward_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@id='reward_type_group']" position="after">
+            <group name="reward_type_group" position="after">
                 <group id="shipping" string="Free shipping" attrs="{'invisible': [('reward_type', '!=', 'shipping')]}">
                     <field name="discount_max_amount"/>
                 </group>
-            </xpath>
+            </group>
         </field>
     </record>
 
@@ -18,13 +19,14 @@
         <field name="model">loyalty.reward</field>
         <field name="inherit_id" ref="loyalty.loyalty_reward_view_kanban"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[@id='reward_info']" position="inside">
-                <t t-if="record.reward_type.raw_value === 'shipping'">
-
+            <div name="reward_info" position="inside">
+                <t t-elif="record.reward_type.raw_value === 'shipping'">
                     <a>Free shipping <t t-if="record.discount_max_amount.raw_value > 0">( Max <field name="discount_max_amount"/> )</t></a>
-                    <br/><br/>
-                </t>                    
-            </xpath>
+                    <br/>
+                    <br/>
+                </t>
+            </div>
         </field>
     </record>
+
 </odoo>