- diff --git a/admin-dev/themes/template/products/informations.tpl b/admin-dev/themes/template/products/informations.tpl index b583dd650..70f718b5b 100644 --- a/admin-dev/themes/template/products/informations.tpl +++ b/admin-dev/themes/template/products/informations.tpl @@ -30,17 +30,26 @@ - {/if} \ No newline at end of file diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 9ddbbcd52..a59501f9d 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -54,20 +54,20 @@ class AdminProductsControllerCore extends AdminController protected $available_tabs_lang = array (); - protected $tabs_toolbar_save_buttons = array( + protected $tabs_preloaded = array( 'Informations' => true, - 'Prices' => false, + 'Prices' => true, 'Associations' => true, 'Images' => false, 'Shipping' => true, 'Combinations' => false, - 'Features' => true, + 'Features' => false, 'Customization' => false, - 'Attachments' => true, - 'Quantities' => false, - 'Suppliers' => true, - 'Warehouses' => true, - 'Accounting' => true + 'Attachments' => false, + 'Quantities' => true, + 'Suppliers' => false, + 'Warehouses' => false, + 'Accounting' => false ); public function __construct() @@ -499,7 +499,7 @@ class AdminProductsControllerCore extends AdminController } /* Product images management */ - else if (($id_image = (int)(Tools::getValue('id_image'))) && Validate::isUnsignedId($id_image) && Validate::isLoadedObject($image = new Image($id_image))) + else if (($id_image = (int)Tools::getValue('id_image')) && Validate::isUnsignedId($id_image) && Validate::isLoadedObject($image = new Image($id_image))) { if ($this->tabAccess['edit'] === '1') { @@ -722,18 +722,18 @@ class AdminProductsControllerCore extends AdminController foreach ($id_specific_prices as $key => $id_specific_price) if ($this->_validateSpecificPrice($id_shops[$key], $id_currencies[$key], $id_countries[$key], $id_groups[$key], $prices[$key], $from_quantities[$key], $reductions[$key], $reduction_types[$key], $froms[$key], $tos[$key])) { - $specificPrice = new SpecificPrice((int)($id_specific_price)); - $specificPrice->id_shop = (int)$id_shops[$key]; - $specificPrice->id_currency = (int)($id_currencies[$key]); - $specificPrice->id_country = (int)($id_countries[$key]); - $specificPrice->id_group = (int)($id_groups[$key]); - $specificPrice->price = (float)($prices[$key]); - $specificPrice->from_quantity = (int)($from_quantities[$key]); - $specificPrice->reduction = (float)($reduction_types[$key] == 'percentage' ? ($reductions[$key] / 100) : $reductions[$key]); - $specificPrice->reduction_type = !$reductions[$key] ? 'amount' : $reduction_types[$key]; - $specificPrice->from = !$froms[$key] ? '0000-00-00 00:00:00' : $froms[$key]; - $specificPrice->to = !$tos[$key] ? '0000-00-00 00:00:00' : $tos[$key]; - if (!$specificPrice->update()) + $specific_price = new SpecificPrice((int)($id_specific_price)); + $specific_price->id_shop = (int)$id_shops[$key]; + $specific_price->id_currency = (int)($id_currencies[$key]); + $specific_price->id_country = (int)($id_countries[$key]); + $specific_price->id_group = (int)($id_groups[$key]); + $specific_price->price = (float)($prices[$key]); + $specific_price->from_quantity = (int)($from_quantities[$key]); + $specific_price->reduction = (float)($reduction_types[$key] == 'percentage' ? ($reductions[$key] / 100) : $reductions[$key]); + $specific_price->reduction_type = !$reductions[$key] ? 'amount' : $reduction_types[$key]; + $specific_price->from = !$froms[$key] ? '0000-00-00 00:00:00' : $froms[$key]; + $specific_price->to = !$tos[$key] ? '0000-00-00 00:00:00' : $tos[$key]; + if (!$specific_price->update()) $this->_errors = Tools::displayError('An error occurred while updating the specific price.'); } if (!count($this->_errors)) @@ -759,20 +759,20 @@ class AdminProductsControllerCore extends AdminController $to = Tools::getValue('sp_to'); if ($this->_validateSpecificPrice($id_shop, $id_currency, $id_country, $id_group, $price, $from_quantity, $reduction, $reduction_type, $from, $to)) { - $specificPrice = new SpecificPrice(); - $specificPrice->id_product = $id_product; - $specificPrice->id_product_attribute = (int)Tools::getValue('id_product_attribute'); - $specificPrice->id_shop = (int)$id_shop; - $specificPrice->id_currency = (int)($id_currency); - $specificPrice->id_country = (int)($id_country); - $specificPrice->id_group = (int)($id_group); - $specificPrice->price = (float)($price); - $specificPrice->from_quantity = (int)($from_quantity); - $specificPrice->reduction = (float)($reduction_type == 'percentage' ? $reduction / 100 : $reduction); - $specificPrice->reduction_type = $reduction_type; - $specificPrice->from = !$from ? '0000-00-00 00:00:00' : $from; - $specificPrice->to = !$to ? '0000-00-00 00:00:00' : $to; - if (!$specificPrice->add()) + $specific_price = new SpecificPrice(); + $specific_price->id_product = $id_product; + $specific_price->id_product_attribute = (int)Tools::getValue('id_product_attribute'); + $specific_price->id_shop = (int)$id_shop; + $specific_price->id_currency = (int)($id_currency); + $specific_price->id_country = (int)($id_country); + $specific_price->id_group = (int)($id_group); + $specific_price->price = (float)($price); + $specific_price->from_quantity = (int)($from_quantity); + $specific_price->reduction = (float)($reduction_type == 'percentage' ? $reduction / 100 : $reduction); + $specific_price->reduction_type = $reduction_type; + $specific_price->from = !$from ? '0000-00-00 00:00:00' : $from; + $specific_price->to = !$to ? '0000-00-00 00:00:00' : $to; + if (!$specific_price->add()) $this->_errors = Tools::displayError('An error occurred while updating the specific price.'); else $this->redirect_after = self::$currentIndex.(Tools::getValue('id_category') ? '&id_category='.Tools::getValue('id_category') : '').'&action=Prices&id_product='.$id_product.'&add'.$this->table.'&tabs=2&conf=3&token='.($token ? $token : $this->token); @@ -791,8 +791,8 @@ class AdminProductsControllerCore extends AdminController $this->_errors[] = Tools::displayError('Invalid specific price ID'); else { - $specificPrice = new SpecificPrice((int)($id_specific_price)); - if (!$specificPrice->delete()) + $specific_price = new SpecificPrice((int)($id_specific_price)); + if (!$specific_price->delete()) $this->_errors[] = Tools::displayError('An error occurred while deleting the specific price'); else $this->redirect_after = self::$currentIndex.(Tools::getValue('id_category') ? '&action=Prices&id_category='.Tools::getValue('id_category') : '').'&id_product='.$obj->id.'&add'.$this->table.'&tabs=2&conf=1&token='.($token ? $token : $this->token); @@ -882,9 +882,7 @@ class AdminProductsControllerCore extends AdminController $this->postProcessFormSuppliers(); //Manage warehouses else if (Tools::isSubmit('submitWarehouses') || Tools::isSubmit('submitWarehousesAndStay')) - { $this->postProcessFormWarehouses(); - } if (!$this->redirect_after) parent::postProcess(true); @@ -1203,9 +1201,9 @@ class AdminProductsControllerCore extends AdminController else if ($method == 'auto') { $imagesTypes = ImageType::getImagesTypes('products'); - foreach ($imagesTypes as $k => $imageType) - if (!imageResize($tmpName, $new_path.'-'.stripslashes($imageType['name']).'.'.$image->image_format, $imageType['width'], $imageType['height'], $image->image_format)) - $this->_errors[] = Tools::displayError('An error occurred while copying image:').' '.stripslashes($imageType['name']); + foreach ($imagesTypes as $k => $image_type) + if (!imageResize($tmpName, $new_path.'-'.stripslashes($image_type['name']).'.'.$image->image_format, $image_type['width'], $image_type['height'], $image->image_format)) + $this->_errors[] = Tools::displayError('An error occurred while copying image:').' '.stripslashes($image_type['name']); } @unlink($tmpName); @@ -2347,7 +2345,7 @@ class AdminProductsControllerCore extends AdminController public function initFormAssociations($obj) { - $product = $this->object; + $product = $obj; $data = $this->context->smarty->createData(); // Prepare Categories tree for display in Associations tab $default_category = Tools::getValue('id_category', 1); @@ -2387,10 +2385,10 @@ class AdminProductsControllerCore extends AdminController // Accessories block $accessories = Product::getAccessoriesLight($this->context->language->id, $product->id); - if ($postAccessories = Tools::getValue('inputAccessories')) + if ($post_accessories = Tools::getValue('inputAccessories')) { - $postAccessoriesTab = explode('-', Tools::getValue('inputAccessories')); - foreach ($postAccessoriesTab as $accessory_id) + $post_accessories_tab = explode('-', Tools::getValue('inputAccessories')); + foreach ($post_accessories_tab as $accessory_id) if (!$this->haveThisAccessory($accessory_id, $accessories) && $accessory = Product::getAccessoryById($accessory_id)) $accessories[] = $accessory; } @@ -2406,7 +2404,7 @@ class AdminProductsControllerCore extends AdminController $this->tpl_form_vars['custom_form'] = $this->context->smarty->createTemplate($this->tpl_form, $data)->fetch(); } - public function initFormPrices($obj, $languages, $default_language) + public function initFormPrices($obj) { $data = $this->context->smarty->createData(); $product = $obj; @@ -2418,17 +2416,26 @@ class AdminProductsControllerCore extends AdminController $currencies = Currency::getCurrencies(); $attributes = $obj->getAttributesGroups((int)$this->context->language->id); $combinations = array(); - foreach($attributes as $attribute) + foreach ($attributes as $attribute) { $combinations[$attribute['id_product_attribute']]['id_product_attribute'] = $attribute['id_product_attribute']; if (!isset($combinations[$attribute['id_product_attribute']]['attributes'])) $combinations[$attribute['id_product_attribute']]['attributes'] = ''; $combinations[$attribute['id_product_attribute']]['attributes'] .= $attribute['attribute_name'].' - '; - $combinations[$attribute['id_product_attribute']]['price'] = Tools::displayPrice(Tools::convertPrice(Product::getPriceStatic((int)$obj->id, false, $attribute['id_product_attribute']), $this->context->currency), $this->context->currency); + $combinations[$attribute['id_product_attribute']]['price'] = Tools::displayPrice( + Tools::convertPrice( + Product::getPriceStatic((int)$obj->id, false, $attribute['id_product_attribute']), + $this->context->currency + ), $this->context->currency + ); } + foreach ($combinations as &$combination) $combination['attributes'] = rtrim($combination['attributes'], ' - '); + $data->assign('specificPriceModificationForm', $this->_displaySpecificPriceModificationForm( + $this->context->currency, $shops, $currencies, $countries, $groups) + ); $data->assign(array( 'shops' => $shops, @@ -2438,7 +2445,6 @@ class AdminProductsControllerCore extends AdminController 'combinations' => $combinations, 'product' => $product )); - $data->assign('specificPriceModificationForm', $this->_displaySpecificPriceModificationForm($this->context->currency, $shops, $currencies, $countries, $groups)); } else $this->displayWarning($this->l('You must save this product before adding specific prices')); @@ -2453,7 +2459,7 @@ class AdminProductsControllerCore extends AdminController $data->assign('ps_use_ecotax', Configuration::get('PS_USE_ECOTAX')); if ($product->unit_price_ratio != 0) - $data->assign('unit_price', Tools::ps_round($product->price)/$product->unit_price_ratio); + $data->assign('unit_price', Tools::ps_round($product->price) / $product->unit_price_ratio); else $data->assign('unit_price', 0); @@ -2461,20 +2467,28 @@ class AdminProductsControllerCore extends AdminController $data->assign('country_display_tax_label', $this->context->country->display_tax_label); + $unities = array( + 'PS_WEIGHT_UNIT' => Configuration::get('PS_WEIGHT_UNIT'), + 'PS_DISTANCE_UNIT' => Configuration::get('PS_DISTANCE_UNIT'), + 'PS_VOLUME_UNIT' => Configuration::get('PS_VOLUME_UNIT'), + 'PS_DIMENSION_UNIT' => Configuration::get('PS_DIMENSION_UNIT') + ); + $data->assign(array( 'currency', $this->context->currency, - 'product' => $product + 'product' => $product, + 'unities' => $unities )); $this->tpl_form_vars['custom_form'] = $this->context->smarty->createTemplate($this->tpl_form, $data)->fetch(); } - private function _getFinalPrice($specificPrice, $productPrice, $taxRate) + private function _getFinalPrice($specific_price, $productPrice, $taxRate) { - $price = Tools::ps_round((float)($specificPrice['price']) ? $specificPrice['price'] : $productPrice, 2); - if (!(float)($specificPrice['reduction'])) - return (float)($specificPrice['price']); - return ($specificPrice['reduction_type'] == 'amount') ? ($price - $specificPrice['reduction'] / (1 + $taxRate / 100)) : ($price - $price * $specificPrice['reduction']); + $price = Tools::ps_round((float)($specific_price['price']) ? $specific_price['price'] : $productPrice, 2); + if (!(float)($specific_price['reduction'])) + return (float)($specific_price['price']); + return ($specific_price['reduction_type'] == 'amount') ? ($price - $specific_price['reduction'] / (1 + $taxRate / 100)) : ($price - $price * $specific_price['reduction']); } protected function _displaySpecificPriceModificationForm($defaultCurrency, $shops, $currencies, $countries, $groups) @@ -2482,8 +2496,8 @@ class AdminProductsControllerCore extends AdminController $content = ''; if (!($obj = $this->loadObject())) return; - $specificPrices = SpecificPrice::getByProductId((int)$obj->id); - $specificPricePriorities = SpecificPrice::getPriority((int)$obj->id); + $specific_prices = SpecificPrice::getByProductId((int)$obj->id); + $specific_price_priorities = SpecificPrice::getPriority((int)$obj->id); $taxRate = $obj->getTaxesRate(Address::initialize()); @@ -2506,7 +2520,7 @@ class AdminProductsControllerCore extends AdminController $tmp[$group['id_group']] = $group; $groups = $tmp; - if (!is_array($specificPrices) || !count($specificPrices)) + if (!is_array($specific_prices) || !count($specific_prices)) $content .= '
'.$this->l('To').' '.($specificPrice['to'] != '0000-00-00 00:00:00' ? $specificPrice['to'] : '0000-00-00 00:00:00'); - if ($specificPrice['id_product_attribute']) + $period = $this->l('From').' '.($specific_price['from'] != '0000-00-00 00:00:00' ? $specific_price['from'] : '0000-00-00 00:00:00').'
'.$this->l('To').' '.($specific_price['to'] != '0000-00-00 00:00:00' ? $specific_price['to'] : '0000-00-00 00:00:00'); + if ($specific_price['id_product_attribute']) { - $combination = new Combination((int)$specificPrice['id_product_attribute']); + $combination = new Combination((int)$specific_price['id_product_attribute']); $attributes = $combination->getAttributesName((int)$this->context->language->id); $attributes_name = ''; foreach ($attributes as $attribute) @@ -2538,23 +2552,23 @@ class AdminProductsControllerCore extends AdminController else $attributes_name = $this->l('All combinations'); - $rule = new SpecificPriceRule((int)$specificPrice['id_specific_price_rule']); + $rule = new SpecificPriceRule((int)$specific_price['id_specific_price_rule']); $rule_name = ($rule->id ? $rule->name : '--'); $content .= '
': '').'': '').'
>
>
@@ -2744,7 +2758,7 @@ class AdminProductsControllerCore extends AdminController
$this->tpl_form_vars['custom_form'] = $this->context->smarty->createTemplate($this->tpl_form, $data)->fetch();
}
- public function initFormInformations($product, $languages, $default_language)
+ public function initFormInformations($product)
{
$data = $this->context->smarty->createData();
@@ -2755,7 +2769,7 @@ class AdminProductsControllerCore extends AdminController
$this->tpl_form_vars['tinymce'] = true;
$currency = $this->context->currency;
- $data->assign('languages',$languages);
+ $data->assign('languages', $this->_languages);
$data->assign('currency', $currency);
$this->object = $product;
$this->display = 'edit';
@@ -2766,10 +2780,10 @@ class AdminProductsControllerCore extends AdminController
// Accessories block
$accessories = Product::getAccessoriesLight($this->context->language->id, $product->id);
- if ($postAccessories = Tools::getValue('inputAccessories'))
+ if ($post_accessories = Tools::getValue('inputAccessories'))
{
- $postAccessoriesTab = explode('-', Tools::getValue('inputAccessories'));
- foreach ($postAccessoriesTab as $accessory_id)
+ $post_accessories_tab = explode('-', Tools::getValue('inputAccessories'));
+ foreach ($post_accessories_tab as $accessory_id)
if (!$this->haveThisAccessory($accessory_id, $accessories) && $accessory = Product::getAccessoryById($accessory_id))
$accessories[] = $accessory;
}
@@ -2783,7 +2797,7 @@ class AdminProductsControllerCore extends AdminController
$product_download = new ProductDownload($id_product_download);
$product->{'productDownload'} = $product_download;
- $cache_default_attribute = (int) $this->getFieldValue($product, 'cache_default_attribute');
+ $cache_default_attribute = (int)$this->getFieldValue($product, 'cache_default_attribute');
$product_props = array();
// global informations
@@ -2808,10 +2822,10 @@ class AdminProductsControllerCore extends AdminController
'available_now', 'available_later', 'available_date'
);
- if(Configuration::get('PS_USE_ECOTAX'))
+ if (Configuration::get('PS_USE_ECOTAX'))
array_push($product_props, 'ecotax');
- foreach($product_props as $prop)
+ foreach ($product_props as $prop)
$product->$prop = $this->getFieldValue($product, $prop);
$product->name['class'] = 'updateCurrentText';
@@ -2848,14 +2862,15 @@ class AdminProductsControllerCore extends AdminController
if (empty($product->cache_default_attribute))
{
- $data->assign('show_file_input', !strval(Tools::getValue('virtual_product_filename')) OR $product->productDownload->id > 0);
+ $data->assign('show_file_input', !strval(Tools::getValue('virtual_product_filename')) || $product->productDownload->id > 0);
// found in informations and combination : to merge
$data->assign('up_filename', strval(Tools::getValue('virtual_product_filename')));
$display_filename = ($product->productDownload->id > 0) ? $product->productDownload->display_filename : htmlentities(Tools::getValue('virtual_product_name'), ENT_COMPAT, 'UTF-8');
if (!$product->productDownload->id || !$product->productDownload->active)
$hidden = 'display:none;';
- else $hidden ='';
+ else
+ $hidden = '';
$product->productDownload->nb_downloadable = ($product->productDownload->id > 0) ? $product->productDownload->nb_downloadable : htmlentities(Tools::getValue('virtual_product_nb_downloable'), ENT_COMPAT, 'UTF-8');
$product->productDownload->date_expiration = ($product->productDownload->id > 0) ? ((!empty($product->productDownload->date_expiration) && $product->productDownload->date_expiration != '0000-00-00 00:00:00') ? date('Y-m-d', strtotime($product->productDownload->date_expiration)) : '' ) : htmlentities(Tools::getValue('virtual_product_expiration_date'), ENT_COMPAT, 'UTF-8');
@@ -2864,18 +2879,18 @@ class AdminProductsControllerCore extends AdminController
}
else
{
- $error ='';
+ $error = '';
$product_attribute = ProductDownload::getAttributeFromIdProduct($this->getFieldValue($product, 'id'));
foreach ($product_attribute as $p)
{
- $product_downloadAttribute = new ProductDownload($p['id_product_download']);
- $exists_file2 = realpath(_PS_DOWNLOAD_DIR_).'/'.$product_downloadAttribute->filename;
- if (!file_exists($exists_file2) && !empty($product_downloadAttribute->id_product_attribute))
+ $product_download_attribute = new ProductDownload($p['id_product_download']);
+ $exists_file2 = realpath(_PS_DOWNLOAD_DIR_).'/'.$product_download_attribute->filename;
+ if (!file_exists($exists_file2) && !empty($product_download_attribute->id_product_attribute))
{
- $msg = sprintf(Tools::displayError('This file "%s" is missing'), $product_downloadAttribute->display_filename);
+ $msg = sprintf(Tools::displayError('This file "%s" is missing'), $product_download_attribute->display_filename);
$error .= '
'.$msg.' :
- '.realpath(_PS_DOWNLOAD_DIR_) .'/'. $product_downloadAttribute->filename.'
+ '.realpath(_PS_DOWNLOAD_DIR_).'/'.$product_download_attribute->filename.'
+ * Purpose: implode Array + * Use: {implode value="" separator=""} + * + * @link http://www.smarty.net/manual/en/language.function.fetch.php {fetch} + * (Smarty online manual) + * + * @param array $params parameters + * @param Smarty_Internal_Template $template template object + * @return string|null if the assign parameter is passed, Smarty assigns the result to a template variable + */ +function smarty_function_implode($params, $template) +{ + if (empty($params['value'])) + { + trigger_error("[plugin] implode parameter 'value' cannot be empty", E_USER_NOTICE); + return; + } + + if (empty($params['separator'])) + $params['separator'] = ','; + + return implode($params['value'], $params['separator']); +} + +?> \ No newline at end of file