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 diff --git a/classes/Meta.php b/classes/Meta.php index 76933c88b..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 = basename($file, '.php'); + $filename = Tools::strtolower(basename($file, '.php')); if ($filename == 'index') continue; - $module = basename(dirname(dirname(dirname($file)))); + $module = Tools::strtolower(basename(dirname(dirname(dirname($file))))); $selected_pages[$module.' - '.$filename] = 'module-'.$module.'-'.$filename; } 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); diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 9fcc3d66e..8ec50408e 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -3042,4 +3042,4 @@ class AdminControllerCore extends Controller return $return; } -} \ No newline at end of file +} diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php index 6d9bd6cb8..001e24a65 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)); @@ -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); 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) { diff --git a/classes/stock/StockMvt.php b/classes/stock/StockMvt.php index 83bd79e08..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.' OR 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); diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index 45797273e..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($this->context->cookie); + $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($this->context->cookie); + $currency = Tools::setCurrency((object)array('id_currency' => null)); $chart->getCurve(1)->setLabel($this->l('Sales + Tax').' ('.strtoupper($currency->iso_code).')'); $content .= $chart->fetch(); 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()) diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index 9fad901c9..0d0bb10be 100644 --- a/controllers/admin/AdminMetaController.php +++ b/controllers/admin/AdminMetaController.php @@ -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 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(); 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 Аутентификация 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'}