changed the request.META.HTTP_REFERER in the forms cancel button to semi harded coded url

haikalbot/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2.4 on 2025-07-14 15:04
+# Generated by Django 5.2.4 on 2025-07-15 13:26
 
 import django.db.models.deletion
 import django.utils.timezone

haikalbot/migrations/0002_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2.4 on 2025-07-14 15:04
+# Generated by Django 5.2.4 on 2025-07-15 13:26
 
 import django.db.models.deletion
 from django.db import migrations, models

inventory/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2.4 on 2025-07-14 15:04
+# Generated by Django 5.2.4 on 2025-07-15 13:26
 
 import datetime
 import django.core.serializers.json
@@ -253,7 +253,7 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=255, verbose_name='English Name')),
                 ('phone_number', phonenumber_field.modelfields.PhoneNumberField(max_length=128, region='SA', verbose_name='Phone Number')),
                 ('address', models.CharField(blank=True, max_length=200, null=True, verbose_name='Address')),
-                ('logo', models.ImageField(blank=True, null=True, upload_to='logos/users', verbose_name='Logo')),
+                ('logo', models.ImageField(blank=True, default='logo.png', null=True, upload_to='logos/users', verbose_name='Logo')),
                 ('joined_at', models.DateTimeField(auto_now_add=True, verbose_name='Joined At')),
                 ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Updated At')),
                 ('slug', models.SlugField(blank=True, max_length=255, null=True, unique=True)),
@@ -772,7 +772,7 @@ class Migration(migrations.Migration):
                 ('phone_number', phonenumber_field.modelfields.PhoneNumberField(max_length=128, region='SA', verbose_name='Phone Number')),
                 ('staff_type', models.CharField(choices=[('inventory', 'Inventory'), ('accountant', 'Accountant'), ('sales', 'Sales')], max_length=255, verbose_name='Staff Type')),
                 ('address', models.CharField(blank=True, max_length=200, null=True, verbose_name='Address')),
-                ('image', models.ImageField(blank=True, null=True, upload_to='staff/', verbose_name='Image')),
+                ('logo', models.ImageField(blank=True, null=True, upload_to='logos/staff', verbose_name='Image')),
                 ('active', models.BooleanField(default=True, verbose_name='Active')),
                 ('created', models.DateTimeField(auto_now_add=True, verbose_name='Created')),
                 ('updated', models.DateTimeField(auto_now=True, verbose_name='Updated')),
@@ -905,7 +905,7 @@ class Migration(migrations.Migration):
             options={
                 'verbose_name': 'Car Financial Details',
                 'verbose_name_plural': 'Car Financial Details',
-                'indexes': [models.Index(fields=['car'], name='car_finance_car_idx'), models.Index(fields=['cost_price'], name='car_finance_cost_price_idx'), models.Index(fields=['selling_price'], name='car_finance_selling_price_idx'), models.Index(fields=['discount_amount'], name='car_finance_discount_idx')],
+                'indexes': [models.Index(fields=['car'], name='car_finance_car_idx'), models.Index(fields=['cost_price'], name='car_finance_cost_price_idx'), models.Index(fields=['selling_price'], name='car_finance_selling_price_idx'), models.Index(fields=['marked_price'], name='car_finance_marked_price_idx'), models.Index(fields=['discount_amount'], name='car_finance_discount_idx')],
             },
         ),
         migrations.AddIndex(

inventory/views.py

@@ -1470,6 +1470,7 @@ class CarFinanceCreateView(LoginRequiredMixin, PermissionRequiredMixin, CreateVi
     permission_required = ["inventory.add_carfinance"]
     
     def dispatch(self, request, *args, **kwargs):
+        print(self.car)
         self.car = get_object_or_404(models.Car, slug=self.kwargs["slug"])
         return super().dispatch(request, *args, **kwargs)
 
@@ -1487,6 +1488,7 @@ class CarFinanceCreateView(LoginRequiredMixin, PermissionRequiredMixin, CreateVi
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["car"] = self.car
+        print(self.car)
         return context
 
     def get_form(self, form_class=None):
@@ -1557,7 +1559,10 @@ class CarFinanceUpdateView(
             "additional_finances"
         ].queryset = models.AdditionalServices.objects.filter(dealer=dealer)
         return form
-
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["car"] = self.object.car
+        return context
 
 class CarUpdateView(
     LoginRequiredMixin, PermissionRequiredMixin, SuccessMessageMixin, UpdateView
@@ -10405,7 +10410,7 @@ def upload_cars(request, dealer_slug, pk=None):
 
     form = forms.CSVUploadForm()
     form.fields["vendor"].queryset = dealer.vendors.all()
-
+    print(request)
     return render(
         request,
         "csv_upload.html",

templates/bill/bill_create.html

@@ -89,7 +89,7 @@
                                     id="djl-bill-create-button"
                                     class="btn btn-phoenix-primary btn-lg">{% trans 'Create' %}
                             </button>
-                            <a href="{{request.META.HTTP_REFERER}}"
+                            <a href="{% url 'bill_list' request.dealer.slug%}"
                                id="djl-bill-create-back-button"
                                class="btn btn-phoenix-secondary">{% trans 'Cancel' %}</a>
                         </div>

templates/crm/leads/lead_form.html

@@ -58,7 +58,7 @@
                                 <i class="fa-solid fa-floppy-disk me-1"></i> 
                                 {{ _("Save") }}
                             </button>
-                            <a href="{{ request.META.HTTP_REFERER }}" class="btn btn-phoenix-danger btn-lg">
+                            <a href="{% url 'lead_list' request.dealer.slug %}" class="btn btn-phoenix-danger btn-lg">
                                 <i class="fa-solid fa-ban me-1"></i> 
                                 {% trans "Cancel" %}
                             </a>

templates/crm/leads/lead_send.html

@@ -26,9 +26,9 @@
         </div>
         <div class="d-flex justify-content-between align-items-center">
           <div class="d-flex gap-2">
-            <a href="{{ request.META.HTTP_REFERER }}" class="btn btn-phoenix-danger">Discard</a>
+            <a href="{% url 'lead_detail' request.dealer.slug lead.slug%}" class="btn btn-phoenix-danger">{% trans 'Discard' %}</a>
             <a hx-boost="true" hx-push-url='false' hx-include="#message,#subject,#to" href="{% url 'send_lead_email' request.dealer.slug lead.slug %}?status=draft" class="btn btn-phoenix-success">Save as Draft</a>
-            <button class="btn btn-phoenix-primary fs-10" type="submit">Send<span class="fa-solid fa-paper-plane ms-1"></span></button>
+            <button class="btn btn-phoenix-primary fs-10" type="submit">{% trans 'Send' %}<span class="fa-solid fa-paper-plane ms-1"></span></button>
           </div>
         </div>
       </form>

templates/csv_upload.html

@@ -72,6 +72,7 @@
 {% endblock customCSS %}
 
 {% block content %}
+
     <div class="container mt-4">
         <h2>Upload Cars CSV <i class="fa-solid fa-file-csv text-primary"></i></h2>
         <div class="d-flex justify-content-end">
@@ -171,7 +172,7 @@
                 </div>
             </div>
             <button type="submit" class="btn btn-phoenix-primary mb-2">Upload</button>
-            <a href="{{ request.META.HTTP_REFERER }}" class="btn btn-phoenix-secondary mb-2">Cancel</a>
+            <a href="{% url 'car_list' request.dealer.slug %}" class="btn btn-phoenix-secondary mb-2">Cancel</a>
         </form>
     </div>
 {% endblock %}

templates/customers/customer_form.html

@@ -34,7 +34,7 @@
 
                         <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                           <button class="btn  btn-phoenix-success btn-lg me-md-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                        <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>    
+                        <a href="{% url 'customer_list' request.dealer.slug %}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>    
                         </div>
                 </form>
 

templates/dealers/dealer_form.html

@@ -43,7 +43,7 @@
                    <hr class="my-2">
                     <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                          <button class="btn btn-lg btn-phoenix-success md-me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                         <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                         <a href="{% url 'dealer_detail' request.dealer.slug %}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                     </div>
                 </form>
                

templates/groups/group_form.html

@@ -77,7 +77,7 @@
                     <hr class="my-2">
                     <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                          <button class="btn btn-lg btn-phoenix-success md-me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                         <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                         <a href="{% url 'group_list' request.dealer.slug %}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                     </div>
                 </form>
                

templates/inventory/add_colors.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 {%block title%} {%trans 'Add Colors'%} {% endblock%}
 {% block content %}
-    <div class="row mt-4">
+    <div class="row mt-4 mb-3">
         <h5 class="text-center">{% trans "Add Colors" %}</h5>
         <p class="text-center">
             {% trans "Select exterior and interior colors for" %} {{ car.id_car_make.get_local_name }} {{ car.id_car_model.get_local_name }}
@@ -52,26 +52,12 @@
                     </div>
                 {% endfor %}
             </div>
-            <!-- Save and Cancel Buttons -->
+           
-            {% comment %} <div class="row g-1 mt-4">
-                <div class="btn-group">
-                    <button type="submit" class="btn btn-sm btn-success me-1"><i class="fa-solid fa-floppy-disk"></i>{% trans "Save" %}</button>
-                    <a href="{{request.META.HTTP_REFERER}}" class="btn btn-sm btn-danger"><i class="fa-solid fa-ban"></i>{% trans "Cancel" %}</a>
-                </div>
-            </div> {% endcomment %}
-            {% comment %} <div class="row justify-content-center g-1 mt-4">
-                 <div class="col-auto">
-                   <div class="btn-group shadow-sm">
-                     <button type="submit" class="btn btn-success btn-sm me-2"><i class="fa-solid fa-floppy-disk me-1"></i>{% trans "Save" %}</button>
-                     <a href="{{request.META.HTTP_REFERER}}" class="btn btn-danger btn-sm"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
-                   </div>
-                </div>
-            </div> {% endcomment %}
             <div class="d-flex justify-content-center mt-4">
                 <button class="btn btn-sm btn-phoenix-success me-2" type="submit">
                     <i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}
                 </button>
-                <a href="{{ request.META.HTTP_REFERER }}" class="btn btn-sm btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                <a href="{% url 'car_detail' request.dealer.slug car.slug %}" class="btn btn-sm btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
             </div>
         </form>
     </div>

templates/inventory/car_edit.html

@@ -41,7 +41,7 @@
                     <hr class="my-2">
                     <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                          <button class="btn btn-lg btn-phoenix-success md-me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                         <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                         <a href="{% url 'car_detail' request.dealer.slug car.slug %}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                     </div>
                 </form>
                

templates/inventory/car_finance_form.html

@@ -38,8 +38,8 @@
                 <a href="{{ request.META.HTTP_REFERER }}" class="btn btn-sm btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
             </div>
         </form>
-    </div> {% endcomment %}
+    </div>
-
+ {% endcomment %}
 
 
     <!---->
@@ -49,7 +49,7 @@
          <div class="card shadow-sm border-0 rounded-3">
             <div class="card-header bg-gray-200  py-3 border-0 rounded-top-3">
                     <h3 class="mb-0 fs-4 text-center text-white">
-                       {% trans "Finance Details for" %}{{ car.id_car_make.get_local_name }} - {{ car.id_car_model.get_local_name }}
+                       {% trans "Finance Details for" %}&nbsp;{{ car.id_car_make.get_local_name }} - {{ car.id_car_model.get_local_name }}
                    </h3>
                    {% if form.errors %}
                  <div class="alert alert-danger">
@@ -75,7 +75,7 @@
                         <hr class="my-2">
                     <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                          <button class="btn btn-lg btn-phoenix-success md-me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                         <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                         <a href="{% url 'car_detail' request.dealer.slug car.slug %}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                     </div>
                 </form>
 

templates/items/expenses/expense_create.html

@@ -47,7 +47,7 @@
                             <hr class="my-2">
                          <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                             <button class="btn btn-lg btn-phoenix-success md-me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                            <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                            <a href="{% url  'item_expense_list' request.dealer.slug %}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                          </div>
 
                 </form>

templates/items/expenses/expense_update.html

@@ -40,7 +40,7 @@
                             <hr class="my-2">
                     <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                          <button class="btn btn-lg btn-phoenix-success md-me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                         <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                         <a href="{% url 'item_expense_list' request.dealer.slug %}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                     </div>
                 </form>
                

templates/items/service/service_create.html

@@ -64,7 +64,7 @@
                         <hr class="my-2">
                       <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                          <button class="btn btn-lg btn-phoenix-success md-me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                         <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                         <a href="{% url 'item_service_list' request.dealer.slug%}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                       </div>
                 </form>
 

templates/ledger/bank_accounts/bank_account_form.html

@@ -76,13 +76,12 @@
                             <hr class="my-2">
                     <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                          <button class="btn btn-lg btn-phoenix-success md-me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                         <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                         <a href="{% url 'bank_account_list' request.dealer.slug%}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                     </div>
                             
                 </form>
                
 
-
             </div>
         </div>
 

templates/ledger/coa_accounts/account_form.html

@@ -82,7 +82,7 @@
                             <i class="saveBtnIcon fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}
                         </button>
 
-                         <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                         <a href="{% url 'account_list' request.dealer.slug %}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                     </div>
 
                 </form>

templates/ledger/ledger/ledger_form.html

@@ -45,7 +45,7 @@
                       <hr class="my-2">
                     <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                          <button class="btn btn-lg btn-phoenix-success md-me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                         <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                         <a href="{% url 'ledger_list' request.dealer.slug request.entity.slug %}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                     </div>
 
 

templates/organizations/organization_form.html

@@ -34,9 +34,8 @@
                     <hr class="my-2">
                     <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                          <button class="btn btn-lg btn-phoenix-success md-me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                         <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                         <a href="{% url 'organization_list' request.dealer.slug %}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                     </div>  
-                    
                 </form>
 
                

templates/purchase_orders/po_form.html

@@ -22,7 +22,7 @@
                    </h3>
             </div>
             <div class="card-body bg-light-subtle">
-                  <form class="row g-3 mb-9" method="post" class="form" enctype="multipart/form-data" novalidate >
+                  <form class="row g-3 " method="post" class="form" enctype="multipart/form-data" novalidate >
                      {% csrf_token %}
                      {{ redirect_field }}
                      {{ form|crispy }}
@@ -33,7 +33,7 @@
                     <hr class="my-2">
                     <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                          <button class="btn btn-lg btn-phoenix-success md-me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                         <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                         <a href="{% url 'purchase_order_list' request.dealer.slug request.entity.slug  %}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                     </div>
 
                 </form>

templates/sales/estimates/estimate_form.html

@@ -187,11 +187,10 @@
             <hr class="my-2">
             <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                  <button class="btn btn-lg btn-phoenix-success md-me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                 <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                 <a href="{% url 'estimate_list' request.dealer.slug%}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
             </div>
         </form>
                
-
             </div>
         </div>
 

templates/sales/invoices/invoice_create.html

@@ -41,7 +41,7 @@
                              <hr class="my-2">
                         <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                          <button class="btn btn-lg btn-phoenix-success md-me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                         <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                         <a href="{% url 'invoice_list' request.dealer.slug %}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                         </div>
                        
                 </form>

templates/users/user_form.html

@@ -82,7 +82,7 @@
                       {{ form.email|as_crispy_field }}
                       {{ form.phone_number|as_crispy_field }}
                       {{ form.address|as_crispy_field }}
-                      {{ form.image|as_crispy_field }}
+                      {{ form.logo|as_crispy_field }}
                       {{ form.group|as_crispy_field }}
                       {% for error in form.errors %}
                         <div class="text-danger">{{ error }}</div>
@@ -91,7 +91,7 @@
                       <hr class="my-2">
                       <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                          <button class="btn btn-lg btn-phoenix-success md-me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                         <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                         <a href="{% url 'user_list' request.dealer.slug %}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                      </div>
                   </form>
 

templates/users/user_group_form.html

@@ -21,7 +21,7 @@
             <div class="text-danger">{{ error }}</div>
           {% endfor %}
           <div class="d-flex mb-3">
-            <a href="{{request.META.HTTP_REFERER}}" class="btn btn-phoenix-primary me-2 px-6"><i class="fa-solid fa-ban"></i> {% trans "Cancel" %}</a>
+            <a href="{% url 'user_detail' request.dealer.slug  staff.slug %}" class="btn btn-phoenix-primary me-2 px-6"><i class="fa-solid fa-ban"></i> {% trans "Cancel" %}</a>
             <button class="btn btn-phoenix-primary" type="submit">
               <i class="fa-solid fa-floppy-disk"></i>
               {{ _("Save") }}

templates/vendors/vendor_form.html

@@ -82,7 +82,7 @@
                         <hr class="my-2">
                        <div class="d-grid gap-2 d-md-flex justify-content-md-center mt-3">
                          <button class="btn btn-lg btn-phoenix-success md-me-2" type="submit"><i class="fa-solid fa-floppy-disk me-1"></i>{{ _("Save") }}</button>
-                         <a href="{{request.META.HTTP_REFERER}}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
+                         <a href="{% url 'vendor_list' request.dealer.slug%}" class="btn btn-lg btn-phoenix-danger"><i class="fa-solid fa-ban me-1"></i>{% trans "Cancel" %}</a>
                        </div>
                  </form>
 

templates/welcome_base.html

@@ -32,7 +32,7 @@
     {% comment %} <link href="{% static 'css/sweetalert2.min.css' %}" rel="stylesheet"> {% endcomment %}
     {% comment %} <link rel="stylesheet" href="https://unicons.iconscout.com/release/v4.0.8/css/line.css"> {% endcomment %}
 
-    {% if LANGUAGE_CODE == 'ar' %}
+        {% if LANGUAGE_CODE == 'ar' %}
             <link href="{% static 'css/theme-rtl.min.css' %}" type="text/css" rel="stylesheet" id="style-rtl">
             <link href="{% static 'css/user-rtl.min.css' %}" type="text/css" rel="stylesheet" id="user-style-rtl">
         {% else %}