diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 2c0677c88..671851bbd 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -25,7 +25,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -class AdminProductsController extends AdminController +class AdminProductsControllerCore extends AdminController { protected $max_file_size = 20000000; /** @var integer Max image size for upload @@ -45,6 +45,7 @@ class AdminProductsController extends AdminController 'Attachments', 'Quantities', 'Suppliers', + 'Warehouses', 'Accounting'); public function __construct() @@ -58,6 +59,7 @@ class AdminProductsController extends AdminController $this->duplicate = true; $this->imageType = 'jpg'; $this->context = Context::getContext(); + $this->_defaultOrderBy = 'position'; $this->fieldsDisplay = array( 'id_product' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 20), @@ -295,7 +297,7 @@ class AdminProductsController extends AdminController if (!sizeof($this->_errors)) { $attachment->add(); - Tools::redirectAdmin(self::$currentIndex.'&id_product='.(int)(Tools::getValue($this->identifier)).'&id_category='.(int)(Tools::getValue('id_category')).'&addproduct&conf=4&tabs=6&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&id_product='.(int)(Tools::getValue($this->identifier)).'&id_category='.(int)(Tools::getValue('id_category')).'&addproduct&conf=4&tabs=6&token='.($token ? $token : $this->token); } else $this->_errors[] = Tools::displayError('Invalid file'); @@ -310,7 +312,7 @@ class AdminProductsController extends AdminController if ($this->tabAccess['edit'] === '1') if ($id = (int)(Tools::getValue($this->identifier))) if (Attachment::attachToProduct($id, Tools::getValue('attachments'))) - Tools::redirectAdmin(self::$currentIndex.'&id_product='.(int)$id.(isset($_POST['id_category']) ? '&id_category='.(int)$_POST['id_category'] : '').'&conf=4&add'.$this->table.'&tabs=6&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&id_product='.(int)$id.(isset($_POST['id_category']) ? '&id_category='.(int)$_POST['id_category'] : '').'&conf=4&add'.$this->table.'&tabs=6&token='.($token ? $token : $this->token); } /* Product duplication */ @@ -347,7 +349,7 @@ class AdminProductsController extends AdminController { Hook::exec('addProduct', array('product' => $product)); Search::indexation(false, $product->id); - Tools::redirectAdmin(self::$currentIndex.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&conf=19&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&conf=19&token='.($token ? $token : $this->token); } } else @@ -366,7 +368,7 @@ class AdminProductsController extends AdminController { // @todo : redirect to the previous page instead of always product list if ($object->toggleStatus()) - Tools::redirectAdmin(self::$currentIndex.'&conf=5'.((($id_category = (!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1')) && Tools::getValue('id_product')) ? '&id_category='.$id_category : '').'&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&conf=5'.((($id_category = (!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1')) && Tools::getValue('id_product')) ? '&id_category='.$id_category : '').'&token='.($token ? $token : $this->token); else $this->_errors[] = Tools::displayError('An error occurred while updating status.'); } @@ -396,10 +398,10 @@ class AdminProductsController extends AdminController $object->deleteImages(); $object->deleted = 1; if ($object->update()) - Tools::redirectAdmin(self::$currentIndex.'&conf=1&token='.($token ? $token : $this->token).$category_url); + $this->redirect_after = self::$currentIndex.'&conf=1&token='.($token ? $token : $this->token).$category_url; } else if ($object->delete()) - Tools::redirectAdmin(self::$currentIndex.'&conf=1&token='.($token ? $token : $this->token).$category_url); + $this->redirect_after = self::$currentIndex.'&conf=1&token='.($token ? $token : $this->token).$category_url; $this->_errors[] = Tools::displayError('An error occurred during deletion.'); } } @@ -443,7 +445,7 @@ class AdminProductsController extends AdminController $id_category = Tools::getValue('id_category'); $category_url = empty($id_category) ? '' : '&id_category='.$id_category; - Tools::redirectAdmin(self::$currentIndex.'&conf=2&token='.$token.$category_url); + $this->redirect_after = self::$currentIndex.'&conf=2&token='.$token.$category_url; } $this->_errors[] = Tools::displayError('An error occurred while deleting selection.'); } @@ -485,7 +487,7 @@ class AdminProductsController extends AdminController $productId = (int)(Tools::getValue('id_product')); @unlink(_PS_TMP_IMG_DIR_.'/product_'.$productId.'.jpg'); @unlink(_PS_TMP_IMG_DIR_.'/product_mini_'.$productId.'.jpg'); - Tools::redirectAdmin(self::$currentIndex.'&id_product='.$image->id_product.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&addproduct&tabs=1'.'&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&id_product='.$image->id_product.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&addproduct&tabs=1'.'&token='.($token ? $token : $this->token); } } @@ -493,7 +495,7 @@ class AdminProductsController extends AdminController else if (isset($_GET['imgPosition']) && isset($_GET['imgDirection'])) { $image->updatePosition(Tools::getValue('imgDirection'), Tools::getValue('imgPosition')); - Tools::redirectAdmin(self::$currentIndex.'&id_product='.$image->id_product.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&tabs=1&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&id_product='.$image->id_product.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&tabs=1&token='.($token ? $token : $this->token); } } else @@ -606,7 +608,7 @@ class AdminProductsController extends AdminController if (!empty($is_virtual)) Product::updateIsVirtual($product->id); - Tools::redirectAdmin(self::$currentIndex.'&id_product='.$product->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&tabs=3&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&id_product='.$product->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&tabs=3&token='.($token ? $token : $this->token); } } } @@ -638,7 +640,7 @@ class AdminProductsController extends AdminController else Product::updateDefaultAttribute($id_product); - Tools::redirectAdmin(self::$currentIndex.'&add'.$this->table.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&tabs=3&id_product='.$product->id.'&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&add'.$this->table.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&tabs=3&id_product='.$product->id.'&token='.($token ? $token : $this->token); } else $this->_errors[] = Tools::displayError('Cannot delete attribute'); @@ -661,7 +663,7 @@ class AdminProductsController extends AdminController $product->cache_default_attribute = 0; $product->update(); } - Tools::redirectAdmin(self::$currentIndex.'&add'.$this->table.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&tabs=3&id_product='.$product->id.'&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&add'.$this->table.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&tabs=3&id_product='.$product->id.'&token='.($token ? $token : $this->token); } else $this->_errors[] = Tools::displayError('Cannot delete attributes'); @@ -677,7 +679,7 @@ class AdminProductsController extends AdminController { $product->deleteDefaultAttributes(); $product->setDefaultAttribute((int)(Tools::getValue('id_product_attribute'))); - Tools::redirectAdmin(self::$currentIndex.'&add'.$this->table.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&tabs=3&id_product='.$product->id.'&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&add'.$this->table.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&tabs=3&id_product='.$product->id.'&token='.($token ? $token : $this->token); } else $this->_errors[] = Tools::displayError('Cannot make default attribute'); @@ -722,7 +724,7 @@ class AdminProductsController extends AdminController } } if (!sizeof($this->_errors)) - Tools::redirectAdmin(self::$currentIndex.'&id_product='.(int)$product->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&tabs=4&conf=4&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&id_product='.(int)$product->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&tabs=4&conf=4&token='.($token ? $token : $this->token); } else $this->_errors[] = Tools::displayError('Product must be created before adding features.'); @@ -765,7 +767,7 @@ class AdminProductsController extends AdminController $this->_errors = Tools::displayError('An error occurred while updating the specific price.'); } if (!sizeof($this->_errors)) - Tools::redirectAdmin(self::$currentIndex.'&id_product='.(int)(Tools::getValue('id_product')).'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&update'.$this->table.'&tabs=2&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&id_product='.(int)(Tools::getValue('id_product')).'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&update'.$this->table.'&tabs=2&token='.($token ? $token : $this->token); } else $this->_errors[] = Tools::displayError('You do not have permission to add here.'); @@ -803,7 +805,7 @@ class AdminProductsController extends AdminController if (!$specificPrice->add()) $this->_errors = Tools::displayError('An error occurred while updating the specific price.'); else - Tools::redirectAdmin(self::$currentIndex.(Tools::getValue('id_category') ? '&id_category='.Tools::getValue('id_category') : '').'&id_product='.$id_product.'&add'.$this->table.'&tabs=2&conf=3&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.(Tools::getValue('id_category') ? '&id_category='.Tools::getValue('id_category') : '').'&id_product='.$id_product.'&add'.$this->table.'&tabs=2&conf=3&token='.($token ? $token : $this->token); } } else @@ -823,7 +825,7 @@ class AdminProductsController extends AdminController if (!$specificPrice->delete()) $this->_errors[] = Tools::displayError('An error occurred while deleting the specific price'); else - Tools::redirectAdmin(self::$currentIndex.(Tools::getValue('id_category') ? '&id_category='.Tools::getValue('id_category') : '').'&id_product='.$obj->id.'&add'.$this->table.'&tabs=2&conf=1&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.(Tools::getValue('id_category') ? '&id_category='.Tools::getValue('id_category') : '').'&id_product='.$obj->id.'&add'.$this->table.'&tabs=2&conf=1&token='.($token ? $token : $this->token); } } else @@ -840,12 +842,12 @@ class AdminProductsController extends AdminController if (!SpecificPrice::setPriorities($priorities)) $this->_errors[] = Tools::displayError('An error occurred while updating priorities.'); else - Tools::redirectAdmin(self::$currentIndex.'&id_product='.$obj->id.'&add'.$this->table.'&tabs=2&conf=4&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&id_product='.$obj->id.'&add'.$this->table.'&tabs=2&conf=4&token='.($token ? $token : $this->token); } else if (!SpecificPrice::setSpecificPriority((int)($obj->id), $priorities)) $this->_errors[] = Tools::displayError('An error occurred while setting priorities.'); else - Tools::redirectAdmin(self::$currentIndex.(Tools::getValue('id_category') ? '&id_category='.Tools::getValue('id_category') : '').'&id_product='.$obj->id.'&add'.$this->table.'&tabs=2&conf=4&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.(Tools::getValue('id_category') ? '&id_category='.Tools::getValue('id_category') : '').'&id_product='.$obj->id.'&add'.$this->table.'&tabs=2&conf=4&token='.($token ? $token : $this->token); } /* Customization management */ else if (Tools::isSubmit('submitCustomizationConfiguration')) @@ -864,7 +866,7 @@ class AdminProductsController extends AdminController if (!sizeof($this->_errors) && !$product->update()) $this->_errors[] = Tools::displayError('An error occurred while updating customization configuration.'); if (!sizeof($this->_errors)) - Tools::redirectAdmin(self::$currentIndex.'&id_product='.$product->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&tabs=5&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&id_product='.$product->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&tabs=5&token='.($token ? $token : $this->token); } else $this->_errors[] = Tools::displayError('Product must be created before adding customization possibilities.'); @@ -884,7 +886,7 @@ class AdminProductsController extends AdminController if (!sizeof($this->_errors) && !$product->updateLabels()) $this->_errors[] = Tools::displayError('An error occurred while updating customization.'); if (!sizeof($this->_errors)) - Tools::redirectAdmin(self::$currentIndex.'&id_product='.$product->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&tabs=5&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&id_product='.$product->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&tabs=5&token='.($token ? $token : $this->token); } else $this->_errors[] = Tools::displayError('Product must be created before adding customization possibilities.'); @@ -901,7 +903,7 @@ class AdminProductsController extends AdminController if (!$object->updatePosition((int)(Tools::getValue('way')), (int)(Tools::getValue('position')))) $this->_errors[] = Tools::displayError('Failed to update the position.'); else - Tools::redirectAdmin(self::$currentIndex.'&'.$this->table.'Orderby=position&'.$this->table.'Orderway=asc&conf=5'.(($id_category = (!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1')) ? ('&id_category='.$id_category) : '').'&token='.Tools::getAdminTokenLite('AdminProducts')); + $this->redirect_after = self::$currentIndex.'&'.$this->table.'Orderby=position&'.$this->table.'Orderway=asc&conf=5'.(($id_category = (!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1')) ? ('&id_category='.$id_category) : '').'&token='.Tools::getAdminTokenLite('AdminProducts'); } else if (Tools::isSubmit('submitAccountingDetails')) $this->postProcessFormAccounting(); @@ -911,7 +913,9 @@ class AdminProductsController extends AdminController //Manage suppliers else if (Tools::isSubmit('submitSupplierReferences')) $this->postProcessFormSupplierReferences(); - + //Manage warehouses + else if (Tools::isSubmit('submitProductWarehouses')) + $this->postProcessFormWarehouses(); parent::postProcess(true); } @@ -1001,7 +1005,7 @@ class AdminProductsController extends AdminController @unlink(_PS_TMP_IMG_DIR_.'/product_'.$image->id_product.'.jpg'); @unlink(_PS_TMP_IMG_DIR_.'/product_mini_'.$image->id_product.'.jpg'); if (!$this->ajax) - Tools::redirectAdmin($currentIndex.'&id_product='.$image->id_product.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&tabs=1'.'&token='.($token ? $token : $this->token)); + $this->redirect_after = $currentIndex.'&id_product='.$image->id_product.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&tabs=1'.'&token='.($token ? $token : $this->token); else $this->content = '{"status":"ok"}'; } @@ -1208,6 +1212,7 @@ class AdminProductsController extends AdminController $this->copyFromPost($object, $this->table); if ($object->update()) { + $this->addCarriers(); if ($id_reason = (int)Tools::getValue('id_mvt_reason') && Tools::getValue('mvt_quantity') > 0 && $id_reason > 0) { if (!$object->addStockMvt(Tools::getValue('mvt_quantity'), $id_reason, null, null, $this->context->employee->id)) @@ -1229,7 +1234,7 @@ class AdminProductsController extends AdminController Hook::exec('updateProduct', array('product' => $object)); Search::indexation(false, $object->id); if (Tools::getValue('resizer') == 'man' && isset($id_image) && is_int($id_image) && $id_image) - Tools::redirectAdmin(self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&edit='.strval(Tools::getValue('productCreated')).'&id_image='.$id_image.'&imageresize&toconf=4&submitAddAndStay='.((Tools::isSubmit('submitAdd'.$this->table.'AndStay') || Tools::getValue('productCreated') == 'on') ? 'on' : 'off').'&token='.(($token ? $token : $this->token))); + $this->redirect_after = self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&edit='.strval(Tools::getValue('productCreated')).'&id_image='.$id_image.'&imageresize&toconf=4&submitAddAndStay='.((Tools::isSubmit('submitAdd'.$this->table.'AndStay') || Tools::getValue('productCreated') == 'on') ? 'on' : 'off').'&token='.(($token ? $token : $this->token)); // Save and preview if (Tools::isSubmit('submitAddProductAndPreview')) @@ -1246,14 +1251,14 @@ class AdminProductsController extends AdminController $preview_url .= '&'; $preview_url .= 'adtoken='.$token.'&ad='.$admin_dir; } - Tools::redirectAdmin($preview_url); + $this->redirect_after = $preview_url; } else if (Tools::isSubmit('submitAdd'.$this->table.'AndStay') || ($id_image && $id_image !== true)) // Save and stay on same form // Save and stay on same form if (Tools::isSubmit('submitAdd'.$this->table.'AndStay')) - Tools::redirectAdmin(self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&addproduct&conf=4&tabs='.(int)(Tools::getValue('tabs')).'&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&addproduct&conf=4&tabs='.(int)(Tools::getValue('tabs')).'&token='.($token ? $token : $this->token); // Default behavior (save and back) - Tools::redirectAdmin(self::$currentIndex.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&conf=4&token='.($token ? $token : $this->token).'&onredirigeici'); + $this->redirect_after = self::$currentIndex.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&conf=4&token='.($token ? $token : $this->token).'&onredirigeici'; } } else @@ -1271,6 +1276,7 @@ class AdminProductsController extends AdminController $this->copyFromPost($object, $this->table); if ($object->add()) { + $this->addCarriers(); $this->updateAssoShop((int)$object->id); $this->updateAccessories($object); if (!$this->updatePackItems($object)) @@ -1299,16 +1305,17 @@ class AdminProductsController extends AdminController $preview_url .= '&adtoken='.$token.'&ad='.$admin_dir; } - Tools::redirectAdmin($preview_url); + $this->redirect_after = $preview_url; } if (Tools::getValue('resizer') == 'man' && isset($id_image) && is_int($id_image) && $id_image) - Tools::redirectAdmin(self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&id_image='.$id_image.'&imageresize&toconf=3&submitAddAndStay='.(Tools::isSubmit('submitAdd'.$this->table.'AndStay') ? 'on' : 'off').'&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&id_image='.$id_image.'&imageresize&toconf=3&submitAddAndStay='.(Tools::isSubmit('submitAdd'.$this->table.'AndStay') ? 'on' : 'off').'&token='.($token ? $token : $this->token); // Save and stay on same form if (Tools::isSubmit('submitAdd'.$this->table.'AndStay')) - Tools::redirectAdmin(self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&addproduct&conf=3&tabs='.(int)(Tools::getValue('tabs')).'&token='.($token ? $token : $this->token)); - // Default behavior (save and back) - Tools::redirectAdmin(self::$currentIndex.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&conf=3&token='.($token ? $token : $this->token)); + $this->redirect_after = self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&addproduct&conf=3&tabs='.(int)(Tools::getValue('tabs')).'&token='.($token ? $token : $this->token); + else + // Default behavior (save and back) + $this->redirect_after = self::$currentIndex.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&conf=3&token='.($token ? $token : $this->token); } } else @@ -1599,7 +1606,7 @@ class AdminProductsController extends AdminController { $this->display = 'list'; if ($id_category = (int)Tools::getValue('id_category')) - AdminTab::$currentIndex .= '&id_category='.$id_category; + AdminController::$currentIndex .= '&id_category='.$id_category; $this->getList($this->context->language->id, !$this->context->cookie->__get($this->table.'Orderby') ? 'position' : null, !$this->context->cookie->__get($this->table.'Orderway') ? 'ASC' : null, 0, null, $this->context->shop->getID(true)); $id_category = Tools::getValue('id_category', 1); @@ -1777,10 +1784,18 @@ class AdminProductsController extends AdminController 'href' => '#todo'.$this->context->link->getAdminLink('AdminProducts').'&id_product='.$product->id, 'desc' => $this->l('Create'), ); if($this->tabAccess['edit']) + { $this->toolbar_btn['save'] = array( - 'short' => 'Save', - 'href' => '#todo'.$this->context->link->getAdminLink('AdminProducts').'&id_product='.$product->id, 'desc' => $this->l('Save'), - ); + 'short' => 'Save', + 'href' => '#todo'.$this->context->link->getAdminLink('AdminProducts').'&id_product='.$product->id, + 'desc' => $this->l('Save'), + ); + $this->toolbar_btn['save-and-stay'] = array( + 'short' => 'SaveAndStay', + 'href' => '#todo'.$this->context->link->getAdminLink('AdminProducts').'&id_product='.$product->id, + 'desc' => $this->l('Save and stay'), + ); + } } parent::initToolbar(); $this->context->smarty->assign('toolbar_fix', 1); @@ -1807,6 +1822,7 @@ class AdminProductsController extends AdminController $this->addJs(_PS_JS_DIR_.'attributesBack.js'); $this->display = 'edit'; $this->addJqueryUI('ui.datepicker'); + $this->addJqueryUI('ui.accordion'); $this->tpl_form_vars['pos_select'] = ($tab = Tools::getValue('tabs')) ? $tab : '0'; $this->tpl_form_vars['token'] = $this->token; $this->tpl_form_vars['combinationImagesJs'] = $this->getCombinationImagesJs(); @@ -2007,7 +2023,7 @@ class AdminProductsController extends AdminController if ($reference != $psc->product_supplier_reference) { $psc->product_supplier_reference = pSQL($reference); - $psc->save(); + $psc->update(); } break; } @@ -2019,6 +2035,88 @@ class AdminProductsController extends AdminController } } + /** + * Post traitment for warehouses + */ + public function postProcessFormWarehouses() + { + if (Validate::isLoadedObject($product = new Product((int)Tools::getValue('id_product')))) + { + // Get all id_product_attribute + $attributes = $product->getAttributesResume($this->context->language->id); + if (empty($attributes)) + $attributes[] = array( + 'id_product_attribute' => 0, + 'attribute_designation' => '' + ); + + // Get all available warehouses + $warehouses = Warehouse::getWarehouses(true); + + // Get already associated warehouses + $associated_warehouses_collection = WarehouseProductLocation::getCollection($product->id); + + $elements_to_manage = array(); + + // get form inforamtion + foreach ($attributes as $attribute) + { + foreach ($warehouses as $warehouse) + { + $key = $warehouse['id_warehouse'].'_'.$attribute['id_product'].'_'.$attribute['id_product_attribute']; + + // get elements to manage + if (Tools::isSubmit('check_warehouse_'.$key)) + { + $location = Tools::getValue('location_warehouse_'.$key, ''); + $elements_to_manage[$key] = $location; + } + } + } + + // Delete entry if necessary + foreach ($associated_warehouses_collection as $awc) + { + if (!array_key_exists($awc->id_warehouse.'_'.$awc->id_product.'_'.$awc->id_product_attribute, $elements_to_manage)) + $awc->delete(); + } + + // Manage locations + foreach ($elements_to_manage as $key => $location) + { + $params = explode('_', $key); + + $wpl_id = WarehouseProductLocation::getIdByProductAndWarehouse($params[1], $params[2], $params[0]); + + if (empty($wpl_id)) + { + //create new record + $warehouse_location_entity = new WarehouseProductLocation(); + $warehouse_location_entity->id_product = $params[1]; + $warehouse_location_entity->id_product_attribute = $params[2]; + $warehouse_location_entity->id_warehouse = $params[0]; + $warehouse_location_entity->location = pSQL($location); + $warehouse_location_entity->save(); + } + else + { + $warehouse_location_entity = new WarehouseProductLocation($wpl_id); + + $location = pSQL($location); + + if ($location != $warehouse_location_entity->location) + { + $warehouse_location_entity->location = pSQL($location); + $warehouse_location_entity->update(); + } + break; + } + } + + $this->confirmations[] = $this->l('Warehouses and location(s) of the product have been updated'); + } + } + /** * Init data for accounting */ @@ -2462,6 +2560,15 @@ class AdminProductsController extends AdminController { $data = $this->context->smarty->createData(); + // autoload rich text editor (tiny mce) + $iso = $this->context->language->iso_code; + $this->tpl_form_vars['iso'] = file_exists(_PS_ROOT_DIR_.'/js/tiny_mce/langs/'.$iso.'.js') ? $iso : 'en'; + $this->tpl_form_vars['ad'] = dirname($_SERVER['PHP_SELF']); + $this->tpl_form_vars['tinymce'] = true; + $this->addJS(_PS_JS_DIR_.'tiny_mce/tiny_mce.js'); + $this->addJS(_PS_JS_DIR_.'tinymce.inc.js'); + + $currency = $this->context->currency; $data->assign('languages',$languages); @@ -2490,10 +2597,12 @@ class AdminProductsController extends AdminController $data->assign('feature_shop_active', Shop::isFeatureActive()); // @todo : uses the helperform $data->assign('displayAssoShop', $this->displayAssoShop()); + $data->assign('carrier_list', $this->getCarrierList()); + $product_props = array(); // global informations - array_push($product_props, 'reference', 'ean13', 'upc', 'location', + array_push($product_props, 'reference', 'ean13', 'upc', 'available_for_order', 'show_price', 'online_only', 'id_manufacturer' ); @@ -2651,23 +2760,6 @@ class AdminProductsController extends AdminController $data->assign('images', $images); $data->assign('imagesTypes', ImageType::getImagesTypes('products')); - $content .= ' - - - '; - if ($product->id) - $product->tags = Tag::getProductTags((int)$product->id); - foreach ($this->_languages as $language) - { - $content .= '
- - '.$this->l('Forbidden characters:').' !<>;?=+#"°{}_$%  -
'; - } - $content .= '

'.$this->l('Tags separated by commas (e.g., dvd, dvd player, hifi)').'

- - '; $accessories = Product::getAccessoriesLight($this->context->language->id, $product->id); if ($postAccessories = Tools::getValue('inputAccessories')) @@ -2677,89 +2769,17 @@ class AdminProductsController extends AdminController if (!$this->haveThisAccessory($accessoryId, $accessories) && $accessory = Product::getAccessoryById($accessoryId)) $accessories[] = $accessory; } + $data->assign('accessories', $accessories); + $product->tags = Tag::getProductTags($product->id); - $content .= ' - - - -
'; - foreach ($accessories as $accessory) - $content .= htmlentities($accessory['name'], ENT_COMPAT, 'UTF-8').(!empty($accessory['reference']) ? ' ('.$accessory['reference'].')' : '').'
'; - $content .= '
- - - '; $this->addJqueryPlugin('autocomplete'); - $content .= ' -
-

'.$this->l('Begin typing the first letters of the product name, then select the product from the drop-down list:').'

- - '.$this->l('Add an accessory').' -
- - - -
- - - -   - - -
- '; // TinyMCE $iso_tiny_mce = $this->context->language->iso_code; $iso_tiny_mce = (file_exists(_PS_JS_DIR_.'tiny_mce/langs/'.$iso_tiny_mce.'.js') ? $iso_tiny_mce : 'en'); $data->assign('ad', dirname($_SERVER["PHP_SELF"])); $data->assign('iso_tiny_mce', $iso_tiny_mce); - $content .= ' - '; $categoryBox = Tools::getValue('categoryBox', array()); $data->assign('product', $product); $data->assign('last_content', $content); @@ -2770,6 +2790,35 @@ class AdminProductsController extends AdminController $this->tpl_form_vars['custom_form'] = $this->context->smarty->createTemplate($this->tpl_form, $data)->fetch(); } + protected function getCarrierList() + { + $carrier_list = Carrier::getCarriers($this->context->language->id); + if ($product = $this->loadObject(true)) + { + $carrier_selected_list = $product->getCarriers(); + foreach ($carrier_list as &$carrier) + foreach ($carrier_selected_list as $carrier_selected) + if ($carrier_selected['id_reference'] == $carrier['id_reference']) + { + $carrier['selected'] = true; + continue; + } + } + return $carrier_list; + } + + protected function addCarriers() + { + if (Tools::getValue('carriers')) + { + if (Validate::isLoadedObject($product = new Product((int)(Tools::getValue('id_product'))))) + { + if (Tools::getValue('carriers')) + $product->setCarriers(Tools::getValue('carriers')); + } + } + } + public function initFormImages($obj, $token = null) { $this->addJs('admin-dnd'); @@ -2915,7 +2964,6 @@ class AdminProductsController extends AdminController $combArray[$combinaison['id_product_attribute']]['upc'] = $combinaison['upc']; $combArray[$combinaison['id_product_attribute']]['minimal_quantity'] = $combinaison['minimal_quantity']; $combArray[$combinaison['id_product_attribute']]['available_date'] = strftime($combinaison['available_date']); - $combArray[$combinaison['id_product_attribute']]['location'] = $combinaison['location']; $combArray[$combinaison['id_product_attribute']]['id_image'] = isset($combinationImages[$combinaison['id_product_attribute']][0]['id_image']) ? $combinationImages[$combinaison['id_product_attribute']][0]['id_image'] : 0; $combArray[$combinaison['id_product_attribute']]['default_on'] = $combinaison['default_on']; $combArray[$combinaison['id_product_attribute']]['ecotax'] = $combinaison['ecotax']; @@ -2987,7 +3035,7 @@ class AdminProductsController extends AdminController '.$this->l('Modify this combination').'  '.(!$product_attribute['default_on'] ? ' '.$this->l('Make this the default combination').'' : '').' @@ -3048,22 +3096,34 @@ class AdminProductsController extends AdminController 'attribute_designation' => '' ); + // Get physical quantities & available quantities + $stock_manager = StockManagerFactory::getManager(); + $total_quantity = 0; + $physical_quantity = array(); $available_quantity = array(); $product_designation = array(); foreach ($attributes as $attribute) { - // Get available quantity for the current product attribute in the current shop - $available_quantity[$attribute['id_product_attribute']] = StockAvailable::getQuantityAvailableByProduct( + $physical_quantity[$attribute['id_product_attribute']] = (int)$stock_manager->getProductPhysicalQuantities( (int)$obj->id, - $attribute['id_product_attribute'] + (int)$attribute['id_product_attribute'] ); + + $total_quantity += $physical_quantity[$attribute['id_product_attribute']]; + + // Get available quantity for the current product attribute in the current shop + $available_quantity[$attribute['id_product_attribute']] = StockAvailable::getQuantityAvailableByProduct((int)$obj->id, + $attribute['id_product_attribute']); + // Get all product designation $product_designation[$attribute['id_product_attribute']] = rtrim($obj->name[$this->context->language->id].' - '.$attribute['attribute_designation'], ' - '); } $data->assign(array( 'attributes' => $attributes, + 'total_quantity' => $total_quantity, + 'physical_quantity' => $physical_quantity, 'available_quantity' => $available_quantity, 'product_designation' => $product_designation, 'product' => $this->object, @@ -3144,6 +3204,47 @@ class AdminProductsController extends AdminController $this->tpl_form_vars['custom_form'] = $this->context->smarty->createTemplate($this->tpl_form, $data)->fetch(); } + public function initFormWarehouses($obj) + { + $data = $this->context->smarty->createData(); + + if ($this->object->id) + { + // Get all id_product_attribute + $attributes = $obj->getAttributesResume($this->context->language->id); + if (empty($attributes)) + $attributes[] = array( + 'id_product_attribute' => 0, + 'attribute_designation' => '' + ); + + $product_designation = array(); + + foreach ($attributes as $attribute) + $product_designation[$attribute['id_product_attribute']] = rtrim($obj->name[$this->context->language->id].' - '.$attribute['attribute_designation'], ' - '); + + // Get all available warehouses + $warehouses = Warehouse::getWarehouses(true); + + // Get already associated warehouses + $associated_warehouses_collection = WarehouseProductLocation::getCollection($this->object->id); + + $data->assign(array( + 'attributes' => $attributes, + 'warehouses' => $warehouses, + 'associated_warehouses' => $associated_warehouses_collection, + 'product_designation' => $product_designation, + 'product' => $this->object, + 'link' => $this->context->link, + 'token' => $this->token + )); + } + else + $data->assign('content', ''.$this->l('You must save this product before manage warehouses').'.'); + + $this->tpl_form_vars['custom_form'] = $this->context->smarty->createTemplate($this->tpl_form, $data)->fetch(); + } + public function initFormFeatures($obj) { if (!Feature::isFeatureActive())