From cdda269c5766356ebb71225d8ea0a78a85f78a8a Mon Sep 17 00:00:00 2001
From: Flatlogic Bot <support@flatlogic.com>
Date: Sat, 24 Jan 2026 07:29:53 +0000
Subject: [PATCH] changing shipment form

---
 core/__pycache__/models.cpython-311.pyc       | Bin 32172 -> 31870 bytes
 core/__pycache__/views.cpython-311.pyc        | Bin 40032 -> 40099 bytes
 core/models.py                                |   4 ++--
 core/templates/core/place_bid.html            |   5 +++++
 core/templates/core/shipper_dashboard.html    |  18 ++++++++++++++++--
 .../templates/core/truck_owner_dashboard.html |  17 ++++++++++++++++-
 core/views.py                                 |   1 +
 7 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/core/__pycache__/models.cpython-311.pyc b/core/__pycache__/models.cpython-311.pyc
index 4611a8f91fca6ea9fe58e2938836c5f92409f40d..b06800a1dbf44d19a93659de1e963cb927093638 100644
GIT binary patch
delta 2639
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

delta 2862
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

diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc
index 64e613bd57c694979f689e0b7aa53517fa4d3284..ddeb8a39a5c5302dc73c606c40a13b816fb73af1 100644
GIT binary patch
delta 1444
zcmY*YZA@Eb6u$4h+?KSXd=|=JP{sn3jWGo_Wqg>R3(yvjfeVJwF>af6<;%D25BZQ0
z%vc~Jk>lrrf1J+XFwxvUn}7WH<BW68P@Q9&y2KDCah7Z|lQ8EwZx^CBy-&~kob#T~
zdww}5pFS^J-cLv{N%&-kLVj21V@p<pc@rKLeD4&*!8h$W(Ap4W^YH1`LinShSUDI<
z1B-JzJkzMdk;VjTLMB}ok7ij&JcHiOnm~5$XGzf2m=3+p3~REMaz;iT-$$0I3u*AC
zvrMsS>2S%J$1))5tYtRX<#NN%u3VUN)v?X+N_7tW<0>&`jVL3smJO^em2H82?gN=N
z?tLNb=U&Yd;^CfvC-mZ=*VF6o55S!JFf+kJcahA$gKbTf<_L!5-xDl?ziFIBV5Mmd
zak*JD{e<)ZCP~2(XlwDZJou!=Zg!MJ9F>>%wnrS#!PS<A6su$_U6sr>%UyyK_4hXG
z<<EYmsK4UnN&WA((m2D9<o+t`?C4~RFx|1oaE*xTaG_%hy8+7`W$FqNvwF_+mu0m0
zvop8o7Fpat2vV=@c01pT|4SzBJ?iZVc@FzEejAAeefPl!%ybV$PH;}I_S7*Jh4Dj=
z8&-+E3+E3#mi-rs|MSG}lak;IsP+`-JGxU9bq$Xf^`|wX%+|o=>r@{g@tgjkuPTmR
zf!~jA!@eX2(lNz?z$jaXcLPzj1h4hButZqytw>rYpCbf*f(UHydjeHj-&VG&Pxdt%
z%_-PTZXsnd+zd4tGU&Vx72zXlF^YxyJK<Amej>3~$Vx)Vq3~lQFA^w3$UG4|!{r7G
z*{#D{!<F&bD9$tVdTqE0^RtZ%jtMV2$VA*6qU$0#H%SzZ=acjjfkt2?NG633C5Mqe
zNrdnt5=}?d(x#v{81xVHd$jIQHy8e??jT*pIng6#W#&fmM6h2^89gbR;^|Bf*5}9C
zl|35?I#?`-D7l2Jb`r$OqZD@G@zw>D&~gzfCZ5U_C5hmou482NpW@)v3A=SSIoSxp
zANBgHiDI=1HADLSi7A=Yz{K%<wHAptPM<x_STZb3=HSA8Jy}sGS|P5{JcDrv8|888
zxPUpm@Wc<y_K;Gbyqj=fGATul5wK3xvk#zast;pboGN2CXQ!=(8Zy`iS=0GyJ&Nz?
zb<@)_D}`@QmgNy4JPoC_dVS%3&F&lE_Ev9?*FPAlv~vdeGoD%zLJW|G6&qkVNlOG`
ztwsLy#fTX@;$riRRRy2V6sd01eWc%>xuckx$&BDjePxy_W3>C6c9_#{ie(cU7F!(J
z6i(a0M+wBoB*rafOzq{=(pZy3Jrqj#pO<(w-JyM6i?8Y%(89gm8ty|q{-ofzDoIgA
fzyA8$N@fXbWl@Q6RgvVRmvf@Bpt|(gQ<vDk`;K|v

delta 1406
zcmYLIeM}rx5Z||Zdspttas|N?IJg3#z0xZ|N>G7nG)C}_E6^YoDfHqVk<x?u_AVBC
z2n~c1h>&KYCTJ72hKA5Y&Bmzz_>q{#Xi^O*Z4na^qZMQA5ok<H{g`=I+Lzs5=FPmB
zH}jh}XFrvfKasU_si}4e*UFJ-*ShhcmQ&|&;8wwZO|yXWnLKE!GuRpUykG}htJ}pI
z!S(dAT~9r)O{YlGYzk!i53n@o@%u8J`nG8qb@(Tjo_;<9KJb?-_vxANn}0h@`O+XO
zP{!_u+CV*X!ReZO_$cr=ycWoZl_GbE60O|ym87_&XUCPetmnKXPh&!}l$2NpByTRX
z*SElT^&yr5Wx<`$9;|fCqmlnWFb8i3PqKL^*nbPr-JsilMs*95Bx5^_H-wo7RvSFv
zZmdnukX)s!lHH}P6O7j0aG5VPexazppu>n+-CSz1UZRkf;l+b(Yz{6Sth6qY;wNyl
zy4ezVTg%lyP;uG}wSF%b&ynqAf<l5YfsWu+_`@XsPOt<mhurEl6lcx8L;o=QI%x?$
zHU~SNVC*`4b@)MRg0yRJ`*2zA4HOL`z~k}oD$@VG317lsN3q!(%23pssQcDDrQ2k7
z6DB*`)Z3`IY9>0XEo=dN-9;|qXwezvp&ldje6*{#rz6^TER2M8b@#IkxZ0gySK#u|
z2Bv{GQsLa7OX37w1oO}nc?eDCA_XjAeiPYmb8JIWxkg4O6vcwpEZT3t@z@Kh7sX=p
z*VvR=sF8MoPW^{~Tnv&dxRTN2mAMA*p4e+mO?oe#cw|csiZcwO=EbX#_vhlr21Jw+
zI&zO?kz74RqwA8Szd~Cgo!bbUWavc6YfJV(#1V;RqG@rf5jG5>LJvhlT*Rlk4RS`h
zX$i_5+)9xMn#|_@S7p16_5@M$&w*y8@@|4&#_yH9n@;%%lI2lOrMO-BnsQ=D{_&y5
ztfHh6_-x3<yl`pAlUYF?cO&vU#BLqlrB<P(&#W3AlUWU17%5cuq2l$ke~mEagzKmB
zSQcob6+1-T!i}0|SniaQd_F`kCwS95GP=NA|58?zWDvW<$S4w;hiAuX*$lih7QwsH
z#>;b;@!+Cj#3I~^(&n?SA&)1aeY{Y83dQ%#k@0bv?Sb@(aw{pg5Bw9^OoGmdjz>j!
zF&@;FWT*C$bcH~SvB;gC2B&6vEy>0uD+0^pPBnnG_sz1&HN_sJV+0q>J;0R#nsrX|
z%V{n-jhUFO<jByBaGDF=Pas~6=&NWZQOk)=!3`Iw(^Vq=jKpimhvx6rmg-2a9y=P|
r$HQpHPclxbl9W)){5Q@h5A0@5EFlrDDw6CR&P&Kb)n@)Ub&>rK<m6;4

diff --git a/core/models.py b/core/models.py
index ce891d1..1ca61f8 100644
--- a/core/models.py
+++ b/core/models.py
@@ -63,12 +63,12 @@ class Profile(models.Model):
     is_subscription_active = models.BooleanField(default=False)
     def is_expired(self):
         if self.subscription_plan == "NONE":
+            return False
+        if not self.is_subscription_active:
             return True
         if not self.subscription_expiry:
             return True
         return self.subscription_expiry < timezone.now().date()
-
-    def days_until_expiry(self):
         if not self.subscription_expiry:
             return 0
         delta = self.subscription_expiry - timezone.now().date()
diff --git a/core/templates/core/place_bid.html b/core/templates/core/place_bid.html
index 9b8001c..bb96997 100644
--- a/core/templates/core/place_bid.html
+++ b/core/templates/core/place_bid.html
@@ -46,6 +46,11 @@
                                     <small class="text-muted">{% trans "Owner" %}: {{ truck.owner.username }} | {% trans "Plate" %}: {{ truck.plate_no }}</small>
                                 </div>
                             </div>
+                        <div class="mb-3">
+                            <label class="form-label fw-bold">{{ form.required_truck_type_link.label }}</label>
+                            {{ form.required_truck_type_link }}
+                            {{ form.required_truck_type_link.errors }}
+                        </div>
                         </div>
                     </div>
                     
diff --git a/core/templates/core/shipper_dashboard.html b/core/templates/core/shipper_dashboard.html
index 75738f9..7c636b8 100644
--- a/core/templates/core/shipper_dashboard.html
+++ b/core/templates/core/shipper_dashboard.html
@@ -44,7 +44,21 @@
                 </div>
             </div>
         </div>
-        <!-- Add more stats here if needed -->
+        <div class="col-md-3 mb-3">
+            <div class="card shadow-sm border-0 h-100">
+                <div class="card-body">
+                    <h6 class="text-uppercase small text-muted">{% trans "Subscription" %}</h6>
+                    {% if request.user.profile.is_subscription_active %}
+                        <h4 class="mb-1 text-success">{% trans "Active" %}</h4>
+                        <small class="text-muted d-block mb-3">{% trans "Expires:" %} {{ request.user.profile.subscription_expiry }}</small>
+                    {% else %}
+                        <h4 class="mb-1 text-danger">{% trans "Inactive" %}</h4>
+                        <small class="text-muted d-block mb-3">{% trans "Payment required" %}</small>
+                    {% endif %}
+                    <a href="{% url 'renew_subscription' %}" class="btn btn-outline-primary btn-sm">{% trans "Manage" %}</a>
+                </div>
+            </div>
+        </div>
     </div>
 
     <!-- Active Offers -->
@@ -158,4 +172,4 @@
         </div>
     </div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/core/templates/core/truck_owner_dashboard.html b/core/templates/core/truck_owner_dashboard.html
index 76f7ec5..7179850 100644
--- a/core/templates/core/truck_owner_dashboard.html
+++ b/core/templates/core/truck_owner_dashboard.html
@@ -40,6 +40,21 @@
                 </div>
             </div>
         </div>
+        <div class="col-md-3 mb-3">
+            <div class="card shadow-sm border-0 h-100">
+                <div class="card-body">
+                    <h6 class="text-uppercase small text-muted">{% trans "Subscription" %}</h6>
+                    {% if request.user.profile.is_subscription_active %}
+                        <h4 class="mb-1 text-success">{% trans "Active" %}</h4>
+                        <small class="text-muted d-block mb-3">{% trans "Expires:" %} {{ request.user.profile.subscription_expiry }}</small>
+                    {% else %}
+                        <h4 class="mb-1 text-danger">{% trans "Inactive" %}</h4>
+                        <small class="text-muted d-block mb-3">{% trans "Payment required" %}</small>
+                    {% endif %}
+                    <a href="{% url 'renew_subscription' %}" class="btn btn-outline-primary btn-sm">{% trans "Manage" %}</a>
+                </div>
+            </div>
+        </div>
     </div>
 
     <!-- Incoming Offers Section -->
@@ -148,4 +163,4 @@
         {% endfor %}
     </div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/core/views.py b/core/views.py
index c3c7849..c33254e 100644
--- a/core/views.py
+++ b/core/views.py
@@ -354,6 +354,7 @@ def place_bid(request, truck_id):
             shipment = Shipment.objects.create(
                 shipper=request.user,
                 description=form.cleaned_data['description'],
+                required_truck_type_link=form.cleaned_data["required_truck_type_link"],
                 weight=form.cleaned_data['weight'],
                 origin_country=form.cleaned_data['origin_country'],
                 origin_city=form.cleaned_data['origin_city'],