From c09646f1b7ad96493445b63d13c1dc1d0105332a Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 22 Sep 2025 17:56:44 +0200 Subject: [PATCH] wait #7752 @2 --- app/Fluidbook/Compiler/Cart.php | 20 ++++++++++++++++++++ app/Fluidbook/Compiler/Compiler.php | 2 ++ app/Fluidbook/Compiler/Links.php | 14 ++++++++++++-- app/Models/Traits/PublicationSettings.php | 1 + 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/app/Fluidbook/Compiler/Cart.php b/app/Fluidbook/Compiler/Cart.php index 9b5560285..7ba5f64de 100644 --- a/app/Fluidbook/Compiler/Cart.php +++ b/app/Fluidbook/Compiler/Cart.php @@ -766,6 +766,9 @@ trait Cart case 'JoueclubWishlist2024': $this->writeJoueClub2024Cart(); return; + case 'JoueclubNoWishlist2025': + $this->writeJoueClubNoWishlist2025Cart(); + return; case 'Remarkable': $this->addParsley(); $this->addJsLib('cookie', 'js/libs/jquery/jquery.cookie.js'); @@ -861,4 +864,21 @@ trait Cart return $references; } + public function writeJoueClubNoWishlist2025Cart() + { + $ref = ExcelToArray::excelToArrayKeyVars($this->wdir . 'commerce/' . $this->config->basketReferences); + $this->getLinksAndRulers($links, $rulers); + foreach ($links as $k => $link) { + if ($link['type'] == Link::CART) { + $link['image'] = 'icone-plus.svg'; + $link['type'] = Link::WEB; + $link['tooltip'] = 'Plus d\'informations'; + $link['target'] = '_popupiframe'; + $link['to'] = $ref[$link['to']]['Url produit'] ?? ''; + $links[$k] = $link; + } + } + $this->setLinksAndRuliers($links, $rulers); + } + } diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php index de45244ae..f6f185e90 100644 --- a/app/Fluidbook/Compiler/Compiler.php +++ b/app/Fluidbook/Compiler/Compiler.php @@ -266,6 +266,8 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError protected $_addedPDFJS = false; protected $audioDescriptionTextsList = []; protected $hybrid = false; + protected $_links; + protected $_rulers; protected $_docDimensions = []; diff --git a/app/Fluidbook/Compiler/Links.php b/app/Fluidbook/Compiler/Links.php index 7ba1315d3..466f2c69b 100644 --- a/app/Fluidbook/Compiler/Links.php +++ b/app/Fluidbook/Compiler/Links.php @@ -16,7 +16,18 @@ trait Links { public function getLinksAndRulers(&$links, &$rulers) { - return $this->getFluidbook()->getLinksAndRulers($links, $rulers, 'latest', true); + if ($this->_links !== null) { + $links = $this->_links; + $rulers = $this->_rulers; + return; + } + $this->getFluidbook()->getLinksAndRulers($links, $rulers, 'latest', true); + } + + public function setLinksAndRuliers($links, $rulers) + { + $this->_links = $links; + $this->_rulers = $rulers; } /** @@ -25,7 +36,6 @@ trait Links */ protected function writeLinks() { - $dupLinkAreaColor = ($this->getSetting('linksAnimationLayer', 'top') === 'under'); if ($dupLinkAreaColor) { $dupLinkAreaColor = $this->getSetting('linksColor'); diff --git a/app/Models/Traits/PublicationSettings.php b/app/Models/Traits/PublicationSettings.php index fad22c3ad..0fee67e24 100644 --- a/app/Models/Traits/PublicationSettings.php +++ b/app/Models/Traits/PublicationSettings.php @@ -1448,6 +1448,7 @@ trait PublicationSettings 'GrandPavois' => 'Grand Pavois', 'JoueclubWishlist2021' => 'Wishlist Jouéclub Noël 2021', 'JoueclubWishlist2024' => 'Wishlist Jouéclub Noël 2024', + 'JoueclubNoWishlist2025' => 'Jouéclub sans wishlist 2025', 'Thiriet' => 'Thiriet', 'CFOC' => 'CFOC', 'Bastide' => 'Bastide', -- 2.39.5