diff --git a/car_inventory/__pycache__/settings.cpython-311.pyc b/car_inventory/__pycache__/settings.cpython-311.pyc index 825dd1b5..22b56171 100644 Binary files a/car_inventory/__pycache__/settings.cpython-311.pyc and b/car_inventory/__pycache__/settings.cpython-311.pyc differ diff --git a/car_inventory/settings.py b/car_inventory/settings.py index 545ad623..a9ef3a3a 100644 --- a/car_inventory/settings.py +++ b/car_inventory/settings.py @@ -29,7 +29,6 @@ DEBUG = True ALLOWED_HOSTS = ['10.10.1.109', 'localhost', '127.0.0.1', '192.168.1.109', '172.20.10.4'] # Application definition - INSTALLED_APPS = [ 'django.contrib.sites', 'django.contrib.admin', @@ -40,8 +39,6 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'inventory.apps.InventoryConfig', 'api.apps.ApiConfig', - - # Other Apps to select what we need before deploy 'allauth', 'allauth.account', 'allauth.socialaccount', @@ -62,7 +59,6 @@ INSTALLED_APPS = [ 'djmoney', 'sslserver', 'haikalbot', - ] SITE_ID = 1 @@ -138,7 +134,6 @@ AUTH_PASSWORD_VALIDATORS = [ ] # Authentications - LOGIN_REDIRECT_URL = '/' ACCOUNT_LOGOUT_REDIRECT_URL = '/' ACCOUNT_EMAIL_VERIFICATION = "none" @@ -151,19 +146,12 @@ AUTHENTICATION_BACKENDS = [ REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': [ 'rest_framework.authentication.TokenAuthentication', - # 'rest_framework.authentication.SessionAuthentication', - # 'dj_rest_auth.jwt_auth.JWTCookieAuthentication', ], 'DEFAULT_PERMISSION_CLASSES': [ - # 'rest_framework.permissions.IsAuthenticated', 'rest_framework.permissions.AllowAny', ], } -# REST_AUTH = { -# 'USE_JWT': True, -# 'JWT_AUTH_COOKIE': 'jwt-auth', -# } # Email backend EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend" @@ -223,24 +211,18 @@ DJANGO_TABLES2_TABLE_ATTRS = { } CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5" - CRISPY_TEMPLATE_PACK = "bootstrap5" -# DEFAULT_CURRENCY = 'SAR' - # API KEYS -# OPENAI (GPT) +# OPENAI OPENAI_API_KEY = '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' -# ELM API KEYS -# vehicle-info -# c2729afb -# 6d397471920412d672af1b8a02ca52ea - # option-info # 367974ed # 046b0412c1b4d3f8c39ec6375d6f3030 +# vehicle-info +# ELM API KEYS ELM_APP_ID = 'c2729afb' ELM_APP_KEY = '6d397471920412d672af1b8a02ca52ea' ELM_CLIENT_ID = '94142c27-2536-47e9-8e28-9ca7728b9442' @@ -256,15 +238,16 @@ LOGGING = { 'loggers': { 'django': { 'handlers': ['console'], - 'level': 'INFO', # Change to WARNING or ERROR as needed + 'level': 'INFO', }, 'openai': { 'handlers': ['console'], - 'level': 'WARNING', # Suppress detailed logs from OpenAI client + 'level': 'WARNING', }, }, } # Global Settings +DEFAULT_CURRENCY = 'SAR' CURRENCY = _('SAR') VAT_RATE = Decimal('0.15') \ No newline at end of file diff --git a/inventory/__pycache__/views.cpython-311.pyc b/inventory/__pycache__/views.cpython-311.pyc index 73d26b03..7f22944e 100644 Binary files a/inventory/__pycache__/views.cpython-311.pyc and b/inventory/__pycache__/views.cpython-311.pyc differ diff --git a/inventory/signals.py b/inventory/signals.py index 50242417..a1dc9c5c 100644 --- a/inventory/signals.py +++ b/inventory/signals.py @@ -64,10 +64,8 @@ def create_ledger_entity(sender, instance, created, **kwargs): entity = EntityModel.objects.create( name=instance.name, admin=instance.user, - # address_1=instance.address, accrual_method=False, fy_start_month=1, - # depth=0, ) default_coa = entity.create_chart_of_accounts(assign_as_default=True, diff --git a/inventory/views.py b/inventory/views.py index aa2ee751..d411aea3 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -298,7 +298,6 @@ class CarColorCreate(LoginRequiredMixin, CreateView): def inventory_stats_view(request): dealer = request.user.dealer - # Annotate total cars by make, model, and trim cars = ( models.Car.objects.filter(dealer=dealer.get_parent_or_self) .select_related('id_car_make', 'id_car_model', 'id_car_trim') @@ -316,7 +315,6 @@ def inventory_stats_view(request): inventory[make.id_car_make] = { 'make_id': make.id_car_make, 'make_name': make.get_local_name, - 'logo': make.logo, 'total_cars': 0, 'models': {} } @@ -347,7 +345,6 @@ def inventory_stats_view(request): { 'make_id': make_data['make_id'], 'make_name': make_data['make_name'], - 'logo': make_data['logo'], 'total_cars': make_data['total_cars'], 'models': [ { diff --git a/static/images/.DS_Store b/static/images/.DS_Store index 5cd0001f..da8c1491 100644 Binary files a/static/images/.DS_Store and b/static/images/.DS_Store differ diff --git a/static/images/logos/.DS_Store b/static/images/logos/.DS_Store index e7c24729..21d13a80 100644 Binary files a/static/images/logos/.DS_Store and b/static/images/logos/.DS_Store differ diff --git a/static/images/logos/Al-Futaim-automotive.png b/static/images/logos/suppliers/Al-Futaim-automotive copy.png similarity index 100% rename from static/images/logos/Al-Futaim-automotive.png rename to static/images/logos/suppliers/Al-Futaim-automotive copy.png diff --git a/static/images/logos/Al-Futaim-automotive_ZJdcLcr.png b/static/images/logos/suppliers/Al-Futaim-automotive_ZJdcLcr.png similarity index 100% rename from static/images/logos/Al-Futaim-automotive_ZJdcLcr.png rename to static/images/logos/suppliers/Al-Futaim-automotive_ZJdcLcr.png diff --git a/static/images/logos/Alamjdouie-Hyundai-Auto.jpeg b/static/images/logos/suppliers/Alamjdouie-Hyundai-Auto.jpeg similarity index 100% rename from static/images/logos/Alamjdouie-Hyundai-Auto.jpeg rename to static/images/logos/suppliers/Alamjdouie-Hyundai-Auto.jpeg diff --git a/static/images/logos/Alamjdouie-Hyundai-Auto.png b/static/images/logos/suppliers/Alamjdouie-Hyundai-Auto.png similarity index 100% rename from static/images/logos/Alamjdouie-Hyundai-Auto.png rename to static/images/logos/suppliers/Alamjdouie-Hyundai-Auto.png diff --git a/static/images/logos/Alamjdouie-Hyundai-Auto.svg b/static/images/logos/suppliers/Alamjdouie-Hyundai-Auto.svg similarity index 100% rename from static/images/logos/Alamjdouie-Hyundai-Auto.svg rename to static/images/logos/suppliers/Alamjdouie-Hyundai-Auto.svg diff --git a/static/images/logos/Alamjdouie-Hyundai-Auto_IybmIRQ.jpeg b/static/images/logos/suppliers/Alamjdouie-Hyundai-Auto_IybmIRQ.jpeg similarity index 100% rename from static/images/logos/Alamjdouie-Hyundai-Auto_IybmIRQ.jpeg rename to static/images/logos/suppliers/Alamjdouie-Hyundai-Auto_IybmIRQ.jpeg diff --git a/static/images/logos/Aljazirah-Vehicles-Agencies-Co.png b/static/images/logos/suppliers/Aljazirah-Vehicles-Agencies-Co.png similarity index 100% rename from static/images/logos/Aljazirah-Vehicles-Agencies-Co.png rename to static/images/logos/suppliers/Aljazirah-Vehicles-Agencies-Co.png diff --git a/static/images/logos/Aljazirah-Vehicles-Agencies-Co_h52lPXi.png b/static/images/logos/suppliers/Aljazirah-Vehicles-Agencies-Co_h52lPXi.png similarity index 100% rename from static/images/logos/Aljazirah-Vehicles-Agencies-Co_h52lPXi.png rename to static/images/logos/suppliers/Aljazirah-Vehicles-Agencies-Co_h52lPXi.png diff --git a/static/images/logos/Aljomaih-Automotive-Company.png b/static/images/logos/suppliers/Aljomaih-Automotive-Company copy.png similarity index 100% rename from static/images/logos/Aljomaih-Automotive-Company.png rename to static/images/logos/suppliers/Aljomaih-Automotive-Company copy.png diff --git a/static/images/logos/Alrassam-Company-Limited.png b/static/images/logos/suppliers/Alrassam-Company-Limited.png similarity index 100% rename from static/images/logos/Alrassam-Company-Limited.png rename to static/images/logos/suppliers/Alrassam-Company-Limited.png diff --git a/static/images/logos/Alrassam-Company-Limited_gQiebAY.png b/static/images/logos/suppliers/Alrassam-Company-Limited_gQiebAY.png similarity index 100% rename from static/images/logos/Alrassam-Company-Limited_gQiebAY.png rename to static/images/logos/suppliers/Alrassam-Company-Limited_gQiebAY.png diff --git a/static/images/logos/adnan_logo.png b/static/images/logos/suppliers/adnan_logo.png similarity index 100% rename from static/images/logos/adnan_logo.png rename to static/images/logos/suppliers/adnan_logo.png diff --git a/static/images/logos/adnan_logo_hcd452e.png b/static/images/logos/suppliers/adnan_logo_hcd452e.png similarity index 100% rename from static/images/logos/adnan_logo_hcd452e.png rename to static/images/logos/suppliers/adnan_logo_hcd452e.png diff --git a/static/images/logos/alfuttaim-logo-3.svg b/static/images/logos/suppliers/alfuttaim-logo-3.svg similarity index 100% rename from static/images/logos/alfuttaim-logo-3.svg rename to static/images/logos/suppliers/alfuttaim-logo-3.svg diff --git a/static/images/logos/contlogo_q0pFGsZ.png b/static/images/logos/suppliers/contlogo_q0pFGsZ.png similarity index 100% rename from static/images/logos/contlogo_q0pFGsZ.png rename to static/images/logos/suppliers/contlogo_q0pFGsZ.png diff --git a/templates/inventory/car_detail.html b/templates/inventory/car_detail.html index b7b3e701..b148562e 100644 --- a/templates/inventory/car_detail.html +++ b/templates/inventory/car_detail.html @@ -274,9 +274,7 @@
-

{% trans 'Colors Details' %}

-
@@ -370,10 +368,12 @@ {% else %}
-
- {% csrf_token %} - -
+ {% endif %}