// Release branch merged
This commit is contained in:
Francois Gaillard
@@ -35,12 +35,12 @@
|
||||
</div>
|
||||
<div class="footerRight">
|
||||
{if $iso_is_fr}
|
||||
<span>Questions / Renseignements / Formations :</span> <strong>+33 (0)1.40.18.30.04</strong> de 09h à 18h
|
||||
<span>Questions / Renseignements / Formations :</span> <strong>+33 (0)1.40.18.30.04</strong>
|
||||
{/if}
|
||||
| <a href="http://www.prestashop.com/en/contact_us/" target="_blank" class="footer_link">{l s='Contact'}</a>
|
||||
| <a href="http://forge.prestashop.com" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
|
||||
| <a href="http://www.prestashop.com/forums/" target="_blank" class="footer_link">{l s='Forum'}</a>
|
||||
| <a href="http://addons.prestashop.com/" target="_blank" class="footer_link">{l s='Addons'}</a>
|
||||
| <a href="http://www.prestashop.com/en/contact-us?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Contact'}</a>
|
||||
| <a href="http://forge.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
|
||||
| <a href="http://www.prestashop.com/forums/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Forum'}</a>
|
||||
| <a href="http://addons.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Addons'}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -347,7 +347,7 @@ class ProductCore extends ObjectModel
|
||||
),
|
||||
'id_tax_rules_group' => array(
|
||||
'xlink_resource' => array(
|
||||
'resourceName' => 'tax_rules_group'
|
||||
'resourceName' => 'tax_rule_groups'
|
||||
)
|
||||
),
|
||||
'position_in_category' => array(
|
||||
|
||||
@@ -1535,6 +1535,16 @@ class AdminControllerCore extends Controller
|
||||
|
||||
protected function addToolBarModulesListButton()
|
||||
{
|
||||
|
||||
if (!$this->isFresh(Module::CACHE_FILE_DEFAULT_COUNTRY_MODULES_LIST, 86400))
|
||||
file_put_contents(_PS_ROOT_DIR_.Module::CACHE_FILE_DEFAULT_COUNTRY_MODULES_LIST, Tools::addonsRequest('native'));
|
||||
|
||||
$country_module_list_xml = simplexml_load_file(_PS_ROOT_DIR_.Module::CACHE_FILE_DEFAULT_COUNTRY_MODULES_LIST);
|
||||
$country_module_list = array();
|
||||
foreach ($country_module_list_xml->module as $k => $m)
|
||||
$country_module_list[] = (string)$m->name;
|
||||
$this->tab_modules_list['slider_list'] = array_intersect($this->tab_modules_list['slider_list'], $country_module_list);
|
||||
|
||||
if (is_array($this->tab_modules_list['slider_list']) && count($this->tab_modules_list['slider_list']))
|
||||
$this->toolbar_btn['modules-list'] = array(
|
||||
'href' => '#',
|
||||
|
||||
@@ -302,14 +302,13 @@ class AdminModulesPositionsControllerCore extends AdminController
|
||||
|
||||
public function getLiveEditUrl($live_edit_params)
|
||||
{
|
||||
$lang = '';
|
||||
$lang = '';
|
||||
$admin_dir = dirname($_SERVER['PHP_SELF']);
|
||||
$admin_dir = substr($admin_dir, strrpos($admin_dir, '/') + 1);
|
||||
$dir = str_replace($admin_dir, '', dirname($_SERVER['SCRIPT_NAME']));
|
||||
if (Configuration::get('PS_REWRITING_SETTINGS') && count(Language::getLanguages(true)) > 1)
|
||||
$lang = Language::getIsoById($this->context->employee->id_lang).'/';
|
||||
$url = Tools::getCurrentUrlProtocolPrefix().Tools::getHttpHost().$dir.$lang.Dispatcher::getInstance()->createUrl('index', (int)$this->context->language->id, $live_edit_params);
|
||||
|
||||
return $url;
|
||||
}
|
||||
|
||||
|
||||
@@ -863,6 +863,12 @@ class AdminProductsControllerCore extends AdminController
|
||||
{
|
||||
$combination = new Combination((int)$id_product_attribute);
|
||||
$combination->setAttributes(Tools::getValue('attribute_combination_list'));
|
||||
|
||||
// images could be deleted before
|
||||
$id_images = Tools::getValue('id_image_attr');
|
||||
if (!empty($id_images))
|
||||
$combination->setImages($id_images);
|
||||
|
||||
$product->checkDefaultAttributes();
|
||||
if (Tools::getValue('attribute_default'))
|
||||
{
|
||||
|
||||
@@ -689,7 +689,7 @@ Country</value>
|
||||
<value>7700</value>
|
||||
</configuration>
|
||||
<configuration id="PS_VERSION_DB" name="PS_VERSION_DB">
|
||||
<value>1.5.0.9</value>
|
||||
<value>1.5.5.0</value>
|
||||
</configuration>
|
||||
<configuration id="PS_BASE_DISTANCE_UNIT" name="PS_BASE_DISTANCE_UNIT">
|
||||
<value>m</value>
|
||||
@@ -701,7 +701,7 @@ Country</value>
|
||||
<value>localhost</value>
|
||||
</configuration>
|
||||
<configuration id="PS_INSTALL_VERSION" name="PS_INSTALL_VERSION">
|
||||
<value>1.5.0.9</value>
|
||||
<value>1.5.5.0</value>
|
||||
</configuration>
|
||||
<configuration id="PS_SHOP_NAME" name="PS_SHOP_NAME">
|
||||
<value>PrestaShop</value>
|
||||
|
||||
@@ -74,8 +74,8 @@
|
||||
<tab id="Search" name="Pesquisar"/>
|
||||
<tab id="Search_Engines" name="Ferramentas de Pesquisa"/>
|
||||
<tab id="SEO_URLs" name="SEO e URLs"/>
|
||||
<tab id="Shipping" name="Preferências"/>
|
||||
<tab id="Shipping_1" name="Envio"/>
|
||||
<tab id="Shipping" name="Envio"/>
|
||||
<tab id="Shipping_1" name="Preferências"/>
|
||||
<tab id="Shop_URLs" name="URL da loja"/>
|
||||
<tab id="Shopping_Carts" name="Carrinhos de Compras"/>
|
||||
<tab id="Shops" name="Lojas"/>
|
||||
|
||||
@@ -74,8 +74,8 @@
|
||||
<tab id="Search" name="Suche"/>
|
||||
<tab id="Search_Engines" name="Suchmaschinen"/>
|
||||
<tab id="SEO_URLs" name="SEO & URLs"/>
|
||||
<tab id="Shipping" name="Voreinstellungen"/>
|
||||
<tab id="Shipping_1" name="Versand"/>
|
||||
<tab id="Shipping" name="Versand"/>
|
||||
<tab id="Shipping_1" name="Voreinstellungen"/>
|
||||
<tab id="Shop_URLs" name="Shop-URLs"/>
|
||||
<tab id="Shopping_Carts" name="Warenkörbe"/>
|
||||
<tab id="Shops" name="Shops"/>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<tab id="Orders" name="Orders"/>
|
||||
<tab id="Customers" name="Customers"/>
|
||||
<tab id="Price_Rules" name="Price Rules"/>
|
||||
<tab id="Shipping" name="Preferences"/>
|
||||
<tab id="Shipping" name="Shipping"/>
|
||||
<tab id="Localization" name="Localization"/>
|
||||
<tab id="Modules" name="Modules"/>
|
||||
<tab id="Preferences" name="Preferences"/>
|
||||
@@ -48,7 +48,7 @@
|
||||
<tab id="Cart_Rules" name="Cart Rules"/>
|
||||
<tab id="Catalog_Price_Rules" name="Catalog Price Rules"/>
|
||||
<tab id="Marketing" name="Marketing"/>
|
||||
<tab id="Shipping_1" name="Shipping"/>
|
||||
<tab id="Shipping_1" name="Preferences"/>
|
||||
<tab id="Carriers" name="Carriers"/>
|
||||
<tab id="Localization_1" name="Localization"/>
|
||||
<tab id="Languages" name="Languages"/>
|
||||
|
||||
@@ -74,8 +74,8 @@
|
||||
<tab id="Search" name="Buscar"/>
|
||||
<tab id="Search_Engines" name="Buscador"/>
|
||||
<tab id="SEO_URLs" name="SEO y URLs"/>
|
||||
<tab id="Shipping" name="Preferencias"/>
|
||||
<tab id="Shipping_1" name="transporte"/>
|
||||
<tab id="Shipping" name="Transporte"/>
|
||||
<tab id="Shipping_1" name="Preferencias"/>
|
||||
<tab id="Shop_URLs" name="URL cortos"/>
|
||||
<tab id="Shopping_Carts" name="Cestas"/>
|
||||
<tab id="Shops" name="Tiendas"/>
|
||||
|
||||
@@ -74,8 +74,8 @@
|
||||
<tab id="Search" name="Recherche"/>
|
||||
<tab id="Search_Engines" name="Moteurs de recherche"/>
|
||||
<tab id="SEO_URLs" name="SEO & URLs"/>
|
||||
<tab id="Shipping" name="Préférences"/>
|
||||
<tab id="Shipping_1" name="Transport"/>
|
||||
<tab id="Shipping" name="Transport"/>
|
||||
<tab id="Shipping_1" name="Préférences"/>
|
||||
<tab id="Shop_URLs" name="URLs de boutique"/>
|
||||
<tab id="Shopping_Carts" name="Paniers"/>
|
||||
<tab id="Shops" name="Boutiques"/>
|
||||
|
||||
@@ -74,8 +74,8 @@
|
||||
<tab id="Search" name="Cerca"/>
|
||||
<tab id="Search_Engines" name="Motori di ricerca"/>
|
||||
<tab id="SEO_URLs" name="URL e SEO"/>
|
||||
<tab id="Shipping" name="Preferenze"/>
|
||||
<tab id="Shipping_1" name="Spedizione"/>
|
||||
<tab id="Shipping" name="Spedizione"/>
|
||||
<tab id="Shipping_1" name="Preferenze"/>
|
||||
<tab id="Shop_URLs" name="URLs negozi"/>
|
||||
<tab id="Shopping_Carts" name="Carrello"/>
|
||||
<tab id="Shops" name="Negozi associati"/>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<tab id="Orders" name="Orders"/>
|
||||
<tab id="Customers" name="Customers"/>
|
||||
<tab id="Price_Rules" name="Price Rules"/>
|
||||
<tab id="Shipping" name="Preferences"/>
|
||||
<tab id="Shipping" name="Shipping"/>
|
||||
<tab id="Localization" name="Localization"/>
|
||||
<tab id="Modules" name="Modules"/>
|
||||
<tab id="Preferences" name="Preferences"/>
|
||||
@@ -48,7 +48,7 @@
|
||||
<tab id="Cart_Rules" name="Cart Rules"/>
|
||||
<tab id="Catalog_Price_Rules" name="Catalog Price Rules"/>
|
||||
<tab id="Marketing" name="Marketing"/>
|
||||
<tab id="Shipping_1" name="Shipping"/>
|
||||
<tab id="Shipping_1" name="Preferences"/>
|
||||
<tab id="Carriers" name="Carriers"/>
|
||||
<tab id="Price_Ranges" name="Price Ranges"/>
|
||||
<tab id="Weight_Ranges" name="Weight Ranges"/>
|
||||
|
||||
@@ -74,8 +74,8 @@
|
||||
<tab id="Search" name="Wyszukaj"/>
|
||||
<tab id="Search_Engines" name="Wyszukiwarki"/>
|
||||
<tab id="SEO_URLs" name="Dane URL i SEO"/>
|
||||
<tab id="Shipping" name="Preferencje"/>
|
||||
<tab id="Shipping_1" name="Wysyłka"/>
|
||||
<tab id="Shipping" name="Wysyłka"/>
|
||||
<tab id="Shipping_1" name="Preferencje"/>
|
||||
<tab id="Shop_URLs" name="Adres URL sklepu"/>
|
||||
<tab id="Shopping_Carts" name="Koszyk zakupów"/>
|
||||
<tab id="Shops" name="Sklepy"/>
|
||||
|
||||
@@ -74,8 +74,8 @@
|
||||
<tab id="Search" name="Поиск"/>
|
||||
<tab id="Search_Engines" name="Поисковые с-мы"/>
|
||||
<tab id="SEO_URLs" name="SEO и URLs"/>
|
||||
<tab id="Shipping" name="Настройки"/>
|
||||
<tab id="Shipping_1" name="Доставка"/>
|
||||
<tab id="Shipping" name="Доставка"/>
|
||||
<tab id="Shipping_1" name="Настройки"/>
|
||||
<tab id="Shop_URLs" name="URL магазина"/>
|
||||
<tab id="Shopping_Carts" name="Корзины"/>
|
||||
<tab id="Shops" name="Магазины"/>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user