diff --git a/inventory/management/commands/initial_services_offered.py b/inventory/management/commands/initial_services_offered.py new file mode 100644 index 00000000..09a19235 --- /dev/null +++ b/inventory/management/commands/initial_services_offered.py @@ -0,0 +1,12 @@ +# management/commands/create_plans.py +from django.core.management.base import BaseCommand +from appointment.models import Service +import datetime +class Command(BaseCommand): + help = 'create initial services offered' + + def handle(self, *args, **options): + Service.objects.all().delete() + Service.objects.create(name='Call', price=0,duration=datetime.timedelta(minutes=10),currency='SAR',description='15 min call') + Service.objects.create(name='Meeting', price=0,duration=datetime.timedelta(minutes=30),currency='SAR',description='30 min meeting') + Service.objects.create(name='Visit', price=0,duration=datetime.timedelta(minutes=30),currency='SAR',description='30 min visit') \ No newline at end of file diff --git a/inventory/management/commands/tenhal_plan.py b/inventory/management/commands/tenhal_plan.py index c9be1183..91b912e3 100644 --- a/inventory/management/commands/tenhal_plan.py +++ b/inventory/management/commands/tenhal_plan.py @@ -27,19 +27,23 @@ class Command(BaseCommand): # Order.objects.all().delete() # BillingInfo.objects.all().delete() - three_users_quota = Quota.objects.create(name='3 users', codename='3 users', unit='number') - five_users_quota = Quota.objects.create(name='5 users', codename='5 users', unit='number') - ten_users_quota = Quota.objects.create(name='10 users', codename='10 users', unit='number') + users_quota = Quota.objects.create(name='Users', codename='Users', unit='number') + cars_quota = Quota.objects.create(name='Cars', codename='Cars', unit='number') # Create plans basic_plan = Plan.objects.create(name='Basic', description='basic plan', available=True, visible=True) pro_plan = Plan.objects.create(name='Pro', description='Pro plan', available=True, visible=True) enterprise_plan = Plan.objects.create(name='Enterprise', description='Enterprise plan', available=True, visible=True) # Assign quotas to plans - PlanQuota.objects.create(plan=basic_plan, quota=three_users_quota, value=3) - PlanQuota.objects.create(plan=pro_plan, quota=five_users_quota, value=5) - PlanQuota.objects.create(plan=enterprise_plan, quota=ten_users_quota, value=10) + PlanQuota.objects.create(plan=basic_plan, quota=users_quota, value=3) + PlanQuota.objects.create(plan=basic_plan, quota=cars_quota, value=3) + + PlanQuota.objects.create(plan=pro_plan, quota=users_quota, value=5) + PlanQuota.objects.create(plan=pro_plan, quota=cars_quota, value=5) + + PlanQuota.objects.create(plan=enterprise_plan, quota=users_quota, value=10) + PlanQuota.objects.create(plan=enterprise_plan, quota=cars_quota, value=10) # PlanQuota.objects.create(plan=pro_plan, quota=project_quota, value=50) # PlanQuota.objects.create(plan=pro_plan, quota=storage_quota, value=100) diff --git a/inventory/models.py b/inventory/models.py index 0bac15f3..c0f1327e 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -839,7 +839,6 @@ class Dealer(models.Model, LocalizedNameMixin): def active_plan(self): try: plan = UserPlan.objects.get(user=self.user,active=True).plan - print(plan) return plan except Exception as e: @@ -851,8 +850,6 @@ class Dealer(models.Model, LocalizedNameMixin): try: quota_dict = get_user_quota(self.user) allowed_users = quota_dict.get("Users", None) - - print(allowed_users) return allowed_users except Exception as e: print(e) @@ -863,8 +860,6 @@ class Dealer(models.Model, LocalizedNameMixin): try: quota_dict = get_user_quota(self.user) allowed_cars = quota_dict.get("Cars", None) - - print(allowed_cars) return allowed_cars except Exception as e: print(e) diff --git a/inventory/views.py b/inventory/views.py index 24d731a3..270e83af 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -7061,6 +7061,8 @@ def assign_car_makes(request): create_accounts_for_make(dealer, makes) form.save() return redirect("dealer_detail", pk=dealer.pk) + else: + print(form.errors) else: # Pre-fill the form with existing selections existing_car_makes = models.DealersMake.objects.filter( @@ -7069,7 +7071,9 @@ def assign_car_makes(request): form = forms.DealersMakeForm( initial={"car_makes": existing_car_makes}, dealer=dealer ) - + for choice in form.fields["car_makes"].choices: + print(choice[0].instance) + break return render(request, "dealers/assign_car_makes.html", {"form": form}) @@ -7553,9 +7557,9 @@ def payment_callback(request): tax_number=dealer.vrn, name=dealer.arabic_name, street=dealer.address, - zipcode=dealer.entity.zip_code, - city=dealer.entity.city, - country=dealer.entity.country, + zipcode=dealer.entity.zip_code if dealer.entity.zip_code else " ", + city=dealer.entity.city if dealer.entity.city else " ", + country=dealer.entity.country if dealer.entity.country else " ", ) if created: userplan =UserPlan.objects.create( diff --git a/templates/dealers/assign_car_makes.html b/templates/dealers/assign_car_makes.html index 6730d525..f500a556 100644 --- a/templates/dealers/assign_car_makes.html +++ b/templates/dealers/assign_car_makes.html @@ -1,25 +1,91 @@ {% extends "base.html" %} -{% load crispy_forms_filters %} +{% load static %} {% block content %} -

{{ _("Select Car Makes You Sell")}}

+ /* Your existing CSS styles here */ + .car-makes-grid { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(120px, 1fr)); + gap: 20px; + margin: 20px 0; + } + .car-make-option { + position: relative; + cursor: pointer; + text-align: center; + transition: all 0.3s ease; + } + .car-make-image { + width: 100px; + height: 100px; + object-fit: contain; + border: 2px solid transparent; + border-radius: 8px; + padding: 8px; + background: #f8f9fa; + } + .car-make-option input[type="checkbox"] { + position: absolute; + opacity: 0; + width: 0; + height: 0; + } + .car-make-option input[type="checkbox"]:checked + .car-make-image-container .car-make-image { + border: 2px solid #2c7be5; + box-shadow: 0 0 10px rgba(44, 123, 229, 0.5); + background: #f0f7ff; + } + .car-make-name { + margin-top: 8px; + font-size: 12px; + color: #5e6e82; + } + .car-make-image-container { + display: flex; + justify-content: center; + } + .logo-placeholder { + width: 100px; + height: 100px; + display: flex; + align-items: center; + justify-content: center; + background: #f8f9fa; + border-radius: 8px; + } + -
- {% csrf_token %} -
- {{ form.car_makes }} -
- -
+

{{ _("Select Car Makes You Sell") }}

+ +
+ {% csrf_token %} + +
+ {% for car_make in form.fields.car_makes.queryset %} + + + {% endfor %} +
+
+ +
+
{% endblock %} \ No newline at end of file