diff --git a/cart/templates/cart/detail.html b/cart/templates/cart/detail.html index bfc1e87..7771005 100644 --- a/cart/templates/cart/detail.html +++ b/cart/templates/cart/detail.html @@ -4,70 +4,69 @@ {% block title %}Your shopping cart{% endblock %} {% block content %} - +
-

- Корзина -

-

Проверьте свои товары перед оформлением заказа.

-
-
+

+ Корзина +

+

Проверьте свои товары перед оформлением заказа.

+ - +
+
+ + + + + + + + + + + + {% for item in cart %} + {% with product=item.product %} + + + + + + + + + {% endwith %} + {% endfor %} + + + + + +
ИзображениеПродуктКоличествоУдалитьЦена за единицуОбщая цена
+ + {{ product.name }} + + {{ product.name }} +
+ {% csrf_token %} + {{ item.update_quantity_form.quantity }} + {{ item.update_quantity_form.override }} + +
+
+
+ {% csrf_token %} + +
+
₸{{ item.price }}₸{{ item.total_price }}
Итого₸{{ cart.get_total_price }}
+ - - - Изображение - Продукт - Количество - Удалить - Цена за единицу - Общая цена - - - - {% for item in cart %} - {% with product=item.product %} - - - - {{ product.name }} - - - {{ product.name }} - -
- {% csrf_token %} - {{ item.update_quantity_form.quantity }} - {{ item.update_quantity_form.override }} - -
- - -
- {% csrf_token %} - -
- - ₸{{ item.price }} - ₸{{ item.total_price }} - - {% endwith %} - {% endfor %} - - Итого - - ₸{{ cart.get_total_price }} - - - -
- Продолжить покупки - - Оформить заказ +
+ Продолжить покупки + Оформить заказ
diff --git a/db.sqlite3 b/db.sqlite3 index 656f70d..d98da4c 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/django.log b/django.log index fc4ad17..f0df420 100644 --- a/django.log +++ b/django.log @@ -5682,3 +5682,45 @@ WARNING 2024-03-05 16:08:04,936 log Not Found: /favicon.ico INFO 2024-03-05 16:42:51,322 autoreload Watching for file changes with StatReloader WARNING 2024-03-05 16:43:01,054 log Not Found: /about/ WARNING 2024-03-05 16:43:01,167 log Not Found: /favicon.ico +INFO 2024-03-06 12:17:00,290 autoreload Watching for file changes with StatReloader +WARNING 2024-03-06 12:17:36,367 log Not Found: /about/ +WARNING 2024-03-06 12:17:36,468 log Not Found: /favicon.ico +INFO 2024-03-06 12:55:00,433 autoreload Watching for file changes with StatReloader +INFO 2024-03-06 12:59:41,022 autoreload Watching for file changes with StatReloader +INFO 2024-03-06 13:01:18,537 autoreload Watching for file changes with StatReloader +WARNING 2024-03-06 13:01:38,838 log Not Found: /about/ +WARNING 2024-03-06 13:01:38,924 log Not Found: /favicon.ico +INFO 2024-03-06 13:07:46,609 autoreload Watching for file changes with StatReloader +INFO 2024-03-06 13:10:44,176 autoreload Watching for file changes with StatReloader +WARNING 2024-03-06 13:13:25,506 log Not Found: /about/ +INFO 2024-03-06 13:15:40,689 autoreload Watching for file changes with StatReloader +WARNING 2024-03-06 13:17:40,657 log Not Found: /about/ +WARNING 2024-03-06 13:18:58,440 log Not Found: /about/ +INFO 2024-03-06 17:31:05,807 autoreload Watching for file changes with StatReloader +INFO 2024-03-06 17:34:37,089 autoreload Watching for file changes with StatReloader +INFO 2024-03-06 17:40:55,604 autoreload Watching for file changes with StatReloader +INFO 2024-03-07 12:07:41,112 autoreload Watching for file changes with StatReloader +INFO 2024-03-07 13:13:03,537 autoreload Watching for file changes with StatReloader +INFO 2024-03-07 13:13:23,431 autoreload Watching for file changes with StatReloader +INFO 2024-03-07 13:15:03,244 autoreload Watching for file changes with StatReloader +WARNING 2024-03-07 13:17:24,713 log Not Found: /about/ +WARNING 2024-03-07 13:17:24,831 log Not Found: /favicon.ico +INFO 2024-03-07 13:37:50,854 autoreload Watching for file changes with StatReloader +ERROR 2024-03-07 13:43:03,600 log Internal Server Error: /orders/create/ +Traceback (most recent call last): + File "C:\Users\fhjj3\djangoProject1\venv\Lib\site-packages\django\core\handlers\exception.py", line 55, in inner + response = get_response(request) + ^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\fhjj3\djangoProject1\venv\Lib\site-packages\django\core\handlers\base.py", line 197, in _get_response + response = wrapped_callback(request, *callback_args, **callback_kwargs) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\fhjj3\djangoProject1\orders\views.py", line 22, in order_create + send_invoice_via_email(order.email, order) # order.email + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\fhjj3\djangoProject1\orders\utils.py", line 40, in send_invoice_via_email + generate_invoice_image(html_content, image_path) + File "C:\Users\fhjj3\djangoProject1\orders\utils.py", line 27, in generate_invoice_image + os.remove(temp_html) +FileNotFoundError: [WinError 2] : 'temp_invoice.html' +WARNING 2024-03-07 13:43:03,802 log Not Found: /favicon.ico +WARNING 2024-03-07 14:16:25,678 log Not Found: /about/ diff --git a/invoice_image.png b/invoice_image.png index 431ddaf..5603d06 100644 Binary files a/invoice_image.png and b/invoice_image.png differ diff --git a/main/static/deps/css/exo.css b/main/static/deps/css/exo.css index 30c7fd6..80bb638 100644 --- a/main/static/deps/css/exo.css +++ b/main/static/deps/css/exo.css @@ -42,10 +42,9 @@ } .categories-sidebar { - width: 15%; /* Уменьшаем ширину боковой панели */ - margin-left: auto; /* Выравнивание по правому краю */ + width: 75%; /* Уменьшаем ширину боковой панели */ padding: 20px; - background: rgba(0, 0, 0, 0.5); /* Полупрозрачный фон для панели */ + background: rgba(0, 0, 0, 0.07); /* Полупрозрачный фон для панели */ border-radius: 10px; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); } diff --git a/main/static/deps/css/my_css.css b/main/static/deps/css/my_css.css index a896a96..0b9bbd7 100644 --- a/main/static/deps/css/my_css.css +++ b/main/static/deps/css/my_css.css @@ -78,4 +78,10 @@ font-family: 'Playfair Display', fantasy; box-shadow: 0 0 0 0 rgba(255, 215, 0, 0); } } +@media (max-width: 767.98px) { /* Bootstrap breakpoint for small devices */ + .button-container { + flex-direction: row !important; /* Switch to horizontal layout */ + justify-content: center; /* Center buttons horizontally */ + } +} diff --git a/main/templates/main/base.html b/main/templates/main/base.html index b4618ca..950772d 100644 --- a/main/templates/main/base.html +++ b/main/templates/main/base.html @@ -70,42 +70,39 @@ -
- backimg +
+ backimg -
- -
+
- - -
-
- -
-
+
+ {% block content %} +
+ +
+
+ Категории + {% for category in categories %} + {{ category.name }} + {% endfor %} +
+
+
+ {% endblock %}
-
- - - - {% block content %} -
-
-
- Категории - {% for category in categories %} - {{ category.name }} - {% endfor %} -
-
- -
- {% endblock %} -
diff --git a/main/templates/main/product/list.html b/main/templates/main/product/list.html index 1a57827..eac04d8 100644 --- a/main/templates/main/product/list.html +++ b/main/templates/main/product/list.html @@ -5,7 +5,7 @@ -
+
{% for product in products %} @@ -44,7 +44,7 @@ {% endfor %}
-