[FIX] website_sale_loyalty: ewallet application fix

addons/website_sale_loyalty/controllers/main.py

@@ -92,7 +92,9 @@ def claim_reward(self, reward_id, code=None, **post):
                 coupon = coupon_
                 if code == coupon.code and (
                     (program_sudo.trigger == 'with_code' and program_sudo.program_type != 'promo_code')
-                    or (program_sudo.trigger == 'auto' and program_sudo.applies_on == 'future')
+                    or (program_sudo.trigger == 'auto'
+                        and program_sudo.applies_on == 'future'
+                        and program_sudo.program_type not in ('ewallet', 'loyalty'))
                 ):
                     return self.pricelist(code)
         if coupon:

addons/website_sale_loyalty/tests/__init__.py

@@ -5,3 +5,4 @@
 from . import test_shop_sale_coupon
 from . import test_website_sale_loyalty_delivery
 from . import test_free_product_reward
+from . import test_ewallet

addons/website_sale_loyalty/tests/test_ewallet.py

@@ -0,0 +1,61 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import http, Command
+from odoo.tests import tagged, HttpCase
+from odoo.addons.website.tools import MockRequest
+from odoo.addons.website_sale_loyalty.controllers.main import WebsiteSale
+from odoo.addons.website_sale.tests.common import WebsiteSaleCommon
+
+@tagged('post_install', '-at_install')
+class TestEwallet(HttpCase, WebsiteSaleCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.WebsiteSaleController = WebsiteSale()
+        cls.website = cls.env['website'].browse(1)
+
+        cls.topup = cls.env['product.product'].create({
+            'name': 'Ewallet Top up',
+            'list_price': 50.0,
+            'website_published': True,
+        })
+
+        cls.ewallet_program = cls.env['loyalty.program'].create([{
+            'name': 'E-wallet Card Program',
+            'program_type': 'ewallet',
+            'trigger': 'auto',
+            'applies_on': 'future',
+            'rule_ids': [Command.create({
+                'reward_point_mode': 'money',
+                'reward_point_amount': 10,
+                'product_ids': cls.topup,
+            })],
+            'reward_ids': [Command.create({
+                'discount_mode': 'per_point',
+                'discount': 1,
+                'discount_applicability': 'order',
+            })],
+        }])
+        installed_modules = set(cls.env['ir.module.module'].search([
+            ('state', '=', 'installed'),
+        ]).mapped('name'))
+        for _ in http._generate_routing_rules(installed_modules, nodb_only=False):
+            pass
+
+    def test_ewallet(self):
+        self.env['loyalty.generate.wizard'].create({
+            'program_id': self.ewallet_program.id,
+            'coupon_qty': 1,
+            'points_granted': 10,
+        }).generate_coupons()
+
+        self.ewallet_program.coupon_ids[0].partner_id = self.env.user.partner_id
+
+        order = self.empty_cart
+        with MockRequest(self.env, website=self.website, sale_order_id=order.id):
+            self.WebsiteSaleController.cart_update_json(self.consumable_product.id, set_qty=1)
+            self.assertEqual(order.amount_total, 20)
+            self.WebsiteSaleController.claim_reward(self.ewallet_program.reward_ids[0].id)
+            self.assertEqual(order.amount_total, 10)

addons/website_sale_loyalty/views/website_sale_templates.xml

@@ -42,7 +42,7 @@
                                                 <div class="flex-grow-1">
                                                     <t t-set="program" t-value="reward.program_id"/>
                                                     <t t-set="points" t-value="coupon._format_points(website_sale_order._get_real_points_for_coupon(coupon))"/>
-                                                    <t t-if="program.program_type not in ['ewallet', 'promo_code'] and (program.trigger == 'with_code' or (program.trigger == 'auto' and program.applies_on == 'future'))">
+                                                    <t t-if="program.program_type not in ['ewallet', 'promo_code', 'loyalty'] and (program.trigger == 'with_code' or (program.trigger == 'auto' and program.applies_on == 'future'))">
                                                         <t t-if="program.program_type == 'gift_card'">
                                                             <strong t-esc="reward.description"/>
                                                             <strong> - </strong>