Merge branch 'feature/falcon-PS9'

.gitignore

@@ -1,4 +1,2 @@
 
 falcon/vendor/
-
-*.zip

falcon/_dev/js/theme/components/selectors.js

@@ -1,84 +1,82 @@
-import prestashop from "prestashop";
+import prestashop from 'prestashop';
-import $ from "jquery";
+import $ from 'jquery';
 
 prestashop.themeSelectors = {
-    product: {
+  product: {
-        tabs: ".tabs .nav-link",
+    tabs: '.tabs .nav-link',
-        activeNavClass: "js-product-nav-active",
+    activeNavClass: 'js-product-nav-active',
-        activeTabClass: "js-product-tab-active",
+    activeTabClass: 'js-product-tab-active',
-        activeTabs: ".tabs .nav-link.active, .js-product-nav-active",
+    activeTabs: '.tabs .nav-link.active, .js-product-nav-active',
-        imagesModal: ".js-product-images-modal",
+    imagesModal: '.js-product-images-modal',
-        thumb: ".js-thumb",
+    thumb: '.js-thumb',
-        thumbContainer: ".thumb-container, .js-thumb-container",
+    thumbContainer: '.thumb-container, .js-thumb-container',
-        arrows: ".js-arrows",
+    arrows: '.js-arrows',
-        selected: ".selected, .js-thumb-selected",
+    selected: '.selected, .js-thumb-selected',
-        modalProductCover: ".js-modal-product-cover",
+    modalProductCover: '.js-modal-product-cover',
-        cover: ".js-qv-product-cover",
+    cover: '.js-qv-product-cover',
-        customizationModal: ".js-customization-modal",
+    customizationModal: '.js-customization-modal',
-    },
+  },
-    listing: {
+  listing: {
-        searchFilterToggler: "#search_filter_toggler, .js-search-toggler",
+    searchFilterToggler: '#search_filter_toggler, .js-search-toggler',
-        searchFiltersWrapper: "#search_filters_wrapper",
+    searchFiltersWrapper: '#search_filters_wrapper',
-        searchFilterControls: "#search_filter_controls",
+    searchFilterControls: '#search_filter_controls',
-        searchFilters: "#search_filters",
+    searchFilters: '#search_filters',
-        activeSearchFilters: "#js-active-search-filters",
+    activeSearchFilters: '#js-active-search-filters',
-        listTop: "#js-product-list-top",
+    listTop: '#js-product-list-top',
-        list: "#js-product-list",
+    list: '#js-product-list',
-        listBottom: "#js-product-list-bottom",
+    listBottom: '#js-product-list-bottom',
-        listHeader: "#js-product-list-header",
+    listHeader: '#js-product-list-header',
-        searchFiltersClearAll: ".js-search-filters-clear-all",
+    searchFiltersClearAll: '.js-search-filters-clear-all',
-        searchLink: ".js-search-link",
+    searchLink: '.js-search-link',
-    },
+  },
-    order: {
+  order: {
-        returnForm: "#order-return-form, .js-order-return-form",
+    returnForm: '#order-return-form, .js-order-return-form',
-    },
+  },
-    arrowDown: ".arrow-down, .js-arrow-down",
+  arrowDown: '.arrow-down, .js-arrow-down',
-    arrowUp: ".arrow-up, .js-arrow-up",
+  arrowUp: '.arrow-up, .js-arrow-up',
-    clear: ".clear",
+  clear: '.clear',
-    fileInput: ".js-file-input",
+  fileInput: '.js-file-input',
-    contentWrapper: "#content-wrapper, .js-content-wrapper",
+  contentWrapper: '#content-wrapper, .js-content-wrapper',
-    footer: "#footer, .js-footer",
+  footer: '#footer, .js-footer',
-    modalContent: ".js-modal-content",
+  modalContent: '.js-modal-content',
-    modal: ".js-checkout-modal",
+  modal: '.js-checkout-modal',
-    touchspin: ".js-touchspin",
+  touchspin: '.js-touchspin',
-    checkout: {
+  checkout: {
-        termsLink: ".js-terms a",
+    termsLink: '.js-terms a',
-        giftCheckbox: ".js-gift-checkbox",
+    giftCheckbox: '.js-gift-checkbox',
-        imagesLink: ".card-block .cart-summary-products p a, .js-show-details",
+    imagesLink: '.card-block .cart-summary-products p a, .js-show-details',
-        carrierExtraContent:
+    carrierExtraContent: '.carrier-extra-content, .js-carrier-extra-content',
-            ".carrier-extra-content, .js-carrier-extra-content",
+    btn: '.checkout a',
-        btn: ".checkout a",
+  },
-    },
+  cart: {
-    cart: {
+    productLineQty: '.js-cart-line-product-quantity',
-        productLineQty: ".js-cart-line-product-quantity",
+    quickview: '.quickview',
-        quickview: ".quickview",
+    touchspin: '.bootstrap-touchspin',
-        touchspin: ".bootstrap-touchspin",
+    promoCode: '#promo-code',
-        promoCode: "#promo-code",
+    displayPromo: '.display-promo',
-        displayPromo: ".display-promo",
+    promoCodeButton: '.promo-code-button',
-        promoCodeButton: ".promo-code-button",
+    discountCode: '.js-discount .code',
-        discountCode: ".js-discount .js-code",
+    discountName: '[name=discount_name]',
-        discountName: "[name=discount_name]",
+    actions: '[data-link-action="delete-from-cart"], [data-link-action="remove-voucher"]',
-        actions:
+  },
-            '[data-link-action="delete-from-cart"], [data-link-action="remove-voucher"]',
+  notifications: {
-    },
+    dangerAlert: '#notifications article.alert-danger',
-    notifications: {
+    container: '#notifications .container',
-        dangerAlert: "#notifications article.alert-danger",
+  },
-        container: "#notifications .container",
+  passwordPolicy: {
-    },
+    template: '#password-feedback',
-    passwordPolicy: {
+    hint: '.js-hint-password',
-        template: "#password-feedback",
+    container: '.js-password-strength-feedback',
-        hint: ".js-hint-password",
+    strengthText: '.js-password-strength-text',
-        container: ".js-password-strength-feedback",
+    requirementScore: '.js-password-requirements-score',
-        strengthText: ".js-password-strength-text",
+    requirementLength: '.js-password-requirements-length',
-        requirementScore: ".js-password-requirements-score",
+    requirementScoreIcon: '.js-password-requirements-score i',
-        requirementLength: ".js-password-requirements-length",
+    requirementLengthIcon: '.js-password-requirements-length i',
-        requirementScoreIcon: ".js-password-requirements-score i",
+    progressBar: '.js-password-policy-progress-bar',
-        requirementLengthIcon: ".js-password-requirements-length i",
+    inputColumn: '.js-input-column',
-        progressBar: ".js-password-policy-progress-bar",
+  },
-        inputColumn: ".js-input-column",
-    },
 };
 
 $(() => {
-    prestashop.emit("themeSelectorsInit");
+  prestashop.emit('themeSelectorsInit');
 });

falcon/_dev/js/theme/index.js

@@ -79,19 +79,4 @@ $(() => {
     $(".js-select-link").on("change", ({ target }) => {
         window.location.href = $(target).val();
     });
-
-    // Postcode input formatting
-    const $postCodeInput = $("input[name='postcode']");
-    $postCodeInput.on("input", function () {
-        let value = $(this).val();
-
-        // Match 4 digits followed by 2 letters (e.g., 1234AB)
-        const match = value.match(/^(\d{4})([a-zA-Z]{2})$/);
-
-        if (match) {
-            // Add space between numbers and letters
-            const formatted = `${match[1]} ${match[2]}`;
-            $(this).val(formatted);
-        }
-    });
 });

falcon/modules/is_shoppingcart/views/templates/hook/is_shoppingcart.tpl

@@ -1,79 +0,0 @@
-{**
- * 2007-2020 PrestaShop and Contributors
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2020 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
- * International Registered Trademark & Property of PrestaShop SA
- *}
- 
-<div class="header-top__block header-top__block--cart col flex-grow-0">
-  <div class="js-blockcart blockcart cart-preview dropdown" data-refresh-url="{$refresh_url}">
-    <a href="#" role="button" id="cartDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
-      class="header-top__link d-lg-block d-none">
-      <div class="header-top__icon-container">
-        <span class="header-top__icon material-icons">shopping_basket</span>
-        <span class="header-top__badge {if $cart.products_count > 9}header-top__badge--smaller{/if}">
-          {$cart.products_count}
-        </span>
-      </div>
-    </a>
-    <a href="{$cart_url}" class="d-flex d-lg-none header-top__link">
-      <div class="header-top__icon-container">
-        <span class="header-top__icon material-icons">shopping_basket</span>
-        <span class="header-top__badge {if $cart.products_count > 9}header-top__badge--smaller{/if}">
-          {$cart.products_count}
-        </span>
-      </div>
-    </a>
-    <div class="dropdown-menu blockcart__dropdown cart-dropdown dropdown-menu-right" aria-labelledby="cartDropdown">
-      <div class="cart-dropdown__content keep-open js-cart__card-body cart__card-body">
-        <div class="cart-loader">
-          <div class="spinner-border text-primary" role="status"><span
-              class="sr-only">{l s='Loading...' d='Shop.Theme.Global'}</span></div>
-        </div>
-        <div class="cart-dropdown__title d-flex align-items-center mb-3">
-          <p class="h5 mb-0 mr-2">
-            {l s='Your cart' d='Modules.Isshoppingcart.Isshoppingcart'}
-          </p>
-          <a data-toggle="dropdown" href="#" class="cart-dropdown__close dropdown-close ml-auto cursor-pointer text-decoration-none">
-            <i class="material-icons d-block">close</i>
-          </a>
-        </div>
-        {if $cart.products_count > 0}
-          <div class="cart-dropdown__products pt-3 mb-3">
-            {foreach from=$cart.products item=product}
-              {include 'module:is_shoppingcart/views/templates/front/is_shoppingcart-product-line.tpl' product=$product}
-            {/foreach}
-          </div>
-
-          <div class="cart-summary-line cart-total">
-            <span class="label">{$cart.totals.total.label}</span>
-            <span class="value">{$cart.totals.total.value}</span>
-          </div>
-
-          <div class="mt-3">
-            <a href="{$cart_url}" class="btn btn-sm btn-primary btn-block dropdown-close">
-              {l s='Proceed to checkout' d='Shop.Theme.Actions'}
-            </a>
-          </div>
-
-        {else}
-          <div class="alert alert-warning">
-            {l s='Unfortunately your basket is empty' d='Modules.Isshoppingcart.Isshoppingcart'}
-          </div>
-        {/if}
-      </div>
-    </div>
-  </div>
-</div>

falcon/templates/catalog/_partials/category-footer.tpl

@@ -1,13 +1,5 @@
-{* Defensive: Handles LazyArray objects for category *}
-{if is_object($category)}
-  {$category = $category|json_encode|json_decode:true}
-  {if isset($category.category)}
-    {$category = $category.category}
-  {/if}
-{/if}
-
 <div id="js-product-list-footer">
-    {if isset($category.additional_description) && $category.additional_description && $listing.pagination.items_shown_from == 1}
+    {if $category.additional_description && $listing.pagination.items_shown_from == 1}
       <div id="category-description-2" class="cms-content my-3">
         {$category.additional_description nofilter}
       </div>

falcon/templates/checkout/_partials/cart-summary-totals.tpl

@@ -38,11 +38,6 @@
       <span class="label">{$cart.totals.total.label}&nbsp;{if $configuration.display_taxes_label && $configuration.taxes_enabled}{$cart.labels.tax_short}{/if}</span>
       <span class="value">{$cart.totals.total.value}</span>
     </div>
-     {if !$cart.has_delivery_address}
-      <p class="no_delivery_address_yet_message">
-        {l s='Shipping costs will be calculated in the next step, before you checkout. Shipping costs depend on the country the order is shipped to. For the Netherlands, orders with a value of € 125.00 will be shipped free of charge. You can view the shippingcosts <a href="https://www.nijssenbulbs.com/content/16-verzendkosten"><u>here</u></a>' d='Shop.Checkout.Total'}
-      </p>
-    {/if}
   {/if}
 {/block}