[IMP]sale_loyalty_ux: SOs on programs

sale_loyalty_ux/__manifest__.py

@@ -32,7 +32,7 @@
         'sale_loyalty',
     ],
     'data': [
-        'views/loyalty_rule_views.xml',
+        'views/loyalty_program_views.xml',
     ],
     'demo': [
     ],

sale_loyalty_ux/models/__init__.py

@@ -1,3 +1,2 @@
-from . import loyalty_rule
 from . import sale_order
 from . import loyalty_program

sale_loyalty_ux/models/loyalty_program.py

@@ -1,17 +1,18 @@
+import ast
+
 from odoo import fields, models
+from odoo.osv import expression
 
 
 class LoyaltyProgram(models.Model):
     _inherit = 'loyalty.program'
 
-    def _get_valid_pricelists(self, pricelist):
-        '''
-        Returns a dict containing the pricelists that match per rule of the program
-        '''
-        rule_pricelists = dict()
-        for rule in self.rule_ids:
-            if not rule.pricelist_ids:
-                rule_pricelists[rule] = pricelist
-            else:
-                rule_pricelists[rule] = rule.pricelist_ids
-        return rule_pricelists
+    sale_domain = fields.Char(default="[]")
+
+    def _get_valid_sale_order(self):
+        domain = []
+        if self.sale_domain and self.sale_domain != '[]':
+            domain = expression.AND([domain, ast.literal_eval(self.sale_domain)])
+            return domain
+        return False
+

sale_loyalty_ux/models/sale_order.py

@@ -4,19 +4,11 @@
 class SaleOrder(models.Model):
 
     _inherit = "sale.order"
-
     def _program_check_compute_points(self, programs):
         res = super()._program_check_compute_points(programs)
-        pricelist = self.pricelist_id
-        pricelists_per_rule = programs._get_valid_pricelists(pricelist)
-        aux_programs = programs
-        for program in programs:
-            aux_programs -= program
-            for rule in program.rule_ids:
-                if self.pricelist_id in pricelists_per_rule.get(rule):
-                    aux_programs += program
-                    break
         for r in res:
-            if r not in aux_programs:
-                res[r] = {'error': "pricelist not matching"}
+            domain = r._get_valid_sale_order()
+            if not res[r].get('error') and domain:
+                if self not in self.env['sale.order'].search(domain):
+                    res[r] = {'error': "SaleOrder not matching"}
         return res

sale_loyalty_ux/views/loyalty_program_views.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="loyalty_program_view_form" model="ir.ui.view">
+        <field name="name">loyalty.program.view.form</field>
+        <field name="model">loyalty.program</field>
+        <field name="inherit_id" ref="loyalty.loyalty_program_view_form"/>
+        <field name="arch" type="xml">
+            <field name="date_to" position="after">
+                 <field name="sale_domain" string="Sales domain" widget="domain" options="{'model': 'sale.order', 'in_dialog': true}"/>
+            </field>
+        </field>
+    </record>
+</odoo>