diff --git a/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl index a17e3bf95..1e8bf90a1 100644 --- a/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl @@ -26,83 +26,84 @@ {extends file="helpers/view/view.tpl"} {block name="override_tpl"} {if isset($warehouse)} -
-
- {l s='General information'} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{l s='Reference:'}{$warehouse->reference}
{l s='Name:'}{$warehouse->name}
{l s='Manager:'}{$employee->lastname} {$employee->firstname}
{l s='Country:'}{if $address->country != ''}{$address->country}{else}{l s='N/D'}{/if}
{l s='Phone:'}{if $address->phone != ''}{$address->phone}{else}{l s='N/D'}{/if}
{l s='Management type:'}{l s=$warehouse->management_type}
{l s='Valuation currency:'}{$currency->name} ({$currency->sign})
{l s='Products'}{$warehouse_num_products} {l s='References:'}
{l s='Physical product quantities:'}{$warehouse_quantities}
{l s='Stock valuation:'}{$warehouse_value}
-
+
+

{l s='General information'}

+
+
+ +

{$warehouse->reference}

-
-
- {l s='Shops:'} - {l s='The following are the shops associated with this warehouse.'} - - - - - {foreach $shops as $shop} - - - - - {/foreach} -
{l s='ID'}{l s='Name'}
{$shop.id_shop}{$shop.name}
-
+
+ +

{$warehouse->name}

-
-
- {l s='Stock'} - {l s='Click here if you want details on products in this warehouse'} -
+
+ +

{$employee->lastname} {$employee->firstname}

-
-
- {l s='History'} - {l s='Click here if you want details about this warehouse\'s activity.'} -
+
+ +

{if $address->country != ''}{$address->country}{else}{l s='N/D'}{/if}

+
+ +

{if $address->phone != ''}{$address->phone}{else}{l s='N/D'}{/if}

+
+
+ +

{l s=$warehouse->management_type}

+
+
+ +

{$currency->name} ({$currency->sign})

+
+
+ +

{$warehouse_num_products} {l s='References:'}

+
+
+ +

{$warehouse_quantities}

+
+
+ +

{$warehouse_value}

+
+
+
+
+

{l s='Shops:'}

+ {if isset($shops) && count($shops) > 0} +
{l s='The following are the shops associated with this warehouse.'}
+ + + + + + + + + {foreach $shops as $shop} + + + + + {/foreach} + +
{l s='ID'}{l s='Name'}
{$shop.id_shop}{$shop.name}
+ {else} +
{l s='Currently there is no shop associated with this warehouse.'}
+ {/if} +
+
+

{l s='Stock'}

+ {l s='See products details'} +
+
+

{l s='History'}

+ {l s='See warehouse\'s activity details'} +
{else} - {l s='This warehouse does not exist.'} +
{l s='This warehouse does not exist.'}
{/if} {/block} diff --git a/controllers/admin/AdminWarehousesController.php b/controllers/admin/AdminWarehousesController.php index 6357dd30d..a65e38048 100644 --- a/controllers/admin/AdminWarehousesController.php +++ b/controllers/admin/AdminWarehousesController.php @@ -397,6 +397,8 @@ class AdminWarehousesControllerCore extends AdminController $address = new Address($warehouse->id_address); $shops = $warehouse->getShops(); + $this->toolbar_title = $warehouse->name; + // checks objects if (!Validate::isLoadedObject($warehouse) || !Validate::isLoadedObject($employee) ||