From 0036768ae5bbdc39fcfbc339d8898d90fe5b5af1 Mon Sep 17 00:00:00 2001 From: bumbu Date: Mon, 7 Jan 2013 19:24:12 +0200 Subject: [PATCH 001/276] ObjectModel::updateMultishopTable() where argument is not mandatory --- classes/ObjectModel.php | 6 +++--- classes/Product.php | 2 +- classes/Search.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php index 105c7cdff..4032cc318 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -1284,7 +1284,7 @@ abstract class ObjectModelCore * @param string $specific_where Only executed for common table * @return bool */ - public static function updateMultishopTable($classname, $data, $where, $specific_where = '') + public static function updateMultishopTable($classname, $data, $where = '', $specific_where = '') { $def = ObjectModel::getDefinition($classname); $update_data = array(); @@ -1304,8 +1304,8 @@ abstract class ObjectModelCore $sql = 'UPDATE '._DB_PREFIX_.$def['table'].' a '.Shop::addSqlAssociation($def['table'], 'a', true, null, true).' - SET '.implode(', ', $update_data).' - WHERE '.$where; + SET '.implode(', ', $update_data). + (!empty($where) ? ' WHERE '.$where : ''); return Db::getInstance()->execute($sql); } diff --git a/classes/Product.php b/classes/Product.php index e22850083..ba07b5794 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -4609,7 +4609,7 @@ class ProductCore extends ObjectModel { return ObjectModel::updateMultishopTable('product', array( 'ecotax' => 0, - ), ''); + )); } /** diff --git a/classes/Search.php b/classes/Search.php index 20bbdce47..b549a1df5 100644 --- a/classes/Search.php +++ b/classes/Search.php @@ -413,7 +413,7 @@ class SearchCore { $db->execute('TRUNCATE '._DB_PREFIX_.'search_index'); $db->execute('TRUNCATE '._DB_PREFIX_.'search_word'); - ObjectModel::updateMultishopTable('Product', array('indexed' => 0), '1'); + ObjectModel::updateMultishopTable('Product', array('indexed' => 0)); } else { From d59ea3e6ddab8ca4868eb1ceea47ff01d4a32794 Mon Sep 17 00:00:00 2001 From: PrestaEdit Date: Thu, 17 Jan 2013 23:29:11 +0100 Subject: [PATCH 002/276] [*] BO: use lang for input file --- .../themes/default/template/helpers/form/form.tpl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl index 02538c893..77d417ac6 100644 --- a/admin-dev/themes/default/template/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/helpers/form/form.tpl @@ -244,7 +244,19 @@
{/if} {/if} - + + {if isset($input.lang) AND $input.lang} +
+ {foreach $languages as $language} +
+ + +
+ {/foreach} +
+ {else} + + {/if} {if !empty($input.hint)}{$input.hint} {/if} {elseif $input.type == 'password'} Date: Wed, 27 Feb 2013 16:53:32 +0100 Subject: [PATCH 003/276] Default adresse layout update As many countries use mobile phones in an extensive way, it should be useful to update the default address layout --- controllers/admin/AdminCountriesController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php index e71874924..9e711e6d9 100644 --- a/controllers/admin/AdminCountriesController.php +++ b/controllers/admin/AdminCountriesController.php @@ -145,7 +145,8 @@ class AdminCountriesControllerCore extends AdminController array('address2'), array('postcode', 'city'), array('Country:name'), - array('phone')); + array('phone'), + array('phone_mobile')); foreach ($default_layout_tab as $line) $default_layout .= implode(' ', $line)."\r\n"; From 47d3085a4af102a05a5e7c035180360ed9db973d Mon Sep 17 00:00:00 2001 From: PrestaEdit Date: Mon, 18 Mar 2013 01:03:43 +0100 Subject: [PATCH 004/276] [*]WS: POST and XML ressource --- webservice/dispatcher.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webservice/dispatcher.php b/webservice/dispatcher.php index 519121013..7ed118db4 100644 --- a/webservice/dispatcher.php +++ b/webservice/dispatcher.php @@ -66,8 +66,8 @@ else // if no XML $input_xml = NULL; - // if a XML is in PUT - if ($_SERVER['REQUEST_METHOD'] == 'PUT') + // if a XML is in PUT or in POST + if (($_SERVER['REQUEST_METHOD'] == 'PUT') || ($_SERVER['REQUEST_METHOD'] == 'POST')) { $putresource = fopen("php://input", "r"); while ($putData = fread($putresource, 1024)) @@ -113,4 +113,4 @@ if (isset($result['type'])) } } -ob_end_flush(); \ No newline at end of file +ob_end_flush(); From 312e16a9266b63c497ff8321133fe57e3b979d93 Mon Sep 17 00:00:00 2001 From: Vincent Schoener Date: Thu, 28 Mar 2013 12:45:03 +0100 Subject: [PATCH 005/276] [-] CORE : Fix issue with delivery option Happens after a payment redirection error, delivery_option is not sent (but should be set in the cart context) --- controllers/front/OrderController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php index 190bdd1de..cc406e733 100644 --- a/controllers/front/OrderController.php +++ b/controllers/front/OrderController.php @@ -155,14 +155,18 @@ class OrderControllerCore extends ParentOrderController Tools::redirect('index.php?controller=order&step=2'); Context::getContext()->cookie->check_cgv = true; - // Check the delivery option is setted + // Check the delivery option is set if (!$this->context->cart->isVirtualCart()) { if (!Tools::getValue('delivery_option') && !Tools::getValue('id_carrier') && !$this->context->cart->delivery_option && !$this->context->cart->id_carrier) Tools::redirect('index.php?controller=order&step=2'); elseif (!Tools::getValue('id_carrier') && !$this->context->cart->id_carrier) { - foreach (Tools::getValue('delivery_option') as $delivery_option) + $deliveries_options = Tools::getValue('delivery_option'); + if (!$deliveries_options) { + $deliveries_options = $this->context->cart->delivery_option; + } + foreach ($deliveries_options as $delivery_option) if (empty($delivery_option)) Tools::redirect('index.php?controller=order&step=2'); } From 5b058e672369874d5fc7a89209d5a2da911c0898 Mon Sep 17 00:00:00 2001 From: Arnaud Lemercier Date: Fri, 29 Mar 2013 10:26:44 +0100 Subject: [PATCH 006/276] Allow webservice to set the tags list of product when creating or updating a product --- classes/Product.php | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/classes/Product.php b/classes/Product.php index bbe6fd920..b1669b31a 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -4663,6 +4663,34 @@ class ProductCore extends ObjectModel FROM `'._DB_PREFIX_.'product_tag` WHERE `id_product` = '.(int)$this->id); } + + /** + * Webservice setter : set tag ids of current product for association + * + * @param $tag_ids tag ids + */ + public function setWsTags($tag_ids) + { + $ids = array(); + foreach ($tag_ids as $value) + $ids[] = $value['id']; + if ($this->deleteTags()) + { + if ($ids) + { + $sql_values = ''; + $ids = array_map('intval', $ids); + foreach ($ids as $position => $id) + $sql_values[] = '('.(int)$this->id.', '.(int)$id.')'; + $result = Db::getInstance()->execute(' + INSERT INTO `'._DB_PREFIX_.'product_tag` (`id_product`, `id_tag`) + VALUES '.implode(',', $sql_values) + ); + return $result; + } + } + return true; + } public function getWsManufacturerName() From 07979774f69630a42e5058f11044097755cc6fd4 Mon Sep 17 00:00:00 2001 From: Arnaud Lemercier Date: Tue, 2 Apr 2013 18:44:12 +0200 Subject: [PATCH 007/276] Delete products tags entries without delete tags for webservice usage --- classes/Product.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/classes/Product.php b/classes/Product.php index b1669b31a..c027d691d 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -4674,7 +4674,7 @@ class ProductCore extends ObjectModel $ids = array(); foreach ($tag_ids as $value) $ids[] = $value['id']; - if ($this->deleteTags()) + if ($this->deleteWsTags()) { if ($ids) { @@ -4690,7 +4690,17 @@ class ProductCore extends ObjectModel } } return true; - } + } + + /** + * Delete products tags entries without delete tags for webservice usage + * + * @return array Deletion result + */ + public function deleteWsTags() + { + return Db::getInstance()->delete('product_tag', 'id_product = '.(int)$this->id); + } public function getWsManufacturerName() From 624fed3710d4c1bd5bf38c6b66c4676982fbfbd8 Mon Sep 17 00:00:00 2001 From: ldecoker Date: Tue, 16 Apr 2013 19:15:45 +0300 Subject: [PATCH 008/276] Update form.tpl --- .../template/controllers/attributes/helpers/form/form.tpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl index 365736bbd..fbe5a1ced 100644 --- a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl @@ -29,6 +29,9 @@ {if $input.type == 'color'}
{/if} + {if $input.type == 'closediv'} +
+ {/if} {$smarty.block.parent} {/block} From 34644ee6ebc6fd8400a0be47a379a5d8afe8c584 Mon Sep 17 00:00:00 2001 From: ldecoker Date: Tue, 16 Apr 2013 19:17:51 +0300 Subject: [PATCH 009/276] Update AdminAttributesGroupsController.php --- controllers/admin/AdminAttributesGroupsController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php index 26c53cc83..e4e66d4aa 100644 --- a/controllers/admin/AdminAttributesGroupsController.php +++ b/controllers/admin/AdminAttributesGroupsController.php @@ -328,6 +328,10 @@ class AdminAttributesGroupsControllerCore extends AdminController 'label' => $this->l('Current texture:'), 'name' => 'current_texture' ); + + $this->fields_form['input'][] = array( + 'type' => 'closediv' + ); $this->fields_form['submit'] = array( 'title' => $this->l('Save '), From a994c93dee987d294016e8592c2bd161e06cfcd3 Mon Sep 17 00:00:00 2001 From: Otto Nascarella Date: Thu, 25 Apr 2013 12:18:50 -0300 Subject: [PATCH 010/276] Progressive JPEG https://plus.google.com/+PaulIrish/posts/5KzxfS9nNEZ --- classes/ImageManager.php | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/ImageManager.php b/classes/ImageManager.php index c7500c8fd..c647b6ea3 100644 --- a/classes/ImageManager.php +++ b/classes/ImageManager.php @@ -407,6 +407,7 @@ class ImageManagerCore case 'jpeg': default: $quality = (Configuration::get('PS_JPEG_QUALITY') === false ? 90 : Configuration::get('PS_JPEG_QUALITY')); + imageinterlace($resource,1); /// make it PROGRESSIVE $success = imagejpeg($resource, $filename, (int)$quality); break; } From 8331ab0c1aa61c8e0c1f1eaf2aea3b4e5b3f21ef Mon Sep 17 00:00:00 2001 From: ccauw Date: Sun, 28 Apr 2013 16:01:55 +0300 Subject: [PATCH 011/276] [-]BO : bug color parameter in List [-]BO : bug color parameter in List In field list, if there is another field with 'color' => 'color_field', (and color_field column in the select), the background color is always the value of field list column 'color', never 'color_field' the lines: {block name="td_content"} ... {if isset($params.color) && isset($tr[$params.color])} + {/if} {if isset($tr.$key)} {if isset($params.active)} From 10e3fec8a260eb1eb34ec9696ef9e961fbc98098 Mon Sep 17 00:00:00 2001 From: Maxence Date: Sun, 2 Jun 2013 21:04:48 +0300 Subject: [PATCH 012/276] Add page limit to Collection I do not see any way to limit the number of object in a Collection. Collection::setPageSize() and Collection::setPageNumber() add a limit clause to the query. --- classes/Collection.php | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/classes/Collection.php b/classes/Collection.php index 7f8094059..d27b2c395 100644 --- a/classes/Collection.php +++ b/classes/Collection.php @@ -74,6 +74,16 @@ class CollectionCore implements Iterator, ArrayAccess, Countable * @var int Total of elements for iteration */ protected $total; + + /** + * @var int Page number + */ + protected $page_number = 0; + + /** + * @var int Size of a page + */ + protected $page_size = 10; protected $fields = array(); protected $alias = array(); @@ -334,6 +344,11 @@ class CollectionCore implements Iterator, ArrayAccess, Countable break; } } + + // All limit clause + if ($this->page_size) + $this->query->limit($this->page_size, $this->page_number * $this->page_size); + // Shall we display query for debug ? if ($display_query) @@ -659,6 +674,35 @@ class CollectionCore implements Iterator, ArrayAccess, Countable } return $this->fields[$field]; } + + /** + * Set the page number + * + * @param int $page_number + * @return Collection + */ + public function setPageNumber($page_number) + { + $page_number = (int)$page_number; + if ($page_number > 0) { + $page_number--; + } + + $this->page_number = $page_number; + return $this; + } + + /** + * Set the nuber of item per page + * + * @param int $page_size + * @return Collection + */ + public function setPageSize($page_size) + { + $this->page_size = (int)$page_size; + return $this; + } /** * Generate uniq alias from association name From 879aa9f98adeecb5e6932933696296c14f288692 Mon Sep 17 00:00:00 2001 From: Maxence Date: Sun, 2 Jun 2013 20:18:59 +0200 Subject: [PATCH 013/276] Use PrestaShop norme --- classes/Collection.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/classes/Collection.php b/classes/Collection.php index d27b2c395..f40fabf77 100644 --- a/classes/Collection.php +++ b/classes/Collection.php @@ -684,9 +684,8 @@ class CollectionCore implements Iterator, ArrayAccess, Countable public function setPageNumber($page_number) { $page_number = (int)$page_number; - if ($page_number > 0) { + if ($page_number > 0) $page_number--; - } $this->page_number = $page_number; return $this; From 371edf9edb25689f6325f93f332abf41dba9b697 Mon Sep 17 00:00:00 2001 From: Maxence Date: Mon, 3 Jun 2013 13:28:51 +0200 Subject: [PATCH 014/276] Keep retro-compatibility --- classes/Collection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Collection.php b/classes/Collection.php index f40fabf77..64d47ec60 100644 --- a/classes/Collection.php +++ b/classes/Collection.php @@ -83,7 +83,7 @@ class CollectionCore implements Iterator, ArrayAccess, Countable /** * @var int Size of a page */ - protected $page_size = 10; + protected $page_size = 0; protected $fields = array(); protected $alias = array(); From 77864b88aed829674f034c065a5ca825a361568d Mon Sep 17 00:00:00 2001 From: PhpMadman Date: Fri, 7 Jun 2013 10:41:02 +0200 Subject: [PATCH 015/276] [-] FO : In stock sort is now removed when Stock managment is disabled on default theme. Not to be confused for my pull #465, which was for default mobile theme. This is for the default regular theme. --- themes/default/product-sort.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/default/product-sort.tpl b/themes/default/product-sort.tpl index 874cd0267..7fd0d5e39 100644 --- a/themes/default/product-sort.tpl +++ b/themes/default/product-sort.tpl @@ -64,7 +64,7 @@ $(document).ready(function() {/if} - {if !$PS_CATALOG_MODE} + {if $PS_STOCK_MANAGEMENT && !$PS_CATALOG_MODE} {/if} From 663ec76bb99f898eeea6eb85edf2e0b004b763e3 Mon Sep 17 00:00:00 2001 From: "cam.lafit" Date: Mon, 10 Jun 2013 10:43:01 +0200 Subject: [PATCH 016/276] Better regexp to get country browser from HTTP_ACCEPT_LANGUAGE With HTTP_ACCEPT_LANGUAGE we have two choices : * Country == language (displayed with two letter as fr,de,en,...) * Country with multi language (displayes as fr-CH, de-CH, it-CH) Previous regexp find only first case. --- controllers/front/AddressController.php | 4 +++- controllers/front/AuthController.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php index 699a37287..eb17888ce 100644 --- a/controllers/front/AddressController.php +++ b/controllers/front/AddressController.php @@ -303,7 +303,9 @@ class AddressControllerCore extends FrontController $selected_country = (int)$this->_address->id_country; else if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { - $array = preg_split('/,|-/', $_SERVER['HTTP_ACCEPT_LANGUAGE']); + // get all countries as language (xy) or language-country (wz-XY) + $array = array(); + preg_match("#(?<=-)\w\w|\w\w(?!-)#",$_SERVER['HTTP_ACCEPT_LANGUAGE'],$array); if (!Validate::isLanguageIsoCode($array[0]) || !($selected_country = Country::getByIso($array[0]))) $selected_country = (int)Configuration::get('PS_COUNTRY_DEFAULT'); } diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php index 745cca405..f348b2c50 100644 --- a/controllers/front/AuthController.php +++ b/controllers/front/AuthController.php @@ -107,7 +107,9 @@ class AuthControllerCore extends FrontController if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { - $array = preg_split('/,|-/', $_SERVER['HTTP_ACCEPT_LANGUAGE']); + // get all countries as language (xy) or language-country (wz-XY) + $array = array(); + preg_match("#(?<=-)\w\w|\w\w(?!-)#",$_SERVER['HTTP_ACCEPT_LANGUAGE'],$array); if (!Validate::isLanguageIsoCode($array[0]) || !($sl_country = Country::getByIso($array[0]))) $sl_country = (int)Configuration::get('PS_COUNTRY_DEFAULT'); } From c94dbb36ce863c6a7a331ee165384f66fd4806df Mon Sep 17 00:00:00 2001 From: romainberger Date: Fri, 14 Jun 2013 11:04:20 +0200 Subject: [PATCH 017/276] [*] MO: Referral program: display currency in account page next to the voucher value --- .../controllers/front/program.php | 27 ++++++++++--------- .../views/templates/front/program.tpl | 6 ++--- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/modules/referralprogram/controllers/front/program.php b/modules/referralprogram/controllers/front/program.php index 4f72049a7..2b4d04dcd 100755 --- a/modules/referralprogram/controllers/front/program.php +++ b/modules/referralprogram/controllers/front/program.php @@ -29,31 +29,31 @@ */ include_once(dirname(__FILE__).'../../../ReferralProgramModule.php'); include_once(dirname(__FILE__).'../../../referralprogram.php'); - + class ReferralprogramProgramModuleFrontController extends ModuleFrontController { - + public function init() { if (!$this->context->customer->isLogged()) Tools::redirect('index.php?controller=authentication&back=modules/referralprogram/referralprogram-program.php'); parent::init(); } - + public function setMedia() { parent::setMedia(); $this->addJqueryPlugin(array('thickbox', 'idTabs')); } - + /** * @see FrontController::initContent() */ public function initContent() { parent::initContent(); - + // get discount value (ready to display) $discount_type = (int)(Configuration::get('REFERRAL_DISCOUNT_TYPE')); if ($discount_type == 1) @@ -63,7 +63,7 @@ class ReferralprogramProgramModuleFrontController extends ModuleFrontController $activeTab = 'sponsor'; $error = false; - + // Mailing invitation to friend sponsor $invitation_sent = false; $nbInvitation = 0; @@ -82,7 +82,7 @@ class ReferralprogramProgramModuleFrontController extends ModuleFrontController $friendEmail = strval($friendEmail); $friendLastName = strval($friendsLastName[$key]); $friendFirstName = strval($friendsFirstName[$key]); - + if (empty($friendEmail) AND empty($friendLastName) AND empty($friendFirstName)) continue; elseif (empty($friendEmail) OR !Validate::isEmail($friendEmail)) @@ -136,7 +136,7 @@ class ReferralprogramProgramModuleFrontController extends ModuleFrontController $error = 'email exists'; } } - + // Mailing revive $revive_sent = false; $nbRevive = 0; @@ -174,16 +174,16 @@ class ReferralprogramProgramModuleFrontController extends ModuleFrontController else $error = 'no revive checked'; } - + $customer = new Customer((int)($this->context->customer->id)); $stats = $customer->getStats(); - + $orderQuantity = (int)(Configuration::get('REFERRAL_ORDER_QUANTITY')); $canSendInvitations = false; if ((int)($stats['nb_orders']) >= $orderQuantity) $canSendInvitations = true; - + // Smarty display $this->context->smarty->assign(array( 'activeTab' => $activeTab, @@ -198,8 +198,9 @@ class ReferralprogramProgramModuleFrontController extends ModuleFrontController 'revive_sent' => $revive_sent, 'nbRevive' => $nbRevive, 'subscribeFriends' => ReferralProgramModule::getSponsorFriend((int)($this->context->customer->id), 'subscribed'), - 'mails_exists' => (isset($mails_exists) ? $mails_exists : array()) + 'mails_exists' => (isset($mails_exists) ? $mails_exists : array()), + 'currencySign' => $this->context->currency->sign )); $this->setTemplate('program.tpl'); } -} \ No newline at end of file +} diff --git a/modules/referralprogram/views/templates/front/program.tpl b/modules/referralprogram/views/templates/front/program.tpl index b2ca271e7..425deb9c1 100644 --- a/modules/referralprogram/views/templates/front/program.tpl +++ b/modules/referralprogram/views/templates/front/program.tpl @@ -83,7 +83,7 @@

- {l s='Get a discount of %d for you and your friends by recommending this Website.' sprintf=$discount mod='referralprogram'} + {l s='Get a discount of %1$d %2$s for you and your friends by recommending this Website.' sprintf=[$discount,$currencySign] mod='referralprogram'}

{if $canSendInvitations}

@@ -93,7 +93,7 @@ {else} {l s='When one of them makes at least %d order' sprintf=$orderQuantity mod='referralprogram'} {/if}, - {l s='he or she will receive a %1$d voucher and you will receive your own voucher worth %2$d.' sprintf=[$discount,$discount] mod='referralprogram'} + {l s='he or she will receive a %1$d %2$s voucher and you will receive your own voucher worth %3$d %4$s.' sprintf=[$discount,$currencySign,$discount,$currencySign] mod='referralprogram'}

@@ -125,7 +125,7 @@ {l s='Read conditions.' mod='referralprogram'}

- {l s='Preview' mod='referralprogram'} + {l s='Preview' mod='referralprogram'} {assign var="file" value="{$lang_iso}/referralprogram-invitation.html"} {l s='the default e-mail' mod='referralprogram'} {l s='that will be sent to your friend(s).' mod='referralprogram'}

From 783b02b34fb465c0de5ac27e6ddc7ad8e53b5052 Mon Sep 17 00:00:00 2001 From: jeckyl Date: Tue, 18 Jun 2013 14:56:55 +0200 Subject: [PATCH 018/276] Update admin.css force size for module logo to keep a good design structure --- css/admin.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/css/admin.css b/css/admin.css index f5201ec60..ee879bc8d 100644 --- a/css/admin.css +++ b/css/admin.css @@ -332,6 +332,8 @@ select optgroup option { .lab_modules_positions img { float:left; + width:32px; + height:32px; } From a617bec39bc8e30166a7bafa00fdd94ef9091806 Mon Sep 17 00:00:00 2001 From: ldecoker Date: Fri, 28 Jun 2013 16:46:12 +0200 Subject: [PATCH 019/276] Update shopping-cart.tpl To access template "shopping-cart-product-line.tpl", it should use the $tpl_dir variable. --- themes/default/shopping-cart.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/default/shopping-cart.tpl b/themes/default/shopping-cart.tpl index 8b486c2de..c1c2f6675 100644 --- a/themes/default/shopping-cart.tpl +++ b/themes/default/shopping-cart.tpl @@ -226,7 +226,7 @@ {assign var='odd' value=$product@iteration%2} {assign var='ignoreProductLast' value=isset($customizedDatas.$productId.$productAttributeId) || count($gift_products)} {* Display the product line *} - {include file="./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first} + {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} @@ -292,7 +292,7 @@ {assign var='quantityDisplayed' value=$quantityDisplayed+$customization.quantity} {/foreach} {* If it exists also some uncustomized products *} - {if $product.quantity-$quantityDisplayed > 0}{include file="./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first}{/if} + {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} @@ -304,7 +304,7 @@ {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} + {include file="$tpl_dir./shopping-cart-product-line.tpl" productLast=$product@last productFirst=$product@first} {/foreach} {if sizeof($discounts)} From 7c2323f1cc1d51a2f22a4d6a1156f942bfa82367 Mon Sep 17 00:00:00 2001 From: Gregory Roussac Date: Mon, 1 Jul 2013 10:56:31 +0200 Subject: [PATCH 020/276] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index beb165d67..3aad8f041 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,8 @@ .DS_Store robots.txt sitemap.xml +cache/cachefs/* +!cache/cachefs/index.php cache/smarty/cache/* !cache/smarty/cache/index.php cache/smarty/compile/* From 0d7af596572bf0c595a8ecb71a69056f5f422f0a Mon Sep 17 00:00:00 2001 From: Gregory Roussac Date: Mon, 1 Jul 2013 10:58:54 +0200 Subject: [PATCH 021/276] Update .gitignore --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3aad8f041..beb165d67 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,6 @@ .DS_Store robots.txt sitemap.xml -cache/cachefs/* -!cache/cachefs/index.php cache/smarty/cache/* !cache/smarty/cache/index.php cache/smarty/compile/* From 1208e45958b8b80617dc6f06045b24561845dde4 Mon Sep 17 00:00:00 2001 From: indesign47 Date: Wed, 3 Jul 2013 14:09:44 +0200 Subject: [PATCH 022/276] [-] BO : products comments impossible if quantity > 0 The pull request https://github.com/PrestaShop/PrestaShop/pull/219 makes the module not working properly in v1.5.4.1. Indeed, after this change, the OosHook works as expected but now, as the product comments module is attached to the OosHook, comments information is only shown when the product is out of stock! --- modules/productcomments/productcomments-extra.tpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/productcomments/productcomments-extra.tpl b/modules/productcomments/productcomments-extra.tpl index 930a806b6..d9547f8bf 100644 --- a/modules/productcomments/productcomments-extra.tpl +++ b/modules/productcomments/productcomments-extra.tpl @@ -35,6 +35,8 @@ $(function(){ }); +{if $logged == 1 || $nbComments != 0} +
{if $nbComments != 0}
@@ -60,4 +62,6 @@ $(function(){ {/if}
+
+{/if} From 32a83e20c4e05b0a0498eb862d0fd82606d2b4a9 Mon Sep 17 00:00:00 2001 From: Agence CINS Date: Tue, 9 Jul 2013 17:09:19 +0200 Subject: [PATCH 023/276] [+] BO: Fix Bug Progress Bar Upload Image Product MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Lorsque l'on ajoute des images a des produits, la barre de progression s'affiche en dehors de son cadre. "position:relative" n'est pas prĂ©sent pour "div.progressBarImage" dans le fichier admin.css . ---- When we add pictures to products, the progress bar is out of his wrapper. "position:relative" is missing for "div.progressBarImage" in admin.css file. --- css/admin.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/admin.css b/css/admin.css index f5201ec60..d3fdd3bc3 100644 --- a/css/admin.css +++ b/css/admin.css @@ -1872,6 +1872,7 @@ div.progressBarImage height: 15px; margin-left: 3px; width: 233px; + position:relative; } #showCounter { From 291cec36abfda5141f92653619ed8eec4234bf7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Mo=C4=87ko?= Date: Thu, 11 Jul 2013 18:49:44 +0200 Subject: [PATCH 024/276] Do not limit features value on a list Controller use default method getList with pagination of 50 items. Argument $limit should be set to FALSE to disable limit, because if you have more than 50 values of one feature, then you can not access them in back office. --- controllers/admin/AdminFeaturesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php index 8045e2c56..f63ceb83a 100644 --- a/controllers/admin/AdminFeaturesController.php +++ b/controllers/admin/AdminFeaturesController.php @@ -455,7 +455,7 @@ class AdminFeaturesControllerCore extends AdminController * AdminController::getList() override * @see AdminController::getList() */ - public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false) + public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = false, $id_lang_shop = false) { if ($this->table == 'feature_value') $this->_where .= ' AND a.custom = 0'; From 876c49b6906afc611002a42516ed58e65c022751 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 12 Jul 2013 18:24:18 +0800 Subject: [PATCH 025/276] PNM-1241 Issue with backbutton This will solve the issue with url indexing not working for all languages. --- modules/blocklayered/blocklayered.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php index 47ed3bb19..ffdade6d6 100644 --- a/modules/blocklayered/blocklayered.php +++ b/modules/blocklayered/blocklayered.php @@ -445,7 +445,10 @@ class BlockLayered extends Module static $_MODULES = array(); global $_MODULE; - $file = _PS_MODULE_DIR_.$this->name.'/'.Language::getIsoById($id_lang).'.php'; + if (version_compare(_PS_VERSION_,'1.5','>')) + $file = _PS_MODULE_DIR_.$this->name.'/translations/'.Language::getIsoById($id_lang).'.php'; + else + $file = _PS_MODULE_DIR_.$this->name.'/'.Language::getIsoById($id_lang).'.php'; if (!array_key_exists($id_lang, $_MODULES)) { From 2f6a53f9713d1fd4725a85330740ec161b0deecf Mon Sep 17 00:00:00 2001 From: djfm Date: Fri, 19 Jul 2013 15:34:10 +0000 Subject: [PATCH 026/276] [+] TR: Created file structure for Dutch installer --- .../apple/langs/nl/data/attribute.xml | 63 ++ .../apple/langs/nl/data/attribute_group.xml | 15 + .../apple/langs/nl/data/attributegroup.xml | 21 + .../fixtures/apple/langs/nl/data/carrier.xml | 6 + .../fixtures/apple/langs/nl/data/category.xml | 27 + .../fixtures/apple/langs/nl/data/feature.xml | 18 + .../apple/langs/nl/data/feature_value.xml | 45 ++ .../apple/langs/nl/data/featurevalue.xml | 45 ++ .../fixtures/apple/langs/nl/data/image.xml | 81 ++ .../fixtures/apple/langs/nl/data/index.php | 35 + .../apple/langs/nl/data/manufacturer.xml | 17 + .../apple/langs/nl/data/order_message.xml | 12 + .../apple/langs/nl/data/ordermessage.xml | 7 + .../fixtures/apple/langs/nl/data/product.xml | 135 ++++ .../fixtures/apple/langs/nl/data/profile.xml | 15 + .../fixtures/apple/langs/nl/data/scene.xml | 12 + .../fixtures/apple/langs/nl/data/supplier.xml | 15 + .../fixtures/apple/langs/nl/data/tag.xml | 9 + install-dev/fixtures/apple/langs/nl/index.php | 35 + install-dev/langs/nl/data/carrier.xml | 6 + install-dev/langs/nl/data/category.xml | 19 + install-dev/langs/nl/data/cms.xml | 45 ++ install-dev/langs/nl/data/cms_category.xml | 11 + install-dev/langs/nl/data/configuration.xml | 21 + install-dev/langs/nl/data/contact.xml | 9 + install-dev/langs/nl/data/country.xml | 735 ++++++++++++++++++ install-dev/langs/nl/data/gender.xml | 6 + install-dev/langs/nl/data/group.xml | 6 + install-dev/langs/nl/data/index.php | 35 + install-dev/langs/nl/data/meta.xml | 159 ++++ .../langs/nl/data/order_return_state.xml | 18 + install-dev/langs/nl/data/order_state.xml | 51 ++ install-dev/langs/nl/data/profile.xml | 6 + install-dev/langs/nl/data/quick_access.xml | 8 + install-dev/langs/nl/data/risk.xml | 7 + .../langs/nl/data/stock_mvt_reason.xml | 27 + .../langs/nl/data/supplier_order_state.xml | 21 + .../langs/nl/data/supply_order_state.xml | 21 + install-dev/langs/nl/data/tab.xml | 105 +++ install-dev/langs/nl/flag.jpg | Bin 0 -> 348 bytes install-dev/langs/nl/img/index.php | 35 + .../langs/nl/img/nl-default-category.jpg | Bin 0 -> 3928 bytes install-dev/langs/nl/img/nl-default-home.jpg | Bin 0 -> 3026 bytes install-dev/langs/nl/img/nl-default-large.jpg | Bin 0 -> 5919 bytes .../langs/nl/img/nl-default-large_scene.jpg | Bin 0 -> 4298 bytes .../langs/nl/img/nl-default-medium.jpg | Bin 0 -> 1845 bytes install-dev/langs/nl/img/nl-default-small.jpg | Bin 0 -> 968 bytes .../langs/nl/img/nl-default-thickbox.jpg | Bin 0 -> 8219 bytes .../langs/nl/img/nl-default-thumb_scene.jpg | Bin 0 -> 1119 bytes install-dev/langs/nl/img/nl.jpg | Bin 0 -> 10859 bytes install-dev/langs/nl/index.php | 35 + install-dev/langs/nl/install.php | 19 + install-dev/langs/nl/language.xml | 8 + install-dev/langs/nl/mail_identifiers.txt | 10 + 54 files changed, 2036 insertions(+) create mode 100644 install-dev/fixtures/apple/langs/nl/data/attribute.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/attribute_group.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/attributegroup.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/carrier.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/category.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/feature.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/feature_value.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/featurevalue.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/image.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/index.php create mode 100644 install-dev/fixtures/apple/langs/nl/data/manufacturer.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/order_message.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/ordermessage.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/product.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/profile.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/scene.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/supplier.xml create mode 100644 install-dev/fixtures/apple/langs/nl/data/tag.xml create mode 100644 install-dev/fixtures/apple/langs/nl/index.php create mode 100644 install-dev/langs/nl/data/carrier.xml create mode 100644 install-dev/langs/nl/data/category.xml create mode 100644 install-dev/langs/nl/data/cms.xml create mode 100644 install-dev/langs/nl/data/cms_category.xml create mode 100644 install-dev/langs/nl/data/configuration.xml create mode 100644 install-dev/langs/nl/data/contact.xml create mode 100644 install-dev/langs/nl/data/country.xml create mode 100644 install-dev/langs/nl/data/gender.xml create mode 100644 install-dev/langs/nl/data/group.xml create mode 100644 install-dev/langs/nl/data/index.php create mode 100644 install-dev/langs/nl/data/meta.xml create mode 100644 install-dev/langs/nl/data/order_return_state.xml create mode 100644 install-dev/langs/nl/data/order_state.xml create mode 100644 install-dev/langs/nl/data/profile.xml create mode 100644 install-dev/langs/nl/data/quick_access.xml create mode 100644 install-dev/langs/nl/data/risk.xml create mode 100644 install-dev/langs/nl/data/stock_mvt_reason.xml create mode 100644 install-dev/langs/nl/data/supplier_order_state.xml create mode 100644 install-dev/langs/nl/data/supply_order_state.xml create mode 100644 install-dev/langs/nl/data/tab.xml create mode 100644 install-dev/langs/nl/flag.jpg create mode 100644 install-dev/langs/nl/img/index.php create mode 100644 install-dev/langs/nl/img/nl-default-category.jpg create mode 100644 install-dev/langs/nl/img/nl-default-home.jpg create mode 100644 install-dev/langs/nl/img/nl-default-large.jpg create mode 100644 install-dev/langs/nl/img/nl-default-large_scene.jpg create mode 100644 install-dev/langs/nl/img/nl-default-medium.jpg create mode 100644 install-dev/langs/nl/img/nl-default-small.jpg create mode 100644 install-dev/langs/nl/img/nl-default-thickbox.jpg create mode 100644 install-dev/langs/nl/img/nl-default-thumb_scene.jpg create mode 100644 install-dev/langs/nl/img/nl.jpg create mode 100644 install-dev/langs/nl/index.php create mode 100644 install-dev/langs/nl/install.php create mode 100644 install-dev/langs/nl/language.xml create mode 100644 install-dev/langs/nl/mail_identifiers.txt diff --git a/install-dev/fixtures/apple/langs/nl/data/attribute.xml b/install-dev/fixtures/apple/langs/nl/data/attribute.xml new file mode 100644 index 000000000..f27df851c --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/attribute.xml @@ -0,0 +1,63 @@ + + + + 2GB + + + 4GB + + + Metal + + + Blue + + + Pink + + + Green + + + Orange + + + Optional 64GB solid-state drive + + + 80GB Parallel ATA Drive @ 4200 rpm + + + 1.60GHz Intel Core 2 Duo + + + 1.80GHz Intel Core 2 Duo + + + 80GB: 20,000 Songs + + + 160GB: 40,000 Songs + + + Black + + + 8GB + + + 16GB + + + 32GB + + + Purple + + + Yellow + + + Red + + diff --git a/install-dev/fixtures/apple/langs/nl/data/attribute_group.xml b/install-dev/fixtures/apple/langs/nl/data/attribute_group.xml new file mode 100644 index 000000000..221a81bc7 --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/attribute_group.xml @@ -0,0 +1,15 @@ + + + + Disk space + Disk space + + + Color + Color + + + ICU + Processor + + diff --git a/install-dev/fixtures/apple/langs/nl/data/attributegroup.xml b/install-dev/fixtures/apple/langs/nl/data/attributegroup.xml new file mode 100644 index 000000000..977fceeb7 --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/attributegroup.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/install-dev/fixtures/apple/langs/nl/data/carrier.xml b/install-dev/fixtures/apple/langs/nl/data/carrier.xml new file mode 100644 index 000000000..c59766e73 --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/carrier.xml @@ -0,0 +1,6 @@ + + + + Delivery next day! + + diff --git a/install-dev/fixtures/apple/langs/nl/data/category.xml b/install-dev/fixtures/apple/langs/nl/data/category.xml new file mode 100644 index 000000000..eeae63831 --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/category.xml @@ -0,0 +1,27 @@ + + + + iPods + Now that you can buy movies from the iTunes Store and sync them to your iPod, the whole world is your theater. + music-ipods + + + + + + Accessories + Wonderful accessories for your iPod + accessories-ipod + + + + + + Laptops + The latest Intel processor, a bigger hard drive, plenty of memory, and even more new features all fit inside just one liberating inch. The new Mac laptops have the performance, power, and connectivity of a desktop computer. Without the desk part. + laptops + Apple laptops + Apple laptops MacBook Air + Powerful and chic Apple laptops + + diff --git a/install-dev/fixtures/apple/langs/nl/data/feature.xml b/install-dev/fixtures/apple/langs/nl/data/feature.xml new file mode 100644 index 000000000..7682c6495 --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/feature.xml @@ -0,0 +1,18 @@ + + + + Height + + + Width + + + Depth + + + Weight + + + Headphone + + diff --git a/install-dev/fixtures/apple/langs/nl/data/feature_value.xml b/install-dev/fixtures/apple/langs/nl/data/feature_value.xml new file mode 100644 index 000000000..d3a824d22 --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/feature_value.xml @@ -0,0 +1,45 @@ + + + + Jack stereo + + + Mini-jack stereo + + + 2.75 in + + + 2.06 in + + + 49.2 g + + + 0.26 in + + + 1.07 in + + + 1.62 in + + + 15.5 g + + + 0.41 in (clip included) + + + 4.33 in + + + 2.76 in + + + 120g + + + 0.31 in + + diff --git a/install-dev/fixtures/apple/langs/nl/data/featurevalue.xml b/install-dev/fixtures/apple/langs/nl/data/featurevalue.xml new file mode 100644 index 000000000..d101bed96 --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/featurevalue.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install-dev/fixtures/apple/langs/nl/data/image.xml b/install-dev/fixtures/apple/langs/nl/data/image.xml new file mode 100644 index 000000000..49a836dc3 --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/image.xml @@ -0,0 +1,81 @@ + + + + MacBook Air + + + MacBook Air + + + MacBook Air + + + MacBook Air + + + MacBook Air + + + MacBook Air SuperDrive + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + iPod touch + + + housse-portefeuille-en-cuir + + + Shure SE210 Sound-Isolating Earphones for iPod and iPhone + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod Nano + + + iPod shuffle + + + iPod shuffle + + + iPod shuffle + + + iPod shuffle + + diff --git a/install-dev/fixtures/apple/langs/nl/data/index.php b/install-dev/fixtures/apple/langs/nl/data/index.php new file mode 100644 index 000000000..fcb7f5c2b --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/index.php @@ -0,0 +1,35 @@ + +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../../../../'); +exit; \ No newline at end of file diff --git a/install-dev/fixtures/apple/langs/nl/data/manufacturer.xml b/install-dev/fixtures/apple/langs/nl/data/manufacturer.xml new file mode 100644 index 000000000..f06ff9661 --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/manufacturer.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/install-dev/fixtures/apple/langs/nl/data/order_message.xml b/install-dev/fixtures/apple/langs/nl/data/order_message.xml new file mode 100644 index 000000000..93ad3b501 --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/order_message.xml @@ -0,0 +1,12 @@ + + + + Delay + Hi, + +Unfortunately, an item on your order is currently out of stock. This may cause a slight delay in delivery. +Please accept our apologies and rest assured that we are working hard to rectify this. + +Best regards, + + diff --git a/install-dev/fixtures/apple/langs/nl/data/ordermessage.xml b/install-dev/fixtures/apple/langs/nl/data/ordermessage.xml new file mode 100644 index 000000000..e743f5d97 --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/ordermessage.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/install-dev/fixtures/apple/langs/nl/data/product.xml b/install-dev/fixtures/apple/langs/nl/data/product.xml new file mode 100644 index 000000000..0c405b001 --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/product.xml @@ -0,0 +1,135 @@ + + + + <p><strong><span style="font-size: small;">Curved ahead of the curve.</span></strong></p> +<p>For those about to rock, we give you nine amazing colors. But that's only part of the story. Feel the curved, all-aluminum and glass design and you won't want to put iPod nano down.</p> +<p><strong><span style="font-size: small;">Great looks. And brains, too.</span></strong></p> +<p>The new Genius feature turns iPod nano into your own highly intelligent, personal DJ. It creates playlists by finding songs in your library that go great together.</p> +<p><strong><span style="font-size: small;">Made to move with your moves.</span></strong></p> +<p>The accelerometer comes to iPod nano. Give it a shake to shuffle your music. Turn it sideways to view Cover Flow. And play games designed with your moves in mind.</p> + <p>New design. New features. Now in 8GB and 16GB. iPod nano rocks like never before.</p> + ipod-nano + + + + iPod Nano + In stock + + + + <p><span style="font-size: small;"><strong>Instant attachment.</strong></span></p> +<p>Wear up to 500 songs on your sleeve. Or your belt. Or your gym shorts. iPod shuffle is a badge of musical devotion. Now in new, more brilliant colors.</p> +<p><span style="font-size: small;"><strong>Feed your iPod shuffle.</strong></span></p> +<p>iTunes is your entertainment superstore. It’s your ultra-organized music collection and jukebox. And it’s how you load up your iPod shuffle in one click.</p> +<p><span style="font-size: small;"><strong>Beauty and the beat.</strong></span></p> +<p>Intensely colorful anodized aluminum complements the simple design of iPod shuffle. Now in blue, green, pink, red, and original silver.</p> + <p>iPod shuffle, the world’s most wearable music player, now clips on in more vibrant blue, green, pink, and red.</p> + ipod-shuffle + + + + iPod shuffle + In stock + + + + <p>MacBook Air is nearly as thin as your index finger. Practically every detail that could be streamlined has been. Yet it still has a 13.3-inch widescreen LED display, full-size keyboard, and large multi-touch trackpad. It’s incomparably portable without the usual ultraportable screen and keyboard compromises.</p><p>The incredible thinness of MacBook Air is the result of numerous size- and weight-shaving innovations. From a slimmer hard drive to strategically hidden I/O ports to a lower-profile battery, everything has been considered and reconsidered with thinness in mind.</p><p>MacBook Air is designed and engineered to take full advantage of the wireless world. A world in which 802.11n Wi-Fi is now so fast and so available, people are truly living untethered — buying and renting movies online, downloading software, and sharing and storing files on the web. </p> + MacBook Air is ultrathin, ultraportable, and ultra unlike anything else. But you don’t lose inches and pounds overnight. It’s the result of rethinking conventions. Of multiple wireless innovations. And of breakthrough design. With MacBook Air, mobile computing suddenly has a new standard. + macbook-air + + + + MacBook Air + + + + + Every MacBook has a larger hard drive, up to 250GB, to store growing media collections and valuable data.<br /><br />The 2.4GHz MacBook models now include 2GB of memory standard — perfect for running more of your favorite applications smoothly. + MacBook makes it easy to hit the road thanks to its tough polycarbonate case, built-in wireless technologies, and innovative MagSafe Power Adapter that releases automatically if someone accidentally trips on the cord. + macbook + + + + MacBook + + + + + <h3>Five new hands-on applications</h3> +<p>View rich HTML email with photos as well as PDF, Word, and Excel attachments. Get maps, directions, and real-time traffic information. Take notes and read stock and weather reports.</p> +<h3>Touch your music, movies, and more</h3> +<p>The revolutionary Multi-Touch technology built into the gorgeous 3.5-inch display lets you pinch, zoom, scroll, and flick with your fingers.</p> +<h3>Internet in your pocket</h3> +<p>With the Safari web browser, see websites the way they were designed to be seen and zoom in and out with a tap.<sup>2</sup> And add Web Clips to your Home screen for quick access to favorite sites.</p> +<h3>What's in the box</h3> +<ul> +<li><span></span>iPod touch</li> +<li><span></span>Earphones</li> +<li><span></span>USB 2.0 cable</li> +<li><span></span>Dock adapter</li> +<li><span></span>Polishing cloth</li> +<li><span></span>Stand</li> +<li><span></span>Quick Start guide</li> +</ul> + <ul> +<li>Revolutionary Multi-Touch interface</li> +<li>3.5-inch widescreen color display</li> +<li>Wi-Fi (802.11b/g)</li> +<li>8 mm thin</li> +<li>Safari, YouTube, Mail, Stocks, Weather, Notes, iTunes Wi-Fi Music Store, Maps</li> +</ul> + ipod-touch + + + + iPod touch + + + + + <p>Lorem ipsum</p> + <p>Lorem ipsum</p> + belkin-leather-folio-for-ipod-nano-black-chocolate + + + + Belkin Leather Folio for iPod nano - Black / Chocolate + + + + + <div class="product-overview-full">Using Hi-Definition MicroSpeakers to deliver full-range audio, the ergonomic and lightweight design of the SE210 earphones is ideal for premium on-the-go listening on your iPod or iPhone. They offer the most accurate audio reproduction from both portable and home stereo audio sources--for the ultimate in precision highs and rich low end. In addition, the flexible design allows you to choose the most comfortable fit from a variety of wearing positions. <br /> <br /> <strong>Features </strong> <br /> +<ul> +<li>Sound-isolating design </li> +<li> Hi-Definition MicroSpeaker with a single balanced armature driver </li> +<li> Detachable, modular cable so you can make the cable longer or shorter depending on your activity </li> +<li> Connector compatible with earphone ports on both iPod and iPhone </li> +</ul> +<strong>Specifications </strong><br /> +<ul> +<li>Speaker type: Hi-Definition MicroSpeaker </li> +<li> Frequency range: 25Hz-18.5kHz </li> +<li> Impedance (1kHz): 26 Ohms </li> +<li> Sensitivity (1mW): 114 dB SPL/mW </li> +<li> Cable length (with extension): 18.0 in./45.0 cm (54.0 in./137.1 cm) </li> +</ul> +<strong>In the box</strong><br /> +<ul> +<li>Shure SE210 earphones </li> +<li> Extension cable (36.0 in./91.4 cm) </li> +<li> Three pairs foam earpiece sleeves (small, medium, large) </li> +<li> Three pairs soft flex earpiece sleeves (small, medium, large) </li> +<li> One pair triple-flange earpiece sleeves </li> +<li> Carrying case </li> +</ul> +Warranty<br /> Two-year limited <br />(For details, please visit <br />www.shure.com/PersonalAudio/CustomerSupport/ProductReturnsAndWarranty/index.htm.) <br /><br /> Mfr. Part No.: SE210-A-EFS <br /><br />Note: Products sold through this website that do not bear the Apple Brand name are serviced and supported exclusively by their manufacturers in accordance with terms and conditions packaged with the products. Apple's Limited Warranty does not apply to products that are not Apple-branded, even if packaged or sold with Apple products. Please contact the manufacturer directly for technical support and customer service.</div> + <p>Evolved from personal monitor technology road-tested by pro musicians and perfected by Shure engineers, the lightweight and stylish SE210 delivers full-range audio that's free from outside noise.</p> + ecouteurs-a-isolation-sonore-shure-se210-blanc + + + + Shure SE210 Sound-Isolating Earphones for iPod and iPhone + + + + diff --git a/install-dev/fixtures/apple/langs/nl/data/profile.xml b/install-dev/fixtures/apple/langs/nl/data/profile.xml new file mode 100644 index 000000000..02aa4d76c --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/profile.xml @@ -0,0 +1,15 @@ + + + + Administrator + + + Logistician + + + Translator + + + Salesman + + diff --git a/install-dev/fixtures/apple/langs/nl/data/scene.xml b/install-dev/fixtures/apple/langs/nl/data/scene.xml new file mode 100644 index 000000000..f7270d3ff --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/scene.xml @@ -0,0 +1,12 @@ + + + + The iPods Nano + + + The iPods + + + The MacBooks + + diff --git a/install-dev/fixtures/apple/langs/nl/data/supplier.xml b/install-dev/fixtures/apple/langs/nl/data/supplier.xml new file mode 100644 index 000000000..e9db64034 --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/supplier.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/install-dev/fixtures/apple/langs/nl/data/tag.xml b/install-dev/fixtures/apple/langs/nl/data/tag.xml new file mode 100644 index 000000000..b781c0ed2 --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/data/tag.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/install-dev/fixtures/apple/langs/nl/index.php b/install-dev/fixtures/apple/langs/nl/index.php new file mode 100644 index 000000000..67d9932bf --- /dev/null +++ b/install-dev/fixtures/apple/langs/nl/index.php @@ -0,0 +1,35 @@ + +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../../../'); +exit; \ No newline at end of file diff --git a/install-dev/langs/nl/data/carrier.xml b/install-dev/langs/nl/data/carrier.xml new file mode 100644 index 000000000..343fa6f51 --- /dev/null +++ b/install-dev/langs/nl/data/carrier.xml @@ -0,0 +1,6 @@ + + + + Pick up in-store + + diff --git a/install-dev/langs/nl/data/category.xml b/install-dev/langs/nl/data/category.xml new file mode 100644 index 000000000..87b90b95e --- /dev/null +++ b/install-dev/langs/nl/data/category.xml @@ -0,0 +1,19 @@ + + + + Root + + root + + + + + + Home + + home + + + + + diff --git a/install-dev/langs/nl/data/cms.xml b/install-dev/langs/nl/data/cms.xml new file mode 100644 index 000000000..37edee2c4 --- /dev/null +++ b/install-dev/langs/nl/data/cms.xml @@ -0,0 +1,45 @@ + + + + Delivery + Our terms and conditions of delivery + conditions, delivery, delay, shipment, pack + <h2>Shipments and returns</h2><h3>Your pack shipment</h3><p>Packages are generally dispatched within 2 days after receipt of payment and are shipped via UPS with tracking and drop-off without signature. If you prefer delivery by UPS Extra with required signature, an additional cost will be applied, so please contact us before choosing this method. Whichever shipment choice you make, we will provide you with a link to track your package online.</p><p>Shipping fees include handling and packing fees as well as postage costs. Handling fees are fixed, whereas transport fees vary according to total weight of the shipment. We advise you to group your items in one order. We cannot group two distinct orders placed separately, and shipping fees will apply to each of them. Your package will be dispatched at your own risk, but special care is taken to protect fragile objects.<br /><br />Boxes are amply sized and your items are well-protected.</p> + delivery + + + Legal Notice + Legal notice + notice, legal, credits + <h2>Legal</h2><h3>Credits</h3><p>Concept and production:</p><p>This Web site was created using <a href="http://www.prestashop.com">PrestaShop</a>&trade; open-source software.</p> + legal-notice + + + Terms and conditions of use + Our terms and conditions of use + conditions, terms, use, sell + <h2>Your terms and conditions of use</h2><h3>Rule 1</h3><p>Here is the rule 1 content</p> +<h3>Rule 2</h3><p>Here is the rule 2 content</p> +<h3>Rule 3</h3><p>Here is the rule 3 content</p> + terms-and-conditions-of-use + + + About us + Learn more about us + about us, informations + <h2>About us</h2> +<h3>Our company</h3><p>Our company</p> +<h3>Our team</h3><p>Our team</p> +<h3>Informations</h3><p>Informations</p> + about-us + + + Secure payment + Our secure payment mean + secure payment, ssl, visa, mastercard, paypal + <h2>Secure payment</h2> +<h3>Our secure payment</h3><p>With SSL</p> +<h3>Using Visa/Mastercard/Paypal</h3><p>About this services</p> + secure-payment + + diff --git a/install-dev/langs/nl/data/cms_category.xml b/install-dev/langs/nl/data/cms_category.xml new file mode 100644 index 000000000..ceb8cf491 --- /dev/null +++ b/install-dev/langs/nl/data/cms_category.xml @@ -0,0 +1,11 @@ + + + + Home + + home + + + + + diff --git a/install-dev/langs/nl/data/configuration.xml b/install-dev/langs/nl/data/configuration.xml new file mode 100644 index 000000000..ef31b5d07 --- /dev/null +++ b/install-dev/langs/nl/data/configuration.xml @@ -0,0 +1,21 @@ + + + + IN + + + DE + + + a|the|of|on|in|and|to + + + 0 + + + Dear Customer, + +Regards, +Customer service + + diff --git a/install-dev/langs/nl/data/contact.xml b/install-dev/langs/nl/data/contact.xml new file mode 100644 index 000000000..bdc0b24d9 --- /dev/null +++ b/install-dev/langs/nl/data/contact.xml @@ -0,0 +1,9 @@ + + + + If a technical problem occurs on this website + + + For any question about a product, an order + + diff --git a/install-dev/langs/nl/data/country.xml b/install-dev/langs/nl/data/country.xml new file mode 100644 index 000000000..d57ea1e36 --- /dev/null +++ b/install-dev/langs/nl/data/country.xml @@ -0,0 +1,735 @@ + + + + Germany + + + Austria + + + Belgium + + + Canada + + + China + + + Spain + + + Finland + + + France + + + Greece + + + Italy + + + Japan + + + Luxemburg + + + Netherlands + + + Poland + + + Portugal + + + Czech Republic + + + United Kingdom + + + Sweden + + + Switzerland + + + Denmark + + + United States + + + HongKong + + + Norway + + + Australia + + + Singapore + + + Ireland + + + New Zealand + + + South Korea + + + Israel + + + South Africa + + + Nigeria + + + Ivory Coast + + + Togo + + + Bolivia + + + Mauritius + + + Romania + + + Slovakia + + + Algeria + + + American Samoa + + + + Angola + + + Anguilla + + + Antigua and Barbuda + + + Argentina + + + Armenia + + + Aruba + + + Azerbaijan + + + Bahamas + + + Bahrain + + + Bangladesh + + + Barbados + + + Belarus + + + Belize + + + Benin + + + Bermuda + + + Bhutan + + + Botswana + + + Brazil + + + Brunei + + + Burkina Faso + + + Burma (Myanmar) + + + Burundi + + + Cambodia + + + Cameroon + + + Cape Verde + + + Central African Republic + + + Chad + + + Chile + + + Colombia + + + Comoros + + + Congo, Dem. Republic + + + Congo, Republic + + + Costa Rica + + + Croatia + + + Cuba + + + Cyprus + + + Djibouti + + + Dominica + + + Dominican Republic + + + East Timor + + + Ecuador + + + Egypt + + + El Salvador + + + Equatorial Guinea + + + Eritrea + + + Estonia + + + Ethiopia + + + Falkland Islands + + + Faroe Islands + + + Fiji + + + Gabon + + + Gambia + + + Georgia + + + Ghana + + + Grenada + + + Greenland + + + Gibraltar + + + Guadeloupe + + + Guam + + + Guatemala + + + Guernsey + + + Guinea + + + Guinea-Bissau + + + Guyana + + + Haiti + + + Heard Island and McDonald Islands + + + Vatican City State + + + Honduras + + + Iceland + + + India + + + Indonesia + + + Iran + + + Iraq + + + Man Island + + + Jamaica + + + Jersey + + + Jordan + + + Kazakhstan + + + Kenya + + + Kiribati + + + Korea, Dem. Republic of + + + Kuwait + + + Kyrgyzstan + + + Laos + + + Latvia + + + Lebanon + + + Lesotho + + + Liberia + + + Libya + + + Liechtenstein + + + Lithuania + + + Macau + + + Macedonia + + + Madagascar + + + Malawi + + + Malaysia + + + Maldives + + + Mali + + + Malta + + + Marshall Islands + + + Martinique + + + Mauritania + + + Hungary + + + Mayotte + + + Mexico + + + Micronesia + + + Moldova + + + Monaco + + + Mongolia + + + Montenegro + + + Montserrat + + + Morocco + + + Mozambique + + + Namibia + + + Nauru + + + Nepal + + + Netherlands Antilles + + + New Caledonia + + + Nicaragua + + + Niger + + + Niue + + + Norfolk Island + + + Northern Mariana Islands + + + Oman + + + Pakistan + + + Palau + + + Palestinian Territories + + + Panama + + + Papua New Guinea + + + Paraguay + + + Peru + + + Philippines + + + Pitcairn + + + Puerto Rico + + + Qatar + + + Reunion Island + + + Russian Federation + + + Rwanda + + + Saint Barthelemy + + + Saint Kitts and Nevis + + + Saint Lucia + + + Saint Martin + + + Saint Pierre and Miquelon + + + Saint Vincent and the Grenadines + + + Samoa + + + San Marino + + + São Tomé and Príncipe + + + Saudi Arabia + + + Senegal + + + Serbia + + + Seychelles + + + Sierra Leone + + + Slovenia + + + Solomon Islands + + + Somalia + + + South Georgia and the South Sandwich Islands + + + Sri Lanka + + + Sudan + + + Suriname + + + Svalbard and Jan Mayen + + + Swaziland + + + Syria + + + Taiwan + + + Tajikistan + + + Tanzania + + + Thailand + + + Tokelau + + + Tonga + + + Trinidad and Tobago + + + Tunisia + + + Turkey + + + Turkmenistan + + + Turks and Caicos Islands + + + Tuvalu + + + Uganda + + + Ukraine + + + United Arab Emirates + + + Uruguay + + + Uzbekistan + + + Vanuatu + + + Venezuela + + + Vietnam + + + Virgin Islands (British) + + + Virgin Islands (U.S.) + + + Wallis and Futuna + + + Western Sahara + + + Yemen + + + Zambia + + + Zimbabwe + + + Albania + + + Afghanistan + + + Antarctica + + + Bosnia and Herzegovina + + + Bouvet Island + + + British Indian Ocean Territory + + + Bulgaria + + + Cayman Islands + + + Christmas Island + + + Cocos (Keeling) Islands + + + Cook Islands + + + French Guiana + + + French Polynesia + + + French Southern Territories + + + Åland Islands + + diff --git a/install-dev/langs/nl/data/gender.xml b/install-dev/langs/nl/data/gender.xml new file mode 100644 index 000000000..75fc2ed2a --- /dev/null +++ b/install-dev/langs/nl/data/gender.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/install-dev/langs/nl/data/group.xml b/install-dev/langs/nl/data/group.xml new file mode 100644 index 000000000..2d1b70934 --- /dev/null +++ b/install-dev/langs/nl/data/group.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/install-dev/langs/nl/data/index.php b/install-dev/langs/nl/data/index.php new file mode 100644 index 000000000..10edbfe91 --- /dev/null +++ b/install-dev/langs/nl/data/index.php @@ -0,0 +1,35 @@ + +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../../'); +exit; \ No newline at end of file diff --git a/install-dev/langs/nl/data/meta.xml b/install-dev/langs/nl/data/meta.xml new file mode 100644 index 000000000..bae593782 --- /dev/null +++ b/install-dev/langs/nl/data/meta.xml @@ -0,0 +1,159 @@ + + + + 404 error + This page cannot be found + error, 404, not found + page-not-found + + + Best sales + Our best sales + best sales + best-sales + + + Contact us + Use our form to contact us + contact, form, e-mail + contact-us + + + + <description>Shop powered by PrestaShop</description> + <keywords>shop, prestashop</keywords> + <url_rewrite/> + </meta> + <meta id="manufacturer" id_shop="1"> + <title>Manufacturers + Manufacturers list + manufacturer + manufacturers + + + New products + Our new products + new, products + new-products + + + Forgot your password + Enter your e-mail address used to register in goal to get e-mail with your new password + forgot, password, e-mail, new, reset + password-recovery + + + Prices drop + Our special products + special, prices drop + prices-drop + + + Sitemap + Lost ? Find what your are looking for + sitemap + sitemap + + + Suppliers + Suppliers list + supplier + supplier + + + Address + + + address + + + Addresses + + + addresses + + + Authentication + + + authentication + + + Cart + + + cart + + + Discount + + + discount + + + Order history + + + order-history + + + Identity + + + identity + + + My account + + + my-account + + + Order follow + + + order-follow + + + Order slip + + + order-slip + + + Order + + + order + + + Search + + + search + + + Stores + + + stores + + + Order + + + quick-order + + + Guest tracking + + + guest-tracking + + + Order confirmation + + + order-confirmation + + diff --git a/install-dev/langs/nl/data/order_return_state.xml b/install-dev/langs/nl/data/order_return_state.xml new file mode 100644 index 000000000..37ad31de9 --- /dev/null +++ b/install-dev/langs/nl/data/order_return_state.xml @@ -0,0 +1,18 @@ + + + + Waiting for confirmation + + + Waiting for package + + + Package received + + + Return denied + + + Return completed + + diff --git a/install-dev/langs/nl/data/order_state.xml b/install-dev/langs/nl/data/order_state.xml new file mode 100644 index 000000000..c44dc3358 --- /dev/null +++ b/install-dev/langs/nl/data/order_state.xml @@ -0,0 +1,51 @@ + + + + Awaiting cheque payment + + + + Payment accepted + + + + Preparation in progress + + + + Shipped + + + + Delivered +