Merge pull request 'Plan' (#213) from frontend into main

Reviewed-on: #213

templates/account/signup-wizard.html

@@ -372,7 +372,11 @@
                 hideLoading();
                 const data = await response.json();
                 if (response.ok) {
+<<<<<<< HEAD
+                    notify("success","{% trans 'Account created successfully'%}");
+=======
                     notify("success","Account created successfully");
+>>>>>>> d3dcb85fa378e156b77550e8ab833ad10ffad51f
                     setTimeout(() => {
                         window.location.href = "{% url 'account_login' %}";
                     }, 1000);

templates/dealers/dealer_detail.html

@@ -68,7 +68,7 @@
                             <div class="col-12 col-sm-auto d-flex align-items-center justify-content-around flex-wrap mt-3 mt-sm-0">
                                 <div class="text-center mx-3 mb-2 mb-sm-0">
                                     <h6 class="mb-2 text-body-secondary">{% trans 'Total users'|capfirst %}</h6>
-                                    <h4 class="fs-7 text-body-highlight mb-2">{{ dealer.staff_count }} / {{ allowed_users }}</h4>
+                                    <h4 class="fs-7 text-body-highlight mb-2">{{ dealer.staff_count }}</h4>
                                     <div class="progress" style="height: 5px; width: 100px;">
                                         <div class="progress-bar bg-success"
                                              role="progressbar"
@@ -80,7 +80,7 @@
                                 </div>
                                 <div class="text-center mx-3 mb-2 mb-sm-0">
                                     <h6 class="mb-2 text-body-secondary">{% trans 'Total cars'|capfirst %}</h6>
-                                    <h4 class="fs-7 text-body-highlight mb-2">{{ cars_count }} / {{ allowed_cars }}</h4>
+                                    <h4 class="fs-7 text-body-highlight mb-2">{{ cars_count }}</h4>
                                     <div class="progress" style="height: 5px; width: 100px;">
                                         <div class="progress-bar bg-info"
                                              role="progressbar"
@@ -222,7 +222,7 @@
                                                     </div>
                                                     <div class="d-flex justify-content-between text-body-secondary fs-9 mt-2">
                                                          <span>{{ _("Used") }}: {{ dealer.staff_count }}</span>
-                                                        <span>{{ _("Limit") }}: {{ allowed_users }}</span>
+                                                      
                                                     </div>
                                                 </div>
                                                 <div class="mb-4">
@@ -237,7 +237,7 @@
                                                     </div>
                                                     <div class="d-flex justify-content-between text-body-secondary fs-9 mt-2">
                                                          <span>{{ _("Used") }}: {{ cars_count }}</span>
-                                                        <span>{{ _("Limit") }}: {{ allowed_cars }}</span>
+                                                       
                                                     </div>
                                                 </div>
                                                 <small class="text-body-secondary mt-auto">{{ _("Contact support to increase your limits") }}</small>

templates/ledger/reports/car_sale_report.html

@@ -59,6 +59,7 @@
                             {% for make in makes %}
                                 <option value="{{ make }}" {% if make == selected_make %}selected{% endif %}>{{ make }}</option>
                             {% endfor %}
+                        </select>
                     </div>
                     <div class="col-md-2">
                         <label for="model-select" class="form-label">{% trans 'Model' %}</label>
@@ -111,7 +112,26 @@
                     </div>
                 </form>
             </section>
-           
+            <!---->
+            {% comment %} 'cars_sold': cars_sold,
+        'current_time': current_time,
+        'dealer': dealer,
+        'total_revenue_from_cars': total_revenue_from_cars,
+        'total_revenue_from_additonals':total_revenue_from_additonals,
+        'total_revenue_collected': total_revenue_collected,
+        'total_vat_on_cars':total_vat_on_cars,
+        'total_vat_from_additonals':total_vat_from_additonals,
+        'total_vat_collected':total_vat_collected,
+        'total_discount': total_discount,
+        'makes': makes,
+        'models': models_qs,
+        'series': series,
+        'years': years,
+        'selected_make': selected_make,
+        'selected_model': selected_model,
+        'selected_serie': selected_serie,
+            'selected_year': selected_year, {% endcomment %}
+            <!---->
             <section id="summary" class="mb-5">
                 <h2 class="section-heading mb-4 border-start border-5 border-primary p-2">{% trans 'Report Summary' %}</h2>
                 <div class="row g-4">
@@ -267,13 +287,13 @@
                                         <span>{{ car.discount }} <span class="icon-saudi_riyal"></span></span>
                                     </td>
                                     <td class="fs-9 text-nowrap">
-                                        <span >{{ car.final_price }} <span class="icon-saudi_riyal"></span></span>
+                                        <span>{{ car.final_price }} <span class="icon-saudi_riyal"></span></span>
                                     </td>
                                     <td class="fs-9 text-nowrap">
                                         <span>{{ car.vat_amount|floatformat:2 }} <span class="icon-saudi_riyal"></span></span>
                                     </td>
                                     <td class="fs-9 text-nowrap">
-                                        <span >{{ car.get_additional_services.total|floatformat:2 }} <span class="icon-saudi_riyal"></span></span>
+                                        <span>{{ car.get_additional_services.total|floatformat:2 }} <span class="icon-saudi_riyal"></span></span>
                                     </td>
                                     <td class="fs-9 text-nowrap">
                                         <span>{{ car.get_additional_services.services_vat|floatformat:2 }}<span class="icon-saudi_riyal"></span></span>