From 83ae4a31dfb2d74221375b836fa11d4bf5c10d27 Mon Sep 17 00:00:00 2001 From: rMalie Date: Wed, 18 Apr 2012 15:19:36 +0000 Subject: [PATCH] // Change order of fields in ShopGroup creation #PSTEST-690 --- .../admin/AdminShopGroupController.php | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/controllers/admin/AdminShopGroupController.php b/controllers/admin/AdminShopGroupController.php index 9f34da5e7..94d9cc4b2 100644 --- a/controllers/admin/AdminShopGroupController.php +++ b/controllers/admin/AdminShopGroupController.php @@ -104,28 +104,6 @@ class AdminShopGroupControllerCore extends AdminController ), 'desc' => $this->l('Share customers between shops of this group') ), - array( - 'type' => 'radio', - 'label' => $this->l('Share orders:'), - 'name' => 'share_order', - 'required' => true, - 'class' => 't', - 'is_bool' => true, - 'values' => array( - array( - 'id' => 'share_order_on', - 'value' => 1, - 'label' => $this->l('Enabled') - ), - array( - 'id' => 'share_order_off', - 'value' => 0, - 'label' => $this->l('Disabled') - ) - ), - 'desc' => - $this->l('Share orders and carts between shops of this group (you can share orders only if you share customers and available quantities)') - ), array( 'type' => 'radio', 'label' => $this->l('Share available quantities to sell:'), @@ -147,6 +125,28 @@ class AdminShopGroupControllerCore extends AdminController ), 'desc' => $this->l('Share available quantities to sell between shops of this group. When changing this option, all product available quantities for this group will be reset to 0.'), ), + array( + 'type' => 'radio', + 'label' => $this->l('Share orders:'), + 'name' => 'share_order', + 'required' => true, + 'class' => 't', + 'is_bool' => true, + 'values' => array( + array( + 'id' => 'share_order_on', + 'value' => 1, + 'label' => $this->l('Enabled') + ), + array( + 'id' => 'share_order_off', + 'value' => 0, + 'label' => $this->l('Disabled') + ) + ), + 'desc' => + $this->l('Share orders and carts between shops of this group (you can share orders only if you share customers and available quantities)') + ), array( 'type' => 'radio', 'label' => $this->l('Status:'),