Merge pull request PrestaShop#4930 from djfm/develop

// [*] Made pack products available to template...
Roskus · Feb 9, 2016 · 72295c2 · 72295c2
2 parents 904e57f + d941e66
commit 72295c2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
@@ -246,8 +246,20 @@ public function initContent()
             $this->assignAttributesCombinations();
 
             // Pack management
-            $pack_items = Pack::isPack($this->product->id) ? Pack::getItemTable($this->product->id, $this->context->language->id, true) : null;
-            $this->context->smarty->assign('packItems', $pack_items);
+            $pack_items = Pack::isPack($this->product->id) ? Pack::getItemTable($this->product->id, $this->context->language->id, true) : [];
+
+            $assembler = new ProductAssembler($this->context);
+            $presenter = $this->getProductPresenter();
+            $presentedPackItems = [];
+            foreach ($pack_items as $item) {
+                $presentedPackItems[] = $presenter->presentForListing(
+                    $this->getProductPresentationSettings(),
+                    $assembler->assembleProduct($item),
+                    $this->context->language
+                );
+            }
+
+            $this->context->smarty->assign('packItems', $presentedPackItems);
             $this->context->smarty->assign('noPackPrice', $this->product->getNoPackPrice());
             $this->context->smarty->assign('displayPackPrice', ($pack_items && $productPrice < $this->product->getNoPackPrice()) ? true : false);
             $this->context->smarty->assign('packs', Pack::getPacksTable($this->product->id, $this->context->language->id, true, 1));

diff --git a/themes/classic/templates/catalog/pack-product-miniature.tpl b/themes/classic/templates/catalog/pack-product-miniature.tpl
@@ -0,0 +1,10 @@
+<article>
+    <h1 class="h5">{$product.name}</h1>
+    <img
+      src = "{$product.cover.small.url}"
+      alt = "{$product.cover.legend}"
+      data-full-size-image-url = "{$product.cover.large.url}"
+    >
+    {$product.description_short}
+    {$product.description}
+</article>
diff --git a/themes/classic/templates/catalog/product.tpl b/themes/classic/templates/catalog/product.tpl
@@ -351,7 +351,7 @@
             <h3 class="text-uppercase _bolder">{l s='Pack content'}</h3>
             {foreach from=$packItems item="product_pack"}
               {block name='product_miniature'}
-                {include file='catalog/product-miniature.tpl' product=$product_pack}
+                {include file='catalog/pack-product-miniature.tpl' product=$product_pack}
               {/block}
             {/foreach}
         </section>