diff --git a/core/__pycache__/models.cpython-311.pyc b/core/__pycache__/models.cpython-311.pyc index 4611a8f..b06800a 100644 Binary files a/core/__pycache__/models.cpython-311.pyc and b/core/__pycache__/models.cpython-311.pyc differ diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc index 64e613b..ddeb8a3 100644 Binary files a/core/__pycache__/views.cpython-311.pyc and b/core/__pycache__/views.cpython-311.pyc differ 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 @@ {% trans "Owner" %}: {{ truck.owner.username }} | {% trans "Plate" %}: {{ truck.plate_no }} +
+ + {{ form.required_truck_type_link }} + {{ form.required_truck_type_link.errors }} +
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 @@ - +
+
+
+
{% trans "Subscription" %}
+ {% if request.user.profile.is_subscription_active %} +

{% trans "Active" %}

+ {% trans "Expires:" %} {{ request.user.profile.subscription_expiry }} + {% else %} +

{% trans "Inactive" %}

+ {% trans "Payment required" %} + {% endif %} + {% trans "Manage" %} +
+
+
@@ -158,4 +172,4 @@ -{% 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 @@ +
+
+
+
{% trans "Subscription" %}
+ {% if request.user.profile.is_subscription_active %} +

{% trans "Active" %}

+ {% trans "Expires:" %} {{ request.user.profile.subscription_expiry }} + {% else %} +

{% trans "Inactive" %}

+ {% trans "Payment required" %} + {% endif %} + {% trans "Manage" %} +
+
+
@@ -148,4 +163,4 @@ {% endfor %} -{% 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'],