Merge branch 'release/1.3.14'

CHANGELOG.md

@@ -6,12 +6,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [1.3.14] - 2022-05-30
+
+### Added
+- Facebook Pixel tracking integration
+
+
 ## [1.3.13] - 2022-05-30
 
 ### Added
 - Sentry for much better system error tracking
 - django-localflavor for state selection
 
+
 ## [1.3.12] - 2022-05-25
 ### Added
 - Captcha to newsletter form
@@ -19,10 +27,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Post only views to accept only POST requests
 
+
 ## [1.3.11] - 2022-05-21
 ### Changed
 - File logging handler to not propagate
 
+
 ## [1.3.10] - 2022-05-21
 ### Added
 - Tests for almost all storefront views, exposing a couple of inconsistencies
@@ -31,6 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - CustomerAddressUpdateView `test_func()` throwing error because addresses don't have a `customer` object
 - PaymentCanceled misspelled template name
 
+
 ## [1.3.7] - 2022-05-19
 ### Added
 - Visual enhancements

Pipfile

@@ -24,6 +24,7 @@ psycopg2-binary = "*"
 gunicorn = "*"
 sentry-sdk = "*"
 django-localflavor = "*"
+django-analytical = "*"
 
 [dev-packages]
 django-debug-toolbar = "*"

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "e63160d7b1865d6c2b4941bac8f68a8c11d74f92db7061e08884bf2da4c5b395"
+            "sha256": "4c61051a7dc3376dbb9f24c62c73e306f2aaf40508b7373c3a5edd63f9d492b4"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -217,6 +217,14 @@
             "index": "pypi",
             "version": "==0.50.0"
         },
+        "django-analytical": {
+            "hashes": [
+                "sha256:43de3d8ef7734732f58eba4e5e7df0dea37512dbd89727efdfb30c27a96d4ea9",
+                "sha256:6127c9196c8de3bcb4626f420d2ae670a7703152b1841b1b3e852b31a9a9d44b"
+            ],
+            "index": "pypi",
+            "version": "==3.1.0"
+        },
         "django-anymail": {
             "extras": [
                 "mailgun"
@@ -324,6 +332,14 @@
             "markers": "python_version >= '3.5'",
             "version": "==4.2.3"
         },
+        "gunicorn": {
+            "hashes": [
+                "sha256:9dcc4547dbb1cb284accfb15ab5667a0e5d1881cc443e0677b4882a4067a807e",
+                "sha256:e0a968b5ba15f8a328fdfd7ab1fcb5af4470c28aaf7e55df02a99bc13138e6e8"
+            ],
+            "index": "pypi",
+            "version": "==20.1.0"
+        },
         "idna": {
             "hashes": [
                 "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff",
@@ -764,6 +780,14 @@
             "index": "pypi",
             "version": "==1.5.12"
         },
+        "setuptools": {
+            "hashes": [
+                "sha256:68e45d17c9281ba25dc0104eadd2647172b3472d9e01f911efa57965e8d51a36",
+                "sha256:a43bdedf853c670e5fed28e5623403bad2f73cf02f9a2774e91def6bda8265a7"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==62.3.2"
+        },
         "six": {
             "hashes": [
                 "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
@@ -1118,7 +1142,7 @@
                 "sha256:670a52d3115d0e879e1ac838a4eb999af32f858163e3a704fe4839de2a676070",
                 "sha256:fb2d48e4eab0dfb786a472cd514aaadc71e3445b203bc300bad93daa75d77c1a"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==0.20.0"
         },
         "trio-websocket": {
@@ -1142,7 +1166,7 @@
                 "sha256:2218cb57952d90b9fca325c0dcfb08c3bda93e8fd8070b0a17f048e2e47a521b",
                 "sha256:a2e56bfd5c7cd83c1369d83b5feccd6d37798b74872866e62616e0ecf111bda8"
             ],
-            "markers": "python_full_version >= '3.7.0'",
+            "markers": "python_version >= '3.7'",
             "version": "==1.1.0"
         }
     }

src/ptcoffee/config.py

@@ -21,6 +21,8 @@ CACHE_CONFIG = {
 SENTRY_DSN = os.environ.get('SENTRY_DSN', '')
 SENTRY_ENV = os.environ.get('SENTRY_ENV', 'development')
 
+FACEBOOK_PIXEL_ID = os.environ.get('FACEBOOK_PIXEL_ID', '')
+
 PAYPAL_CLIENT_ID = os.environ.get('PAYPAL_CLIENT_ID', '')
 PAYPAL_SECRET_ID = os.environ.get('PAYPAL_SECRET_ID', '')
 PAYPAL_ENVIRONMENT = os.environ.get('PAYPAL_ENVIRONMENT', 'SANDBOX')

src/ptcoffee/settings.py

@@ -48,6 +48,7 @@ INSTALLED_APPS = [
     'allauth',
     'allauth.account',
     'allauth.socialaccount',
+    'analytical',
 
     # Local
     'accounts.apps.AccountsConfig',

src/templates/base.html

@@ -1,9 +1,12 @@
 {% load static %}
 {% load compress %}
 {% load account %}
+{% load analytical %}
+{% load facebook_pixel %}
 <!DOCTYPE html>
 <html>
 <head>
+    {% analytical_head_top %}
     <meta charset="utf-8">
     <meta content="width=device-width, initial-scale=1.0" name="viewport">
     <meta content="chrome=1" http-equiv="X-UA-Compatible">
@@ -24,8 +27,11 @@
 
     {% block head %}
     {% endblock %}
+    {% analytical_head_bottom %}
+    {% facebook_pixel_head %}
 </head>
 <body>
+{% analytical_body_top %}
 <div class="modal-menu">
     <div class="modal-menu__content">
         <div class="modal-menu__header">
@@ -103,5 +109,6 @@
         </p>
     </section>
 </footer>
+{% analytical_body_bottom %}
 </body>
 </html>