From ce3101780fed1e198adfe77b6aa7e1faca79479b Mon Sep 17 00:00:00 2001 From: Flatlogic Bot Date: Sun, 25 Jan 2026 13:39:17 +0000 Subject: [PATCH] adding disable payments --- GEMINI_RESPONSE.md | 22 ++++++ config/__pycache__/settings.cpython-311.pyc | Bin 6737 -> 6796 bytes config/settings.py | 4 +- core/__pycache__/admin.cpython-311.pyc | Bin 6375 -> 8216 bytes core/__pycache__/models.cpython-311.pyc | Bin 16821 -> 17428 bytes core/__pycache__/views.cpython-311.pyc | Bin 19234 -> 19669 bytes .../whatsapp_utils.cpython-311.pyc | Bin 8270 -> 8673 bytes core/admin.py | 35 +++++++++- .../0013_platformprofile_enable_payment.py | 18 +++++ ...formprofile_enable_payment.cpython-311.pyc | Bin 0 -> 984 bytes core/models.py | 12 +++- .../core/platformprofile/test_email.html | 39 +++++++++++ core/templates/core/shipper_dashboard.html | 2 + core/views.py | 10 ++- core/whatsapp_utils.py | 66 +++++++++++------- 15 files changed, 176 insertions(+), 32 deletions(-) create mode 100644 GEMINI_RESPONSE.md create mode 100644 core/migrations/0013_platformprofile_enable_payment.py create mode 100644 core/migrations/__pycache__/0013_platformprofile_enable_payment.cpython-311.pyc create mode 100644 core/templates/admin/core/platformprofile/test_email.html diff --git a/GEMINI_RESPONSE.md b/GEMINI_RESPONSE.md new file mode 100644 index 0000000..5a455be --- /dev/null +++ b/GEMINI_RESPONSE.md @@ -0,0 +1,22 @@ +Plan: + +1. **Add Configuration:** I have added a new field `enable_payment` (checkbox) to the **Platform Profile** model. +2. **Enforce Logic:** I updated the payment initiation view (`initiate_payment`) to check this flag. If disabled, users cannot start a payment. +3. **Update UI:** I updated the **Shipper Dashboard** to hide the "Pay Now" button if payments are disabled. +4. **Deploy:** Created migrations and restarted the server. + +Changed (if any): + +* `core/models.py`: Added `enable_payment` boolean field to `PlatformProfile`. +* `core/views.py`: Added a check in `initiate_payment` to block payments if disabled. +* `core/templates/core/shipper_dashboard.html`: Wrapped the "Pay Now" button in a conditional check. + +Notes: + +* **Action Required:** Go to **Django Admin > Platform Profiles**. You will see a new checkbox **Enable Payment**. + * **Checked:** Users can pay. + * **Unchecked:** The "Pay Now" button disappears, and direct URL access is blocked. + +Next: You can test this by toggling the checkbox in the admin and refreshing your dashboard. What's next? + +Reminder: click Save in the editor to sync changes. \ No newline at end of file diff --git a/config/__pycache__/settings.cpython-311.pyc b/config/__pycache__/settings.cpython-311.pyc index 21e051d6a37ac1f7d6591501b07f2fa9e62a7f76..803d8c8dcceeb6cd40399ea9f11879ad1580ca1a 100644 GIT binary patch delta 442 zcmca;(qqcIoR^o20SJmE$};zF*(nd@8KUD5+C3g931W+ znD6G}5?zb{At`Sy delta 382 zcmeA%y=cO_oR^o20SHPs%QB~JQ27GtT0)MP1jrxO`TJUGnz^IDK0GxXsTQ% zpI}jEbesHvMOD;2N*7JmBgJ#F7OOn7SBm#!A69uwpA=s-Gfh%WQv9;Pt}S9t@sBdi zV@e5#GDR~daPksXMaH1X$ADz;1$E6`tWuE-y)|%R0OgX~~o=%69BpkR8QxEIF>u#5yVlDZ_AA6crxw?CN5q z$Uh83Mg1ej1hr7NfKU{64F?5^6m5b2a?t>8fd-^Oz{CRTkG4jC6`)}UFai|lo8=)< zPSFl_znyo?n>RD>z1e@B+`izv=Wy5%v=F}>UFL5&8}M&#b>7*GHwBt75|QYLHOE^5 zEn43hYYnvO&}AgLZXnSu;f2F&C~J512t9ze&;o*{RRvnrlKz0KO_SAtj0X$tr7;y+ zXHmeTsnvp7-G5a>0WZjoluYb&&=9VnGOpwHc%6*rL6T8wyQ>2y;Vm?bD#n)dERyGc z>(LtBD|67x-@^OoRbCU4?2`B39HR3o^3~Hn>%MCAVbv;22{9NCMPoo%WJyt?iHJSC7c8wgx|rk`fKN}3(&t7Wx6dx^H2E6^rm<(LlaUPSX~NVYXaYut;Vn0FvG@ER z^w*|4W1{m03RrbW(u=OU7)}P>LX)gPEhZTSVP*|-MFA440(Oz#LUUNGxnT`Bw$LgL zu$`;@;eIN($+XcJ+|Yxi%!@sHZ!lns%aS8^2S0?&C=V?0)M2b@+S?QM8 zk@lo)dxXzS2I&vE{#w<=m_bb=xEz&Mdm?^TBX3p-8I=aRbX|BA4Mq z-eSmk^>X-vpf^swloY-2b`RYz z`Uxeo;6r@tDs|rb>H6 zrdf|?z)oGQzBD*AFf}q69C~MbG&ndqaAky4GwBSIS_fCd(jr?m`5vS7vO>r#69*Wu z+#>HX&{E2{FQtN;z*ezD-h;2q;u-Q@5DJMu4rIz(I+Y2MoP(_y5aZE=|3LW|W}|x` z(XOMMyL!u*S#rHhp~L%Qqk4heLlHO3xl20W!mnX8F=$ zqnV6rD(jj`Tc%`okv`}h@S=xa+r<|BL;sPB4f;Pc7@;5DU%FVwU+e1^&!@NRbB?7gO#KJNrI%_JzwOWz!V26o%Wo3Y;V^2CV=-ofc=RKKa3d z%$CQ(iVjy@3W-3-g8AJL-+oz}bhVEJoPXGE~!t zeA{`mu@QFq|A)fA8uQ9`l(yFX1h>-P*NR8n;zB49N&3S{BKcX>*XoK|ZYj0u5+hh_~vG--TYQXWj7Ja+~tEKT$#_m_LV z&;8vqGe7iqU+|tR`#D^v!XK3tH(75RA+sk3Hgc7UA}UZn=4l?0>sKH@~j}y#E5-*ZXxTLo#yBC3IOB~pt)!lbc$MFS6&zwdy-A54zd6SG5B8Wa#9_HKg1;Y3!aDz!#roW^xz^v zj&VE7@D_dBXFY_HJyJ}ghYJBcGRIvddh1PJL7L;Pk%EjYL?0}BW(etnVc$cN`pTaV zbXE1oD={s=h?pZm`$?4G5aVkn5X*$_Vc8GcEe1SMdGC&(xKb^bb;MKz{( z!_z>A_c#igNYBAZY4C*RrWa7IyQisX)dQtzt5%&VGJ#%1z2!#8<#IP@4iEGa!feKF zWLffwJt$gZur8f#Yqk<^KPR;Ml(izV{|%PJYBSuASAnH4sSL(W6>vH%7t+?EOtQ@39g1hv7v z0D>*T+oZwm!Y)BT&UQe8J4*X$K}a&){|4trz9 UDMvS$Ve`3l2tLd%xf%8U0u2O5v;Y7A diff --git a/core/__pycache__/models.cpython-311.pyc b/core/__pycache__/models.cpython-311.pyc index 68424aaddf22a496f9c256efd26635d24004e174..fdc0ec8f5af262b368cecfc7a0ff3665c14e49e7 100644 GIT binary patch delta 1181 zcmZvaZD*e!q#*!Ta2DcfWtzqsXCZvn1PDNm87%VIxCMj2 zHS z#X1&Y_(CNjGMpggo1%p#iHU@nSRc76Z)XdzsXqRaY#EPee10a9W zp$ETGWz*#W`dHoMT%{cx^~q$j$YdNnbAU|CplABH@LIJ~vxyZ%p>qu`!?Z_%m;s%j z?I_`#*R1JcseZG|9~E2@ALeR8yd?R1`To+p6|bM+{tI1i{=>l*q3_&n#v(jG`ay{G zW$7RvM(5m>OIV#qb|Ri9h+<^vxIdWHNe2S~;gEO%I}$luhCz4TPTf_a-=ds*`Qf7C zm8!+2SXMl-v^=u3j9FS0OKYP2xuY`&C__yiNu63^JMB5?8P<)JELKVu=KwUUA-n8c)>AO$x5FPQD24p!hdW;5h1Pnb768HjdV9R_kY2_JO%&& delta 576 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 MQ#deLCNf?B1;{Sn%K!iX delta 3942 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 SvD?B{61y`2G-q(&+Wi|GUtD4U diff --git a/core/__pycache__/whatsapp_utils.cpython-311.pyc b/core/__pycache__/whatsapp_utils.cpython-311.pyc index ecb79838effc5583cd20bec450b4224826d05e58..523cb2d588668597cacb5b2d05619cb15e640509 100644 GIT binary patch delta 1743 zcma)7Z%h+s7=N#K{d-(X@2V79;Ka(T1W-pz=3vS|aY6;DFj?5JawpV5i|<{F8DUwn=WVU}ac`gd-Sc~% z=Y5{{_uhxz-~Vfu`zpt|5UlIM*?3RzJ2&fK?LcXG{&X`RKdIAScdYnSj?|QvhOSTu zeNE{7oe2HHYTXSgGRb*H=OT&DcOH^$|s=u5?D1@+!f`Ze}q^7wMlwfAjIeG-mQjl?%t0n$j z(2Nk4)cSG^CUdIzoRw~+%yEy#WxQpE^tnx}zTf4wT2cr%>c<@o`Z-tAQAVoLY#`gO zaUh#HWr-rmB2^b-w##&p*F3Fw;W)4(P~2flyVYlc5z6r7-t~7_zZgZJw(;3~qP8RL zk%FaWDyIk8W~y9X8>mft-uJ-p;(L}V-$A%;?!5jf8`ghd|CTnWChUNY8TnAVxeWJ1PUpv&(b zfG};^C*_zVW5r~om>ScMax-1xo3WEqF-7bgcth+0~jZ)&%>{So&n<&n+t&E@RlfaJ^map*Kak@OEc6x}sDfW(gR5+CX*kP0`wUlO$rieR3&DlnyxmJ`cjv1cjLo~iGH)6BzaH1T)4vob(6q<4&{J?D zzBVt^6s&ZGt$+X)x(k)HR`IbA_@pBvT${Mn{ZoS>M6yC8Cqxz<1sm<$kq?HxjC>xs z*ng>iF|rt0f9R=(NzNV50V*y*hWrXNWY*W$i4V*2RA_F1#wLXtqP&c@vP926IyPD3}Fx0Lto8jy%%~7@z^Z_CCmDTa=szMH|X!PQbf%J3&t~!4B6U zhQ4Rt-LsFr_XTBxi**>fpI`pK_lJe*)2FLC{SgQp3A6YJym3E)0Rn^i z-Kv+UsQ#pCv+WoO4CyZaLF*{E7nXsVVt290v;jIY_y$zgIuU_feEs MKri5^&WMNq1K-luO#lD@ delta 1345 zcma)6OKclO7@qZd{n&@sk2JCKAWoVlHO>RYC~(NLp^nrfB~45f#38J*8)t*#HM8r4 znst){hzcYSovKyaMEF2UD?lpBfgDgTv{euivMURsl`4UN100Yg1VWXNn2GDEM@IjA z^UXj1{NF#bkDtcB8})o52rR(uny{vR6Z*o#xi}Y|(zySbqCfoODRj(r$1Xby4n#H7 z4HzN`t~SG4V*sqUYuxbF7yu@?P66;Kh2CfDH>$L@n0K0V-euY$9a$$L{#!a`$nw;$Y%y-?6rE#ye zJj0uOfyakvZ_W!QzarFDWdCb6!r_o96g=dV=r-$P>{$wSqIp+4`kRgRG?)%tSMbSw zcpfqZT(u+bF&^sxP!LIu^L#Ko2Mz-xT+;!d18d|(xv`qd@S)pW5A`UzrKu?|o)zbS zd@!z4>);LgWw1^~nse`<=lO{3bU%8P|7Qb|$McZt&DHfu8MSY%zfV`va?h%w>rzt5 zd8JGyr7lW_s-^o@bS)jRS;AP>Sk|DLJMiZCaV>2qX`?4`CZkw(Su!MxS&~w^VmZ~c zZb)e(Vz-#gvX)k08&<<^eFAFPjAdU6rKIF<Bcz;I2D={L)VSOX3FDz=Z zg672+S~&?9zfe`O=qyaZ{)3V-(wUSd$>>XQmO74D@7s}z3j_{b>N?-G-FYqWant9E zx4KKcBjw(aQsZd3akS(gEBnVbCo3%a%X@gkQ&(goRofh|I6&i({ovCTh87(afMIi@ z!UMPXW2j@lshwD`t>R_`PX!R5oj$fgyAQ(ZMJD_p&~#y_5V(=to!FZ#24+funQ~y} zoNGTA{z$kYTo$*)a{?CO>&jefA$FhZoGEghH->(Q4&ILr?#`E@@p3f2rxc@e*dFly z4<_H8EC#1;5vW>;pDy#$MSgle&`=B|_69IKvOuE9C(wZZ=FubgYQAR2V#m9|o#7sg zce~kmjJ`Y2AMd5_9i=e8*UQ9XJI@8aw=pl_=(Qbx{qHtv68#$-3r=Cj$p{Ch@d!^6 zc#*&5+%GQ5AcwUd$XrULr8^|Clb z6r3q7nN-tB7(?%cr=BHehNN;xbRY@72_U&Q*o@(!Yj9PQvngd5F5@Zwdjb7h#I@zb PVJch!k6{#DYCG{C*hpmn diff --git a/core/admin.py b/core/admin.py index c0b25b6..2831ec9 100644 --- a/core/admin.py +++ b/core/admin.py @@ -8,6 +8,8 @@ from django.shortcuts import render from django.utils.html import format_html from django.contrib import messages from .whatsapp_utils import send_whatsapp_message_detailed +from django.core.mail import send_mail +from django.conf import settings import logging class ProfileInline(admin.StackedInline): @@ -47,6 +49,7 @@ class PlatformProfileAdmin(admin.ModelAdmin): urls = super().get_urls() custom_urls = [ path('test-whatsapp/', self.admin_site.admin_view(self.test_whatsapp_view), name='test-whatsapp'), + path('test-email/', self.admin_site.admin_view(self.test_email_view), name='test-email'), ] return custom_urls + urls @@ -69,11 +72,39 @@ class PlatformProfileAdmin(admin.ModelAdmin): ) return render(request, "admin/core/platformprofile/test_whatsapp.html", context) + def test_email_view(self, request): + email = '' + if request.method == 'POST': + email = request.POST.get('email') + if email: + try: + send_mail( + subject="Test Email from Platform", + message="This is a test email to verify your platform's email configuration.", + from_email=settings.DEFAULT_FROM_EMAIL, + recipient_list=[email], + fail_silently=False, + ) + messages.success(request, f"Success: Test email sent to {email}.") + except Exception as e: + messages.error(request, f"Error sending email: {str(e)}") + else: + messages.warning(request, "Please enter an email address.") + + context = dict( + self.admin_site.each_context(request), + email=email, + ) + return render(request, "admin/core/platformprofile/test_email.html", context) + def test_connection_link(self, obj): return format_html( + '{}' '{}', reverse('admin:test-whatsapp'), - _('Test WhatsApp Configuration') + _('Test WhatsApp'), + reverse('admin:test-email'), + _('Test Email') ) test_connection_link.short_description = _("Actions") test_connection_link.allow_tags = True @@ -84,6 +115,8 @@ class PlatformProfileAdmin(admin.ModelAdmin): fieldsets = super().get_fieldsets(request, obj) # Add the test link to the first fieldset or a new one if obj: + # Check if 'Tools' fieldset already exists to avoid duplication if called multiple times (though get_fieldsets is usually fresh) + # Easier: just append it. fieldsets += ((_('Tools'), {'fields': ('test_connection_link',)}),) return fieldsets diff --git a/core/migrations/0013_platformprofile_enable_payment.py b/core/migrations/0013_platformprofile_enable_payment.py new file mode 100644 index 0000000..6c9e20b --- /dev/null +++ b/core/migrations/0013_platformprofile_enable_payment.py @@ -0,0 +1,18 @@ +# Generated by Django 5.2.7 on 2026-01-25 13:36 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0012_alter_platformprofile_whatsapp_access_token_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='platformprofile', + name='enable_payment', + field=models.BooleanField(default=True, help_text='Toggle to enable or disable payments on the platform.', verbose_name='Enable Payment'), + ), + ] diff --git a/core/migrations/__pycache__/0013_platformprofile_enable_payment.cpython-311.pyc b/core/migrations/__pycache__/0013_platformprofile_enable_payment.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..eb8d4126b4e0f565deb3fdd529cefa2d76c14157 GIT binary patch literal 984 zcmZuvJ#W-77`BsK?h;)KluCSc2ogoTr70i=q^c4~1qnfgMCot?mM?zqF4rUuPSUTb z0|R5X{sTTle@urCl~*RVRPEFWJ9k%9N}RlYpZCj;9_QP{gp1TeW;ViU1EF6UjGx-b zIbBrFK4OUB2*tRKW20?gWT01w8J`g|0T0Y^(^uvFyg+S}S?^J+_FJc0hIHewCukn> zB$IZ`8AMqy?$o<80;eC9vyT9^F+**G;T~?A1_Em^CZ&#MI${s%qaMU8R%7--{W67v z#$~J~HJGDFxzc$%W}~QC0T&>jEi62GOlXvYAZbMNE*EhscsGoIZ1!oM(KIDA2q4Qy z&etI!G+`vxt=Imkmy?jtj_OP4b__|ry7P3E_j(a{IroMsj|-25nXd9iRhh>VFYhZn zI(>d;a=Du0y&KMHnX=BHON%I%P9LI_WP%Iwot~5F)nH za%6*4aYCd^6nR!CmP9rQ`BczI*J{Kdg@i#8gpdh+qq6awv6p&=urzGG;5-7FR3Yi| z6h>G31D)zSIbZYpJO;n$6iHtAumwSpbK!4tv7V(g0AEY)|NSL=CH|8uvR_tlKHV0! z8eSRgWIbheFIH(IX9bt0F>UX@DP82ud~uH&_l|GP9pAWrJT<%b@MvoGJ3Cw|N`#h; z4~E)qt{EqlJ*#Y4w;cBbDRZVxY1&iv?rXioo$<*lElWCVK$9MyXPru(N|YhD+q$f( zy{o+Q#^O-pB{8EQR$sQJOle|_6<^#sL~~c)(r#kAL|4t8dvyK5iB6pTCtIES2a**J A4FCWD literal 0 HcmV?d00001 diff --git a/core/models.py b/core/models.py index 07c5370..dad3a39 100644 --- a/core/models.py +++ b/core/models.py @@ -166,12 +166,22 @@ class PlatformProfile(models.Model): whatsapp_business_phone_number_id = models.CharField(_('Wablas Domain'), max_length=100, blank=True, default="https://deu.wablas.com", help_text=_("The Wablas API domain (e.g., https://deu.wablas.com).")) whatsapp_app_secret = models.CharField(_('Wablas Secret Key'), max_length=255, blank=True, help_text=_("Your Wablas API Secret Key (if required).")) + # Payment Configuration + enable_payment = models.BooleanField(_('Enable Payment'), default=True, help_text=_("Toggle to enable or disable payments on the platform.")) + def save(self, *args, **kwargs): # Auto-clean whitespace from credentials if self.whatsapp_access_token: self.whatsapp_access_token = self.whatsapp_access_token.strip() if self.whatsapp_business_phone_number_id: - self.whatsapp_business_phone_number_id = self.whatsapp_business_phone_number_id.strip() + val = self.whatsapp_business_phone_number_id.strip() + # Remove common path suffixes if user pasted full URL + for suffix in ['/api/send-message', '/api/v2/send-message']: + if val.endswith(suffix): + val = val[:-len(suffix)] + if val.endswith('/'): + val = val[:-1] + self.whatsapp_business_phone_number_id = val if self.whatsapp_app_secret: self.whatsapp_app_secret = self.whatsapp_app_secret.strip() diff --git a/core/templates/admin/core/platformprofile/test_email.html b/core/templates/admin/core/platformprofile/test_email.html new file mode 100644 index 0000000..2c7aa29 --- /dev/null +++ b/core/templates/admin/core/platformprofile/test_email.html @@ -0,0 +1,39 @@ +{% extends "admin/base_site.html" %} +{% load i18n admin_urls static admin_modify %} + +{% block extrahead %}{{ block.super }} + +{{ media }} +{% endblock %} + +{% block breadcrumbs %} +
+{% translate 'Home' %} +› Core +› Platform Profiles +› Test Email Configuration +
+{% endblock %} + +{% block content %} +
+
+ {% csrf_token %} +
+
+

Test Email Configuration

+
+ + +
Enter the email address to receive the test message.
+
+
+ +
+ + Go Back +
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/core/templates/core/shipper_dashboard.html b/core/templates/core/shipper_dashboard.html index 32d54ce..99e07e8 100644 --- a/core/templates/core/shipper_dashboard.html +++ b/core/templates/core/shipper_dashboard.html @@ -32,9 +32,11 @@ {% if parcel.payment_status == 'pending' %} + {% if platform_profile.enable_payment %} {% trans "Pay Now" %} + {% endif %} {% endif %}
diff --git a/core/views.py b/core/views.py index 47a0897..75f0bb9 100644 --- a/core/views.py +++ b/core/views.py @@ -2,7 +2,7 @@ from django.shortcuts import render, redirect, get_object_or_404 from django.contrib.auth import login, authenticate, logout from django.contrib.auth.forms import AuthenticationForm from django.contrib.auth.decorators import login_required -from .models import Parcel, Profile, Country, Governate, City, OTPVerification +from .models import Parcel, Profile, Country, Governate, City, OTPVerification, PlatformProfile from .forms import UserRegistrationForm, ParcelForm, ContactForm, UserProfileForm from django.utils.translation import gettext_lazy as _ from django.utils.translation import get_language @@ -125,6 +125,12 @@ def update_status(request, parcel_id): @login_required def initiate_payment(request, parcel_id): + # Check if payments are enabled + platform_profile = PlatformProfile.objects.first() + if platform_profile and not platform_profile.enable_payment: + messages.error(request, _("Payments are currently disabled by the administrator.")) + return redirect('dashboard') + parcel = get_object_or_404(Parcel, id=parcel_id, shipper=request.user, payment_status='pending') thawani = ThawaniPay() @@ -319,4 +325,4 @@ def verify_otp_view(request): except OTPVerification.DoesNotExist: messages.error(request, _("Invalid code.")) - return render(request, 'core/verify_otp.html') \ No newline at end of file + return render(request, 'core/verify_otp.html', {'form': form}) \ No newline at end of file diff --git a/core/whatsapp_utils.py b/core/whatsapp_utils.py index d398931..14ba968 100644 --- a/core/whatsapp_utils.py +++ b/core/whatsapp_utils.py @@ -15,7 +15,7 @@ def get_whatsapp_credentials(): api_token = settings.WHATSAPP_API_KEY if hasattr(settings, 'WHATSAPP_API_KEY') else "" # We repurpose Phone ID as Domain in settings if needed, or default to Wablas DEU domain = "https://deu.wablas.com" - secret_key = "" # Add this to settings if you want env support, but for now mostly DB + secret_key = "" source = "Settings/Env" # Try to fetch from PlatformProfile @@ -53,7 +53,7 @@ def send_whatsapp_message(phone_number, message): def send_whatsapp_message_detailed(phone_number, message): """ - Sends a WhatsApp message via Wablas V2 API and returns detailed status. + Sends a WhatsApp message via Wablas API and returns detailed status. Returns tuple: (success: bool, response_msg: str) """ if not getattr(settings, 'WHATSAPP_ENABLED', True): @@ -69,43 +69,57 @@ def send_whatsapp_message_detailed(phone_number, message): return False, msg # Normalize phone number (Wablas expects international format without +, e.g. 628123...) - # Remove all non-digits - clean_phone = "".join(filter(str.isdigit, str(phone_number))) + clean_phone = str(phone_number).replace('+', '').replace(' ', '') - # Construct Authorization Header - # Wablas V2: Authorization: {$token}.{$secret_key} - # Some Wablas servers just need Token, but docs say Token.Secret + # Endpoint: /api/send-message (Simple Text) + # Ensure domain has schema + if not domain.startswith('http'): + domain = f"https://{domain}" + + # Using the exact endpoint provided in user example + url = f"{domain}/api/send-message" + + # Header construction logic from user example auth_header = api_token if secret_key: auth_header = f"{api_token}.{secret_key}" - - # Endpoint V2 - url = f"{domain}/api/v2/send-message" - + headers = { "Authorization": auth_header, - "Content-Type": "application/json", + # requests will set Content-Type to application/x-www-form-urlencoded when using 'data' param } - payload = { - "data": [ - { - "phone": clean_phone, - "message": message, - "isGroup": "false", - "flag": "instant" # Priority - } - ] + # Payload as form data (not JSON) + data = { + "phone": clean_phone, + "message": message, } + + # Note: User's example didn't add 'secret' to payload, only to header. + # We will stick to user's example strictly. try: - response = requests.post(url, headers=headers, json=payload, timeout=15) - response_data = response.json() + # Use data=data for form-urlencoded + response = requests.post(url, headers=headers, data=data, timeout=15) + # Handle non-JSON response (HTML error pages) + try: + response_data = response.json() + except ValueError: + response_data = response.text + # Wablas success usually has status: true - if response.status_code == 200 and response_data.get('status') is not False: - logger.info(f"WhatsApp message sent to {clean_phone} via Wablas") - return True, f"Message sent successfully via Wablas. (Source: {source})" + if response.status_code == 200: + # Check for logical success in JSON + if isinstance(response_data, dict): + if response_data.get('status') is True: + logger.info(f"WhatsApp message sent to {clean_phone} via Wablas") + return True, f"Message sent successfully via Wablas. (Source: {source})" + else: + return False, f"Wablas API Logic Error (Source: {source}): {response_data}" + else: + # If text, assume success if 200 OK? Or inspect text. + return True, f"Message sent (Raw Response). (Source: {source})" else: error_msg = f"Wablas API error (Source: {source}): {response.status_code} - {response_data}" logger.error(error_msg)