Merge pull request #237 from expsa/zainab_sale

[UPDATE]UPDATE
2024-07-17 08:47:26 +03:00 · 2024-07-17 08:47:26 +03:00 · 9cb294aa7b
parent 1623a0b7f5 78d1ba3825
commit 9cb294aa7b
8 changed files with 128 additions and 41 deletions
--- a/odex25_sales/dev_membership/i18n/ar_001.po
+++ b/odex25_sales/dev_membership/i18n/ar_001.po
@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-08 14:52+0000\n"
-"PO-Revision-Date: 2024-07-08 14:52+0000\n"
+"POT-Creation-Date: 2024-07-17 05:38+0000\n"
+"PO-Revision-Date: 2024-07-17 05:38+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@ -30,6 +30,16 @@ msgstr ""
 "               \t<p>عضويتك <b>${(object.name)}</b> لقد انتهت في <b>${object.datetime_convert()}</b> date.</p>\n"
 "     "

+#. module: dev_membership
+#: model:mail.template,body_html:dev_membership.dev_cancel_membership_expire
+msgid ""
+"\n"
+"               \t<p>Hello ${object.partner_id.name}.</p>\n"
+"               \t<p>Hope you doing well!</p>\n"
+"               \t<p>It's gentle reminder that your membership is about to Cancelled on ${object.datetime_convert()}.</p>\n"
+"                "
+msgstr ""
+
 #. module: dev_membership
 #: model:mail.template,body_html:dev_membership.dev_membership_expire_reminder_mail_template
 #: model:mail.template,body_html:dev_membership.dev_membership_expire_second_reminder_mail_template
@ -41,6 +51,16 @@ msgid ""
 "                "
 msgstr ""

+#. module: dev_membership
+#: model:mail.template,body_html:dev_membership.dev_cancel_membership_expire2
+msgid ""
+"\n"
+"               \t<p>Hello ${object.user_id.name}.</p>\n"
+"               \t<p>Hope you doing well!</p>\n"
+"               \t<p>It's gentle reminder that your membership is about to Cancelled on ${object.datetime_convert()}.</p>\n"
+"                "
+msgstr ""
+
 #. module: dev_membership
 #: model:mail.template,report_name:dev_membership.template_membership
 msgid "${(object.name)}_Membership"
@ -108,7 +128,7 @@ msgstr ""
 msgid ""
 "<span class=\"o_form_label\">Membership Cancellation\".\n"
 "                                </span>"
-msgstr "إلغاء العضوية"
+msgstr "إلغاء تلقائي للعضويات المنتهية بعد تجاوز المدة المحدده وعدم التجديد"

 #. module: dev_membership
 #: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
@ -196,14 +216,14 @@ msgstr "مؤرشف"
 #. module: dev_membership
 #: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_attachment_count
 msgid "Attachment Count"
-msgstr "عدد المرفقات"
+msgstr ""

 #. module: dev_membership
 #: model:ir.actions.server,name:dev_membership.cron_membership_auto_expire_ir_actions_server
 #: model:ir.cron,cron_name:dev_membership.cron_membership_auto_expire
 #: model:ir.cron,name:dev_membership.cron_membership_auto_expire
 msgid "Auto Expire Membership"
-msgstr "انتهاء العضوية تلقائيًا"
+msgstr ""

 #. module: dev_membership
 #: model:ir.model.fields,field_description:dev_membership.field_res_partner__birth_date
@ -226,7 +246,7 @@ msgstr "الغاء"

 #. module: dev_membership
 #: model:ir.actions.act_window,name:dev_membership.membership_request_cancel_wizard_action
-#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__cancel_reason_id
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__cancel_reasone
 #: model:ir.model.fields,field_description:dev_membership.field_membership_request_cancel_wizard__reason_id
 #: model_terms:ir.ui.view,arch_db:dev_membership.membership_cancel_wizard_view_form
 msgid "Cancel Membership Reason"
@ -294,13 +314,14 @@ msgstr ""
 #. module: dev_membership
 #: model:ir.model.fields.selection,name:dev_membership.selection__product_template__interval__days
 #: model:ir.model.fields.selection,name:dev_membership.selection__renew_membership__interval__days
+#: model:ir.model.fields.selection,name:dev_membership.selection__res_config_settings__interval__days
 msgid "Days"
 msgstr "ايام"

 #. module: dev_membership
 #: model:ir.model.fields,field_description:dev_membership.field_res_config_settings__days_before
 msgid "Days Before First Reminder"
-msgstr "أيام قبل التذكير الأول"
+msgstr ""

 #. module: dev_membership
 #: model:ir.model.fields,field_description:dev_membership.field_res_config_settings__days_before_second
@ -361,11 +382,6 @@ msgstr "لا يمكن أن تكون المدة أقل من القيمة الاف
 msgid "Email"
 msgstr "البريد الالكتروني"

-#. module: dev_membership
-#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__id_no
-msgid "Identification Number"
-msgstr "رقم الهوية"
-
 #. module: dev_membership
 #: model:ir.model.fields,field_description:dev_membership.field_res_partner__employer
 #: model:ir.model.fields,field_description:dev_membership.field_res_users__employer
@ -471,6 +487,11 @@ msgstr ""
 msgid "Icon to indicate an exception activity."
 msgstr ""

+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_dev_membership__id_no
+msgid "Identification Number"
+msgstr "رقم الهوية"
+
 #. module: dev_membership
 #: model:ir.model.fields,help:dev_membership.field_dev_membership__message_needaction
 #: model:ir.model.fields,help:dev_membership.field_dev_membership__message_unread
@ -488,6 +509,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:dev_membership.field_product_product__interval
 #: model:ir.model.fields,field_description:dev_membership.field_product_template__interval
 #: model:ir.model.fields,field_description:dev_membership.field_renew_membership__interval
+#: model:ir.model.fields,field_description:dev_membership.field_res_config_settings__interval
 msgid "Interval"
 msgstr "الفترة"

@ -604,6 +626,11 @@ msgstr "تم إلغاء العضوية %s"
 msgid "Membership Cancellation"
 msgstr "إلغاء العضوية"

+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_form
+msgid "Membership Cancellation Reasones"
+msgstr ""
+
 #. module: dev_membership
 #: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
 msgid "Membership Cancellation\"."
@ -621,7 +648,7 @@ msgstr "إلغاء العضوية"
 #: model:ir.model.fields,field_description:dev_membership.field_res_partner__membership_count
 #: model:ir.model.fields,field_description:dev_membership.field_res_users__membership_count
 msgid "Membership Count"
-msgstr "عدد الأعضاء"
+msgstr ""

 #. module: dev_membership
 #: model_terms:ir.ui.view,arch_db:dev_membership.view_dev_membership_form
@ -652,7 +679,7 @@ msgstr ""
 #. module: dev_membership
 #: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
 msgid "Membership Expiry Reminders"
-msgstr "تذكيرات انتهاء العضوية"
+msgstr "تذكير انتهاء العضوية"

 #. module: dev_membership
 #: model:ir.model.fields,field_description:dev_membership.field_dev_membership__membership_fees
@ -671,7 +698,14 @@ msgstr "تاريخ اﻷنضمام"
 msgid ""
 "Membership Invoice is not paid.\n"
 "Please Paid membership invoice and active the membership."
-msgstr "يرجى دفع فاتورة العضوية وتفعيل العضوية."
+msgstr ""
+
+#. module: dev_membership
+#: model:ir.actions.server,name:dev_membership.cron_cancel_dev_membership_reminder_ir_actions_server
+#: model:ir.cron,cron_name:dev_membership.cron_cancel_dev_membership_reminder
+#: model:ir.cron,name:dev_membership.cron_cancel_dev_membership_reminder
+msgid "Membership Partner Cancel Notify"
+msgstr ""

 #. module: dev_membership
 #: model:ir.actions.act_window,name:dev_membership.action_membership_pro
@ -705,7 +739,7 @@ msgstr "تقييم تسجيل العضوية"
 #: model:ir.cron,cron_name:dev_membership.cron_dev_membership_reminder
 #: model:ir.cron,name:dev_membership.cron_dev_membership_reminder
 msgid "Membership Reminder"
-msgstr "تذكير بالعضوية"
+msgstr ""

 #. module: dev_membership
 #: model_terms:ir.ui.view,arch_db:dev_membership.res_dev_membership_config_settings_view_form
@ -725,6 +759,8 @@ msgid "Membership Secand Reminder"
 msgstr "تذكير ثاني بانتهاءالعضوية"

 #. module: dev_membership
+#: model:mail.template,subject:dev_membership.dev_cancel_membership_expire
+#: model:mail.template,subject:dev_membership.dev_cancel_membership_expire2
 #: model:mail.template,subject:dev_membership.dev_membership_expire_second_reminder_mail_template
 msgid "Membership Second Expire Reminder"
 msgstr "تذكير ثاني بانتهاء العضوية"
@ -752,13 +788,25 @@ msgstr "تاريخ نهاية العضوية"
 msgid "Membership Type"
 msgstr "نوع العضوية"

+#. module: dev_membership
+#: model:ir.actions.server,name:dev_membership.cron_cancel2_dev_membership_reminder_ir_actions_server
+#: model:ir.cron,cron_name:dev_membership.cron_cancel2_dev_membership_reminder
+#: model:ir.cron,name:dev_membership.cron_cancel2_dev_membership_reminder
+msgid "Membership User Cancel Notify"
+msgstr ""
+
 #. module: dev_membership
 #: code:addons/dev_membership/models/dev_membership.py:0
+#: code:addons/dev_membership/models/dev_membership.py:0
+#: code:addons/dev_membership/wizard/renew_membership.py:0
+#: code:addons/dev_membership/wizard/renew_membership.py:0
+#: code:addons/dev_membership/wizard/renew_membership.py:0
 #, python-format
 msgid ""
 "Membership fees cannot be less than the default value in Setting of "
 "membrship type."
-msgstr "لا يمكن أن تكون رسوم العضوية أقل من القيمة الافتراضية في إعداد نوع العضوية."
+msgstr ""
+"لا يمكن أن تكون رسوم العضوية أقل من القيمة الافتراضية في إعداد نوع العضوية."

 #. module: dev_membership
 #: model:ir.model,name:dev_membership.model_membership_request_cancel_wizard
@ -781,7 +829,7 @@ msgstr "العضوية"
 #: model:ir.model.fields,field_description:dev_membership.field_res_partner__memebership_end_date
 #: model:ir.model.fields,field_description:dev_membership.field_res_users__memebership_end_date
 msgid "Memebership End Date"
-msgstr "تاريخ انتهاء العضوية"
+msgstr "تاريخ نهاية العضوية"

 #. module: dev_membership
 #: model:ir.model.fields,field_description:dev_membership.field_dev_membership__message_has_error
@ -796,6 +844,7 @@ msgstr ""
 #. module: dev_membership
 #: model:ir.model.fields.selection,name:dev_membership.selection__product_template__interval__month
 #: model:ir.model.fields.selection,name:dev_membership.selection__renew_membership__interval__month
+#: model:ir.model.fields.selection,name:dev_membership.selection__res_config_settings__interval__month
 msgid "Month"
 msgstr "شهر"

@ -805,15 +854,14 @@ msgid "My Activity Deadline"
 msgstr ""

 #. module: dev_membership
-#: model:ir.model.fields,field_description:dev_membership.field_cancellation_reason__name
 #: model:ir.model.fields,field_description:dev_membership.field_dev_membership__name
 #: model_terms:ir.ui.view,arch_db:dev_membership.view_res_partner_member_tree
 msgid "Name"
-msgstr "رقم العضوية"
+msgstr "سبب الالغاء"

 #. module: dev_membership
-#: model:ir.model.fields,field_description:dev_membership.field_product_product__nationality_id
-#: model:ir.model.fields,field_description:dev_membership.field_product_template__nationality_id
+#: model:ir.model.fields,field_description:dev_membership.field_product_product__nationality_ids
+#: model:ir.model.fields,field_description:dev_membership.field_product_template__nationality_ids
 #: model:ir.model.fields,field_description:dev_membership.field_res_partner__nationality_id
 #: model:ir.model.fields,field_description:dev_membership.field_res_users__nationality_id
 msgid "Nationality"
@ -822,17 +870,17 @@ msgstr "الجنسية"
 #. module: dev_membership
 #: model:ir.model.fields,field_description:dev_membership.field_dev_membership__activity_date_deadline
 msgid "Next Activity Deadline"
-msgstr "الموعد النهائي للنشاط التالي"
+msgstr ""

 #. module: dev_membership
 #: model:ir.model.fields,field_description:dev_membership.field_dev_membership__activity_summary
 msgid "Next Activity Summary"
-msgstr "ملخص النشاط التالي"
+msgstr ""

 #. module: dev_membership
 #: model:ir.model.fields,field_description:dev_membership.field_dev_membership__activity_type_id
 msgid "Next Activity Type"
-msgstr "نوع النشاط التالي"
+msgstr ""

 #. module: dev_membership
 #: model_terms:ir.ui.view,arch_db:dev_membership.form_membership_product
@ -886,11 +934,17 @@ msgstr ""
 msgid "Phone"
 msgstr "الهاتف"

+#. module: dev_membership
+#: code:addons/dev_membership/models/dev_membership.py:0
+#, python-format
+msgid "Please Check Membership Conditions in Type Of membership"
+msgstr "تفضل بالتحقق من شروط العضوية في نوع العضوية"
+
 #. module: dev_membership
 #: code:addons/dev_membership/models/dev_membership.py:0
 #, python-format
 msgid "Please Create Membership Invoice"
-msgstr "يرجى إنشاء فاتورة العضوية"
+msgstr ""

 #. module: dev_membership
 #: model_terms:ir.ui.view,arch_db:dev_membership.form_membership_product
@ -918,6 +972,11 @@ msgstr "قالب المنتج"
 msgid "Reason/Justification"
 msgstr "الاسباب/ المبررات"

+#. module: dev_membership
+#: model:ir.model.fields,field_description:dev_membership.field_cancellation_reason__name
+msgid "Reasone of Cancellation"
+msgstr ""
+
 #. module: dev_membership
 #: model_terms:ir.ui.view,arch_db:dev_membership.view_renew_membership_form
 msgid "Renew"
@ -934,7 +993,7 @@ msgstr "تجديد العضوية"
 #. module: dev_membership
 #: model:ir.model,name:dev_membership.model_res_partner
 msgid "Renter"
-msgstr "المستأجر"
+msgstr ""

 #. module: dev_membership
 #: model:ir.model.fields,field_description:dev_membership.field_membership_request_cancel_wizard__request_id
@ -1064,9 +1123,14 @@ msgstr ""
 #. module: dev_membership
 #: model:mail.template,subject:dev_membership.dev_membership_expired_mail_template
 msgid "Your membership ${(object.name)} Expired"
-msgstr "انتهت صلاحية عضويتك ${(object.name)}"
+msgstr ""

 #. module: dev_membership
 #: model_terms:ir.ui.view,arch_db:dev_membership.dev_res_partner_member_kanban_view
 msgid "at"
 msgstr "في"
+
+#. module: dev_membership
+#: model_terms:ir.ui.view,arch_db:dev_membership.cancell_view_tree
+msgid "cancell_tree"
+msgstr ""
--- a/odex25_sales/dev_membership/models/dev_membership.py
+++ b/odex25_sales/dev_membership/models/dev_membership.py
@ -124,14 +124,23 @@ class DevMembership(models.Model):
                self.to_date = self.from_date + relativedelta(days=+self.duration)

    def action_confirm_membership(self):
-        self.state = 'confirm'
+        if self.product_id.nationality_ids and self.product_id.age:
+            if self.partner_id.nationality_id in self.product_id.nationality_ids and self.product_id.age == self.partner_id.age:
+                 self.state = 'confirm'
+            else:
+                raise ValidationError(_('Please Check Membership Conditions in Type Of membership'))

+        else:
+            self.state = 'confirm'
    def action_active_membership(self):
        if not self.invoice_id and not self.is_free:
            raise ValidationError(_('Please Create Membership Invoice'))
        if self.invoice_id.payment_state not in ['paid','in_payment'] and not self.is_free:
            raise ValidationError(_('Membership Invoice is not paid.\nPlease Paid membership invoice and active the membership.'))
        self.state = 'active'
+        self.partner_id.product_id = self.product_id.id
+        if not self.partner_id.join_date:
+            self.partner_id.join_date = self.from_date

    def action_cancel_membership(self):
        self.state = 'cancel'
--- a/odex25_sales/dev_membership/models/product_template.py
+++ b/odex25_sales/dev_membership/models/product_template.py
@ -44,7 +44,7 @@ class ProductTemplate(models.Model):
    is_free = fields.Boolean(string="Is Free")
    nominee = fields.Boolean(string="Nominee")
    join_period = fields.Integer(string="Join Period")
-    nationality_id = fields.Many2one('res.country', string="Nationality")
+    nationality_ids = fields.Many2many('res.country', 'country_group_rel', 'devmember_id', 'country_id', 'Nationality')
    age = fields.Integer(string="Age", default=18)
    # Sale Description Override

--- a/odex25_sales/dev_membership/models/res_config_settings.py
+++ b/odex25_sales/dev_membership/models/res_config_settings.py
@ -52,10 +52,10 @@ class ResConfigSettings(models.TransientModel):
        string="Cancellation Reason",
        config_parameter='dev_membership.cancellation_reason'
    )
-
+    interval = fields.Selection(string="Interval", selection=([('days', 'Days'),('month', 'Month')]),default='days')

 class CancellReason(models.Model):
    _name = 'cancellation.reason'
    _description = 'Cancellation Reason'

-    name = fields.Char(string='Name')
+    name = fields.Char(string='Reasone of Cancellation')
--- a/odex25_sales/dev_membership/views/dev_membership.xml
+++ b/odex25_sales/dev_membership/views/dev_membership.xml
@ -78,7 +78,7 @@
                            <field name="product_id"
                                   context="{'form_view_ref': 'dev_membership.form_membership_product'}"
                                   attrs="{'readonly': ([('state', '!=', 'draft')])}"/>
-                            <field name="membership_fees"/>
+                            <field  attrs="{'readonly': ([('state', '!=', 'draft')])}" name="membership_fees"/>
                        </group>
                        <group>
                            <field name="date" attrs="{'readonly': ([('state', '!=', 'draft')])}"/>
@ -92,8 +92,8 @@
                            </div>
                            <label for="duration" string="Membership Duration"/>
                            <div class="address_format">
-                                <field name="duration" style="width: 48%; font-size:13px;"/>
-                                <field name="interval"
+                                <field name="duration"  attrs="{'readonly': ([('state', '!=', 'draft')])}" style="width: 48%; font-size:13px;"/>
+                                <field name="interval"  attrs="{'readonly': ([('state', '!=', 'draft')])}"
                                       style="width: 48%; padding:3px; font-size:13px;"/>
                            </div>
                            <field name="user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
@ -109,7 +109,7 @@
                        <field name="description" attrs="{'readonly': ([('state', '!=', 'draft')])}"/>
                        <group attrs="{'invisible': ([('state', '!=', 'cancel')])}">
                            <group string="Membership Cancellation Reasones">
-                                <field name="cancel_reasone"/>
+                                <field readonly='1' name="cancel_reasone"/>
                            </group>
                        </group>
                    </div>
--- a/odex25_sales/dev_membership/views/product_template.xml
+++ b/odex25_sales/dev_membership/views/product_template.xml
@ -75,7 +75,7 @@
                    </div>
                    <group>
                        <group string="Membership Terms">
-                            <field name="nationality_id"/>
+                            <field widget="many2many_tags" name="nationality_ids"/>
                            <field name="age"/>
                        </group>
                        <group string="Nomination for Membership">
--- a/odex25_sales/dev_membership/views/res_config_settings.xml
+++ b/odex25_sales/dev_membership/views/res_config_settings.xml
@ -18,6 +18,8 @@
                                </div>
                                <div class="text-muted content-group mt16">
                                    <field name="days_before" class="text-left oe_inline"/>
+                                    <field name="interval"  readonly="1"
+                                           style="width: 48%; padding:3px; font-size:13px;"/>
                                </div>
                            </div>
                        </div>
@ -32,6 +34,8 @@
                                </div>
                                <div class="text-muted content-group mt16">
                                    <field name="days_before_second" class="text-left oe_inline"/>
+                                    <field name="interval"  readonly="1"
+                                           style="width: 48%; padding:3px; font-size:13px;"/>
                                </div>
                            </div>
                        </div>
@ -87,7 +91,8 @@
                                </div>
                                <div class="text-muted content-group mt16">
                                    <field name="post_expiry_period"/>
-                                </div>
+                                    <field name="interval"  readonly="1"
+                                           style="width: 48%; padding:3px; font-size:13px;"/>                                </div>
                                <div class="text-muted content-group mt16">
                                    <field name="cancellation_reason"/>
                                </div>
@ -109,12 +114,20 @@
        <field name="target">inline</field>
        <field name="context">{'module' : 'dev_membership', 'bin_size': False}</field>
    </record>
-
+<record id="cancell_view_tree" model="ir.ui.view">
+    <field name="name">cancell_view_tree</field>
+    <field name="model">cancellation.reason</field>
+    <field name="arch" type="xml">
+        <tree string="cancell_tree">
+            <field name="name"/>
+        </tree>
+    </field>
+</record>
    <record id="action_dev_membership_config_refuse_resone" model="ir.actions.act_window">
        <field name="name">Cancell Resone</field>
        <field name="type">ir.actions.act_window</field>
        <field name="res_model">cancellation.reason</field>
-        <field name="view_mode">form,tree</field>
+        <field name="view_mode">tree,form</field>
    </record>

    <!--Menu-->
--- a/odex25_sales/dev_membership/wizard/renew_membership.py
+++ b/odex25_sales/dev_membership/wizard/renew_membership.py
@ -76,7 +76,8 @@ class RenewMembership(models.TransientModel):
        new_membership = mem_pool.create({
            'partner_id':self.membership_id.partner_id and self.membership_id.partner_id.id or False,
            'product_id':self.product_id and self.product_id.id or False,
-            'membership_fees':self.product_id.list_price or 0.0,
+            'membership_fees':self.membership_fees or 0.0,
+            'duration':self.duration or 0.0,
            'from_date':self.from_date or False,
            'description':self.product_id and self.product_id.description or '',
        })