From bdeb062657b096cf05030d1a0c1d8bdbbcb0180b Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 27 Jan 2016 22:38:21 +0200 Subject: [PATCH] Refining how expenses convert to products --- app/Http/Controllers/InvoiceController.php | 2 +- app/Ninja/Repositories/InvoiceRepository.php | 9 ++++----- resources/lang/en/texts.php | 1 + resources/views/accounts/email_settings.blade.php | 1 + resources/views/invoices/edit.blade.php | 7 ++++++- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 51fb264a07e9..9ef2eed1643c 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -296,7 +296,7 @@ class InvoiceController extends BaseController return [ 'data' => Input::old('data'), 'account' => Auth::user()->account->load('country'), - 'products' => Product::scope()->with('default_tax_rate')->orderBy('id')->get(), + 'products' => Product::scope()->with('default_tax_rate')->orderBy('product_key')->get(), 'taxRates' => TaxRate::scope()->orderBy('name')->get(), 'currencies' => Cache::get('currencies'), 'languages' => Cache::get('languages'), diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php index ffd27f1a9f14..47d4e62d40de 100644 --- a/app/Ninja/Repositories/InvoiceRepository.php +++ b/app/Ninja/Repositories/InvoiceRepository.php @@ -402,6 +402,7 @@ class InvoiceRepository extends BaseRepository continue; } + $task = false; if (isset($item['task_public_id']) && $item['task_public_id']) { $task = Task::scope($item['task_public_id'])->where('invoice_id', '=', null)->firstOrFail(); $task->invoice_id = $invoice->id; @@ -409,6 +410,7 @@ class InvoiceRepository extends BaseRepository $task->save(); } + $expense = false; if (isset($item['expense_public_id']) && $item['expense_public_id']) { $expense = Expense::scope($item['expense_public_id'])->where('invoice_id', '=', null)->firstOrFail(); $expense->invoice_id = $invoice->id; @@ -424,11 +426,8 @@ class InvoiceRepository extends BaseRepository $product = Product::createNew(); $product->product_key = trim($item['product_key']); } - - $product->notes = $invoice->has_tasks ? '' : $item['notes']; - $product->notes = $invoice->has_expenses ? '' : $item['notes']; - - $product->cost = $item['cost']; + $product->notes = ($task || $expense) ? '' : $item['notes']; + $product->cost = $expense ? 0 : $item['cost']; $product->save(); } } diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 4b73e6ab1a16..f4ad44295360 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -1130,4 +1130,5 @@ return array( 'info' => 'Info', 'imported_expenses' => 'Successfully created :count_vendors vendor(s) and :count_expenses expense(s)', + 'iframe_url_help3' => 'Note: if you plan on accepting credit cards we strongly recommend having HTTPS enabled on your site.', ); diff --git a/resources/views/accounts/email_settings.blade.php b/resources/views/accounts/email_settings.blade.php index 1957bf16f90b..0d4dd0b16074 100644 --- a/resources/views/accounts/email_settings.blade.php +++ b/resources/views/accounts/email_settings.blade.php @@ -96,6 +96,7 @@ + window.location.search.substring(1); </script>

{{ trans('texts.iframe_url_help2') }}

+

{{ trans('texts.iframe_url_help3') }}