From: Vincent Vanwaelscappel Date: Mon, 14 Apr 2025 15:42:44 +0000 (+0200) Subject: wait #7423 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=f9b94c8e23cc7c66767aa75218b8a0df4126f6bb;p=fluidbook-toolbox.git wait #7423 @1 --- diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/PumaOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/PumaOperation.php index 3505caf9f..ef05696a7 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/PumaOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/PumaOperation.php @@ -43,8 +43,8 @@ trait PumaOperation continue; } $r[$reference] = $data; - $title = trim(trim($data['Catégorie']??'') . ' ' . trim($data['RBU']??'')); - $subtitle = trim(trim($data['Age Group']??'') . ' - ' . trim($data['Product Line']??''), '- '); + $title = trim(trim($data['Catégorie'] ?? '') . ' ' . trim($data['RBU'] ?? '')); + $subtitle = trim(trim($data['Age Group'] ?? '') . ' - ' . trim($data['Product Line'] ?? ''), '- '); $key = md5($title . $subtitle); if (!isset($planches[$key])) { $planches[$key] = ['class' => $data['Catégorie'], 'title' => $title, 'subtitle' => $subtitle, 'products' => []]; @@ -62,24 +62,38 @@ trait PumaOperation $html .= ''; $html .= ''; foreach ($planches as $data) { - $html .= '
'; - $html .= '

' . $data['title'] . '

'; - $html .= '

' . $data['subtitle'] . '

'; - $html .= '
'; - foreach ($data['products'] as $reference => $product) { - $f = protected_path('fluidbookpublication/cache/zoomarea/zoomarea/books/32281/' . $product['zoom_image']); - $html .= '
'; - $html .= ''; - $html .= '
'; - $html .= '

' . $reference . '

'; - $html .= '
' . $product['Désignation']??'' . '
'; - $html .= '
' . $product['Color Name']??''. '
'; - $html .= '
PA : ' . number_format(floatval($product['Tarif']??0), 2, ',', ' ') . ' € / PVP : ' . number_format(floatval($product['PVC']??0), 2, ',', ' ') . ' €
'; + $max = $data['class'] === 'Footwear' ? 20 : 18; + + $subs = array_chunk($data['products'], $max, true); + $csubs = count($subs); + + foreach ($subs as $i => $sub) { + $pos = $csubs == 1 ? '' : ' (' . ($i + 1) . '/' . $csubs . ')'; + $html .= '
'; + $html .= '

' . $data['title'] . '

'; + $html .= '

' . $data['subtitle'] . $pos . '

'; + $html .= '
'; + foreach ($sub as $reference => $product) { + if (isset($product['zoom_image'])) { + $f = protected_path('fluidbookpublication/cache/zoomarea/zoomarea/books/32281/' . $product['zoom_image']); + $img = Files::asDataURI($f); + } else { + $img = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+P+/HgAFhAJ/wlseKgAAAABJRU5ErkJggg=='; + } + + $html .= '
'; + $html .= ''; + $html .= '
'; + $html .= '

' . $reference . '

'; + $html .= '
' . $product['Désignation'] ?? '' . '
'; + $html .= '
' . $product['Color Name'] ?? '' . '
'; + $html .= '
PA : ' . number_format(floatval($product['Tarif'] ?? 0), 2, ',', ' ') . ' € / PVP : ' . number_format(floatval($product['PVC'] ?? 0), 2, ',', ' ') . ' €
'; + $html .= '
'; + $html .= '
'; + } $html .= '
'; - $html .= '
'; + $html .= '
'; } - $html .= ''; - $html .= ''; } $html .= ''; return $html; diff --git a/resources/puma/planogramme/style.css b/resources/puma/planogramme/style.css index 8080c8385..cd0f79b10 100644 --- a/resources/puma/planogramme/style.css +++ b/resources/puma/planogramme/style.css @@ -53,6 +53,10 @@ article img { max-height: 40mm; margin: 0 auto; } +.Footwear article img { + max-width: 48mm; + max-height: 30mm; +} h1, h2 { font-family: Puma; diff --git a/resources/puma/planogramme/style.css.map b/resources/puma/planogramme/style.css.map index c21c8ff6e..6d95b776f 100644 --- a/resources/puma/planogramme/style.css.map +++ b/resources/puma/planogramme/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.less"],"names":[],"mappings":"AAAA;EACI,aAAa,MAAb;EACA,kBAAA;EACA,gBAAA;EACA,y3pFAAA;;AAIJ;EACI,aAAa,MAAb;EACA,kBAAA;EACA,gBAAA;EACA,y9gFAAA;;AAGJ;EACI;IACI,eAAA;;;AAIR;EACI,UAAA;EACA,SAAA;EACA,yCAAA;EACA,iBAAA;EACA,kBAAA;EACA,sBAAA;;AAGJ;EACI,wBAAA;EACA,YAAA;EACA,iBAAA;;AAHJ,OAKI;EACI,uBAAA;;AAIR;EACI,aAAA;EACA,uBAAuB,cAAvB;EACA,oBAAoB,eAApB;EACA,YAAA;EACA,gBAAA;;AAEA,SAAU;EACN,uBAAuB,cAAvB;EACA,oBAAoB,eAApB;;AAIR;EACI,aAAA;EACA,sBAAA;;EACA,8BAAA;;AAHJ,OAKI;EACI,eAAA;EACA,gBAAA;EACA,cAAA;;AAIR;AAAI;EACA,iBAAA;EACA,gBAAA;EACA,yBAAA;;AAIJ;EAEI,gBAAA;EACA,iBAAA;;AAIJ;EACI,gBAAA;EACA,iBAAA;;AAGJ;EACI,gBAAA","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.less"],"names":[],"mappings":"AAAA;EACI,aAAa,MAAb;EACA,kBAAA;EACA,gBAAA;EACA,y3pFAAA;;AAIJ;EACI,aAAa,MAAb;EACA,kBAAA;EACA,gBAAA;EACA,y9gFAAA;;AAGJ;EACI;IACI,eAAA;;;AAIR;EACI,UAAA;EACA,SAAA;EACA,yCAAA;EACA,iBAAA;EACA,kBAAA;EACA,sBAAA;;AAGJ;EACI,wBAAA;EACA,YAAA;EACA,iBAAA;;AAHJ,OAKI;EACI,uBAAA;;AAIR;EACI,aAAA;EACA,uBAAuB,cAAvB;EACA,oBAAoB,eAApB;EACA,YAAA;EACA,gBAAA;;AAEA,SAAU;EACN,uBAAuB,cAAvB;EACA,oBAAoB,eAApB;;AAIR;EACI,aAAA;EACA,sBAAA;;EACA,8BAAA;;AAHJ,OAKI;EACI,eAAA;EACA,gBAAA;EACA,cAAA;;AAEA,SAAU,QALd;EAMQ,eAAA;EACA,gBAAA;;AAKZ;AAAI;EACA,iBAAA;EACA,gBAAA;EACA,yBAAA;;AAIJ;EAEI,gBAAA;EACA,iBAAA;;AAIJ;EACI,gBAAA;EACA,iBAAA;;AAGJ;EACI,gBAAA","file":"style.css"} \ No newline at end of file diff --git a/resources/puma/planogramme/style.less b/resources/puma/planogramme/style.less index 2cc68507f..44332f8bc 100644 --- a/resources/puma/planogramme/style.less +++ b/resources/puma/planogramme/style.less @@ -60,6 +60,11 @@ article { max-width: 40mm; max-height: 40mm; margin: 0 auto; + + .Footwear &{ + max-width: 48mm; + max-height: 30mm; + } } }