dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Stock : fixed instant state

Browse Source
This commit is contained in:
bMancone committed 2011-11-08 11:05:16 +00:00
1 parent 9cbb51678b
commit 7fd1f831e8
1 file changed
+9 -5
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStockInstantStateController.php
+9 -5
View File
@@ -25,6 +25,9 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
/**
* @since 1.5.0
*/
class AdminStockInstantStateControllerCore extends AdminController class AdminStockInstantStateControllerCore extends AdminController
{ {
private $_default_order_by = 'id_product'; private $_default_order_by = 'id_product';
@@ -93,7 +96,7 @@ class AdminStockInstantStateControllerCore extends AdminController
$this->addRowAction('details'); $this->addRowAction('details');
//no link on list rows // disables link on list rows
$this->list_no_link = true; $this->list_no_link = true;
$this->tpl_list_vars['list_warehouses'] = Warehouse::getWarehouseList(true); $this->tpl_list_vars['list_warehouses'] = Warehouse::getWarehouseList(true);
@@ -103,15 +106,16 @@ class AdminStockInstantStateControllerCore extends AdminController
} }
/** /**
* method call when ajax request is made with the details row action * Method call when ajax request is made with the details row action
* @see AdminController::postProcess() * @see AdminController::postProcess()
*/ */
public function ajaxProcess() public function ajaxProcess()
{ {
// get current lang id // gets current lang id
$lang_id = (int)$this->context->language->id; $lang_id = (int)$this->context->language->id;
$query = 'SELECT physical_quantity, usable_quantity, s.price_te $query = '
SELECT physical_quantity, usable_quantity, s.price_te
FROM '._DB_PREFIX_.'stock s FROM '._DB_PREFIX_.'stock s
INNER JOIN '._DB_PREFIX_.'product p INNER JOIN '._DB_PREFIX_.'product p
ON (p.id_product = s.id_product) ON (p.id_product = s.id_product)
@@ -151,7 +155,7 @@ class AdminStockInstantStateControllerCore extends AdminController
$warehouse = 1; $warehouse = 1;
if ((int)Tools::getValue('warehouse')) if ((int)Tools::getValue('warehouse'))
$warehouse = (int)Tools::getValue('warehouse'); $warehouse = (int)Tools::getValue('warehouse');
else if ((int)$this->context->cookie->warehouse) else if ((int)$this->context->cookie->warehouse && (int)$this->context->cookie->warehouse != -1)
$warehouse = (int)$this->context->cookie->warehouse; $warehouse = (int)$this->context->cookie->warehouse;
$this->context->cookie->warehouse = $warehouse; $this->context->cookie->warehouse = $warehouse;
} }