isabelle/Falcon-PrestaShop-9
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: isabelle:6849b8eefde3ec613bc7308abc9d9afa1a403cce
Branches Tags
isabelle:main isabelle:feature/extra-features isabelle:feature/falcon-PS9
...
compare: isabelle:92a8db6e72434ca59fc6e7f22c98e48b5ac9df6a
Branches Tags
isabelle:feature/extra-features isabelle:main isabelle:feature/falcon-PS9

3 Commits
6849b8eefd ... 92a8db6e72

Author SHA1 Message Date
Isabelle
92a8db6e72 Merge branch 'feature/falcon-PS9' 2025-11-20 09:10:47 +01:00
Isabelle
44666297b3 fix: Improved active class added to account 
Found a bug where when you click on "details"button in order history, all the customer links become active. This fixes that.
 2025-11-19 17:29:32 +01:00
Isabelle
ae299283a7 Fix: Replace deprecated getBrightness with new method 
New method created in is_themecore module: Uses use PrestaShop\PrestaShop\Core\Util\ColorBrightnessCalculator and adds as smarty function in SmartyHelperFunctions.php
 2025-11-19 17:14:56 +01:00
5 changed files with 60 additions and 50 deletions
Expand all files Collapse all files

102
falcon/_dev/js/theme/index.js
View File

@ -1,73 +1,83 @@
import $ from 'jquery'; import $ from "jquery";
import '@js/theme/vendors/bootstrap/bootstrap-imports'; import "@js/theme/vendors/bootstrap/bootstrap-imports";
import 'bootstrap-touchspin'; import "bootstrap-touchspin";
import 'jquery-hoverintent'; import "jquery-hoverintent";
import '@js/theme/components/dynamic-bootstrap-components'; import "@js/theme/components/dynamic-bootstrap-components";
import bsCustomFileInput from 'bs-custom-file-input'; import bsCustomFileInput from "bs-custom-file-input";
import '@js/theme/components/selectors'; import "@js/theme/components/selectors";
import '@js/theme/components/sliders'; import "@js/theme/components/sliders";
import '@js/theme/components/responsive'; import "@js/theme/components/responsive";
import '@js/theme/components/customer'; import "@js/theme/components/customer";
import '@js/theme/components/quickview'; import "@js/theme/components/quickview";
import '@js/theme/components/product'; import "@js/theme/components/product";
import '@js/theme/components/cart/cart'; import "@js/theme/components/cart/cart";
import '@js/theme/components/cart/block-cart'; import "@js/theme/components/cart/block-cart";
import "@js/theme/components/product_miniature_form";
import usePasswordPolicy from '@js/theme/components/usePasswordPolicy'; import usePasswordPolicy from "@js/theme/components/usePasswordPolicy";
import prestashop from 'prestashop'; import prestashop from "prestashop";
import EventEmitter from 'events'; import EventEmitter from "events";
import Form from '@js/theme/components/form'; import Form from "@js/theme/components/form";
import TopMenu from '@js/theme/components/TopMenu'; import TopMenu from "@js/theme/components/TopMenu";
import PageLazyLoad from '@js/theme/components/Lazyload'; import PageLazyLoad from "@js/theme/components/Lazyload";
import PageLoader from '@js/theme/components/PageLoader'; import PageLoader from "@js/theme/components/PageLoader";
import useStickyElement from '@js/theme/components/useStickyElement'; import useStickyElement from "@js/theme/components/useStickyElement";
/* eslint-disable */ /* eslint-disable */
// "inherit" EventEmitter // "inherit" EventEmitter
for (const i in EventEmitter.prototype) { for (const i in EventEmitter.prototype) {
prestashop[i] = EventEmitter.prototype[i]; prestashop[i] = EventEmitter.prototype[i];
} }
/* eslint-enable */ /* eslint-enable */
prestashop.pageLazyLoad = new PageLazyLoad({ prestashop.pageLazyLoad = new PageLazyLoad({
selector: '.lazyload', selector: ".lazyload",
}); });
prestashop.pageLoader = new PageLoader(); prestashop.pageLoader = new PageLoader();
function accLinksTriggerActive() { function accLinksTriggerActive() {
const url = window.location.pathname; const currentUrl = window.location.pathname + window.location.search;
$('.js-customer-links a').each((i, el) => {
const $el = $(el);
if ($el.attr('href').indexOf(url) !== -1) { $(".js-customer-links a").each((i, el) => {
$el.addClass('active'); const $el = $(el);
} const linkHref = $el.attr("href");
}); let linkPath = linkHref;
try {
const linkUrl = new URL(linkHref, window.location.origin);
linkPath = linkUrl.pathname + linkUrl.search;
} catch (e) {}
if (
currentUrl === linkPath ||
(linkPath !== "/" && currentUrl.startsWith(linkPath))
) {
$el.addClass("active");
}
});
} }
function initStickyHeader() { function initStickyHeader() {
const header = document.querySelector('.js-header-top'); const header = document.querySelector(".js-header-top");
const headerWrapper = document.querySelector('.js-header-top-wrapper'); const headerWrapper = document.querySelector(".js-header-top-wrapper");
if (header && headerWrapper) { if (header && headerWrapper) {
useStickyElement(header, headerWrapper); useStickyElement(header, headerWrapper);
} }
} }
$(() => { $(() => {
initStickyHeader(); initStickyHeader();
accLinksTriggerActive(); accLinksTriggerActive();
Form.init(); Form.init();
bsCustomFileInput.init(); bsCustomFileInput.init();
const topMenu = new TopMenu('#_desktop_top_menu .js-main-menu'); const topMenu = new TopMenu("#_desktop_top_menu .js-main-menu");
usePasswordPolicy('.field-password-policy'); usePasswordPolicy(".field-password-policy");
topMenu.init(); topMenu.init();
$('.js-select-link').on('change', ({ target }) => { $(".js-select-link").on("change", ({ target }) => {
window.location.href = $(target).val(); window.location.href = $(target).val();
}); });
}); });

2
falcon/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
View File

@ -75,7 +75,7 @@
type="{if $facet.multipleSelectionAllowed}checkbox{else}radio{/if}" class="custom-control-input" type="{if $facet.multipleSelectionAllowed}checkbox{else}radio{/if}" class="custom-control-input"
{if $filter.active } checked{/if}> {if $filter.active } checked{/if}>
<label for="facet_input_{$_expand_id}_{$filter_key}" {if isset($filter.properties.color)} <label for="facet_input_{$_expand_id}_{$filter_key}" {if isset($filter.properties.color)}
class="custom-control-label custom-control-label-{if Tools::getBrightness($filter.properties.color) > 128}dark{else}bright{/if}" class="custom-control-label custom-control-label-{if $filter.properties.color|is_bright}dark{else}bright{/if}"
{else} class="custom-control-label" {else} class="custom-control-label"
{/if}> {/if}>
{if isset($filter.properties.color)} {if isset($filter.properties.color)}

2
falcon/templates/catalog/_partials/product-variants.tpl
View File

@ -45,7 +45,7 @@
<div class="custom-control custom-radio-color"> <div class="custom-control custom-radio-color">
<input class="custom-control-input" type="radio" data-product-attribute="{$id_attribute_group}" id="{$id_attribute_group}_{$id_attribute}" name="group[{$id_attribute_group}]" value="{$id_attribute}" title="{$group_attribute.name}"{if $group_attribute.selected} checked="checked"{/if}> <input class="custom-control-input" type="radio" data-product-attribute="{$id_attribute_group}" id="{$id_attribute_group}_{$id_attribute}" name="group[{$id_attribute_group}]" value="{$id_attribute}" title="{$group_attribute.name}"{if $group_attribute.selected} checked="checked"{/if}>
<label class="custom-control-label {if $group_attribute.html_color_code}custom-control-label-{if Tools::getBrightness($group_attribute.html_color_code) > 128}dark{else}bright{/if}{/if}" for="{$id_attribute_group}_{$id_attribute}" aria-label="{$group_attribute.name}"> <label class="custom-control-label {if $group_attribute.html_color_code}custom-control-label-{if $group_attribute.html_color_code|is_bright}dark{else}bright{/if}{/if}" for="{$id_attribute_group}_{$id_attribute}" aria-label="{$group_attribute.name}">
<span <span
{if $group_attribute.texture} {if $group_attribute.texture}
class="custom-control-input-color" style="background-image: url({$group_attribute.texture})" class="custom-control-input-color" style="background-image: url({$group_attribute.texture})"

2
falcon/templates/customer/history.tpl
View File

@ -60,7 +60,7 @@
<td class="hidden-md-down align-middle">{$order.details.payment}</td> <td class="hidden-md-down align-middle">{$order.details.payment}</td>
<td class="align-middle"> <td class="align-middle">
<span <span
class="label label-pill badge {if Tools::getBrightness($order.history.current.color) < 128}text-white{/if}" class="label label-pill badge {if !$order.history.current.color|is_bright}text-white{/if}"
style="background-color:{$order.history.current.color}" style="background-color:{$order.history.current.color}"
> >
{$order.history.current.ostate_name} {$order.history.current.ostate_name}

2
falcon/templates/customer/order-detail.tpl
View File

@ -89,7 +89,7 @@
<td>{$state.history_date}</td> <td>{$state.history_date}</td>
<td> <td>
<span <span
class="label label-pill badge {if Tools::getBrightness($state.color) < 128}text-white{/if}" class="label label-pill badge {if !$state.color|is_bright}text-white{/if}"
style="background-color:{$state.color}"> style="background-color:{$state.color}">
{$state.ostate_name} {$state.ostate_name}
</span> </span>