From c4e28b117d41b644b0579712926ae7e48f9d7032 Mon Sep 17 00:00:00 2001 From: vChabot Date: Wed, 12 Oct 2011 14:31:36 +0000 Subject: [PATCH] [*] BO : Carriers are now sortable by position or price git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9276 b9a71923-0436-4b27-9f14-aed3839534dd --- admin-dev/tabs/AdminCarriers.php | 9 +- cache/class_index.php | 184 ++++++++++++----------- classes/Carrier.php | 14 ++ install-dev/php/add_carrier_position.php | 45 ++++++ install-dev/sql/db_settings_lite.sql | 10 +- translations/fr/admin.php | 24 ++- 6 files changed, 174 insertions(+), 112 deletions(-) create mode 100755 install-dev/php/add_carrier_position.php diff --git a/admin-dev/tabs/AdminCarriers.php b/admin-dev/tabs/AdminCarriers.php index d9816cf2c..b478e5359 100644 --- a/admin-dev/tabs/AdminCarriers.php +++ b/admin-dev/tabs/AdminCarriers.php @@ -49,12 +49,19 @@ class AdminCarriers extends AdminTab 'position' => array('title' => $this->l('Position'), 'width' => 40,'filter_key' => 'cp!position', 'align' => 'center', 'position' => 'position') ); + $carrier_default_sort = array( + array('value' => Carrier::SORT_BY_PRICE, 'name' => $this->l('Price')), + array('value' => Carrier::SORT_BY_POSITION, 'name' => $this->l('Position')) + ); + $this->optionsList = array( 'general' => array( 'title' => $this->l('Carrier options'), 'fields' => array( 'PS_CARRIER_DEFAULT' => array('title' => $this->l('Default carrier:'), 'desc' => $this->l('The default carrier used in shop'), 'cast' => 'intval', 'type' => 'select', 'identifier' => 'id_carrier', 'list' => Carrier::getCarriers((int)Configuration::get('PS_LANG_DEFAULT'), true, false, false, null, Carrier::ALL_CARRIERS)), + 'PS_CARRIER_DEFAULT_SORT' => array('title' => $this->l('Carrier default sort:'), 'desc' => $this->l('This default sort will be available only on front-office'), 'cast' => 'intval', 'type' => 'select', + 'identifier' => 'value', 'list' => $carrier_default_sort), ), ), ); @@ -357,7 +364,7 @@ class AdminCarriers extends AdminTab { if (Tools::getValue('id_carrier') == Configuration::get('PS_CARRIER_DEFAULT')) $this->_errors[] = Tools::displayError('You can\'t disable the default carrier, please change your default carrier first.'); - else + else parent::postProcess(); } else diff --git a/cache/class_index.php b/cache/class_index.php index 0927fde94..7c4b229ca 100644 --- a/cache/class_index.php +++ b/cache/class_index.php @@ -1,10 +1,10 @@ 'classes/AbstractLogger.php', 'AbstractLogger' => 'override/classes/AbstractLogger.php', - 'AddressCore' => 'classes/Address.php', - 'Address' => 'override/classes/Address.php', 'AddressFormatCore' => 'classes/AddressFormat.php', 'AddressFormat' => 'override/classes/AddressFormat.php', + 'AddressCore' => 'classes/Address.php', + 'Address' => 'override/classes/Address.php', 'AdminControllerCore' => 'classes/AdminController.php', 'AdminController' => 'override/classes/AdminController.php', 'AdminTabCore' => 'classes/AdminTab.php', @@ -13,29 +13,39 @@ 'Alias' => 'override/classes/Alias.php', 'AttachmentCore' => 'classes/Attachment.php', 'Attachment' => 'override/classes/Attachment.php', - 'AttributeCore' => 'classes/Attribute.php', - 'Attribute' => 'override/classes/Attribute.php', 'AttributeGroupCore' => 'classes/AttributeGroup.php', 'AttributeGroup' => 'override/classes/AttributeGroup.php', + 'AttributeCore' => 'classes/Attribute.php', + 'Attribute' => 'override/classes/Attribute.php', 'Autoload' => 'classes/Autoload.php', 'BackupCore' => 'classes/Backup.php', 'Backup' => 'override/classes/Backup.php', 'BlowfishCore' => 'classes/Blowfish.php', 'Blowfish' => 'override/classes/Blowfish.php', - 'CMSCore' => 'classes/CMS.php', - 'CMS' => 'override/classes/CMS.php', - 'CMSCategoryCore' => 'classes/CMSCategory.php', - 'CMSCategory' => 'override/classes/CMSCategory.php', - 'CarrierCore' => 'classes/Carrier.php', - 'Carrier' => 'override/classes/Carrier.php', + 'CacheApcCore' => 'classes/cache/CacheApc.php', + 'CacheApc' => 'override/classes/cache/CacheApc.php', + 'CacheFsCore' => 'classes/cache/CacheFs.php', + 'CacheFs' => 'override/classes/cache/CacheFs.php', + 'CacheMemcacheCore' => 'classes/cache/CacheMemcache.php', + 'CacheMemcache' => 'override/classes/cache/CacheMemcache.php', + 'CacheCore' => 'classes/cache/Cache.php', + 'Cache' => 'override/classes/cache/Cache.php', + 'CacheXcacheCore' => 'classes/cache/CacheXcache.php', + 'CacheXcache' => 'override/classes/cache/CacheXcache.php', 'CarrierModuleCore' => 'classes/CarrierModule.php', 'CarrierModule' => 'override/classes/CarrierModule.php', + 'CarrierCore' => 'classes/Carrier.php', + 'Carrier' => 'override/classes/Carrier.php', 'CartCore' => 'classes/Cart.php', 'Cart' => 'override/classes/Cart.php', 'CategoryCore' => 'classes/Category.php', 'Category' => 'override/classes/Category.php', 'ChartCore' => 'classes/Chart.php', 'Chart' => 'override/classes/Chart.php', + 'CMSCategoryCore' => 'classes/CMSCategory.php', + 'CMSCategory' => 'override/classes/CMSCategory.php', + 'CMSCore' => 'classes/CMS.php', + 'CMS' => 'override/classes/CMS.php', 'CombinationCore' => 'classes/Combination.php', 'Combination' => 'override/classes/Combination.php', 'CompareProductCore' => 'classes/CompareProduct.php', @@ -52,10 +62,10 @@ 'Contact' => 'override/classes/Contact.php', 'ContextCore' => 'classes/Context.php', 'Context' => 'override/classes/Context.php', - 'ControllerCore' => 'classes/Controller.php', - 'Controller' => 'override/classes/Controller.php', 'ControllerFactoryCore' => 'classes/ControllerFactory.php', 'ControllerFactory' => 'override/classes/ControllerFactory.php', + 'ControllerCore' => 'classes/Controller.php', + 'Controller' => 'override/classes/Controller.php', 'CookieCore' => 'classes/Cookie.php', 'Cookie' => 'override/classes/Cookie.php', 'CountryCore' => 'classes/Country.php', @@ -64,16 +74,26 @@ 'County' => 'override/classes/County.php', 'CurrencyCore' => 'classes/Currency.php', 'Currency' => 'override/classes/Currency.php', - 'CustomerCore' => 'classes/Customer.php', - 'Customer' => 'override/classes/Customer.php', 'CustomerMessageCore' => 'classes/CustomerMessage.php', 'CustomerMessage' => 'override/classes/CustomerMessage.php', + 'CustomerCore' => 'classes/Customer.php', + 'Customer' => 'override/classes/Customer.php', 'CustomerThreadCore' => 'classes/CustomerThread.php', 'CustomerThread' => 'override/classes/CustomerThread.php', 'CustomizationCore' => 'classes/Customization.php', 'Customization' => 'override/classes/Customization.php', 'DateRangeCore' => 'classes/DateRange.php', 'DateRange' => 'override/classes/DateRange.php', + 'DbMySQLiCore' => 'classes/db/DbMySQLi.php', + 'DbMySQLi' => 'override/classes/db/DbMySQLi.php', + 'DbPDOCore' => 'classes/db/DbPDO.php', + 'DbPDO' => 'override/classes/db/DbPDO.php', + 'DbCore' => 'classes/db/Db.php', + 'Db' => 'override/classes/db/Db.php', + 'DbQueryCore' => 'classes/db/DbQuery.php', + 'DbQuery' => 'override/classes/db/DbQuery.php', + 'MySQLCore' => 'classes/db/MySQL.php', + 'MySQL' => 'override/classes/db/MySQL.php', 'DeliveryCore' => 'classes/Delivery.php', 'Delivery' => 'override/classes/Delivery.php', 'DiscountCore' => 'classes/Discount.php', @@ -82,6 +102,14 @@ 'Dispatcher' => 'override/classes/Dispatcher.php', 'EmployeeCore' => 'classes/Employee.php', 'Employee' => 'override/classes/Employee.php', + 'PrestashopDatabaseExceptionCore' => 'classes/exception/PrestashopDatabaseException.php', + 'PrestashopDatabaseException' => 'override/classes/exception/PrestashopDatabaseException.php', + 'PrestashopExceptionCore' => 'classes/exception/PrestashopException.php', + 'PrestashopException' => 'override/classes/exception/PrestashopException.php', + 'PrestashopModuleExceptionCore' => 'classes/exception/PrestashopModuleException.php', + 'PrestashopModuleException' => 'override/classes/exception/PrestashopModuleException.php', + 'PrestashopPaymentExceptionCore' => 'classes/exception/PrestashopPaymentException.php', + 'PrestashopPaymentException' => 'override/classes/exception/PrestashopPaymentException.php', 'FeatureCore' => 'classes/Feature.php', 'Feature' => 'override/classes/Feature.php', 'FeatureValueCore' => 'classes/FeatureValue.php', @@ -102,10 +130,12 @@ 'Guest' => 'override/classes/Guest.php', 'HelpAccessCore' => 'classes/HelpAccess.php', 'HelpAccess' => 'override/classes/HelpAccess.php', - 'HelperCore' => 'classes/Helper.php', - 'Helper' => 'override/classes/Helper.php', + 'HelperFormCore' => 'classes/HelperForm.php', + 'HelperForm' => '', 'HelperListCore' => 'classes/HelperList.php', 'HelperList' => '', + 'HelperCore' => 'classes/Helper.php', + 'Helper' => 'override/classes/Helper.php', 'HookCore' => 'classes/Hook.php', 'Hook' => 'override/classes/Hook.php', 'ImageCore' => 'classes/Image.php', @@ -132,22 +162,20 @@ 'Message' => 'override/classes/Message.php', 'MetaCore' => 'classes/Meta.php', 'Meta' => 'override/classes/Meta.php', - 'ModuleCore' => 'classes/Module.php', - 'Module' => 'override/classes/Module.php', - 'ModuleGraphCore' => 'classes/ModuleGraph.php', - 'ModuleGraph' => 'override/classes/ModuleGraph.php', 'ModuleGraphEngineCore' => 'classes/ModuleGraphEngine.php', 'ModuleGraphEngine' => 'override/classes/ModuleGraphEngine.php', - 'ModuleGridCore' => 'classes/ModuleGrid.php', - 'ModuleGrid' => 'override/classes/ModuleGrid.php', + 'ModuleGraphCore' => 'classes/ModuleGraph.php', + 'ModuleGraph' => 'override/classes/ModuleGraph.php', 'ModuleGridEngineCore' => 'classes/ModuleGridEngine.php', 'ModuleGridEngine' => 'override/classes/ModuleGridEngine.php', + 'ModuleGridCore' => 'classes/ModuleGrid.php', + 'ModuleGrid' => 'override/classes/ModuleGrid.php', + 'ModuleCore' => 'classes/Module.php', + 'Module' => 'override/classes/Module.php', 'NotificationCore' => 'classes/Notification.php', 'Notification' => 'override/classes/Notification.php', 'ObjectModelCore' => 'classes/ObjectModel.php', 'ObjectModel' => 'override/classes/ObjectModel.php', - 'OrderCore' => 'classes/Order.php', - 'Order' => 'override/classes/Order.php', 'OrderDetailCore' => 'classes/OrderDetail.php', 'OrderDetail' => 'override/classes/OrderDetail.php', 'OrderDiscountCore' => 'classes/OrderDiscount.php', @@ -156,6 +184,8 @@ 'OrderHistory' => 'override/classes/OrderHistory.php', 'OrderMessageCore' => 'classes/OrderMessage.php', 'OrderMessage' => 'override/classes/OrderMessage.php', + 'OrderCore' => 'classes/Order.php', + 'Order' => 'override/classes/Order.php', 'OrderReturnCore' => 'classes/OrderReturn.php', 'OrderReturn' => 'override/classes/OrderReturn.php', 'OrderReturnStateCore' => 'classes/OrderReturnState.php', @@ -164,8 +194,6 @@ 'OrderSlip' => 'override/classes/OrderSlip.php', 'OrderStateCore' => 'classes/OrderState.php', 'OrderState' => 'override/classes/OrderState.php', - 'PDFCore' => 'classes/PDF.php', - 'PDF' => 'override/classes/PDF.php', 'PackCore' => 'classes/Pack.php', 'Pack' => 'override/classes/Pack.php', 'PageCore' => 'classes/Page.php', @@ -174,10 +202,12 @@ 'PaymentCC' => 'override/classes/PaymentCC.php', 'PaymentModuleCore' => 'classes/PaymentModule.php', 'PaymentModule' => 'override/classes/PaymentModule.php', - 'ProductCore' => 'classes/Product.php', - 'Product' => 'override/classes/Product.php', + 'PDFCore' => 'classes/PDF.php', + 'PDF' => 'override/classes/PDF.php', 'ProductDownloadCore' => 'classes/ProductDownload.php', 'ProductDownload' => 'override/classes/ProductDownload.php', + 'ProductCore' => 'classes/Product.php', + 'Product' => 'override/classes/Product.php', 'ProductSaleCore' => 'classes/ProductSale.php', 'ProductSale' => 'override/classes/ProductSale.php', 'ProfileCore' => 'classes/Profile.php', @@ -196,20 +226,34 @@ 'Rijndael' => 'override/classes/Rijndael.php', 'SceneCore' => 'classes/Scene.php', 'Scene' => 'override/classes/Scene.php', - 'SearchCore' => 'classes/Search.php', - 'Search' => 'override/classes/Search.php', 'SearchEngineCore' => 'classes/SearchEngine.php', 'SearchEngine' => 'override/classes/SearchEngine.php', + 'SearchCore' => 'classes/Search.php', + 'Search' => 'override/classes/Search.php', + 'GroupShopCore' => 'classes/shop/GroupShop.php', + 'GroupShop' => 'override/classes/shop/GroupShop.php', + 'ShopCore' => 'classes/shop/Shop.php', + 'Shop' => 'override/classes/shop/Shop.php', + 'ShopUrlCore' => 'classes/shop/ShopUrl.php', + 'ShopUrl' => 'override/classes/shop/ShopUrl.php', 'SpecificPriceCore' => 'classes/SpecificPrice.php', 'SpecificPrice' => 'override/classes/SpecificPrice.php', 'StateCore' => 'classes/State.php', 'State' => 'override/classes/State.php', - 'StockCore' => 'classes/Stock.php', - 'Stock' => 'override/classes/Stock.php', + 'StockManagerFactoryCore' => 'classes/stock/StockManagerFactory.php', + 'StockManagerFactory' => '', + 'StockManagerInterface' => 'classes/stock/StockManagerInterface.php', + 'StockManagerModule' => 'classes/stock/StockManagerModule.php', + 'StockManagerCore' => 'classes/stock/StockManager.php', + 'StockManager' => '', + 'WarehouseCore' => 'classes/stock/Warehouse.php', + 'Warehouse' => '', 'StockMvtCore' => 'classes/StockMvt.php', 'StockMvt' => 'override/classes/StockMvt.php', 'StockMvtReasonCore' => 'classes/StockMvtReason.php', 'StockMvtReason' => 'override/classes/StockMvtReason.php', + 'StockCore' => 'classes/Stock.php', + 'Stock' => 'override/classes/Stock.php', 'StoreCore' => 'classes/Store.php', 'Store' => 'override/classes/Store.php', 'SubDomainCore' => 'classes/SubDomain.php', @@ -220,6 +264,21 @@ 'Tab' => 'override/classes/Tab.php', 'TagCore' => 'classes/Tag.php', 'Tag' => 'override/classes/Tag.php', + 'TaxCalculatorCore' => 'classes/tax/TaxCalculator.php', + 'TaxCalculator' => 'override/classes/tax/TaxCalculator.php', + 'TaxManagerFactoryCore' => 'classes/tax/TaxManagerFactory.php', + 'TaxManagerFactory' => 'override/classes/tax/TaxManagerFactory.php', + 'TaxManagerInterface' => 'classes/tax/TaxManagerInterface.php', + 'TaxManagerModuleCore' => 'classes/tax/TaxManagerModule.php', + 'TaxManagerModule' => 'override/classes/tax/TaxManagerModule.php', + 'TaxCore' => 'classes/tax/Tax.php', + 'Tax' => 'override/classes/tax/Tax.php', + 'TaxRuleCore' => 'classes/tax/TaxRule.php', + 'TaxRule' => 'override/classes/tax/TaxRule.php', + 'TaxRulesGroupCore' => 'classes/tax/TaxRulesGroup.php', + 'TaxRulesGroup' => 'override/classes/tax/TaxRulesGroup.php', + 'TaxRulesTaxManagerCore' => 'classes/tax/TaxRulesTaxManager.php', + 'TaxRulesTaxManager' => 'override/classes/tax/TaxRulesTaxManager.php', 'ThemeCore' => 'classes/Theme.php', 'Theme' => 'override/classes/Theme.php', 'ToolsCore' => 'classes/Tools.php', @@ -230,65 +289,6 @@ 'Upgrader' => 'override/classes/Upgrader.php', 'ValidateCore' => 'classes/Validate.php', 'Validate' => 'override/classes/Validate.php', - 'ZoneCore' => 'classes/Zone.php', - 'Zone' => 'override/classes/Zone.php', - 'CacheCore' => 'classes/cache/Cache.php', - 'Cache' => 'override/classes/cache/Cache.php', - 'CacheApcCore' => 'classes/cache/CacheApc.php', - 'CacheApc' => 'override/classes/cache/CacheApc.php', - 'CacheFsCore' => 'classes/cache/CacheFs.php', - 'CacheFs' => 'override/classes/cache/CacheFs.php', - 'CacheMemcacheCore' => 'classes/cache/CacheMemcache.php', - 'CacheMemcache' => 'override/classes/cache/CacheMemcache.php', - 'CacheXcacheCore' => 'classes/cache/CacheXcache.php', - 'CacheXcache' => 'override/classes/cache/CacheXcache.php', - 'DbCore' => 'classes/db/Db.php', - 'Db' => 'override/classes/db/Db.php', - 'DbMySQLiCore' => 'classes/db/DbMySQLi.php', - 'DbMySQLi' => 'override/classes/db/DbMySQLi.php', - 'DbPDOCore' => 'classes/db/DbPDO.php', - 'DbPDO' => 'override/classes/db/DbPDO.php', - 'DbQueryCore' => 'classes/db/DbQuery.php', - 'DbQuery' => 'override/classes/db/DbQuery.php', - 'MySQLCore' => 'classes/db/MySQL.php', - 'MySQL' => 'override/classes/db/MySQL.php', - 'PrestashopDatabaseExceptionCore' => 'classes/exception/PrestashopDatabaseException.php', - 'PrestashopDatabaseException' => 'override/classes/exception/PrestashopDatabaseException.php', - 'PrestashopExceptionCore' => 'classes/exception/PrestashopException.php', - 'PrestashopException' => 'override/classes/exception/PrestashopException.php', - 'PrestashopModuleExceptionCore' => 'classes/exception/PrestashopModuleException.php', - 'PrestashopModuleException' => 'override/classes/exception/PrestashopModuleException.php', - 'PrestashopPaymentExceptionCore' => 'classes/exception/PrestashopPaymentException.php', - 'PrestashopPaymentException' => 'override/classes/exception/PrestashopPaymentException.php', - 'GroupShopCore' => 'classes/shop/GroupShop.php', - 'GroupShop' => 'override/classes/shop/GroupShop.php', - 'ShopCore' => 'classes/shop/Shop.php', - 'Shop' => 'override/classes/shop/Shop.php', - 'ShopUrlCore' => 'classes/shop/ShopUrl.php', - 'ShopUrl' => 'override/classes/shop/ShopUrl.php', - 'StockManagerCore' => 'classes/stock/StockManager.php', - 'StockManager' => '', - 'StockManagerFactoryCore' => 'classes/stock/StockManagerFactory.php', - 'StockManagerFactory' => '', - 'StockManagerInterface' => 'classes/stock/StockManagerInterface.php', - 'StockManagerModule' => 'classes/stock/StockManagerModule.php', - 'StockWarehouseCore' => 'classes/stock/StockWarehouse.php', - 'StockWarehouse' => '', - 'TaxCore' => 'classes/tax/Tax.php', - 'Tax' => 'override/classes/tax/Tax.php', - 'TaxCalculatorCore' => 'classes/tax/TaxCalculator.php', - 'TaxCalculator' => 'override/classes/tax/TaxCalculator.php', - 'TaxManagerFactoryCore' => 'classes/tax/TaxManagerFactory.php', - 'TaxManagerFactory' => 'override/classes/tax/TaxManagerFactory.php', - 'TaxManagerInterface' => 'classes/tax/TaxManagerInterface.php', - 'TaxManagerModuleCore' => 'classes/tax/TaxManagerModule.php', - 'TaxManagerModule' => 'override/classes/tax/TaxManagerModule.php', - 'TaxRuleCore' => 'classes/tax/TaxRule.php', - 'TaxRule' => 'override/classes/tax/TaxRule.php', - 'TaxRulesGroupCore' => 'classes/tax/TaxRulesGroup.php', - 'TaxRulesGroup' => 'override/classes/tax/TaxRulesGroup.php', - 'TaxRulesTaxManagerCore' => 'classes/tax/TaxRulesTaxManager.php', - 'TaxRulesTaxManager' => 'override/classes/tax/TaxRulesTaxManager.php', 'WebserviceExceptionCore' => 'classes/webservice/WebserviceException.php', 'WebserviceException' => 'override/classes/webservice/WebserviceException.php', 'WebserviceKeyCore' => 'classes/webservice/WebserviceKey.php', @@ -305,6 +305,8 @@ 'WebserviceSpecificManagementInterface' => 'classes/webservice/WebserviceSpecificManagementInterface.php', 'WebserviceSpecificManagementSearchCore' => 'classes/webservice/WebserviceSpecificManagementSearch.php', 'WebserviceSpecificManagementSearch' => 'override/classes/webservice/WebserviceSpecificManagementSearch.php', + 'ZoneCore' => 'classes/Zone.php', + 'Zone' => 'override/classes/Zone.php', 'FB' => 'override/classes/fb.php', 'AdminAddressesControllerCore' => 'controllers/admin/AdminAddressesController.php', 'AdminAddressesController' => '', diff --git a/classes/Carrier.php b/classes/Carrier.php index 79148a2e3..4caa4316d 100644 --- a/classes/Carrier.php +++ b/classes/Carrier.php @@ -41,6 +41,9 @@ class CarrierCore extends ObjectModel const SHIPPING_METHOD_PRICE = 2; const SHIPPING_METHOD_FREE = 3; + const SORT_BY_PRICE = 0; + const SORT_BY_POSITION = 1; + /** @var int Tax id (none = 0) */ public $id_tax_rules_group; @@ -538,6 +541,17 @@ class CarrierCore extends ObjectModel } $results_array[] = $row; } + + // if we have to sort carriers by price + if (Configuration::get('PS_CARRIER_DEFAULT_SORT') == Carrier::SORT_BY_PRICE) + { + foreach ($results_array as $r) + { + $prices[] = $r['price']; + } + array_multisort($prices, SORT_NUMERIC, $results_array); + } + return $results_array; } diff --git a/install-dev/php/add_carrier_position.php b/install-dev/php/add_carrier_position.php new file mode 100755 index 000000000..2aef8b0ea --- /dev/null +++ b/install-dev/php/add_carrier_position.php @@ -0,0 +1,45 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 6844 $ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +function add_carrier_position() +{ + $carriers = Db::getInstance()->executeS(' + SELECT `id_carrier` + FROM `'._DB_PREFIX_.'carrier` + WHERE `deleted` = 0'); + if (count($carriers) && is_array($carriers)) + { + $i = 0; + foreach ($carriers as $carrier) + { + Db::getInstance()->execute(' + UPDATE `'._DB_PREFIX_.'carrier` + SET `position` = '.$i++.' + WHERE `id_carrier` = '.(int)$carrier['id_carrier']); + } + } +} \ No newline at end of file diff --git a/install-dev/sql/db_settings_lite.sql b/install-dev/sql/db_settings_lite.sql index 1e9af6644..4d8c7cb83 100644 --- a/install-dev/sql/db_settings_lite.sql +++ b/install-dev/sql/db_settings_lite.sql @@ -233,7 +233,11 @@ INSERT INTO `PREFIX_configuration` (`id_configuration`, `name`, `value`, `date_a (145, 'PS_DISCOUNT_FEATURE_ACTIVE', '0', NOW(), NOW()), (146, 'PS_GROUP_FEATURE_ACTIVE', '0', NOW(), NOW()), (147, 'PS_PACK_FEATURE_ACTIVE', '0', NOW(), NOW()), -(148, 'PS_ALIAS_FEATURE_ACTIVE', '1', NOW(), NOW()); +(148, 'PS_ALIAS_FEATURE_ACTIVE', '1', NOW(), NOW(), +(149, 'PS_CARRIER_DEFAULT', '1', NOW(), NOW()), +(150, 'PS_TAX_ADDRESS_TYPE', 'id_address_delivery', NOW(), NOW()), +(151, 'PS_SHOP_DEFAULT', '1', NOW(), NOW()), +(152, 'PS_CARRIER_DEFAULT_SORT', '0', NOW(), NOW())); INSERT INTO `PREFIX_configuration_lang` (`id_configuration`, `id_lang`, `value`, `date_upd`) VALUES (36, 1, 'IN', NOW()),(36, 2, 'FA', NOW()),(36, 3, 'CU', NOW()),(36, 4, 'FA', NOW()),(36, 5, 'FA', NOW()), @@ -1187,8 +1191,6 @@ INSERT INTO `PREFIX_carrier_zone` (`id_carrier`, `id_zone`) VALUES (1, 1); INSERT INTO `PREFIX_carrier_shop` (`id_carrier`, `id_shop`) VALUES (1,1); -INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_CARRIER_DEFAULT', '1', NOW(), NOW()); - /* Timezone */ INSERT INTO `PREFIX_timezone` (`name`) VALUES ('Africa/Abidjan'),('Africa/Accra'),('Africa/Addis_Ababa'),('Africa/Algiers'), ('Africa/Asmara'),('Africa/Asmera'),('Africa/Bamako'),('Africa/Bangui'),('Africa/Banjul'),('Africa/Bissau'),('Africa/Blantyre'), @@ -1275,7 +1277,6 @@ INSERT INTO `PREFIX_group_lang` (`id_group`, `id_lang`, `name`) VALUES (1, 1, 'D INSERT INTO `PREFIX_group_group_shop` (`id_group`, `id_group_shop`) (SELECT `id_group`, 1 FROM `PREFIX_group`); INSERT INTO `PREFIX_category_group` (`id_category`, `id_group`) VALUES (1, 1); -INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_TAX_ADDRESS_TYPE', 'id_address_delivery', NOW(), NOW()); INSERT INTO `PREFIX_stock_mvt_reason` (`id_stock_mvt_reason`, `sign`, `date_add`, `date_upd`) VALUES (1, 1, NOW(), NOW()), (2, -1, NOW(), NOW()), (3, -1, NOW(), NOW()), (4, -1, NOW(), NOW()), (5, 1, NOW(), NOW()); @@ -1318,7 +1319,6 @@ phone' where `id_country`=21; INSERT INTO `PREFIX_group_shop` (`id_group_shop`, `name`, `active`, `deleted`, `share_stock`, `share_customer`, `share_order`) VALUES (1, 'Default', 1, 0, 0, 0, 0); INSERT INTO `PREFIX_shop` (`id_shop`, `id_group_shop`, `name`, `id_category`, `id_theme`, `active`, `deleted`) VALUES (1, 1, 'Default', 1, 1, 1, 0); -INSERT INTO `PREFIX_configuration` (`id_configuration`, `name`, `value`, `date_add`, `date_upd`) VALUES (NULL, 'PS_SHOP_DEFAULT', '1', NOW(), NOW()); INSERT INTO `PREFIX_theme` (`id_theme`, `name`) VALUES (1, 'prestashop'); diff --git a/translations/fr/admin.php b/translations/fr/admin.php index 07f126598..76ec6f854 100644 --- a/translations/fr/admin.php +++ b/translations/fr/admin.php @@ -68,7 +68,6 @@ $_LANGADM['AdminAttributes76a2e1080cd661b42c6653fc8fd57367'] = 'Texture :'; $_LANGADM['AdminAttributes390bd26864da3269b496814c118238c0'] = 'Choisir une texture spécifique'; $_LANGADM['AdminAttributesba353198430b2004efeb1ac6d1f410d0'] = 'Ceci remplacera la couleur HTML !'; $_LANGADM['AdminAttributes859c7c7ffc3e60f67f6537f4d7dd98ca'] = 'Texture actuelle :'; -$_LANGADM['AdminAttributes099af53f601532dbd31e0ea99ffdeb64'] = 'supprimer'; $_LANGADM['AdminAttributes6adf97f83acf6453d4a6a4b1070f3754'] = 'Aucun'; $_LANGADM['AdminAttributes38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer'; $_LANGADM['AdminAttributes19f823c6453c2b1ffd09cb715214813d'] = 'Champs requis'; @@ -215,9 +214,13 @@ $_LANGADM['AdminCarriers8c2857a9ad1d8f31659e35e904e20fa6'] = 'Logo'; $_LANGADM['AdminCarriers8f497c1a3d15af9e0c215019f26b887d'] = 'Délai'; $_LANGADM['AdminCarriersec53a8c4f07baed5d8825072c89799be'] = 'Statut'; $_LANGADM['AdminCarriersf9293626f0c44c6e310fc49280c20790'] = 'Transporteur gratuit'; +$_LANGADM['AdminCarriers52f5e0bc3859bc5f5e25130b6c7e8881'] = 'Position'; +$_LANGADM['AdminCarriers3601146c4e948c32b6424d2c0a7f0118'] = 'Prix'; $_LANGADM['AdminCarriers8430a7b1b81635e3df949c2845303303'] = 'Options du transporteur'; $_LANGADM['AdminCarriers80ac9c802ce4d76982ab5a2e5a54b8bc'] = 'Transporteur par défaut :'; $_LANGADM['AdminCarriers5528aa4f25577dcffcfca40eda4c2a5b'] = 'Transporteur par défaut utilisé dans la boutique'; +$_LANGADM['AdminCarriers544532426f92451ebe42205efa14bf2a'] = 'Tri par défaut du transporteur :'; +$_LANGADM['AdminCarriersd651904bdc84edacc04911bbf7c8e2e5'] = 'Ce tri par défaut ne sera disponible que sur la boutique'; $_LANGADM['AdminCarriersc0add41517a5511d7b58d2c992db11e7'] = 'Comment créer un nouveau transporteur ?'; $_LANGADM['AdminCarriersb8bf3ffcbb8025ef76f8d67fff0cdf2b'] = 'Cliquez sur \"Nouveau\".'; $_LANGADM['AdminCarriersb7ccdf6ab58f5514acc520721ddc9f08'] = 'Remplissez les champs et cliquez sur \"Enregistrer\".'; @@ -854,9 +857,9 @@ $_LANGADM['AdminEmployeesa9e4402481bd9b8e36752bf731f67eb6'] = 'Thème :'; $_LANGADM['AdminEmployeese4b41fb20213ac1461a81cb0c310bd97'] = 'Mode d\'interface'; $_LANGADM['AdminEmployeesf177aa999000021a3901ac78a2728b59'] = 'Affichage au survol'; $_LANGADM['AdminEmployeesd4e0f6342c209912053fec10be72c94b'] = 'Affichage au clic'; -$_LANGADM['AdminEmployees24a23d787190f2c4812ff9ab11847a72'] = 'Statut :'; $_LANGADM['AdminEmployees00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé'; $_LANGADM['AdminEmployeesb9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé'; +$_LANGADM['AdminEmployees24a23d787190f2c4812ff9ab11847a72'] = 'Statut :'; $_LANGADM['AdminEmployees41bc9496fbde8565bd5fc699e513fbd9'] = 'Autoriser cet employé à se connecter au Back Office'; $_LANGADM['AdminEmployees9fbf3617c6172a75648e9ac0a864bb56'] = 'Profil :'; $_LANGADM['AdminEmployees7bc873cba11f035df692c3549366c722'] = '-- Choisissez --'; @@ -919,7 +922,6 @@ $_LANGADM['AdminGeneratorad11acdc8759d7a20ca3b868a8db30ae'] = 'Génération du f $_LANGADM['AdminGenerator3f3e336e2f1fa10375efd923fca18b55'] = 'Avertissement :'; $_LANGADM['AdminGenerator620da2256fdfaa8c903cc870221450ca'] = 'cet outil peut SEULEMENT être utilisé si vous êtes hébergé par un serveur web Apache. Merci de demander à votre hébergeur.'; $_LANGADM['AdminGenerator53bdd80ab93282cc38ef9c605f058eba'] = 'Cet outil va générer automatiquement le fichier \".htaccess\" offrant la possibilité de procéder à la ré-écriture d\'URL de la boutique et de personnaliser les erreurs 404.'; -$_LANGADM['AdminGenerator18727f0f95739b6c5e9c2301b5a56ffa'] = 'Si vous n\'avez pas l\'option \"URL simplifiée\" activée lors de la génération du fichier \".htaccess\", cette fonctionnalité ne sera pas disponible.'; $_LANGADM['AdminGenerator15970c4fdbca1fc48c5b412d94e798c0'] = 'Optimisation'; $_LANGADM['AdminGenerator32d593fb52ab5e4ae3f16844b576867d'] = 'En cochant cette case, votre fichier .htaccess sera complété automatiquement avec des directives améliorant le cache et la compression.'; $_LANGADM['AdminGenerator1dec4f55522b828fe5dacf8478021a9e'] = 'URLs simplifiées'; @@ -974,7 +976,6 @@ $_LANGADM['AdminGroups49ee3087348e8d44e1feda1917443987'] = 'Nom'; $_LANGADM['AdminGroups104d9898c04874d0fbac36e125fa1369'] = 'Réduction'; $_LANGADM['AdminGroupsef53538ae41a651c7f72ab6cb1135d8c'] = 'Membres'; $_LANGADM['AdminGroups3112209b2dd9b55cf5dbc4865dd15afd'] = 'Date de création'; -$_LANGADM['AdminGroups03937134cedab9078be39a77ee3a48a0'] = 'Groupe'; $_LANGADM['AdminGroups4e140ba723a03baa6948340bf90e2ef6'] = 'Nom :'; $_LANGADM['AdminGroups6252c0f2c2ed83b7b06dfca86d4650bb'] = 'Caractères invalides :'; $_LANGADM['AdminGroupsa1e7379abfdbc3b8e03506e5489c6110'] = 'Réduction:'; @@ -1107,6 +1108,8 @@ $_LANGADM['AdminImport7a1920d61156abc05a60135aefe8bc67'] = 'Défaut'; $_LANGADM['AdminImport9b93b45649ec5961b8cc84e905964683'] = 'Position de l\'image'; $_LANGADM['AdminImport9c163d2934fbdd2775356db804d451fc'] = 'Position de l\'image produit à utiliser pour cette déclinaison. Si vous remplissez ce champ, laissez le champ \"URL de l\'image\" vide.'; $_LANGADM['AdminImport427b6d816d7fdd86cabe48d8180a3cc9'] = 'URL de l\'image'; +$_LANGADM['AdminImport14913d7e9d486e77b5c8d085e3797f94'] = 'Supprimer les images existantes (0 = non, 1 = oui)'; +$_LANGADM['AdminImporte6691747add3b37b9c381b8d9476fd4c'] = 'Si vous ne spécifiez pas cette colonne et vous spécifier la colonne images, toutes les images du produit seront remplacé par celle spécifié dans le fichier d\'import'; $_LANGADM['AdminImportb718adec73e04ce3ec720dd11a06a308'] = 'Identifiant'; $_LANGADM['AdminImportfd0dcc6233b026d257763713c133cf72'] = 'Actif (0/1)'; $_LANGADM['AdminImport2688a544cd5ac33f27ab78c8d8c3acaa'] = 'Nom *'; @@ -1137,9 +1140,8 @@ $_LANGADM['AdminImportf2149c422ab7577f063b69a2884d17f0'] = 'Disponible'; $_LANGADM['AdminImportb1a2a959c20b1bd847895e73a5fddbc9'] = 'Date d\'ajout d\'un produit'; $_LANGADM['AdminImporte1a5e653bc356ed6745d6814d50213eb'] = 'Afficher le prix'; $_LANGADM['AdminImport4d2589e1bcd4263cb99927b59f0f88d2'] = 'URLs des images (x,y,z...)'; -$_LANGADM['AdminImport14913d7e9d486e77b5c8d085e3797f94'] = 'Supprimer les images existantes (0 = non, 1 = oui)'; -$_LANGADM['AdminImporte6691747add3b37b9c381b8d9476fd4c'] = 'Si vous ne spécifiez pas cette colonne et vous spécifier la colonne images, toutes les images du produit seront remplacé par celle spécifié dans le fichier d\'import'; -$_LANGADM['AdminImport21021ea0e52be8e9c599f4dff41e5be0'] = 'Caractéristique'; +$_LANGADM['AdminImportecde3e896afb64e9a48781b8363b9a03'] = 'Caractéristique(Nom:Valeur:Position)'; +$_LANGADM['AdminImport93b145201f52e9210402f4281ff8c188'] = 'Position de la caractéristique'; $_LANGADM['AdminImport71d0ceacdf562024f2d4c3a76d3b63e4'] = 'Uniquement disponible en ligne'; $_LANGADM['AdminImport9e2941b3c81256fac10392aaca4ccfde'] = 'Etat'; $_LANGADM['AdminImportf8a0fa3674c3336359b77bbe8e942a2c'] = 'ID ou nom de la boutique'; @@ -1899,7 +1901,6 @@ $_LANGADM['AdminPreferencesc173252856179a44a9506a968359de8b'] = 'Fixe un prix po $_LANGADM['AdminPreferences0d8bdbe98feb696dd76760ee1374a740'] = 'Tax des emballages cadeaux'; $_LANGADM['AdminPreferences9311ccba175a9f2fc72e7c6a3dfb6078'] = 'Fixe une taxe pour le prix de l\'emballage cadeau'; $_LANGADM['AdminPreferences3aadb5e86b174ecada1174e22f5a6368'] = 'Poids maximum des fichiers joints'; -$_LANGADM['AdminPreferences0550caa9a256c7672bda5f09a45c9334'] = 'Configurer la limite de tailles des fichiers téléchargeables (en MegaOctets)'; $_LANGADM['AdminPreferencesb667478ccafce4bff6d427a6bca06269'] = 'Proposer des emballages recyclés'; $_LANGADM['AdminPreferencese84eed89f38f20639431d99ad2f5ee8a'] = 'Le client choisit de recevoir un colis recyclé'; $_LANGADM['AdminPreferencese6b03a6bdf49d1cd0655e0f7a3d990cb'] = 'Ré-afficher le panier après identification'; @@ -2175,7 +2176,6 @@ $_LANGADM['AdminProducts32b919d18cfaca89383f6000dcc9c031'] = 'Générer'; $_LANGADM['AdminProductsb06f68603b4cf2f867480c4d1eb6a611'] = 'URL simplifié basée sur le nom du produit'; $_LANGADM['AdminProducts92ab5edf4194cb5a84d6808cb8d8b696'] = 'Le lien vers la fiche produit sera :'; $_LANGADM['AdminProducts234078adec0a64008b6ae77653776cfa'] = 'Résumé :'; -$_LANGADM['AdminProducts83d4043f36afbc6c2549ec9309d9aee8'] = 'apparaîtra dans les moteurs de recherche'; $_LANGADM['AdminProductsc39ddd7f7c2983a075a10bff9ff14ae5'] = 'Vous souhaitez mettre une image associé à ce produit dans votre description ?'; $_LANGADM['AdminProducts936ccdb97115e9f35a11d35e3d5b5cad'] = 'Cliquez ici'; $_LANGADM['AdminProducts8300b58d12ed9de055d7a727c72ef55a'] = 'Sélectionner votre image :'; @@ -2499,8 +2499,6 @@ $_LANGADM['AdminScenesc820e0c1d4ae16db218626f49e7916b1'] = 'Ko max.'; $_LANGADM['AdminScenes0b24516ee8c68a18020951583bc3b8ab'] = 'Automatiquement redimensionné à'; $_LANGADM['AdminScenes8a5c9824486e8c1f74cb4c4ec8f9e465'] = '(hauteur x largeur)'; $_LANGADM['AdminScenesa5394858079fa378684b20a1abc0e9be'] = 'Note : Pour changer la dimension de base des images de scènes, veuillez modifier le paramètre \'large_scene\' avec les dimensions souhaitées (dans le Back office : Onglet \'Préférences\' > Onglet \'Image\').'; -$_LANGADM['AdminScenes56a8a9eb05f9014da51a4f9b57322ac7'] = 'Catégorie(s) :'; -$_LANGADM['AdminScenes19f2cd1d239a894f67d4ac73058af014'] = 'Cochez les cases des catégories dans lesquelles la scène doit apparaître.'; $_LANGADM['AdminScenesdf41d831253828e9852a25c72393fde8'] = 'Enregistrez la scène'; $_LANGADM['AdminScenesf5dae0e1b3d4bc66fadd2840b4f79227'] = 'Veuillez ajouter une image pour continuer'; $_LANGADM['AdminScenes19f823c6453c2b1ffd09cb715214813d'] = 'Champs requis'; @@ -2511,9 +2509,7 @@ $_LANGADM['AdminSearchc0bd7654d5b278e65f21cf4e9153fdb4'] = 'Fabriquant'; $_LANGADM['AdminSearch63d5049791d9d79d86e9a108b0a999ca'] = 'Référence'; $_LANGADM['AdminSearch49ee3087348e8d44e1feda1917443987'] = 'Nom'; $_LANGADM['AdminSearch3601146c4e948c32b6424d2c0a7f0118'] = 'Prix'; -$_LANGADM['AdminSearch4b78ac8eb158840e9638a3aeb26c4a9d'] = 'Taxe'; $_LANGADM['AdminSearch27ce7f8b5623b2e2df568d64cf051607'] = 'Stock'; -$_LANGADM['AdminSearch8c489d0946f66d17d73f26366a4bf620'] = 'Poids'; $_LANGADM['AdminSearchec53a8c4f07baed5d8825072c89799be'] = 'Statut'; $_LANGADM['AdminSearch06df33001c1d7187fdd81ea1f5b277aa'] = 'Actions'; $_LANGADM['AdminSearchdaab80c5dadc81fa2d019c562f805994'] = 'Genre'; @@ -2951,7 +2947,6 @@ $_LANGADM['AdminTranslations4a4ec3855ac2f9f99d29088b6cc914a1'] = 'Champs à trad $_LANGADM['AdminTranslationsd05b6ed7d2345020440df396d6da7f73'] = 'champs'; $_LANGADM['AdminTranslations7f34f2676cea244eff88e272f03a6e03'] = 'traduction manquante(s) sur le template(s) %s pour % s'; $_LANGADM['AdminTranslationsb3cb7b15aa2fb2cb6675414233a3aa1b'] = 'Objet pour %s :'; -$_LANGADM['AdminTranslations336b1855d0b132434c887a50f4a425cc'] = 'Aucun objet n\'a été trouvée pour %s.'; $_LANGADM['AdminTranslations078deac9ee43d3b13c460c4fd069b925'] = 'Il ya un problème pour obtenir les fichiers Mail.'; $_LANGADM['AdminTranslationsd2298f4722b53d97039abbe9d1c11a44'] = 'Veuillez vous assurer que les fichiers anglais existent dans le dossier %s'; $_LANGADM['AdminTranslations98ef80a9c71c74e06e1e185dff22a5d3'] = 'Balise \"title\" :'; @@ -3278,7 +3273,6 @@ $_LANGADM['index13348442cc6a27032d2b4aa28b75a5d3'] = 'Recherche'; $_LANGADM['index4f32a32dea642737580dd71cdfd8d3c0'] = 'Accès rapide'; $_LANGADM['index891cea3363eb13a9ed383ae32f0b48d8'] = 'Selectionnez votre boutique :'; $_LANGADM['index53cd939ae14e33855274e17a3c411fdd'] = 'Pour des raisons de sécurité, vous devez :'; -$_LANGADM['index362b56674d07160fab60725a927bbf13'] = 'supprimer le dossier /install'; $_LANGADM['index7286baef44d09300636a4b99c533523c'] = 'Temps de chargement :'; $_LANGADM['indexbbaff12800505b22a853e8b7f4eb6a22'] = 'Contact'; $_LANGADM['index3e937d04c1c83492260a33d926ca587c'] = 'Bug Tracker';