From bd70bc711de6a75aa19449e498a0f11ca40b46dc Mon Sep 17 00:00:00 2001 From: Artemiy Date: Wed, 7 Nov 2018 17:28:56 +0300 Subject: [PATCH] #630 Move an order phone in favor of shop phone. (#632) --- shopelectro/context_processors.py | 2 +- shopelectro/settings/base.py | 1 + shopelectro/views/catalog.py | 9 ++++++--- templates/ecommerce/order/email.html | 2 +- templates/ecommerce/order/success.html | 4 +--- templates/ecommerce/yandex_feedback.html | 2 +- templates/layout/footer.html | 4 ++-- templates/layout/header.html | 6 +++--- templates/layout/metadata.html | 2 +- 9 files changed, 17 insertions(+), 15 deletions(-) diff --git a/shopelectro/context_processors.py b/shopelectro/context_processors.py index 9aed9765..a521c04c 100644 --- a/shopelectro/context_processors.py +++ b/shopelectro/context_processors.py @@ -11,5 +11,5 @@ def shop(request): return { 'shop': settings.SHOP, 'DEBUG': settings.DEBUG, - 'BASE_URL': settings.BASE_URL + 'BASE_URL': settings.BASE_URL, } diff --git a/shopelectro/settings/base.py b/shopelectro/settings/base.py index be73d4f1..3ab0858e 100644 --- a/shopelectro/settings/base.py +++ b/shopelectro/settings/base.py @@ -313,6 +313,7 @@ 'success_url': BASE_URL + '/shop/order-success/', 'fail_url': BASE_URL + '/', 'cps_phone': '+78124163200', + 'cps_formatted_phone': '416-32-00', 'cps_email': 'info@shopelectro.ru', 'local_delivery_cost': 300, 'local_delivery_cost_threshold': 5000, diff --git a/shopelectro/views/catalog.py b/shopelectro/views/catalog.py index 6ab2691b..252c85d5 100644 --- a/shopelectro/views/catalog.py +++ b/shopelectro/views/catalog.py @@ -211,8 +211,11 @@ def load_more(request, category_slug, offset=0, limit=0, sorting=0, tags=None): category = get_object_or_404(models.CategoryPage, slug=category_slug).model sorting_option = context.SortingOption(index=int(sorting)) - all_products = models.Product.objects.active().get_category_descendants( - category, ordering=(sorting_option.directed_field,) + all_products = ( + models.Product.objects + .active() + .get_category_descendants(category) + .order_by(sorting_option.directed_field) ) if tags: @@ -225,7 +228,7 @@ def load_more(request, category_slug, offset=0, limit=0, sorting=0, tags=None): .filter(tags__in=tag_entities) # Use distinct because filtering by QuerySet tags, # that related with products by many-to-many relation. - .distinct(sorting_option.field) + .distinct() ) paginated = context.PaginatorLinks( diff --git a/templates/ecommerce/order/email.html b/templates/ecommerce/order/email.html index ee97c338..37422d66 100644 --- a/templates/ecommerce/order/email.html +++ b/templates/ecommerce/order/email.html @@ -14,7 +14,7 @@ (812) - 416-32-00 + {{ shop.cps_formatted_phone }} diff --git a/templates/ecommerce/order/success.html b/templates/ecommerce/order/success.html index 6655a94c..f65b67f5 100644 --- a/templates/ecommerce/order/success.html +++ b/templates/ecommerce/order/success.html @@ -18,9 +18,7 @@

Заказ принят

data-total-revenue="{{ total_revenue }}">

Номер вашего заказа {{ order.fake_order_number }}

{% time_to_call %}

- {% if order.phone %} -

Контактный телефон: {{ order.phone }}

- {% endif %} +

Телефон магазина: 8 (812) {{ shop.cps_formatted_phone }}

{% if order.email %}

Электронная почта: {{ order.email }}

diff --git a/templates/ecommerce/yandex_feedback.html b/templates/ecommerce/yandex_feedback.html index 9ec01a34..67cc6d84 100644 --- a/templates/ecommerce/yandex_feedback.html +++ b/templates/ecommerce/yandex_feedback.html @@ -6,7 +6,7 @@ (812) - 416-32-00 + {{ shop.cps_formatted_phone }} diff --git a/templates/layout/footer.html b/templates/layout/footer.html index 003f2c57..f4531947 100644 --- a/templates/layout/footer.html +++ b/templates/layout/footer.html @@ -128,8 +128,8 @@
- - +7 (812) 416-32-00 + + +7 (812) {{ shop.cps_formatted_phone }}

diff --git a/templates/layout/header.html b/templates/layout/header.html index 074b7b1d..e7eccc8e 100644 --- a/templates/layout/header.html +++ b/templates/layout/header.html @@ -20,16 +20,16 @@

- +
- + 8 812 - 416-32-00 + {{ shop.cps_formatted_phone }}
diff --git a/templates/layout/metadata.html b/templates/layout/metadata.html index c8782dcc..a2bc3e8c 100644 --- a/templates/layout/metadata.html +++ b/templates/layout/metadata.html @@ -31,7 +31,7 @@ - + {# seo guys desired this tag: http://prntscr.com/gt5jh1 #}