From a901bf68460d48147cceb95203e682ac3e880c32 Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 11 Aug 2024 13:55:20 +0300
Subject: [PATCH 1/5] Update res_partner.py

---
 odex25_sales/membership_card_odoo/models/res_partner.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/odex25_sales/membership_card_odoo/models/res_partner.py b/odex25_sales/membership_card_odoo/models/res_partner.py
index 9e753478d..0e9c9fcc6 100644
--- a/odex25_sales/membership_card_odoo/models/res_partner.py
+++ b/odex25_sales/membership_card_odoo/models/res_partner.py
@@ -44,6 +44,10 @@ class ResPartner(models.Model):
         if self.is_member or partner_id.member_lines:
             data = {
                 'name': partner_id.name,
+                'product_id': partner_id.product_id.name,
+                'membrship_level':partner_id.membrship_level.name,
+                'membrship_level_color':partner_id.membrship_level.color,
+                'membrship_no':partner_id.membrship_no,
                 'image': partner_id.image_1920,
                 'phone': partner_id.phone,
                 'function': partner_id.function,

From c74bdec0f9fc276075cb37148e1587e8cd5062ee Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 11 Aug 2024 13:56:43 +0300
Subject: [PATCH 2/5] Update res_partner.py

---
 odex25_sales/dev_membership/models/res_partner.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/odex25_sales/dev_membership/models/res_partner.py b/odex25_sales/dev_membership/models/res_partner.py
index 9cd8ec49a..b32e5338f 100644
--- a/odex25_sales/dev_membership/models/res_partner.py
+++ b/odex25_sales/dev_membership/models/res_partner.py
@@ -23,6 +23,7 @@ class PartnerExtended(models.Model):
     nationality_id = fields.Many2one('res.country', string="Nationality")
     is_membership_expire = fields.Boolean('Expire Membership',store=True, compute='check_active_membership')
     memebership_status = fields.Char('Membership Status', compute='check_memebership_status')
+    membrship_no = fields.Char('Membership Number')
     birth_date  = fields.Date(string='Birth Date')
     join_date  = fields.Date(string='Join Date')
     memebership_end_date  = fields.Date(string='Memebership End Date',store=True,related='active_membership_id.to_date')

From 4cbfbb464b86ce22d3e65d03dc90a8c1df0e9a7b Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 11 Aug 2024 13:59:34 +0300
Subject: [PATCH 3/5] Update partner_extended.xml

---
 odex25_sales/dev_membership/views/partner_extended.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/odex25_sales/dev_membership/views/partner_extended.xml b/odex25_sales/dev_membership/views/partner_extended.xml
index 46f940ee3..a7e116ea6 100644
--- a/odex25_sales/dev_membership/views/partner_extended.xml
+++ b/odex25_sales/dev_membership/views/partner_extended.xml
@@ -14,6 +14,7 @@
                 <field name="company_id" groups="base.group_multi_company" readonly="1"/>
                 <field name="join_date" optional="show"/>
                 <field name="membrship_level" optional="hide"/>
+                 <field name="membrship_no" optional="hide"/>
                 <field name="memebership_end_date" optional="show"/>
 
                 <field name="product_id" optional="show"/>
@@ -50,6 +51,8 @@
                 <field name="join_date"/>
                 <field name="memebership_end_date"/>
                 <field name="membrship_level"/>
+                 <field name="membrship_no"/>
+
                 <field name="category_id" widget="many2many_tags"/>
 
                 <field name="image_128"/>
@@ -123,6 +126,8 @@
                                         <field name="memebership_status"/>
                                     </b><br/><b style="color:#7C7BAD">
                                         <field name="membrship_level"/>
+                                    </b><br/><b style="color:#7C7BAD">
+                                        <field name="membrship_no"/>
                                     </b>
                                 </span>
                                 <div class="o_row">
@@ -162,7 +167,9 @@
                 <field name="gender"/>
                 <field name="nationality_id"/>
                 <field name="birth_date"/>
-                <field name="age"/><field name="membrship_level"/>
+                <field name="age"/>
+                <field name="membrship_level"/>
+              <field name="membrship_no"/>
             </xpath>
             <xpath expr="//field[@name='function']" position="after">
                 <field name="employer"/>

From 8959c9dec00a8223780c18c0d621df19097a1c3e Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 11 Aug 2024 13:59:52 +0300
Subject: [PATCH 4/5] Update membership_level.xml

---
 odex25_sales/dev_membership/views/membership_level.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/odex25_sales/dev_membership/views/membership_level.xml b/odex25_sales/dev_membership/views/membership_level.xml
index cb2b03b0f..c983de070 100644
--- a/odex25_sales/dev_membership/views/membership_level.xml
+++ b/odex25_sales/dev_membership/views/membership_level.xml
@@ -10,8 +10,6 @@
                 <field name="years"/>
                 <field name="min"/>
                 <field name="max"/>
-                <field name="max"/>
-
                 <field widget='color' name="color"/>
             </tree>
         </field>

From aae8ec0d5d307293d768c26bcd0b7fb02c32030f Mon Sep 17 00:00:00 2001
From: zainab2097 <149927291+zainab2097@users.noreply.github.com>
Date: Sun, 11 Aug 2024 14:00:33 +0300
Subject: [PATCH 5/5] Update res_partner.py

---
 odex25_sales/dev_membership/models/res_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_sales/dev_membership/models/res_partner.py b/odex25_sales/dev_membership/models/res_partner.py
index b32e5338f..5d0b17c18 100644
--- a/odex25_sales/dev_membership/models/res_partner.py
+++ b/odex25_sales/dev_membership/models/res_partner.py
@@ -84,7 +84,7 @@ class PartnerExtended(models.Model):
                     partner.memebership_status = 'Membership Expire'
                 else:
                     if partner.active_membership_id:
-                        partner.memebership_status = 'Membership : ' + partner.active_membership_id.name
+                        partner.memebership_status = 'Membership : ' + partner.active_membership_id.product_id..name
                     else:
                         # البحث عن حالة الاشتراك الأخيرة
                         last_membership = self.env['dev.membership'].search([('partner_id', '=', partner.id)],