From 1353e5e79052396bed42ad6db9107ef3a3a6ab7f Mon Sep 17 00:00:00 2001 From: zainab2097 <149927291+zainab2097@users.noreply.github.com> Date: Sun, 29 Sep 2024 16:31:05 +0300 Subject: [PATCH] Update dev_membership.py --- .../dev_membership/models/dev_membership.py | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/odex25_sales/dev_membership/models/dev_membership.py b/odex25_sales/dev_membership/models/dev_membership.py index ee684a2e9..29a799e34 100644 --- a/odex25_sales/dev_membership/models/dev_membership.py +++ b/odex25_sales/dev_membership/models/dev_membership.py @@ -112,8 +112,7 @@ class DevMembership(models.Model): if rec.from_date < membership.to_date: raise ValidationError( _("You already have a membership from '%s' to '%s' !!!!") % (membership.from_date, membership.to_date)) - - + @api.onchange('from_date', 'product_id', 'duration','interval') def onchange_from_date(self): if self.from_date and self.product_id: @@ -123,24 +122,25 @@ class DevMembership(models.Model): self.to_date = self.from_date + relativedelta(months=+self.duration) - relativedelta(days=1) elif self.interval == 'days': self.to_date = self.from_date + relativedelta(days=+self.duration) - def action_confirm_membership(self): - if self.product_id.nationality_ids: + if self.product_id.nationality_ids: if self.partner_id.nationality_id not in self.product_id.nationality_ids: raise ValidationError(_("The member's nationality does not meet the membership requirements")) - if self.product_id.age > 0 and self.partner_id.age < self.product_id.age: - raise ValidationError(_('The member must be at least %s years old.')%self.product_id.age) - if self.product_id.max_age > 0 and self.partner_id.age > self.product_id.max_age: + if self.product_id.age > 0 and self.partner_id.age < self.product_id.age: + raise ValidationError(_('The member must be at least %s years old.') % self.product_id.age) + if self.product_id.max_age > 0 and self.partner_id.age > self.product_id.max_age: raise ValidationError(_('The member must not be more than %s years old.') % self.product_id.max_age) - if self.product_id.gender and self.partner_id.gender != self.product_id.gender : + if self.product_id.gender and self.partner_id.gender != self.product_id.gender: raise ValidationError(_('Membership is only %s allowed') % self.product_id.gender) - if record.membership_fees < (record.product_id.list_price * record.duration ): - raise ValidationError(_("Membership fees cannot be less than %s .") % (record.product_id.list_price* record.duration,)) - if record.duration < record.product_id.duration: - raise ValidationError(_("Duration cannot be less than the default value in Setting of membrship type.%s'") % record.product_id.duration) - - self.state = 'confirm' + if record.membership_fees < (record.product_id.list_price * record.duration): + raise ValidationError( + _("Membership fees cannot be less than %s .") % (record.product_id.list_price * record.duration,)) + if record.duration < record.product_id.duration: + raise ValidationError( + _("Duration cannot be less than the default value in Setting of membrship type.%s'") % record.product_id.duration) + self.state = 'confirm' + def action_active_membership(self): # Search for the last membership of the partner last_membership = self.env['dev.membership'].search([