From 0922b975672cdc1901cbfd0732961e2a7df76665 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 24 Apr 2014 01:04:21 +0300 Subject: [PATCH] Working on products --- app/controllers/ProductController.php | 2 +- app/lang/de/texts.php | 14 ++++++++++++++ app/lang/en/texts.php | 1 + app/lang/es/texts.php | 14 ++++++++++++++ app/lang/fr/texts.php | 14 ++++++++++++++ app/lang/it/texts.php | 14 ++++++++++++++ app/lang/nl/texts.php | 14 ++++++++++++++ app/lang/pt_BR/texts.php | 14 ++++++++++++++ app/views/accounts/products.blade.php | 4 +++- 9 files changed, 89 insertions(+), 2 deletions(-) diff --git a/app/controllers/ProductController.php b/app/controllers/ProductController.php index d2c548ff85b0..132fcb614557 100644 --- a/app/controllers/ProductController.php +++ b/app/controllers/ProductController.php @@ -12,7 +12,7 @@ class ProductController extends \BaseController { return Datatable::query($query) ->addColumn('product_key', function($model) { return link_to('products/' . $model->public_id . '/edit', $model->product_key); }) - ->addColumn('notes', function($model) { return $model->notes; }) + ->addColumn('notes', function($model) { return nl2br(Str::limit($model->notes, 100)); }) ->addColumn('cost', function($model) { return Utils::formatMoney($model->cost); }) ->addColumn('dropdown', function($model) { diff --git a/app/lang/de/texts.php b/app/lang/de/texts.php index c47f564d5d1c..db3a2487f9d0 100644 --- a/app/lang/de/texts.php +++ b/app/lang/de/texts.php @@ -319,4 +319,18 @@ return array( 'edit' => 'Edit', 'view_as_recipient' => 'View as recipient', + // product management + 'product' => 'Product', + 'products' => 'Products', + 'fill_products' => 'Auto-fill products', + 'fill_products_help' => 'Selecting a product will automatically set the description and cost', + 'update_products' => 'Auto-update products', + 'update_products_help' => 'Updating an invoice will automatically update the products', + 'create_product' => 'Create Product', + 'edit_product' => 'Edit Product', + 'archive_product' => 'Archive Product', + 'updated_product' => 'Successfully updated product', + 'created_product' => 'Successfully created product', + 'archived_product' => 'Successfully archived product', + ); diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php index fbe066aa9fc7..967f0f6aa895 100644 --- a/app/lang/en/texts.php +++ b/app/lang/en/texts.php @@ -326,6 +326,7 @@ return array( 'set_name' => 'Set your company name', 'view_as_recipient' => 'View as recipient', + // product management 'product' => 'Product', 'products' => 'Products', 'fill_products' => 'Auto-fill products', diff --git a/app/lang/es/texts.php b/app/lang/es/texts.php index 8491cd362b91..a8b493f65934 100644 --- a/app/lang/es/texts.php +++ b/app/lang/es/texts.php @@ -317,5 +317,19 @@ return array( 'field_value' => 'Field Value', 'edit' => 'Edit', 'view_as_recipient' => 'View as recipient', + + // product management + 'product' => 'Product', + 'products' => 'Products', + 'fill_products' => 'Auto-fill products', + 'fill_products_help' => 'Selecting a product will automatically set the description and cost', + 'update_products' => 'Auto-update products', + 'update_products_help' => 'Updating an invoice will automatically update the products', + 'create_product' => 'Create Product', + 'edit_product' => 'Edit Product', + 'archive_product' => 'Archive Product', + 'updated_product' => 'Successfully updated product', + 'created_product' => 'Successfully created product', + 'archived_product' => 'Successfully archived product', ); diff --git a/app/lang/fr/texts.php b/app/lang/fr/texts.php index f205699f5825..87a5f660fa0a 100644 --- a/app/lang/fr/texts.php +++ b/app/lang/fr/texts.php @@ -318,5 +318,19 @@ return array( 'field_value' => 'Field Value', 'edit' => 'Edit', 'view_as_recipient' => 'View as recipient', + + // product management + 'product' => 'Product', + 'products' => 'Products', + 'fill_products' => 'Auto-fill products', + 'fill_products_help' => 'Selecting a product will automatically set the description and cost', + 'update_products' => 'Auto-update products', + 'update_products_help' => 'Updating an invoice will automatically update the products', + 'create_product' => 'Create Product', + 'edit_product' => 'Edit Product', + 'archive_product' => 'Archive Product', + 'updated_product' => 'Successfully updated product', + 'created_product' => 'Successfully created product', + 'archived_product' => 'Successfully archived product', ); diff --git a/app/lang/it/texts.php b/app/lang/it/texts.php index 7fbe922fdc70..604415fe4276 100644 --- a/app/lang/it/texts.php +++ b/app/lang/it/texts.php @@ -319,4 +319,18 @@ return array( 'edit' => 'Edit', 'view_as_recipient' => 'View as recipient', + // product management + 'product' => 'Product', + 'products' => 'Products', + 'fill_products' => 'Auto-fill products', + 'fill_products_help' => 'Selecting a product will automatically set the description and cost', + 'update_products' => 'Auto-update products', + 'update_products_help' => 'Updating an invoice will automatically update the products', + 'create_product' => 'Create Product', + 'edit_product' => 'Edit Product', + 'archive_product' => 'Archive Product', + 'updated_product' => 'Successfully updated product', + 'created_product' => 'Successfully created product', + 'archived_product' => 'Successfully archived product', + ); diff --git a/app/lang/nl/texts.php b/app/lang/nl/texts.php index 7889730e9582..47df38988dac 100644 --- a/app/lang/nl/texts.php +++ b/app/lang/nl/texts.php @@ -319,5 +319,19 @@ return array( 'edit' => 'Edit', 'view_invoice' => 'View invoice', 'view_as_recipient' => 'View as recipient', + + // product management + 'product' => 'Product', + 'products' => 'Products', + 'fill_products' => 'Auto-fill products', + 'fill_products_help' => 'Selecting a product will automatically set the description and cost', + 'update_products' => 'Auto-update products', + 'update_products_help' => 'Updating an invoice will automatically update the products', + 'create_product' => 'Create Product', + 'edit_product' => 'Edit Product', + 'archive_product' => 'Archive Product', + 'updated_product' => 'Successfully updated product', + 'created_product' => 'Successfully created product', + 'archived_product' => 'Successfully archived product', ); diff --git a/app/lang/pt_BR/texts.php b/app/lang/pt_BR/texts.php index e59ea9fbbafb..94a8545619a9 100644 --- a/app/lang/pt_BR/texts.php +++ b/app/lang/pt_BR/texts.php @@ -308,5 +308,19 @@ return array( 'view_invoice' => 'View invoice', 'view_as_recipient' => 'View as recipient', + // product management + 'product' => 'Product', + 'products' => 'Products', + 'fill_products' => 'Auto-fill products', + 'fill_products_help' => 'Selecting a product will automatically set the description and cost', + 'update_products' => 'Auto-update products', + 'update_products_help' => 'Updating an invoice will automatically update the products', + 'create_product' => 'Create Product', + 'edit_product' => 'Edit Product', + 'archive_product' => 'Archive Product', + 'updated_product' => 'Successfully updated product', + 'created_product' => 'Successfully created product', + 'archived_product' => 'Successfully archived product', + ); diff --git a/app/views/accounts/products.blade.php b/app/views/accounts/products.blade.php index 3f7d58adca60..82426fc54bfb 100644 --- a/app/views/accounts/products.blade.php +++ b/app/views/accounts/products.blade.php @@ -25,7 +25,9 @@ trans('texts.action')) ->setUrl(url('api/products/')) ->setOptions('sPaginationType', 'bootstrap') - ->setOptions('bFilter', false) + ->setOptions('bFilter', false) + ->setOptions('bAutoWidth', false) + ->setOptions('aoColumns', [[ "sWidth"=> "20%" ], [ "sWidth"=> "45%" ], ["sWidth"=> "20%"], ["sWidth"=> "15%" ]]) ->render('datatable') }}