From 9726a81f0cfb7ef635817a2cb90bcaf3b5fe8da7 Mon Sep 17 00:00:00 2001
From: Flatlogic Bot <support@flatlogic.com>
Date: Sat, 24 Jan 2026 03:30:04 +0000
Subject: [PATCH] adding subscription fee

---
 core/__pycache__/admin.cpython-311.pyc        | Bin 8356 -> 8839 bytes
 core/__pycache__/forms.cpython-311.pyc        | Bin 14430 -> 15734 bytes
 core/__pycache__/models.cpython-311.pyc       | Bin 26922 -> 27822 bytes
 core/__pycache__/views.cpython-311.pyc        | Bin 24159 -> 24640 bytes
 core/admin.py                                 |  14 ++++--
 core/forms.py                                 |  14 +++++-
 ...ual_fee_appsetting_monthly_fee_and_more.py |  43 ++++++++++++++++++
 ...tting_monthly_fee_and_more.cpython-311.pyc | Bin 0 -> 1870 bytes
 core/models.py                                |  11 +++++
 core/templates/registration/register.html     |  27 +++++++++++
 core/views.py                                 |   8 +++-
 11 files changed, 111 insertions(+), 6 deletions(-)
 create mode 100644 core/migrations/0017_appsetting_annual_fee_appsetting_monthly_fee_and_more.py
 create mode 100644 core/migrations/__pycache__/0017_appsetting_annual_fee_appsetting_monthly_fee_and_more.cpython-311.pyc

diff --git a/core/__pycache__/admin.cpython-311.pyc b/core/__pycache__/admin.cpython-311.pyc
index c9f108df52a5e1907774a3ac39b2f554770b4db7..af5adc3af30a7e9d201cf1dcd777a730ef301c76 100644
GIT binary patch
delta 1392
zcmZWpU1%It6rQ_3lbPASq?_z+Hfh~ZX}h(iQfV|zk%Um%h1gW1rCDRAlbO4_lg`YJ
zcV=T^NwQ)ksTP}hAF5PpONvqoQpvOW?2}UnSO$cMZ-S7559*Wm%wlZG41Dv=_nmw0
z<=%78-I3)J$*&U$iDOUWxT`;({x<oVfOvXAI56mUIE`sXCA#hEbxXDl#qu+{BR{1o
zs;kf9VwfCZDacWP0eV$9&6DQXqg^GsDcr~&XR4p7ziVM4%MAw;OEEDSqMwLwNP{o}
zpg`N>ou5isG)T|Hj?vepbNos0PSFR_3_l8Vlon!#(J1q=0A3N1lk~e-i5~}doW|pa
z(KvIv>0(=&*5Y||hJFw)NoT<ZI6}ADI_dB6UFa;mmg!#4BqW4}XkT&?;q^;NjF3iu
zO${HavRFUTAco_|)Q02MO&NZO&U7cjpin3@$zDc?x&CVVwJ>t&FX@2+3&zE<qSj=!
zZn=2QB|{)ZWfQv!i85Z~31lZVfCj)UEp_fg_PX6Ug9b1tCV<VrPsp-rD2}6I!;s~B
zsI>ybtl`%5QxG~u+cS$%pz8IGuBFS2EOR$F%$1SGl|vdThqaIv)*?EpghCvSXwk1&
zj{A@&c$mj;du=;BVcQdTcoKM(NIAN~Rgf0DER^@~E8H9^w@q-xxStxa?FsC<x>X&~
zOx-F*=x><=OMd55MT9M7+Q8arpRefH&>U7yD{NtY#Hd&6KJT!PV!f9hWqZo%tx&Qm
zbz&+|l`QfKizFXGcnUV11;~n~5$rgAbPQJ&qZski1Xp#(CBYckQX1woCcfk<bF$Uq
z?Jg#!BiAc3tIt_o#eUKz`mCbP%XZz+)p<WY@x*Ol^L`9d#!NP4&6t-f82gf9Sq;Si
zPGi|SyDz}X6o3i?C(K~GZZQ2ZyI%~Bdxq)s`>x)l1x9?awFTI9NZ`V0k`Ea;PaOL)
zhyZVa@i~LPn%sZyW_q$Ywkal71uy@ymm2hhV~<2>rNfIA9*TV%V&CmkUcc(?)jR<Q
z#>z`q@>lb#&(*xbMX$^71hXZ-@=(lgi22XXdHbil-nTvB{FWH);G3nbB<;`SsGUpF
z;Y^e+=6JLm+}a;<sY7#YHGZ^CG)%~O;F3zP;$lr!+<PJN1(O237$I}?pWK_$O;7+X
zLJOc~cNX0YZt<<|!Gl4zxPw`nVLiy5xAFfO$SpRAoy6TBB}MsM7le~90d51_0hpxy
z`4iF_P=I&nLjDD`M!(5lLJRa@&->2?J!lmCppgXaBDh$=HV4aFqd)cRMi18i==nK(
lG=W~+;&#F+-pK5G491@TkHcK3cLViog&=ef{rj2w{{lmAhx7md

delta 967
zcmZXS-%Aux6vy}OFW1?fRkv*y-CcDR%%wmvQnp{X#tMQ;p=DV#j<YvicX!6_%$6mH
z8sdYI$_aY)p@;~g*q7cS`UiRtilLyF-nDv&p1S9n7BmANzH`p^oO|!wvzmRJ2|kr&
z$-y5ZZRI=aUIj1sh#Mw+?d}v|UGUa7>^-+Q_%RfN!_|+XC%MtCF>dRWDN5O-Ojk>k
zrQu!msJDmbSPvwm4$=cR1NG49OTwyj*_*{gKYW#Dqzp<#8ziMLl>AYWIq<&mAN8S^
zFPw#M{sHe0x`!YW=paMf)lY`ubzndm#W11^cB;bAB!|dorAuxlBn_8>SBO@58Ki_v
zLZr6$809|OU1mko_G@L+GD-@5uqhrl-5kx$&5Nv+3s$Hs*RHz=gHX7;yNGoGs%q1U
zX6P23vsfBK9;HMrm3g>Mc^P(RHxMSmf`xD!(JN2FGo)L?NCBa9*s`K%Mb$JlS}ZEc
zGqSe>!c)C_%a5aV9I}yx7)mTZc$|OK_ZAqGn__ch+%w`xx$K(E?Cc1&th_#z$(8bY
z$_00$?eIe0YGl`W4O0*~4%5YPa8wO?>yIcRIgO4M4t|_C>I9+@(S#7kSVnb^!~AE%
zD;Pvv#l#topNo$D_sgLSD3Le}H`J4r{VP7@?^AU?J9~R|vs=8z_82Tj8M}sB(il}O
znp0HknUme;ArVh;D|~LaD6L@xLB;%>k44FvXucFnkBM#plWJDp&=u>>EdASoJ>W$t
z7kjwh(ypCUwZarL%6g99aM57={Mdo5BQ_A5h%u;(XC*+1D8NL#lK^bS=gB<CiKRX<
z_hPWcyo%`*cPajl*s-WiVhjAy;<|tNPM3^axk%5lt;+kv2iJ)za(u_}KQ`!gq-_@y
VKM=bvhcmuSVmnT>hTv23`ERt`?Mwgw

diff --git a/core/__pycache__/forms.cpython-311.pyc b/core/__pycache__/forms.cpython-311.pyc
index cb35ac54118422d8bb02576cb3381fd9f5b9328b..4624d9cdb5947c76e0fe5f7cee09722bab4b0018 100644
GIT binary patch
delta 4295
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

delta 3064
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
NlU*FS=a<3!e*k}+mMQ=M

diff --git a/core/__pycache__/models.cpython-311.pyc b/core/__pycache__/models.cpython-311.pyc
index c0eda8549ba039e68b37012c75dade92cd27fac9..9f1466b581bf39c77c04a25add60fb600dab01ca 100644
GIT binary patch
delta 3280
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
ZBT1W<eIG_r#!_dHfB%Uv2g<wu@jsa^aD4y(

delta 2449
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
AKmY&$

diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc
index 5941460846a42be8bffa294c82e5c025b20ede47..8907a4fbe55e3c72753c7106d0df2fa6ac4d1e30 100644
GIT binary patch
delta 3669
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

delta 3255
zcmb7GYfK#172dnEGt0t0SXkb$EEop{6l?-+aBSn{5nvM_<`Lu|@D{U+y#(0h?t(+R
z6stc<6I+U{lZTbqPMowPww0vm<cAei4UwX@a?=(nr%6VAsm+g6{ZUl4a;vD1bM62O
zuJfZK?Z>(2p1Jp&?>vT;752LyFz0IyN4g20Z|zS+Y;A8lpH|?q)5iV)Re8lyYeItG
zx8}l=2eToOSF!IONj702YkETF0z*LDp_g{(Wtee!7IzrPI}B0>Dqo_vru3n-i^_sI
zX-=9Zl+D{iwu9t?Ike60MOvrMvzlHsT{167u=;48TUur&({=nA&w>Sl1;ve_jHG2k
zP(kVl`x>6VASd!Rtng1#O3KS-d=-Dj!|M_SaQ;vp{OM6UvqM>JsiS0b4+(NWcdaV+
zoY3nlWpyx8TR>~D*-BxppcGbWol<7V4XiN7oYez`>1}3Jf%)`Z+LiPYmZn?AqkKwr
z!{0LMpxW+Zhu~rRZim8a@fPkUI0)zLg%;uhzGu&Mb)!IR#S<9cX%qa*UMa1ca-q`E
z?pk+P%be>bgjIXVdL}&M_{??Vo|TFl-nER*TN$0JmQFb9EHZy4!ByuBy8xH#@-g);
zXmM4uX_#`oZsE6+GF;i63rFsAn)x50HS-I&;I3jSyzg#iHE^#lkL`hfr`3SdXNP^Z
ztb!VJX5*R2-;|Q3#2)yntp;At^48UFYLQ`6C=2tJ9r9c>FH6WY{*0&Jq~`Q+$}{hV
z+gZDjiIVL6yaT9ECBBdJUm+j`Z-l|@r3OEWx-~Y-W6^k6E#wc<S~?L<aH=@oOi)D7
zK+r<a3T{sU>xCLm!x1YfD4V)9K07uRj>mZisR9J#mzrjzK{(|n?ID7P5cKqDA{OM~
zu_zDemf3ii^I`Z!Aji!QlL^87_=|te;IEz`Rs`KSNAoaEjsbRI;$v^!FTHhZ-uheK
zdP?2P<wfvu&bT&}t4XX4$_k%X#6?Z;!@{Q*{dkV*F`_9)ITekbhOq{X%V}dj0R?1)
zAc7$#baNzRkmDYootzBDPDZE0!Rgtl<LI`V?Ar;%on<6-5(oyYyfjsbK~fJB5C!~U
zf-d-T(Jpx$#h{j5ylg2MB`r~VmGKbCg8WBNYUfAbS3d7zA8Gpu1_%Zb)O_I|KS~Ob
zJeedPfw=Ilxuo4NfrvpRshZ$1f?k3lf~`FB5nArQYm#*<@fbv+Qc?QJT(BbIJw^%6
z;KxZzu%LZdc1B@AI9m0oD~1YPZf@%i^kCp|@T*O14i?oO-2b`S&4!`4x<Xl?cjutJ
zx;9;~KyXp}M)l(sWrnu;;4if|#{DR&?rn}V(w?A2@IVtw(5lPrfvyMpjnWpea@vX$
zln{u3?}%60m@VMgTP2@Gs}=2my<SNX$>MOVK9?=QZ2d#54_4~i#-Bus0qj6O{?%>a
zP$UtYiiX1c46fBoF7o6+*>HEKfBY%h5RE6iyPIPotN=_j6e@Hi_rp^SUimzVA8Bti
z+%&sSkyfyE5~TqihHu}0dNGwHLC$G15=W&R61UO4x)u9mG?Cz3&_jIaX|c)C1U5mG
zm(i<RY^kzA&pFbPLwZK^)HGIxXd2#ynmAqoON~Y8&*S2AQhWq62immt#^11vZQjBs
z50rQRKYnfuqf?`NIx>Ai3?n37^q=7lbR6)>FW`;;)FuzyHoG53(V&K!ter1GqUntx
zKgz1>%gZO9-b#%`k(o)-ZIN*29Na3IuOF_KFQKVLyLQ;S?fwD&1RXF1pEegcW>Hja
z8}|cisb#aUx1}WgCDa!%q-zY`I$WhKwp_MkilP&VGGc*yJLW5dGgs)qR|sAu_zuB$
z36=?7gPR>Sr58y|5Qx&bM$&bHs{~>2bVfXYqOL@F<V0jzw}is+1iuF7JC85=$%fuj
zi|?#rF>*v*iINgUT}<XF)||AYk)tbPJdCBpTS?<05LI@Rq-O|3|2>P6?hHlZSa<V5
zbO(5#piOwZvjG41^Rrcoq6awztxLyoQawkfci~hjlixwHT>E?ACsH1DiE0*R1~*1Y
z!maKyMGzK)FS<)BsW5dV{6r+4h;zYsD(cg?XLM5xntRH##g!S6crY?O7oD67hj<L;
zdMf01(XLl}sb@)IC!w<MJ{%cCeMKw`bAA08L_B|!;4Qe-*HkO=B-%mLS%7u~HG*T2
zF;R-b$1~vX_jC#RQoa#~{B45o6A0c$P}=BOT|rW4f@`SL9r2TqSS;1J@N$2t{66js
zYajHVGb=<B&fB5EntdtH?r=po+DV4w=w>gzM+yzz9W0SQKygm{_27GKmoAS-I2M<f
zF3uQ_%#DuC2V>F6$k@F2mR^-$#_lQKgRjKt+v@ZA_+C2d!%g@m!>y1B*6jHjdu%sj
zKZ44k{l!0~{hJ7?!aXEY+3}webU<>bsQhOr?mTjpHVMvdJ92GklCchG8jkhSKas|N
zD)i+xK51gao~0!XUrxh~)2!i_2&j4aI|P(;PDFBw-tc}E{xe*d{aak)eWthv<6D;)
kW1qmDkwUF~#Lp^<S%9sZw&B5h*f?so;Sufnv1i$T0hq<U1^@s6

diff --git a/core/admin.py b/core/admin.py
index 502dd53..2c70ecf 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -25,8 +25,8 @@ class TruckTypeAdmin(admin.ModelAdmin):
 
 @admin.register(Profile)
 class ProfileAdmin(admin.ModelAdmin):
-    list_display = ('user', 'role', 'country_code', 'phone_number')
-    list_filter = ('role',)
+    list_display = ('user', 'role', 'country_code', 'phone_number', 'subscription_plan', 'is_subscription_active')
+    list_filter = ('role', 'subscription_plan', 'is_subscription_active')
     search_fields = ('user__username', 'phone_number')
 
 @admin.register(Truck)
@@ -90,7 +90,13 @@ class WhatsAppConfigAdmin(admin.ModelAdmin):
 
 @admin.register(AppSetting)
 class AppSettingAdmin(admin.ModelAdmin):
-    list_display = ('app_name', 'contact_phone', 'contact_email')
+    list_display = ('app_name', 'contact_phone', 'contact_email', 'subscription_enabled')
+    fieldsets = (
+        (None, {'fields': ('app_name', 'logo', 'slogan')}),
+        (_('Contact Information'), {'fields': ('contact_phone', 'contact_email', 'contact_address')}),
+        (_('Legal'), {'fields': ('registration_number', 'tax_number', 'terms_of_service', 'privacy_policy')}),
+        (_('Subscription'), {'fields': ('subscription_enabled', 'monthly_fee', 'annual_fee')}),
+    )
 
     def has_add_permission(self, request):
         # Only allow one configuration record
@@ -109,4 +115,4 @@ class HomeSectionAdmin(admin.ModelAdmin):
     list_display = ('title', 'section_type', 'order', 'is_active')
     list_editable = ('order', 'is_active')
     list_filter = ('section_type', 'is_active', 'background_color')
-    search_fields = ('title', 'title_ar', 'subtitle', 'subtitle_ar', 'content', 'content_ar')
+    search_fields = ('title', 'title_ar', 'subtitle', 'subtitle_ar', 'content', 'content_ar')
\ No newline at end of file
diff --git a/core/forms.py b/core/forms.py
index a8bfadc..7ee09ed 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from .models import Truck, Shipment, Bid, Profile, Country, OTPCode, City, TruckType
+from .models import Truck, Shipment, Bid, Profile, Country, OTPCode, City, TruckType, AppSetting
 from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.forms import UserCreationForm
 from django.contrib.auth.models import User
@@ -10,6 +10,8 @@ class UserRegistrationForm(UserCreationForm):
     role = forms.ChoiceField(choices=[choice for choice in Profile.ROLE_CHOICES if choice[0] != 'ADMIN'], widget=forms.Select(attrs={'class': 'form-select'}))
     country_code = forms.ChoiceField(choices=[], widget=forms.Select(attrs={'class': 'form-select'}))
     phone_number = forms.CharField(max_length=20, required=True, widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': '123456789'}))
+    subscription_plan = forms.ChoiceField(choices=[('MONTHLY', _('Monthly')), ('ANNUAL', _('Annual'))], required=False, widget=forms.Select(attrs={'class': 'form-select'}), label=_('Subscription Plan'))
+    accept_terms = forms.BooleanField(required=True, widget=forms.CheckboxInput(attrs={'class': 'form-check-input'}), label=_('I have read and agree to the Terms and Conditions and Privacy Policy'))
 
     class Meta(UserCreationForm.Meta):
         model = User
@@ -29,6 +31,16 @@ class UserRegistrationForm(UserCreationForm):
             self.fields['country_code'].choices = [('966', 'Saudi Arabia (+966)')]
             self.fields['country_code'].initial = '966'
 
+        app_settings = AppSetting.objects.first()
+        if app_settings and app_settings.subscription_enabled:
+            self.fields['subscription_plan'].choices = [
+                ('MONTHLY', _('Monthly (%(fee)s)') % {'fee': app_settings.monthly_fee}),
+                ('ANNUAL', _('Annual (%(fee)s)') % {'fee': app_settings.annual_fee}),
+            ]
+            self.fields['subscription_plan'].required = True
+        else:
+            self.fields['subscription_plan'].required = False
+
         for field in self.fields.values():
             if not isinstance(field.widget, (forms.CheckboxInput, forms.Select)):
                 field.widget.attrs.update({'class': 'form-control'})
diff --git a/core/migrations/0017_appsetting_annual_fee_appsetting_monthly_fee_and_more.py b/core/migrations/0017_appsetting_annual_fee_appsetting_monthly_fee_and_more.py
new file mode 100644
index 0000000..105ece4
--- /dev/null
+++ b/core/migrations/0017_appsetting_annual_fee_appsetting_monthly_fee_and_more.py
@@ -0,0 +1,43 @@
+# Generated by Django 5.2.7 on 2026-01-24 03:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0016_homesection'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='appsetting',
+            name='annual_fee',
+            field=models.DecimalField(decimal_places=2, default=0.0, max_digits=10, verbose_name='Annual Fee'),
+        ),
+        migrations.AddField(
+            model_name='appsetting',
+            name='monthly_fee',
+            field=models.DecimalField(decimal_places=2, default=0.0, max_digits=10, verbose_name='Monthly Fee'),
+        ),
+        migrations.AddField(
+            model_name='appsetting',
+            name='subscription_enabled',
+            field=models.BooleanField(default=False, verbose_name='Enable Subscription Fee'),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='is_subscription_active',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='subscription_expiry',
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='subscription_plan',
+            field=models.CharField(choices=[('MONTHLY', 'Monthly'), ('ANNUAL', 'Annual'), ('NONE', 'None')], default='NONE', max_length=20),
+        ),
+    ]
diff --git a/core/migrations/__pycache__/0017_appsetting_annual_fee_appsetting_monthly_fee_and_more.cpython-311.pyc b/core/migrations/__pycache__/0017_appsetting_annual_fee_appsetting_monthly_fee_and_more.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ce3b160ef51a299ba2008e55992aa31a6c824613
GIT binary patch
literal 1870
zcmb7E&2Jk;6rbI-*Y?H<$;3233yn%su#oCh1W=?1DJ2abO<bS_scxjz+B2~?*_~bX
zqfG*b95`_7jXQ@>R3G{Wa6tS8w&a5~S5CP(N=`lTX6$X^q>9?v-8b*ed+#@I-g~ou
zj*c1##-oME{x^-#e?mwG$Z{Mm!1OyJh$s$nm5So36;(kh`VtZKS41?bY-j^pv<KYN
z7g9wdsk^9{-WTek$_>}92UcWzEabZD5$c4s#8b>;1L5#*MQlk?MIor75~Z$GG!@a*
zMiLZkO~i`6kx2kZilm87GR^E>3W9*IKbpDWpw8eJFU1*oZJfNs$tL@fQ8LziV^4)x
z;CrQ5#>vEKj3(ZLTs(#E6%i&SLN2i<1yX3f`I=E&kQlNx1Wp~1sXr9*7J0k*&TuYI
z=eDj_M#x1d`6ZrPO==B=Pu0AD^6}Z(8=smD&!r))i7w!V<@+IxBAeBLXDqfHbDh$C
zk+6Dlgnbdnj<G1!)60|=Q+$ljn(czM?^rb&@(iKtR_sL3V%C;P?7AI=JpYgeRWGC_
zvs_x#Kqp#GN<1ajczWHY4&fuN$D)R_E%x3SS?vpACte8SYFG<wUxaH?W>p<ZmUpIZ
zNpAY?39XDw4MYzI<3M=E54?5Tq5Og!nnO4ioc<v#D$<xw4(aHYZwK4=AZh8UW3f$$
zG<F<5F=Pa%W<?EbGOKsW_r6-W4@^I5Sko8F<sTMTV3rvZ=`Y_Y-va6}8caiI`voA7
zkW8)N*^s_|95QtdW%a00F6MdGl$kP3ZkQ%yE_NvJdDHv}swA=}Btm`42xT=JP{h6G
z*+oK@MOFiG19^U_Unsf6^EW-up%&{)xg{&21NMuC74%ud^XcFx@fSJ-4D{SBiKZ#V
z)tE(biEhza9C<<Mkr!-+KGeS?+N*T@b16ZieP$l_mU-M-Cs$8Y9V`eOGN9M}?Ldb;
zB@s;c3*5ck7f(+|xtX4(7WCbfo`G_gelt4Ri`}XByA$tr@yz3E9X#{wyMMISx8Juc
zw}n|7vkqpxOe$v_ARtGAobr6{j3;YhuZ_J9_RjbGAn|-cTQ?uH@LC(Mb@19bPSf3q
z;t3}_*T!=lJa@jwwJyFQj&|iq;n`9P&$sb>2hX4Hb2ag4eY81v<DYv7eXZVBVVYb~
z4<tR3^fcBdm$AP4jd+6Dq#R|q_&Ks+vATDiRAsx#ChHfhB+R7k4d9+<7y3Q>dGIla
q;{O@`2&AVeiULJciY@fv*|(?9D0&Z_C6A5H_|*fUIC_az?)yIl73%Z=

literal 0
HcmV?d00001

diff --git a/core/models.py b/core/models.py
index ec465ab..1c6482e 100644
--- a/core/models.py
+++ b/core/models.py
@@ -53,6 +53,14 @@ class Profile(models.Model):
     )
     user = models.OneToOneField(User, on_delete=models.CASCADE)
     role = models.CharField(max_length=20, choices=ROLE_CHOICES, default='SHIPPER')
+    SUBSCRIPTION_CHOICES = (
+        ('MONTHLY', _('Monthly')),
+        ('ANNUAL', _('Annual')),
+        ('NONE', _('None')),
+    )
+    subscription_plan = models.CharField(max_length=20, choices=SUBSCRIPTION_CHOICES, default='NONE')
+    subscription_expiry = models.DateField(null=True, blank=True)
+    is_subscription_active = models.BooleanField(default=False)
     country_code = models.CharField(max_length=5, blank=True, default="966")
     phone_number = models.CharField(max_length=20, unique=True, null=True) # Changed to unique and nullable for migration safety
     
@@ -240,6 +248,9 @@ class AppSetting(models.Model):
     contact_address = models.TextField(_('Contact Address'), blank=True)
     terms_of_service = models.TextField(_('Terms of Service'), blank=True)
     privacy_policy = models.TextField(_('Privacy Policy'), blank=True)
+    subscription_enabled = models.BooleanField(_('Enable Subscription Fee'), default=False)
+    monthly_fee = models.DecimalField(_('Monthly Fee'), max_digits=10, decimal_places=2, default=0.00)
+    annual_fee = models.DecimalField(_('Annual Fee'), max_digits=10, decimal_places=2, default=0.00)
 
     class Meta:
         verbose_name = _('App Setting')
diff --git a/core/templates/registration/register.html b/core/templates/registration/register.html
index be7b142..74fcb1e 100644
--- a/core/templates/registration/register.html
+++ b/core/templates/registration/register.html
@@ -47,6 +47,33 @@
                                     </div>
                                 {% elif field.name == 'phone_number' %}
                                     {# Handled above #}
+                                {% elif field.name == 'subscription_plan' %}
+                                    {% if subscription_enabled %}
+                                        <div class="mb-3">
+                                            <label class="form-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
+                                            {{ field }}
+                                            {% if field.errors %}
+                                                {% for error in field.errors %}
+                                                    <div class="text-danger small">{{ error }}</div>
+                                                {% endfor %}
+                                            {% endif %}
+                                        </div>
+                                    {% endif %}
+                                {% elif field.name == 'accept_terms' %}
+                                    <div class="mb-3 form-check">
+                                        {{ field }}
+                                        <label class="form-check-label small" for="{{ field.id_for_label }}">
+                                            {% trans "I have read and agree to the" %} 
+                                            <a href="{% url 'terms_of_service' %}" target="_blank">{% trans "Terms of Service" %}</a> 
+                                            {% trans "and" %} 
+                                            <a href="{% url 'privacy_policy' %}" target="_blank">{% trans "Privacy Policy" %}</a>
+                                        </label>
+                                        {% if field.errors %}
+                                            {% for error in field.errors %}
+                                                <div class="text-danger small">{{ error }}</div>
+                                            {% endfor %}
+                                        {% endif %}
+                                    </div>
                                 {% else %}
                                     <div class="mb-3">
                                         <label class="form-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
diff --git a/core/views.py b/core/views.py
index 9a89dbc..d0ab69f 100644
--- a/core/views.py
+++ b/core/views.py
@@ -23,6 +23,8 @@ def home(request):
     return render(request, "core/index.html", context)
 
 def register(request):
+    app_settings = AppSetting.objects.first()
+    subscription_enabled = app_settings.subscription_enabled if app_settings else False
     if request.method == 'POST':
         form = UserRegistrationForm(request.POST)
         if form.is_valid():
@@ -34,6 +36,7 @@ def register(request):
                 'role': form.cleaned_data['role'],
                 'phone_number': form.cleaned_data['phone_number'],
                 'country_code': form.cleaned_data['country_code'],
+                'subscription_plan': form.cleaned_data.get('subscription_plan', 'NONE'),
             }
             request.session['registration_data'] = registration_data
             
@@ -50,7 +53,7 @@ def register(request):
             messages.error(request, _("Please correct the errors below."))
     else:
         form = UserRegistrationForm()
-    return render(request, 'registration/register.html', {'form': form})
+    return render(request, 'registration/register.html', {'form': form, 'subscription_enabled': subscription_enabled})
 
 def verify_otp_registration(request):
     registration_data = request.session.get('registration_data')
@@ -78,6 +81,9 @@ def verify_otp_registration(request):
                 profile.role = registration_data['role']
                 profile.phone_number = registration_data['phone_number']
                 profile.country_code = registration_data['country_code']
+                profile.subscription_plan = registration_data.get('subscription_plan', 'NONE')
+                if profile.subscription_plan != 'NONE':
+                    profile.is_subscription_active = True
                 profile.save()
                 
                 login(request, user)