From 8ce558d391ffe406cf6156ce683a66ae1cc450f5 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 18 Sep 2016 12:26:18 +0300
Subject: [PATCH] Fix for unique invoice number check with slashes

---
 app/Http/Controllers/InvoiceController.php  | 6 ++++--
 app/Http/routes.php                         | 2 +-
 resources/views/invoices/knockout.blade.php | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index 9598c85730b9..4279a1cd6a45 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -330,7 +330,7 @@ class InvoiceController extends BaseController
                 }
             }
         }
-        
+
         // Tax rate $options
         $account = Auth::user()->account;
         $rates = TaxRate::scope()->orderBy('name')->get();
@@ -612,8 +612,10 @@ class InvoiceController extends BaseController
         return View::make('invoices.history', $data);
     }
 
-    public function checkInvoiceNumber($invoiceNumber)
+    public function checkInvoiceNumber()
     {
+        $invoiceNumber = request()->invoice_number;
+        
         $count = Invoice::scope()
                     ->whereInvoiceNumber($invoiceNumber)
                     ->withTrashed()
diff --git a/app/Http/routes.php b/app/Http/routes.php
index e4fa59e4a43c..190371badb30 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -127,7 +127,7 @@ Route::group(['middleware' => 'auth:user'], function() {
     Route::get('hide_message', 'HomeController@hideMessage');
     Route::get('force_inline_pdf', 'UserController@forcePDFJS');
     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('settings/user_details', 'AccountController@showUserDetails');
diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php
index 88b09b61b15d..d3b7ebc3c80c 100644
--- a/resources/views/invoices/knockout.blade.php
+++ b/resources/views/invoices/knockout.blade.php
@@ -899,7 +899,7 @@ ko.bindingHandlers.productTypeahead = {
 };
 
 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) {
         var isValid = data == '{{ RESULT_SUCCESS }}' ? true : false;
         if (isValid) {