Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for unique invoice number check with slashes

Browse Source
This commit is contained in:
Hillel Coren 2016-09-18 12:26:18 +03:00
parent ad4841822a
commit 8ce558d391
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/InvoiceController.php
View File

@ -330,7 +330,7 @@ class InvoiceController extends BaseController
} }
} }
} }
// Tax rate $options // Tax rate $options
$account = Auth::user()->account; $account = Auth::user()->account;
$rates = TaxRate::scope()->orderBy('name')->get(); $rates = TaxRate::scope()->orderBy('name')->get();
@ -612,8 +612,10 @@ class InvoiceController extends BaseController
return View::make('invoices.history', $data); return View::make('invoices.history', $data);
} }
public function checkInvoiceNumber($invoiceNumber) public function checkInvoiceNumber()
{ {
$invoiceNumber = request()->invoice_number;
$count = Invoice::scope() $count = Invoice::scope()
->whereInvoiceNumber($invoiceNumber) ->whereInvoiceNumber($invoiceNumber)
->withTrashed() ->withTrashed()

2
app/Http/routes.php
View File

@ -127,7 +127,7 @@ Route::group(['middleware' => 'auth:user'], function() {
Route::get('hide_message', 'HomeController@hideMessage'); Route::get('hide_message', 'HomeController@hideMessage');
Route::get('force_inline_pdf', 'UserController@forcePDFJS'); Route::get('force_inline_pdf', 'UserController@forcePDFJS');
Route::get('account/get_search_data', ['as' => 'get_search_data', 'uses' => 'AccountController@getSearchData']); Route::get('account/get_search_data', ['as' => 'get_search_data', 'uses' => 'AccountController@getSearchData']);
Route::get('check_invoice_number/{invoice_number}', 'InvoiceController@checkInvoiceNumber'); Route::get('check_invoice_number', 'InvoiceController@checkInvoiceNumber');
Route::get('save_sidebar_state', 'UserController@saveSidebarState'); Route::get('save_sidebar_state', 'UserController@saveSidebarState');
Route::get('settings/user_details', 'AccountController@showUserDetails'); Route::get('settings/user_details', 'AccountController@showUserDetails');

2
resources/views/invoices/knockout.blade.php
View File

@ -899,7 +899,7 @@ ko.bindingHandlers.productTypeahead = {
}; };
function checkInvoiceNumber() { function checkInvoiceNumber() {
var url = '{{ url('check_invoice_number') }}/' + $('#invoice_number').val(); var url = '{{ url('check_invoice_number') }}?invoice_number=' + encodeURIComponent($('#invoice_number').val());
$.get(url, function(data) { $.get(url, function(data) {
var isValid = data == '{{ RESULT_SUCCESS }}' ? true : false; var isValid = data == '{{ RESULT_SUCCESS }}' ? true : false;
if (isValid) { if (isValid) {