diff --git a/app/controllers/ProductController.php b/app/controllers/ProductController.php
index d2c548ff8..132fcb614 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 c47f564d5..db3a2487f 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 fbe066aa9..967f0f6aa 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 8491cd362..a8b493f65 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 f205699f5..87a5f660f 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 7fbe922fd..604415fe4 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 7889730e9..47df38988 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 e59ea9fbb..94a854561 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 3f7d58adc..82426fc54 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') }}