#671 phone in order mail (#672)

* Create test case to catch an issue.

* Fix issues with render_to_string function.

shopelectro/tests/tests_selenium.py

@@ -784,6 +784,9 @@ def test_order_email(self):
         self.assertIn('Наличные', sent_mail_body)
         self.assertIn('+7 (222) 222 22 22', sent_mail_body)
         self.assertIn('test@test.test', sent_mail_body)
+        self.assertIn(f'tel:{settings.SHOP["cps_phone"]}', sent_mail_body)
+        self.assertIn(settings.SHOP['cps_formatted_phone'], sent_mail_body)
+
         for code in clean_codes:
             self.assertInHTML(
                 '<td align="left"'

shopelectro/views/ecommerce.py

@@ -18,6 +18,10 @@
 class OrderPage(ec_views.OrderPage):
     order_form = OrderForm
     cart = SECart
+    # Django does not provide context_processors for render_to_string function,
+    # which is used to render an order mail. So we have to explicitly pass
+    # a context to it.
+    email_extra_context = {'shop': settings.SHOP}
 
     def get_context_data(self, request, **kwargs):
         data = super().get_context_data(request, **kwargs)
@@ -79,9 +83,9 @@ def one_click_buy(request):
     Accept XHR, save Order to DB, send mail about it
     and return 200 OK.
     """
-    SECart(request.session).clear()
-
     cart = SECart(request.session)
+    cart.clear()
+
     product = get_object_or_404(Product, id=request.POST['product'])
     cart.add(product, int(request.POST['quantity']))
     order = Order(phone=request.POST['phone'])
@@ -91,6 +95,8 @@ def one_click_buy(request):
         subject=settings.EMAIL_SUBJECTS['one_click'],
         order=order,
         to_customer=False,
+        # see se.OrderPage class for a detail about `shop` context.
+        extra_context={'shop': settings.SHOP},
     )
     return HttpResponse('ok')
 

shopelectro/views/service.py

@@ -77,13 +77,17 @@ def send_mail_to_shop(order):
                 'paid': paid,
                 'profit': profit,
                 'commission': commission,
+                # see se.OrderPage class for a detail about `shop` context.
+                'shop': settings.SHOP,
             })
 
     def send_mail_to_customer(order):
         mailer.send_order(
             subject=settings.EMAIL_SUBJECTS['yandex_order'],
             order=order,
             to_shop=False,
+            # see se.OrderPage class for a detail about `shop` context.
+            extra_context={'shop': settings.SHOP},
         )
 
     if not has_correct_md5(request.POST):