diff --git a/core/__pycache__/admin.cpython-311.pyc b/core/__pycache__/admin.cpython-311.pyc index 1b97a82..f65d7c4 100644 Binary files a/core/__pycache__/admin.cpython-311.pyc and b/core/__pycache__/admin.cpython-311.pyc differ diff --git a/core/__pycache__/forms.cpython-311.pyc b/core/__pycache__/forms.cpython-311.pyc index affcaa7..e0ce395 100644 Binary files a/core/__pycache__/forms.cpython-311.pyc and b/core/__pycache__/forms.cpython-311.pyc differ diff --git a/core/__pycache__/models.cpython-311.pyc b/core/__pycache__/models.cpython-311.pyc index 4bdc403..77440cd 100644 Binary files a/core/__pycache__/models.cpython-311.pyc and b/core/__pycache__/models.cpython-311.pyc differ diff --git a/core/__pycache__/urls.cpython-311.pyc b/core/__pycache__/urls.cpython-311.pyc index 354b745..e4f0366 100644 Binary files a/core/__pycache__/urls.cpython-311.pyc and b/core/__pycache__/urls.cpython-311.pyc differ diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc index 9c3b770..18141de 100644 Binary files a/core/__pycache__/views.cpython-311.pyc and b/core/__pycache__/views.cpython-311.pyc differ diff --git a/core/admin.py b/core/admin.py index 097ec01..fd6f7d6 100644 --- a/core/admin.py +++ b/core/admin.py @@ -7,7 +7,7 @@ from django.utils.translation import gettext_lazy as _ from django.utils import timezone from django.utils.html import format_html import os -from .models import Profile, Truck, Shipment, Bid, Message, WhatsAppConfig, Country, City, TruckType, AppSetting, Banner, HomeSection +from .models import Profile, Truck, Shipment, Bid, Message, WhatsAppConfig, Country, City, TruckType, AppSetting, Banner, HomeSection, ContactMessage from .whatsapp import send_whatsapp_message @admin.register(Country) @@ -189,4 +189,12 @@ 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') \ No newline at end of file + search_fields = ('title', 'title_ar', 'subtitle', 'subtitle_ar', 'content', 'content_ar') + +@admin.register(ContactMessage) +class ContactMessageAdmin(admin.ModelAdmin): + list_display = ('subject', 'name', 'email', 'created_at', 'is_read') + list_filter = ('is_read', 'created_at') + search_fields = ('subject', 'name', 'email', 'message') + readonly_fields = ('created_at',) + list_editable = ('is_read',) diff --git a/core/forms.py b/core/forms.py index 9f99003..df3ac14 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, AppSetting +from .models import Truck, Shipment, Bid, Profile, Country, OTPCode, City, TruckType, AppSetting, ContactMessage from django.utils.translation import gettext_lazy as _ from django.contrib.auth.forms import UserCreationForm from django.contrib.auth.models import User @@ -187,4 +187,15 @@ class AppSettingForm(forms.ModelForm): 'shipper_annual_fee': forms.NumberInput(attrs={'class': 'form-control', 'step': '0.01'}), 'truck_owner_monthly_fee': forms.NumberInput(attrs={'class': 'form-control', 'step': '0.01'}), 'truck_owner_annual_fee': forms.NumberInput(attrs={'class': 'form-control', 'step': '0.01'}), - } \ No newline at end of file + } + +class ContactForm(forms.ModelForm): + class Meta: + model = ContactMessage + fields = ['name', 'email', 'subject', 'message'] + widgets = { + 'name': forms.TextInput(attrs={'class': 'form-control', 'placeholder': _('Your Name')}), + 'email': forms.EmailInput(attrs={'class': 'form-control', 'placeholder': _('Your Email')}), + 'subject': forms.TextInput(attrs={'class': 'form-control', 'placeholder': _('Subject')}), + 'message': forms.Textarea(attrs={'class': 'form-control', 'rows': 5, 'placeholder': _('Your Message')}), + } diff --git a/core/migrations/0023_contactmessage.py b/core/migrations/0023_contactmessage.py new file mode 100644 index 0000000..5e122b1 --- /dev/null +++ b/core/migrations/0023_contactmessage.py @@ -0,0 +1,30 @@ +# Generated by Django 5.2.7 on 2026-01-24 08:43 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0022_alter_truck_driver_license_back_and_more'), + ] + + operations = [ + migrations.CreateModel( + name='ContactMessage', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=100, verbose_name='Name')), + ('email', models.EmailField(max_length=254, verbose_name='Email')), + ('subject', models.CharField(max_length=200, verbose_name='Subject')), + ('message', models.TextField(verbose_name='Message')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('is_read', models.BooleanField(default=False)), + ], + options={ + 'verbose_name': 'Contact Message', + 'verbose_name_plural': 'Contact Messages', + 'ordering': ['-created_at'], + }, + ), + ] diff --git a/core/migrations/__pycache__/0023_contactmessage.cpython-311.pyc b/core/migrations/__pycache__/0023_contactmessage.cpython-311.pyc new file mode 100644 index 0000000..eecd3b3 Binary files /dev/null and b/core/migrations/__pycache__/0023_contactmessage.cpython-311.pyc differ diff --git a/core/models.py b/core/models.py index d8c35ff..4d7d3f5 100644 --- a/core/models.py +++ b/core/models.py @@ -474,4 +474,20 @@ class Transaction(models.Model): super().save(*args, **kwargs) def __str__(self): - return f"{self.receipt_number} - {self.user.username} ({self.amount})" \ No newline at end of file + return f"{self.receipt_number} - {self.user.username} ({self.amount})" + +class ContactMessage(models.Model): + name = models.CharField(_('Name'), max_length=100) + email = models.EmailField(_('Email')) + subject = models.CharField(_('Subject'), max_length=200) + message = models.TextField(_('Message')) + created_at = models.DateTimeField(auto_now_add=True) + is_read = models.BooleanField(default=False) + + class Meta: + verbose_name = _('Contact Message') + verbose_name_plural = _('Contact Messages') + ordering = ['-created_at'] + + def __str__(self): + return f"{self.subject} - {self.name}" diff --git a/core/templates/base.html b/core/templates/base.html index f2dc547..54fdabf 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -66,6 +66,9 @@ {% endif %} {% endif %} +
  • + {% trans "Contact" %} +
  • @@ -156,7 +159,7 @@
    @@ -186,4 +189,4 @@ - + \ No newline at end of file diff --git a/core/templates/core/contact.html b/core/templates/core/contact.html new file mode 100644 index 0000000..546ea9b --- /dev/null +++ b/core/templates/core/contact.html @@ -0,0 +1,101 @@ +{% extends 'base.html' %} +{% load i18n %} + +{% block content %} +
    +
    +
    + +
    +
    +

    {% trans "Get in Touch" %}

    +

    + {% trans "Have questions about our services or need assistance? Fill out the form and our team will get back to you shortly." %} +

    +
    + +
    +
    +
    + +
    +
    +
    +
    {% trans "Phone" %}
    +

    {{ app_settings.contact_phone|default:"+966 XXX XXX XXX" }}

    +
    +
    + +
    +
    +
    + +
    +
    +
    +
    {% trans "Email" %}
    +

    {{ app_settings.contact_email|default:"info@masarcargo.com" }}

    +
    +
    + +
    +
    +
    + +
    +
    +
    +
    {% trans "Address" %}
    +

    {{ app_settings.contact_address|default:"Muscat, Oman"|linebreaksbr }}

    +
    +
    +
    + + +
    +
    +

    {% trans "Send us a Message" %}

    +
    + {% csrf_token %} +
    +
    + + {{ form.name }} + {% if form.name.errors %} +
    {{ form.name.errors }}
    + {% endif %} +
    +
    + + {{ form.email }} + {% if form.email.errors %} +
    {{ form.email.errors }}
    + {% endif %} +
    +
    + + {{ form.subject }} + {% if form.subject.errors %} +
    {{ form.subject.errors }}
    + {% endif %} +
    +
    + + {{ form.message }} + {% if form.message.errors %} +
    {{ form.message.errors }}
    + {% endif %} +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +{% endblock %} diff --git a/core/urls.py b/core/urls.py index 28f8bc3..eaaee16 100644 --- a/core/urls.py +++ b/core/urls.py @@ -22,6 +22,7 @@ urlpatterns = [ path("bid//reject/", views.reject_bid, name="reject_bid"), path("privacy-policy/", views.privacy_policy, name="privacy_policy"), path("terms-of-service/", views.terms_of_service, name="terms_of_service"), + path("contact/", views.contact, name="contact"), path("subscription-expired/", views.subscription_expired, name="subscription_expired"), path("subscription-renew/", views.renew_subscription, name="renew_subscription"), path("payment/success/", views.thawani_success, name="thawani_success"), diff --git a/core/views.py b/core/views.py index 788ccd6..fd34b2f 100644 --- a/core/views.py +++ b/core/views.py @@ -5,10 +5,11 @@ from django.contrib.auth.decorators import login_required from django.contrib.auth import login, authenticate, logout from django.utils import timezone from django.urls import reverse -from .models import Profile, Truck, Shipment, Bid, Message, OTPCode, Country, City, AppSetting, Banner, HomeSection, Transaction +from .models import Profile, Truck, Shipment, Bid, Message, OTPCode, Country, City, AppSetting, Banner, HomeSection, Transaction, ContactMessage from .forms import ( TruckForm, ShipmentForm, BidForm, UserRegistrationForm, - OTPVerifyForm, ShipperOfferForm, RenewSubscriptionForm, AppSettingForm + OTPVerifyForm, ShipperOfferForm, RenewSubscriptionForm, AppSettingForm, + ContactForm ) from django.contrib import messages from django.utils.translation import gettext as _ @@ -23,6 +24,7 @@ from django.http import HttpResponse from django.contrib.sites.shortcuts import get_current_site import json import logging +import os logger = logging.getLogger(__name__) @@ -731,4 +733,26 @@ def admin_app_settings(request): else: form = AppSettingForm(instance=settings_obj) - return render(request, 'core/app_settings.html', {'form': form}) \ No newline at end of file + return render(request, 'core/app_settings.html', {'form': form}) + +def contact(request): + app_settings = AppSetting.objects.first() + if request.method == 'POST': + form = ContactForm(request.POST) + if form.is_valid(): + form.save() + messages.success(request, _("Your message has been sent successfully! We will get back to you soon.")) + return redirect('contact') + else: + messages.error(request, _("There was an error in your form. Please check the fields below.")) + else: + form = ContactForm() + if request.user.is_authenticated: + # Pre-fill name and email if user is logged in + form.fields['name'].initial = request.user.get_full_name() or request.user.username + form.fields['email'].initial = request.user.email + + return render(request, 'core/contact.html', { + 'form': form, + 'app_settings': app_settings + })