Tidy example templating

craftcms · Jul 13, 2023 · dac76c6 · dac76c6
1 parent 5eb1f0a
commit dac76c6
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 82 deletions.
diff --git a/example-templates/dist/shop/checkout/options.twig b/example-templates/dist/shop/checkout/options.twig
@@ -2,16 +2,27 @@
 
 {# @var cart \craft\commerce\elements\Order #}
 
-{% block main %}
+{% if cart is not defined %}
+    {% set cart = craft.commerce.carts.cart %}
+{% endif %}
+
+{#
+    We can skip the "options" step if the customer is a logged in user and
+    the addresses have come from the address book
+#}
+{% if currentUser and cart.sourceBillingAddressId and cart.sourceShippingAddressId %}
+    {% redirect 'shop/checkout/payment' %}
+{% endif %}
 
-  {% if not cart.getCustomer() %}
+{% if not cart.getCustomer() %}
     {% redirect 'shop/checkout/email' %}
-  {% endif %}
+{% endif %}
 
-  {% if not cart.gateway %}
+{% if not cart.gateway %}
     {% redirect 'shop/checkout/payment-method' %}
-  {% endif %}
+{% endif %}
 
+{% block main %}
   <div class="md:flex md:-mx-8" >
     <div class="md:w-2/3 md:px-8">
 
@@ -36,15 +47,15 @@
               {{ 'Create my account after ordering'|t }}
             </label>
             <div>
-              {{ _self.docs('Registering a user on order complete.', 'https://docs.craftcms.com/commerce/api/v4/craft-commerce-elements-order.html#registeruseronordercomplete') }}
+              {{ _self.docs('Registering a user on order complete.', 'https://craftcms.com/docs/commerce/4.x/customers.html#registration-at-checkout') }}
             </div>
           </div>
         {% endif %}
 
         {% set saveAddressCheckboxesShown = false %}
-        {% if cart.billingAddressId and not cart.sourceBillingAddressId %}
+        {% if currentUser and cart.billingAddressId and not cart.sourceBillingAddressId %}
           {% set saveAddressCheckboxesShown = true %}
-          <div class="mt-3 js-save-address {{ cart.getCustomer() and cart.getCustomer().getIsCredentialed() ? '' : 'hidden' }}">
+          <div class="mt-3">
             <label for="saveBillingAddressOnOrderComplete">
               {{ hiddenInput('saveBillingAddressOnOrderComplete', false) }}
               {{ input('checkbox', 'saveBillingAddressOnOrderComplete', 1, {
@@ -56,8 +67,8 @@
           </div>
         {% endif %}
 
-        {% if cart.shippingAddressId and not cart.sourceShippingAddressId %}
-          <div class="mt-3 js-save-address {{ cart.getCustomer() and cart.getCustomer().getIsCredentialed() ? '' : 'hidden' }}">
+        {% if currentUser and cart.shippingAddressId and not cart.sourceShippingAddressId %}
+          <div class="mt-3">
             {% set saveAddressCheckboxesShown = true %}
             <label for="saveShippingAddressOnOrderComplete">
               {{ hiddenInput('saveShippingAddressOnOrderComplete', false) }}
@@ -71,7 +82,7 @@
         {% endif %}
 
         {% if saveAddressCheckboxesShown %}
-          <div class="js-save-address {{ cart.getCustomer() and cart.getCustomer().getIsCredentialed() ? '' : 'hidden' }}">
+          <div>
             {{ _self.docs('Saving addresses on order complete.', '#') }}
           </div>
         {% endif %}
@@ -94,24 +105,4 @@
       }) }}
     </div>
   </div>
-
-  {% js %}
-    const $registerCheckbox = document.querySelector('#registerUserOnOrderComplete');
-
-    if ($registerCheckbox) {
-      $registerCheckbox.addEventListener('change', () => {
-          // if the register checkbox is checked make sure the save address checkboxes are visible
-          const saveAddressBoxes = document.querySelectorAll('.js-save-address');
-          if ($registerCheckbox.checked) {
-              saveAddressBoxes.forEach((box) => {
-                  box.classList.remove('hidden');
-              });
-          } else {
-              saveAddressBoxes.forEach((box) => {
-                  box.classList.add('hidden');
-              });
-          }
-      });
-    }
-  {% endjs %}
 {% endblock %}
diff --git a/example-templates/dist/shop/checkout/payment-method.twig b/example-templates/dist/shop/checkout/payment-method.twig
@@ -20,16 +20,7 @@
           <form method="post" action="" class="relative border-b-1 mb-4">
             {{ csrfInput() }}
             {{ actionInput('commerce/cart/update-cart') }}
-
-            {#
-            We can skip the "options" step if the customer is a logged in user and
-            the addresses have come from the address book
-            #}
-            {% if currentUser and cart.sourceBillingAddressId and cart.sourceShippingAddressId %}
-              {{ redirectInput(siteUrl('shop/checkout/payment')) }}
-            {% else %}
-              {{ redirectInput(siteUrl('shop/checkout/options')) }}
-            {% endif %}
+            {{ redirectInput(siteUrl('shop/checkout/options')) }}
             {{ successMessageInput('Payment options selected.') }}
 
             <div class="mt-3">

diff --git a/example-templates/src/shop/checkout/options.twig b/example-templates/src/shop/checkout/options.twig
@@ -2,16 +2,27 @@
 
 {# @var cart \craft\commerce\elements\Order #}
 
-{% block main %}
+{% if cart is not defined %}
+    {% set cart = craft.commerce.carts.cart %}
+{% endif %}
+
+{#
+    We can skip the "options" step if the customer is a logged in user and
+    the addresses have come from the address book
+#}
+{% if currentUser and cart.sourceBillingAddressId and cart.sourceShippingAddressId %}
+    {% redirect '[[folderName]]/checkout/payment' %}
+{% endif %}
 
-  {% if not cart.getCustomer() %}
+{% if not cart.getCustomer() %}
     {% redirect '[[folderName]]/checkout/email' %}
-  {% endif %}
+{% endif %}
 
-  {% if not cart.gateway %}
+{% if not cart.gateway %}
     {% redirect '[[folderName]]/checkout/payment-method' %}
-  {% endif %}
+{% endif %}
 
+{% block main %}
   <div class="md:flex md:-mx-8" [[hx-disable]]>
     <div class="md:w-2/3 md:px-8">
 
@@ -36,15 +47,15 @@
               {{ 'Create my account after ordering'|t }}
             </label>
             <div>
-              {{ _self.docs('Registering a user on order complete.', 'https://docs.craftcms.com/commerce/api/v4/craft-commerce-elements-order.html#registeruseronordercomplete') }}
+              {{ _self.docs('Registering a user on order complete.', 'https://craftcms.com/docs/commerce/4.x/customers.html#registration-at-checkout') }}
             </div>
           </div>
         {% endif %}
 
         {% set saveAddressCheckboxesShown = false %}
-        {% if cart.billingAddressId and not cart.sourceBillingAddressId %}
+        {% if currentUser and cart.billingAddressId and not cart.sourceBillingAddressId %}
           {% set saveAddressCheckboxesShown = true %}
-          <div class="mt-3 js-save-address {{ cart.getCustomer() and cart.getCustomer().getIsCredentialed() ? '' : 'hidden' }}">
+          <div class="mt-3">
             <label for="saveBillingAddressOnOrderComplete">
               {{ hiddenInput('saveBillingAddressOnOrderComplete', false) }}
               {{ input('checkbox', 'saveBillingAddressOnOrderComplete', 1, {
@@ -56,8 +67,8 @@
           </div>
         {% endif %}
 
-        {% if cart.shippingAddressId and not cart.sourceShippingAddressId %}
-          <div class="mt-3 js-save-address {{ cart.getCustomer() and cart.getCustomer().getIsCredentialed() ? '' : 'hidden' }}">
+        {% if currentUser and cart.shippingAddressId and not cart.sourceShippingAddressId %}
+          <div class="mt-3">
             {% set saveAddressCheckboxesShown = true %}
             <label for="saveShippingAddressOnOrderComplete">
               {{ hiddenInput('saveShippingAddressOnOrderComplete', false) }}
@@ -71,7 +82,7 @@
         {% endif %}
 
         {% if saveAddressCheckboxesShown %}
-          <div class="js-save-address {{ cart.getCustomer() and cart.getCustomer().getIsCredentialed() ? '' : 'hidden' }}">
+          <div>
             {{ _self.docs('Saving addresses on order complete.', '#') }}
           </div>
         {% endif %}
@@ -94,24 +105,4 @@
       }) }}
     </div>
   </div>
-
-  {% js %}
-    const $registerCheckbox = document.querySelector('#registerUserOnOrderComplete');
-
-    if ($registerCheckbox) {
-      $registerCheckbox.addEventListener('change', () => {
-          // if the register checkbox is checked make sure the save address checkboxes are visible
-          const saveAddressBoxes = document.querySelectorAll('.js-save-address');
-          if ($registerCheckbox.checked) {
-              saveAddressBoxes.forEach((box) => {
-                  box.classList.remove('hidden');
-              });
-          } else {
-              saveAddressBoxes.forEach((box) => {
-                  box.classList.add('hidden');
-              });
-          }
-      });
-    }
-  {% endjs %}
 {% endblock %}
diff --git a/example-templates/src/shop/checkout/payment-method.twig b/example-templates/src/shop/checkout/payment-method.twig
@@ -20,16 +20,7 @@
           <form method="post" action="" class="relative border-b-1 mb-4">
             {{ csrfInput() }}
             {{ actionInput('commerce/cart/update-cart') }}
-
-            {#
-            We can skip the "options" step if the customer is a logged in user and
-            the addresses have come from the address book
-            #}
-            {% if currentUser and cart.sourceBillingAddressId and cart.sourceShippingAddressId %}
-              {{ redirectInput(siteUrl('[[folderName]]/checkout/payment')) }}
-            {% else %}
-              {{ redirectInput(siteUrl('[[folderName]]/checkout/options')) }}
-            {% endif %}
+            {{ redirectInput(siteUrl('[[folderName]]/checkout/options')) }}
             {{ successMessageInput('Payment options selected.') }}
 
             <div class="mt-3">