diff --git a/addons/loyalty/static/src/scss/loyalty.scss b/addons/loyalty/static/src/scss/loyalty.scss index d8703da919b..7d9cf9b721c 100644 --- a/addons/loyalty/static/src/scss/loyalty.scss +++ b/addons/loyalty/static/src/scss/loyalty.scss @@ -8,6 +8,7 @@ .o_kanban_record { margin-right: 0px; margin-left: 0px; + width: 100%; .o_field_many2many_tags .o_tag span { // Remove the small ball before the tags diff --git a/addons/loyalty/views/loyalty_card_views.xml b/addons/loyalty/views/loyalty_card_views.xml index 361018d9a97..386a72d5a8b 100644 --- a/addons/loyalty/views/loyalty_card_views.xml +++ b/addons/loyalty/views/loyalty_card_views.xml @@ -47,6 +47,10 @@ loyalty.card + + + + diff --git a/addons/loyalty/views/loyalty_program_views.xml b/addons/loyalty/views/loyalty_program_views.xml index 8e0612e7895..91ee0921e9e 100644 --- a/addons/loyalty/views/loyalty_program_views.xml +++ b/addons/loyalty/views/loyalty_program_views.xml @@ -164,7 +164,7 @@ [('program_type', 'not in', ('gift_card', 'ewallet'))] - No loyalty program found. + No program found. Create one from scratch, or use a templates below: diff --git a/addons/pos_loyalty/models/pos_order.py b/addons/pos_loyalty/models/pos_order.py index 5ee9026482c..e403351fb5d 100644 --- a/addons/pos_loyalty/models/pos_order.py +++ b/addons/pos_loyalty/models/pos_order.py @@ -74,7 +74,7 @@ class PosOrder(models.Model): } for p in coupons_to_create.values()] # Pos users don't have the create permission - new_coupons = self.env['loyalty.card'].sudo().create(coupon_create_vals) + new_coupons = self.env['loyalty.card'].with_context(action_no_send_mail=True).sudo().create(coupon_create_vals) # We update the gift card that we sold when the gift_card_settings = 'scan_use'. gift_cards_to_update = [v for v in coupon_data.values() if v.get('giftCardId')] @@ -104,6 +104,8 @@ class PosOrder(models.Model): coupon.points += coupon_data[coupon_new_id_map[coupon.id]]['points'] for reward_code in coupon_data[coupon_new_id_map[coupon.id]].get('line_codes', []): lines_per_reward_code[reward_code].coupon_id = coupon + # Send creation email + new_coupons.with_context(action_no_send_mail=False)._send_creation_communication() # Reports per program report_per_program = {} coupon_per_report = defaultdict(list) diff --git a/addons/sale_loyalty/models/sale_order.py b/addons/sale_loyalty/models/sale_order.py index c7a9b09ebc8..b2b6d2fe679 100644 --- a/addons/sale_loyalty/models/sale_order.py +++ b/addons/sale_loyalty/models/sale_order.py @@ -360,7 +360,7 @@ class SaleOrder(models.Model): self.ensure_one() return [('active', '=', True), ('program_id.sale_ok', '=', True), ('company_id', 'in', (self.company_id.id, False)), - '|', ('program_id.date_to', '=', False), ('program_id.date_to', '<=', fields.Date.context_today(self))] + '|', ('program_id.date_to', '=', False), ('program_id.date_to', '>=', fields.Date.context_today(self))] def _get_applicable_program_points(self, domain=None): """
Create one from scratch, or use a templates below: