From 4c9baf95e0d7ece9365f6319fddebcb8f3303351 Mon Sep 17 00:00:00 2001
From: Flatlogic Bot <support@flatlogic.com>
Date: Sun, 25 Jan 2026 15:15:04 +0000
Subject: [PATCH] Autosave: 20260125-151503

---
 core/__pycache__/admin.cpython-311.pyc        | Bin 8216 -> 8317 bytes
 .../whatsapp_utils.cpython-311.pyc            | Bin 8673 -> 11229 bytes
 core/admin.py                                 |   3 +
 core/whatsapp_utils.py                        |  75 ++++++++++++++++--
 4 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/core/__pycache__/admin.cpython-311.pyc b/core/__pycache__/admin.cpython-311.pyc
index 7a8440bb3b7c597e0a04030a72981956411b63ad..3c03fa2b607964de08f138352aab9567f6385508 100644
GIT binary patch
delta 825
zcmZvZ&rj1(9KieSM%QlZR@??`WU(1WoJJBAg~S+_s0c(56cmcF%=K+)(rx5*L*#@B
ziI{luT`<v`@kb;vrUyLx2Ovfcq#isN^@`Dp2NU1x5RCC9{q+0$`@Y||ocooNpUQHO
zqvvCK)_ng;UK2thQ|bB60r?_Km3SjyLXqb=<TJ!4z;Q3=*EojcS%d#rLl5~PU-WDK
zC9ViYcu~}vJV~aKU_=%<Enq|`MMI%%)MzI60_~l9kfeups>igj(c)z$79~wy;^sh$
zT;{T^WG(RgKw>0+tBfi&^-Q%=G)r}yubI_K7TgG`<ZoC=pK17=S@9DH=V{gXPO=_|
z6FV4#!_J-HOMpJo6TWn$pZZ*X9b2{=D%9;-wX8D*4^q4Br%+XO0cWUyFHp><y)tWI
z3643N;kP`DlV{PRFho8?lL{+_2N-%8CWv3j2p3seqkB$?!AWOK`OFJrEMVL@9rJ@Q
z%_0txYE&g=Tn=6FTntyq?RaN?f{LzmZmxi4*pzsZ={~!LvBrX?7={?GF(?$-CcJx<
zX=-o*;p_BoH&M`uRJAeE2vz6zc_ZZ%A%x0#)6!>6baUA0O1$QwpL}f{hY~r}rbC%L
zYFiPjG$ZT7ePlG5>fUW)QL`%*O=KB1s%@|DPqXd)Vb(0ennk-xsHX2k*U6hCPTACr
z*;9Fo#%yhv-4B<^aH_kNWxKMj7p%N(7m#J?dKT~?d5}uO7+Fn?HfP>R9UD@|W;njy
zlHKz0`^nE#kC=!w3kw5Vs?*y($-`aee)=(-m<C90asTJ?@s0LF-#q7!zeCRYh_!d+
EH=88QEdT%j

delta 727
zcmZvYO=uHQ5XawazIL<Oc562@*$`cdP@_FasnTOFX$>uv+Sb}FWeIs332v)-8)GS=
zMS{eu?@~eWB6_eOvKJ4YJ&8r|l!HRi-h_&R7X{~SE3M$b{@%=+|C`yF-=iC&+A~c{
z611|>tTkV1@8W7gglOMC6TTB)yq%DU8=>-3AmllIdq$OqQdO!(>}Z=*fhJqB9Sc1b
zy*N#^h@GGsQl?!<C9Ki?Zw*&*!q%c9)iF}{ixb*or>GIu>(yI|t+mN2*j+QEknR|~
zt{eAd9=w*f0mk^_<RF|3-X>oF6#3261sLaBslIFpYxz-xWm)U2A00M<Sj*${v~t;P
zIM<oypAPccmISl>YxfXLa!b$Z<3f5)U_@Y^m-K#^!Zs$qs~>@p;DP={iqDALY|!eB
z0yzAhF{I9gHv$*=8)Kk6k8VdPu2$S@joQ@}c1gq$zromo5ZMBg0*eAVq7Y*T%^kex
zfXkNf^kWE|!?N}UIgjDmaU8@{-Q{x4bDA~x#zf$!Ur9LqU}g>|zmsvm<J+0d=@nEL
zBCLo<M-zirYpzFqx8bv+B6Yay6(Ld%1mPC{cHduPoqx&>0OJXhnGE%8Oh7D`O$ms<
zV;<+`a9<tWj^;QOuk8C3*Yg~w0IbA6nt2%JzszaAoI4?Rt3C1c(ykdi$}LFH4u0mJ
ez}Y2$>@N8~H_m*>o%$9ge;k(FlKA^$n|}bg%&oit

diff --git a/core/__pycache__/whatsapp_utils.cpython-311.pyc b/core/__pycache__/whatsapp_utils.cpython-311.pyc
index 523cb2d588668597cacb5b2d05619cb15e640509..44c265ef34167de1a580aaeb984fc4894131205e 100644
GIT binary patch
delta 4297
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

delta 1801
zcma)6TWAzl7(Qq2yR(;xS(8n&N!HEHv6`whN^8;}Mh$3VOw=|(jGLWFvLU-0&#b1F
z_443@g+i<6MF{~5Vk_F4`%+5Zn${LdF=Zdhh!kHczLbD3ZK2TrpUuW<OX<&?Z~ogk
zbH4xla~{0@a98MqV9-xMZdRX4?~PpwMd|rV9UIPxmNX-0lu?Bef!K6f#T*n{yFm%L
z1*0sZK1;qpM*Wros9P#vz|sJNmJcvw`2oY04ro|(n3#dbIB~$FuIAYJd^$VnJjT_)
z5gwdL<|lG2Ggy@AF;T&fGP#(R5>##k-B)~1o)p%_Ky}wTcGeo3n@Z-L<m~KN#&(?K
zq|I6(*2$w<FAWvn(7vF2$R87p+g1F8e~zx<kNx{-HSf~5+mV7gPpq{I;<I!pu>`B8
zpg>Gn5GRCTVo6r5XGaUcd9omRKEbMcCZ~QSBQPC;4R``8H1H*TM2(eWd`lo%*LWs;
zHVkWe?>Rb0-V{g395tJYw*u{yYW&CGZfPCNFYXKV(5eV%u9VI~O^`oZ%ddt{v{!>_
z8Z3?;%yq?#Gs$Yuj3U$`)bY(mi?SKjEqugS-`N1FV*tdT6NdF<%@x>&c}vAlj7};U
zjdHvwuenKwqI-JCS1(2Sd}L9hpfCEW`WnT>dI9wqMZIxnGZ<g@_yE6ARmAWn#2$aY
zB;HlG?(G%tzD!Z?mHVa3ky>Fh<?l8e<kOJ?kHtd#MxvDu#QgBC=8qDF9}1;H$7pYL
z^ZPYB_@>&cYCY_3kLl-kqKC(I+%h`KrNE;%MOT?kvXnjJ2Arw%?5xekvdN6?)yWYd
z1IT-X-P&v}pPo29hG`i)n;%OtJDImFb_B96z;He%{G+<L{t(f^7f-!&_R8rc)hwyz
zGNJM?{cz%Tw$#~I>O5GsAB0=49l3t2)V8D4*8gqCQh2Bo9=fLu{iGWgyI32n$7!TS
z$RgukH(FAGOl#ou1X@KdP;5Ey;wCFzwLq@<`1=isICP$NM$CsRK|&za`*G1z5cy{<
zwR8vnt|h_Snxgzr)2QNAW<USEY3I4uAZNhT*#NxR0fa$>A%uUaq8ns(%1)oE6mJ;v
z+|a6Tb}E;(O^F@C>4!0<S85H7=mu63!Ez*sE7)-?#ve5|>PNx848!?_@Nm4BZ#5%)
zJid|lu1m}1GVN@y5&E%A$9YfUOCyi%z9Pt(|D32-EE)Pj;dfgKHqr!cu9`|RmbTgR
z{BZMSk{<hK`-P1_)D%4`u5PiXockc~v|;%D)|h@AT-VWkhj5{7e%k}7?n-;9{>4wL
zm!z(e)OD}&csx?8S0qf4Vc@|&`Hk?A_V0~+5R4T8QYzOwfRqHJWd5WhH&rI3l~3q@
zFc8Xz;cZ%gbt_FCsWf>$nLp`_rKXZuxFp9R<6{`k+x*Y<&Vm2tVOFtMAlFrAa+8yA
zTeEJobZZ)x%5|o4*$IZsTqTpU>=}p2{QQQxe!RKLcUCKE-tB@v7Q^#r#}RNBH;Gp(
z?~nXL>xLyx&e*TAG=#8x&JX<IhV8ujg<VJYQyO0;f5W3ffL1M&Rfrk1cbTk0t46mi
OlU0bQX#Nwt&;JF-xT5+1

diff --git a/core/admin.py b/core/admin.py
index 2831ec9..45b972e 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -33,6 +33,9 @@ class PlatformProfileAdmin(admin.ModelAdmin):
         (_('Policies'), {
             'fields': ('privacy_policy', 'terms_conditions')
         }),
+        (_('Payment Configuration'), {
+            'fields': ('enable_payment',)
+        }),
         (_('WhatsApp Configuration (Wablas Gateway)'), {
             'fields': ('whatsapp_access_token', 'whatsapp_app_secret', 'whatsapp_business_phone_number_id'),
             'description': _('Configure your Wablas API connection. Use "Test WhatsApp Configuration" to verify.')
diff --git a/core/whatsapp_utils.py b/core/whatsapp_utils.py
index 14ba968..2b4de8f 100644
--- a/core/whatsapp_utils.py
+++ b/core/whatsapp_utils.py
@@ -2,6 +2,8 @@ import requests
 import logging
 import json
 from django.conf import settings
+from django.core.mail import send_mail
+from django.utils.translation import gettext_lazy as _
 from .models import PlatformProfile
 
 logger = logging.getLogger(__name__)
@@ -95,10 +97,8 @@ def send_whatsapp_message_detailed(phone_number, message):
         "message": message,
     }
     
-    # Note: User's example didn't add 'secret' to payload, only to header.
-    # We will stick to user's example strictly.
-
     try:
+        logger.info(f"Attempting to send WhatsApp message to {clean_phone} via {url}")
         # Use data=data for form-urlencoded
         response = requests.post(url, headers=headers, data=data, timeout=15)
         
@@ -130,7 +130,7 @@ def send_whatsapp_message_detailed(phone_number, message):
         return False, error_msg
 
 def notify_shipment_created(parcel):
-    """Notifies the shipper that the shipment request was received."""
+    """Notifies the shipper that the shipment request was received via WhatsApp and Email."""
     shipper_name = parcel.shipper.get_full_name() or parcel.shipper.username
     message = f"""Hello {shipper_name},
 
@@ -139,21 +139,54 @@ Tracking Number: {parcel.tracking_number}
 Status: {parcel.get_status_display()}
 
 Please proceed to payment to make it visible to drivers."""
+    
+    # WhatsApp
     if hasattr(parcel.shipper, 'profile') and parcel.shipper.profile.phone_number:
-        return send_whatsapp_message(parcel.shipper.profile.phone_number, message)
-    return False
+        send_whatsapp_message(parcel.shipper.profile.phone_number, message)
+    else:
+        logger.warning(f"No phone number found for shipper {shipper_name}, skipping WhatsApp.")
+
+    # Email
+    if parcel.shipper.email:
+        try:
+            send_mail(
+                subject='Shipment Request Received - ' + parcel.tracking_number,
+                message=message,
+                from_email=settings.DEFAULT_FROM_EMAIL,
+                recipient_list=[parcel.shipper.email],
+                fail_silently=False
+            )
+            logger.info(f"Shipment created email sent to {parcel.shipper.email}")
+        except Exception as e:
+            logger.error(f"Failed to send shipment created email to {parcel.shipper.email}: {e}")
+    
+    return True
 
 def notify_payment_received(parcel):
-    """Notifies the shipper and receiver about successful payment."""
+    """Notifies the shipper and receiver about successful payment via WhatsApp and Email."""
     # Notify Shipper
     shipper_name = parcel.shipper.get_full_name() or parcel.shipper.username
     shipper_msg = f"""Payment successful for shipment {parcel.tracking_number}.
 Your shipment is now visible to available drivers."""
     
+    # WhatsApp Shipper
     if hasattr(parcel.shipper, 'profile') and parcel.shipper.profile.phone_number:
         send_whatsapp_message(parcel.shipper.profile.phone_number, shipper_msg)
     
-    # Notify Receiver
+    # Email Shipper
+    if parcel.shipper.email:
+        try:
+            send_mail(
+                subject='Payment Successful - ' + parcel.tracking_number,
+                message=shipper_msg,
+                from_email=settings.DEFAULT_FROM_EMAIL,
+                recipient_list=[parcel.shipper.email],
+                fail_silently=False
+            )
+        except Exception as e:
+            logger.error(f"Failed to send payment email to {parcel.shipper.email}: {e}")
+
+    # Notify Receiver (WhatsApp only usually, but good to have logic if email exists in future)
     receiver_msg = f"""Hello {parcel.receiver_name},
 
 A shipment is coming your way from {shipper_name}.
@@ -169,6 +202,19 @@ Status: {parcel.get_status_display()}"""
     
     if hasattr(parcel.shipper, 'profile') and parcel.shipper.profile.phone_number:
         send_whatsapp_message(parcel.shipper.profile.phone_number, msg)
+        
+    if parcel.shipper.email:
+        try:
+            send_mail(
+                subject='Driver Assigned - ' + parcel.tracking_number,
+                message=msg,
+                from_email=settings.DEFAULT_FROM_EMAIL,
+                recipient_list=[parcel.shipper.email],
+                fail_silently=True
+            )
+        except Exception:
+            pass
+
     send_whatsapp_message(parcel.receiver_phone, msg)
 
 def notify_status_change(parcel):
@@ -178,4 +224,17 @@ New Status: {parcel.get_status_display()}"""
     
     if hasattr(parcel.shipper, 'profile') and parcel.shipper.profile.phone_number:
         send_whatsapp_message(parcel.shipper.profile.phone_number, msg)
+    
+    if parcel.shipper.email:
+        try:
+            send_mail(
+                subject='Shipment Update - ' + parcel.tracking_number,
+                message=msg,
+                from_email=settings.DEFAULT_FROM_EMAIL,
+                recipient_list=[parcel.shipper.email],
+                fail_silently=True
+            )
+        except Exception:
+            pass
+
     send_whatsapp_message(parcel.receiver_phone, msg)
\ No newline at end of file