From 2c71e216a1f7e22bb2be7427f477fe432508a6e8 Mon Sep 17 00:00:00 2001 From: zainab2097 <149927291+zainab2097@users.noreply.github.com> Date: Sun, 25 Aug 2024 13:10:36 +0300 Subject: [PATCH] Update dev_membership.py --- .../dev_membership/models/dev_membership.py | 91 +------------------ 1 file changed, 4 insertions(+), 87 deletions(-) diff --git a/odex25_sales/dev_membership/models/dev_membership.py b/odex25_sales/dev_membership/models/dev_membership.py index 2fb075ae1..5122656ac 100644 --- a/odex25_sales/dev_membership/models/dev_membership.py +++ b/odex25_sales/dev_membership/models/dev_membership.py @@ -233,41 +233,7 @@ class DevMembership(models.Model): tmpl_id.send_mail(membership.id, force_send=True) return True - # def cancell_membership_reminder_email_cron(self): - # membership_pool = self.env['dev.membership'] - # tmpl_id = self.env.ref('dev_membership.dev_cancel_membership_expire') - # post_expiry_period = self.env['ir.config_parameter'].get_param('dev_membership.post_expiry_period') - # cancel_reason = self.env['ir.config_parameter'].get_param('dev_membership.cancellation_reason') - # - # if tmpl_id and post_expiry_period: - # try: - # post_expiry_period = int(post_expiry_period) - # except ValueError: - # post_expiry_period = 0 # تحديد فترة افتراضية أو التعامل مع الحالة بشكل آخر - # - # date = fields.Date.today() - relativedelta(days=post_expiry_period) - # membership_ids = membership_pool.search([ - # ('state', '=', 'expire'), - # ('to_date', '<=', date), - # ('membership_id', '=', False) - # ]) - # for membership in membership_ids: - # # Check if a cancellation request already exists - # existing_cancel_request = self.env['membership.cancellation.request'].search([ - # ('membership_id', '=', membership.id), - # ('state', '=', 'draft') - # ], limit=1) - # if not existing_cancel_request: - # # Create a new cancellation request instead of canceling directly - # self.env['membership.cancellation.request'].create({ - # 'membership_id': membership.id, - # 'member_id': membership.partner_id.id, - # 'request_date': fields.Datetime.now(), - # 'state': 'draft', - # 'cancel_reason': cancel_reason - # }) - # tmpl_id.send_mail(membership.id, force_send=True) - # return True + def cancell2_membership_reminder_email_cron(self): membership_pool = self.env['dev.membership'] @@ -280,7 +246,7 @@ class DevMembership(models.Model): try: post_expiry_period = int(post_expiry_period) except ValueError: - post_expiry_period = 0 # تحديد فترة افتراضية أو التعامل مع الحالة بشكل آخر + post_expiry_period = 0 date = fields.Date.today() - relativedelta(days=int(post_expiry_period)) membership_ids = membership_pool.search([ @@ -308,53 +274,6 @@ class DevMembership(models.Model): tmpl_id2.send_mail(membership.id, force_send=True) return True - # def cancell_membership_reminder_email_cron(self): - # membership_pool = self.env['dev.membership'] - # cancel_reason = self.env['ir.config_parameter'].get_param('dev_membership.cancellation_reason') - # tmpl_id = self.env.ref('dev_membership.dev_cancel_membership_expire') - # post_expiry_period = self.env['ir.config_parameter'].get_param('dev_membership.post_expiry_period') - # tmpl_id2 = self.env.ref('dev_membership.dev_cancel_membership_expire2') - # if tmpl_id: - # date = self.to_date+ relativedelta(days=int(post_expiry_period)) - # membership_ids = membership_pool.search([('state', '=', 'expire'), - # ('to_date', '<=', date)]) - # for membership in membership_ids: - # # Check if a cancellation request already exists - # existing_cancel_request = self.env['membership.cancellation.request'].search([ - # ('membership_id', '=', membership.id), - # ('state', '=', 'draft') - # ], limit=1) - # if not existing_cancel_request: - # # Create a new cancellation request instead of canceling directly - # self.env['membership.cancellation.request'].create({ - # 'membership_id': membership.id, - # 'member_id': membership.partner_id.id, - # 'request_date': fields.Datetime.now(), - # 'state': 'draft', - # 'cancel_reason': cancel_reason - # }) - # tmpl_id.send_mail(membership.id, force_send=True) - # if tmpl_id2: - # date = self.to_date+ relativedelta(days=int(post_expiry_period)) - # membership_ids = membership_pool.search([('state', '=', 'expire'), - # ('to_date', '<=', date)]) - # for membership in membership_ids: - # # Check if a cancellation request already exists - # existing_cancel_request = self.env['membership.cancellation.request'].search([ - # ('membership_id', '=', membership.id), - # ('state', '=', 'draft') - # ], limit=1) - # if not existing_cancel_request: - # # Create a new cancellation request instead of canceling directly - # self.env['membership.cancellation.request'].create({ - # 'membership_id': membership.id, - # 'member_id': membership.partner_id.id, - # 'request_date': fields.Datetime.now(), - # 'state': 'draft', - # 'cancel_reason': cancel_reason - # }) - # tmpl_id2.send_mail(membership.id, force_send=True) - # return True def membership_secand_reminder_email_cron(self): membership_pool = self.env['dev.membership'] tmpl_id = self.env.ref('dev_membership.dev_membership_expire_second_reminder_mail_template') @@ -363,12 +282,11 @@ class DevMembership(models.Model): try: days_before_second = int(days_before_second) except ValueError: - days_before_second = 0 # تحديد قيمة افتراضية أو التعامل مع الخطأ - + days_before_second = 0 date = datetime.now().date() + relativedelta(days=days_before_second) membership_ids = membership_pool.search([ ('state', '=', 'active'), - ('to_date', '<=', date) # استخدام التاريخ المحسوب هنا + ('to_date', '<=', date) ]) for membership in membership_ids: tmpl_id.send_mail(membership.id, force_send=True) @@ -396,7 +314,6 @@ class DevMembership(models.Model): total_fees = sum(membership.membership_fees for membership in memberships)+record.membership_fees total_duration = sum(membership.duration for membership in memberships)+record.duration - # البحث عن مستوى العضوية بناءً على إجمالي الرسوم level_by_fees = self.env['membership.level'].search([ ('min', '<=', total_fees),('years', '<=', total_duration)], limit=1, order='sequence desc') if level_by_fees: record.membrship_level = level_by_fees