Change to consider shift_type in LaCagette Membership, instead of admitting…

Change to consider shift_type in LaCagette Membership, instead of admitting everybody has subscribed ftop type shift templates

lacagette_addons/lacagette_membership/data/ir_config_parameter_data.xml

 <?xml version="1.0"?>
 <odoo noupdate="1">
-   
     <record id="points_limit_to_get_suspended" model="ir.config_parameter">
         <field name="key">lacagette_membership.points_limit_to_get_suspended</field>
         <field name="value">-2</field>

lacagette_addons/lacagette_membership/models/res_partner.py

@@ -21,7 +21,7 @@ class ResPartner(models.Model):
 
     target_status = fields.Selection(
                     selection=TARGET_STATUS_SELECTION, default='')
-    
+
     @api.model
     def run_process_target_status(self):
         """Method called by cron task"""
@@ -31,24 +31,28 @@ class ResPartner(models.Model):
 
         for p in self.env['res.partner']\
                          .search([('target_status', '!=', "")]):
-            new_values = {'target_status': "", "date_alert_stop": False}
-            if p.final_ftop_point < 0:
-                new_values['cooperative_state'] = p.target_status
-                if new_values['cooperative_state'] == "unsubscribed":
-                    new_values['makeups_to_do'] = 2 if absence_status == 'absent' else 1
-                    new_values['final_ftop_point'] = -2
-                    new_values['display_ftop_points'] = -2
-                    """
-                    unlink model: "shift.template.registration"
-                    to delete all future shifts linked to this coop.
-                    """
-                    for streg in self.env['shift.template.registration']\
-                                .search([('partner_id', '=', p.id)]):
-                        streg.unlink()
-                    mail_template = self.env.ref('coop_membership.unsubscribe_email')
-                    if mail_template:
-                         mail_template.send_mail(p.id)
-            p.update(new_values)
+            try:
+                new_values = {'target_status': "", "date_alert_stop": False}
+                final_points = p.final_ftop_point if p.shift_type == "ftop" else p.final_standard_point
+                if final_points < 0:
+                    new_values['cooperative_state'] = p.target_status
+                    if new_values['cooperative_state'] == "unsubscribed":
+                        new_values['makeups_to_do'] = 2 if absence_status == 'absent' else 1
+                        new_values['final_' + p.shift_type + '_point'] = -2
+                        new_values['display_' + p.shift_type + '_points'] = -2
+                        """
+                        unlink model: "shift.template.registration"
+                        to delete all future shifts linked to this coop.
+                        """
+                        for streg in self.env['shift.template.registration']\
+                                    .search([('partner_id', '=', p.id)]):
+                            streg.unlink()
+                        mail_template = self.env.ref('coop_membership.unsubscribe_email')
+                        if mail_template:
+                             mail_template.send_mail(p.id)
+                p.update(new_values)
+            except Exception as e:
+                _logger.error("run_process_target_status : %s", str(e))
 
     #@api.onchange('cooperativestate') : could be used only if it is called from client
     @api.model
@@ -89,7 +93,7 @@ class ResPartner(models.Model):
             else:
                 # need to load data
                 member = self.env['res.partner'].search([('id', '=', self.id)])[0]
-                # should exist an other way to do it , but haven't found it 
+                # should exist an other way to do it , but haven't found it
                 if member.cooperative_state != "up_to_date":
                     answer = False
         else:
@@ -103,11 +107,11 @@ class ResPartner(models.Model):
 
     @api.model
     def update(self, vals):
-        #_logger.info("valeurs reçues pour update partner = %s", str(vals))
+        _logger.info("valeurs reçues pour update partner = %s", str(vals))
         state_to_record = ""
         if 'cooperative_state' in vals:
             state_to_record = vals['cooperative_state']
-            
+
         elif 'current_cooperative_state' in vals:
             state_to_record = vals['current_cooperative_state']
             del vals['current_cooperative_state']
@@ -116,11 +120,11 @@ class ResPartner(models.Model):
 
         return super(ResPartner, self).update(vals)
 
+
     @api.model
     def write(self, vals):
-        # _logger.info("valeurs reçues pour write partner = %s", str(vals))
+        _logger.info("valeurs reçues pour write partner = %s", str(vals))
         if 'cooperative_state' in vals:
             self._write_state_change(vals['cooperative_state'])
         return super(ResPartner, self).write(vals)
 
-    
\ No newline at end of file

lacagette_addons/lacagette_membership/models/shift_counter_event.py

@@ -17,18 +17,19 @@ class ShiftCounterEvent(models.Model):
         if vals['point_qty'] < 0:
             res_partner = self.env['res.partner'].search([('id', '=', vals['partner_id'])])
             if res_partner:
-                points_before_removing_points = res_partner[0].final_ftop_point
+                p = res_partner[0]
+                points_before_removing_points = p.final_ftop_point if p.shift_type == "ftop" else p.final_standard_point
                 points_after_removal = points_before_removing_points + vals['point_qty']
                 _logger.info("points_after_removal = %s", str(points_after_removal))
                 if points_after_removal <= suspension_limit or points_after_removal <= unsubscribe_limit:
-                    if (points_after_removal <= suspension_limit  
-                        and 
-                        res_partner[0].cooperative_state != 'delay'):
+                    if (points_after_removal <= suspension_limit
+                        and
+                        p.cooperative_state != 'delay'):
                         target_status = 'suspended'
                     if points_after_removal <= unsubscribe_limit:
                         target_status = 'unsubscribed'
-                    res_partner[0].update({'target_status': target_status,
-                                           'current_cooperative_state': res_partner[0].cooperative_state})
+                    p.update({'target_status': target_status,
+                              'current_cooperative_state': p.cooperative_state})
 
     @api.model
     def write(self, vals):
@@ -43,4 +44,3 @@ class ShiftCounterEvent(models.Model):
         _logger.info("Vals reçues creation = %s", str(vals))
         return super(ShiftCounterEvent, self).create(vals)
 
-   
\ No newline at end of file