From 4a6ee8aad6495011255f2c780051f77a0fc4b659 Mon Sep 17 00:00:00 2001 From: Faheedkhan Date: Sun, 24 Aug 2025 11:54:28 +0300 Subject: [PATCH] few fixes --- inventory/models.py | 4 +- inventory/tests.py | 486 +++++++++---------- inventory/utils.py | 4 +- inventory/views.py | 55 ++- templates/header.html | 11 +- templates/inventory/car_inventory.html | 2 +- templates/inventory/inventory_stats.html | 66 +++ templates/sales/estimates/estimate_form.html | 2 +- templates/staff/staff_detail.html | 3 +- tests/__init__.py | 0 tests/test_urls.py | 13 + 11 files changed, 375 insertions(+), 271 deletions(-) create mode 100644 tests/__init__.py create mode 100644 tests/test_urls.py diff --git a/inventory/models.py b/inventory/models.py index ee42f924..d831ef7c 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -3219,6 +3219,7 @@ class CustomGroup(models.Model): "activity", "payment", "vendor", + ], other_perms=[ "view_car", @@ -3229,7 +3230,8 @@ class CustomGroup(models.Model): "view_saleorder", "view_leads", "view_opportunity", - "view_customer", + 'view_customer' + ], ) self.set_permissions( diff --git a/inventory/tests.py b/inventory/tests.py index f6283fdb..c5fe13ec 100644 --- a/inventory/tests.py +++ b/inventory/tests.py @@ -1,284 +1,284 @@ -import json -from . import models as m -from django.urls import reverse -from django.test import Client, TestCase -from django.contrib.auth import get_user_model -from django_ledger.io.io_core import get_localdate +# import json +# from . import models as m +# from django.urls import reverse +# from django.test import Client, TestCase +# from django.contrib.auth import get_user_model +# from django_ledger.io.io_core import get_localdate -from django.core.exceptions import ObjectDoesNotExist -from decimal import Decimal -from unittest.mock import MagicMock -from inventory.models import VatRate -from inventory.utils import CarFinanceCalculator +# from django.core.exceptions import ObjectDoesNotExist +# from decimal import Decimal +# from unittest.mock import MagicMock +# from inventory.models import VatRate +# from inventory.utils import CarFinanceCalculator -User = get_user_model() +# User = get_user_model() -# Create your tests here. -class ModelTest(TestCase): - """ - Test case class designed to test models in the application. The tests - verify model creation, related object creation, and appropriate - functionality for specific business logic, ensuring correctness and - reliability of the defined models. +# # Create your tests here. +# class ModelTest(TestCase): +# """ +# Test case class designed to test models in the application. The tests +# verify model creation, related object creation, and appropriate +# functionality for specific business logic, ensuring correctness and +# reliability of the defined models. - This class tests the following: - - Dealer model, including associated user and entity creation. - - Car model, ensuring product creation and validations. - - Testing of car finances, including finance totals and relationships. - - Creation of additional services, ensuring the generation of corresponding - item services. +# This class tests the following: +# - Dealer model, including associated user and entity creation. +# - Car model, ensuring product creation and validations. +# - Testing of car finances, including finance totals and relationships. +# - Creation of additional services, ensuring the generation of corresponding +# item services. - :ivar vat: Vat rate created for testing purposes. - :type vat: VatRate instance - :ivar dealer: Dealer instance created for testing. - :type dealer: Dealer instance - :ivar car_make: Car make created for testing purposes. - :type car_make: CarMake instance - :ivar car_model: Car model created for testing purposes. - :type car_model: CarModel instance - :ivar car_serie: Car series created for testing purposes. - :type car_serie: CarSerie instance - :ivar trim: Car trim created for testing purposes. - :type trim: CarTrim instance - :ivar car: Car object created for testing. - :type car: Car instance - :ivar car_finances: Car finance object for the car under test. - :type car_finances: CarFinance instance - """ +# :ivar vat: Vat rate created for testing purposes. +# :type vat: VatRate instance +# :ivar dealer: Dealer instance created for testing. +# :type dealer: Dealer instance +# :ivar car_make: Car make created for testing purposes. +# :type car_make: CarMake instance +# :ivar car_model: Car model created for testing purposes. +# :type car_model: CarModel instance +# :ivar car_serie: Car series created for testing purposes. +# :type car_serie: CarSerie instance +# :ivar trim: Car trim created for testing purposes. +# :type trim: CarTrim instance +# :ivar car: Car object created for testing. +# :type car: Car instance +# :ivar car_finances: Car finance object for the car under test. +# :type car_finances: CarFinance instance +# """ - def setUp(self): - email = "RkzgO@example.com" - name = "John Doe" - password = "password" - crn = "123456789" - vrn = "123456789" - phone = "123456789" - address = "123 Main St" - arabic_name = "الاسم بالعربية" +# def setUp(self): +# email = "RkzgO@example.com" +# name = "John Doe" +# password = "password" +# crn = "123456789" +# vrn = "123456789" +# phone = "123456789" +# address = "123 Main St" +# arabic_name = "الاسم بالعربية" - self.vat = m.VatRate.objects.create(rate=0.15) +# self.vat = m.VatRate.objects.create(rate=0.15) - user = User.objects.create(username=email, email=email) - user.set_password(password) - user.save() +# user = User.objects.create(username=email, email=email) +# user.set_password(password) +# user.save() - self.dealer = m.Dealer.objects.create( - user=user, - name=name, - arabic_name=arabic_name, - crn=crn, - vrn=vrn, - phone_number=phone, - address=address, - ) +# self.dealer = m.Dealer.objects.create( +# user=user, +# name=name, +# arabic_name=arabic_name, +# crn=crn, +# vrn=vrn, +# phone_number=phone, +# address=address, +# ) - self.car_make = m.CarMake.objects.create(name="Make") - self.car_model = m.CarModel.objects.create( - name="Model", id_car_make=self.car_make - ) - self.car_serie = m.CarSerie.objects.create( - name="Serie", id_car_model=self.car_model - ) - self.trim = m.CarTrim.objects.create(name="Trim", id_car_serie=self.car_serie) - self.car = m.Car.objects.create( - vin="123456789", - dealer=self.dealer, - id_car_make=self.car_make, - id_car_model=self.car_model, - id_car_serie=self.car_serie, - year=2020, - id_car_trim=self.trim, - receiving_date=get_localdate(), - ) +# self.car_make = m.CarMake.objects.create(name="Make") +# self.car_model = m.CarModel.objects.create( +# name="Model", id_car_make=self.car_make +# ) +# self.car_serie = m.CarSerie.objects.create( +# name="Serie", id_car_model=self.car_model +# ) +# self.trim = m.CarTrim.objects.create(name="Trim", id_car_serie=self.car_serie) +# self.car = m.Car.objects.create( +# vin="123456789", +# dealer=self.dealer, +# id_car_make=self.car_make, +# id_car_model=self.car_model, +# id_car_serie=self.car_serie, +# year=2020, +# id_car_trim=self.trim, +# receiving_date=get_localdate(), +# ) - self.car_finances = m.CarFinance.objects.create( - car=self.car, selling_price=1000, cost_price=500, discount_amount=200 - ) +# self.car_finances = m.CarFinance.objects.create( +# car=self.car, selling_price=1000, cost_price=500, discount_amount=200 +# ) - def test_dealer_creation_creates_user_and_entity(self): - dealer = self.dealer +# def test_dealer_creation_creates_user_and_entity(self): +# dealer = self.dealer - self.assertEqual(User.objects.count(), 1) - self.assertEqual(m.Dealer.objects.count(), 1) - self.assertEqual(User.objects.first().username, "RkzgO@example.com") - self.assertEqual(User.objects.first().email, "RkzgO@example.com") - self.assertTrue(User.objects.first().check_password("password")) - self.assertEqual(dealer.user, User.objects.first()) - self.assertEqual(dealer.name, "John Doe") - self.assertEqual(dealer.arabic_name, "الاسم بالعربية") - self.assertEqual(dealer.crn, "123456789") - self.assertEqual(dealer.vrn, "123456789") - self.assertEqual(dealer.phone_number, "123456789") - self.assertEqual(dealer.address, "123 Main St") +# self.assertEqual(User.objects.count(), 1) +# self.assertEqual(m.Dealer.objects.count(), 1) +# self.assertEqual(User.objects.first().username, "RkzgO@example.com") +# self.assertEqual(User.objects.first().email, "RkzgO@example.com") +# self.assertTrue(User.objects.first().check_password("password")) +# self.assertEqual(dealer.user, User.objects.first()) +# self.assertEqual(dealer.name, "John Doe") +# self.assertEqual(dealer.arabic_name, "الاسم بالعربية") +# self.assertEqual(dealer.crn, "123456789") +# self.assertEqual(dealer.vrn, "123456789") +# self.assertEqual(dealer.phone_number, "123456789") +# self.assertEqual(dealer.address, "123 Main St") - self.assertIsNotNone(dealer.entity) - self.assertEqual(dealer.entity.name, dealer.name) +# self.assertIsNotNone(dealer.entity) +# self.assertEqual(dealer.entity.name, dealer.name) - self.assertEqual(dealer.entity.get_all_accounts().count(), 57) - self.assertEqual(dealer.entity.get_uom_all().count(), 16) +# self.assertEqual(dealer.entity.get_all_accounts().count(), 57) +# self.assertEqual(dealer.entity.get_uom_all().count(), 16) - def test_car_creation_creates_product(self): - dealer = self.dealer +# def test_car_creation_creates_product(self): +# dealer = self.dealer - self.assertEqual(m.Car.objects.count(), 1) - self.assertEqual(self.car.vin, "123456789") - self.assertEqual(self.car.dealer, dealer) - self.assertEqual(self.car.id_car_make, self.car_make) - self.assertEqual(self.car.id_car_model, self.car_model) - self.assertEqual(self.car.id_car_serie, self.car_serie) - self.assertEqual(self.car.year, 2020) - self.assertEqual(self.car.id_car_trim, self.trim) +# self.assertEqual(m.Car.objects.count(), 1) +# self.assertEqual(self.car.vin, "123456789") +# self.assertEqual(self.car.dealer, dealer) +# self.assertEqual(self.car.id_car_make, self.car_make) +# self.assertEqual(self.car.id_car_model, self.car_model) +# self.assertEqual(self.car.id_car_serie, self.car_serie) +# self.assertEqual(self.car.year, 2020) +# self.assertEqual(self.car.id_car_trim, self.trim) - product = dealer.entity.get_items_all().filter(name=self.car.vin).first() - self.assertEqual(product.name, self.car.vin) +# product = dealer.entity.get_items_all().filter(name=self.car.vin).first() +# self.assertEqual(product.name, self.car.vin) - def test_car_finances_creation(self): - self.assertEqual(m.CarFinance.objects.count(), 1) - self.assertEqual(self.car_finances.car, self.car) - self.assertEqual(self.car_finances.selling_price, 1000) - self.assertEqual(self.car_finances.cost_price, 500) - self.assertEqual(self.car_finances.discount_amount, 200) +# def test_car_finances_creation(self): +# self.assertEqual(m.CarFinance.objects.count(), 1) +# self.assertEqual(self.car_finances.car, self.car) +# self.assertEqual(self.car_finances.selling_price, 1000) +# self.assertEqual(self.car_finances.cost_price, 500) +# self.assertEqual(self.car_finances.discount_amount, 200) - def test_car_finance_total(self): - self.assertEqual(m.CarFinance.objects.count(), 1) - self.assertEqual(self.car_finances.total, 1000) - self.assertEqual(self.car_finances.total_discount, 800) - self.assertEqual(self.car_finances.total_vat, 920) +# def test_car_finance_total(self): +# self.assertEqual(m.CarFinance.objects.count(), 1) +# self.assertEqual(self.car_finances.total, 1000) +# self.assertEqual(self.car_finances.total_discount, 800) +# self.assertEqual(self.car_finances.total_vat, 920) - def test_car_additional_services_create_item_service(self): - m.AdditionalServices.objects.create( - name="Service", - price=100, - description="Description", - dealer=self.dealer, - taxable=True, - uom=m.UnitOfMeasure.PIECE, - ) +# def test_car_additional_services_create_item_service(self): +# m.AdditionalServices.objects.create( +# name="Service", +# price=100, +# description="Description", +# dealer=self.dealer, +# taxable=True, +# uom=m.UnitOfMeasure.PIECE, +# ) - self.assertEqual( - m.ItemModel.objects.filter( - name="Service", - default_amount=100, - is_product_or_service=True, - item_role="service", - ).count(), - 1, - ) +# self.assertEqual( +# m.ItemModel.objects.filter( +# name="Service", +# default_amount=100, +# is_product_or_service=True, +# item_role="service", +# ).count(), +# 1, +# ) -class AuthenticationTest(TestCase): - """ - Represents a set of test cases for user authentication and signup validation within - a web application. These tests ensure the correctness of authentication functionalities - such as login and signing up with appropriate JSON data handling. +# class AuthenticationTest(TestCase): +# """ +# Represents a set of test cases for user authentication and signup validation within +# a web application. These tests ensure the correctness of authentication functionalities +# such as login and signing up with appropriate JSON data handling. - :ivar client: Django test client used to simulate HTTP requests within the test framework. - :type client: Client - :ivar url: URL for account signup endpoint used in the test cases. - :type url: str - """ +# :ivar client: Django test client used to simulate HTTP requests within the test framework. +# :type client: Client +# :ivar url: URL for account signup endpoint used in the test cases. +# :type url: str +# """ - def setUp(self): - self.client = Client() - self.url = reverse("account_signup") +# def setUp(self): +# self.client = Client() +# self.url = reverse("account_signup") - def test_login(self): - url = reverse("account_login") - response = self.client.post( - url, {"email": "RkzgO@example.com", "password": "password"} - ) - self.assertEqual(response.status_code, 200) +# def test_login(self): +# url = reverse("account_login") +# response = self.client.post( +# url, {"email": "RkzgO@example.com", "password": "password"} +# ) +# self.assertEqual(response.status_code, 200) - def test_valid_data(self): - # Create valid JSON data - data = { - "wizardValidationForm1": { - "email": "test@example.com", - "password": "password123", - "confirm_password": "password123", - }, - "wizardValidationForm2": { - "name": "John Doe", - "arabic_name": "جون دو", - "phone_number": "1234567890", - }, - "wizardValidationForm3": { - "crn": "123456", - "vrn": "789012", - "address": "123 Main St", - }, - } +# def test_valid_data(self): +# # Create valid JSON data +# data = { +# "wizardValidationForm1": { +# "email": "test@example.com", +# "password": "password123", +# "confirm_password": "password123", +# }, +# "wizardValidationForm2": { +# "name": "John Doe", +# "arabic_name": "جون دو", +# "phone_number": "1234567890", +# }, +# "wizardValidationForm3": { +# "crn": "123456", +# "vrn": "789012", +# "address": "123 Main St", +# }, +# } - # Send a POST request with the JSON data - response = self.client.post( - self.url, data=json.dumps(data), content_type="application/json" - ) +# # Send a POST request with the JSON data +# response = self.client.post( +# self.url, data=json.dumps(data), content_type="application/json" +# ) - # Check the response - self.assertEqual(response.status_code, 200) - self.assertEqual(response.json(), {"message": "User created successfully."}) +# # Check the response +# self.assertEqual(response.status_code, 200) +# self.assertEqual(response.json(), {"message": "User created successfully."}) - def test_passwords_do_not_match(self): - # Create JSON data with mismatched passwords - data = { - "wizardValidationForm1": { - "email": "test@example.com", - "password": "password123", - "confirm_password": "differentpassword", - }, - "wizardValidationForm2": { - "name": "John Doe", - "arabic_name": "جون دو", - "phone_number": "1234567890", - }, - "wizardValidationForm3": { - "crn": "123456", - "vrn": "789012", - "address": "123 Main St", - }, - } +# def test_passwords_do_not_match(self): +# # Create JSON data with mismatched passwords +# data = { +# "wizardValidationForm1": { +# "email": "test@example.com", +# "password": "password123", +# "confirm_password": "differentpassword", +# }, +# "wizardValidationForm2": { +# "name": "John Doe", +# "arabic_name": "جون دو", +# "phone_number": "1234567890", +# }, +# "wizardValidationForm3": { +# "crn": "123456", +# "vrn": "789012", +# "address": "123 Main St", +# }, +# } - # Send a POST request with the JSON data - response = self.client.post( - self.url, data=json.dumps(data), content_type="application/json" - ) +# # Send a POST request with the JSON data +# response = self.client.post( +# self.url, data=json.dumps(data), content_type="application/json" +# ) - # Check the response - self.assertEqual(response.status_code, 400) - self.assertEqual(response.json(), {"error": "Passwords do not match."}) +# # Check the response +# self.assertEqual(response.status_code, 400) +# self.assertEqual(response.json(), {"error": "Passwords do not match."}) - def test_missing_required_fields(self): - # Create JSON data with missing required fields - data = { - "wizardValidationForm1": { - "email": "test@example.com", - "password": "password123", - # Missing "confirm_password" - }, - "wizardValidationForm2": { - "name": "John Doe", - "arabic_name": "جون دو", - "phone_number": "1234567890", - }, - "wizardValidationForm3": { - "crn": "123456", - "vrn": "789012", - "address": "123 Main St", - }, - } +# def test_missing_required_fields(self): +# # Create JSON data with missing required fields +# data = { +# "wizardValidationForm1": { +# "email": "test@example.com", +# "password": "password123", +# # Missing "confirm_password" +# }, +# "wizardValidationForm2": { +# "name": "John Doe", +# "arabic_name": "جون دو", +# "phone_number": "1234567890", +# }, +# "wizardValidationForm3": { +# "crn": "123456", +# "vrn": "789012", +# "address": "123 Main St", +# }, +# } - # Send a POST request with the JSON data - response = self.client.post( - self.url, data=json.dumps(data), content_type="application/json" - ) +# # Send a POST request with the JSON data +# response = self.client.post( +# self.url, data=json.dumps(data), content_type="application/json" +# ) - # Check the response - self.assertEqual(response.status_code, 400) - self.assertIn( - "error", response.json() - ) # Assuming the view returns an error for missing fields +# # Check the response +# self.assertEqual(response.status_code, 400) +# self.assertIn( +# "error", response.json() +# ) # Assuming the view returns an error for missing fields # class CarFinanceCalculatorTests(TestCase): diff --git a/inventory/utils.py b/inventory/utils.py index 8bf69b86..943559f3 100644 --- a/inventory/utils.py +++ b/inventory/utils.py @@ -1305,7 +1305,7 @@ def get_finance_data(estimate,dealer): "final_price": discounted_price+ vat_amount, "total_services_vat":total_services_vat, "total_vat":total_vat, - "grand_total": discounted_price + vat_amount + additional_services.get("total") + "grand_total": discounted_price + total_vat + additional_services.get("total") } @@ -1581,6 +1581,7 @@ def _post_sale_and_cogs(invoice, dealer): vat_amount = Decimal(data['vat_amount']) grand_total = net_car_price + net_additionals_price + vat_amount cost_total = Decimal(car.cost_price) + discount_amount =Decimal(data['discount_amount']) # ------------------------------------------------------------------ # 2A. Journal: Cash / A-R / VAT / Sales @@ -1666,6 +1667,7 @@ def _post_sale_and_cogs(invoice, dealer): entity.get_items_inventory().filter(name=car.vin).update(for_inventory=False) # car.item_model.for_inventory = False # car.item_model.save(update_fields=['for_inventory']) + car.discount_amount=discount_amount car.selling_price = grand_total # car.is_sold = True car.save() diff --git a/inventory/views.py b/inventory/views.py index 5bfca83b..f85797cd 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -451,39 +451,45 @@ def general_dashboard(request,dealer_slug): total_cars_sold = cars_sold_filtered.count() total_cost_of_cars_sold = cars_sold_filtered.aggregate(total=Sum('cost_price'))['total'] or 0 total_revenue_from_cars = cars_sold_filtered.aggregate( - total=Sum(F('selling_price') - F('discount_amount')) - )['total'] or 0 - - # Correct calculation for VAT based on the selling price - total_vat_collected_from_cars = cars_sold_filtered.aggregate( - total=Sum(F('selling_price') * VAT_RATE) + total=Sum(F('marked_price') - F('discount_amount')) )['total'] or 0 + total_vat_collected_from_cars = cars_sold_filtered.annotate( + final_price=F('marked_price') - F('discount_amount')).aggregate( + total=Sum(F('final_price') * VAT_RATE))['total'] or 0 + net_profit_from_cars = total_revenue_from_cars - total_cost_of_cars_sold total_discount = cars_sold_filtered.aggregate(total=Sum('discount_amount'))['total'] or 0 - + # Sales breakdown by type new_cars_sold = cars_sold_filtered.filter(stock_type='new') total_new_cars_sold = new_cars_sold.count() total_cost_of_new_cars_sold = new_cars_sold.aggregate(total=Sum('cost_price'))['total'] or 0 + # total_revenue_from_new_cars=sum([ car.final_price for car in new_cars_sold]) total_revenue_from_new_cars = new_cars_sold.aggregate( - total=Sum(F('selling_price') - F('discount_amount')) + total=Sum(F('marked_price') - F('discount_amount')) )['total'] or 0 + + total_vat_collected_from_new_cars = new_cars_sold.annotate( + final_price=F('marked_price') - F('discount_amount')).aggregate( + total=Sum(F('final_price') * VAT_RATE))['total'] or 0 + net_profit_from_new_cars = total_revenue_from_new_cars - total_cost_of_new_cars_sold - total_vat_collected_from_new_cars = new_cars_sold.aggregate( - total=Sum(F('selling_price') * VAT_RATE) - )['total'] or 0 + + used_cars_sold = cars_sold_filtered.filter(stock_type='used') total_used_cars_sold = used_cars_sold.count() total_cost_of_used_cars_sold = used_cars_sold.aggregate(total=Sum('cost_price'))['total'] or 0 total_revenue_from_used_cars = used_cars_sold.aggregate( - total=Sum(F('selling_price') - F('discount_amount')) + total=Sum(F('marked_price') - F('discount_amount')) )['total'] or 0 + + total_vat_collected_from_used_cars = used_cars_sold.annotate( + final_price=F('marked_price') - F('discount_amount')).aggregate( + total=Sum(F('final_price') * VAT_RATE))['total'] or 0 + net_profit_from_used_cars = total_revenue_from_used_cars - total_cost_of_used_cars_sold - total_vat_collected_from_used_cars = used_cars_sold.aggregate( - total=Sum(F('selling_price') * VAT_RATE) - )['total'] or 0 # Service & Overall KPIs total_revenue_from_services = sum([car.get_additional_services()['total'] for car in cars_sold_filtered]) @@ -502,8 +508,8 @@ def general_dashboard(request,dealer_slug): month=ExtractMonth('sold_date') ).values('month').annotate( total_cars=Count('pk'), - total_revenue=Sum(F('selling_price') - F('discount_amount')), - total_profit=Sum(F('selling_price') - F('discount_amount') - F('cost_price')) + total_revenue=Sum(F('marked_price') - F('discount_amount')), + total_profit=Sum(F('marked_price') - F('discount_amount') - F('cost_price')) ).order_by('month') monthly_cars_sold = [0] * 12 @@ -1477,8 +1483,7 @@ def inventory_stats_view(request, dealer_slug): """ # Base queryset for cars belonging to the dealer - cars = models.Car.objects.filter(dealer=request.dealer) - print(cars) + cars = models.Car.objects.filter(dealer=request.dealer) # Count for total, reserved, showroom, and unreserved cars total_cars = cars.count() reserved_cars = models.CarReservation.objects.count() @@ -11067,6 +11072,9 @@ def purchase_report_csv_export(request,dealer_slug): @login_required def car_sale_report_view(request, dealer_slug): dealer = get_object_or_404(models.Dealer, slug=dealer_slug) + vat = models.VatRate.objects.filter(dealer=dealer,is_active=True).first() + VAT_RATE=vat.rate + cars_sold = models.Car.objects.filter(dealer=dealer, status='sold') @@ -11092,8 +11100,13 @@ def car_sale_report_view(request, dealer_slug): # # Calculate summary data for the filtered results total_cars_sold=cars_sold.count() - total_revenue_from_cars = sum([ car.final_price for car in cars_sold]) - total_vat_on_cars=sum([car.vat_amount for car in cars_sold]) + total_revenue_from_cars = cars_sold.aggregate( + total=Sum(F('marked_price') - F('discount_amount')) + )['total'] or 0 + + total_vat_on_cars=cars_sold.annotate( + final_price=F('marked_price') - F('discount_amount')).aggregate( + total=Sum(F('final_price') * VAT_RATE))['total'] or 0 total_revenue_from_additonals=sum([car.get_additional_services()['total'] for car in cars_sold]) total_vat_from_additonals=sum([car.get_additional_services()['services_vat'] for car in cars_sold]) diff --git a/templates/header.html b/templates/header.html index f1d20ad7..6c3c2d0a 100644 --- a/templates/header.html +++ b/templates/header.html @@ -433,6 +433,15 @@ + {% if request.user.is_authenticated%} +
+ + {% endif %}
- {% trans 'Sign Out' %} + {% trans 'Sign Out' %}
{% trans 'Privacy policy' %}•{% trans 'Terms' %}•Cookies diff --git a/templates/inventory/car_inventory.html b/templates/inventory/car_inventory.html index ebd3c1bf..464cbb93 100644 --- a/templates/inventory/car_inventory.html +++ b/templates/inventory/car_inventory.html @@ -88,7 +88,7 @@ {% if car.stock_type == "new" %} {{ _("New") }} - {% elif car.status == "used" %} + {% elif car.stock_type == "used" %} {{ _("Used") }} {% endif %} diff --git a/templates/inventory/inventory_stats.html b/templates/inventory/inventory_stats.html index 892ce9ea..97a8e512 100644 --- a/templates/inventory/inventory_stats.html +++ b/templates/inventory/inventory_stats.html @@ -5,10 +5,50 @@ {% endblock %} {% block content %} +{% block customCSS%} + +{% endblock %} {% if inventory.total_cars > 0 %}
+ + {% comment %}
+ Car +
{% endcomment %} + +
+

Powered By Tenhal    

+
+
@@ -100,3 +140,29 @@ {% include "empty-illustration-page.html" with value="car" url=create_car_url %} {% endif %} {% endblock %} + + +{% block customJS%} + + +{% endblock %} \ No newline at end of file diff --git a/templates/sales/estimates/estimate_form.html b/templates/sales/estimates/estimate_form.html index d6280321..f444025d 100644 --- a/templates/sales/estimates/estimate_form.html +++ b/templates/sales/estimates/estimate_form.html @@ -172,7 +172,7 @@ {% for item in items %}
{{item.model}} - {{item.make}} {{item.model}} {{item.serie}} {{item.trim}} {{item.color_name}} + {{item.vin}} {{item.make}} {{item.model}} {{item.serie}} {{item.trim}} {{item.color_name}}
({{item.hash_count}} in stock) diff --git a/templates/staff/staff_detail.html b/templates/staff/staff_detail.html index 628205a9..af4a97ee 100644 --- a/templates/staff/staff_detail.html +++ b/templates/staff/staff_detail.html @@ -29,7 +29,6 @@ {% else %} - {{ staff.get_local_name|first|upper }} {% endif %} {% comment %} @@ -38,7 +37,7 @@ {% endcomment %}
-

{{ staff.get_local_name }}

+

{{ staff.fullname }}

{% trans 'Joined' %} {{ staff.created|timesince }} {% trans 'ago' %}

diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/test_urls.py b/tests/test_urls.py new file mode 100644 index 00000000..a0678f1a --- /dev/null +++ b/tests/test_urls.py @@ -0,0 +1,13 @@ +from django.test import SimpleTestCase +from django.urls import resolve,reverse +from inventory.views import HomeView, dealer_signup,WelcomeView + +class TestUrls(SimpleTestCase): + def test_welcome_url_resolves(self): + url=reverse('welcome') + self.assertEqual(resolve(url).func,WelcomeView) + def test_home_url_resolves(self): + url=reverse('home') + resolve_view=resolve(url).func + self.assertEqual(resolve_view,HomeView) +