admin.suherdy/pos_loyalty_subscription
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: synchronize active status for loyalty subscriptions and refine card validation logic in POS

Browse Source
This commit is contained in:
Suherdy Yacob 2026-06-05 08:48:19 +07:00
parent 075d5055a7
commit d5a406e566
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/loyalty_card.py
View File

@ -33,5 +33,5 @@ class LoyaltyCard(models.Model):
@api.model @api.model
def _load_pos_data_fields(self, config): def _load_pos_data_fields(self, config):
fields_list = super()._load_pos_data_fields(config) fields_list = super()._load_pos_data_fields(config)
fields_list.extend(['subscription_start_date', 'subscription_end_date', 'subscription_usage_count']) fields_list.extend(['subscription_start_date', 'subscription_end_date', 'subscription_usage_count', 'active'])
return fields_list return fields_list

13
models/loyalty_program.py
View File

@ -44,8 +44,13 @@ class LoyaltyProgram(models.Model):
def write(self, vals): def write(self, vals):
if vals.get('program_type') == 'subscription' or (not vals.get('program_type') and any(p.program_type == 'subscription' for p in self)): if vals.get('program_type') == 'subscription' or (not vals.get('program_type') and any(p.program_type == 'subscription' for p in self)):
vals['manual_membership'] = True if any(not p.manual_membership for p in self):
vals['trigger'] = 'auto' vals['manual_membership'] = True
vals['applies_on'] = 'both' if any(p.trigger != 'auto' for p in self):
vals['portal_visible'] = True vals['trigger'] = 'auto'
if any(p.applies_on != 'both' for p in self):
vals['applies_on'] = 'both'
if any(not p.portal_visible for p in self):
vals['portal_visible'] = True
return super().write(vals) return super().write(vals)

6
static/src/app/models/pos_order.js
View File

@ -38,7 +38,11 @@ patch(PosOrder.prototype, {
return cardPartnerId === partner.id && cardProgramId === program.id; return cardPartnerId === partner.id && cardProgramId === program.id;
}); });
if (!card || !card.active) { if (!card) {
return true;
}
if (card.id < 0 || !card.active) {
return false; return false;
} }