Compare commits
6 Commits
bae76ed030
...
feature/fa
| Author | SHA1 | Date | |
|---|---|---|---|
| 1db08c5f17 | |||
| c911fc76d2 | |||
| dc8ed97eb0 | |||
| a128906dc0 | |||
| ddec414409 | |||
| 48e776d80d |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,2 +1,4 @@
|
||||
|
||||
falcon/vendor/
|
||||
|
||||
*.zip
|
||||
|
||||
@@ -5,3 +5,4 @@
|
||||
@import "layout/index";
|
||||
@import "components/index";
|
||||
|
||||
@import "custom/custom";
|
||||
|
||||
22
falcon/_dev/css/theme/custom/_custom.scss
Normal file
22
falcon/_dev/css/theme/custom/_custom.scss
Normal file
@@ -0,0 +1,22 @@
|
||||
/* This is the main custom SCSS file for the Falcon theme.
|
||||
|
||||
I am loosely following the 7 in 1 structure for better organization of the styles. Learn more here:
|
||||
https://medium.com/@diyorbekjuraev77/be-a-master-at-creating-the-7-1-sass-pattern-776fdfb5a3b1
|
||||
|
||||
⚠️NOTE: All bootstrap overrides have been configured under themes/falcon/_dev/css/abstracts/variables/bootstrap */
|
||||
|
||||
//Abstracts: Things used throughout the site such as utility classes and generic overrides.
|
||||
//@import "abstracts/mixins";
|
||||
|
||||
// Components: parts of the theme itself that are not associated with a module.
|
||||
//@import "components/buttons";
|
||||
|
||||
// Modules: Styling for specific modules.
|
||||
//@import "modules/";
|
||||
|
||||
//Layouts: Parts of a page, such as the header, footer, etc.
|
||||
//@import "layout/footer";
|
||||
//@import "layout/header";
|
||||
|
||||
// Pages
|
||||
//@import "pages/home";
|
||||
@@ -1,82 +1,84 @@
|
||||
import prestashop from 'prestashop';
|
||||
import $ from 'jquery';
|
||||
import prestashop from "prestashop";
|
||||
import $ from "jquery";
|
||||
|
||||
prestashop.themeSelectors = {
|
||||
product: {
|
||||
tabs: '.tabs .nav-link',
|
||||
activeNavClass: 'js-product-nav-active',
|
||||
activeTabClass: 'js-product-tab-active',
|
||||
activeTabs: '.tabs .nav-link.active, .js-product-nav-active',
|
||||
imagesModal: '.js-product-images-modal',
|
||||
thumb: '.js-thumb',
|
||||
thumbContainer: '.thumb-container, .js-thumb-container',
|
||||
arrows: '.js-arrows',
|
||||
selected: '.selected, .js-thumb-selected',
|
||||
modalProductCover: '.js-modal-product-cover',
|
||||
cover: '.js-qv-product-cover',
|
||||
customizationModal: '.js-customization-modal',
|
||||
tabs: ".tabs .nav-link",
|
||||
activeNavClass: "js-product-nav-active",
|
||||
activeTabClass: "js-product-tab-active",
|
||||
activeTabs: ".tabs .nav-link.active, .js-product-nav-active",
|
||||
imagesModal: ".js-product-images-modal",
|
||||
thumb: ".js-thumb",
|
||||
thumbContainer: ".thumb-container, .js-thumb-container",
|
||||
arrows: ".js-arrows",
|
||||
selected: ".selected, .js-thumb-selected",
|
||||
modalProductCover: ".js-modal-product-cover",
|
||||
cover: ".js-qv-product-cover",
|
||||
customizationModal: ".js-customization-modal",
|
||||
},
|
||||
listing: {
|
||||
searchFilterToggler: '#search_filter_toggler, .js-search-toggler',
|
||||
searchFiltersWrapper: '#search_filters_wrapper',
|
||||
searchFilterControls: '#search_filter_controls',
|
||||
searchFilters: '#search_filters',
|
||||
activeSearchFilters: '#js-active-search-filters',
|
||||
listTop: '#js-product-list-top',
|
||||
list: '#js-product-list',
|
||||
listBottom: '#js-product-list-bottom',
|
||||
listHeader: '#js-product-list-header',
|
||||
searchFiltersClearAll: '.js-search-filters-clear-all',
|
||||
searchLink: '.js-search-link',
|
||||
searchFilterToggler: "#search_filter_toggler, .js-search-toggler",
|
||||
searchFiltersWrapper: "#search_filters_wrapper",
|
||||
searchFilterControls: "#search_filter_controls",
|
||||
searchFilters: "#search_filters",
|
||||
activeSearchFilters: "#js-active-search-filters",
|
||||
listTop: "#js-product-list-top",
|
||||
list: "#js-product-list",
|
||||
listBottom: "#js-product-list-bottom",
|
||||
listHeader: "#js-product-list-header",
|
||||
searchFiltersClearAll: ".js-search-filters-clear-all",
|
||||
searchLink: ".js-search-link",
|
||||
},
|
||||
order: {
|
||||
returnForm: '#order-return-form, .js-order-return-form',
|
||||
returnForm: "#order-return-form, .js-order-return-form",
|
||||
},
|
||||
arrowDown: '.arrow-down, .js-arrow-down',
|
||||
arrowUp: '.arrow-up, .js-arrow-up',
|
||||
clear: '.clear',
|
||||
fileInput: '.js-file-input',
|
||||
contentWrapper: '#content-wrapper, .js-content-wrapper',
|
||||
footer: '#footer, .js-footer',
|
||||
modalContent: '.js-modal-content',
|
||||
modal: '.js-checkout-modal',
|
||||
touchspin: '.js-touchspin',
|
||||
arrowDown: ".arrow-down, .js-arrow-down",
|
||||
arrowUp: ".arrow-up, .js-arrow-up",
|
||||
clear: ".clear",
|
||||
fileInput: ".js-file-input",
|
||||
contentWrapper: "#content-wrapper, .js-content-wrapper",
|
||||
footer: "#footer, .js-footer",
|
||||
modalContent: ".js-modal-content",
|
||||
modal: ".js-checkout-modal",
|
||||
touchspin: ".js-touchspin",
|
||||
checkout: {
|
||||
termsLink: '.js-terms a',
|
||||
giftCheckbox: '.js-gift-checkbox',
|
||||
imagesLink: '.card-block .cart-summary-products p a, .js-show-details',
|
||||
carrierExtraContent: '.carrier-extra-content, .js-carrier-extra-content',
|
||||
btn: '.checkout a',
|
||||
termsLink: ".js-terms a",
|
||||
giftCheckbox: ".js-gift-checkbox",
|
||||
imagesLink: ".card-block .cart-summary-products p a, .js-show-details",
|
||||
carrierExtraContent:
|
||||
".carrier-extra-content, .js-carrier-extra-content",
|
||||
btn: ".checkout a",
|
||||
},
|
||||
cart: {
|
||||
productLineQty: '.js-cart-line-product-quantity',
|
||||
quickview: '.quickview',
|
||||
touchspin: '.bootstrap-touchspin',
|
||||
promoCode: '#promo-code',
|
||||
displayPromo: '.display-promo',
|
||||
promoCodeButton: '.promo-code-button',
|
||||
discountCode: '.js-discount .code',
|
||||
discountName: '[name=discount_name]',
|
||||
actions: '[data-link-action="delete-from-cart"], [data-link-action="remove-voucher"]',
|
||||
productLineQty: ".js-cart-line-product-quantity",
|
||||
quickview: ".quickview",
|
||||
touchspin: ".bootstrap-touchspin",
|
||||
promoCode: "#promo-code",
|
||||
displayPromo: ".display-promo",
|
||||
promoCodeButton: ".promo-code-button",
|
||||
discountCode: ".js-discount .js-code",
|
||||
discountName: "[name=discount_name]",
|
||||
actions:
|
||||
'[data-link-action="delete-from-cart"], [data-link-action="remove-voucher"]',
|
||||
},
|
||||
notifications: {
|
||||
dangerAlert: '#notifications article.alert-danger',
|
||||
container: '#notifications .container',
|
||||
dangerAlert: "#notifications article.alert-danger",
|
||||
container: "#notifications .container",
|
||||
},
|
||||
passwordPolicy: {
|
||||
template: '#password-feedback',
|
||||
hint: '.js-hint-password',
|
||||
container: '.js-password-strength-feedback',
|
||||
strengthText: '.js-password-strength-text',
|
||||
requirementScore: '.js-password-requirements-score',
|
||||
requirementLength: '.js-password-requirements-length',
|
||||
requirementScoreIcon: '.js-password-requirements-score i',
|
||||
requirementLengthIcon: '.js-password-requirements-length i',
|
||||
progressBar: '.js-password-policy-progress-bar',
|
||||
inputColumn: '.js-input-column',
|
||||
template: "#password-feedback",
|
||||
hint: ".js-hint-password",
|
||||
container: ".js-password-strength-feedback",
|
||||
strengthText: ".js-password-strength-text",
|
||||
requirementScore: ".js-password-requirements-score",
|
||||
requirementLength: ".js-password-requirements-length",
|
||||
requirementScoreIcon: ".js-password-requirements-score i",
|
||||
requirementLengthIcon: ".js-password-requirements-length i",
|
||||
progressBar: ".js-password-policy-progress-bar",
|
||||
inputColumn: ".js-input-column",
|
||||
},
|
||||
};
|
||||
|
||||
$(() => {
|
||||
prestashop.emit('themeSelectorsInit');
|
||||
prestashop.emit("themeSelectorsInit");
|
||||
});
|
||||
|
||||
@@ -79,4 +79,19 @@ $(() => {
|
||||
$(".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);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
{**
|
||||
* 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>
|
||||
@@ -1,5 +1,13 @@
|
||||
{* 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 $category.additional_description && $listing.pagination.items_shown_from == 1}
|
||||
{if isset($category.additional_description) && $category.additional_description && $listing.pagination.items_shown_from == 1}
|
||||
<div id="category-description-2" class="cms-content my-3">
|
||||
{$category.additional_description nofilter}
|
||||
</div>
|
||||
|
||||
@@ -38,6 +38,11 @@
|
||||
<span class="label">{$cart.totals.total.label} {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}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user