From 1895ec873182e2d27d49219d17ba2da5fe1ed458 Mon Sep 17 00:00:00 2001 From: Madman Date: Fri, 26 Jul 2013 15:30:54 +0200 Subject: [PATCH 01/23] // Begining of Support for Advanved Stock Managment in CSV Import --- controllers/admin/AdminImportController.php | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 81723c4fc..5f500accd 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -1477,6 +1477,34 @@ class AdminImportControllerCore extends AdminController // clean feature positions to avoid conflict Feature::cleanPositions(); } + + // set advanced stock managment + if($product->advanced_stock_managment) { + $product->setAdvancedStockManagement($product->advanced_stock_managment); + } + +/* + Add these checks andd also create a warning messeage + case 'advanced_stock_management' : + if (Tools::getValue('value') === false) + die (Tools::jsonEncode(array('error' => $this->l('Undefined value')))); + if ((int)Tools::getValue('value') != 1 && (int)Tools::getValue('value') != 0) + die (Tools::jsonEncode(array('error' => $this->l('Uncorrect value')))); + if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && (int)Tools::getValue('value') == 1) + die (Tools::jsonEncode(array('error' => $this->l('Not possible if advanced stock management is disabled. ')))); + if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && Pack::isPack($product->id)) + die (Tools::jsonEncode(array('error' => $this->l('Not possible if the product is a pack.')))); + + $product->setAdvancedStockManagement((int)Tools::getValue('value')); + if (StockAvailable::dependsOnStock($product->id) == 1 && (int)Tools::getValue('value') == 0) + StockAvailable::setProductDependsOnStock($product->id, 0); + break; + + } +*/ +// if (StockAvailable::dependsOnStock($product->id) == 1 && (int)Tools::getValue('value') == 0) +// StockAvailable::setProductDependsOnStock($product->id, 0); +// break; // stock available if (Shop::isFeatureActive()) From 4857c8c7889149c7ad314cce684c20f20f5dce47 Mon Sep 17 00:00:00 2001 From: PhpMadman Date: Mon, 29 Jul 2013 09:35:39 +0200 Subject: [PATCH 02/23] [+] BO: Added support for Advanced Stock Management [*] BO: Fixed typos [*] BO: Auto remove product from DependsOnStock of Advanced Stock Management is disabled [*] BO: Added id to warehouse controller --- controllers/admin/AdminImportController.php | 42 ++++++++----------- .../admin/AdminWarehousesController.php | 4 ++ 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 5f500accd..c2361ffc3 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -243,7 +243,11 @@ class AdminImportControllerCore extends AdminController 'shop' => array( 'label' => $this->l('ID / Name of shop'), 'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default shop will be used.'), - ) + ), + 'advanced_stock_management' => array( + 'label' => $this->l('Advanced Stock Management'), + 'help' => $this->l('Enable Advanced Stock Management on product (0 = No, 1 = Yes)') + ), ); self::$default_values = array( @@ -1479,32 +1483,20 @@ class AdminImportControllerCore extends AdminController } // set advanced stock managment - if($product->advanced_stock_managment) { - $product->setAdvancedStockManagement($product->advanced_stock_managment); + if($product->advanced_stock_management) { + if($product->advanced_stock_management != 1 || $product->advanced_stock_management != 0) { + $this->warnings[] = Tools::displayError('Advanced stock management has incorrect value. Not set'); + } elseif(!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management == 1) { + $this->warnings[] = Tools::displayError('Advanced stock management is not enabled, can not enable on product '); + } else { + $product->setAdvancedStockManagement($product->advanced_stock_management); + } + // automaticly disable depends on stock, if a_s_m set to disabled + if (StockAvailable::dependsOnStock($product->id) == 1 && $product->advanced_stock_management == 0) { + StockAvailable::setProductDependsOnStock($product->id, 0); + } } -/* - Add these checks andd also create a warning messeage - case 'advanced_stock_management' : - if (Tools::getValue('value') === false) - die (Tools::jsonEncode(array('error' => $this->l('Undefined value')))); - if ((int)Tools::getValue('value') != 1 && (int)Tools::getValue('value') != 0) - die (Tools::jsonEncode(array('error' => $this->l('Uncorrect value')))); - if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && (int)Tools::getValue('value') == 1) - die (Tools::jsonEncode(array('error' => $this->l('Not possible if advanced stock management is disabled. ')))); - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && Pack::isPack($product->id)) - die (Tools::jsonEncode(array('error' => $this->l('Not possible if the product is a pack.')))); - - $product->setAdvancedStockManagement((int)Tools::getValue('value')); - if (StockAvailable::dependsOnStock($product->id) == 1 && (int)Tools::getValue('value') == 0) - StockAvailable::setProductDependsOnStock($product->id, 0); - break; - - } -*/ -// if (StockAvailable::dependsOnStock($product->id) == 1 && (int)Tools::getValue('value') == 0) -// StockAvailable::setProductDependsOnStock($product->id, 0); -// break; // stock available if (Shop::isFeatureActive()) diff --git a/controllers/admin/AdminWarehousesController.php b/controllers/admin/AdminWarehousesController.php index 8628f1f52..99e1371cc 100644 --- a/controllers/admin/AdminWarehousesController.php +++ b/controllers/admin/AdminWarehousesController.php @@ -38,6 +38,10 @@ class AdminWarehousesControllerCore extends AdminController $this->multishop_context = Shop::CONTEXT_ALL; $this->fields_list = array( + 'id_warehouse' => array( + 'title' => $this->l('ID'), + 'width' => 50, + ), 'reference' => array( 'title' => $this->l('Reference'), 'width' => 150, From 909948bfb950d5d7a29d9a14179de162644265c1 Mon Sep 17 00:00:00 2001 From: PhpMadman Date: Mon, 29 Jul 2013 10:27:31 +0200 Subject: [PATCH 03/23] [+] BO : Added support to set A warehouse by id [*] BO : Import will clear any warehouses allready set --- controllers/admin/AdminImportController.php | 25 +++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index c2361ffc3..17621d2bd 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -248,6 +248,7 @@ class AdminImportControllerCore extends AdminController 'label' => $this->l('Advanced Stock Management'), 'help' => $this->l('Enable Advanced Stock Management on product (0 = No, 1 = Yes)') ), + 'warehouse' => array('label' => $this->l('Warehouse')), ); self::$default_values = array( @@ -1484,10 +1485,10 @@ class AdminImportControllerCore extends AdminController // set advanced stock managment if($product->advanced_stock_management) { - if($product->advanced_stock_management != 1 || $product->advanced_stock_management != 0) { + if($product->advanced_stock_management != 1 && $product->advanced_stock_management != 0) { $this->warnings[] = Tools::displayError('Advanced stock management has incorrect value. Not set'); } elseif(!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management == 1) { - $this->warnings[] = Tools::displayError('Advanced stock management is not enabled, can not enable on product '); + $this->warnings[] = sprintf(Tools::displayError('Advanced stock management is not enabled, can not enable on product %1$s '),$product->name[$default_language_id]); } else { $product->setAdvancedStockManagement($product->advanced_stock_management); } @@ -1497,6 +1498,26 @@ class AdminImportControllerCore extends AdminController } } + // Check if warehouse exists + if(Warehouse::exists($product->warehouse)) { + // Get already associated warehouses + $associated_warehouses_collection = WarehouseProductLocation::getCollection($product->id); + + // Delete any entry in warehouse for this product + foreach ($associated_warehouses_collection as $awc) + { + $awc->delete(); + } + $warehouse_location_entity = new WarehouseProductLocation(); + $warehouse_location_entity->id_product = $product->id; + $warehouse_location_entity->id_product_attribute = 0; + $warehouse_location_entity->id_warehouse = $product->warehouse; + $warehouse_location_entity->save(); + + StockAvailable::synchronize($product->id); // Don't know if it is needed, but it can't hurt + } else { + $this->warnings[] = sprintf(Tools::displayError('Warehouse did not exists, can not set on product %1$s '),$product->name[$default_language_id]); + } // stock available if (Shop::isFeatureActive()) From 1dd7d6afcc0b42b6baebe10fc38924a73714ac16 Mon Sep 17 00:00:00 2001 From: PhpMadman Date: Mon, 29 Jul 2013 11:54:15 +0200 Subject: [PATCH 04/23] [-] BO : Fixed incorrect error message in a_s_m [+] BO : Added support for Depends On Stock [-] BO : Added missing check if warehouse is set in csv --- controllers/admin/AdminImportController.php | 77 ++++++++++++++------- 1 file changed, 51 insertions(+), 26 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 17621d2bd..c323eeea0 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -248,7 +248,14 @@ class AdminImportControllerCore extends AdminController 'label' => $this->l('Advanced Stock Management'), 'help' => $this->l('Enable Advanced Stock Management on product (0 = No, 1 = Yes)') ), - 'warehouse' => array('label' => $this->l('Warehouse')), + 'depends_on_stock' => array( + 'label' => $this->l('Depends On Stock'), + 'help' => $this->l('0 = Use quantity set in product, 1 = Use quantity from Warehouse') + ), + 'warehouse' => array( + 'label' => $this->l('Warehouse'), + 'help' => $this->l('ID of the warehouse to set as storeage') + ), ); self::$default_values = array( @@ -1486,7 +1493,7 @@ class AdminImportControllerCore extends AdminController // set advanced stock managment if($product->advanced_stock_management) { if($product->advanced_stock_management != 1 && $product->advanced_stock_management != 0) { - $this->warnings[] = Tools::displayError('Advanced stock management has incorrect value. Not set'); + $this->warnings[] = sprintf(Tools::displayError('Advanced stock management has incorrect value. Not set for product %1$s '),$product->name[$default_language_id]); } elseif(!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management == 1) { $this->warnings[] = sprintf(Tools::displayError('Advanced stock management is not enabled, can not enable on product %1$s '),$product->name[$default_language_id]); } else { @@ -1499,34 +1506,52 @@ class AdminImportControllerCore extends AdminController } // Check if warehouse exists - if(Warehouse::exists($product->warehouse)) { - // Get already associated warehouses - $associated_warehouses_collection = WarehouseProductLocation::getCollection($product->id); - - // Delete any entry in warehouse for this product - foreach ($associated_warehouses_collection as $awc) - { - $awc->delete(); + if($product->warehouse) { + if(!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { + $this->warnings[] = sprintf(Tools::displayError('Advanced stock management is not enabled, warehouse not set on product %1$s '),$product->name[$default_language_id]); + } else { + if(Warehouse::exists($product->warehouse)) { + // Get already associated warehouses + $associated_warehouses_collection = WarehouseProductLocation::getCollection($product->id); + + // Delete any entry in warehouse for this product + foreach ($associated_warehouses_collection as $awc) + { + $awc->delete(); + } + $warehouse_location_entity = new WarehouseProductLocation(); + $warehouse_location_entity->id_product = $product->id; + $warehouse_location_entity->id_product_attribute = 0; + $warehouse_location_entity->id_warehouse = $product->warehouse; + $warehouse_location_entity->save(); + + StockAvailable::synchronize($product->id); // Don't know if it is needed, but it can't hurt + } else { + $this->warnings[] = sprintf(Tools::displayError('Warehouse did not exists, can not set on product %1$s '),$product->name[$default_language_id]); + } } - $warehouse_location_entity = new WarehouseProductLocation(); - $warehouse_location_entity->id_product = $product->id; - $warehouse_location_entity->id_product_attribute = 0; - $warehouse_location_entity->id_warehouse = $product->warehouse; - $warehouse_location_entity->save(); - - StockAvailable::synchronize($product->id); // Don't know if it is needed, but it can't hurt - } else { - $this->warnings[] = sprintf(Tools::displayError('Warehouse did not exists, can not set on product %1$s '),$product->name[$default_language_id]); } - + // stock available - if (Shop::isFeatureActive()) - { - foreach ($shops as $shop) - StockAvailable::setQuantity((int)$product->id, 0, $product->quantity, (int)$shop); + if($product->depends_on_stock) { // if not set + if($product->depends_on_stock != 0 && $product->depends_on_stock != 1) { + $this->warnings[] = sprintf(Tools::displayError('Incorrect value for depends on stock for product %1$s '),$product->name[$default_language_id]); + } elseif((!$product->advanced_stock_management || $product->advanced_stock_management == 0) && $product->depends_on_stock == 1) { + $this->warnings[] = sprintf(Tools::displayError('Advanced stock management not enabled, can not set depends on stock %1$s '),$product->name[$default_language_id]); + } else { + StockAvailable::setProductDependsOnStock($product->id, $product->depends_on_stock); + } + } else { // if not depends_on_stock set, use normal qty + if (Shop::isFeatureActive()) + { + foreach ($shops as $shop) + StockAvailable::setQuantity((int)$product->id, 0, $product->quantity, (int)$shop); + } + else + { + StockAvailable::setQuantity((int)$product->id, 0, $product->quantity, $this->context->shop->id); + } } - else - StockAvailable::setQuantity((int)$product->id, 0, $product->quantity, $this->context->shop->id); } From e90dafe7b1d3e9c092dd71ebcca9ec1e5ebdac2e Mon Sep 17 00:00:00 2001 From: djfm Date: Wed, 4 Dec 2013 16:18:22 +0000 Subject: [PATCH 05/23] // more descriptive labels in dashactivity --- modules/dashactivity/dashactivity.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/dashactivity/dashactivity.php b/modules/dashactivity/dashactivity.php index ce5939890..1acb5e3d2 100644 --- a/modules/dashactivity/dashactivity.php +++ b/modules/dashactivity/dashactivity.php @@ -353,7 +353,7 @@ class Dashactivity extends Module $fields_form['form']['input'][] = array( 'label' => $this->l('Cart active'), - 'desc' => $this->l('Default time range to consider a Shopping cart as active (default 30, max 120)'), + 'desc' => $this->l('How long (in minutes) a cart is to be considered active after the last recorded change.'), 'name' => 'DASHACTIVITY_CART_ACTIVE', 'type' => 'select', 'options' => array( @@ -371,7 +371,7 @@ class Dashactivity extends Module ); $fields_form['form']['input'][] = array( 'label' => $this->l('Visitor online'), - 'desc' => $this->l('Default time range to consider a Visitor as online (default 30, max 120)'), + 'desc' => $this->l('How long (in minutes) a visitor is to be considered online after their last action (default: 30 min).'), 'name' => 'DASHACTIVITY_VISITOR_ONLINE', 'type' => 'select', 'options' => array( @@ -389,14 +389,14 @@ class Dashactivity extends Module ); $fields_form['form']['input'][] = array( 'label' => $this->l('Cart abandoned (min)'), - 'desc' => $this->l('Default time range (min) to consider a Shopping cart as abandoned (default 24hrs)'), + 'desc' => $this->l('How long (in hours) after the last action a cart is to be considered as abandoned (default: 24 hrs).'), 'name' => 'DASHACTIVITY_CART_ABANDONED_MIN', 'type' => 'text', 'suffix' => $this->l('hrs'), ); $fields_form['form']['input'][] = array( 'label' => $this->l('Cart abandoned (max)'), - 'desc' => $this->l('Default time range (max) to consider a Shopping cart as abandoned (default 48hrs)'), + 'desc' => $this->l('How long (in hours) after the last action a cart is no longer to be considered as abandoned (default: 24 hrs).'), 'name' => 'DASHACTIVITY_CART_ABANDONED_MAX', 'type' => 'text', 'suffix' => $this->l('hrs'), From ec8ca92e6782349d674429b91532fa195226212d Mon Sep 17 00:00:00 2001 From: gRoussac Date: Wed, 4 Dec 2013 18:49:34 +0100 Subject: [PATCH 06/23] // norms --- controllers/admin/AdminImportController.php | 52 +++++++++------------ 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index cd206a10c..77633ee0d 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -1707,68 +1707,62 @@ class AdminImportControllerCore extends AdminController } // set advanced stock managment - if($product->advanced_stock_management) { - if($product->advanced_stock_management != 1 && $product->advanced_stock_management != 0) { + if($product->advanced_stock_management) + { + if($product->advanced_stock_management != 1 && $product->advanced_stock_management != 0) $this->warnings[] = sprintf(Tools::displayError('Advanced stock management has incorrect value. Not set for product %1$s '),$product->name[$default_language_id]); - } elseif(!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management == 1) { + elseif(!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management == 1) $this->warnings[] = sprintf(Tools::displayError('Advanced stock management is not enabled, can not enable on product %1$s '),$product->name[$default_language_id]); - } else { + else $product->setAdvancedStockManagement($product->advanced_stock_management); - } // automaticly disable depends on stock, if a_s_m set to disabled - if (StockAvailable::dependsOnStock($product->id) == 1 && $product->advanced_stock_management == 0) { + if (StockAvailable::dependsOnStock($product->id) == 1 && $product->advanced_stock_management == 0) StockAvailable::setProductDependsOnStock($product->id, 0); - } } // Check if warehouse exists - if($product->warehouse) { - if(!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { + if($product->warehouse) + { + if(!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) $this->warnings[] = sprintf(Tools::displayError('Advanced stock management is not enabled, warehouse not set on product %1$s '),$product->name[$default_language_id]); - } else { - if(Warehouse::exists($product->warehouse)) { + else + { + if(Warehouse::exists($product->warehouse)) + { // Get already associated warehouses $associated_warehouses_collection = WarehouseProductLocation::getCollection($product->id); - // Delete any entry in warehouse for this product foreach ($associated_warehouses_collection as $awc) - { $awc->delete(); - } $warehouse_location_entity = new WarehouseProductLocation(); $warehouse_location_entity->id_product = $product->id; $warehouse_location_entity->id_product_attribute = 0; $warehouse_location_entity->id_warehouse = $product->warehouse; $warehouse_location_entity->save(); - StockAvailable::synchronize($product->id); // Don't know if it is needed, but it can't hurt - } else { - $this->warnings[] = sprintf(Tools::displayError('Warehouse did not exists, can not set on product %1$s '),$product->name[$default_language_id]); } + else + $this->warnings[] = sprintf(Tools::displayError('Warehouse did not exists, can not set on product %1$s '),$product->name[$default_language_id]); } } - // stock available - if($product->depends_on_stock) { // if not set - if($product->depends_on_stock != 0 && $product->depends_on_stock != 1) { + if($product->depends_on_stock) + { + if($product->depends_on_stock != 0 && $product->depends_on_stock != 1) $this->warnings[] = sprintf(Tools::displayError('Incorrect value for depends on stock for product %1$s '),$product->name[$default_language_id]); - } elseif((!$product->advanced_stock_management || $product->advanced_stock_management == 0) && $product->depends_on_stock == 1) { + elseif((!$product->advanced_stock_management || $product->advanced_stock_management == 0) && $product->depends_on_stock == 1) $this->warnings[] = sprintf(Tools::displayError('Advanced stock management not enabled, can not set depends on stock %1$s '),$product->name[$default_language_id]); - } else { + else StockAvailable::setProductDependsOnStock($product->id, $product->depends_on_stock); - } - } else { // if not depends_on_stock set, use normal qty + } + else// if not depends_on_stock set, use normal qty + { if (Shop::isFeatureActive()) - { foreach ($shops as $shop) StockAvailable::setQuantity((int)$product->id, 0, $product->quantity, (int)$shop); - } else - { StockAvailable::setQuantity((int)$product->id, 0, $product->quantity, $this->context->shop->id); - } } - } $this->closeCsvFile($handle); } From 04d2ff59ee6bff6a71c50c8fefcd27e586ab1913 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Wed, 4 Dec 2013 19:31:02 +0100 Subject: [PATCH 07/23] // fix product list + facebook block HTML5 version WIP --- modules/blockfacebook/blockfacebook.tpl | 32 +++++++++++++++++------ themes/default-bootstrap/product-list.tpl | 5 ++-- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/modules/blockfacebook/blockfacebook.tpl b/modules/blockfacebook/blockfacebook.tpl index 17cb392ea..e69da60ee 100644 --- a/modules/blockfacebook/blockfacebook.tpl +++ b/modules/blockfacebook/blockfacebook.tpl @@ -1,10 +1,26 @@ {if $facebookurl != ''} -
-

{l s='Follow us on facebook' mod='blockfacebook'}

- +
+ +
+

{l s='Follow us on facebook' mod='blockfacebook'}

+ -{/if} - - +
+{/if} \ No newline at end of file diff --git a/themes/default-bootstrap/product-list.tpl b/themes/default-bootstrap/product-list.tpl index e248b68bb..fa1a114aa 100644 --- a/themes/default-bootstrap/product-list.tpl +++ b/themes/default-bootstrap/product-list.tpl @@ -151,14 +151,13 @@ href="{$link->getPageLink('cart',false, NULL, "add=1&id_product={$product.id_product|intval}&token={$static_token}", false)|escape:'html'}" rel="nofollow" title="{l s='Add to cart'}" - data-id-product="{$product.id_product|intval}" - token={$static_token}", false)|escape:'html'}"> + data-id-product="{$product.id_product|intval}"> {l s='Add to cart'} {else} From 7117a6f4fdd295fb64456d82ab04fcb0dcb047e9 Mon Sep 17 00:00:00 2001 From: Vincent Augagneur Date: Thu, 5 Dec 2013 10:35:51 +0100 Subject: [PATCH 08/23] [-] BO : fixed bug #PSCSX-76 - carrier wizard fees not display after reload carrier --- js/admin_carrier_wizard.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js index 6a1dedb8e..6ecea9104 100644 --- a/js/admin_carrier_wizard.js +++ b/js/admin_carrier_wizard.js @@ -31,7 +31,6 @@ $(document).ready(function() { if (parseInt($('input[name="is_free"]:checked').val())) is_freeClick($('input[name="is_free"]:checked')); displayRangeType(); - checkAllZones(); }); function initCarrierWizard() @@ -676,4 +675,4 @@ function checkAllZones(elt) $('.fees div.input-group input:text, .fees_all div.input-group input:text').attr('disabled', 'disabled').val(''); } -} \ No newline at end of file +} From 5e9db96f614c58c490233deef922677bdf4b3ad9 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Thu, 5 Dec 2013 10:38:59 +0100 Subject: [PATCH 09/23] // home is valid W3C! --- themes/default-bootstrap/css/highdpi.css | 7 +------ themes/default-bootstrap/header.tpl | 11 ++++++----- .../default-bootstrap/modules/blockcart/blockcart.tpl | 4 ++-- themes/default-bootstrap/product-list.tpl | 10 +--------- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/themes/default-bootstrap/css/highdpi.css b/themes/default-bootstrap/css/highdpi.css index 1f777ceb2..6f06e9369 100644 --- a/themes/default-bootstrap/css/highdpi.css +++ b/themes/default-bootstrap/css/highdpi.css @@ -1,11 +1,7 @@ -@media only screen and (-webkit-min-device-pixel-ratio: 2), -only screen and (min-device-pixel-ratio: 2) { - - +@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) { .replace-2x { font-size: 1px; } - .example { background-image: url(../images/example2x.png); -webkit-background-size:13px 13px; @@ -13,5 +9,4 @@ only screen and (min-device-pixel-ratio: 2) { -o-background-size:13px 13px; background-size:13px 13px; } - } \ No newline at end of file diff --git a/themes/default-bootstrap/header.tpl b/themes/default-bootstrap/header.tpl index fa06645fe..b64881274 100644 --- a/themes/default-bootstrap/header.tpl +++ b/themes/default-bootstrap/header.tpl @@ -44,16 +44,18 @@ + + - - + + {if isset($css_files)} {foreach from=$css_files key=css_uri item=media} - + {/foreach} {/if} @@ -62,10 +64,9 @@ var viewport = document.querySelector("meta[name=viewport]"); viewport.setAttribute('content', 'initial-scale=1.0,maximum-scale=1.0,user-scalable=0,width=device-width,height=device-height'); } - if(navigator.userAgent.match(/Android/i)){ + if(navigator.userAgent.match(/Android/i)) { window.scrollTo(0,1); } - var baseDir = '{$content_dir|addslashes}'; var baseUri = '{$base_uri|addslashes}'; var static_token = '{$static_token|addslashes}'; diff --git a/themes/default-bootstrap/modules/blockcart/blockcart.tpl b/themes/default-bootstrap/modules/blockcart/blockcart.tpl index 39ea46550..fae2c2d06 100644 --- a/themes/default-bootstrap/modules/blockcart/blockcart.tpl +++ b/themes/default-bootstrap/modules/blockcart/blockcart.tpl @@ -76,8 +76,8 @@ var generated_date = {$smarty.now|intval}; {assign var='productId' value=$product.id_product} {assign var='productAttributeId' value=$product.id_product_attribute}
- - + + {$product.name|escape:htmlall:'UTF-8'}
diff --git a/themes/default-bootstrap/product-list.tpl b/themes/default-bootstrap/product-list.tpl index fa1a114aa..5ff63a2bc 100644 --- a/themes/default-bootstrap/product-list.tpl +++ b/themes/default-bootstrap/product-list.tpl @@ -116,13 +116,10 @@ {$product.name|truncate:45:'...'|escape:'html':'UTF-8'} - {hook h='displayProductListReviews' product=$product} -

{$product.description_short|strip_tags:'UTF-8'|truncate:360:'...'}

- {if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
{if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)} @@ -141,7 +138,6 @@ {/if}
{/if} -
{if ($product.id_product_attribute == 0 || (isset($add_prod_display) && ($add_prod_display == 1))) && $product.available_for_order && !isset($restricted_country_mode) && $product.minimal_quantity <= 1 && $product.customizable != 2 && !$PS_CATALOG_MODE} {if ($product.allow_oosp || $product.quantity > 0)} @@ -190,7 +186,6 @@ {l s='Reduced price!'} {/if}
- {if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))} {if isset($product.available_for_order) && $product.available_for_order && !isset($restricted_country_mode)} @@ -210,9 +205,7 @@ {/if} {/if} -
-
{hook h='displayProductListFunctionalButtons' product=$product} {if isset($comparator_max_item) && $comparator_max_item} @@ -251,7 +244,6 @@ )}); } - {if $page_name !='index' && $page_name !='product'} {/if} -{/if} +{/if} \ No newline at end of file From 9850eeb3e51e24ce11ca23d5e339f1e51bc1fd8b Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Thu, 5 Dec 2013 11:00:58 +0100 Subject: [PATCH 10/23] // Fix category delete cancel button --- .../controllers/categories/helpers/list/list_header.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl index ad3092b9b..3ac34f007 100644 --- a/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl @@ -94,7 +94,7 @@ {/if} {/foreach}
- From acd0bbc366cf23bfe3cfb1a1959f0db31085cf19 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Thu, 5 Dec 2013 11:26:26 +0100 Subject: [PATCH 11/23] // php warning --- modules/dashgoals/dashgoals.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/dashgoals/dashgoals.php b/modules/dashgoals/dashgoals.php index ab25dd934..636f646f0 100644 --- a/modules/dashgoals/dashgoals.php +++ b/modules/dashgoals/dashgoals.php @@ -235,7 +235,9 @@ class Dashgoals extends Module $fullfilment = round($value / $month_goal, 2); // Base rate is essential here : it determines the value of the goal compared to the "100%" of the chart legend - $base_rate = $month_goal / $average_goal; + $base_rate = 0; + if ($average_goal && $month_goal) + $base_rate = $month_goal / $average_goal; // Fullfilment of 1 means that we performed exactly anticipated if ($fullfilment == 1) From 3889f6d61f73c484c2c3a5ad9d09580ae2ba097f Mon Sep 17 00:00:00 2001 From: gRoussac Date: Thu, 5 Dec 2013 11:27:07 +0100 Subject: [PATCH 12/23] // follow up https://github.com/PrestaShop/PrestaShop/commit/7140a63272fa2de5f7368a062d7fde79ca89d692#commitcomment-4775950 --- controllers/admin/AdminImportController.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 77633ee0d..13602d5e8 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -255,7 +255,6 @@ class AdminImportControllerCore extends AdminController 'uploadable_files' => array('label' => $this->l('Uploadable files (0 = No, 1 = Yes)')), 'text_fields' => array('label' => $this->l('Text fields (0 = No, 1 = Yes)')), 'out_of_stock' => array('label' => $this->l('Action when out of stock')), - 'advanced_stock_management' => array('label' => $this->l('Advanced stock management')), 'shop' => array( 'label' => $this->l('ID / Name of shop'), 'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default shop will be used.'), @@ -1739,7 +1738,7 @@ class AdminImportControllerCore extends AdminController $warehouse_location_entity->id_product_attribute = 0; $warehouse_location_entity->id_warehouse = $product->warehouse; $warehouse_location_entity->save(); - StockAvailable::synchronize($product->id); // Don't know if it is needed, but it can't hurt + StockAvailable::synchronize($product->id); } else $this->warnings[] = sprintf(Tools::displayError('Warehouse did not exists, can not set on product %1$s '),$product->name[$default_language_id]); @@ -1946,11 +1945,11 @@ class AdminImportControllerCore extends AdminController else $this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : ''); - // fils groups attributes + // fills groups attributes $id_attribute_group = $obj->id; $groups_attributes[$key]['id'] = $id_attribute_group; } - else // alreay exists + else // already exists { $id_attribute_group = $groups[$group]; $groups_attributes[$key]['id'] = $id_attribute_group; From 9df713e6ec9a41465c5f4cef705098881f34b3c0 Mon Sep 17 00:00:00 2001 From: PhpMadman Date: Thu, 5 Dec 2013 12:30:17 +0100 Subject: [PATCH 13/23] [-] BO : Fixes for Advanced Stock Management Import [*] BO : Combinations import supports Advanced Stock Management [*] BO : Advanced Stock Management import now supports stock increase [*] BO : Advanced Stock Management stock unit price uses wholesale_price (Product Cost) or 0.00001 if not set [*] BO : Added Advanced Stock Management to csv import docs --- controllers/admin/AdminImportController.php | 155 ++++++++++++++++++-- docs/csv_import/combinations_import.csv | 56 +++---- docs/csv_import/products_import.csv | 16 +- 3 files changed, 175 insertions(+), 52 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 13602d5e8..f3c5adacc 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -145,7 +145,19 @@ class AdminImportControllerCore extends AdminController 'shop' => array( 'label' => $this->l('ID / Name of shop'), 'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default shop will be used.'), - ) + ), + 'advanced_stock_management' => array( + 'label' => $this->l('Advanced Stock Management'), + 'help' => $this->l('Enable Advanced Stock Management on product (0 = No, 1 = Yes)') + ), + 'depends_on_stock' => array( + 'label' => $this->l('Depends On Stock'), + 'help' => $this->l('0 = Use quantity set in product, 1 = Use quantity from Warehouse') + ), + 'warehouse' => array( + 'label' => $this->l('Warehouse'), + 'help' => $this->l('ID of the warehouse to set as storeage') + ), ); self::$default_values = array( @@ -160,6 +172,8 @@ class AdminImportControllerCore extends AdminController 'minimal_quantity' => 1, 'weight' => 0, 'default_on' => 0, + 'advanced_stock_management' => 0, + 'depends_on_stock' => 0, ); break; @@ -298,7 +312,8 @@ class AdminImportControllerCore extends AdminController 'uploadable_files' => 0, 'text_fields' => 0, 'out_of_stock' => '2', - 'advanced_stock_management' => '0', + 'advanced_stock_management' => 0, + 'depends_on_stock' => 0, ); break; @@ -1704,13 +1719,13 @@ class AdminImportControllerCore extends AdminController // clean feature positions to avoid conflict Feature::cleanPositions(); } - + // set advanced stock managment - if($product->advanced_stock_management) + if (isset($product->advanced_stock_management)) { - if($product->advanced_stock_management != 1 && $product->advanced_stock_management != 0) + if ($product->advanced_stock_management != 1 && $product->advanced_stock_management != 0) $this->warnings[] = sprintf(Tools::displayError('Advanced stock management has incorrect value. Not set for product %1$s '),$product->name[$default_language_id]); - elseif(!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management == 1) + elseif (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management == 1) $this->warnings[] = sprintf(Tools::displayError('Advanced stock management is not enabled, can not enable on product %1$s '),$product->name[$default_language_id]); else $product->setAdvancedStockManagement($product->advanced_stock_management); @@ -1718,15 +1733,15 @@ class AdminImportControllerCore extends AdminController if (StockAvailable::dependsOnStock($product->id) == 1 && $product->advanced_stock_management == 0) StockAvailable::setProductDependsOnStock($product->id, 0); } - + // Check if warehouse exists - if($product->warehouse) + if ($product->warehouse) { - if(!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) + if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) $this->warnings[] = sprintf(Tools::displayError('Advanced stock management is not enabled, warehouse not set on product %1$s '),$product->name[$default_language_id]); else { - if(Warehouse::exists($product->warehouse)) + if (Warehouse::exists($product->warehouse)) { // Get already associated warehouses $associated_warehouses_collection = WarehouseProductLocation::getCollection($product->id); @@ -1737,24 +1752,52 @@ class AdminImportControllerCore extends AdminController $warehouse_location_entity->id_product = $product->id; $warehouse_location_entity->id_product_attribute = 0; $warehouse_location_entity->id_warehouse = $product->warehouse; - $warehouse_location_entity->save(); + if (WarehouseProductLocation::getProductLocation($product->id, 0, $product->warehouse) !== false) + $warehouse_location_entity->update(); + else + $warehouse_location_entity->save(); StockAvailable::synchronize($product->id); } else $this->warnings[] = sprintf(Tools::displayError('Warehouse did not exists, can not set on product %1$s '),$product->name[$default_language_id]); } } + // stock available - if($product->depends_on_stock) + if (isset($product->depends_on_stock)) { - if($product->depends_on_stock != 0 && $product->depends_on_stock != 1) + if ($product->depends_on_stock != 0 && $product->depends_on_stock != 1) $this->warnings[] = sprintf(Tools::displayError('Incorrect value for depends on stock for product %1$s '),$product->name[$default_language_id]); - elseif((!$product->advanced_stock_management || $product->advanced_stock_management == 0) && $product->depends_on_stock == 1) + elseif ((!$product->advanced_stock_management || $product->advanced_stock_management == 0) && $product->depends_on_stock == 1) $this->warnings[] = sprintf(Tools::displayError('Advanced stock management not enabled, can not set depends on stock %1$s '),$product->name[$default_language_id]); else StockAvailable::setProductDependsOnStock($product->id, $product->depends_on_stock); + + // This code allows us to set qty and disable depends on stock + if (isset($product->quantity) && $product->depends_on_stock == 0) + { + if (Shop::isFeatureActive()) + foreach ($shops as $shop) + StockAvailable::setQuantity((int)$product->id, 0, $product->quantity, (int)$shop); + else + StockAvailable::setQuantity((int)$product->id, 0, $product->quantity, $this->context->shop->id); + } + // elseif enable depends on stock and quantity, add quantity to stock + elseif (isset($product->quantity) && $product->depends_on_stock == 1) + { + // add stock + $stock_manager = StockManagerFactory::getManager(); + $price = str_replace(',', '.', $product->wholesale_price); + if ($price == 0) + $price = 0.000001; + $price = round(floatval($price), 6); + $warehouse = new Warehouse($product->warehouse); + if ($stock_manager->addProduct((int)$product->id, 0, $warehouse, $product->quantity, 1, $price, true)) + StockAvailable::synchronize((int)$product->id); + } } - else// if not depends_on_stock set, use normal qty + // if not depends_on_stock set, use normal qty + else { if (Shop::isFeatureActive()) foreach ($shops as $shop) @@ -2100,7 +2143,87 @@ class AdminImportControllerCore extends AdminController VALUES ('.(int)$attribute_to_add.','.(int)$id_product_attribute.')'); } - StockAvailable::setQuantity($product->id, $id_product_attribute, (int)$info['quantity']); + // set advanced stock managment + if (isset($info['advanced_stock_management'])) + { + if ($info['advanced_stock_management'] != 1 && $info['advanced_stock_management'] != 0) + $this->warnings[] = sprintf(Tools::displayError('Advanced stock management has incorrect value. Not set for product with id %s '),$product->id); + elseif (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $info['advanced_stock_management'] == 1) + $this->warnings[] = sprintf(Tools::displayError('Advanced stock management is not enabled, can not enable on product with id %s '),$product->id); + else + $product->setAdvancedStockManagement($info['advanced_stock_management']); + // automaticly disable depends on stock, if a_s_m set to disabled + if (StockAvailable::dependsOnStock($product->id) == 1 && $info['advanced_stock_management'] == 0) + StockAvailable::setProductDependsOnStock($product->id, 0,null,$id_product_attribute); + } + + // Check if warehouse exists + if ($info['warehouse']) + { + if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) + $this->warnings[] = sprintf(Tools::displayError('Advanced stock management is not enabled, warehouse not set on product with id %s '),$product->id); + else + { + if (Warehouse::exists($info['warehouse'])) + { + $warehouse_location_entity = new WarehouseProductLocation(); + $warehouse_location_entity->id_product = $product->id; + $warehouse_location_entity->id_product_attribute = $id_product_attribute; + $warehouse_location_entity->id_warehouse = $info['warehouse']; + if (WarehouseProductLocation::getProductLocation($product->id, $id_product_attribute, $info['warehouse']) !== false) + $warehouse_location_entity->update(); + else + $warehouse_location_entity->save(); + StockAvailable::synchronize($product->id); + } + else + $this->warnings[] = sprintf(Tools::displayError('Warehouse did not exists, can not set on product %1$s '),$product->name[$default_language_id]); + } + } + + // stock available + if (isset($info['depends_on_stock'])) + { + if ($info['depends_on_stock'] != 0 && $info['depends_on_stock'] != 1) + $this->warnings[] = sprintf(Tools::displayError('Incorrect value for depends on stock for product %1$s '),$product->name[$default_language_id]); + elseif ((!$info['advanced_stock_management'] || $info['advanced_stock_management'] == 0) && $info['depends_on_stock'] == 1) + $this->warnings[] = sprintf(Tools::displayError('Advanced stock management not enabled, can not set depends on stock %1$s '),$product->name[$default_language_id]); + else + StockAvailable::setProductDependsOnStock($product->id, $info['depends_on_stock'],null,$id_product_attribute); + + // This code allows us to set qty and disable depends on stock + if (isset($info['quantity']) && $info['depends_on_stock'] == 0) + { + if (Shop::isFeatureActive()) + foreach ($shops as $shop) + StockAvailable::setQuantity((int)$product->id, $id_product_attribute, (int)$info['quantity'], (int)$shop); + else + StockAvailable::setQuantity((int)$product->id, $id_product_attribute, (int)$info['quantity'], $this->context->shop->id); + } + // elseif enable depends on stock and quantity, add quantity to stock + elseif (isset($info['quantity']) && $info['depends_on_stock'] == 1) + { + // add stock + $stock_manager = StockManagerFactory::getManager(); + $price = str_replace(',', '.', $info['wholesale_price']); + if ($price == 0) + $price = 0.000001; + $price = round(floatval($price), 6); + $warehouse = new Warehouse($info['warehouse']); + if ($stock_manager->addProduct((int)$product->id, $id_product_attribute, $warehouse, (int)$info['quantity'], 1, $price, true)) + StockAvailable::synchronize((int)$product->id); + } + } + // if not depends_on_stock set, use normal qty + else + { + if (Shop::isFeatureActive()) + foreach ($shops as $shop) + StockAvailable::setQuantity((int)$product->id, $id_product_attribute, (int)$info['quantity'], (int)$shop); + else + StockAvailable::setQuantity((int)$product->id, $id_product_attribute, (int)$info['quantity'], $this->context->shop->id); + } + } } diff --git a/docs/csv_import/combinations_import.csv b/docs/csv_import/combinations_import.csv index ffdcc861f..f15cf9ebb 100644 --- a/docs/csv_import/combinations_import.csv +++ b/docs/csv_import/combinations_import.csv @@ -1,28 +1,28 @@ -Product ID*;Attribute (Name:Type:Position)*;Value (Value:Position)*;Supplier reference;Reference;EAN13;UPC;Wholesale price;Impact on price;Ecotax;Quantity;Minimal quantity;Impact on weight;Default (0 = No, 1 = Yes);Image position;Image URL;Delete existing images (0 = No, 1 = Yes);ID / Name of shop -1;Color:color:0, Disk space:select:1;Blue:0, 16GB:1;RF-Nano-Blue-16GB;RP-Nano-Blue-16GB;0000080446392;;100;40;;10;1;0;0;1;http://youdomain.com/img.jpg;1; -1;Color:color:0, Disk space:select:1;Blue:0, 8GB:1;RF-Nano-Blue-8GB;RP-Nano-Blue-8GB;0000080446393;;80;0;;10;1;0;0;2;http://youdomain.com/img.jpg;1; -1;Color:color:0, Disk space:select:1;Yellow:0, 16GB:1;RF-Nano-Yellow-16GB;RP-Nano-Yellow-16GB;0000080446394;;100;40;;10;1;0;0;3;http://youdomain.com/img.jpg;1; -1;Color:color:0, Disk space:select:1;Yellow:0, 8GB:1;RF-Nano-Yellow-8GB;RP-Nano-Yellow-8GB;0000080446395;;80;0;;10;1;0;1;4;http://youdomain.com/img.jpg;1; -1;Color:color:0, Disk space:select:1;Metal:0, 16GB:1;RF-Nano-Metal-16GB;RP-Nano-Metal-16GB;0000080446396;;100;40;;10;1;0;0;5;http://youdomain.com/img.jpg;1; -1;Color:color:0, Disk space:select:1;Metal:0, 8GB:1;RF-Nano-Metal-8GB;RP-Nano-Metal-8GB;0000080446397;;80;0;;10;1;0;0;6;http://youdomain.com/img.jpg;1; -1;Color:color:0, Disk space:select:1;Black:0, 16GB:1;RF-Nano-Black-16GB;RP-Nano-Black-16GB;0000080446398;;100;40;;10;1;0;0;7;http://youdomain.com/img.jpg;1; -1;Color:color:0, Disk space:select:1;Black:0, 8GB:1;RF-Nano-Black-8GB;RP-Nano-Black-8GB;0000080446399;;80;0;;10;1;0;0;8;http://youdomain.com/img.jpg;1; -1;Color:color:0, Disk space:select:1;Orange:0, 16GB:1;RF-Nano-Orange-16GB;RP-Nano-Orange-16GB;0000080446400;;100;40;;10;1;0;0;9;http://youdomain.com/img.jpg;1; -1;Color:color:0, Disk space:select:1;Orange:0, 8GB:1;RF-Nano-Orange-8GB;RP-Nano-Orange-8GB;0000080446401;;80;0;;10;1;0;0;10;http://youdomain.com/img.jpg;1; -1;Color:color:0, Disk space:select:1;Pink:0, 16GB:1;RF-Nano-Pink-16GB;RP-Nano-Pink-16GB;0000080446402;;100;40;;10;1;0;0;11;http://youdomain.com/img.jpg;1; -1;Color:color:0, Disk space:select:1;Pink:0, 8GB:1;RF-Nano-Pink-8GB;RP-Nano-Pink-8GB;0000080446403;;80;0;;10;1;0;0;12;http://youdomain.com/img.jpg;1; -1;Color:color:0, Disk space:select:1;Green:0, 16GB:1;RF-Nano-Green-16GB;RP-Nano-Green-16GB;0000080446404;;100;40;;10;1;0;0;13;http://youdomain.com/img.jpg;1; -1;Color:color:0, Disk space:select:1;Green:0, 8GB:1;RF-Nano-Green-8GB;RP-Nano-Green-8GB;0000080446405;;80;0;;10;1;0;0;14;http://youdomain.com/img.jpg;1; -1;Color:color:0, Disk space:select:1;Purple:0, 16GB:1;RF-Nano-Purple-16GB;RP-Nano-Purple-16GB;0000080446406;;100;40;;10;1;0;0;15;http://youdomain.com/img.jpg;1; -1;Color:color:0, Disk space:select:1;Purple:0, 8GB:1;RF-Nano-Purple-8GB;RP-Nano-Purple-8GB;0000080446407;;80;0;;10;1;0;0;16;http://youdomain.com/img.jpg;1; -2;Color:color:0;Metal:0;RF-Shuffle-Metal;RP-Shuffle-Metal;0685387080038;;40;0;;12;1;0;1;1;http://youdomain.com/img.jpg;1; -2;Color:color:0;Blue:0;RF-Shuffle-Blue;RP-Shuffle-Blue;0685387080039;;40;0;;12;1;0;0;2;http://youdomain.com/img.jpg;1; -2;Color:color:0;Pink:0;RF-Shuffle-Pink;RP-Shuffle-Pink;0685387080040;;40;0;;12;1;0;0;3;http://youdomain.com/img.jpg;1; -2;Color:color:0;Green:0;RF-Shuffle-Green;RP-Shuffle-Green;0685387080041;;40;0;;12;1;0;0;4;http://youdomain.com/img.jpg;1; -3;Color:color:0, Disk space:select:1, ICU:select:2;Metal:0, 80GB Parallel ATA Drive @ 4200 rpm:1, 1.60GHz Intel Core 2 Duo:2;RF-MacBookAir80GB-1.6MHz;RP-MacBookAir80GB-1.6MHz;0123456791230;;0;750;;10;1;0;0;1;http://youdomain.com/img.jpg;1; -3;Color:color:0, Disk space:select:1, ICU:select:2;Metal:0, 80GB Parallel ATA Drive @ 4200 rpm:1, 1.80GHz Intel Core 2 Duo:2;RF-MacBookAir80GB-1.6MHz;RP-MacBookAir80GB-1.6MHz;0123456791230;;0;0;;10;1;0;1;2;http://youdomain.com/img.jpg;1; -3;Color:color:0, Disk space:select:1, ICU:select:2;Metal:0, Optional 64GB solid-state drive:1, 1.60GHz Intel Core 2 Duo:2;RF-MacBookAir64GB-1.8MHz;RP-MacBookAir64GB-1.8MHz;0123456791230;;0;225;;10;1;0;0;3;http://youdomain.com/img.jpg;1; -3;Color:color:0, Disk space:select:1, ICU:select:2;Metal:0, Optional 64GB solid-state drive:1, 1.60GHz Intel Core 2 Duo:2;RF-MacBookAir64GB-1.8MHz;RP-MacBookAir64GB-1.8MHz;0123456791230;;0;975;;10;1;0;0;4;http://youdomain.com/img.jpg;1; -5;Disk space:select:1;8GB:0;RF-IpodTouch8GB;RP-IpodTouch8GB;8456123645123;;200;0;;10;1;0;1;1;http://youdomain.com/img.jpg;1; -5;Disk space:select:1;16GB:0;RF-IpodTouch16GB;RP-IpodTouch16GB;8456123645124;;250;75;;10;1;0;0;2;http://youdomain.com/img.jpg;1; -5;Disk space:select:1;32GB:0;RF-IpodTouch32GB;RP-IpodTouch32GB;8456123645125;;300;150;;10;1;0;0;3;http://youdomain.com/img.jpg;1; +Product ID*;Attribute (Name:Type:Position)*;Value (Value:Position)*;Supplier reference;Reference;EAN13;UPC;Wholesale price;Impact on price;Ecotax;Quantity;Minimal quantity;Impact on weight;Default (0 = No, 1 = Yes);Image position;Image URL;Delete existing images (0 = No, 1 = Yes);ID / Name of shop;Advanced Stock Managment;Depends on stock;Warehouse +1;Color:color:0, Disk space:select:1;Blue:0, 16GB:1;RF-Nano-Blue-16GB;RP-Nano-Blue-16GB;0000080446392;;100;40;;10;1;0;0;1;http://youdomain.com/img.jpg;1;0;0;0; +1;Color:color:0, Disk space:select:1;Blue:0, 8GB:1;RF-Nano-Blue-8GB;RP-Nano-Blue-8GB;0000080446393;;80;0;;10;1;0;0;2;http://youdomain.com/img.jpg;1;0;0;0; +1;Color:color:0, Disk space:select:1;Yellow:0, 16GB:1;RF-Nano-Yellow-16GB;RP-Nano-Yellow-16GB;0000080446394;;100;40;;10;1;0;0;3;http://youdomain.com/img.jpg;1;0;0;0; +1;Color:color:0, Disk space:select:1;Yellow:0, 8GB:1;RF-Nano-Yellow-8GB;RP-Nano-Yellow-8GB;0000080446395;;80;0;;10;1;0;1;4;http://youdomain.com/img.jpg;1;0;0;0; +1;Color:color:0, Disk space:select:1;Metal:0, 16GB:1;RF-Nano-Metal-16GB;RP-Nano-Metal-16GB;0000080446396;;100;40;;10;1;0;0;5;http://youdomain.com/img.jpg;1;0;0;0; +1;Color:color:0, Disk space:select:1;Metal:0, 8GB:1;RF-Nano-Metal-8GB;RP-Nano-Metal-8GB;0000080446397;;80;0;;10;1;0;0;6;http://youdomain.com/img.jpg;1;0;0;0; +1;Color:color:0, Disk space:select:1;Black:0, 16GB:1;RF-Nano-Black-16GB;RP-Nano-Black-16GB;0000080446398;;100;40;;10;1;0;0;7;http://youdomain.com/img.jpg;1;0;0;0; +1;Color:color:0, Disk space:select:1;Black:0, 8GB:1;RF-Nano-Black-8GB;RP-Nano-Black-8GB;0000080446399;;80;0;;10;1;0;0;8;http://youdomain.com/img.jpg;1;0;0;0; +1;Color:color:0, Disk space:select:1;Orange:0, 16GB:1;RF-Nano-Orange-16GB;RP-Nano-Orange-16GB;0000080446400;;100;40;;10;1;0;0;9;http://youdomain.com/img.jpg;1;0;0;0; +1;Color:color:0, Disk space:select:1;Orange:0, 8GB:1;RF-Nano-Orange-8GB;RP-Nano-Orange-8GB;0000080446401;;80;0;;10;1;0;0;10;http://youdomain.com/img.jpg;1;0;0;0; +1;Color:color:0, Disk space:select:1;Pink:0, 16GB:1;RF-Nano-Pink-16GB;RP-Nano-Pink-16GB;0000080446402;;100;40;;10;1;0;0;11;http://youdomain.com/img.jpg;1;0;0;0; +1;Color:color:0, Disk space:select:1;Pink:0, 8GB:1;RF-Nano-Pink-8GB;RP-Nano-Pink-8GB;0000080446403;;80;0;;10;1;0;0;12;http://youdomain.com/img.jpg;1;0;0;0; +1;Color:color:0, Disk space:select:1;Green:0, 16GB:1;RF-Nano-Green-16GB;RP-Nano-Green-16GB;0000080446404;;100;40;;10;1;0;0;13;http://youdomain.com/img.jpg;1;0;0;0; +1;Color:color:0, Disk space:select:1;Green:0, 8GB:1;RF-Nano-Green-8GB;RP-Nano-Green-8GB;0000080446405;;80;0;;10;1;0;0;14;http://youdomain.com/img.jpg;1;0;0;0; +1;Color:color:0, Disk space:select:1;Purple:0, 16GB:1;RF-Nano-Purple-16GB;RP-Nano-Purple-16GB;0000080446406;;100;40;;10;1;0;0;15;http://youdomain.com/img.jpg;1;0;0;0; +1;Color:color:0, Disk space:select:1;Purple:0, 8GB:1;RF-Nano-Purple-8GB;RP-Nano-Purple-8GB;0000080446407;;80;0;;10;1;0;0;16;http://youdomain.com/img.jpg;1;0;0;0; +2;Color:color:0;Metal:0;RF-Shuffle-Metal;RP-Shuffle-Metal;0685387080038;;40;0;;12;1;0;1;1;http://youdomain.com/img.jpg;1;0;0;0; +2;Color:color:0;Blue:0;RF-Shuffle-Blue;RP-Shuffle-Blue;0685387080039;;40;0;;12;1;0;0;2;http://youdomain.com/img.jpg;1;0;0;0; +2;Color:color:0;Pink:0;RF-Shuffle-Pink;RP-Shuffle-Pink;0685387080040;;40;0;;12;1;0;0;3;http://youdomain.com/img.jpg;1;0;0;0; +2;Color:color:0;Green:0;RF-Shuffle-Green;RP-Shuffle-Green;0685387080041;;40;0;;12;1;0;0;4;http://youdomain.com/img.jpg;1;0;0;0; +3;Color:color:0, Disk space:select:1, ICU:select:2;Metal:0, 80GB Parallel ATA Drive @ 4200 rpm:1, 1.60GHz Intel Core 2 Duo:2;RF-MacBookAir80GB-1.6MHz;RP-MacBookAir80GB-1.6MHz;0123456791230;;0;750;;10;1;0;0;1;http://youdomain.com/img.jpg;1;0;0;0; +3;Color:color:0, Disk space:select:1, ICU:select:2;Metal:0, 80GB Parallel ATA Drive @ 4200 rpm:1, 1.80GHz Intel Core 2 Duo:2;RF-MacBookAir80GB-1.6MHz;RP-MacBookAir80GB-1.6MHz;0123456791230;;0;0;;10;1;0;1;2;http://youdomain.com/img.jpg;1;0;0;0; +3;Color:color:0, Disk space:select:1, ICU:select:2;Metal:0, Optional 64GB solid-state drive:1, 1.60GHz Intel Core 2 Duo:2;RF-MacBookAir64GB-1.8MHz;RP-MacBookAir64GB-1.8MHz;0123456791230;;0;225;;10;1;0;0;3;http://youdomain.com/img.jpg;1;0;0;0; +3;Color:color:0, Disk space:select:1, ICU:select:2;Metal:0, Optional 64GB solid-state drive:1, 1.60GHz Intel Core 2 Duo:2;RF-MacBookAir64GB-1.8MHz;RP-MacBookAir64GB-1.8MHz;0123456791230;;0;975;;10;1;0;0;4;http://youdomain.com/img.jpg;1;0;0;0; +5;Disk space:select:1;8GB:0;RF-IpodTouch8GB;RP-IpodTouch8GB;8456123645123;;200;0;;10;1;0;1;1;http://youdomain.com/img.jpg;1;0;0;0; +5;Disk space:select:1;16GB:0;RF-IpodTouch16GB;RP-IpodTouch16GB;8456123645124;;250;75;;10;1;0;0;2;http://youdomain.com/img.jpg;1;0;0;0; +5;Disk space:select:1;32GB:0;RF-IpodTouch32GB;RP-IpodTouch32GB;8456123645125;;300;150;;10;1;0;0;3;http://youdomain.com/img.jpg;1;0;0;0; diff --git a/docs/csv_import/products_import.csv b/docs/csv_import/products_import.csv index ed03aaa89..415509420 100644 --- a/docs/csv_import/products_import.csv +++ b/docs/csv_import/products_import.csv @@ -1,8 +1,8 @@ -ID;Active (0/1);Name *;Categories (x,y,z...);Price tax excluded or Price tax included;Tax rules ID;Wholesale price;On sale (0/1);Discount amount;Discount percent;Discount from (yyyy-mm-dd);Discount to (yyyy-mm-dd);Reference #;Supplier reference #;Supplier;Manufacturer;EAN13;UPC;Ecotax;Width;Height;Depth;Weight;Quantity;Minimal quantity;Visibility;Additional shipping cost;Unity;Unit price ratio;Short description;Description;Tags (x,y,z...);Meta title;Meta keywords;Meta description;URL rewritten;Text when in stock;Text when backorder allowed;Available for order (0 = No, 1 = Yes);Product available date;Product creation date;Show price (0 = No, 1 = Yes);Image URLs (x,y,z...);Delete existing images (0 = No, 1 = Yes);Feature(Name:Value:Position);Available online only (0 = No, 1 = Yes);Condition;Customizable (0 = No, 1 = Yes);Uploadable files (0 = No, 1 = Yes);Text fields (0 = No, 1 = Yes);Out_of_stock;Advanced stock management;ID / Name of shop -1;1;iPod Nano;iPods;100;1;80;1;;5.5;2013-06-01;2018-12-31;RP-demo_1;RF-demo_1;Applestore;Apple;1234567890123;;1;0.6;0.2;0.4;0.068357;160;1;;;;;

New design.

;

New design.

;apple, ipod, nano;Meta title-Nano;Meta keywords-Nano;Meta description-Nano;iPod-Nano;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-01;1;http://localhost/prestashop_1.5.6.0/img/p/1/5/15.jpg;0;;0;new;0;0;0;0;0; -2;1;iPod shuffle;iPods;60;1;40;1;;;2013-06-01;2018-12-31;RP-demo_2;RF-demo_2;Applestore;Apple;1234567890123;;1;0.1;0.1;0.1;0.027563;120;1;both;;;;

New design.

;

New design.

;ipod, shuffle;Meta title-Shuffle;Meta keywords-Shuffle;Meta description-Shuffle;iPod-shuffle;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-02;1;http://localhost/prestashop_1.5.6.0/img/p/2/3/23.jpg;0;;0;new;0;0;0;0;0; -3;1;MacBook Air;Laptops;1500;1;1000;1;100;;2013-06-01;2018-12-31;RP-demo_3;RF-demo_3;Applestore;Apple;1234567890123;;2;1.31;0.3;1;2.976846;400;1;catalog;;;;

New design.

;

New design.

;MacBook, Air;Meta title-McBookAir;Meta keywords-McBookAir;Meta description-McBookAir;MacBook-Air;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-03;1;http://localhost/prestashop_1.5.6.0/img/p/1/1.jpg;1;;0;new;0;0;0;0;0; -4;1;MacBook;Laptops;1150;1;750;1;;;2013-06-01;2018-12-31;RP-demo_4;RF-demo_4;Applestore;Apple;1234567890123;;2;1.31;0.3;1;4.454244;75;1;search;;;;

New design.

;

New design.

;MacBook, Pro;Meta title-McBookPro;Meta keywords-McBookPro;Meta description-McBookPro;MacBook;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-04;1;http://localhost/prestashop_1.5.6.0/img/p/6/6.jpg;1;;0;new;0;0;0;0;0; -5;1;iPod touch;iPods;240;1;150;1;;;2013-06-01;2018-12-31;RP-demo_5;RF-demo_5;Applestore;Apple;1234567890123;;1;0.6;0.2;0.4;0.194046;120;1;none;;;;

New design.

;

New design.

;Ipod touch;Meta title-IpodTouch;Meta keywords-IpodTouch;Meta description-IpodTouch;iPod-touch;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-05;1;http://localhost/prestashop_1.5.6.0/img/p/7/7.jpg;0;;1;used;0;0;0;0;0; -6;1;Belkin Leather Folio for iPod nano - Black / Chocolate;Accessories;25;1;150;1;;;2013-06-01;2018-12-31;RP-demo_6;RF-demo_6;Nippon Electronic Import;Belkin;1234567890123;;0;0.6;0.2;0.4;0.038588;25;1;;20;;;

New design.

;

New design.

;Folio, leather;Meta title-BelkinLeatherFolio;Meta keywords-BelkinLeatherFolio;Meta description-BelkinLeatherFolio;Belkin-Leather-Folio-for-iPod-nano---Black-Chocolate;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-06;1;http://localhost/prestashop_1.5.6.0/img/p/1/3/13.jpg;0;;1;refurbished;0;0;0;0;0; -7;1;Shure SE210 Sound-Isolating Earphones for iPod and iPhone;Accessories;125;2;80;1;;;2013-06-01;2018-12-31;RP-demo_7;RF-demo_7;Shure Online Store;Shure;1234567890123;;0;0.1;0.1;0.1;0.040793;15;1;;;;;

New design.

;

New design.

;Headphones;Meta title-ShureEarphones;Meta keywords-ShureEarphones;Meta description-ShureEarphones;Shure-SE210-Sound-Isolating-Earphones-for-iPod-and-iPhone;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-07;1;http://localhost/prestashop_1.5.6.0/img/p/1/4/14.jpg;0;;1;new;0;0;0;0;0; +ID;Active (0/1);Name *;Categories (x,y,z...);Price tax excluded or Price tax included;Tax rules ID;Wholesale price;On sale (0/1);Discount amount;Discount percent;Discount from (yyyy-mm-dd);Discount to (yyyy-mm-dd);Reference #;Supplier reference #;Supplier;Manufacturer;EAN13;UPC;Ecotax;Width;Height;Depth;Weight;Quantity;Minimal quantity;Visibility;Additional shipping cost;Unity;Unit price ratio;Short description;Description;Tags (x,y,z...);Meta title;Meta keywords;Meta description;URL rewritten;Text when in stock;Text when backorder allowed;Available for order (0 = No, 1 = Yes);Product available date;Product creation date;Show price (0 = No, 1 = Yes);Image URLs (x,y,z...);Delete existing images (0 = No, 1 = Yes);Feature(Name:Value:Position);Available online only (0 = No, 1 = Yes);Condition;Customizable (0 = No, 1 = Yes);Uploadable files (0 = No, 1 = Yes);Text fields (0 = No, 1 = Yes);Out of stock;Advanced stock management;ID / Name of shop;Depends On Stock;Warehouse +1;1;iPod Nano;iPods;100;1;80;1;;5.5;2013-06-01;2018-12-31;RP-demo_1;RF-demo_1;Applestore;Apple;1234567890123;;1;0.6;0.2;0.4;0.068357;160;1;;;;;

New design.

;

New design.

;apple, ipod, nano;Meta title-Nano;Meta keywords-Nano;Meta description-Nano;iPod-Nano;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-01;1;http://localhost/prestashop_1.5.6.0/img/p/1/5/15.jpg;0;;0;new;0;0;0;0;0;0;0; +2;1;iPod shuffle;iPods;60;1;40;1;;;2013-06-01;2018-12-31;RP-demo_2;RF-demo_2;Applestore;Apple;1234567890123;;1;0.1;0.1;0.1;0.027563;120;1;both;;;;

New design.

;

New design.

;ipod, shuffle;Meta title-Shuffle;Meta keywords-Shuffle;Meta description-Shuffle;iPod-shuffle;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-02;1;http://localhost/prestashop_1.5.6.0/img/p/2/3/23.jpg;0;;0;new;0;0;0;0;0;0;0; +3;1;MacBook Air;Laptops;1500;1;1000;1;100;;2013-06-01;2018-12-31;RP-demo_3;RF-demo_3;Applestore;Apple;1234567890123;;2;1.31;0.3;1;2.976846;400;1;catalog;;;;

New design.

;

New design.

;MacBook, Air;Meta title-McBookAir;Meta keywords-McBookAir;Meta description-McBookAir;MacBook-Air;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-03;1;http://localhost/prestashop_1.5.6.0/img/p/1/1.jpg;1;;0;new;0;0;0;0;0;0;0; +4;1;MacBook;Laptops;1150;1;750;1;;;2013-06-01;2018-12-31;RP-demo_4;RF-demo_4;Applestore;Apple;1234567890123;;2;1.31;0.3;1;4.454244;75;1;search;;;;

New design.

;

New design.

;MacBook, Pro;Meta title-McBookPro;Meta keywords-McBookPro;Meta description-McBookPro;MacBook;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-04;1;http://localhost/prestashop_1.5.6.0/img/p/6/6.jpg;1;;0;new;0;0;0;0;0;0;0; +5;1;iPod touch;iPods;240;1;150;1;;;2013-06-01;2018-12-31;RP-demo_5;RF-demo_5;Applestore;Apple;1234567890123;;1;0.6;0.2;0.4;0.194046;120;1;none;;;;

New design.

;

New design.

;Ipod touch;Meta title-IpodTouch;Meta keywords-IpodTouch;Meta description-IpodTouch;iPod-touch;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-05;1;http://localhost/prestashop_1.5.6.0/img/p/7/7.jpg;0;;1;used;0;0;0;0;0;0;0; +6;1;Belkin Leather Folio for iPod nano - Black / Chocolate;Accessories;25;1;150;1;;;2013-06-01;2018-12-31;RP-demo_6;RF-demo_6;Nippon Electronic Import;Belkin;1234567890123;;0;0.6;0.2;0.4;0.038588;25;1;;20;;;

New design.

;

New design.

;Folio, leather;Meta title-BelkinLeatherFolio;Meta keywords-BelkinLeatherFolio;Meta description-BelkinLeatherFolio;Belkin-Leather-Folio-for-iPod-nano---Black-Chocolate;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-06;1;http://localhost/prestashop_1.5.6.0/img/p/1/3/13.jpg;0;;1;refurbished;0;0;0;0;0;0;0; +7;1;Shure SE210 Sound-Isolating Earphones for iPod and iPhone;Accessories;125;2;80;1;;;2013-06-01;2018-12-31;RP-demo_7;RF-demo_7;Shure Online Store;Shure;1234567890123;;0;0.1;0.1;0.1;0.040793;15;1;;;;;

New design.

;

New design.

;Headphones;Meta title-ShureEarphones;Meta keywords-ShureEarphones;Meta description-ShureEarphones;Shure-SE210-Sound-Isolating-Earphones-for-iPod-and-iPhone;In Stock;Current supply. Ordering availlable;1;2013-03-01;2013-01-07;1;http://localhost/prestashop_1.5.6.0/img/p/1/4/14.jpg;0;;1;new;0;0;0;0;0;0;0; From c0e87949473421475d3557c0e778b0febf8564b8 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Thu, 5 Dec 2013 14:42:22 +0100 Subject: [PATCH 14/23] // make product.tpl human readable ;) --- themes/default-bootstrap/product.tpl | 1510 ++++++++++++++------------ 1 file changed, 807 insertions(+), 703 deletions(-) diff --git a/themes/default-bootstrap/product.tpl b/themes/default-bootstrap/product.tpl index 650a51947..fc118839d 100644 --- a/themes/default-bootstrap/product.tpl +++ b/themes/default-bootstrap/product.tpl @@ -25,273 +25,335 @@ {include file="$tpl_dir./errors.tpl"} {if $errors|@count == 0} - -
- - -{if !$content_only}
{/if} - - {if isset($adminActionDisplay) && $adminActionDisplay} -
-

{l s='This product is not visible to your customers.'} - - - -

-

-

-
- {/if} - - {if isset($confirmation) && $confirmation} -

- {$confirmation} -

- {/if} - - - -
- - -
- - - {if $product->on_sale} - {l s='Sale!'} - {elseif $product->specificPrice AND $product->specificPrice.reduction AND $productPriceWithoutReduction > $productPrice} - {l s='Reduced price!'} - {/if} - - {if $have_image} - - {if $jqZoomEnabled && $have_image && !$content_only} - - {if !empty($cover.legend)}{$cover.legend|escape:'html'}{else}{$product->name|escape:'html'}{/if} - - {else} - {if !empty($cover.legend)}{$cover.legend|escape:'html'}{else}{$product->name|escape:'html'}{/if} - {if !$content_only}{l s='View larger'}{/if} - {/if} - - {else} - - - {if !$content_only}{l s='View larger'}{/if} - + {if !isset($priceDisplayPrecision)} + {assign var='priceDisplayPrecision' value=2} {/if} -
- {if isset($images) && count($images) > 0} - -
- {if isset($images) && count($images) > 3}{l s='Previous'}{/if} -
-
    - {if isset($images)} - {foreach from=$images item=image name=thumbnails} - {assign var=imageIds value="`$product->id`-`$image.id_image`"} - {if !empty($image.legend)} - {assign var=imageTitlte value=$image.legend|escape:'html'} - {else} - {assign var=imageTitlte value=$product->name|escape:'html'} - {/if} -
  • - - {$imageTitlte} - -
    • + + {if !$priceDisplay || $priceDisplay == 2} + {assign var='productPrice' value=$product->getPrice(true, $smarty.const.NULL, $priceDisplayPrecision)} + {assign var='productPriceWithoutReduction' value=$product->getPriceWithoutReduct(false, $smarty.const.NULL)} + {elseif $priceDisplay == 1} + {assign var='productPrice' value=$product->getPrice(false, $smarty.const.NULL, $priceDisplayPrecision)} + {assign var='productPriceWithoutReduction' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)} + {/if} + + var productPriceWithoutReduction = '{$productPriceWithoutReduction}'; + var productPrice = '{$productPrice}'; + // Customizable field + var img_ps_dir = '{$img_ps_dir}'; + var customizationFields = new Array(); + {assign var='imgIndex' value=0} + {assign var='textFieldIndex' value=0} + {foreach from=$customizationFields item='field' name='customizationFields'} + {assign var="key" value="pictures_`$product->id`_`$field.id_customization_field`"} + customizationFields[{$smarty.foreach.customizationFields.index|intval}] = new Array(); + customizationFields[{$smarty.foreach.customizationFields.index|intval}][0] = '{if $field.type|intval == 0}img{$imgIndex++}{else}textField{$textFieldIndex++}{/if}'; + customizationFields[{$smarty.foreach.customizationFields.index|intval}][1] = {if $field.type|intval == 0 && isset($pictures.$key) && $pictures.$key}2{else}{$field.required|intval}{/if}; + {/foreach} + // Images + var img_prod_dir = '{$img_prod_dir}'; + var combinationImages = new Array(); + + {if isset($combinationImages)} + {foreach from=$combinationImages item='combination' key='combinationId' name='f_combinationImages'} + combinationImages[{$combinationId}] = new Array(); + {foreach from=$combination item='image' name='f_combinationImage'} + combinationImages[{$combinationId}][{$smarty.foreach.f_combinationImage.index}] = {$image.id_image|intval}; {/foreach} - {/if} -
-
- {if isset($images) && count($images) > 3}{l s='Next'}{/if} -
+ {/foreach} {/if} - {if isset($images) && count($images) > 1}

{/if} -
- + combinationImages[0] = new Array(); - -
- - {if $product->online_only} -

{l s='Online only'}

+ {if isset($images)} + {foreach from=$images item='image' name='f_defaultImages'} + combinationImages[0][{$smarty.foreach.f_defaultImages.index}] = {$image.id_image}; + {/foreach} + {/if} + // Translations + var doesntExist = '{l s='This combination does not exist for this product. Please select another combination.' js=1}'; + var doesntExistNoMore = '{l s='This product is no longer in stock' js=1}'; + var doesntExistNoMoreBut = '{l s='with those attributes but is available with others.' js=1}'; + var uploading_in_progress = '{l s='Uploading in progress, please be patient.' js=1}'; + var fieldRequired = '{l s='Please fill in all the required fields before saving your customization.' js=1}'; + + {if isset($groups)} + // Combinations + {foreach from=$combinations key=idCombination item=combination} + var specific_price_combination = new Array(); + var available_date = new Array(); + specific_price_combination['reduction_percent'] = {if $combination.specific_price AND $combination.specific_price.reduction AND $combination.specific_price.reduction_type == 'percentage'}{$combination.specific_price.reduction*100}{else}0{/if}; + specific_price_combination['reduction_price'] = {if $combination.specific_price AND $combination.specific_price.reduction AND $combination.specific_price.reduction_type == 'amount'}{$combination.specific_price.reduction}{else}0{/if}; + specific_price_combination['price'] = {if $combination.specific_price AND $combination.specific_price.price}{$combination.specific_price.price}{else}0{/if}; + specific_price_combination['reduction_type'] = '{if $combination.specific_price}{$combination.specific_price.reduction_type}{/if}'; + specific_price_combination['id_product_attribute'] = {if $combination.specific_price}{$combination.specific_price.id_product_attribute|intval}{else}0{/if}; + available_date['date'] = '{$combination.available_date}'; + available_date['date_formatted'] = '{dateFormat date=$combination.available_date full=false}'; + addCombination({$idCombination|intval}, new Array({$combination.list}), {$combination.quantity}, {$combination.price}, {$combination.ecotax}, {$combination.id_image}, '{$combination.reference|addslashes}', {$combination.unit_impact}, {$combination.minimal_quantity}, available_date, specific_price_combination); + {/foreach} + {/if} + + {if isset($attributesCombinations)} + // Combinations attributes informations + var attributesCombinations = new Array(); + {foreach from=$attributesCombinations key=id item=aC} + tabInfos = new Array(); + tabInfos['id_attribute'] = '{$aC.id_attribute|intval}'; + tabInfos['attribute'] = '{$aC.attribute}'; + tabInfos['group'] = '{$aC.group}'; + tabInfos['id_attribute_group'] = '{$aC.id_attribute_group|intval}'; + attributesCombinations.push(tabInfos); + {/foreach} + {/if} + + var isLoggedWishlist = {if $logged}true{else}false{/if}; + var contentOnly = {if $content_only}true{else}false{/if} + //]]> + + +
+ {if !$content_only} +
+
+
+ {/if} + + {if isset($adminActionDisplay) && $adminActionDisplay} +
+

{l s='This product is not visible to your customers.'} + + + +

+

+
+ {/if} + + {if isset($confirmation) && $confirmation} +

+ {$confirmation} +

+ {/if} + +
+ +
+ {if $product->on_sale} + + {l s='Sale!'} + + {elseif $product->specificPrice AND $product->specificPrice.reduction AND $productPriceWithoutReduction > $productPrice} + {l s='Reduced price!'} + {/if} + + {if $have_image} + + {if $jqZoomEnabled && $have_image && !$content_only} + + {if !empty($cover.legend)}{$cover.legend|escape:'html'}{else}{$product->name|escape:'html'}{/if} + + {else} + {if !empty($cover.legend)}{$cover.legend|escape:'html'}{else}{$product->name|escape:'html'}{/if} + {if !$content_only} + {l s='View larger'} + {/if} + {/if} + + {else} + + + {if !$content_only} + + {l s='View larger'} + + {/if} + + {/if} +
+ + {if isset($images) && count($images) > 0} + +
+ {if isset($images) && count($images) > 3} + + + {l s='Previous'} + + + {/if} +
+
    + {if isset($images)} + {foreach from=$images item=image name=thumbnails} + {assign var=imageIds value="`$product->id`-`$image.id_image`"} + {if !empty($image.legend)} + {assign var=imageTitlte value=$image.legend|escape:'html'} + {else} + {assign var=imageTitlte value=$product->name|escape:'html'} + {/if} +
  • + + {$imageTitlte} + +
    • + {/foreach} + {/if} +
+
+ {if isset($images) && count($images) > 3} + + {l s='Next'} + + {/if} +
+ + {/if} + + {if isset($images) && count($images) > 1} +

+ +

+ {/if} +
+ + + +
+ {if $product->online_only} +

{l s='Online only'}

{/if} -

{$product->name|escape:'html':'UTF-8'}

+

{$product->name|escape:'html':'UTF-8'}

reference}style="display: none;"{/if}> {$product->reference|escape:'html':'UTF-8'}

- {if $product->description_short OR $packItems|@count > 0} -
- {if $product->description_short} -
{$product->description_short}
- {/if} - {if $product->description} -

{l s='More details'}

- {/if} - -
- {/if} + {if $product->description_short OR $packItems|@count > 0} +
+ {if $product->description_short} +
{$product->description_short}
+ {/if} - + {if $product->description} +

+ + {l s='More details'} + +

+ {/if} + +
+ {/if} + + {if ($display_qties == 1 && !$PS_CATALOG_MODE && $product->available_for_order)} -

quantity <= 0} style="display: none;"{/if}> - {$product->quantity|intval} - quantity > 1} style="display: none;"{/if} id="quantityAvailableTxt">{l s='Item'} - quantity == 1} style="display: none;"{/if} id="quantityAvailableTxtMultiple">{l s='Items'} -

+ +

quantity <= 0} style="display: none;"{/if}> + {$product->quantity|intval} + quantity > 1} style="display: none;"{/if} id="quantityAvailableTxt">{l s='Item'} + quantity == 1} style="display: none;"{/if} id="quantityAvailableTxtMultiple">{l s='Items'} +

{/if} -

quantity <= 0 && !$product->available_later && $allow_oosp) OR ($product->quantity > 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}> {*{l s='Availability:'}*} @@ -305,478 +367,520 @@ var contentOnly = {if $content_only}true{else}false{/if} {dateFormat date=$product->available_date full=false}

- -
quantity > 0} style="display: none;"{/if}> {$HOOK_PRODUCT_OOS}
- {*{if isset($colors) && $colors} - -
-

{l s='Pick a color:' js=1}

-
- -
-
- {/if}*} - - - {if ($product->show_price AND !isset($restricted_country_mode)) OR isset($groups) OR $product->reference OR (isset($HOOK_PRODUCT_ACTIONS) && $HOOK_PRODUCT_ACTIONS)} - -
quantity > 0}class="hidden"{/if} action="{$link->getPageLink('cart')|escape:'html'}" method="post"> - - -
- {/if} - {if isset($HOOK_EXTRA_RIGHT) && $HOOK_EXTRA_RIGHT}{$HOOK_EXTRA_RIGHT}{/if} - {if !$content_only} - - - {/if} -
- - - - - -
-
-
- - {if $product->show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE} - -
-

- quantity <= 0}href="http://schema.org/OutOfStock"{else}href="http://schema.org/InStock"{/if}> - {if $priceDisplay >= 0 && $priceDisplay <= 2} - {convertPrice price=$productPrice} - - - {/if} -

- -

specificPrice OR $product->specificPrice.reduction_type != 'percentage'} style="display:none;"{/if}>{if $product->specificPrice AND $product->specificPrice.reduction_type == 'percentage'}-{$product->specificPrice.reduction*100}%{/if}

- - -

specificPrice || !$product->specificPrice.reduction} class="hidden"{/if}> - {if $priceDisplay >= 0 && $priceDisplay <= 2} - {if $productPriceWithoutReduction > $productPrice}{convertPrice price=$productPriceWithoutReduction}{/if} - - {/if} -

- {if $priceDisplay == 2} -
- {convertPrice price=$product->getPrice(false, $smarty.const.NULL)} {l s='tax excl.'} - {/if} -
- -

specificPrice OR $product->specificPrice.reduction_type != 'amount' || $product->specificPrice.reduction|intval ==0} style="display:none"{/if}> - - {if $product->specificPrice AND $product->specificPrice.reduction_type == 'amount' AND $product->specificPrice.reduction|intval !=0} - -{convertPrice price=$productPriceWithoutReduction-$productPrice|floatval} - {/if} - -

- - {if $packItems|@count && $productPrice < $product->getNoPackPrice()} -

{l s='Instead of'} {convertPrice price=$product->getNoPackPrice()}

- - {/if} - {if $product->ecotax != 0} -

{l s='Include'} {if $priceDisplay == 2}{$ecotax_tax_exc|convertAndFormatPrice}{else}{$ecotax_tax_inc|convertAndFormatPrice}{/if} {l s='For green tax'} - {if $product->specificPrice AND $product->specificPrice.reduction} -
{l s='(not impacted by the discount)'} - {/if} -

- {/if} - {if !empty($product->unity) && $product->unit_price_ratio > 0.000000} - {math equation="pprice / punit_price" pprice=$productPrice punit_price=$product->unit_price_ratio assign=unit_price} -

{convertPrice price=$unit_price} {l s='per'} {$product->unity|escape:'html':'UTF-8'}

- {/if} - {*close if for show price*} - {/if} - -
-
- -
- - -

quantity <= 0) OR $virtual OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}> - - - - minimal_quantity > 1}onkeyup="checkMinimalQuantity({$product->minimal_quantity});"{/if} /> - - - - -

- - - -

minimal_quantity <= 1 OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}> - {l s='This product is not sold individually. You must select at least'} {$product->minimal_quantity} {l s='quantity for this product.'} -

- {if $product->minimal_quantity > 1} - - {/if} - - {if isset($groups)} - -
-
- {foreach from=$groups key=id_attribute_group item=group} - {if $group.attributes|@count} -
- - {assign var="groupName" value="group_$id_attribute_group"} -
- {if ($group.group_type == 'select')} - - {elseif ($group.group_type == 'color')} - - - {elseif ($group.group_type == 'radio')} -
    - {foreach from=$group.attributes key=id_attribute item=group_attribute} -
  • - - {$group_attribute|escape:'html':'UTF-8'} -
    • - {/foreach} -
- {/if} -
-
- {/if} - {/foreach} + {* {if isset($colors) && $colors} + +
+

{l s='Pick a color:' js=1}

+
+ +
+ {/if} *} + + {if ($product->show_price AND !isset($restricted_country_mode)) OR isset($groups) OR $product->reference OR (isset($HOOK_PRODUCT_ACTIONS) && $HOOK_PRODUCT_ACTIONS)} + +
quantity > 0}class="hidden"{/if} action="{$link->getPageLink('cart')|escape:'html'}" method="post"> + + +
{/if} - - -
- -
- -

quantity <= 0) OR !$product->available_for_order OR (isset($restricted_country_mode) AND $restricted_country_mode) OR $PS_CATALOG_MODE}style="display:none"{/if} class="buttons_bottom_block"> - -

- {if isset($HOOK_PRODUCT_ACTIONS) && $HOOK_PRODUCT_ACTIONS}{$HOOK_PRODUCT_ACTIONS}{/if} + {if isset($HOOK_EXTRA_RIGHT) && $HOOK_EXTRA_RIGHT}{$HOOK_EXTRA_RIGHT}{/if} - -
- -
- -
- - -
- -{if !$content_only} - -{if $product->description} -
-

{l s='More info'}

{/if} - {if isset($product) && $product->description} - -
{$product->description}
-
-{/if} - - - - -{if $features} -
-

{l s='Data sheet'}

{/if} -{if isset($features) && $features} - - {foreach from=$features item=feature} - - {if isset($feature.value)} - + {if !$content_only} + + {/if} - - {/foreach} -
{$feature.name|escape:'html':'UTF-8'} {$feature.value|escape:'html':'UTF-8'}
-
-{/if} - +
+ + + +
+
+
+ {if $product->show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE} + +
+

+ quantity <= 0}href="http://schema.org/OutOfStock"{else}href="http://schema.org/InStock"{/if}> + {if $priceDisplay >= 0 && $priceDisplay <= 2} + {convertPrice price=$productPrice} + + + {/if} +

- -
- {$HOOK_PRODUCT_TAB} - {if isset($HOOK_PRODUCT_TAB_CONTENT) && $HOOK_PRODUCT_TAB_CONTENT}{$HOOK_PRODUCT_TAB_CONTENT}{/if} -
- +

specificPrice OR $product->specificPrice.reduction_type != 'percentage'} style="display:none;"{/if}> + + {if $product->specificPrice AND $product->specificPrice.reduction_type == 'percentage'}-{$product->specificPrice.reduction*100}%{/if} + +

- +

specificPrice || !$product->specificPrice.reduction} class="hidden"{/if}> + {if $priceDisplay >= 0 && $priceDisplay <= 2} + {if $productPriceWithoutReduction > $productPrice}{convertPrice price=$productPriceWithoutReduction}{/if} + + {/if} +

-{if isset($accessories) AND $accessories} -
-

{l s='Accessories'}

- -
-
-
    - {foreach from=$accessories item=accessory name=accessories_list} - {if ($accessory.allow_oosp || $accessory.quantity_all_versions > 0 || $accessory.quantity > 0) AND $accessory.available_for_order AND !isset($restricted_country_mode)} - {assign var='accessoryLink' value=$link->getProductLink($accessory.id_product, $accessory.link_rewrite, $accessory.category)} -
  • + {if $priceDisplay == 2} +
    + + {convertPrice price=$product->getPrice(false, $smarty.const.NULL)} + {l s='tax excl.'} + + {/if} +
-
- {$accessory.legend|escape:'html':'UTF-8'} - -
- {$accessory.description_short|strip_tags|truncate:25:'...'} -
-
- -
-
{$accessory.name|truncate:20:'...':true|escape:'html':'UTF-8'}
- - {if $accessory.show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE} - {if $priceDisplay != 1}{displayWtPrice p=$accessory.price}{else}{displayWtPrice p=$accessory.price_tax_exc}{/if}{/if} -
- -
- {if !$PS_CATALOG_MODE && ($accessory.allow_oosp || $accessory.quantity > 0)} - - - - {/if} -
- - - {/if} - {/foreach} - -
-
- -{/if} - - -{if (isset($quantity_discounts) && count($quantity_discounts) > 0)} - - -
-

{l s='Volume discounts'}

-
- - - - - - - - - - {foreach from=$quantity_discounts item='quantity_discount' name='quantity_discounts'} - - - - - - - {/foreach} - -
{l s='Quantity'}{l s='Discount'}{l s='You Save'}
{$quantity_discount.quantity|intval} - {if $quantity_discount.price >= 0 OR $quantity_discount.reduction_type == 'amount'} - {convertPrice price=$quantity_discount.real_value|floatval} - {else} - {$quantity_discount.real_value|floatval}% - {/if} - - {l s='Up to'} - {if $quantity_discount.price >= 0 OR $quantity_discount.reduction_type == 'amount'} - {$discountPrice=$productPrice-$quantity_discount.real_value|floatval} - {else} - {$discountPrice=$productPrice-($productPrice*$quantity_discount.reduction)|floatval} - {/if} - {$discountPrice=$discountPrice*$quantity_discount.quantity} - {$qtyProductPrice = $productPrice*$quantity_discount.quantity} - {convertPrice price=$qtyProductPrice-$discountPrice} -
-
-{/if} - -
-{if isset($HOOK_PRODUCT_FOOTER) && $HOOK_PRODUCT_FOOTER}{$HOOK_PRODUCT_FOOTER}{/if} - - - -{if (isset($product) && $product->description) || (isset($features) && $features) || (isset($accessories) && $accessories) || (isset($HOOK_PRODUCT_TAB) && $HOOK_PRODUCT_TAB) || (isset($attachments) && $attachments) || isset($product) && $product->customizable} - - - - {if isset($attachments) && $attachments} -
-

{l s='Download'}

- {foreach from=$attachments item=attachment} - {$attachment.name|escape:'html':'UTF-8'}
{$attachment.description|escape:'html':'UTF-8'} - {/foreach} - -
- {/if} - - - - - -{if isset($product) && $product->customizable} -
- -

{l s='Product customization'}

- - - -
-

- {l s='After saving your customized product, remember to add it to your cart.'} - {if $product->uploadable_files}
{l s='Allowed file formats are: GIF, JPG, PNG'}{/if} -

- {if $product->uploadable_files|intval} -
-
{l s='Pictures'}
-
    - {counter start=0 assign='customizationField'} - {foreach from=$customizationFields item='field' name='customizationFields'} - {if $field.type == 0} -
  • {assign var='key' value='pictures_'|cat:$product->id|cat:'_'|cat:$field.id_customization_field} - {if isset($pictures.$key)} -
    - - - {l s='Delete'} - -
    - {/if} -
    - - -
    -
    • - {counter} +

    specificPrice OR $product->specificPrice.reduction_type != 'amount' || $product->specificPrice.reduction|intval ==0} style="display:none"{/if}> + + {if $product->specificPrice AND $product->specificPrice.reduction_type == 'amount' AND $product->specificPrice.reduction|intval !=0} + -{convertPrice price=$productPriceWithoutReduction-$productPrice|floatval} {/if} - {/foreach} -

-
- {/if} - {if $product->text_fields|intval} -
-
{l s='Text'}
-
    - {counter start=0 assign='customizationField'} - {foreach from=$customizationFields item='field' name='customizationFields'} - {if $field.type == 1} -
  • - - -
    • - {counter} + +

    + + {if $packItems|@count && $productPrice < $product->getNoPackPrice()} +

    {l s='Instead of'} {convertPrice price=$product->getNoPackPrice()}

    {/if} + + {if $product->ecotax != 0} +

    {l s='Include'} {if $priceDisplay == 2}{$ecotax_tax_exc|convertAndFormatPrice}{else}{$ecotax_tax_inc|convertAndFormatPrice}{/if} {l s='For green tax'} + {if $product->specificPrice AND $product->specificPrice.reduction} +
    {l s='(not impacted by the discount)'} + {/if} +

    + {/if} + + {if !empty($product->unity) && $product->unit_price_ratio > 0.000000} + {math equation="pprice / punit_price" pprice=$productPrice punit_price=$product->unit_price_ratio assign=unit_price} +

    {convertPrice price=$unit_price} {l s='per'} {$product->unity|escape:'html':'UTF-8'}

    + {/if} + {/if} {*close if for show price*} +
    +
+ +
+ +

quantity <= 0) OR $virtual OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}> + + minimal_quantity > 1}onkeyup="checkMinimalQuantity({$product->minimal_quantity});"{/if} /> + + + + + + + +

+ +

minimal_quantity <= 1 OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}> + {l s='This product is not sold individually. You must select at least'} {$product->minimal_quantity} {l s='quantity for this product.'} +

+ {if $product->minimal_quantity > 1} + + {/if} + + {if isset($groups)} + +
+
+ {foreach from=$groups key=id_attribute_group item=group} + {if $group.attributes|@count} +
+ + {assign var="groupName" value="group_$id_attribute_group"} +
+ {if ($group.group_type == 'select')} + + {elseif ($group.group_type == 'color')} + + + {elseif ($group.group_type == 'radio')} +
    + {foreach from=$group.attributes key=id_attribute item=group_attribute} +
  • + + {$group_attribute|escape:'html':'UTF-8'} +
    • + {/foreach} +
+ {/if} +
+
+ {/if} + {/foreach} +
+ {/if} +
+
+

quantity <= 0) OR !$product->available_for_order OR (isset($restricted_country_mode) AND $restricted_country_mode) OR $PS_CATALOG_MODE}style="display:none"{/if} class="buttons_bottom_block"> + +

+ {if isset($HOOK_PRODUCT_ACTIONS) && $HOOK_PRODUCT_ACTIONS}{$HOOK_PRODUCT_ACTIONS}{/if} +
+
+
+
+ + {if !$content_only} + + {if $product->description} + +
+

{l s='More info'}

{/if} + {if isset($product) && $product->description} + +
{$product->description}
+
+ + {/if} + + + {if $features} + +
+

{l s='Data sheet'}

+ {/if} + {if isset($features) && $features} + + {foreach from=$features item=feature} + + {if isset($feature.value)} + + + {/if} + {/foreach} - +
{$feature.name|escape:'html':'UTF-8'}{$feature.value|escape:'html':'UTF-8'}
+
+ + {/if} + + +
+ {$HOOK_PRODUCT_TAB} + {if isset($HOOK_PRODUCT_TAB_CONTENT) && $HOOK_PRODUCT_TAB_CONTENT}{$HOOK_PRODUCT_TAB_CONTENT}{/if} +
+ + + {if isset($accessories) AND $accessories} + +
+

{l s='Accessories'}

+
+
+
    + {foreach from=$accessories item=accessory name=accessories_list} + {if ($accessory.allow_oosp || $accessory.quantity_all_versions > 0 || $accessory.quantity > 0) AND $accessory.available_for_order AND !isset($restricted_country_mode)} + {assign var='accessoryLink' value=$link->getProductLink($accessory.id_product, $accessory.link_rewrite, $accessory.category)} +
  • +
    + + {$accessory.legend|escape:'html':'UTF-8'} + +
    + + {$accessory.description_short|strip_tags|truncate:25:'...'} + +
    +
    +
    +
    + + {$accessory.name|truncate:20:'...':true|escape:'html':'UTF-8'} + +
    + {if $accessory.show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE} + + {if $priceDisplay != 1} + {displayWtPrice p=$accessory.price}{else}{displayWtPrice p=$accessory.price_tax_exc} + {/if} + + {/if} +
    +
    + {if !$PS_CATALOG_MODE && ($accessory.allow_oosp || $accessory.quantity > 0)} + + {/if} +
    +
    • + {/if} + {/foreach} +
+
+
+
+ + {/if} + + + {if (isset($quantity_discounts) && count($quantity_discounts) > 0)} + +
+

{l s='Volume discounts'}

+
+ + + + + + + + + + {foreach from=$quantity_discounts item='quantity_discount' name='quantity_discounts'} + + + + + + + {/foreach} + +
{l s='Quantity'}{l s='Discount'}{l s='You Save'}
{$quantity_discount.quantity|intval} + {if $quantity_discount.price >= 0 OR $quantity_discount.reduction_type == 'amount'} + {convertPrice price=$quantity_discount.real_value|floatval} + {else} + {$quantity_discount.real_value|floatval}% + {/if} + + {l s='Up to'} + {if $quantity_discount.price >= 0 OR $quantity_discount.reduction_type == 'amount'} + {$discountPrice=$productPrice-$quantity_discount.real_value|floatval} + {else} + {$discountPrice=$productPrice-($productPrice*$quantity_discount.reduction)|floatval} + {/if} + {$discountPrice=$discountPrice*$quantity_discount.quantity} + {$qtyProductPrice = $productPrice*$quantity_discount.quantity} + {convertPrice price=$qtyProductPrice-$discountPrice} +
- {/if} -

- - - - - -

- -

* {l s='required fields'}

-
+ + {/if} + + {if isset($HOOK_PRODUCT_FOOTER) && $HOOK_PRODUCT_FOOTER}{$HOOK_PRODUCT_FOOTER}{/if} + + + {if (isset($product) && $product->description) || (isset($features) && $features) || (isset($accessories) && $accessories) || (isset($HOOK_PRODUCT_TAB) && $HOOK_PRODUCT_TAB) || (isset($attachments) && $attachments) || isset($product) && $product->customizable} + + {if isset($attachments) && $attachments} + +
+

{l s='Download'}

+ {foreach from=$attachments item=attachment} + + {$attachment.name|escape:'html':'UTF-8'} + +
+ {$attachment.description|escape:'html':'UTF-8'} + {/foreach} +
+ + {/if} + + {if isset($product) && $product->customizable} + +
+

{l s='Product customization'}

+ +
+

+ {l s='After saving your customized product, remember to add it to your cart.'} + {if $product->uploadable_files} +
+ {l s='Allowed file formats are: GIF, JPG, PNG'}{/if} +

+ {if $product->uploadable_files|intval} +
+
{l s='Pictures'}
+
    + {counter start=0 assign='customizationField'} + {foreach from=$customizationFields item='field' name='customizationFields'} + {if $field.type == 0} +
  • {assign var='key' value='pictures_'|cat:$product->id|cat:'_'|cat:$field.id_customization_field} + {if isset($pictures.$key)} +
    + + + {l s='Delete'} + +
    + {/if} +
    + + +
    +
    • + {counter} + {/if} + {/foreach} +
+
+ {/if} + + {if $product->text_fields|intval} +
+
{l s='Text'}
+
    + {counter start=0 assign='customizationField'} + {foreach from=$customizationFields item='field' name='customizationFields'} + {if $field.type == 1} +
  • + + +
    • + {counter} + {/if} + {/foreach} +
+
+ {/if} + +

+ + + + + +

+
+

* {l s='required fields'}

+
+ + {/if} + {/if} + + {if isset($packItems) && $packItems|@count > 0} +
+

{l s='Pack content'}

+ {include file="$tpl_dir./product-list.tpl" products=$packItems} +
+ {/if} + {/if} - - - - -{/if} -{if isset($packItems) && $packItems|@count > 0} -
-

{l s='Pack content'}

- {include file="$tpl_dir./product-list.tpl" products=$packItems} -
-{/if} -{/if} - - - - -{/if} +{/if} \ No newline at end of file From 02b6e24ca45de52333ae4ad04a52d090ae499a94 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Thu, 5 Dec 2013 15:27:40 +0100 Subject: [PATCH 15/23] // category page almost W3C valid --- themes/default-bootstrap/nbr-product-page.tpl | 30 +++++++----- themes/default-bootstrap/pagination.tpl | 2 +- themes/default-bootstrap/product-compare.tpl | 2 +- .../default-bootstrap/product-list-colors.tpl | 13 +++-- themes/default-bootstrap/product.tpl | 48 ++++--------------- 5 files changed, 40 insertions(+), 55 deletions(-) diff --git a/themes/default-bootstrap/nbr-product-page.tpl b/themes/default-bootstrap/nbr-product-page.tpl index 03612bd4a..524669846 100644 --- a/themes/default-bootstrap/nbr-product-page.tpl +++ b/themes/default-bootstrap/nbr-product-page.tpl @@ -39,11 +39,17 @@ {/if} {if $nb_products > $products_per_page} -
+
- {if isset($search_query) AND $search_query}{/if} - {if isset($tag) AND $tag AND !is_array($tag)}{/if} - + {if isset($search_query) AND $search_query} + + {/if} + {if isset($tag) AND $tag AND !is_array($tag)} + + {/if} + {if is_array($requestNb)} {foreach from=$requestNb item=requestValue key=requestKey} {if $requestKey != 'requestUrl'} @@ -52,17 +58,17 @@ {/foreach} {/if} {l s='per page'}
{/if} -{/if} +{/if} \ No newline at end of file diff --git a/themes/default-bootstrap/pagination.tpl b/themes/default-bootstrap/pagination.tpl index dd03c6d21..8ab492c5e 100644 --- a/themes/default-bootstrap/pagination.tpl +++ b/themes/default-bootstrap/pagination.tpl @@ -50,7 +50,7 @@
{if !$PS_CATALOG_MODE && ($accessory.allow_oosp || $accessory.quantity > 0)} - {/if}
@@ -699,12 +672,11 @@ {/if} - {if (isset($quantity_discounts) && count($quantity_discounts) > 0)}
-

{l s='Volume discounts'}

+

{l s='Volume discounts'}

From f128dac9c4a3903ff988d216b93ac6973b3dfb6f Mon Sep 17 00:00:00 2001 From: rGaillard Date: Thu, 5 Dec 2013 15:59:14 +0100 Subject: [PATCH 16/23] // small fix --- classes/Tools.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Tools.php b/classes/Tools.php index 18c2a3499..849b1db65 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -2679,7 +2679,7 @@ exit; 'iso_lang' => Tools::strtolower(isset($params['iso_lang']) ? $params['iso_lang'] : Context::getContext()->language->iso_code), 'iso_code' => Tools::strtolower(isset($params['iso_country']) ? $params['iso_country'] : Country::getIsoById(Configuration::get('PS_COUNTRY_DEFAULT'))), 'shop_url' => isset($params['shop_url']) ? $params['shop_url'] : Tools::getShopDomain(), - 'mail' => isset($params['email']) ? $params['email'] : Configuration::get('email') + 'mail' => isset($params['email']) ? $params['email'] : Configuration::get('PS_SHOP_EMAIL') )); $protocols = array('https'); From 9dd82367f3e0931812e990327d6a183cfaa88250 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Thu, 5 Dec 2013 16:27:10 +0100 Subject: [PATCH 17/23] // Product compare almost W3C valid -> #availability_value must be change with a class --- .../default-bootstrap/products-comparison.tpl | 272 +++++++++--------- 1 file changed, 137 insertions(+), 135 deletions(-) diff --git a/themes/default-bootstrap/products-comparison.tpl b/themes/default-bootstrap/products-comparison.tpl index 7b9043d19..a9680d821 100644 --- a/themes/default-bootstrap/products-comparison.tpl +++ b/themes/default-bootstrap/products-comparison.tpl @@ -28,145 +28,147 @@

{l s='Product Comparison'}

{if $hasProduct} - -
-
- - - {assign var='taxes_behavior' value=false} - {if $use_taxes && (!$priceDisplay || $priceDisplay == 2)} - {assign var='taxes_behavior' value=true} - {/if} - {foreach from=$products item=product name=for_products} - {assign var='replace_id' value=$product->id|cat:'|'} - - - {/foreach} - - {if $ordered_features} - {foreach from=$ordered_features item=feature} - - {cycle values='comparison_feature_odd,comparison_feature_even' assign='classname'} - - - {foreach from=$products item=product name=for_products} - {assign var='product_id' value=$product->id} - {assign var='feature_id' value=$feature.id_feature} - {if isset($product_features[$product_id])} - {assign var='tab' value=$product_features[$product_id]} - - {else} - - {/if} - {/foreach} - - {/foreach} - {else} + +
+
- {$HOOK_COMPARE_EXTRA_INFORMATION} - {l s='Features:'} - -
- -
-
- - {$product->name|escape:html:'UTF-8'} - - {if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE} - {if $product->on_sale} -
{l s='Sale!'}
- {/if} - {/if} -
-
{$product->name|truncate:45:'...'|escape:'html':'UTF-8'}
-
- {if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE} - {convertPrice price=$product->getPrice($taxes_behavior)} - {if isset($product->specificPrice) && $product->specificPrice} - {if {$product->specificPrice.reduction_type == 'percentage'}} - {displayWtPrice p=$product->getPrice($taxes_behavior)+($product->getPrice($taxes_behavior)* $product->specificPrice.reduction)} - -{$product->specificPrice.reduction*100|floatval}% - {else} - {convertPrice price=($product->getPrice($taxes_behavior) + $product->specificPrice.reduction)} - -{convertPrice price=$product->specificPrice.reduction} - {/if} - {/if} - {if $product->on_sale} - {elseif $product->specificPrice AND $product->specificPrice.reduction} -
- {l s='Reduced price!'} -
- {/if} - - {if !empty($product->unity) && $product->unit_price_ratio > 0.000000} - {math equation="pprice / punit_price" pprice=$product->getPrice($taxes_behavior) punit_price=$product->unit_price_ratio assign=unit_price} -  {convertPrice price=$unit_price} {l s='per %s' sprintf=$product->unity|escape:'html':'UTF-8'} - {else} - {/if} - {/if} -
-
{$product->description_short|strip_tags|truncate:60:'...'}
- -
- -

- {if !(($product->quantity <= 0 && !$product->available_later) OR ($product->quantity != 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE)} - {l s='Availability:'} - quantity <= 0} class="warning-inline"{/if}> - {if $product->quantity <= 0} - {if $allow_oosp} - {$product->available_later|escape:'html':'UTF-8'} - {else} - {l s='This product is no longer in stock.'} - {/if} - {else} - {$product->available_now|escape:'html':'UTF-8'} - {/if} - - {/if} -

-
-
- {if (!$product->hasAttributes() OR (isset($add_prod_display) AND ($add_prod_display == 1))) AND $product->minimal_quantity == 1 AND $product->customizable != 2 AND !$PS_CATALOG_MODE} - {if ($product->quantity > 0 OR $product->allow_oosp)} - id}&token={$static_token}&add")|escape:'html'}" - title="{l s='Add to cart'}"> - {l s='Add to cart'} - - {else} - {l s='Add to cart'} - {/if} - {else} - - {/if} - {l s='View'} -
-
- -
-
- {$feature.name|escape:'html':'UTF-8'} - {if (isset($tab[$feature_id]))}{$tab[$feature_id]|escape:'html':'UTF-8'}{/if}
- - - - {/if} + + {assign var='taxes_behavior' value=false} + {if $use_taxes && (!$priceDisplay || $priceDisplay == 2)} + {assign var='taxes_behavior' value=true} + {/if} + {foreach from=$products item=product name=for_products} + {assign var='replace_id' value=$product->id|cat:'|'} +
{l s='No features to compare'}
+ {$HOOK_COMPARE_EXTRA_INFORMATION} + {l s='Features:'} + +
+ +
+
+ + {$product->name|escape:html:'UTF-8'} + + {if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE} + {if $product->on_sale} +
{l s='Sale!'}
+ {/if} + {/if} +
+
+ + {$product->name|truncate:45:'...'|escape:'html':'UTF-8'} + +
+
+ {if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE} + {convertPrice price=$product->getPrice($taxes_behavior)} + {if isset($product->specificPrice) && $product->specificPrice} + {if {$product->specificPrice.reduction_type == 'percentage'}} + {displayWtPrice p=$product->getPrice($taxes_behavior)+($product->getPrice($taxes_behavior)* $product->specificPrice.reduction)} + -{$product->specificPrice.reduction*100|floatval}% + {else} + {convertPrice price=($product->getPrice($taxes_behavior) + $product->specificPrice.reduction)} + -{convertPrice price=$product->specificPrice.reduction} + {/if} + {/if} + {if $product->on_sale} + {elseif $product->specificPrice AND $product->specificPrice.reduction} +
+ {l s='Reduced price!'} +
+ {/if} + {if !empty($product->unity) && $product->unit_price_ratio > 0.000000} + {math equation="pprice / punit_price" pprice=$product->getPrice($taxes_behavior) punit_price=$product->unit_price_ratio assign=unit_price} +  {convertPrice price=$unit_price} {l s='per %s' sprintf=$product->unity|escape:'html':'UTF-8'} + {else} + {/if} + {/if} +
- {$HOOK_EXTRA_PRODUCT_COMPARISON} -
-
+
{$product->description_short|strip_tags|truncate:60:'...'}
+ +
+ +

+ {if !(($product->quantity <= 0 && !$product->available_later) OR ($product->quantity != 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE)} + {l s='Availability:'} + quantity <= 0} class="warning-inline"{/if}> + {if $product->quantity <= 0} + {if $allow_oosp} + {$product->available_later|escape:'html':'UTF-8'} + {else} + {l s='This product is no longer in stock.'} + {/if} + {else} + {$product->available_now|escape:'html':'UTF-8'} + {/if} + + {/if} +

+
+
+ {if (!$product->hasAttributes() OR (isset($add_prod_display) AND ($add_prod_display == 1))) AND $product->minimal_quantity == 1 AND $product->customizable != 2 AND !$PS_CATALOG_MODE} + {if ($product->quantity > 0 OR $product->allow_oosp)} + id}&token={$static_token}&add")|escape:'html'}" + title="{l s='Add to cart'}"> + {l s='Add to cart'} + + {else} + {l s='Add to cart'} + {/if} + {/if} + {l s='View'} +
+
+
+ + {/foreach} + + {if $ordered_features} + {foreach from=$ordered_features item=feature} + + {cycle values='comparison_feature_odd,comparison_feature_even' assign='classname'} + + {$feature.name|escape:'html':'UTF-8'} + + {foreach from=$products item=product name=for_products} + {assign var='product_id' value=$product->id} + {assign var='feature_id' value=$feature.id_feature} + {if isset($product_features[$product_id])} + {assign var='tab' value=$product_features[$product_id]} + {if (isset($tab[$feature_id]))}{$tab[$feature_id]|escape:'html':'UTF-8'}{/if} + {else} + + {/if} + {/foreach} + + {/foreach} + {else} + + + {l s='No features to compare'} + + {/if} + {$HOOK_EXTRA_PRODUCT_COMPARISON} + +
{else}

{l s='There are no products selected for comparison.'}

{/if} \ No newline at end of file From 3975599023e1922b80274d951794afdb61a137ac Mon Sep 17 00:00:00 2001 From: gRoussac Date: Thu, 5 Dec 2013 16:47:05 +0100 Subject: [PATCH 18/23] =?UTF-8?q?[-=C2=A0]=20CORE=20:=20Fix=20bug=20#PSCFV?= =?UTF-8?q?-10627,=20bad=20default=20shoip=20currency=20&&=20Shop::getEnti?= =?UTF-8?q?tyIds=20returning=20deleted=20currency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/Tools.php | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/classes/Tools.php b/classes/Tools.php index 849b1db65..107e7ff0b 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -421,28 +421,27 @@ class ToolsCore if (is_object($currency) && $currency->id && !$currency->deleted && $currency->isAssociatedToShop()) $cookie->id_currency = (int)$currency->id; } - - if ((int)$cookie->id_currency) - { - $currency = Currency::getCurrencyInstance((int)$cookie->id_currency); - if (is_object($currency) && (int)$currency->id && (int)$currency->deleted != 1 && $currency->active) - if ($currency->isAssociatedToShop()) - return $currency; - else - { - // get currency from context - $currency = Shop::getEntityIds('currency', Context::getContext()->shop->id); - if (isset($currency[0]) && $currency[0]['id_currency']) - { - $cookie->id_currency = $currency[0]['id_currency']; - return Currency::getCurrencyInstance((int)$cookie->id_currency); - } - } - } + $currency = Currency::getCurrencyInstance(Configuration::get('PS_CURRENCY_DEFAULT')); - if (is_object($currency) && $currency->id) - $cookie->id_currency = (int)$currency->id; + if ((int)$cookie->id_currency) + $currency = Currency::getCurrencyInstance((int)$cookie->id_currency); + if (is_object($currency) && (int)$currency->id && (int)$currency->deleted != 1 && $currency->active) + { + $cookie->id_currency = (int)$currency->id; + if ($currency->isAssociatedToShop()) + return $currency; + else + { + // get currency from context + $currency = Shop::getEntityIds('currency', Context::getContext()->shop->id, true, true); + if (isset($currency[0]) && $currency[0]['id_currency']) + { + $cookie->id_currency = $currency[0]['id_currency']; + return Currency::getCurrencyInstance((int)$cookie->id_currency); + } + } + } return $currency; } From d50999fde0e0a6b4693b8656bb81bdeec6380ca7 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Thu, 5 Dec 2013 17:17:35 +0100 Subject: [PATCH 19/23] =?UTF-8?q?[-]=20Core:=20Fix=C2=A0#PSCFV-11165=20num?= =?UTF-8?q?erical=20configuration=20values=20should=20not=20be=20overridde?= =?UTF-8?q?n=20if=20the=20value=20is=20the=20same=20between=20shop=20and?= =?UTF-8?q?=20global=20context?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/Configuration.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/Configuration.php b/classes/Configuration.php index dc623e3f0..570435a2f 100644 --- a/classes/Configuration.php +++ b/classes/Configuration.php @@ -314,7 +314,8 @@ class ConfigurationCore extends ObjectModel $result = true; foreach ($values as $lang => $value) { - if ($value === Configuration::get($key, $lang, $id_shop_group, $id_shop)) + $stored_value = Configuration::get($key, $lang, $id_shop_group, $id_shop); + if ((!is_numeric($value) && $value === $stored_value) || (is_numeric($value) && $value == $stored_value)) continue; // If key already exists, update value From 1f1b3974cf066d5762070552cdfd6b420073c4fc Mon Sep 17 00:00:00 2001 From: sLorenzini Date: Thu, 5 Dec 2013 17:59:13 +0100 Subject: [PATCH 20/23] // update itemprop on product page + w3c bug on address.tpl --- themes/default-bootstrap/address.tpl | 4 ++-- themes/default-bootstrap/product.tpl | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/themes/default-bootstrap/address.tpl b/themes/default-bootstrap/address.tpl index d6b4fed53..eb07de5f3 100644 --- a/themes/default-bootstrap/address.tpl +++ b/themes/default-bootstrap/address.tpl @@ -106,8 +106,8 @@ $(function(){ldelim}
- - + +
diff --git a/themes/default-bootstrap/product.tpl b/themes/default-bootstrap/product.tpl index 1c8324b7c..9b0785e04 100644 --- a/themes/default-bootstrap/product.tpl +++ b/themes/default-bootstrap/product.tpl @@ -197,7 +197,8 @@ class="jqzoom" title="{if !empty($cover.legend)}{$cover.legend|escape:'html'}{else}{$product->name|escape:'html'}{/if}" rel="gal1" - href="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'thickbox_default')|escape:'html'}"> + href="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'thickbox_default')|escape:'html'}" + itemprop="url"> Date: Thu, 5 Dec 2013 18:37:49 +0100 Subject: [PATCH 21/23] [-] CORE : Ensure correct parent category for home categories --- classes/Category.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/classes/Category.php b/classes/Category.php index 264cb82d7..6187934c9 100644 --- a/classes/Category.php +++ b/classes/Category.php @@ -153,6 +153,10 @@ class CategoryCore extends ObjectModel { if (!isset($this->level_depth)) $this->level_depth = $this->calcLevelDepth(); + + if ($this->is_root_category) + $this->id_parent = (int)Configuration::get('PS_ROOT_CATEGORY'); + $ret = parent::add($autodate, $null_values); if (Tools::isSubmit('checkBoxShopAsso_category')) foreach (Tools::getValue('checkBoxShopAsso_category') as $id_shop => $value) @@ -185,6 +189,10 @@ class CategoryCore extends ObjectModel { if ($this->id_parent == $this->id) throw new PrestaShopException('a category cannot be it\'s own parent'); + + if ($this->is_root_category) + $this->id_parent = (int)Configuration::get('PS_ROOT_CATEGORY'); + // Update group selection $this->updateGroup($this->groupBox); $this->level_depth = $this->calcLevelDepth(); From 0067eff263ff53886fa12657bbce3c8d8c7d1dd1 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Thu, 5 Dec 2013 18:50:50 +0100 Subject: [PATCH 22/23] // working on W3C validation --- themes/default-bootstrap/order-payment.tpl | 604 +++++++------- themes/default-bootstrap/shopping-cart.tpl | 912 +++++++++++---------- 2 files changed, 814 insertions(+), 702 deletions(-) diff --git a/themes/default-bootstrap/order-payment.tpl b/themes/default-bootstrap/order-payment.tpl index 75a8c1bd2..f65eff64d 100644 --- a/themes/default-bootstrap/order-payment.tpl +++ b/themes/default-bootstrap/order-payment.tpl @@ -34,308 +34,332 @@ var txtProducts = "{l s='products' js=1}"; // ]]> - {capture name=path}{l s='Your payment method'}{/capture} {/if} -{if !$opc}

{l s='Please choose your payment method'}

{else}

3 {l s='Please choose your payment method'}

{/if} +{if !$opc} +

{l s='Please choose your payment method'}

+{else} +

3 {l s='Please choose your payment method'}

+{/if} {if !$opc} {assign var='current_step' value='payment'} {include file="$tpl_dir./order-steps.tpl"} - {include file="$tpl_dir./errors.tpl"} {else}
{/if} - -
- -
{$HOOK_TOP_PAYMENT}
- -{if $HOOK_PAYMENT} - {if !$opc} -
- - - - - - - - - - - - - {if $use_taxes} - {if $priceDisplay} - - - - - {else} - - - - - {/if} - {else} - - - - - {/if} - - - - - {if $total_shipping_tax_exc <= 0 && !isset($virtualCart)} - - - - - {else} - {if $use_taxes && $total_shipping_tax_exc != $total_shipping} - {if $priceDisplay} - - - - - {else} - - - - - {/if} - {else} - - - - - {/if} - {/if} - - - - - {if $use_taxes} - {if $priceDisplay && $total_tax != 0} - - - - - {/if} - - - - - {else} - - {if $voucherAllowed} - - {/if} - - - - {/if} - - - {foreach from=$products item=product name=productLoop} - {assign var='productId' value=$product.id_product} - {assign var='productAttributeId' value=$product.id_product_attribute} - {assign var='quantityDisplayed' value=0} - {assign var='cannotModify' value=1} - {assign var='odd' value=$product@iteration%2} - {assign var='noDeleteButton' value=1} - {* Display the product line *} - {include file="$tpl_dir./shopping-cart-product-line.tpl"} - {* Then the customized datas ones*} - {if isset($customizedDatas.$productId.$productAttributeId)} - {foreach from=$customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] key='id_customization' item='customization'} - - + + + {if $total_shipping_tax_exc <= 0 && !isset($virtualCart)} + + + + + {else} + {if $use_taxes && $total_shipping_tax_exc != $total_shipping} + {if $priceDisplay} + + + + + {else} + + + + + {/if} + {else} + + + + + {/if} + {/if} + + + + + {if $use_taxes} + {if $priceDisplay && $total_tax != 0} + + + + + {/if} + + + + + {else} + + {if $voucherAllowed} + + {/if} + + + + {/if} + -{if !$opc} -

{l s='Continue shopping'}

-{else} - -{/if} - + + {foreach from=$products item=product name=productLoop} + {assign var='productId' value=$product.id_product} + {assign var='productAttributeId' value=$product.id_product_attribute} + {assign var='quantityDisplayed' value=0} + {assign var='cannotModify' value=1} + {assign var='odd' value=$product@iteration%2} + {assign var='noDeleteButton' value=1} + {* Display the product line *} + {include file="$tpl_dir./shopping-cart-product-line.tpl"} + {* Then the customized datas ones*} + {if isset($customizedDatas.$productId.$productAttributeId)} + {foreach from=$customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] key='id_customization' item='customization'} + + + + + + {assign var='quantityDisplayed' value=$quantityDisplayed+$customization.quantity} + {/foreach} + {* If it exists also some uncustomized products *} + {if $product.quantity-$quantityDisplayed > 0}{include file="$tpl_dir./shopping-cart-product-line.tpl"}{/if} + {/if} + {/foreach} + {assign var='last_was_odd' value=$product@iteration%2} + {foreach $gift_products as $product} + {assign var='productId' value=$product.id_product} + {assign var='productAttributeId' value=$product.id_product_attribute} + {assign var='quantityDisplayed' value=0} + {assign var='odd' value=($product@iteration+$last_was_odd)%2} + {assign var='ignoreProductLast' value=isset($customizedDatas.$productId.$productAttributeId)} + {assign var='cannotModify' value=1} + {* Display the gift product line *} + {include file="./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first} + {/foreach} + + + {if count($discounts)} + + {foreach from=$discounts item=discount name=discountLoop} + + + + + + {/foreach} + + {/if} +
{l s='Product'}{l s='Description'}{l s='Avail.'}{l s='Unit price'}{l s='Total'}
{if $display_tax_label}{l s='Total products (tax excl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products}
{if $display_tax_label}{l s='Total products (tax incl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products_wt}
{l s='Total products'}{displayPrice price=$total_products}
- {if $use_taxes} - {if $priceDisplay} - {if $display_tax_label}{l s='Total gift wrapping (tax excl.):'}{else}{l s='Total gift wrapping cost:'}{/if} - {else} - {if $display_tax_label}{l s='Total gift wrapping (tax incl.)'}{else}{l s='Total gift wrapping cost:'}{/if} - {/if} - {else} - {l s='Total gift wrapping cost:'} - {/if} - - {if $use_taxes} - {if $priceDisplay} - {displayPrice price=$total_wrapping_tax_exc} - {else} - {displayPrice price=$total_wrapping} - {/if} - {else} - {displayPrice price=$total_wrapping_tax_exc} - {/if} -
{l s='Shipping:'}{l s='Free Shipping!'}
- {if $use_taxes} - {if $priceDisplay} - {if $display_tax_label}{l s='Total vouchers (tax excl.)'}{else}{l s='Total vouchers'}{/if} - {else} - {if $display_tax_label}{l s='Total vouchers (tax incl.)'}{else}{l s='Total vouchers'}{/if} - {/if} - {else} - {l s='Total vouchers'} - {/if} - - {if $use_taxes} - {if $priceDisplay} - {displayPrice price=$total_discounts_tax_exc*-1} - {else} - {displayPrice price=$total_discounts*-1} - {/if} - {else} - {displayPrice price=$total_discounts_tax_exc*-1} - {/if} -
{l s='Total tax:'}{displayPrice price=$total_tax}
{l s='Total'} - {displayPrice price=$total_price} -
-
- {if isset($errors_discount) && $errors_discount} -
    - {foreach from=$errors_discount key=k item=error} -
  • {$error|escape:'html':'UTF-8'}
    • - {/foreach} -
- {/if} - {if $voucherAllowed} - -
-

{l s='Vouchers'}

- - - - {if $displayVouchers} -

{l s='Take advantage of our offers:'}

-
- {foreach from=$displayVouchers item=voucher} - {$voucher.name} - {$voucher.description}
- {/foreach} -
- {/if} -
- - {/if} -
- 		- {l s='Total'} - - {displayPrice price=$total_price_without_tax} -
- {foreach from=$customization.datas key='type' item='datas'} - {if $type == $CUSTOMIZE_FILE} -
-
    - {foreach from=$datas item='picture'} -
  • - -
    • - {/foreach} -
-
- {elseif $type == $CUSTOMIZE_TEXTFIELD} -
    - {foreach from=$datas item='textField' name='typedText'} -
  • - {if $textField.name} - {l s='%s:' sprintf=$textField.name} +
    +
    {$HOOK_TOP_PAYMENT}
    + {if $HOOK_PAYMENT} + {if !$opc} +
    + + + + + + + + + + + + + {if $use_taxes} + {if $priceDisplay} + + + + + {else} + + + + + {/if} + {else} + + + + + {/if} + + - - - - {assign var='quantityDisplayed' value=$quantityDisplayed+$customization.quantity} - {/foreach} - {* If it exists also some uncustomized products *} - {if $product.quantity-$quantityDisplayed > 0}{include file="$tpl_dir./shopping-cart-product-line.tpl"}{/if} - {/if} - {/foreach} - {assign var='last_was_odd' value=$product@iteration%2} - {foreach $gift_products as $product} - {assign var='productId' value=$product.id_product} - {assign var='productAttributeId' value=$product.id_product_attribute} - {assign var='quantityDisplayed' value=0} - {assign var='odd' value=($product@iteration+$last_was_odd)%2} - {assign var='ignoreProductLast' value=isset($customizedDatas.$productId.$productAttributeId)} - {assign var='cannotModify' value=1} - {* Display the gift product line *} - {include file="./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first} - {/foreach} - - {if count($discounts)} - - {foreach from=$discounts item=discount name=discountLoop} - - - - - - {/foreach} - - {/if} -
    {l s='Product'}{l s='Description'}{l s='Avail.'}{l s='Unit price'}{l s='Total'}
    {if $display_tax_label}{l s='Total products (tax excl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products}
    {if $display_tax_label}{l s='Total products (tax incl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products_wt}
    {l s='Total products'}{displayPrice price=$total_products}
    + {if $use_taxes} + {if $priceDisplay} + {if $display_tax_label}{l s='Total gift wrapping (tax excl.):'}{else}{l s='Total gift wrapping cost:'}{/if} {else} - {l s='Text #%s:' sprintf=$smarty.foreach.typedText.index+1} + {if $display_tax_label}{l s='Total gift wrapping (tax incl.)'}{else}{l s='Total gift wrapping cost:'}{/if} {/if} - {$textField.value} - - {/foreach} - - {/if} - {/foreach} - - {if isset($cannotModify) AND $cannotModify == 1} - {if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if} - {else} -
    - {l s='Delete'} -
    -
    - {l s='Add'}
    - {if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1} - - {l s='Subtract'} - - {else} - - {l s='Subtract'} - - {/if} -
    - - - {/if} -
    {$discount.name}{$discount.description} - - {if $discount.value_real > 0} - {if !$priceDisplay} - {displayPrice price=$discount.value_real*-1} - {else} - {displayPrice price=$discount.value_tax_exc*-1} - {/if} - {/if} - -
    -
    -{/if} - {if $opc}
    {/if} -
    - {$HOOK_PAYMENT} -
    - {if $opc}
    {/if} -{else} -

    {l s='No payment modules have been installed.'}

    -{/if} + {else} + {l s='Total gift wrapping cost:'} + {/if} +
+ {if $use_taxes} + {if $priceDisplay} + {displayPrice price=$total_wrapping_tax_exc} + {else} + {displayPrice price=$total_wrapping} + {/if} + {else} + {displayPrice price=$total_wrapping_tax_exc} + {/if} +
{l s='Shipping:'}{l s='Free Shipping!'}
+ {if $use_taxes} + {if $priceDisplay} + {if $display_tax_label}{l s='Total vouchers (tax excl.)'}{else}{l s='Total vouchers'}{/if} + {else} + {if $display_tax_label}{l s='Total vouchers (tax incl.)'}{else}{l s='Total vouchers'}{/if} + {/if} + {else} + {l s='Total vouchers'} + {/if} + + {if $use_taxes} + {if $priceDisplay} + {displayPrice price=$total_discounts_tax_exc*-1} + {else} + {displayPrice price=$total_discounts*-1} + {/if} + {else} + {displayPrice price=$total_discounts_tax_exc*-1} + {/if} +
{l s='Total tax:'}{displayPrice price=$total_tax}
{l s='Total'} + {displayPrice price=$total_price} +
+
+ {if isset($errors_discount) && $errors_discount} +
    + {foreach from=$errors_discount key=k item=error} +
  • {$error|escape:'html':'UTF-8'}
    • + {/foreach} +
+ {/if} + {if $voucherAllowed} +
+
+

{l s='Vouchers'}

+ + + + {if $displayVouchers} +

{l s='Take advantage of our offers:'}

+
+ {foreach from=$displayVouchers item=voucher} + {$voucher.name} - {$voucher.description}
+ {/foreach} +
+ {/if} +
+
+ {/if} +
+ 		+ {l s='Total'} + + {displayPrice price=$total_price_without_tax} +
+ {foreach from=$customization.datas key='type' item='datas'} + {if $type == $CUSTOMIZE_FILE} +
+
    + {foreach from=$datas item='picture'} +
  • + +
    • + {/foreach} +
+
+ {elseif $type == $CUSTOMIZE_TEXTFIELD} +
    + {foreach from=$datas item='textField' name='typedText'} +
  • + {if $textField.name} + {l s='%s:' sprintf=$textField.name} + {else} + {l s='Text #%s:' sprintf=$smarty.foreach.typedText.index+1} + {/if} + {$textField.value} +
    • + {/foreach} +
+ {/if} + {/foreach} + 		+ {if isset($cannotModify) AND $cannotModify == 1} + {if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if} + {else} +
+ + {l s='Delete'} + +
+
+ + {l s='Add'} + +
+ {if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1} + + {l s='Subtract'} + + {else} + + {l s='Subtract'} + + {/if} +
+ + + {/if} +
{$discount.name}{$discount.description} + + {if $discount.value_real > 0} + {if !$priceDisplay} + {displayPrice price=$discount.value_real*-1} + {else} + {displayPrice price=$discount.value_tax_exc*-1} + {/if} + {/if} + +
+
+ {/if} + {if $opc}
{/if} +
+ {$HOOK_PAYMENT} +
+ {if $opc}
{/if} + {else} +

{l s='No payment modules have been installed.'}

+ {/if} + {if !$opc} +

+ + + {l s='Continue shopping'} + +

+ {else} +
+ {/if} +
\ No newline at end of file diff --git a/themes/default-bootstrap/shopping-cart.tpl b/themes/default-bootstrap/shopping-cart.tpl index 13275edb7..5b2694ac3 100644 --- a/themes/default-bootstrap/shopping-cart.tpl +++ b/themes/default-bootstrap/shopping-cart.tpl @@ -34,6 +34,7 @@ {l s='Your account has been created.'}

{/if} + {assign var='current_step' value='summary'} {include file="$tpl_dir./order-steps.tpl"} {include file="$tpl_dir./errors.tpl"} @@ -44,444 +45,531 @@

{l s='This store has not accepted your new order.'}

{else} -{if isset($lastProductAdded) AND $lastProductAdded} -
-
-
{l s='Last product added'}
+ {if isset($lastProductAdded) AND $lastProductAdded} +
+
+
{l s='Last product added'}
+
+ + {$lastProductAdded.name|escape:'html':'UTF-8'} + +
+

+ + {$lastProductAdded.name|escape:'html':'UTF-8'} + +

+ {if isset($lastProductAdded.attributes) && $lastProductAdded.attributes} + + + {$lastProductAdded.attributes|escape:'html':'UTF-8'} + + + {/if} +
- {$lastProductAdded.name|escape:'html':'UTF-8'} -
-

{$lastProductAdded.name|escape:'html':'UTF-8'}

- {if isset($lastProductAdded.attributes) && $lastProductAdded.attributes}{$lastProductAdded.attributes|escape:'html':'UTF-8'}{/if} -
-
-{/if} -{assign var='total_discounts_num' value="{if $total_discounts != 0}1{else}0{/if}"} -{assign var='use_show_taxes' value="{if $use_taxes && $show_taxes}2{else}0{/if}"} -{assign var='total_wrapping_taxes_num' value="{if $total_wrapping != 0}1{else}0{/if}"} -
- - - - - - - - - - - - - - {if $use_taxes} - {if $priceDisplay} - - - - - - {else} - - - - - - {/if} - {else} - - - - - - {/if} - - - - - {if $total_shipping_tax_exc <= 0 && !isset($virtualCart)} - - - - - {else} - {if $use_taxes && $total_shipping_tax_exc != $total_shipping} - {if $priceDisplay} - - - - - {else} - - - - - {/if} - {else} - - - - - {/if} - {/if} - - - - - {if $use_taxes && $show_taxes} - - - - - - - - - {/if} - - - {if $use_taxes} - - {else} - - {/if} - - - - {assign var='odd' value=0} - {foreach $products as $product} - {assign var='productId' value=$product.id_product} - {assign var='productAttributeId' value=$product.id_product_attribute} - {assign var='quantityDisplayed' value=0} - {assign var='odd' value=($odd+1)%2} - {assign var='ignoreProductLast' value=isset($customizedDatas.$productId.$productAttributeId) || count($gift_products)} - {* Display the product line *} - {include file="$tpl_dir./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first} - {* Then the customized datas ones*} - {if isset($customizedDatas.$productId.$productAttributeId)} - {foreach $customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] as $id_customization=>$customization} - - - + {if sizeof($discounts)} + + {foreach $discounts as $discount} + + + + + + + {/foreach} - {/foreach} - - - {/foreach} + + {/if} +
{l s='Product'}{l s='Description'}{l s='Avail.'}{l s='Unit price'}{l s='Qty'}{l s='Total'} 
- {if $voucherAllowed} - {if isset($errors_discount) && $errors_discount} -
    - {foreach $errors_discount as $k=>$error} -
  • {$error|escape:'html':'UTF-8'}
    • - {/foreach} -
- {/if} -
-
-

{l s='Vouchers'}

- - - -
-
- {if $displayVouchers} -

{l s='Take advantage of our exclusive offers:'}

-
- {foreach $displayVouchers as $voucher} - {if $voucher.code != ''}{$voucher.code} - {/if}{$voucher.name}
- {/foreach} -
- {/if} - {/if} - 		{if $display_tax_label}{l s='Total products (tax excl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products}
- {if $voucherAllowed} - {if isset($errors_discount) && $errors_discount} -
    - {foreach $errors_discount as $k=>$error} -
  • {$error|escape:'html':'UTF-8'}
    • - {/foreach} -
- {/if} -
-
-

{l s='Vouchers'}

- - - -
-
- {if $displayVouchers} -

{l s='Take advantage of our exclusive offers:'}

-
- {foreach $displayVouchers as $voucher} - {if $voucher.code != ''}{$voucher.code} - {/if}{$voucher.name}
- {/foreach} -
- {/if} - {/if} - 		{if $display_tax_label}{l s='Total products (tax incl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products_wt}
- {if $voucherAllowed} - {if isset($errors_discount) && $errors_discount} -
    - {foreach $errors_discount as $k=>$error} -
  • {$error|escape:'html':'UTF-8'}
    • - {/foreach} -
- {/if} -
-
-

{l s='Vouchers'}

- - - -
-
- {if $displayVouchers} -

{l s='Take advantage of our exclusive offers:'}

-
- {foreach $displayVouchers as $voucher} - {if $voucher.code != ''}{$voucher.code} - {/if}{$voucher.name}
- {/foreach} -
- {/if} - {/if} - 		{l s='Total products'}{displayPrice price=$total_products}
- {if $use_taxes} - {if $display_tax_label}{l s='Total gift wrapping (tax incl.):'}{else}{l s='Total gift-wrapping cost:'}{/if} - {else} - {l s='Total gift-wrapping cost:'} - {/if} - - {if $use_taxes} - {if $priceDisplay} - {displayPrice price=$total_wrapping_tax_exc} - {else} - {displayPrice price=$total_wrapping} - {/if} - {else} - {displayPrice price=$total_wrapping_tax_exc} - {/if} -
{l s='Shipping'}{l s='Free Shipping!'}
- {if $display_tax_label} - {if $use_taxes && $priceDisplay == 0} - {l s='Total vouchers (tax incl.):'} - {else} - {l s='Total vouchers (tax excl.)'} - {/if} - {else} - {l s='Total vouchers'} - {/if} - - {if $use_taxes && $priceDisplay == 0} - {assign var='total_discounts_negative' value=$total_discounts * -1} - {else} - {assign var='total_discounts_negative' value=$total_discounts_tax_exc * -1} - {/if} - {displayPrice price=$total_discounts_negative} -
{l s='Total (tax excl.)'}{displayPrice price=$total_price_without_tax}
{l s='Total tax'}{displayPrice price=$total_tax}
{l s='Total'} - {displayPrice price=$total_price} - - {displayPrice price=$total_price_without_tax} -
- {foreach $customization.datas as $type => $custom_data} - {if $type == $CUSTOMIZE_FILE} -
-
    - {foreach $custom_data as $picture} -
    • + {/if} + {assign var='total_discounts_num' value="{if $total_discounts != 0}1{else}0{/if}"} + {assign var='use_show_taxes' value="{if $use_taxes && $show_taxes}2{else}0{/if}"} + {assign var='total_wrapping_taxes_num' value="{if $total_wrapping != 0}1{else}0{/if}"} + +
    + + + + + + + + + + + + + + {if $use_taxes} + {if $priceDisplay} + + + + + + {else} + + + + + + {/if} + {else} + + - - + + + {/if} + + + - {assign var='quantityDisplayed' value=$quantityDisplayed+$customization.quantity} + {if $total_shipping_tax_exc <= 0 && !isset($virtualCart)} + + + + + {else} + {if $use_taxes && $total_shipping_tax_exc != $total_shipping} + {if $priceDisplay} + + + + + {else} + + + + + {/if} + {else} + + + + + {/if} + {/if} + + + + + {if $use_taxes && $show_taxes} + + + + + + + + + {/if} + + + {if $use_taxes} + + {else} + + {/if} + + + + {assign var='odd' value=0} + {foreach $products as $product} + {assign var='productId' value=$product.id_product} + {assign var='productAttributeId' value=$product.id_product_attribute} + {assign var='quantityDisplayed' value=0} + {assign var='odd' value=($odd+1)%2} + {assign var='ignoreProductLast' value=isset($customizedDatas.$productId.$productAttributeId) || count($gift_products)} + {* Display the product line *} + {include file="$tpl_dir./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first} + {* Then the customized datas ones*} + {if isset($customizedDatas.$productId.$productAttributeId)} + {foreach $customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] as $id_customization=>$customization} + + + + + + + {assign var='quantityDisplayed' value=$quantityDisplayed+$customization.quantity} + {/foreach} + + {* If it exists also some uncustomized products *} + {if $product.quantity-$quantityDisplayed > 0}{include file="$tpl_dir./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first}{/if} + {/if} {/foreach} - {* If it exists also some uncustomized products *} - {if $product.quantity-$quantityDisplayed > 0}{include file="$tpl_dir./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first}{/if} - {/if} - {/foreach} - {assign var='last_was_odd' value=$product@iteration%2} - {foreach $gift_products as $product} - {assign var='productId' value=$product.id_product} - {assign var='productAttributeId' value=$product.id_product_attribute} - {assign var='quantityDisplayed' value=0} - {assign var='odd' value=($product@iteration+$last_was_odd)%2} - {assign var='ignoreProductLast' value=isset($customizedDatas.$productId.$productAttributeId)} - {assign var='cannotModify' value=1} - {* Display the gift product line *} - {include file="$tpl_dir./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first} - {/foreach} - - {if sizeof($discounts)} - - {foreach $discounts as $discount} - - - - - - - - {/foreach} - - {/if} -
    {l s='Product'}{l s='Description'}{l s='Avail.'}{l s='Unit price'}{l s='Qty'}{l s='Total'} 
    + {if $voucherAllowed} + {if isset($errors_discount) && $errors_discount} +
      + {foreach $errors_discount as $k=>$error} +
    • {$error|escape:'html':'UTF-8'}
      • {/foreach}
    - - {elseif $type == $CUSTOMIZE_TEXTFIELD} -
      - {foreach $custom_data as $textField} -
    • - {if $textField.name} - {$textField.name} - {else} - {l s='Text #'}{$textField@index+1} + {/if} +
      +
      +

      {l s='Vouchers'}

      + + + +
      +
      + {if $displayVouchers} +

      {l s='Take advantage of our exclusive offers:'}

      +
      + {foreach $displayVouchers as $voucher} + {if $voucher.code != ''}{$voucher.code} - {/if}{$voucher.name}
      + {/foreach} +
      + {/if} + {/if} +
    		{if $display_tax_label}{l s='Total products (tax excl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products}
    + {if $voucherAllowed} + {if isset($errors_discount) && $errors_discount} +
      + {foreach $errors_discount as $k=>$error} +
    • {$error|escape:'html':'UTF-8'}
      • + {/foreach} +
    + {/if} +
    +
    +

    {l s='Vouchers'}

    + + + +
    +
    + {if $displayVouchers} +

    {l s='Take advantage of our exclusive offers:'}

    +
    + {foreach $displayVouchers as $voucher} + {if $voucher.code != ''} + {$voucher.code} - {/if} - {l s=':'} {$textField.value} - + {$voucher.name} +
    + {/foreach} +
    + {/if} + {/if} +     		{if $display_tax_label}{l s='Total products (tax incl.)'}{else}{l s='Total products'}{/if}{displayPrice price=$total_products_wt}
    + {if $voucherAllowed} + {if isset($errors_discount) && $errors_discount} +
      + {foreach $errors_discount as $k=>$error} +
    • {$error|escape:'html':'UTF-8'}
      • {/foreach} -
    {/if} - - {/foreach} -     		- {if isset($cannotModify) AND $cannotModify == 1} - {if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if} - {else} - - -
    - {if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1} - - - - {else} - - - +
    +
    +

    {l s='Vouchers'}

    + + + +
    +
    + {if $displayVouchers} +

    {l s='Take advantage of our exclusive offers:'}

    +
    + {foreach $displayVouchers as $voucher} + {if $voucher.code != ''} + {$voucher.code} - + {/if} + {$voucher.name}
    + {/foreach} +
    {/if} - -
    {/if}     		- {if isset($cannotModify) AND $cannotModify == 1} + {l s='Total products'}{displayPrice price=$total_products}
    + {if $use_taxes} + {if $display_tax_label}{l s='Total gift wrapping (tax incl.):'}{else}{l s='Total gift-wrapping cost:'}{/if} {else} -
    - -
    + {l s='Total gift-wrapping cost:'} + {/if} +     		+ {if $use_taxes} + {if $priceDisplay} + {displayPrice price=$total_wrapping_tax_exc} + {else} + {displayPrice price=$total_wrapping} + {/if} + {else} + {displayPrice price=$total_wrapping_tax_exc} {/if}
    {l s='Shipping'}{l s='Free Shipping!'}
    + {if $display_tax_label} + {if $use_taxes && $priceDisplay == 0} + {l s='Total vouchers (tax incl.):'} + {else} + {l s='Total vouchers (tax excl.)'} + {/if} + {else} + {l s='Total vouchers'} + {/if} + + {if $use_taxes && $priceDisplay == 0} + {assign var='total_discounts_negative' value=$total_discounts * -1} + {else} + {assign var='total_discounts_negative' value=$total_discounts_tax_exc * -1} + {/if} + {displayPrice price=$total_discounts_negative} +
    {l s='Total (tax excl.)'}{displayPrice price=$total_price_without_tax}
    {l s='Total tax'}{displayPrice price=$total_tax}
    + {l s='Total'} + + {displayPrice price=$total_price} + + {displayPrice price=$total_price_without_tax} +
    + {foreach $customization.datas as $type => $custom_data} + {if $type == $CUSTOMIZE_FILE} +
    +
      + {foreach $custom_data as $picture} +
      • + {/foreach} +
    +
    + {elseif $type == $CUSTOMIZE_TEXTFIELD} +
      + {foreach $custom_data as $textField} +
    • + {if $textField.name} + {$textField.name} + {else} + {l s='Text #'}{$textField@index+1} + {/if} + {l s=':'} {$textField.value} +
      • + {/foreach} +
    + {/if} + {/foreach} +     		+ {if isset($cannotModify) AND $cannotModify == 1} + {if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if} + {else} + + +
    + {if $product.minimal_quantity < ($customization.quantity -$quantityDisplayed) OR $product.minimal_quantity <= 1} + + + + {else} + + + + {/if} + + + +
    + {/if} +     		+ {if isset($cannotModify) AND $cannotModify == 1} + {else} +
    + + + +
    + {/if} +
    {$discount.name} - {if !$priceDisplay}{displayPrice price=$discount.value_real*-1}{else}{displayPrice price=$discount.value_tax_exc*-1}{/if} - 1 - {if !$priceDisplay}{displayPrice price=$discount.value_real*-1}{else}{displayPrice price=$discount.value_tax_exc*-1}{/if} - - {if strlen($discount.code)}{/if} -
    -
    - -{if $show_option_allow_separate_package} -

    - allow_seperated_package}checked="checked"{/if} autocomplete="off"/> - -

    -{/if} -{if !$opc} - {if Configuration::get('PS_ALLOW_MULTISHIPPING')} -

    - - -

    - {/if} -{/if} - -{* Define the style if it doesn't exist in the PrestaShop version*} -{* Will be deleted for 1.5 version and more *} -{if !isset($addresses_style)} - {$addresses_style.company = 'address_company'} - {$addresses_style.vat_number = 'address_company'} - {$addresses_style.firstname = 'address_name'} - {$addresses_style.lastname = 'address_name'} - {$addresses_style.address1 = 'address_address1'} - {$addresses_style.address2 = 'address_address2'} - {$addresses_style.city = 'address_city'} - {$addresses_style.country = 'address_country'} - {$addresses_style.phone = 'address_phone'} - {$addresses_style.phone_mobile = 'address_phone_mobile'} - {$addresses_style.alias = 'address_title'} -{/if} - -{if ((!empty($delivery_option) AND !isset($virtualCart)) OR $delivery->id OR $invoice->id) AND !$opc} -
    - {if !isset($formattedAddresses) || (count($formattedAddresses.invoice) == 0 && count($formattedAddresses.delivery) == 0) || (count($formattedAddresses.invoice.formated) == 0 && count($formattedAddresses.delivery.formated) == 0)} - {if $delivery->id} -
    -
      -

    • {l s='Delivery address'} ({$delivery->alias})

      • - {if $delivery->company}
    • {$delivery->company|escape:'html':'UTF-8'}
      • {/if} -
    • {$delivery->firstname|escape:'html':'UTF-8'} {$delivery->lastname|escape:'html':'UTF-8'}
      • -
    • {$delivery->address1|escape:'html':'UTF-8'}
      • - {if $delivery->address2}
    • {$delivery->address2|escape:'html':'UTF-8'}
      • {/if} -
    • {$delivery->postcode|escape:'html':'UTF-8'} {$delivery->city|escape:'html':'UTF-8'}
      • -
    • {$delivery->country|escape:'html':'UTF-8'} {if $delivery_state}({$delivery_state|escape:'html':'UTF-8'}){/if}
      • -
    -
    - {/if} - {if $invoice->id} -
    -
      -

    • {l s='Invoice address'} ({$invoice->alias})

      • - {if $invoice->company}
    • {$invoice->company|escape:'html':'UTF-8'}
      • {/if} -
    • {$invoice->firstname|escape:'html':'UTF-8'} {$invoice->lastname|escape:'html':'UTF-8'}
      • -
    • {$invoice->address1|escape:'html':'UTF-8'}
      • - {if $invoice->address2}
    • {$invoice->address2|escape:'html':'UTF-8'}
      • {/if} -
    • {$invoice->postcode|escape:'html':'UTF-8'} {$invoice->city|escape:'html':'UTF-8'}
      • -
    • {$invoice->country|escape:'html':'UTF-8'} {if $invoice_state}({$invoice_state|escape:'html':'UTF-8'}){/if}
      • -
    -
    - {/if} - {else} - {foreach from=$formattedAddresses key=k item=address} -
    -
      -

    • {if $k eq 'invoice'}{l s='Invoice address'}{elseif $k eq 'delivery' && $delivery->id}{l s='Delivery address'}{/if}{if isset($address.object.alias)} ({$address.object.alias}){/if}

      • - {foreach $address.ordered as $pattern} - {assign var=addressKey value=" "|explode:$pattern} - {assign var=addedli value=false} - {foreach from=$addressKey item=key name=foo} - {if isset($address.formated[$key]) && !empty($address.formated[$key])} - {if (!$addedli)} - {$addedli = true} -
    • - {/if}{$address.formated[$key]|escape:'html':'UTF-8'}{/if}{if ($smarty.foreach.foo.last && $addedli)} -
      • {/if} + {assign var='last_was_odd' value=$product@iteration%2} + {foreach $gift_products as $product} + {assign var='productId' value=$product.id_product} + {assign var='productAttributeId' value=$product.id_product_attribute} + {assign var='quantityDisplayed' value=0} + {assign var='odd' value=($product@iteration+$last_was_odd)%2} + {assign var='ignoreProductLast' value=isset($customizedDatas.$productId.$productAttributeId)} + {assign var='cannotModify' value=1} + {* Display the gift product line *} + {include file="$tpl_dir./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first} + {/foreach} +
{$discount.name} + + {if !$priceDisplay}{displayPrice price=$discount.value_real*-1}{else}{displayPrice price=$discount.value_tax_exc*-1}{/if} + + 1 + {if !$priceDisplay}{displayPrice price=$discount.value_real*-1}{else}{displayPrice price=$discount.value_tax_exc*-1}{/if} + + {if strlen($discount.code)} + + + + {/if} +
+
+ + {if $show_option_allow_separate_package} +

+ allow_seperated_package}checked="checked"{/if} autocomplete="off"/> + +

{/if} -
-{/if} -
{$HOOK_SHOPPING_CART}
-

+ {if !$opc} - {l s='Proceed to checkout'} {if Configuration::get('PS_ALLOW_MULTISHIPPING')} - {l s='Proceed to checkout'} +

+ + +

{/if} {/if} - {l s='Continue shopping'} -

+ + {* Define the style if it doesn't exist in the PrestaShop version*} + {* Will be deleted for 1.5 version and more *} + {if !isset($addresses_style)} + {$addresses_style.company = 'address_company'} + {$addresses_style.vat_number = 'address_company'} + {$addresses_style.firstname = 'address_name'} + {$addresses_style.lastname = 'address_name'} + {$addresses_style.address1 = 'address_address1'} + {$addresses_style.address2 = 'address_address2'} + {$addresses_style.city = 'address_city'} + {$addresses_style.country = 'address_country'} + {$addresses_style.phone = 'address_phone'} + {$addresses_style.phone_mobile = 'address_phone_mobile'} + {$addresses_style.alias = 'address_title'} + {/if} + + {if ((!empty($delivery_option) AND !isset($virtualCart)) OR $delivery->id OR $invoice->id) AND !$opc} +
+ {if !isset($formattedAddresses) || (count($formattedAddresses.invoice) == 0 && count($formattedAddresses.delivery) == 0) || (count($formattedAddresses.invoice.formated) == 0 && count($formattedAddresses.delivery.formated) == 0)} + {if $delivery->id} +
+
    +

  • {l s='Delivery address'} ({$delivery->alias})

    • + {if $delivery->company}
  • {$delivery->company|escape:'html':'UTF-8'}
    • {/if} +
  • {$delivery->firstname|escape:'html':'UTF-8'} {$delivery->lastname|escape:'html':'UTF-8'}
    • +
  • {$delivery->address1|escape:'html':'UTF-8'}
    • + {if $delivery->address2}
  • {$delivery->address2|escape:'html':'UTF-8'}
    • {/if} +
  • {$delivery->postcode|escape:'html':'UTF-8'} {$delivery->city|escape:'html':'UTF-8'}
    • +
  • {$delivery->country|escape:'html':'UTF-8'} {if $delivery_state}({$delivery_state|escape:'html':'UTF-8'}){/if}
    • +
+
+ {/if} + {if $invoice->id} +
+
    +

  • {l s='Invoice address'} ({$invoice->alias})

    • + {if $invoice->company}
  • {$invoice->company|escape:'html':'UTF-8'}
    • {/if} +
  • {$invoice->firstname|escape:'html':'UTF-8'} {$invoice->lastname|escape:'html':'UTF-8'}
    • +
  • {$invoice->address1|escape:'html':'UTF-8'}
    • + {if $invoice->address2}
  • {$invoice->address2|escape:'html':'UTF-8'}
    • {/if} +
  • {$invoice->postcode|escape:'html':'UTF-8'} {$invoice->city|escape:'html':'UTF-8'}
    • +
  • {$invoice->country|escape:'html':'UTF-8'} {if $invoice_state}({$invoice_state|escape:'html':'UTF-8'}){/if}
    • +
+
+ {/if} + {else} + {foreach from=$formattedAddresses key=k item=address} +
+
    +
  • +

    + {if $k eq 'invoice'} + {l s='Invoice address'} + {elseif $k eq 'delivery' && $delivery->id} + {l s='Delivery address'} + {/if} + {if isset($address.object.alias)} + ({$address.object.alias}) + {/if} +

    +
    • + {foreach $address.ordered as $pattern} + {assign var=addressKey value=" "|explode:$pattern} + {assign var=addedli value=false} + {foreach from=$addressKey item=key name=foo} + {if isset($address.formated[$key]) && !empty($address.formated[$key])} + {if (!$addedli)} + {$addedli = true} +
  • + {/if} + {$address.formated[$key]|escape:'html':'UTF-8'} + {/if} + {if ($smarty.foreach.foo.last && $addedli)} +
    • + {/if} + {/foreach} + {/foreach} +
+
+ {/foreach} + {/if} +
+ {/if} +
{$HOOK_SHOPPING_CART}
+

+ {if !$opc} + + {l s='Proceed to checkout'} + + {if Configuration::get('PS_ALLOW_MULTISHIPPING')} + + {l s='Proceed to checkout'} + + {/if} + {/if} + + {l s='Continue shopping'} + +

{if !empty($HOOK_SHOPPING_CART_EXTRA)}
{$HOOK_SHOPPING_CART_EXTRA}
{/if} -{/if} - +{/if} \ No newline at end of file From 5e18a94d2adfad7655b58d7ddd155b82025bd7a1 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Thu, 5 Dec 2013 19:16:43 +0100 Subject: [PATCH 23/23] // employee avatar on the logs listing --- controllers/admin/AdminLogsController.php | 55 +++++++++++++++++++---- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/controllers/admin/AdminLogsController.php b/controllers/admin/AdminLogsController.php index cf24d20d3..67b23f346 100644 --- a/controllers/admin/AdminLogsController.php +++ b/controllers/admin/AdminLogsController.php @@ -35,14 +35,47 @@ class AdminLogsControllerCore extends AdminController $this->noLink = true; $this->fields_list = array( - 'id_log' => array('title' => $this->l('ID'), 'align' => 'center', 'class' => 'fixed-width-xs'), - 'employee' => array('title' => $this->l('Employee'), 'align' => 'center', 'havingFilter' => true), - 'severity' => array('title' => $this->l('Severity (1-4)'), 'align' => 'center', 'class' => 'fixed-width-xs'), - 'message' => array('title' => $this->l('Message')), - 'object_type' => array('title' => $this->l('Object type'), 'class' => 'fixed-width-sm'), - 'object_id' => array('title' => $this->l('Object ID'), 'align' => 'center', 'class' => 'fixed-width-xs'), - 'error_code' => array('title' => $this->l('Error code'), 'align' => 'center', 'prefix' => '0x', 'class' => 'fixed-width-xs'), - 'date_add' => array('title' => $this->l('Date'), 'width' => 150, 'align' => 'right', 'type' => 'datetime') + 'id_log' => array( + 'title' => $this->l('ID'), + 'align' => 'center', + 'class' => 'fixed-width-xs' + ), + 'employee' => array( + 'title' => $this->l('Employee'), + 'align' => 'left', + 'havingFilter' => true, + 'callback' => 'displayEmployee', + 'callback_object' => $this + ), + 'severity' => array( + 'title' => $this->l('Severity (1-4)'), + 'align' => 'center', + 'class' => 'fixed-width-xs' + ), + 'message' => array( + 'title' => $this->l('Message') + ), + 'object_type' => array( + 'title' => $this->l('Object type'), + 'class' => 'fixed-width-sm' + ), + 'object_id' => array( + 'title' => $this->l('Object ID'), + 'align' => 'center', + 'class' => 'fixed-width-xs' + ), + 'error_code' => array( + 'title' => $this->l('Error code'), + 'align' => 'center', + 'prefix' => '0x', + 'class' => 'fixed-width-xs' + ), + 'date_add' => array( + 'title' => $this->l('Date'), + 'width' => 150, + 'align' => 'right', + 'type' => 'datetime' + ) ); $this->fields_options = array( @@ -81,6 +114,12 @@ class AdminLogsControllerCore extends AdminController ); unset($this->toolbar_btn['new']); } + + public function displayEmployee($value, $tr) + { + $employee = new Employee((int)$tr['id_employee']); + return ImageManager::thumbnail($employee->getImage(), $this->table.'_mini_'.$value.'_'.$this->context->shop->id.'.'.$this->imageType, 45, $this->imageType).' '.$value; + } } ?>