From 481cb5c28a2f80f8be9d1e04035cae415d7054af Mon Sep 17 00:00:00 2001 From: Zollner Robert Date: Fri, 4 Oct 2013 23:30:24 +0300 Subject: [PATCH 01/19] [-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency --- controllers/admin/AdminHomeController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index 45797273e..279ce6d32 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -303,7 +303,7 @@ class AdminHomeControllerCore extends AdminController public function getMonthlyStatistics() { - $currency = Tools::setCurrency($this->context->cookie); + $currency = Tools::setCurrency(NULL); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow(' SELECT IFNULL(SUM(`total_paid_real` / conversion_rate), "0") as total_sales, COUNT(*) as total_orders FROM `'._DB_PREFIX_.'orders` @@ -400,7 +400,7 @@ class AdminHomeControllerCore extends AdminController $chart->getCurve(1)->setPoint(strtotime($row['invoice_date'].' 02:00:00'), $row['total_converted']); $chart->setSize(580, 170); $chart->setTimeMode(strtotime('-7 DAYS', time()), time(), 'd'); - $currency = Tools::setCurrency($this->context->cookie); + $currency = Tools::setCurrency(NULL); $chart->getCurve(1)->setLabel($this->l('Sales + Tax').' ('.strtoupper($currency->iso_code).')'); $content .= $chart->fetch(); From 1787923c4c20b2d6c809ac271d65fc0a5e653b2f Mon Sep 17 00:00:00 2001 From: Zollner Robert Date: Sat, 5 Oct 2013 00:42:29 +0300 Subject: [PATCH 02/19] [-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency (changed NULL to lowercase) --- controllers/admin/AdminHomeController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index 279ce6d32..d923c051c 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -303,7 +303,7 @@ class AdminHomeControllerCore extends AdminController public function getMonthlyStatistics() { - $currency = Tools::setCurrency(NULL); + $currency = Tools::setCurrency(null); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow(' SELECT IFNULL(SUM(`total_paid_real` / conversion_rate), "0") as total_sales, COUNT(*) as total_orders FROM `'._DB_PREFIX_.'orders` @@ -400,7 +400,7 @@ class AdminHomeControllerCore extends AdminController $chart->getCurve(1)->setPoint(strtotime($row['invoice_date'].' 02:00:00'), $row['total_converted']); $chart->setSize(580, 170); $chart->setTimeMode(strtotime('-7 DAYS', time()), time(), 'd'); - $currency = Tools::setCurrency(NULL); + $currency = Tools::setCurrency(null); $chart->getCurve(1)->setLabel($this->l('Sales + Tax').' ('.strtoupper($currency->iso_code).')'); $content .= $chart->fetch(); From 30adb0932da79aae9700e280f3970292e6d2e95d Mon Sep 17 00:00:00 2001 From: Zollner Robert Date: Mon, 7 Oct 2013 23:42:26 +0300 Subject: [PATCH 03/19] [-] BO : pass correct typed parameter to setCurrency --- controllers/admin/AdminHomeController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index d923c051c..50fa95051 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -303,7 +303,7 @@ class AdminHomeControllerCore extends AdminController public function getMonthlyStatistics() { - $currency = Tools::setCurrency(null); + $currency = Tools::setCurrency((object)array('id_currency' => null)); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow(' SELECT IFNULL(SUM(`total_paid_real` / conversion_rate), "0") as total_sales, COUNT(*) as total_orders FROM `'._DB_PREFIX_.'orders` @@ -400,7 +400,7 @@ class AdminHomeControllerCore extends AdminController $chart->getCurve(1)->setPoint(strtotime($row['invoice_date'].' 02:00:00'), $row['total_converted']); $chart->setSize(580, 170); $chart->setTimeMode(strtotime('-7 DAYS', time()), time(), 'd'); - $currency = Tools::setCurrency(null); + $currency = Tools::setCurrency((object)array('id_currency' => null)); $chart->getCurve(1)->setLabel($this->l('Sales + Tax').' ('.strtoupper($currency->iso_code).')'); $content .= $chart->fetch(); From 9d5a9225e502884f716b48914c44d5c535c85c69 Mon Sep 17 00:00:00 2001 From: Axome Date: Fri, 11 Oct 2013 18:17:55 +0200 Subject: [PATCH 04/19] Correct some "bad query" in the admin products getList Here the wrong Sql generated : SELECT SQL_CALC_FOUND_ROWS a.`id_product`,b.name as name,`reference`,a.price as price,a.active as active , MAX(i.id_image) id_image,cl.name `name_category` , a.`price`, 0 AS price_final, sav.`quantity` as sav_quantity, a.`active` FROM `ps_product` a LEFT JOIN `ps_product_lang` b ON (b.`id_product` = a.`id_product` AND b.`id_lang` = 2 AND b.`id_shop` = 1) LEFT JOIN `ps_image` i ON (i.`id_product` = a.`id_product` AND i.cover=1)LEFT JOIN `ps_category_lang` cl ON (a.`id_category_default` = cl.`id_category` AND b.`id_lang` = cl.`id_lang` AND cl.id_shop = 1) LEFT JOIN `ps_stock_available` sav ON (sav.`id_product` = a.`id_product` AND sav.`id_product_attribute` = 0 AND sav.id_shop = 1 ) WHERE 1 AND a.`active` = 0 GROUP BY a.id_product ORDER BY quantity desc LIMIT 0,50 'quantity' is ambigus (for the ORDER BY) --- classes/controller/AdminController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 9fcc3d66e..d202ccada 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -2284,7 +2284,7 @@ class AdminControllerCore extends Controller (isset($this->_filter) ? $this->_filter : '').$where_shop.' '.(isset($this->_group) ? $this->_group.' ' : '').' '.$having_clause.' - ORDER BY '.(($order_by == $this->identifier) ? 'a.' : '').pSQL($order_by).' '.pSQL($order_way). + ORDER BY '.(($order_by == $this->identifier || $order_by == 'quantity') ? 'a.' : '').pSQL($order_by).' '.pSQL($order_way). ($this->_tmpTableFilter ? ') tmpTable WHERE 1'.$this->_tmpTableFilter : ''). (($use_limit === true) ? ' LIMIT '.(int)$start.','.(int)$limit : ''); @@ -3042,4 +3042,4 @@ class AdminControllerCore extends Controller return $return; } -} \ No newline at end of file +} From a10dcab6e74d138a2f3a3f558ec7d66b1e9d9e10 Mon Sep 17 00:00:00 2001 From: kiropowered Date: Sat, 12 Oct 2013 14:28:27 +0200 Subject: [PATCH 05/19] Update StockMvt.php Fix bug if product have attribute --- classes/stock/StockMvt.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/stock/StockMvt.php b/classes/stock/StockMvt.php index 83bd79e08..2245cf648 100644 --- a/classes/stock/StockMvt.php +++ b/classes/stock/StockMvt.php @@ -236,7 +236,7 @@ class StockMvtCore extends ObjectModel $query->innerJoin('stock', 's', 's.id_stock = sm.id_stock'); $query->innerJoin('warehouse', 'w', 'w.id_warehouse = s.id_warehouse'); $query->where('sm.sign = 1'); - $query->where('s.id_product = '.(int)$id_product.' OR s.id_product_attribute = '.(int)$id_product_attribute); + $query->where('s.id_product = '.(int)$id_product.' AND s.id_product_attribute = '.(int)$id_product_attribute); $query->orderBy('date_add DESC'); $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); From 8d7e96176c5744d3acbc265583cfab0c802f84aa Mon Sep 17 00:00:00 2001 From: ldecoker Date: Mon, 14 Oct 2013 09:38:04 +0200 Subject: [PATCH 06/19] SEO - make sure module and controller name are in lowercase For module controller, make sure that the name of the controller and the module are saved in lowercase. Otherwise the route will not be found in getModuleLink. --- classes/Meta.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Meta.php b/classes/Meta.php index 76933c88b..d5bcbd414 100644 --- a/classes/Meta.php +++ b/classes/Meta.php @@ -85,11 +85,11 @@ class MetaCore extends ObjectModel // Add modules controllers to list (this function is cool !) foreach (glob(_PS_MODULE_DIR_.'*/controllers/front/*.php') as $file) { - $filename = basename($file, '.php'); + $filename = strtolower(basename($file, '.php')); if ($filename == 'index') continue; - $module = basename(dirname(dirname(dirname($file)))); + $module = strtolower(basename(dirname(dirname(dirname($file))))); $selected_pages[$module.' - '.$filename] = 'module-'.$module.'-'.$filename; } From a377ecd5717d3de2d38241add4521df302d9ff5d Mon Sep 17 00:00:00 2001 From: ldecoker Date: Mon, 14 Oct 2013 09:53:50 +0200 Subject: [PATCH 07/19] Update Meta.php Use strtolower from Tools class. --- classes/Meta.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Meta.php b/classes/Meta.php index d5bcbd414..4e911fe72 100644 --- a/classes/Meta.php +++ b/classes/Meta.php @@ -85,11 +85,11 @@ class MetaCore extends ObjectModel // Add modules controllers to list (this function is cool !) foreach (glob(_PS_MODULE_DIR_.'*/controllers/front/*.php') as $file) { - $filename = strtolower(basename($file, '.php')); + $filename = Tools::strtolower(basename($file, '.php')); if ($filename == 'index') continue; - $module = strtolower(basename(dirname(dirname(dirname($file))))); + $module = Tools::strtolower(basename(dirname(dirname(dirname($file))))); $selected_pages[$module.' - '.$filename] = 'module-'.$module.'-'.$filename; } From af9182dad549bc77bd26c4ca038a27e5daa0488a Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 14 Oct 2013 10:51:17 +0200 Subject: [PATCH 08/19] [-] CORE , follow up https://github.com/kiropowered/PrestaShop/commit/b87e934a66a15d4f68e573f5afa9494505a60e28 and https://github.com/kiropowered/PrestaShop/commit/a10dcab6e74d138a2f3a3f558ec7d66b1e9d9e10 --- classes/stock/StockMvt.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/classes/stock/StockMvt.php b/classes/stock/StockMvt.php index 2245cf648..de75d91aa 100644 --- a/classes/stock/StockMvt.php +++ b/classes/stock/StockMvt.php @@ -236,7 +236,10 @@ class StockMvtCore extends ObjectModel $query->innerJoin('stock', 's', 's.id_stock = sm.id_stock'); $query->innerJoin('warehouse', 'w', 'w.id_warehouse = s.id_warehouse'); $query->where('sm.sign = 1'); - $query->where('s.id_product = '.(int)$id_product.' AND s.id_product_attribute = '.(int)$id_product_attribute); + if ($id_product_attribute) + $query->where('s.id_product = '.(int)$id_product.' AND s.id_product_attribute = '.(int)$id_product_attribute); + else + $query->where('s.id_product = '.(int)$id_product); $query->orderBy('date_add DESC'); $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); From 3bc02bbe1004717d532b9ed0820782ce1524b856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 14 Oct 2013 10:56:38 +0200 Subject: [PATCH 09/19] // fields are already correctly formated when they are in a object coming from the database --- controllers/admin/AdminProductsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 763938627..d6b44706c 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -367,9 +367,9 @@ class AdminProductsControllerCore extends AdminController { if (is_array($default_product->$field_name)) foreach ($default_product->$field_name as $key => $value) - $this->object->{$field_name}[$key] = ObjectModel::formatValue($value, $def['fields'][$field_name]['type']); + $this->object->{$field_name}[$key] = $value; else - $this->object->$field_name = ObjectModel::formatValue($default_product->$field_name, $def['fields'][$field_name]['type']); + $this->object->$field_name = $default_product->$field_name; } } $this->object->loadStockData(); From 3282bd19e41b30bf1c338037a969b24c54a697cd Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Mon, 14 Oct 2013 10:59:20 +0200 Subject: [PATCH 10/19] // Small fix --- classes/helper/HelperList.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php index 6d9bd6cb8..8f2ed09f0 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.php @@ -444,13 +444,13 @@ class HelperListCore extends Helper self::$cache_lang['Delete'] = $this->l('Delete', 'Helper'); if (!array_key_exists('DeleteItem', self::$cache_lang)) - self::$cache_lang['DeleteItem'] = $this->l('Delete selected item?', 'Helper', false, false); + self::$cache_lang['DeleteItem'] = $this->l('Delete selected item?', 'Helper', true, false); if (!array_key_exists('Name', self::$cache_lang)) - self::$cache_lang['Name'] = $this->l('Name:', 'Helper', false, false); + self::$cache_lang['Name'] = $this->l('Name:', 'Helper', true, false); if (!is_null($name)) - $name = '\n\n'.self::$cache_lang['Name'].' '.$name; + $name = addcslashes('\n\n'.self::$cache_lang['Name'].' '.$name, '\''); $data = array( $this->identifier => $id, @@ -459,7 +459,7 @@ class HelperListCore extends Helper ); if ($this->specificConfirmDelete !== false) - $data['confirm'] = !is_null($this->specificConfirmDelete) ? '\r'.$this->specificConfirmDelete : Tools::safeOutput(addcslashes(self::$cache_lang['DeleteItem'].$name, '\'')); + $data['confirm'] = !is_null($this->specificConfirmDelete) ? '\r'.$this->specificConfirmDelete : Tools::safeOutput(self::$cache_lang['DeleteItem'].$name); $tpl->assign(array_merge($this->tpl_delete_link_vars, $data)); From 1358c696cdf34b5ff38f1f7c676a38c1f5b44eb8 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 14 Oct 2013 11:37:15 +0200 Subject: [PATCH 11/19] [-] BO : Fix #PSCFV-10678 warning in chrome --- .../controllers/orders/_print_pdf_icon.tpl | 4 +-- .../controllers/orders/helpers/view/view.tpl | 28 +++++++++---------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl b/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl index f88070aa3..d2cba5c83 100644 --- a/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl @@ -26,7 +26,7 @@ {* Generate HTML code for printing Invoice Icon with link *} {if ($order_state->invoice || $order->invoice_number)} - invoice + invoice {else} - {/if} @@ -35,7 +35,7 @@ {* Generate HTML code for printing Delivery Icon with link *} {if ($order_state->delivery || $order->delivery_number)} - delivery + delivery {else} - {/if} diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl index af01d0657..2809e5043 100755 --- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -65,7 +65,7 @@
{if (count($invoices_collection))} - + {l s='View invoice'} {l s='View invoice'} {else} @@ -73,7 +73,7 @@ {/if} | {if (($currentState && $currentState->delivery) || $order->delivery_number)} - + {l s='View delivery slip'} {l s='View delivery slip'} {else} @@ -124,10 +124,10 @@ - - - - + + + + {foreach from=$history item=row key=key} {if ($key == 0)} @@ -299,12 +299,12 @@
- - - - - - + + + + + + @@ -787,8 +787,6 @@ {/if} - -
 


{l s='Back to list'}
-{/block} +{/block} \ No newline at end of file From 2a54296b962a22edd171c090749dfcb4c62d007d Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 14 Oct 2013 12:11:47 +0200 Subject: [PATCH 12/19] [-] BO : Fix bug #PSCFV-10692, AdminImport bad utf8 cars for subst --- controllers/admin/AdminImportController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 58fa8f527..0bf22ae51 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -455,8 +455,8 @@ class AdminImportControllerCore extends AdminController } - $this->separator = substr(strval(trim(Tools::getValue('separator', ';'))), 0, 1); - $this->multiple_value_separator = substr(strval(trim(Tools::getValue('multiple_value_separator', ','))), 0, 1); + $this->separator = Tools::substr(strval(trim(Tools::getValue('separator', ';'))), 0, 1); + $this->multiple_value_separator = Tools::substr(strval(trim(Tools::getValue('multiple_value_separator', ','))), 0, 1); parent::__construct(); } @@ -632,7 +632,7 @@ class AdminImportControllerCore extends AdminController $html .= ''; foreach ($line as $nb_c => $column) if ((MAX_COLUMNS * (int)$current_table <= $nb_c) && ((int)$nb_c < MAX_COLUMNS * ((int)$current_table + 1))) - $html .= ''; + $html .= ''; $html .= ''; } $html .= '
'.htmlentities(substr($column, 0, 200), ENT_QUOTES, 'UTF-8').''.htmlentities(Tools::substr($column, 0, 200), ENT_QUOTES, 'UTF-8').'
'; @@ -2111,7 +2111,7 @@ class AdminImportControllerCore extends AdminController $country->active = 1; $country->name = AdminImportController::createMultiLangField($address->country); $country->id_zone = 0; // Default zone for country to create - $country->iso_code = strtoupper(substr($address->country, 0, 2)); // Default iso for country to create + $country->iso_code = Tools::strtoupper(Tools::substr($address->country, 0, 2)); // Default iso for country to create $country->contains_states = 0; // Default value for country to create $lang_field_error = $country->validateFieldsLang(UNFRIENDLY_ERROR, true); if (($field_error = $country->validateFields(UNFRIENDLY_ERROR, true)) === true && @@ -2142,7 +2142,7 @@ class AdminImportControllerCore extends AdminController $state->name = $address->state; $state->id_country = isset($country->id) ? (int)$country->id : 0; $state->id_zone = 0; // Default zone for state to create - $state->iso_code = strtoupper(substr($address->state, 0, 2)); // Default iso for state to create + $state->iso_code = Tools::strtoupper(Tools::substr($address->state, 0, 2)); // Default iso for state to create $state->tax_behavior = 0; if (($field_error = $state->validateFields(UNFRIENDLY_ERROR, true)) === true && ($lang_field_error = $state->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $state->add()) From f8edca8ac8e6c470eaf0f5270ace0577bae5819d Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 14 Oct 2013 13:59:19 +0200 Subject: [PATCH 13/19] [-] IN : Fix bug #PSCFV-10539 duplicate "address" url rewrite in meta.xml for Russian --- install-dev/langs/ru/data/meta.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-dev/langs/ru/data/meta.xml b/install-dev/langs/ru/data/meta.xml index f53ef2f4a..7c86b7653 100755 --- a/install-dev/langs/ru/data/meta.xml +++ b/install-dev/langs/ru/data/meta.xml @@ -70,7 +70,7 @@ Адреса - address + addresses Аутентификация From c6e3e28894063d4fafb4e8366a135fd1ba01e155 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 14 Oct 2013 14:20:11 +0200 Subject: [PATCH 14/19] [-] FO : Fix bug #PSCFV-10690 could not index a category beacause of robot.txt --- controllers/admin/AdminMetaController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index 9fad901c9..44cdf9ddd 100644 --- a/controllers/admin/AdminMetaController.php +++ b/controllers/admin/AdminMetaController.php @@ -393,7 +393,7 @@ class AdminMetaControllerCore extends AdminController { fwrite($write_fd, "# Private pages\n"); foreach ($this->rb_data['GB'] as $gb) - fwrite($write_fd, 'Disallow: /*'.$gb."\n"); + fwrite($write_fd, 'Disallow: */'.$gb."\n"); } // Directories @@ -401,7 +401,7 @@ class AdminMetaControllerCore extends AdminController { fwrite($write_fd, "# Directories\n"); foreach ($this->rb_data['Directories'] as $dir) - fwrite($write_fd, 'Disallow: /*'.$dir."\n"); + fwrite($write_fd, 'Disallow: */'.$dir."\n"); } // Files @@ -410,7 +410,7 @@ class AdminMetaControllerCore extends AdminController fwrite($write_fd, "# Files\n"); foreach ($this->rb_data['Files'] as $iso_code => $files) foreach ($files as $file) - fwrite($write_fd, 'Disallow: /*'.$iso_code.'/'.$file."\n"); + fwrite($write_fd, 'Disallow: */'.$iso_code.'/'.$file."\n"); } // Sitemap From 50002ec71431157507af902623e2680db1a47f80 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 14 Oct 2013 14:23:26 +0200 Subject: [PATCH 15/19] [-] FO : Fix #PSCFV-10690 again, change just on directories --- controllers/admin/AdminMetaController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index 44cdf9ddd..0d0bb10be 100644 --- a/controllers/admin/AdminMetaController.php +++ b/controllers/admin/AdminMetaController.php @@ -393,7 +393,7 @@ class AdminMetaControllerCore extends AdminController { fwrite($write_fd, "# Private pages\n"); foreach ($this->rb_data['GB'] as $gb) - fwrite($write_fd, 'Disallow: */'.$gb."\n"); + fwrite($write_fd, 'Disallow: /*'.$gb."\n"); } // Directories @@ -410,7 +410,7 @@ class AdminMetaControllerCore extends AdminController fwrite($write_fd, "# Files\n"); foreach ($this->rb_data['Files'] as $iso_code => $files) foreach ($files as $file) - fwrite($write_fd, 'Disallow: */'.$iso_code.'/'.$file."\n"); + fwrite($write_fd, 'Disallow: /*'.$iso_code.'/'.$file."\n"); } // Sitemap From 80f6f4e223c0596b5604b43ff09b594bd9eb236f Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 14 Oct 2013 15:34:47 +0200 Subject: [PATCH 16/19] [-] FO : Fix bug #PSCFV-10688, bad priceDisplay in order-carrier --- themes/default/order-carrier.tpl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/themes/default/order-carrier.tpl b/themes/default/order-carrier.tpl index aac6efad1..9a8f40adc 100644 --- a/themes/default/order-carrier.tpl +++ b/themes/default/order-carrier.tpl @@ -171,10 +171,13 @@
{if $option.total_price_with_tax && (!isset($free_shipping) || (isset($free_shipping) && !$free_shipping))} + {if $use_taxes == 1} - {convertPrice price=$option.total_price_with_tax} {l s='(tax incl.)'} - {else} - {convertPrice price=$option.total_price_without_tax} {l s='(tax excl.)'} + {if $priceDisplay == 1} + {convertPrice price=$option.total_price_without_tax} {l s='(tax excl.)'} + {else} + {convertPrice price=$option.total_price_with_tax} {l s='(tax incl.)'} + {/if} {/if} {else} {l s='Free'} From cc8ec4fd4583d6439a47292e43f45ed451aa141b Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 14 Oct 2013 16:03:50 +0200 Subject: [PATCH 17/19] [-] CORE : Fix bug #PSCFV-10687 bad conversion for accentuated Y and W, thanks @mike15 --- classes/Tools.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Tools.php b/classes/Tools.php index 4a750e577..849877423 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -1162,7 +1162,7 @@ class ToolsCore $replacements = array( 'a', 'c', 'd', 'e', 'g', 'h', 'i', 'j', 'k', 'l', 'n', 'o', 'r', 's', 'ss', 't', 'u', 'y', 'w', 'z', 'ae', 'oe', - 'A', 'C', 'D', 'E', 'G', 'H', 'I', 'J', 'K', 'L', 'N', 'O', 'R', 'S', 'T', 'U', 'Z', 'AE', 'OE' + 'A', 'C', 'D', 'E', 'G', 'H', 'I', 'J', 'K', 'L', 'N', 'O', 'R', 'S', 'T', 'U', 'W', 'Y', 'Z', 'AE', 'OE' ); return preg_replace($patterns, $replacements, $str); From 6f4b85430cb77ca53ae6145007de9f5d9431c426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 14 Oct 2013 18:52:48 +0200 Subject: [PATCH 18/19] // Fix listings and sort --- classes/controller/AdminController.php | 2 +- classes/helper/HelperList.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index d202ccada..8ec50408e 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -2284,7 +2284,7 @@ class AdminControllerCore extends Controller (isset($this->_filter) ? $this->_filter : '').$where_shop.' '.(isset($this->_group) ? $this->_group.' ' : '').' '.$having_clause.' - ORDER BY '.(($order_by == $this->identifier || $order_by == 'quantity') ? 'a.' : '').pSQL($order_by).' '.pSQL($order_way). + ORDER BY '.(($order_by == $this->identifier) ? 'a.' : '').pSQL($order_by).' '.pSQL($order_way). ($this->_tmpTableFilter ? ') tmpTable WHERE 1'.$this->_tmpTableFilter : ''). (($use_limit === true) ? ' LIMIT '.(int)$start.','.(int)$limit : ''); diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php index 8f2ed09f0..001e24a65 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.php @@ -513,7 +513,7 @@ class HelperListCore extends Helper if (Tools::getIsset($this->table.'Orderby')) $order = '&'.$this->table.'Orderby='.urlencode($this->orderBy).'&'.$this->table.'Orderway='.urlencode(strtolower($this->orderWay)); - $action = $this->currentIndex.$identifier.'&token='.$token.$order.'#'.$this->table; + $action = $this->currentIndex.$identifier.'&token='.$token.'#'.$this->table; /* Determine current page number */ $page = (int)Tools::getValue('submitFilter'.$this->list_id); From fd2dc4ff64551dae6c78daecca5f4c8f1f550209 Mon Sep 17 00:00:00 2001 From: Francois Gaillard Date: Tue, 15 Oct 2013 09:14:49 +0200 Subject: [PATCH 19/19] [-] Classes : Modules listing and case insensitive --- classes/module/Module.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/classes/module/Module.php b/classes/module/Module.php index 9ddea6f73..e190ff30a 100644 --- a/classes/module/Module.php +++ b/classes/module/Module.php @@ -1234,11 +1234,7 @@ abstract class ModuleCore $module->interest = 0; } - usort($module_list, create_function('$a,$b', ' - if ($a->displayName == $b->displayName) - return 0; - return ($a->displayName < $b->displayName) ? -1 : 1; - ')); + usort($module_list, create_function('$a,$b', 'return strnatcasecmp($a->displayName, $b->displayName);')); if ($errors) {