diff --git a/modules/cms_pack/cms_pack.php b/modules/cms_pack/cms_pack.php index c8d89379..4b2d5350 100644 --- a/modules/cms_pack/cms_pack.php +++ b/modules/cms_pack/cms_pack.php @@ -81,7 +81,12 @@ class Cms_Pack extends Module $collection_product = new Collection('Product', $id_lang); $collection_product->where('id_product', 'IN', $pack->products); $collection_product->where('active', '=', 1); - $result['products'] = $collection_product->getResults(); + $products = $collection_product->getResults(); + + $products = array_map(function($product) { + return $product->loadReductionInfo(); + }, $products); + $result['products'] = $products; $price = array_map(function($product) { return floatval($product->price); diff --git a/modules/cms_pack/controllers/admin/AdminCmsPackController.php b/modules/cms_pack/controllers/admin/AdminCmsPackController.php index 9be01a76..2d41686d 100644 --- a/modules/cms_pack/controllers/admin/AdminCmsPackController.php +++ b/modules/cms_pack/controllers/admin/AdminCmsPackController.php @@ -97,4 +97,5 @@ class AdminCmsPackController extends ModuleAdminController } parent::processDelete(); } + } diff --git a/modules/cms_pack/views/templates/hook/pack_bottom.tpl b/modules/cms_pack/views/templates/hook/pack_bottom.tpl index dedd41eb..7bc4e24b 100644 --- a/modules/cms_pack/views/templates/hook/pack_bottom.tpl +++ b/modules/cms_pack/views/templates/hook/pack_bottom.tpl @@ -22,8 +22,10 @@

{$product->name}

-
+
+ - + +
@@ -49,6 +51,26 @@
- {hook h='reassuranceTopProduct'} + +
+
+
+
+
+ {l s='Livraison express' mod='cms_pack'} +
+
+
+
+ {l s='Satisfait ou remboursé' mod='cms_pack'} +
+
+
+
+ {l s='Paiement sécurisé' mod='cms_pack'} +
+
+
+
diff --git a/modules/cmsps/cmsps.php b/modules/cmsps/cmsps.php index 1b81b911..acaf5f72 100644 --- a/modules/cmsps/cmsps.php +++ b/modules/cmsps/cmsps.php @@ -1,8 +1,11 @@ id; - p($id_product); + $relations = CmsPsPost::getPostRelationWithProduct($id_product, 3, Context::getContext()->language->id); + if ($relations) { + $this->smarty->assign(array( + 'relations' => $relations, + )); + return $this->display(__FILE__, 'product_relationscms.tpl'); + } } } diff --git a/modules/cmsps/controllers/admin/AdminCmsPsCategories.php b/modules/cmsps/controllers/admin/AdminCmsPsCategories.php index 63ea448b..12a20a20 100644 --- a/modules/cmsps/controllers/admin/AdminCmsPsCategories.php +++ b/modules/cmsps/controllers/admin/AdminCmsPsCategories.php @@ -1,5 +1,5 @@ searchUrl = "{$link->getAdminLink('AdminSearch', true)}"; + + {literal} + $(document).ready(function() { + $('select#id_category').chosen({width: '250px'}).trigger("chosen:updated"); + }); + {/literal} + {$smarty.block.parent} {/block} \ No newline at end of file diff --git a/modules/cmsps/views/templates/hook/product_relationscms.tpl b/modules/cmsps/views/templates/hook/product_relationscms.tpl new file mode 100644 index 00000000..bef4a8ab --- /dev/null +++ b/modules/cmsps/views/templates/hook/product_relationscms.tpl @@ -0,0 +1,10 @@ +
+

{l s='Ce produit peut vous sauver la vie pour' mod='cmsps'}

+
+ {foreach from=$relations item=post key=key} +
+ {include file="$tpl_dir/post_img.tpl" post=$post} +
+ {/foreach} +
+
diff --git a/themes/toutpratique/css/k2000.css b/themes/toutpratique/css/k2000.css index 94db0b8c..5ae989f5 100644 --- a/themes/toutpratique/css/k2000.css +++ b/themes/toutpratique/css/k2000.css @@ -49,7 +49,6 @@ i.awesome { .btn.add_to_cart_button, .btn.ajax_add_to_cart_button, .btn.add_to_cart_pack { - padding-left: 50px; padding-right: 20px; } .btn.add_to_cart_button i, @@ -237,8 +236,11 @@ span.title { padding: 10px 20px; position: relative; text-transform: uppercase; + transition: all 0.2s ease; +} +.btn span { + margin-left: 30px; } - .btn:hover, .btn:focus, .btn.focus { background: #6ac5bb; color: #fff } .btn-black { diff --git a/themes/toutpratique/homestore.tpl b/themes/toutpratique/homestore.tpl index 66f2f991..3130fe9b 100644 --- a/themes/toutpratique/homestore.tpl +++ b/themes/toutpratique/homestore.tpl @@ -33,6 +33,12 @@
+
+ {hook h='displayHome' mod='blockbestsellers'} +
+ +
+
{hook h='displayHome' mod='categorieshome'}
@@ -54,11 +60,6 @@ -
- -
- {hook h='displayHome' mod='blockbestsellers'} -
diff --git a/themes/toutpratique/product.tpl b/themes/toutpratique/product.tpl index 7b6fa872..e094a0d0 100644 --- a/themes/toutpratique/product.tpl +++ b/themes/toutpratique/product.tpl @@ -391,8 +391,6 @@
{hook h='displayRelatedProduct' product=$product} -

{l s='Ce produit peut vous sauver la vie pour'}

-
{/if} diff --git a/themes/toutpratique/shopping-cart-product-line.tpl b/themes/toutpratique/shopping-cart-product-line.tpl index 1bb7a072..0eda2404 100644 --- a/themes/toutpratique/shopping-cart-product-line.tpl +++ b/themes/toutpratique/shopping-cart-product-line.tpl @@ -2,7 +2,7 @@
- {$pnames.name|escape:'html':'UTF-8'} + {$product.name|escape:'html':'UTF-8'}
@@ -37,14 +37,11 @@ {convertPrice price=$product.price_without_specific_price} {/if} - {if $product.ecotax > 0 || $product.sorecop > 0} + {if $product.ecotax > 0} {/if}
@@ -66,7 +63,7 @@ {if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1} - + - {else} @@ -79,7 +76,7 @@ - + +
{/if} diff --git a/themes/toutpratique/shopping-cart.tpl b/themes/toutpratique/shopping-cart.tpl index fd80a421..b0ea7a0c 100644 --- a/themes/toutpratique/shopping-cart.tpl +++ b/themes/toutpratique/shopping-cart.tpl @@ -11,7 +11,7 @@

{l s='Shopping-cart summary'}

- {include file="$tpl_dir./order-steps.tpl"} + {include file="$tpl_dir./order-steps.tpl" current_step="summary"}