From afad149eb8a542b39e9508a458d7aeb43aeb60ed Mon Sep 17 00:00:00 2001 From: Joseph Caburnay Date: Thu, 10 Oct 2019 11:45:35 +0000 Subject: [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. --- addons/website_sale_coupon/models/sale_coupon_program.py | 6 +++--- addons/website_sale_coupon/models/sale_order.py | 2 +- .../website_sale_coupon/tests/test_shop_sale_coupon.py | 8 ++++---- .../views/res_config_settings_views.xml | 4 ++-- .../views/sale_coupon_program_views.xml | 16 ++++++++-------- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'addons/website_sale_coupon') 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 @@
-
-
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 @@ - - + + - sale.coupon.program.common.form - sale.coupon.program - + coupon.program.common.form + coupon.program + - sale.coupon.program.tree - sale.coupon.program - + coupon.program.tree + coupon.program + -- cgit v1.2.3