From 8081acb0b564b98589a922c4583502bd9a8f39b3 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Wed, 18 Sep 2013 10:09:45 +0200 Subject: [PATCH] // Supliers view --- .../suppliers/helpers/view/view.tpl | 85 ++++++++++--------- .../admin/AdminSuppliersController.php | 1 + 2 files changed, 45 insertions(+), 41 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl index fec2106d7..5bf64786a 100644 --- a/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl @@ -26,48 +26,51 @@ {extends file="helpers/view/view.tpl"} {block name="override_tpl"} - -

{$supplier->name}

- -

{l s='Number of products:'} {count($products)}

- - - - - - - - - - {if $stock_management && $shopContext != Shop::CONTEXT_ALL}{/if} - -{foreach $products AS $product} - {if !$product->hasAttributes()} - - - - - - - - - {if $stock_management && $shopContext != Shop::CONTEXT_ALL}{/if} - - {else} - {foreach $product->combination AS $id_product_attribute => $product_attribute} - - - - - - - - - {if $stock_management && $shopContext != Shop::CONTEXT_ALL}{/if} +
+
{l s='Number of products:'} {count($products)}
+
{l s='Product name'}{l s='Attribute name'}{l s='Supplier Reference'}{l s='Wholesale price'}{l s='Reference'}{l s='EAN13'}{l s='UPC'}{l s='Available Quantity'}
{$product->name}{l s='N/A'}{if empty($product->product_supplier_reference)}{l s='N/A'}{else}{$product->product_supplier_reference}{/if}{if empty($product->product_supplier_price_te)}0{else}{$product->product_supplier_price_te}{/if}{if empty($product->reference)}{l s='N/A'}{else}{$product->reference}{/if}{if empty($product->ean13)}{l s='N/A'}{else}{$product->ean13}{/if}{if empty($product->upc)}{l s='N/A'}{else}{$product->upc}{/if}{$product->quantity}
{$product->name}{if empty($product_attribute.attributes)}{l s='N/A'}{else}{$product_attribute.attributes}{/if}{if empty($product_attribute.product_supplier_reference)}{l s='N/A'}{else}{$product_attribute.product_supplier_reference}{/if}{if empty($product_attribute.product_supplier_price_te)}0{else}{$product_attribute.product_supplier_price_te}{/if}{if empty($product_attribute.reference)}{l s='N/A'}{else}{$product_attribute.reference}{/if}{if empty($product_attribute.ean13)}{l s='N/A'}{else}{$product_attribute.ean13}{/if}{if empty($product_attribute.upc)}{l s='N/A'}{else}{$product_attribute.upc}{/if}{$product_attribute.quantity}
+ + + + + + + + + + {if $stock_management && $shopContext != Shop::CONTEXT_ALL}{/if} + + + {foreach $products AS $product} + {if !$product->hasAttributes()} + + + + + + + + + {if $stock_management && $shopContext != Shop::CONTEXT_ALL}{/if} + + {else} + {foreach $product->combination AS $id_product_attribute => $product_attribute} + + + + + + + + + {if $stock_management && $shopContext != Shop::CONTEXT_ALL}{/if} + + {/foreach} + {/if} {/foreach} - {/if} -{/foreach} -
{l s='Product name'}{l s='Attribute name'}{l s='Supplier Reference'}{l s='Wholesale price'}{l s='Reference'}{l s='EAN13'}{l s='UPC'}{l s='Available Quantity'}
 {$product->name}{l s='N/A'}{if empty($product->product_supplier_reference)}{l s='N/A'}{else}{$product->product_supplier_reference}{/if}{if empty($product->product_supplier_price_te)}0{else}{$product->product_supplier_price_te}{/if}{if empty($product->reference)}{l s='N/A'}{else}{$product->reference}{/if}{if empty($product->ean13)}{l s='N/A'}{else}{$product->ean13}{/if}{if empty($product->upc)}{l s='N/A'}{else}{$product->upc}{/if}{$product->quantity}
 {$product->name}{if empty($product_attribute.attributes)}{l s='N/A'}{else}{$product_attribute.attributes}{/if}{if empty($product_attribute.product_supplier_reference)}{l s='N/A'}{else}{$product_attribute.product_supplier_reference}{/if}{if empty($product_attribute.product_supplier_price_te)}0{else}{$product_attribute.product_supplier_price_te}{/if}{if empty($product_attribute.reference)}{l s='N/A'}{else}{$product_attribute.reference}{/if}{if empty($product_attribute.ean13)}{l s='N/A'}{else}{$product_attribute.ean13}{/if}{if empty($product_attribute.upc)}{l s='N/A'}{else}{$product_attribute.upc}{/if}{$product_attribute.quantity}
+ + + {/block} diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php index 04c27f3bd..cdc1b0679 100644 --- a/controllers/admin/AdminSuppliersController.php +++ b/controllers/admin/AdminSuppliersController.php @@ -280,6 +280,7 @@ class AdminSuppliersControllerCore extends AdminController public function renderView() { + $this->toolbar_title = $this->object->name; $products = $this->object->getProductsLite($this->context->language->id); $total_product = count($products); for ($i = 0; $i < $total_product; $i++)