Merge pull request #2 from leotiger/develop

product gallery and fixes
leotiger · Aug 10, 2018 · 6788900 · 6788900
2 parents b7edf12 + e925742
commit 6788900
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# v1.0.1
+## 02-08-2018
+
+1. [](#new)
+    * Add product gallery to product configuration
+    * Show product gallery in product detail page
+
+1. [](#bugfix)
+    * Fix image display and link bugs
+
 # v1.0.0
 ## 01-08-2018
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Shopping Cart Personalizer Addon
-version: 1.0.0
+version: 1.0.1
 description: "Power overload the Shopping Cart Plugin with stock management, variations, product personalizations, country restrictions and plenty of other tweaks and features."
 icon: shopping-cart
 author:

diff --git a/blueprints/pages/shoppingcart_product.yaml b/blueprints/pages/shoppingcart_product.yaml
@@ -96,17 +96,17 @@ form:
                     label: PLUGIN_SHOPPINGCART.PERSONALIZE_PRODUCT_DETAIL_IMAGE_BGCOLOR
                     default: 'rgba(255, 255, 255, 0.00)'
 
-                  header.show_all_media:
-                    type: toggle
-                    label: PLUGIN_SHOPPINGCART.PERSONALIZE_PRODUCT_DETAIL_MEDIA_ALL
-                    help: PLUGIN_SHOPPINGCART.PERSONALIZE_PRODUCT_DETAIL_MEDIA_ALL_HELP
-                    highlight: 0
-                    default: 0
-                    options:
-                        1: Yes
-                        0: No
-                    validate:
-                         type: bool
+                  header.product_gallery:
+                    type: list
+                    style: vertical
+                    btnLabel: PLUGIN_SHOPPINGCART.PERSONALIZE_GALLERY_ADD_MEDIA
+                    fields:
+                      .media:
+                        type: filepicker
+                        label: PLUGIN_SHOPPINGCART.PERSONALIZE_PRODUCT_MEDIA_ITEM
+                        preview_images: true
+                        validate:
+                          type: string
 
                   header.lastSale:
                     type: text

diff --git a/languages.yaml b/languages.yaml
@@ -150,6 +150,8 @@ en:
         PERSONALIZE_MINIMUM_ORDER_AMOUNT: Minimum order amount
         PERSONALIZE_FREE_SHIPPING_AMOUNT: Free shipping amount
         PERSONALIZE_EMAIL_PERSONALIZED_SUBJECT: Personalize confirmation        
+        PERSONALIZE_GALLERY_ADD_MEDIA: Add media item to product gallery
+        PERSONALIZE_PRODUCT_MEDIA_ITEM: Gallery item
 
 de:
     PLUGIN_SHOPPINGCART:

diff --git a/templates/partials/shoppingcart_core_detail_item.html.twig b/templates/partials/shoppingcart_core_detail_item.html.twig
@@ -1,5 +1,5 @@
-{% set shoppingcart_image_file = page.header.default_photo ? page.header.default_photo : (page.media.images|first).uri.filename %}
-{% set shoppingcart_image = page.header.show_all_media ? false : page.media.images|first %}
+{% set shoppingcart_image_default = page.header.default_photo ? page.header.default_photo : (page.media.images|first).uri.filename %}
+{% set shoppingcart_image = page.media.images|first %}
 {% for page_media in page.media.images if page_media.uri.filename == shoppingcart_image_file %}
     {% set shoppingcart_image = page_media %}
 {% endfor %}
@@ -16,30 +16,39 @@
 <div id="shoppingcart-detail" class="shoppingcart-product-container block-group">
 
     <div class="shoppingcart-info block">
-        {% if page.media.images and page.header.show_all_media %}
-            {% for catalogue_image in page.media.images %}
+        {% if page.media.images and page.header.product_gallery and page.header.product_gallery|length %}
+            {% for catalogue_image in page.header.product_gallery if page.media[catalogue_image|last] and catalogue_image|last matches '{\.(gif|jpg|jpeg|png)$}i' %}
             {% if config.plugins.shoppingcart.ui.image_container_square %}
             <div class="shoppingcart-thumb" style="text-align:center;width:{{ image_size_product }}px;height:{{ image_size_product }}px;background-color:{{ page.header.product_bgcolor }}">
             {% else %}
             <div class="shoppingcart-thumb">    
             {% endif %}    
-                <a {{ config.plugins.shoppingcart.ui.fancybox ? 'data-fancybox="itemgallery"' : 'target="_blank"' }} href="{{ catalogue_image.url }}">
-                {{ catalogue_image.cropResize(image_size_product, image_size_product).html(page.header.title, 'shoppingcart-thumb-image')|raw }}
+                <a {{ config.plugins.shoppingcart.ui.fancybox ? 'data-fancybox="itemgallery"' : 'target="_blank"' }} href="{{ page.media[catalogue_image|last].url }}">
+                {{ page.media[catalogue_image|last].cropResize(image_size_product, image_size_product).html(page.header.title, page.header.product_id, 'shoppingcart-thumb-image')|raw }}
                 </a>
             </div>
             <br><br>
             {% endfor %}
+        {% elseif shoppingcart_image_default and page.media[shoppingcart_image_default] and shoppingcart_image_default matches '{\.(gif|jpg|jpeg|png)$}i' %}
+            {% if config.plugins.shoppingcart.ui.image_container_square %}
+            <div class="shoppingcart-thumb" style="text-align:center;width:{{ image_size_product }}px;height:{{ image_size_product }}px;background-color:{{ page.header.product_bgcolor }}">
+            {% else %}
+            <div class="shoppingcart-thumb">    
+            {% endif %}    
+            <a {{ config.plugins.shoppingcart.ui.fancybox ? 'data-fancybox="itemgallery"' : 'target="_blank"' }} href="{{ page.media[shoppingcart_image_default].url }}">
+            {{ page.media[shoppingcart_image_default].cropResize(image_size_product, image_size_product).html(page.header.title, page.header.product_id, 'shoppingcart-thumb-image')|raw }}
+            </a>
+            </div>
         {% elseif shoppingcart_image %}
             {% if config.plugins.shoppingcart.ui.image_container_square %}
             <div class="shoppingcart-thumb" style="text-align:center;width:{{ image_size_product }}px;height:{{ image_size_product }}px;background-color:{{ page.header.product_bgcolor }}">
             {% else %}
             <div class="shoppingcart-thumb">    
             {% endif %}    
             <a {{ config.plugins.shoppingcart.ui.fancybox ? 'data-fancybox="itemgallery"' : 'target="_blank"' }} href="{{ shoppingcart_image.url }}">
-            {{ shoppingcart_image.cropResize(image_size_product, image_size_product).html(page.header.title, 'shoppingcart-thumb-image')|raw }}
+            {{ shoppingcart_image.cropResize(image_size_product, image_size_product).html(page.header.title, page.header.product_id, 'shoppingcart-thumb-image')|raw }}
             </a>
             </div>
-
         {% else %}
             <br><br><br>
         {% endif %}