From 378b1386c3b49aef0f96eb2b67de009b3b39a0e2 Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Mon, 24 Oct 2011 14:32:57 +0000 Subject: [PATCH] // BugFix with order states change and warehouse git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9596 b9a71923-0436-4b27-9f14-aed3839534dd --- admin-dev/themes/template/orders/view.tpl | 7 +++++-- controllers/admin/AdminOrdersController.php | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/admin-dev/themes/template/orders/view.tpl b/admin-dev/themes/template/orders/view.tpl index 009f745cf..c179ae157 100755 --- a/admin-dev/themes/template/orders/view.tpl +++ b/admin-dev/themes/template/orders/view.tpl @@ -32,12 +32,15 @@ $('#warehouse').show(); {/literal}{/if}{literal} } - + function hideWarehouseList() { $('#warehouse').hide(); } - hideWarehouseList(); + $(document).ready(function() + { + hideWarehouseList(); + }); {/literal} diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 5a3a97282..5d0927993 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -503,7 +503,7 @@ class AdminOrdersControllerCore extends AdminController 'carrier' => $carrier = new Carrier($order->id_carrier), 'history' => $order->getHistory($this->context->language->id), 'states' => OrderState::getOrderStates($this->context->language->id), - 'warehouse_list' => Warehouse::getWarehouseList(), + 'warehouse_list' => Warehouse::getWarehouseList(false, $order->id_shop), 'sources' => ConnectionsSource::getOrderSources($order->id), 'currentState' => OrderHistory::getLastOrderState($order->id), 'currency' => new Currency($order->id_currency),