From 6533ee4bec2a615b84180b39d40ca0da148b8e21 Mon Sep 17 00:00:00 2001 From: Sarah Lorenzini Date: Mon, 5 Aug 2013 12:13:43 +0200 Subject: [PATCH] // update stock tab --- .../stock_cover/helpers/list/list_header.tpl | 2 +- .../supply_orders/helpers/form/form.tpl | 134 ++++++++---------- .../helpers/list/list_header.tpl | 2 +- .../supply_orders/helpers/view/view.tpl | 45 +++--- .../AdminStockConfigurationController.php | 47 +++--- .../admin/AdminStockCoverController.php | 7 +- .../AdminStockInstantStateController.php | 8 +- .../admin/AdminStockManagementController.php | 87 +++++------- controllers/admin/AdminStockMvtController.php | 8 +- .../admin/AdminSupplyOrdersController.php | 65 +++------ .../admin/AdminWarehousesController.php | 40 +++--- 11 files changed, 184 insertions(+), 261 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl index a42fa8281..0adaf33c6 100644 --- a/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl @@ -41,7 +41,7 @@ {if count($stock_cover_warehouses) > 0}
- {foreach from=$stock_cover_warehouses key=k item=i} {/foreach} diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl index 06d43e078..97f61fa01 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl @@ -44,77 +44,69 @@

 

- - - - +
- - - - - - - - - - - - - - - - - {foreach $products_list AS $product} - - - - - - - - - - - - - {/foreach} - -
{l s='Reference'}{l s='EAN13'}{l s='UPC'}{l s='Supplier Reference'}{l s='Name'}{l s='Unit Price (tax excl.)'}{l s='Quantity'}{l s='Discount rate'}{l s='Tax rate'}{l s='Delete'}
- {$product.reference} - - - - - {$product.ean13} - - - {$product.upc} - - - {$product.supplier_reference} - - - {$product.name} - - - {$currency->prefix}  {$currency->suffix} - - - - % - - % - - - {l s='Remove this product from the order.'} - -
-
+ + + + + + + + + + + + + + + + {foreach $products_list AS $product} + + + + + + + + + + + + + {/foreach} +
{l s='Reference'}{l s='EAN13'}{l s='UPC'}{l s='Supplier Reference'}{l s='Name'}{l s='Unit Price (tax excl.)'}{l s='Quantity'}{l s='Discount rate'}{l s='Tax rate'}{l s='Delete'}
+ {$product.reference} + + + + + {$product.ean13} + + + {$product.upc} + + + {$product.supplier_reference} + + + {$product.name} + + + {$currency->prefix}  {$currency->suffix} + + + + % + + % + + + {l s='Remove this product from the order.'} + +
diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl index 33dfc9b8e..42c8994e5 100644 --- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl @@ -37,7 +37,7 @@ {/foreach}
-
+
diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl index 74acd19c7..4124c471b 100755 --- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl @@ -25,10 +25,13 @@ {extends file="helpers/view/view.tpl"} {block name="override_tpl"} -
-
- {if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='General information'} - +
+
+

+ + {if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='General information'} +

+
@@ -61,20 +64,26 @@ -
-
- {if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Products:'} +
+
+

+ + {if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Products:'} +

{$supply_order_detail_content}
-
-
- {if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Summary'} -
{l s='Creation date:'} {$supply_order_creation_date}
+
+
+

+ + {if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Summary'} +

+
- + @@ -82,15 +91,15 @@ - + - + - + @@ -98,11 +107,11 @@ - + - + @@ -110,7 +119,7 @@ - +
{l s='Designation'}{l s='Value'}{l s='Value'}
{l s='Total (tax excl.)'}{$supply_order_total_te}{$supply_order_total_te}
{l s='Discount'}{$supply_order_discount_value_te}{$supply_order_discount_value_te}
{l s='Total with discount (tax excl.)'}{$supply_order_total_with_discount_te}{$supply_order_total_with_discount_te}
{l s='Total Tax'}{$supply_order_total_tax}{$supply_order_total_tax}
{l s='Total (tax incl.)'}{$supply_order_total_ti}{$supply_order_total_ti}
{l s='Total to pay.'}{$supply_order_total_ti}{$supply_order_total_ti}
diff --git a/controllers/admin/AdminStockConfigurationController.php b/controllers/admin/AdminStockConfigurationController.php index 0d719285d..3dd0c4cf4 100644 --- a/controllers/admin/AdminStockConfigurationController.php +++ b/controllers/admin/AdminStockConfigurationController.php @@ -34,6 +34,7 @@ class AdminStockConfigurationControllerCore extends AdminController */ public function __construct() { + $this->bootstrap = true; $this->context = Context::getContext(); $this->table = 'stock_mvt_reason'; $this->className = 'StockMvtReason'; @@ -45,12 +46,10 @@ class AdminStockConfigurationControllerCore extends AdminController 'id_stock_mvt_reason' => array( 'title' => $this->l('ID'), 'align' => 'center', - 'width' => 40, 'search' => false, ), 'sign' => array( 'title' => $this->l('Sign'), - 'width' => 100, 'align' => 'center', 'type' => 'select', 'filter_key' => 'a!sign', @@ -66,8 +65,7 @@ class AdminStockConfigurationControllerCore extends AdminController ), 'name' => array( 'title' => $this->l('Name'), - 'filter_key' => 'b!name', - 'width' => 250 + 'filter_key' => 'b!name' ), ); @@ -156,7 +154,7 @@ class AdminStockConfigurationControllerCore extends AdminController $this->fields_form = array( 'legend' => array( 'title' => $this->l('Stock Movement label'), - 'image' => '../img/admin/edit.gif' + 'icon' => 'icon-pencil' ), 'input' => array( array( @@ -164,7 +162,6 @@ class AdminStockConfigurationControllerCore extends AdminController 'lang' => true, 'label' => $this->l('Name:'), 'name' => 'name', - 'size' => 50, 'required' => true ), array( @@ -186,12 +183,12 @@ class AdminStockConfigurationControllerCore extends AdminController 'id' => 'id', 'name' => 'name' ), - 'desc' => $this->l('Select the corresponding action: Increase or decrease stock?') + 'hint' => $this->l('Select the corresponding action: Increase or decrease stock?') ), ), 'submit' => array( 'title' => $this->l('Save'), - 'class' => 'button' + 'class' => 'btn btn-primary' ) ); } @@ -204,7 +201,7 @@ class AdminStockConfigurationControllerCore extends AdminController $this->fields_form = array( 'legend' => array( 'title' => $this->l('Supply Order Status'), - 'image' => '../img/admin/edit.gif' + 'icon' => 'icon-pencil' ), 'input' => array( array( @@ -212,22 +209,19 @@ class AdminStockConfigurationControllerCore extends AdminController 'lang' => true, 'label' => $this->l('Status:'), 'name' => 'name', - 'size' => 50, 'required' => true ), array( 'type' => 'color', 'label' => $this->l('Color:'), 'name' => 'color', - 'size' => 20, - 'desc' => $this->l('The background of the PrestaShop Back Office will be displayed in this color (HTML colors only, please).'), + 'hint' => $this->l('The background of the PrestaShop Back Office will be displayed in this color (HTML colors only, please).'), ), array( - 'type' => 'radio', + 'type' => 'switch', 'label' => $this->l('Editable:'), 'name' => 'editable', 'required' => true, - 'class' => 't', 'is_bool' => true, 'values' => array( array( @@ -241,14 +235,13 @@ class AdminStockConfigurationControllerCore extends AdminController 'label' => $this->l('No') ) ), - 'desc' => $this->l('Is it is possible to edit the order? Keep in mind that an editable order can not be sent to the supplier.') + 'hint' => $this->l('Is it is possible to edit the order? Keep in mind that an editable order can not be sent to the supplier.') ), array( - 'type' => 'radio', + 'type' => 'switch', 'label' => $this->l('Delivery note:'), 'name' => 'delivery_note', 'required' => true, - 'class' => 't', 'is_bool' => true, 'values' => array( array( @@ -262,14 +255,13 @@ class AdminStockConfigurationControllerCore extends AdminController 'label' => $this->l('No') ) ), - 'desc' => $this->l('Is it possible to generate a delivery note for the order?') + 'hint' => $this->l('Is it possible to generate a delivery note for the order?') ), array( - 'type' => 'radio', + 'type' => 'switch', 'label' => $this->l('Delivery state:'), 'name' => 'receipt_state', 'required' => true, - 'class' => 't', 'is_bool' => true, 'values' => array( array( @@ -283,14 +275,13 @@ class AdminStockConfigurationControllerCore extends AdminController 'label' => $this->l('No') ) ), - 'desc' => $this->l('Define if products have been either partially or completely received. This will allow you to know if ordered products have to be added to the corresponding warehouse.'), + 'hint' => $this->l('Define if products have been either partially or completely received. This will allow you to know if ordered products have to be added to the corresponding warehouse.'), ), array( - 'type' => 'radio', + 'type' => 'switch', 'label' => $this->l('Pending receipt:'), 'name' => 'pending_receipt', 'required' => true, - 'class' => 't', 'is_bool' => true, 'values' => array( array( @@ -304,12 +295,12 @@ class AdminStockConfigurationControllerCore extends AdminController 'label' => $this->l('No') ) ), - 'desc' => $this->l('The customer is awaiting delivery.') + 'hint' => $this->l('The customer is awaiting delivery.') ), ), 'submit' => array( 'title' => $this->l('Save'), - 'class' => 'button' + 'class' => 'btn btn-primary' ) ); @@ -327,7 +318,7 @@ class AdminStockConfigurationControllerCore extends AdminController $this->fields_form = array( 'legend' => array( 'title' => $this->l('Supply order status'), - 'image' => '../img/admin/edit.gif' + 'icon' => 'icon-pencil' ), 'input' => array( array( @@ -335,20 +326,18 @@ class AdminStockConfigurationControllerCore extends AdminController 'lang' => true, 'label' => $this->l('Status:'), 'name' => 'name', - 'size' => 50, 'required' => true ), array( 'type' => 'color', 'label' => $this->l('Back Office color:'), 'name' => 'color', - 'size' => 20, 'desc' => $this->l('The background of PrestaShop\'s Back Office will be displayed in this color (HTML colors only, please).'), ), ), 'submit' => array( 'title' => $this->l('Save'), - 'class' => 'button' + 'class' => 'btn btn-primary' ) ); } diff --git a/controllers/admin/AdminStockCoverController.php b/controllers/admin/AdminStockCoverController.php index ddbb16bfb..fe9ad9197 100644 --- a/controllers/admin/AdminStockCoverController.php +++ b/controllers/admin/AdminStockCoverController.php @@ -34,6 +34,7 @@ class AdminStockCoverControllerCore extends AdminController public function __construct() { + $this->bootstrap = true; $this->context = Context::getContext(); $this->table = 'product'; $this->className = 'Product'; @@ -45,19 +46,16 @@ class AdminStockCoverControllerCore extends AdminController 'reference' => array( 'title' => $this->l('Reference'), 'align' => 'center', - 'width' => 200, 'filter_key' => 'a!reference' ), 'ean13' => array( 'title' => $this->l('EAN13'), 'align' => 'center', - 'width' => 100, 'filter_key' => 'a!ean13' ), 'upc' => array( 'title' => $this->l('UPC'), 'align' => 'center', - 'width' => 100, 'filter_key' => 'a!upc' ), 'name' => array( @@ -66,21 +64,18 @@ class AdminStockCoverControllerCore extends AdminController ), 'qty_sold' => array( 'title' => $this->l('Quantity sold'), - 'width' => 160, 'orderby' => false, 'search' => false, 'hint' => $this->l('Quantity sold during the defined period.'), ), 'coverage' => array( 'title' => $this->l('Coverage'), - 'width' => 160, 'orderby' => false, 'search' => false, 'hint' => $this->l('Days left before your stock runs out.'), ), 'stock' => array( 'title' => $this->l('Quantity'), - 'width' => 80, 'orderby' => false, 'search' => false, 'hint' => $this->l('Physical (usable) quantity.') diff --git a/controllers/admin/AdminStockInstantStateController.php b/controllers/admin/AdminStockInstantStateController.php index a3db14452..46059805c 100644 --- a/controllers/admin/AdminStockInstantStateController.php +++ b/controllers/admin/AdminStockInstantStateController.php @@ -33,6 +33,7 @@ class AdminStockInstantStateControllerCore extends AdminController public function __construct() { + $this->bootstrap = true; $this->context = Context::getContext(); $this->table = 'stock'; $this->className = 'Stock'; @@ -43,18 +44,15 @@ class AdminStockInstantStateControllerCore extends AdminController 'reference' => array( 'title' => $this->l('Reference'), 'align' => 'center', - 'width' => 200, 'havingFilter' => true ), 'ean13' => array( 'title' => $this->l('EAN13'), 'align' => 'center', - 'width' => 100, ), 'upc' => array( 'title' => $this->l('UPC'), 'align' => 'center', - 'width' => 100, ), 'name' => array( 'title' => $this->l('Name'), @@ -62,7 +60,6 @@ class AdminStockInstantStateControllerCore extends AdminController ), 'price_te' => array( 'title' => $this->l('Price (tax excl.)'), - 'width' => 150, 'orderby' => true, 'search' => false, 'type' => 'price', @@ -70,7 +67,6 @@ class AdminStockInstantStateControllerCore extends AdminController ), 'valuation' => array( 'title' => $this->l('Valuation'), - 'width' => 150, 'orderby' => true, 'search' => false, 'type' => 'price', @@ -94,7 +90,7 @@ class AdminStockInstantStateControllerCore extends AdminController 'width' => 80, 'orderby' => true, 'search' => false, - 'hint' => $this->l('Pysical quantity (usable) - Client orders + Supply Orders'), + 'hint' => $this->l('Physical quantity (usable) - Client orders + Supply Orders'), ), ); diff --git a/controllers/admin/AdminStockManagementController.php b/controllers/admin/AdminStockManagementController.php index 22319e557..d7e5f4928 100644 --- a/controllers/admin/AdminStockManagementController.php +++ b/controllers/admin/AdminStockManagementController.php @@ -31,6 +31,7 @@ class AdminStockManagementControllerCore extends AdminController { public function __construct() { + $this->bootstrap = true; $this->context = Context::getContext(); $this->table = 'product'; $this->className = 'Product'; @@ -41,31 +42,27 @@ class AdminStockManagementControllerCore extends AdminController 'reference' => array( 'title' => $this->l('Product reference'), 'align' => 'center', - 'filter_key' => 'a!reference', - 'width' => 200 + 'filter_key' => 'a!reference' ), 'ean13' => array( 'title' => $this->l('EAN13'), 'align' => 'center', - 'filter_key' => 'a!ean13', - 'width' => 100 + 'filter_key' => 'a!ean13' ), 'upc' => array( 'title' => $this->l('UPC'), 'align' => 'center', - 'filter_key' => 'a!upc', - 'width' => 100 + 'filter_key' => 'a!upc' ), 'name' => array( - 'title' => $this->l('Name'), + 'title' => $this->l('Name') ), 'stock' => array( 'title' => $this->l('Quantity'), - 'hint' => $this->l('Quantitity total for all warehouses.'), - 'width' => 100, 'orderby' => false, 'filter' => false, 'search' => false, + 'hint' => $this->l('Quantitity total for all warehouses.') ), ); @@ -166,7 +163,7 @@ class AdminStockManagementControllerCore extends AdminController $this->fields_form[]['form'] = array( 'legend' => array( 'title' => $this->l('Add a product to your stock.'), - 'image' => '../img/admin/add_stock.png' + 'icon' => 'icon-long-arrow-up' ), 'input' => array( array( @@ -189,49 +186,43 @@ class AdminStockManagementControllerCore extends AdminController 'type' => 'text', 'label' => $this->l('Product reference:'), 'name' => 'reference', - 'size' => 30, 'disabled' => true, ), array( 'type' => 'text', 'label' => $this->l('EAN13:'), 'name' => 'ean13', - 'size' => 15, 'disabled' => true, ), array( 'type' => 'text', 'label' => $this->l('UPC:'), 'name' => 'upc', - 'size' => 15, 'disabled' => true, ), array( 'type' => 'text', 'label' => $this->l('Name:'), 'name' => 'name', - 'size' => 75, 'disabled' => true, ), array( 'type' => 'text', 'label' => $this->l('Quantity to add:'), 'name' => 'quantity', - 'size' => 10, 'maxlength' => 6, 'required' => true, - 'desc' => $this->l('Physical quantity to add'), - 'hint' => sprintf( + 'hint' => array( + $this->l('Physical quantity to add'), $this->l('Last physical quantity added : %s (%s)'), ($last_sm_quantity > 0 ? $last_sm_quantity : $this->l('N/A')), ($last_sm_quantity > 0 ? ($last_sm_quantity_is_usable >= 0 ? $this->l('Usable') : $this->l('Not usable')) : $this->l('N/A'))), ), array( - 'type' => 'radio', + 'type' => 'switch', 'label' => $this->l('Usable for sale?'), 'name' => 'usable', 'required' => true, - 'class' => 't', 'is_bool' => true, 'values' => array( array( @@ -245,7 +236,7 @@ class AdminStockManagementControllerCore extends AdminController 'label' => $this->l('Disabled') ) ), - 'desc' => $this->l('Is this quantity ready to be displayed in your shop, or is it reserved in the warehouse for other purposes?') + 'hint' => $this->l('Is this quantity ready to be displayed in your shop, or is it reserved in the warehouse for other purposes?') ), array( 'type' => 'select', @@ -257,7 +248,7 @@ class AdminStockManagementControllerCore extends AdminController 'id' => 'id_warehouse', 'name' => 'name' ), - 'desc' => $this->l('Please select the warehouse that you\'ll be adding products to. ') + 'hint' => $this->l('Please select the warehouse that you\'ll be adding products to. ') ), array( 'type' => 'text', @@ -266,8 +257,10 @@ class AdminStockManagementControllerCore extends AdminController 'required' => true, 'size' => 10, 'maxlength' => 10, - 'desc' => $this->l('Unit purchase price or unit manufacturing cost for this product (tax excl.)'), - 'hint' => sprintf($this->l('Last unit price (tax excl.): %s'), $last_sm_unit_price_te), + 'hint' => array( + $this->l('Unit purchase price or unit manufacturing cost for this product (tax excl.)'), + sprintf($this->l('Last unit price (tax excl.): %s'), $last_sm_unit_price_te), + ) ), array( 'type' => 'select', @@ -279,7 +272,7 @@ class AdminStockManagementControllerCore extends AdminController 'id' => 'id_currency', 'name' => 'name' ), - 'desc' => $this->l('The currency associated to the product unit price.'), + 'hint' => $this->l('The currency associated to the product unit price.'), ), array( 'type' => 'select', @@ -293,12 +286,12 @@ class AdminStockManagementControllerCore extends AdminController 'id' => 'id_stock_mvt_reason', 'name' => 'name' ), - 'desc' => $this->l('Label used in stock movements'), + 'hint' => $this->l('Label used in stock movements'), ), ), 'submit' => array( 'title' => $this->l('Add to stock'), - 'class' => 'button' + 'class' => 'btn btn-primary' ) ); $this->fields_value['usable'] = 1; @@ -308,7 +301,7 @@ class AdminStockManagementControllerCore extends AdminController $this->fields_form[]['form'] = array( 'legend' => array( 'title' => $this->l('Remove the product from your stock.'), - 'image' => '../img/admin/remove_stock.png' + 'icon' => 'icon-long-arrow-down' ), 'input' => array( array( @@ -331,38 +324,33 @@ class AdminStockManagementControllerCore extends AdminController 'type' => 'text', 'label' => $this->l('Product reference:'), 'name' => 'reference', - 'size' => 30, 'disabled' => true, ), array( 'type' => 'text', 'label' => $this->l('EAN13:'), 'name' => 'ean13', - 'size' => 15, 'disabled' => true, ), array( 'type' => 'text', 'label' => $this->l('Name:'), 'name' => 'name', - 'size' => 75, 'disabled' => true, ), array( 'type' => 'text', 'label' => $this->l('Quantity to remove:'), 'name' => 'quantity', - 'size' => 10, 'maxlength' => 6, 'required' => true, - 'desc' => $this->l('Physical quantity to remove'), + 'hint' => $this->l('Physical quantity to remove'), ), array( - 'type' => 'radio', + 'type' => 'switch', 'label' => $this->l('Usable for sale:'), 'name' => 'usable', 'required' => true, - 'class' => 't', 'is_bool' => true, 'values' => array( array( @@ -376,7 +364,7 @@ class AdminStockManagementControllerCore extends AdminController 'label' => $this->l('Disabled') ) ), - 'desc' => $this->l('Do you want to remove this quantity from the usable quantity (yes) or the physical quantity (no)?') + 'hint' => $this->l('Do you want to remove this quantity from the usable quantity (yes) or the physical quantity (no)?') ), array( 'type' => 'select', @@ -388,7 +376,7 @@ class AdminStockManagementControllerCore extends AdminController 'id' => 'id_warehouse', 'name' => 'name' ), - 'desc' => $this->l('Select the warehouse you\'d like to remove the product from.') + 'hint' => $this->l('Select the warehouse you\'d like to remove the product from.') ), array( 'type' => 'select', @@ -402,12 +390,12 @@ class AdminStockManagementControllerCore extends AdminController 'id' => 'id_stock_mvt_reason', 'name' => 'name' ), - 'desc' => $this->l('Label used in stock movements'), + 'hint' => $this->l('Label used in stock movements'), ), ), 'submit' => array( 'title' => $this->l('Remove from stock'), - 'class' => 'button' + 'class' => 'btn btn-primary' ) ); break; @@ -416,7 +404,7 @@ class AdminStockManagementControllerCore extends AdminController $this->fields_form[]['form'] = array( 'legend' => array( 'title' => $this->l('Transfer a product from one warehouse to another'), - 'image' => '../img/admin/transfer_stock.png' + 'icon' => 'icon-share-alt' ), 'input' => array( array( @@ -439,31 +427,27 @@ class AdminStockManagementControllerCore extends AdminController 'type' => 'text', 'label' => $this->l('Product reference:'), 'name' => 'reference', - 'size' => 30, 'disabled' => true, ), array( 'type' => 'text', 'label' => $this->l('EAN13:'), 'name' => 'ean13', - 'size' => 15, 'disabled' => true, ), array( 'type' => 'text', 'label' => $this->l('Name:'), 'name' => 'name', - 'size' => 75, 'disabled' => true, ), array( 'type' => 'text', 'label' => $this->l('Quantity to transfer:'), 'name' => 'quantity', - 'size' => 10, 'maxlength' => 6, 'required' => true, - 'desc' => $this->l('Quantity to transfer:') + 'hint' => $this->l('Quantity to transfer:') ), array( 'type' => 'select', @@ -475,14 +459,13 @@ class AdminStockManagementControllerCore extends AdminController 'id' => 'id_warehouse', 'name' => 'name' ), - 'desc' => $this->l('Select the warehouse you\'d like to transfer the product from.') + 'hint' => $this->l('Select the warehouse you\'d like to transfer the product from.') ), array( - 'type' => 'radio', + 'type' => 'switch', 'label' => $this->l('Is this product usable in your source warehouse?'), 'name' => 'usable_from', 'required' => true, - 'class' => 't', 'is_bool' => true, 'values' => array( array( @@ -496,7 +479,7 @@ class AdminStockManagementControllerCore extends AdminController 'label' => $this->l('Disabled') ) ), - 'desc' => $this->l('Is this the usable quantity for sale?') + 'hint' => $this->l('Is this the usable quantity for sale?') ), array( 'type' => 'select', @@ -508,10 +491,10 @@ class AdminStockManagementControllerCore extends AdminController 'id' => 'id_warehouse', 'name' => 'name' ), - 'desc' => $this->l('Select the warehouse you\'d like to transfer your product(s) to. ') + 'hint' => $this->l('Select the warehouse you\'d like to transfer your product(s) to. ') ), array( - 'type' => 'radio', + 'type' => 'switch', 'label' => $this->l('Is this product for sale in your destination warehouse?'), 'name' => 'usable_to', 'required' => true, @@ -529,12 +512,12 @@ class AdminStockManagementControllerCore extends AdminController 'label' => $this->l('Disabled') ) ), - 'desc' => $this->l('Do you want it to be for sale/useable?') + 'hint' => $this->l('Do you want it to be for sale/useable?') ), ), 'submit' => array( 'title' => $this->l('Transfer'), - 'class' => 'button' + 'class' => 'btn btn-primary' ) ); break; diff --git a/controllers/admin/AdminStockMvtController.php b/controllers/admin/AdminStockMvtController.php index cfba4037f..459fd37d9 100644 --- a/controllers/admin/AdminStockMvtController.php +++ b/controllers/admin/AdminStockMvtController.php @@ -31,6 +31,7 @@ class AdminStockMvtControllerCore extends AdminController { public function __construct() { + $this->bootstrap = true; $this->context = Context::getContext(); $this->table = 'stock_mvt'; $this->className = 'StockMvt'; @@ -44,17 +45,14 @@ class AdminStockMvtControllerCore extends AdminController $this->fields_list = array( 'product_reference' => array( 'title' => $this->l('Reference'), - 'width' => 100, 'havingFilter' => true ), 'product_ean13' => array( 'title' => $this->l('EAN 13'), - 'width' => 75, 'havingFilter' => true ), 'product_upc' => array( 'title' => $this->l('UPC'), - 'width' => 75, 'havingFilter' => true ), 'product_name' => array( @@ -84,7 +82,6 @@ class AdminStockMvtControllerCore extends AdminController ), 'physical_quantity' => array( 'title' => $this->l('Quantity'), - 'width' => 40, 'filter_key' => 'a!physical_quantity' ), 'price_te' => array( @@ -97,17 +94,14 @@ class AdminStockMvtControllerCore extends AdminController ), 'reason' => array( 'title' => $this->l('Label'), - 'width' => 100, 'havingFilter' => true ), 'employee' => array( 'title' => $this->l('Employee'), - 'width' => 100, 'havingFilter' => true ), 'date_add' => array( 'title' => $this->l('Date'), - 'width' => 150, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add' diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php index 25d98a664..c1b77a2f8 100644 --- a/controllers/admin/AdminSupplyOrdersController.php +++ b/controllers/admin/AdminSupplyOrdersController.php @@ -37,6 +37,7 @@ class AdminSupplyOrdersControllerCore extends AdminController public function __construct() { + $this->bootstrap = true; $this->context = Context::getContext(); $this->table = 'supply_order'; $this->className = 'SupplyOrder'; @@ -55,28 +56,23 @@ class AdminSupplyOrdersControllerCore extends AdminController $this->fields_list = array( 'reference' => array( 'title' => $this->l('Reference'), - 'width' => 250, 'havingFilter' => true ), 'supplier' => array( 'title' => $this->l('Supplier'), - 'width' => 130, 'filter_key' => 's!name' ), 'warehouse' => array( 'title' => $this->l('Warehouse'), - 'width' => 130, 'filter_key' => 'w!name' ), 'state' => array( 'title' => $this->l('Status'), - 'width' => 200, 'filter_key' => 'stl!name', 'color' => 'color', ), 'date_add' => array( 'title' => $this->l('Creation'), - 'width' => 150, 'align' => 'left', 'type' => 'date', 'havingFilter' => true, @@ -84,7 +80,6 @@ class AdminSupplyOrdersControllerCore extends AdminController ), 'date_upd' => array( 'title' => $this->l('Last modification'), - 'width' => 150, 'align' => 'left', 'type' => 'date', 'havingFilter' => true, @@ -92,7 +87,6 @@ class AdminSupplyOrdersControllerCore extends AdminController ), 'date_delivery_expected' => array( 'title' => $this->l('Delivery (expected)'), - 'width' => 150, 'align' => 'left', 'type' => 'date', 'havingFilter' => true, @@ -100,7 +94,6 @@ class AdminSupplyOrdersControllerCore extends AdminController ), 'id_export' => array( 'title' => $this->l('Export'), - 'width' => 80, 'callback' => 'printExportIcons', 'orderby' => false, 'search' => false @@ -203,16 +196,15 @@ class AdminSupplyOrdersControllerCore extends AdminController $this->fields_form = array( 'legend' => array( 'title' => $this->l('Order information'), - 'image' => '../img/admin/edit.gif' + 'icon' => 'icon-pencil' ), 'input' => array( array( 'type' => 'text', 'label' => $this->l('Reference:'), 'name' => 'reference', - 'size' => 50, 'required' => true, - 'desc' => $this->l('Here\'s the reference number for your order.'), + 'hint' => $this->l('Here\'s the reference number for your order.'), ), array( 'type' => 'select', @@ -224,8 +216,10 @@ class AdminSupplyOrdersControllerCore extends AdminController 'id' => 'id_supplier', 'name' => 'name' ), - 'desc' => $this->l('Select the supplier you\'ll be purchasing from.'), - 'hint' => $this->l('Warning: All products already added to the order will be removed.') + 'hint' => array( + $this->l('Select the supplier you\'ll be purchasing from.'), + $this->l('Warning: All products already added to the order will be removed.') + ) ), array( 'type' => 'select', @@ -237,7 +231,7 @@ class AdminSupplyOrdersControllerCore extends AdminController 'id' => 'id_warehouse', 'name' => 'name' ), - 'desc' => $this->l('Which warehouse will the order be sent to?'), + 'hint' => $this->l('Which warehouse will the order be sent to?'), ), array( 'type' => 'select', @@ -249,8 +243,10 @@ class AdminSupplyOrdersControllerCore extends AdminController 'id' => 'id_currency', 'name' => 'name' ), - 'desc' => $this->l('The currency of the order.'), - 'hint' => $this->l('Warning: All products already added to the order will be removed.') + 'hint' => array( + $this->l('The currency of the order.'), + $this->l('Warning: All products already added to the order will be removed.') + ) ), array( 'type' => 'select', @@ -262,24 +258,24 @@ class AdminSupplyOrdersControllerCore extends AdminController 'id' => 'id_lang', 'name' => 'name' ), - 'desc' => $this->l('The language of the order.') + 'hint' => $this->l('The language of the order.') ), array( 'type' => 'text', 'label' => $this->l('Global discount rate (%):'), 'name' => 'discount_rate', - 'size' => 10, 'required' => true, - 'desc' => $this->l('This is the global discount rate in percent for the order.'), + 'hint' => $this->l('This is the global discount rate in percent for the order.'), ), array( 'type' => 'text', 'label' => $this->l('Automatically load products:'), 'name' => 'load_products', - 'size' => 10, 'required' => false, - 'hint' => $this->l('This will reset the order'), - 'desc' => $this->l('If specified, each product quantity less than or equal to this value will be loaded.'), + 'hint' => array( + $this->l('This will reset the order'), + $this->l('If specified, each product quantity less than or equal to this value will be loaded.'), + ), ), ), 'submit' => array( @@ -307,7 +303,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'type' => 'date', 'label' => $this->l('Expected delivery date:'), 'name' => 'date_delivery_expected', - 'size' => 10, 'required' => true, 'desc' => $this->l('The expected delivery date for this order is...'), ); @@ -695,7 +690,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'supplier_reference' => array( 'title' => $this->l('Supplier Reference'), 'align' => 'left', - 'width' => 50, 'orderby' => false, 'filter' => false, 'search' => false, @@ -703,7 +697,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'reference' => array( 'title' => $this->l('Reference'), 'align' => 'left', - 'width' => 30, 'orderby' => false, 'filter' => false, 'search' => false, @@ -711,7 +704,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'ean13' => array( 'title' => $this->l('EAN13'), 'align' => 'left', - 'width' => 30, 'orderby' => false, 'filter' => false, 'search' => false, @@ -719,7 +711,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'upc' => array( 'title' => $this->l('UPC'), 'align' => 'left', - 'width' => 30, 'orderby' => false, 'filter' => false, 'search' => false, @@ -727,7 +718,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'name' => array( 'title' => $this->l('Name'), 'align' => 'left', - 'width' => 300, 'orderby' => false, 'filter' => false, 'search' => false, @@ -735,7 +725,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'quantity_received_today' => array( 'title' => $this->l('Quantity received today?'), 'align' => 'left', - 'width' => 20, 'type' => 'editable', 'orderby' => false, 'filter' => false, @@ -745,7 +734,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'quantity_received' => array( 'title' => $this->l('Quantity received'), 'align' => 'left', - 'width' => 20, 'orderby' => false, 'filter' => false, 'search' => false, @@ -762,7 +750,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'quantity_left' => array( 'title' => $this->l('Quantity left'), 'align' => 'left', - 'width' => 20, 'orderby' => false, 'filter' => false, 'search' => false, @@ -1491,20 +1478,17 @@ class AdminSupplyOrdersControllerCore extends AdminController $this->fields_list = array( 'history_date' => array( 'title' => $this->l('Last update'), - 'width' => 50, 'align' => 'left', 'type' => 'datetime', 'havingFilter' => true ), 'history_employee' => array( 'title' => $this->l('Employee'), - 'width' => 100, 'align' => 'left', 'havingFilter' => true ), 'history_state_name' => array( 'title' => $this->l('Status'), - 'width' => 100, 'align' => 'left', 'color' => 'color', 'havingFilter' => true @@ -1726,7 +1710,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'supplier_reference' => array( 'title' => $this->l('Supplier Reference'), 'align' => 'center', - 'width' => 120, 'orderby' => false, 'filter' => false, 'search' => false, @@ -1734,7 +1717,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'reference' => array( 'title' => $this->l('Reference'), 'align' => 'center', - 'width' => 120, 'orderby' => false, 'filter' => false, 'search' => false, @@ -1742,7 +1724,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'ean13' => array( 'title' => $this->l('EAN13'), 'align' => 'center', - 'width' => 100, 'orderby' => false, 'filter' => false, 'search' => false, @@ -1750,7 +1731,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'upc' => array( 'title' => $this->l('UPC'), 'align' => 'center', - 'width' => 100, 'orderby' => false, 'filter' => false, 'search' => false, @@ -1764,7 +1744,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'unit_price_te' => array( 'title' => $this->l('Unit price (tax excl.)'), 'align' => 'right', - 'width' => 80, 'orderby' => false, 'filter' => false, 'search' => false, @@ -1774,7 +1753,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'quantity_expected' => array( 'title' => $this->l('Quantity'), 'align' => 'right', - 'width' => 80, 'orderby' => false, 'filter' => false, 'search' => false, @@ -1782,7 +1760,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'price_te' => array( 'title' => $this->l('Price (tax excl.)'), 'align' => 'right', - 'width' => 80, 'orderby' => false, 'filter' => false, 'search' => false, @@ -1792,7 +1769,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'discount_rate' => array( 'title' => $this->l('Discount rate'), 'align' => 'right', - 'width' => 80, 'orderby' => false, 'filter' => false, 'search' => false, @@ -1801,7 +1777,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'discount_value_te' => array( 'title' => $this->l('Discount value (tax excl.)'), 'align' => 'right', - 'width' => 80, 'orderby' => false, 'filter' => false, 'search' => false, @@ -1811,7 +1786,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'price_with_discount_te' => array( 'title' => $this->l('Price with product discount (tax excl.)'), 'align' => 'right', - 'width' => 80, 'orderby' => false, 'filter' => false, 'search' => false, @@ -1821,7 +1795,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'tax_rate' => array( 'title' => $this->l('Tax rate'), 'align' => 'right', - 'width' => 80, 'orderby' => false, 'filter' => false, 'search' => false, @@ -1830,7 +1803,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'tax_value' => array( 'title' => $this->l('Tax value'), 'align' => 'right', - 'width' => 80, 'orderby' => false, 'filter' => false, 'search' => false, @@ -1840,7 +1812,6 @@ class AdminSupplyOrdersControllerCore extends AdminController 'price_ti' => array( 'title' => $this->l('Price (tax incl.)'), 'align' => 'right', - 'width' => 80, 'orderby' => false, 'filter' => false, 'search' => false, diff --git a/controllers/admin/AdminWarehousesController.php b/controllers/admin/AdminWarehousesController.php index dc4d2d1ec..0912f07af 100644 --- a/controllers/admin/AdminWarehousesController.php +++ b/controllers/admin/AdminWarehousesController.php @@ -31,6 +31,7 @@ class AdminWarehousesControllerCore extends AdminController { public function __construct() { + $this->bootstrap = true; $this->table = 'warehouse'; $this->className = 'Warehouse'; $this->deleted = true; @@ -40,31 +41,26 @@ class AdminWarehousesControllerCore extends AdminController $this->fields_list = array( 'reference' => array( 'title' => $this->l('Reference'), - 'width' => 150, ), 'name' => array( 'title' => $this->l('Name'), ), 'management_type' => array( 'title' => $this->l('Managment type'), - 'width' => 80, ), 'employee' => array( 'title' => $this->l('Manager'), - 'width' => 200, 'filter_key' => 'employee', 'havingFilter' => true ), 'location' => array( 'title' => $this->l('Location'), - 'width' => 200, 'orderby' => false, 'filter' => false, 'search' => false, ), 'contact' => array( 'title' => $this->l('Phone Number'), - 'width' => 200, 'orderby' => false, 'filter' => false, 'search' => false, @@ -142,7 +138,7 @@ class AdminWarehousesControllerCore extends AdminController $this->fields_form = array( 'legend' => array( 'title' => $this->l('Warehouse information'), - 'image' => '../img/admin/edit.gif' + 'icon' => 'icon-pencil' ), 'input' => array( array( @@ -153,34 +149,32 @@ class AdminWarehousesControllerCore extends AdminController 'type' => 'text', 'label' => $this->l('Reference:'), 'name' => 'reference', - 'size' => 30, 'maxlength' => 32, 'required' => true, - 'desc' => $this->l('Reference for this warehouse'), + 'hint' => $this->l('Reference for this warehouse'), ), array( 'type' => 'text', 'label' => $this->l('Name:'), 'name' => 'name', - 'size' => 40, 'maxlength' => 45, 'required' => true, - 'desc' => $this->l('Name of this warehouse'), - 'hint' => $this->l('Invalid characters:').' !<>,;?=+()@#"�{}_$%:', + 'hint' => array( + $this->l('Name of this warehouse'), + $this->l('Invalid characters:').' !<>,;?=+()@#"�{}_$%:', + ) ), array( 'type' => 'text', 'label' => $this->l('Phone:'), 'name' => 'phone', - 'size' => 15, 'maxlength' => 16, - 'desc' => $this->l('Phone number for this warehouse') + 'hint' => $this->l('Phone number for this warehouse') ), array( 'type' => 'text', 'label' => $this->l('Address:'), 'name' => 'address', - 'size' => 100, 'maxlength' => 128, 'required' => true ), @@ -188,15 +182,13 @@ class AdminWarehousesControllerCore extends AdminController 'type' => 'text', 'label' => $this->l('Address:').' (2)', 'name' => 'address2', - 'size' => 100, 'maxlength' => 128, - 'desc' => $this->l('Address of this warehouse (complementary address is optional).'), + 'hint' => $this->l('Address of this warehouse (complementary address is optional).'), ), array( 'type' => 'text', 'label' => $this->l('Postcode/Zip Code:'), 'name' => 'postcode', - 'size' => 10, 'maxlength' => 12, 'required' => true, ), @@ -204,7 +196,6 @@ class AdminWarehousesControllerCore extends AdminController 'type' => 'text', 'label' => $this->l('City:'), 'name' => 'city', - 'size' => 20, 'maxlength' => 32, 'required' => true, ), @@ -219,7 +210,7 @@ class AdminWarehousesControllerCore extends AdminController 'id' => 'id_country', 'name' => 'name', ), - 'desc' => $this->l('Warehouse location country') + 'hint' => $this->l('Warehouse location country') ), array( 'type' => 'select', @@ -254,8 +245,11 @@ class AdminWarehousesControllerCore extends AdminController 'id' => 'id_reference', 'name' => 'name' ), - 'desc' => $this->l('Associated carriers. Use CTRL+CLICK to select several.').'
'.$this->l('You must select at least one carrier, if you do not select a carrier none will be able to ship from this warehouse.'), - 'hint' => $this->l('You can specify the number of carriers available to ship orders from particular warehouses.'), + 'hint' => array( + $this->l('Associated carriers. Use CTRL+CLICK to select several.'), + $this->l('You must select at least one carrier, if you do not select a carrier none will be able to ship from this warehouse.'), + $this->l('You can specify the number of carriers available to ship orders from particular warehouses.'), + ) ), ), @@ -268,7 +262,7 @@ class AdminWarehousesControllerCore extends AdminController 'type' => 'shop', 'label' => $this->l('Shops:'), 'name' => 'checkBoxShopAsso', - 'desc' => $this->l('Associated shops'), + 'hint' => $this->l('Associated shops'), 'disable_shared' => Shop::SHARE_STOCK ); } @@ -301,7 +295,7 @@ class AdminWarehousesControllerCore extends AdminController 'id' => 'id', 'name' => 'name' ), - 'desc' => $this->l('Inventory valuation method') + 'hint' => $this->l('Inventory valuation method') ); // adds input valuation currency