diff --git a/inventory/models.py b/inventory/models.py index 99b67cc1..fe690a3a 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -1184,7 +1184,7 @@ class Dealer(models.Model, LocalizedNameMixin): blank=True, null=True, verbose_name=_("Logo"), - default="user-logo.png", + default="default-image/dealer.png", ) thumbnail = ImageSpecField( source="logo", @@ -1288,7 +1288,7 @@ class Staff(models.Model, LocalizedNameMixin): max_length=200, blank=True, null=True, verbose_name=_("Address") ) logo = models.ImageField( - upload_to="logos/staff", blank=True, null=True, verbose_name=_("Image"),default="user-logo.jpg" + upload_to="logos/staff", blank=True, null=True, verbose_name=_("Image"),default="default-image/sales_person.png" ) thumbnail = ImageSpecField( source="logo", @@ -1511,7 +1511,7 @@ class Customer(models.Model): ) active = models.BooleanField(default=True, verbose_name=_("Active")) image = models.ImageField( - upload_to="customers/", blank=True, null=True, verbose_name=_("Image") + upload_to="customers/", blank=True, null=True, verbose_name=_("Image"),default="default-image/customer.png" ) thumbnail = ImageSpecField( source="image", @@ -2481,7 +2481,7 @@ class Vendor(models.Model, LocalizedNameMixin): email = models.EmailField(max_length=255, verbose_name=_("Email Address")) address = models.CharField(max_length=200, verbose_name=_("Address")) logo = models.ImageField( - upload_to="logos/vendors", blank=True, null=True, verbose_name=_("Logo"),default="user-logo.jpg" + upload_to="logos/vendors", blank=True, null=True, verbose_name=_("Logo"),default="default-image/vendor.png" ) thumbnail = ImageSpecField( source="logo", diff --git a/inventory/views.py b/inventory/views.py index 3cddcab6..080adc2e 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -635,7 +635,7 @@ class CarCreateView(LoginRequiredMixin, PermissionRequiredMixin,SuccessMessageMi def get_context_data(self, **kwargs): dealer = get_user_type(self.request) context = super().get_context_data(**kwargs) - context["vendor_exists"] = dealer.vendors.exists() + context["vendor_exists"] = dealer.vendors.filter(active=True).exists() return context @@ -1605,7 +1605,7 @@ class CarUpdateView( def get_form(self, form_class=None): form = super().get_form(form_class) dealer = get_user_type(self.request) - form.fields["vendor"].queryset = dealer.vendors.all() + form.fields["vendor"].queryset = dealer.vendors.filter(active=True) return form @@ -10542,7 +10542,7 @@ def upload_cars(request, dealer_slug, pk=None): return response form = forms.CSVUploadForm() - form.fields["vendor"].queryset = dealer.vendors.all() + form.fields["vendor"].queryset = dealer.vendors.filter(active=True).all() return render( request, diff --git a/static/images/default-image/accountant.png b/static/images/default-image/accountant.png new file mode 100644 index 00000000..110c055f Binary files /dev/null and b/static/images/default-image/accountant.png differ diff --git a/static/images/default-image/customer.png b/static/images/default-image/customer.png new file mode 100644 index 00000000..f7062e5f Binary files /dev/null and b/static/images/default-image/customer.png differ diff --git a/static/images/default-image/dealer.png b/static/images/default-image/dealer.png new file mode 100644 index 00000000..31655236 Binary files /dev/null and b/static/images/default-image/dealer.png differ diff --git a/static/images/default-image/default_manager.png b/static/images/default-image/default_manager.png new file mode 100644 index 00000000..93cdb9c7 Binary files /dev/null and b/static/images/default-image/default_manager.png differ diff --git a/static/images/default-image/inventory.png b/static/images/default-image/inventory.png new file mode 100644 index 00000000..6ad97a3c Binary files /dev/null and b/static/images/default-image/inventory.png differ diff --git a/static/images/default-image/manager.png b/static/images/default-image/manager.png new file mode 100644 index 00000000..568d8634 Binary files /dev/null and b/static/images/default-image/manager.png differ diff --git a/static/images/default-image/no_car.png b/static/images/default-image/no_car.png new file mode 100644 index 00000000..b5ea2f6f Binary files /dev/null and b/static/images/default-image/no_car.png differ diff --git a/static/images/default-image/no_estimate.jpg b/static/images/default-image/no_estimate.jpg new file mode 100644 index 00000000..79792155 Binary files /dev/null and b/static/images/default-image/no_estimate.jpg differ diff --git a/static/images/default-image/no_vendor.png b/static/images/default-image/no_vendor.png new file mode 100644 index 00000000..acb91474 Binary files /dev/null and b/static/images/default-image/no_vendor.png differ diff --git a/static/images/default-image/plan.jpg b/static/images/default-image/plan.jpg new file mode 100644 index 00000000..9e84c1f9 Binary files /dev/null and b/static/images/default-image/plan.jpg differ diff --git a/static/images/default-image/sales_person.png b/static/images/default-image/sales_person.png new file mode 100644 index 00000000..7a7cfb8e Binary files /dev/null and b/static/images/default-image/sales_person.png differ diff --git a/static/images/default-image/vendor.png b/static/images/default-image/vendor.png new file mode 100644 index 00000000..da07f268 Binary files /dev/null and b/static/images/default-image/vendor.png differ diff --git a/static/images/default-user-image/customer-logo.png b/static/images/default-user-image/customer-logo.png deleted file mode 100644 index 177e8dff..00000000 Binary files a/static/images/default-user-image/customer-logo.png and /dev/null differ diff --git a/static/images/default-user-image/staff.png b/static/images/default-user-image/staff.png deleted file mode 100644 index 167ab34d..00000000 Binary files a/static/images/default-user-image/staff.png and /dev/null differ diff --git a/static/images/logos/users/Gemini_Generated_Image_4m8zep4m8zep4m8z.png b/static/images/logos/users/Gemini_Generated_Image_4m8zep4m8zep4m8z.png new file mode 100644 index 00000000..c8bb6dfc Binary files /dev/null and b/static/images/logos/users/Gemini_Generated_Image_4m8zep4m8zep4m8z.png differ diff --git a/static/images/logos/users/Gemini_Generated_Image_4m8zep4m8zep4m8z_1.png b/static/images/logos/users/Gemini_Generated_Image_4m8zep4m8zep4m8z_1.png new file mode 100644 index 00000000..e3c3347d Binary files /dev/null and b/static/images/logos/users/Gemini_Generated_Image_4m8zep4m8zep4m8z_1.png differ diff --git a/static/images/logos/users/Gemini_Generated_Image_4m8zep4m8zep4m8z_2.png b/static/images/logos/users/Gemini_Generated_Image_4m8zep4m8zep4m8z_2.png new file mode 100644 index 00000000..3c86d07a Binary files /dev/null and b/static/images/logos/users/Gemini_Generated_Image_4m8zep4m8zep4m8z_2.png differ diff --git a/static/images/logos/users/Gemini_Generated_Image_4ochp94ochp94och.png b/static/images/logos/users/Gemini_Generated_Image_4ochp94ochp94och.png new file mode 100644 index 00000000..2579b1bf Binary files /dev/null and b/static/images/logos/users/Gemini_Generated_Image_4ochp94ochp94och.png differ diff --git a/static/images/logos/users/Gemini_Generated_Image_7zwaak7zwaak7zwa.png b/static/images/logos/users/Gemini_Generated_Image_7zwaak7zwaak7zwa.png new file mode 100644 index 00000000..d6fb6852 Binary files /dev/null and b/static/images/logos/users/Gemini_Generated_Image_7zwaak7zwaak7zwa.png differ diff --git a/static/images/logos/users/Gemini_Generated_Image_8uszgl8uszgl8usz.png b/static/images/logos/users/Gemini_Generated_Image_8uszgl8uszgl8usz.png new file mode 100644 index 00000000..7bd298af Binary files /dev/null and b/static/images/logos/users/Gemini_Generated_Image_8uszgl8uszgl8usz.png differ diff --git a/static/images/logos/users/Gemini_Generated_Image_s2tn1ss2tn1ss2tn.png b/static/images/logos/users/Gemini_Generated_Image_s2tn1ss2tn1ss2tn.png new file mode 100644 index 00000000..6a91ab8c Binary files /dev/null and b/static/images/logos/users/Gemini_Generated_Image_s2tn1ss2tn1ss2tn.png differ diff --git a/static/images/default-user-image/dealer.png b/static/images/logos/users/dealer.png similarity index 100% rename from static/images/default-user-image/dealer.png rename to static/images/logos/users/dealer.png diff --git a/static/images/logos/users/dealer_default.png b/static/images/logos/users/dealer_default.png new file mode 100644 index 00000000..ee9c22fe Binary files /dev/null and b/static/images/logos/users/dealer_default.png differ diff --git a/static/images/logos/users/employee.png b/static/images/logos/users/employee.png new file mode 100644 index 00000000..0dc96509 Binary files /dev/null and b/static/images/logos/users/employee.png differ diff --git a/static/images/logos/users/new_dealer.png b/static/images/logos/users/new_dealer.png new file mode 100644 index 00000000..31655236 Binary files /dev/null and b/static/images/logos/users/new_dealer.png differ diff --git a/static/images/logos/users/output_2.jpg b/static/images/logos/users/output_2.jpg new file mode 100644 index 00000000..8b62098b Binary files /dev/null and b/static/images/logos/users/output_2.jpg differ diff --git a/static/images/logos/users/salesperson.png b/static/images/logos/users/salesperson.png new file mode 100644 index 00000000..26a371fd Binary files /dev/null and b/static/images/logos/users/salesperson.png differ diff --git a/static/images/logos/vendors/Gemini_Generated_Image_6tpm9i6tpm9i6tpm_1.png b/static/images/logos/vendors/Gemini_Generated_Image_6tpm9i6tpm9i6tpm_1.png new file mode 100644 index 00000000..24298e22 Binary files /dev/null and b/static/images/logos/vendors/Gemini_Generated_Image_6tpm9i6tpm9i6tpm_1.png differ diff --git a/static/images/logos/vendors/Gemini_Generated_Image_6tpm9i6tpm9i6tpm_1_PcQIcmG.png b/static/images/logos/vendors/Gemini_Generated_Image_6tpm9i6tpm9i6tpm_1_PcQIcmG.png new file mode 100644 index 00000000..41ba0b0c Binary files /dev/null and b/static/images/logos/vendors/Gemini_Generated_Image_6tpm9i6tpm9i6tpm_1_PcQIcmG.png differ diff --git a/static/images/logos/vendors/Gemini_Generated_Image_6tpm9i6tpm9i6tpm_2.png b/static/images/logos/vendors/Gemini_Generated_Image_6tpm9i6tpm9i6tpm_2.png new file mode 100644 index 00000000..e375187d Binary files /dev/null and b/static/images/logos/vendors/Gemini_Generated_Image_6tpm9i6tpm9i6tpm_2.png differ diff --git a/static/images/logos/vendors/output_2.jpg b/static/images/logos/vendors/output_2.jpg new file mode 100644 index 00000000..8b62098b Binary files /dev/null and b/static/images/logos/vendors/output_2.jpg differ diff --git a/static/images/logos/vendors/output_2_tiU2l8C.jpg b/static/images/logos/vendors/output_2_tiU2l8C.jpg new file mode 100644 index 00000000..8b62098b Binary files /dev/null and b/static/images/logos/vendors/output_2_tiU2l8C.jpg differ diff --git a/static/images/logos/vendors/output_4.jpg b/static/images/logos/vendors/output_4.jpg new file mode 100644 index 00000000..1f193dea Binary files /dev/null and b/static/images/logos/vendors/output_4.jpg differ diff --git a/static/images/logos/vendors/output_4_owyivsr.jpg b/static/images/logos/vendors/output_4_owyivsr.jpg new file mode 100644 index 00000000..1f193dea Binary files /dev/null and b/static/images/logos/vendors/output_4_owyivsr.jpg differ diff --git a/static/images/logos/vendors/salesperson.png b/static/images/logos/vendors/salesperson.png new file mode 100644 index 00000000..26a371fd Binary files /dev/null and b/static/images/logos/vendors/salesperson.png differ diff --git a/static/images/default-user-image/vendor.png b/static/images/logos/vendors/vendor.png similarity index 100% rename from static/images/default-user-image/vendor.png rename to static/images/logos/vendors/vendor.png diff --git a/static/images/logos/vendors/vnd.png b/static/images/logos/vendors/vnd.png new file mode 100644 index 00000000..95e02e5a Binary files /dev/null and b/static/images/logos/vendors/vnd.png differ diff --git a/static/images/no_content/no_car.png b/static/images/no_content/no_car.png new file mode 100644 index 00000000..b5ea2f6f Binary files /dev/null and b/static/images/no_content/no_car.png differ diff --git a/static/images/no_content/no_estimate.jpg b/static/images/no_content/no_estimate.jpg new file mode 100644 index 00000000..79792155 Binary files /dev/null and b/static/images/no_content/no_estimate.jpg differ diff --git a/static/images/no_content/no_item.jpg b/static/images/no_content/no_item.jpg new file mode 100644 index 00000000..0545ec71 Binary files /dev/null and b/static/images/no_content/no_item.jpg differ diff --git a/static/images/no_content/no_plan.jpg b/static/images/no_content/no_plan.jpg new file mode 100644 index 00000000..9e84c1f9 Binary files /dev/null and b/static/images/no_content/no_plan.jpg differ diff --git a/static/images/no_content/no_user.png b/static/images/no_content/no_user.png new file mode 100644 index 00000000..f7062e5f Binary files /dev/null and b/static/images/no_content/no_user.png differ diff --git a/static/images/no_content/no_vendor.png b/static/images/no_content/no_vendor.png new file mode 100644 index 00000000..acb91474 Binary files /dev/null and b/static/images/no_content/no_vendor.png differ diff --git a/templates/empty-illustration-page.html b/templates/empty-illustration-page.html index d185b106..432c7fc8 100644 --- a/templates/empty-illustration-page.html +++ b/templates/empty-illustration-page.html @@ -39,7 +39,15 @@
- No-empty-state-image + + + {% if image %} + {% static image as final_image_path %} + {% else %} + {% static 'images/no_content/no_item.jpg' as final_image_path %} + {% endif %} + + No-empty-state-image

diff --git a/templates/inventory/car_form.html b/templates/inventory/car_form.html index 639ab8c7..56084531 100644 --- a/templates/inventory/car_form.html +++ b/templates/inventory/car_form.html @@ -19,22 +19,11 @@ {% if not vendor_exists %} - + {% url "vendor_create" request.dealer.slug as create_vendor_url %} + {% include "message-illustration.html" with value1="Please Add A Vendor, Before Adding A Car." value2="Create Vendor" message_image="images/empty/vendor2.png" url=create_vendor_url %} {% endif %} -
+
diff --git a/templates/message-illustration.html b/templates/message-illustration.html new file mode 100644 index 00000000..49a22f92 --- /dev/null +++ b/templates/message-illustration.html @@ -0,0 +1,89 @@ +{% load static %} +{% load i18n %} + + + + + diff --git a/templates/sales/estimates/estimate_form.html b/templates/sales/estimates/estimate_form.html index d9cb4ef3..08475b18 100644 --- a/templates/sales/estimates/estimate_form.html +++ b/templates/sales/estimates/estimate_form.html @@ -122,35 +122,23 @@ }
- {% if not items %} - +
+
+ {% if not items %} + + {% url "car_add" request.dealer.slug as create_car_url %} + {% include "message-illustration.html" with value1="Please add at least one car before creating a quotation." value2="Add car" message_image="images/empty/no_car.png" url=create_car_url %} + {% endif %} +
+
{% if not customer_count %} - + {% url "customer_create" request.dealer.slug as create_customer_url %} + {% include "message-illustration.html" with value1="Please add at least one customer before creating a quotation." value2="Add Customer" message_image="images/empty/no_estimate.png" url=create_customer_url %} {% endif %} -
+
+
+

@@ -160,7 +148,7 @@
-
+ {% csrf_token %}
diff --git a/templates/sales/estimates/estimate_list.html b/templates/sales/estimates/estimate_list.html index adb0bd5e..9c488ba8 100644 --- a/templates/sales/estimates/estimate_list.html +++ b/templates/sales/estimates/estimate_list.html @@ -79,7 +79,7 @@ {% else %} {% url "estimate_create" request.dealer.slug as create_estimate_url %} - {% include "empty-illustration-page.html" with value="estimate" url=create_estimate_url %} + {% include "empty-illustration-page.html" with value="estimate" url=create_estimate_url %} {% endif %} {% endblock %} diff --git a/templates/users/user_list.html b/templates/users/user_list.html index f426b51c..63e561cc 100644 --- a/templates/users/user_list.html +++ b/templates/users/user_list.html @@ -18,18 +18,10 @@ {% trans "Manage Groups & Permissions" %} {% else %} - + + {% url "pricing_page" request.dealer.slug as pricing_page_url %} + {% include "message-illustration.html" with value1="No Active Plan, please create your subscription plan." value2="Manage Subscription" message_image="images/messages/haikal_plan_message.jpg" url=pricing_page_url %} + {% endif %}
@@ -89,25 +81,14 @@

- {% else %} - + {% else %} {% if request.user.userplan %} - {% url "user_create" request.dealer.slug as create_staff_url %} - {% include "empty-illustration-page.html" with value="staff" url=create_staff_url %} + {% url "user_create" request.dealer.slug as create_staff_url %} + {% include "empty-illustration-page.html" with value="staff" url=create_staff_url image="images/no_content/no_user.png"%} {% else %} - + {% url "pricing_page" request.dealer.slug as pricing_page_url %} + {% include "message-illustration.html" with value1="No Active Plan, please create your subscription plan." value2="Buy Plan" message_image="images/no_content/no_plan.jpg" url=pricing_page_url %} {% endif %} {% endif %} diff --git a/templates/vendors/vendors_list.html b/templates/vendors/vendors_list.html index 00cad6a4..74816a8d 100644 --- a/templates/vendors/vendors_list.html +++ b/templates/vendors/vendors_list.html @@ -166,6 +166,6 @@ {% else %} {% url "vendor_create" request.dealer.slug as create_vendor_url %} - {% include "empty-illustration-page.html" with value="vendor" url=create_vendor_url %} + {% include "empty-illustration-page.html" with value="vendor" url=create_vendor_url image="images/no_content/no_vendor.png" %} {% endif %} {% endblock %} diff --git a/templates/vendors/view_vendor.html b/templates/vendors/view_vendor.html index 18aa9852..475bcd58 100644 --- a/templates/vendors/view_vendor.html +++ b/templates/vendors/view_vendor.html @@ -9,6 +9,11 @@

{% trans "Vendor Details" %}

+
+
+ {% if vendor.logo%}{% endif %} +
+
  • {% trans "Name" %}: {{ vendor.get_local_name }} @@ -50,3 +55,4 @@
{% include 'modal/delete_modal.html' %} {% endblock %} +