wip #4321 @0.5

diff --git a/images/symbols/grandvision.svg b/images/symbols/grandvision.svg
index 9f611e5775598dbf399fa3dacb997558842c06f4..ddff1aa09b7038356cd71eb7209c48686e7edac7 100644 (file)
--- a/images/symbols/grandvision.svg
+++ b/images/symbols/grandvision.svg
@@ -53,4 +53,25 @@
                s0.3-0.68,0.68-0.68h4.45c0.92,0,1.68,0.75,1.68,1.68v6.5C16.34,8.89,16.04,9.2,15.67,9.2z"/>
         </g>
     </symbol>
+    <symbol id="grandvision-adv" viewBox="0 0 294 294">
+        <path d="M283.845,145.913c-1.985,0-4.016,0.536-6.03,1.593l-43.19,22.568c-0.496,0.26-0.625,0.558-1.625,0.874v-14.876
+       c0-8.284-6.382-15-14.667-15h-9.305c13.976-13.341,22.71-32.129,22.71-52.93c0-40.37-32.843-73.214-73.213-73.214
+       c-32.474,0-60.062,21.259-69.618,50.585c-8.518-7.548-19.71-12.145-31.959-12.145c-26.607,0-48.255,21.646-48.255,48.253
+       c0,16.289,8.122,30.709,20.519,39.451H15.333c-8.284,0-15.333,6.716-15.333,15v108c0,8.284,7.049,15,15.333,15h203
+       c8.284,0,14.667-6.716,14.667-15v-14.448c1,0.316,1.128,0.614,1.623,0.874l43.106,22.568c2.015,1.057,4.09,1.593,6.074,1.593
+       c5.977,0,10.197-4.678,10.197-11.375V157.288C294,150.59,289.821,145.913,283.845,145.913z M158.525,44.928
+       c23.828,0,43.213,19.386,43.213,43.214s-19.385,43.213-43.213,43.213c-23.828,0-43.214-19.385-43.214-43.213
+       S134.697,44.928,158.525,44.928z M108.022,141.072H84.683c4.951-3.491,9.218-7.884,12.558-12.945
+       C100.333,132.849,103.954,137.189,108.022,141.072z M151,239.072c0,5.523-4.477,10-10,10H46c-5.523,0-10-4.477-10-10v-58
+       c0-5.523,4.477-10,10-10h95c5.523,0,10,4.477,10,10V239.072z M181.391,210.285c-9.602,0-17.386-7.784-17.386-17.385
+       c0-9.602,7.784-17.386,17.386-17.386c9.602,0,17.386,7.784,17.386,17.386C198.776,202.501,190.993,210.285,181.391,210.285z"/>
+    </symbol>
+    <symbol viewBox="0 0 329.942 329.942">
+        <path d="M329.208,126.666c-1.765-5.431-6.459-9.389-12.109-10.209l-95.822-13.922l-42.854-86.837
+       c-2.527-5.12-7.742-8.362-13.451-8.362c-5.71,0-10.925,3.242-13.451,8.362l-42.851,86.836l-95.825,13.922
+       c-5.65,0.821-10.345,4.779-12.109,10.209c-1.764,5.431-0.293,11.392,3.796,15.377l69.339,67.582L57.496,305.07
+       c-0.965,5.628,1.348,11.315,5.967,14.671c2.613,1.899,5.708,2.865,8.818,2.865c2.387,0,4.784-0.569,6.979-1.723l85.711-45.059
+       l85.71,45.059c2.208,1.161,4.626,1.714,7.021,1.723c8.275-0.012,14.979-6.723,14.979-15c0-1.152-0.13-2.275-0.376-3.352
+       l-16.233-94.629l69.339-67.583C329.501,138.057,330.972,132.096,329.208,126.666z"/>
+    </symbol>
 </svg>
\ No newline at end of file

diff --git a/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js b/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js
index 7101306e404f9b74011f09ca4aa3e947672cbc48..f2efe935d7a6251f24458a2a811f315c14e7efdb 100644 (file)
--- a/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js
+++ b/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js
@@ -171,7 +171,7 @@ FluidbookCartGrandVision.prototype = {
         var element = $(c).get(0);
         var options = {
             margin: 0,
-            filename: this.getExportFileName() +'s.pdf',
+            filename: this.getExportFileName() + 's.pdf',
             image: {type: 'png'},
             html2canvas: {dpi: 150, scale: 2.5, letterRendering: false},
             jsPDF: {unit: 'mm', format: 'A4', orientation: 'portrait'}
@@ -484,6 +484,14 @@ FluidbookCartGrandVision.prototype = {
         }
 
         selection = '<div class="item" data-ref="' + item + '" data-brand="' + data.BRAND + '" data-category="' + data.Category + '" data-gender="' + data.Gender + '" data-material="' + data.Material + '">';
+        selection += '<div class="icons">';
+        if (data.ADV === '1') {
+            selection += '<div class="mandatory" data-tooltip="ADV">' + getSpriteIcon('grandvision-adv') + '</div>';
+        }
+        if (data.Mandatory === '1') {
+            selection += '<div class="adv" data-tooltip="Mandatory">' + getSpriteIcon('grandvision-mandatory') + '</div>';
+        }
+        selection += '</div>';
         selection += '<div class="img" style="background-image: url(\'data/commerce/' + item + '-front.jpg\');"></div>';
         selection += '<div class="img-angle" style="background-image: url(\'data/commerce/' + item + '-angle.jpg\');"></div>';
         selection += '<div class="infos"><h3>' + data['Model Code'] + '</h3>';