summaryrefslogtreecommitdiff
path: root/addons/website_sale_coupon
diff options
context:
space:
mode:
authorJoseph Caburnay <jcb@odoo.com>2019-10-10 11:45:35 +0000
committerPierre Masereel <pim@odoo.com>2020-05-08 14:27:29 +0000
commitafad149eb8a542b39e9508a458d7aeb43aeb60ed (patch)
tree80b405cfb2d6050e848120a071ce2ed22c712932 /addons/website_sale_coupon
parentef05ca2812c3407dddd20921604661726c859d74 (diff)
[REF] *_sale_coupon: create coupon module
This refactoring extracts parts of `sale_coupon` module to create a more generic module called `coupon`. This new module can be extended in different sales modules to implement functionalities specific to modules that extend it.
Diffstat (limited to 'addons/website_sale_coupon')
-rw-r--r--addons/website_sale_coupon/models/sale_coupon_program.py6
-rw-r--r--addons/website_sale_coupon/models/sale_order.py2
-rw-r--r--addons/website_sale_coupon/tests/test_shop_sale_coupon.py8
-rw-r--r--addons/website_sale_coupon/views/res_config_settings_views.xml4
-rw-r--r--addons/website_sale_coupon/views/sale_coupon_program_views.xml16
5 files changed, 18 insertions, 18 deletions
diff --git a/addons/website_sale_coupon/models/sale_coupon_program.py b/addons/website_sale_coupon/models/sale_coupon_program.py
index 2fee40ba519..b0ab5bb8792 100644
--- a/addons/website_sale_coupon/models/sale_coupon_program.py
+++ b/addons/website_sale_coupon/models/sale_coupon_program.py
@@ -5,9 +5,9 @@ from odoo import api, models, _
from odoo.exceptions import ValidationError
-class SaleCouponProgram(models.Model):
- _name = 'sale.coupon.program'
- _inherit = ['sale.coupon.program', 'website.multi.mixin']
+class CouponProgram(models.Model):
+ _name = 'coupon.program'
+ _inherit = ['coupon.program', 'website.multi.mixin']
@api.constrains('promo_code', 'website_id')
def _check_promo_code_constraint(self):
diff --git a/addons/website_sale_coupon/models/sale_order.py b/addons/website_sale_coupon/models/sale_order.py
index 2657a534dce..322a58d5322 100644
--- a/addons/website_sale_coupon/models/sale_order.py
+++ b/addons/website_sale_coupon/models/sale_order.py
@@ -83,7 +83,7 @@ class SaleOrder(models.Model):
ICP = self.env['ir.config_parameter']
validity = ICP.get_param('website_sale_coupon.abandonned_coupon_validity', 4)
validity = fields.Datetime.to_string(fields.datetime.now() - timedelta(days=int(validity)))
- coupon_to_reset = self.env['sale.coupon'].search([
+ coupon_to_reset = self.env['coupon.coupon'].search([
('state', '=', 'used'),
('sales_order_id.state', '=', 'draft'),
('sales_order_id.write_date', '<', validity),
diff --git a/addons/website_sale_coupon/tests/test_shop_sale_coupon.py b/addons/website_sale_coupon/tests/test_shop_sale_coupon.py
index 8ab42514891..aed73c9ebb1 100644
--- a/addons/website_sale_coupon/tests/test_shop_sale_coupon.py
+++ b/addons/website_sale_coupon/tests/test_shop_sale_coupon.py
@@ -60,7 +60,7 @@ class TestUi(TestSaleProductAttributeValueCommon, HttpCase):
'taxes_id': False,
})
- self.env['sale.coupon.program'].create({
+ self.env['coupon.program'].create({
'name': "Buy 3 Small Cabinets, get one for free",
'promo_code_usage': 'no_code_needed',
'discount_apply_on': 'on_order',
@@ -72,7 +72,7 @@ class TestUi(TestSaleProductAttributeValueCommon, HttpCase):
'discount_line_product_id': free_large_cabinet.id
})
- self.env['sale.coupon.program'].create({
+ self.env['coupon.program'].create({
'name': "Code for 10% on orders",
'promo_code_usage': 'code_needed',
'promo_code': 'testcode',
@@ -92,7 +92,7 @@ class TestWebsiteSaleCoupon(TransactionCase):
def setUp(self):
super(TestWebsiteSaleCoupon, self).setUp()
- program = self.env['sale.coupon.program'].create({
+ program = self.env['coupon.program'].create({
'name': '10% TEST Discount',
'promo_code_usage': 'code_needed',
'discount_apply_on': 'on_order',
@@ -101,7 +101,7 @@ class TestWebsiteSaleCoupon(TransactionCase):
'program_type': 'coupon_program',
})
- self.env['sale.coupon.generate'].with_context(active_id=program.id).create({}).generate_coupon()
+ self.env['coupon.generate.wizard'].with_context(active_id=program.id).create({}).generate_coupon()
self.coupon = program.coupon_ids[0]
self.steve = self.env['res.partner'].create({
diff --git a/addons/website_sale_coupon/views/res_config_settings_views.xml b/addons/website_sale_coupon/views/res_config_settings_views.xml
index da9e35f92ac..ae0837b65bb 100644
--- a/addons/website_sale_coupon/views/res_config_settings_views.xml
+++ b/addons/website_sale_coupon/views/res_config_settings_views.xml
@@ -9,10 +9,10 @@
<xpath expr="//div[@id='website_sale_coupon']" position="after">
<div class="content-group">
<div class="mt8" attrs="{'invisible': [('module_sale_coupon', '=', False)]}">
- <button name="%(sale_coupon.sale_coupon_program_action_promo_program)d" icon="fa-arrow-right" type="action" string="Promotion Programs" class="btn-link"/>
+ <button name="%(coupon.coupon_program_action_promo_program)d" icon="fa-arrow-right" type="action" string="Promotion Programs" class="btn-link"/>
</div>
<div class="mt8" attrs="{'invisible': [('module_sale_coupon', '=', False)]}">
- <button name="%(sale_coupon.sale_coupon_program_action_coupon_program)d" icon="fa-arrow-right" type="action" string="Coupon Programs" class="btn-link"/>
+ <button name="%(coupon.coupon_program_action_coupon_program)d" icon="fa-arrow-right" type="action" string="Coupon Programs" class="btn-link"/>
</div>
</div>
</xpath>
diff --git a/addons/website_sale_coupon/views/sale_coupon_program_views.xml b/addons/website_sale_coupon/views/sale_coupon_program_views.xml
index 739498bfab3..06ce21f546b 100644
--- a/addons/website_sale_coupon/views/sale_coupon_program_views.xml
+++ b/addons/website_sale_coupon/views/sale_coupon_program_views.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <menuitem action="sale_coupon.sale_coupon_program_action_promo_program" id="menu_promotion_type_config" name="Promotion Programs" parent="website_sale.menu_catalog" groups="sales_team.group_sale_manager" sequence="50"/>
- <menuitem id="menu_coupon_type_config" action="sale_coupon.sale_coupon_program_action_coupon_program" name="Coupon Programs" parent="website_sale.menu_catalog" groups="sales_team.group_sale_manager" sequence="51"/>
+ <menuitem action="coupon.coupon_program_action_promo_program" id="menu_promotion_type_config" name="Promotion Programs" parent="website_sale.menu_catalog" groups="sales_team.group_sale_manager" sequence="50"/>
+ <menuitem id="menu_coupon_type_config" action="coupon.coupon_program_action_coupon_program" name="Coupon Programs" parent="website_sale.menu_catalog" groups="sales_team.group_sale_manager" sequence="51"/>
<record model="ir.ui.view" id="sale_coupon_program_view_form_common_website">
- <field name="name">sale.coupon.program.common.form</field>
- <field name="model">sale.coupon.program</field>
- <field name="inherit_id" ref="sale_coupon.sale_coupon_program_view_form_common"/>
+ <field name="name">coupon.program.common.form</field>
+ <field name="model">coupon.program</field>
+ <field name="inherit_id" ref="coupon.coupon_program_view_form_common"/>
<field name="arch" type="xml">
<group name="validity" position="inside">
<label for="website_id" groups="website.group_multi_website"/>
@@ -19,9 +19,9 @@
</record>
<record id="sale_coupon_program_view_tree_website" model="ir.ui.view">
- <field name="name">sale.coupon.program.tree</field>
- <field name="model">sale.coupon.program</field>
- <field name="inherit_id" ref="sale_coupon.sale_coupon_program_view_tree"/>
+ <field name="name">coupon.program.tree</field>
+ <field name="model">coupon.program</field>
+ <field name="inherit_id" ref="coupon.coupon_program_view_tree"/>
<field name="arch" type="xml">
<field name="name" position="after">
<field name="website_id" groups="website.group_multi_website"/>