From dddbe009cc32ec8560b68039bdea1bcad13db43e Mon Sep 17 00:00:00 2001
From: Abdurrahman Saber <a.saber@odex.sa>
Date: Mon, 14 Jul 2025 07:53:00 +0300
Subject: [PATCH] [IMP][FIX] ensan_sale_management: use partner phone number
 instead of orders, attribute error in sms.composer

---
 .../static/description/icon.png               | Bin 2648 -> 1361 bytes
 .../models/sale_order.py                      |  10 ++++++----
 .../models/sms_composer.py                    |   2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/odex25_donation/ensan_donation_request/static/description/icon.png b/odex25_donation/ensan_donation_request/static/description/icon.png
index f39f480a1644cda0de25c0270842a5a271c346f1..132af11edb9e8892c3e9bfa4367c5d6ac968ff47 100644
GIT binary patch
literal 1361
zcmV-X1+MyuP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1m;OZK~#7F?VW*f
z)G!c5_ZSLDIxrOwD&VL9s34&NLIrnJkWc~XAW(si3V;fH9gq$_5>h5NA(nP+S<>12
zW_B`@oTSaJB(J5Fj!01yMNt$*QIw^zq9X#piTUx-$l6Hb#q!I@-pF?&yVYv750t+!
z^75b#%bl;omjBjQez6$CHAY(S`D)8NDt~3<&yezq#u(zGz;KV*co|aOmbs)Q<BeCE
z4J{G4o?i=-jf5&6!f^BNPa`K(2lgTTYKn*RGpZ9i>}xT;#p?2vCZM_z;Cp{Zb#iJ(
z!5t-}#u4z2@tM7mH%3m4yfE^?|BlPf$R}Uk%6n${`A0>F$NL@J3)NF)w}^AuQ})Ey
z9ipYVgLusTE>ixirw;qOvq;%>r0rU##&kps0A?MJoe(v?FL#on{i6nPSkcje6IjOQ
zwoh{h@p*VHsOwB<{EJB2e`xMt#6x&wyG0(tHHM)-B7bj;v?-n7>uTv?dAg79G<U#w
z5PE)6B5YmEHXB+3;II9UULJs3`_IzW(EzuB!rnZgfe4Imb!lixn1A>Ze6C0c+zuI+
zWp2!Xx3q8%d*cMMjh-znnbb~D;}0N}6V&)4Fb2667;p1L`Hi6bmX!Z7hPe?K@$#UY
zWPkaFlzxOxIQOE)PYL*Mt`d^HS<fE0<%*O}uyxgx1W-Q-ouI}a3fz)Khv9V49MEx$
za6+fXPs9KxbZY#>2%MnCp9+Q()c8|_5qUvMBK%0W!9!X~TWil3C+EVYg}fz~!`aYu
z?7jRuyR}-acC=*RUVJ3GNU7<JTu=t!QWURzn}^exeQCRe%O7ee7fAo=KZXtyIRehG
zoj{isIh=vAJ-?4+XSd)wSc`GAn8F!w542iIk(M%cIpZnpG}TZFz)#&M#hA2|a|}NM
z8-ta~!bwf6J$AOkUYs@pH-+8MbZ606=gOjCsC6YB2QN6M7~z(lZ^>O%Fg15Zr_;~}
zMmxYXko=&ZH<BHB7e-za?|sAG5%DHcZ$rE!++>WlPi&&2iNV8LEr)fWo^#0Odz*=I
zcA$ry?pi_lZ#0%z3zP})(o))<vKz?gy(a?v42v}Rq_I{gBjEME^}*+d#P=O~7VY2`
z`nYh8+p_-YAe0frPcd3r|Jfn&eT$x6E39uzsfe{inE|gyOYR1`=Q_}48RPrLgHUF`
z8wC=g_X2^x4t7haiM2=t!1#5Wdpg7qZ*$kdY+dPJ>SC>u5Y$79NR$G8^weRh713DB
zBm{ME&CoM%xEW9+2nj)1Sogr8M7SAHCI|^ZIXdv}izpZI^e7aBgrE#97}Er5Grm_U
z2nj)cu89dshMNJUf{+m8Lv-&aN{5>P#e$F!OwWBDkmQz>4YTeJx$}!+8qtx1TEfkM
zg0po1Y6>?4O3u;&s4?Q{QFL|=I2z-7W#{OC`ohhCva@mk_<2qpYB;<X(~^z^$i4)k
zLoMm-F-@sr;P!;qknNCV4L6_DNNRV&06ygW4jE2r;+~enXJh>FxjX_m4w(N{jSg%4
zEoFw|fUG^D5Jik{i8{ca&H6&~rI_(8ti(|~+$=k%W1jZ#->1@t|5#TS`>*Y=na6V&
z2|IF;&Z`<uUJf~?+L#|(a$g5{3?pJsuDAatm%_dyMNt$*Q4~c{6h%=KMJd2vI|eC9
T7wYV(00000NkvXXu0mjf`OAXg

literal 2648
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
YTK-#RxQO+bqZtwyUNzHwsqGZ~H`%<9TL1t6

diff --git a/odex25_donation/ensan_sale_management/models/sale_order.py b/odex25_donation/ensan_sale_management/models/sale_order.py
index af69918a8..b2c78a127 100644
--- a/odex25_donation/ensan_sale_management/models/sale_order.py
+++ b/odex25_donation/ensan_sale_management/models/sale_order.py
@@ -21,12 +21,14 @@ class SaleOrder(models.Model):
     def write(self, vals):
         if 'order_mobile_number' in vals:
             vals['order_mobile_number'] = self.phone_format(vals['order_mobile_number'])
-            numbers = set(self.search([('state', '=', 'sale'), ('id', 'not in', self.ids)]).mapped('order_mobile_number'))
+            orders = self.search([('state', '=', 'sale'), ('id', 'not in', self.ids)])
+            numbers = set(orders.mapped('order_mobile_number'))
             if vals['order_mobile_number'] in numbers:
                 vals['is_first_time'] = False
+                self |= orders.filtered(lambda o: o.order_mobile_number == vals['order_mobile_number'])
             else:
                 vals['is_first_time'] = True
-        return super().write(vals)
+        return super(SaleOrder, self).write(vals)
     
     def get_sale_order_portal_url(self):
         for sale in self:
@@ -120,11 +122,11 @@ class SaleOrder(models.Model):
     
     def action_recovery_sms_send(self):
         self.ensure_one()
-        if not self.order_mobile_number:
+        if not (self.partner_id.phone or self.partner_id.mobile):
             raise UserError(_("There is no phone number for this cart."))
 
         context = dict(self.env.context)
-        context.update(default_res_model='sale.order', default_res_id=self.id, default_composition_mode='comment', default_number_field_name='order_mobile_number')
+        context.update(default_res_model='res.partner', default_res_id=self.partner_id.id, default_composition_mode='comment')
 
         template = self.website_id.cart_recovery_sms_template_id
 
diff --git a/odex25_donation/ensan_sale_management/models/sms_composer.py b/odex25_donation/ensan_sale_management/models/sms_composer.py
index e2b21028f..18579c044 100644
--- a/odex25_donation/ensan_sale_management/models/sms_composer.py
+++ b/odex25_donation/ensan_sale_management/models/sms_composer.py
@@ -7,7 +7,7 @@ class SMSComposer(models.TransientModel):
 
     def _action_send_sms(self):
         context = self._context
-        if context.get('website_sale_send_recovery_sms') and self.model == 'sale.order' and context.get('active_ids'):
+        if context.get('website_sale_send_recovery_sms') and self.res_model == 'res.partner' and context.get('active_ids'):
             self.env['sale.order'].search([
                 ('id', 'in', context.get('active_ids')),
                 ('cart_recovery_sms_sent', '=', False),