Skip to content

[FIX] loyalty: prevent archiving product used for specific discounts #203241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[FIX] loyalty: prevent archiving product used for specific discounts #203241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions addons/loyalty/models/product_product.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ class ProductProduct(models.Model):
def write(self, vals):
if not vals.get('active', True) and any(product.active for product in self):
# Prevent archiving products used for giving rewards
rewards = self.env['loyalty.reward'].sudo().search(
[('discount_line_product_id', 'in', self.ids), ('active', '=', True)], limit=1
)
rewards = self.env['loyalty.reward'].sudo().search([
('active', '=', True),
'|',
('discount_line_product_id', 'in', self.ids),
('discount_product_ids', 'in', self.ids),
], limit=1)
if rewards:
raise ValidationError(_("This product may not be archived. It is being used for an active promotion program."))
return super().write(vals)
Expand Down
41 changes: 23 additions & 18 deletions addons/loyalty/tests/test_loyalty.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ def setUpClass(cls):
'name': 'Test Program',
'reward_ids': [(0, 0, {})],
})

cls.product = cls.env['product.product'].with_context(default_taxes_id=False).create({
'name': "Test Product",
'detailed_type': 'consu',
'list_price': 20.0,
})

def test_discount_product_unlink(self):
# Test that we can not unlink dicount line product id
Expand Down Expand Up @@ -141,11 +145,7 @@ def test_archiving_unarchiving(self):
def test_prevent_archiving_product_linked_to_active_loyalty_reward(self):
self.program.program_type = 'promotion'
self.program.flush_recordset()
product = self.env['product.product'].with_context(default_taxes_id=False).create({
'name': 'Test Product',
'detailed_type': 'consu',
'list_price': 20.0,
})
product = self.product
reward = self.env['loyalty.reward'].create({
'program_id': self.program.id,
'discount_line_product_id': product.id,
Expand All @@ -158,18 +158,27 @@ def test_prevent_archiving_product_linked_to_active_loyalty_reward(self):
self.program.action_archive()
product.action_archive()

def test_prevent_archiving_product_used_for_discount_reward(self):
self.program.program_type = 'promotion'
self.program.write({
'reward_ids': [Command.create({
'discount': 50.0,
'discount_applicability': 'specific',
'discount_product_ids': self.product.ids,
})],
})
with self.assertRaises(ValidationError):
self.product.action_archive()
self.program.action_archive()
self.product.action_archive()

def test_prevent_archiving_product_when_archiving_program(self):
"""
Test prevent archiving a product when archiving a "Buy X Get Y" program.
We just have to archive the free product that has been created while creating
the program itself not the product we already had before.
"""
product = self.env['product.product'].with_context(default_taxes_id=False).create({
'name': 'Test Product',
'detailed_type': 'consu',
'list_price': 20.0,
})

product = self.product
loyalty_program = self.env['loyalty.program'].create({
'name': 'Test Program',
'program_type': 'buy_x_get_y',
Expand All @@ -187,12 +196,8 @@ def test_prevent_archiving_product_when_archiving_program(self):

def test_card_description_on_tag_change(self):
product_tag = self.env['product.tag'].create({'name': 'Multiple Products'})
product1 = self.env['product.product'].create({
'name': 'Test Product',
'detailed_type': 'consu',
'list_price': 20.0,
'product_tag_ids': product_tag,
})
product1 = self.product
product1.product_tag_ids = product_tag
self.env['product.product'].create({
'name': 'Test Product 2',
'detailed_type': 'consu',
Expand Down