diff --git a/classes/Language.php b/classes/Language.php index 797e891c4..fae299508 100644 --- a/classes/Language.php +++ b/classes/Language.php @@ -516,7 +516,7 @@ class LanguageCore extends ObjectModel { if (!self::$_LANGUAGES) self::loadLanguages(); - $languages = array(); + $languages = array(); foreach (self::$_LANGUAGES AS $language) { @@ -615,6 +615,7 @@ class LanguageCore extends ObjectModel $sql = 'SELECT l.*, ls.`id_shop` FROM `'._DB_PREFIX_.'lang` l LEFT JOIN `'._DB_PREFIX_.'lang_shop` ls ON (l.id_lang = ls.id_lang)'; + $result = Db::getInstance()->executeS($sql); foreach ($result AS $row) { diff --git a/classes/SpecificPrice.php b/classes/SpecificPrice.php index 45ac163df..39a76a6fb 100644 --- a/classes/SpecificPrice.php +++ b/classes/SpecificPrice.php @@ -31,6 +31,7 @@ class SpecificPriceCore extends ObjectModel public $id_specific_price_rule = 0; public $id_product_attribute; public $id_shop; + public $id_group_shop; public $id_currency; public $id_country; public $id_group; diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index e3b9c8e0b..4663a6c40 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -718,7 +718,7 @@ class AdminProductsControllerCore extends AdminController } - public function proccessPriceAddition($token) + public function processPriceAddition($token) { $id_product = (int)(Tools::getValue('id_product')); $id_shop = Tools::getValue('sp_id_shop'); diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php index 1cb8d76df..c3943584c 100644 --- a/controllers/admin/AdminSuppliersController.php +++ b/controllers/admin/AdminSuppliersController.php @@ -104,7 +104,7 @@ class AdminSuppliersControllerCore extends AdminController ), array( 'type' => 'text', - 'label' => $this->l('Adress:'), + 'label' => $this->l('Address:'), 'name' => 'address', 'size' => 100, 'maxlength' => 128, @@ -112,7 +112,7 @@ class AdminSuppliersControllerCore extends AdminController ), array( 'type' => 'text', - 'label' => $this->l('Adress:').' (2)', + 'label' => $this->l('Address:').' (2)', 'name' => 'address2', 'size' => 100, 'maxlength' => 128, diff --git a/install-dev/sql/db.sql b/install-dev/sql/db.sql index 3f858156c..9f6f15dc2 100644 --- a/install-dev/sql/db.sql +++ b/install-dev/sql/db.sql @@ -1584,6 +1584,7 @@ CREATE TABLE `PREFIX_specific_price` ( `id_specific_price_rule` INT(11) UNSIGNED NOT NULL, `id_product` INT UNSIGNED NOT NULL, `id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1', + `id_group_shop` INT(11) UNSIGNED NOT NULL, `id_currency` INT UNSIGNED NOT NULL, `id_country` INT UNSIGNED NOT NULL, `id_group` INT UNSIGNED NOT NULL, diff --git a/install-dev/sql/db_settings_extends.sql b/install-dev/sql/db_settings_extends.sql index 67c828571..4a97612c5 100644 --- a/install-dev/sql/db_settings_extends.sql +++ b/install-dev/sql/db_settings_extends.sql @@ -439,8 +439,8 @@ INSERT INTO `PREFIX_product_lang` (`id_product`, `id_lang`, `description`, `desc (8, 5, '

Lorem ipsum

', '

Lorem ipsum

', 'custodia-portafoglio-in-pelle-belkin-per-ipod-nano-nero-cioccolato', '', '', '', 'Custodia portafoglio in pelle Belkin per iPod nano - Nero/Cioccolato', '', NULL), (9, 5, '
L\'ascolto con la tecnologia dei Micro-Auricolari ad Alta Definizione permette l\'ascolto ideale del tuo iPod o iPhone. E\' quanto ti offre il design leggero, ergonomico ed elegante degli auricolari SE210. Ti garantiscono un rendimento audio ad alto livello di stereo portatili e fissi, per un livello di precisione mai raggiunto prima. Inoltre, la forma flessibile ti peremtte di scegliere la posizione migliore per indossarli.

Caratteristiche
\r\n\r\nSpecifiche tecniche
\r\n\r\nNella confezione
\r\n\r\nGaranzia
Due anni limitata
(Per informazioni, visitare
www.shure.com/PersonalAudio/CustomerSupport/ProductReturnsAndWarranty/index.htm.)

Mfr. Parte N.: SE210-A-EFS

Nota: I prodotti venduti tramite questo sito web e che non hanno il marchio Apple ricevono assistenza esclusivamente dai loro produttori con i termini e le condizioni contenute nella confezione del prodotto. La Garanzia Limitata di Apple non si applica ai prodotti che non appartengono al marchio Apple, anche se imballati o venduti con i prodotti Apple . Contatta direttamente il produttore per supporto tecnico e servizio clienti.
', '

Basati sulla tecnologia all\'avanguardia, testati da musicisti professionisti, e messi a punto da ingegneri Shure, i leggeri ed eleganti SE210 offrono un suono nitido e privo di rumori di fondo.

', 'ecouteurs-a-isolation-sonore-shure-se210-blanc', '', '', '', 'auricolari-sound-isolating-shure-se210-per-ipod-e-iphone', '', NULL); -INSERT INTO `PREFIX_specific_price` (`id_product`, `id_shop`, `id_currency`, `id_country`, `id_group`, `id_product_attribute`, `price`, `from_quantity`, `reduction`, `reduction_type`, `from`, `to`) VALUES -(1, 0, 0, 0, 0, 0, 0, 1, 0.05, 'percentage', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `PREFIX_specific_price` (`id_product`, `id_shop`, `id_group_shop`, `id_currency`, `id_country`, `id_group`, `id_product_attribute`, `price`, `from_quantity`, `reduction`, `reduction_type`, `from`, `to`) VALUES +(1, 0, 0, 0, 0, 0, 0, 0, 1, 0.05, 'percentage', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); INSERT INTO `PREFIX_category` (`id_category`, `id_parent`, `level_depth`, `nleft`, `nright`, `active`, `date_add`, `date_upd`, `position`) VALUES (2, 1, 1, 2, 3, 1, NOW(), NOW(), 0),(3, 1, 1, 3, 4, 1, NOW(), NOW(), 1),(4, 1, 1, 4, 5, 1, NOW(), NOW(), 2); diff --git a/install-dev/sql/upgrade/1.5.0.2.sql b/install-dev/sql/upgrade/1.5.0.2.sql index 8c87a399c..81c4650ff 100644 --- a/install-dev/sql/upgrade/1.5.0.2.sql +++ b/install-dev/sql/upgrade/1.5.0.2.sql @@ -296,3 +296,4 @@ ADD `reduction_amount_tax_excl` FLOAT( 20.6 ) NOT NULL AFTER `reduction_amount ALTER TABLE `PREFIX_order_cart_rule` ADD `value_tax_excl` DECIMAL(17, 2) NOT NULL DEFAULT '0.00'; ALTER TABLE `PREFIX_order_cart_rule` ADD `id_order_invoice` INT NOT NULL DEFAULT '0' AFTER `id_cart_rule`; +ALTER TABLE `PREFIX_specific_price` ADD `id_group_shop` INT(11) UNSIGNED NOT NULL AFTER `id_shop`; \ No newline at end of file