Fixes for tests

app/Http/Requests/Client/StoreClientRequest.php

@@ -85,6 +85,10 @@ class StoreClientRequest extends Request
             }
         }
 
+        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+        }
+        
         //is no settings->currency_id is set then lets dive in and find either a group or company currency all the below may be redundant!!
         if (!property_exists($settings, 'currency_id') && isset($input['group_settings_id'])) {
             $input['group_settings_id'] = $this->decodePrimaryKey($input['group_settings_id']);

app/Http/Requests/Client/UpdateClientRequest.php

@@ -92,6 +92,10 @@ class UpdateClientRequest extends Request
             $input['group_settings_id'] = $this->decodePrimaryKey($input['group_settings_id']);
         }
 
+        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+        }
+
         if (isset($input['contacts'])) {
             foreach ($input['contacts'] as $key => $contact) {
                 if (array_key_exists('id', $contact) && is_numeric($contact['id'])) {

app/Http/Requests/Credit/StoreCreditRequest.php

@@ -58,6 +58,10 @@ class StoreCreditRequest extends FormRequest
             $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
         }
 
+        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+        }
+
         if (isset($input['client_contacts'])) {
             foreach ($input['client_contacts'] as $key => $contact) {
                 if (!array_key_exists('send_email', $contact) || !array_key_exists('id', $contact)) {

app/Http/Requests/Credit/UpdateCreditRequest.php

@@ -58,6 +58,10 @@ class UpdateCreditRequest extends FormRequest
             $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
         }
 
+        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+        }
+        
         if (isset($input['invitations'])) {
             foreach ($input['invitations'] as $key => $value) {
                 if (is_numeric($input['invitations'][$key]['id'])) {

app/Http/Requests/Payment/StorePaymentRequest.php

@@ -46,6 +46,10 @@ class StorePaymentRequest extends Request
             $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
         }
 
+        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+        }
+        
         if (isset($input['invoices']) && is_array($input['invoices']) !== false) {
             foreach ($input['invoices'] as $key => $value) {
                 $input['invoices'][$key]['invoice_id'] = $this->decodePrimaryKey($value['invoice_id']);

app/Http/Requests/Payment/UpdatePaymentRequest.php

@@ -60,6 +60,10 @@ class UpdatePaymentRequest extends Request
     {
         $input = $this->all();
 
+        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+        }
+        
         if (isset($input['client_id'])) {
             unset($input['client_id']);
         }

app/Http/Requests/Product/StoreProductRequest.php

@@ -56,6 +56,10 @@ class StoreProductRequest extends Request
             $input['quantity'] = 1;
         }
 
+        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+        }
+        
         $this->replace($input);
     }
 }

app/Http/Requests/Product/UpdateProductRequest.php

@@ -60,6 +60,10 @@ class UpdateProductRequest extends Request
             $input['quantity'] = 1;
         }
 
+        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+        }
+        
         $this->replace($input);
     }
 }

app/Http/Requests/Quote/StoreQuoteRequest.php

@@ -44,6 +44,10 @@ class StoreQuoteRequest extends Request
             $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
         }
 
+        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+        }
+        
         if (isset($input['client_contacts'])) {
             foreach ($input['client_contacts'] as $key => $contact) {
                 if (!array_key_exists('send_email', $contact) || !array_key_exists('id', $contact)) {

app/Http/Requests/Quote/UpdateQuoteRequest.php

@@ -69,6 +69,10 @@ class UpdateQuoteRequest extends Request
             $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
         }
 
+        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+        }
+        
         $this->replace($input);
     }
 }

app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php

@@ -49,6 +49,11 @@ class StoreRecurringInvoiceRequest extends Request
             $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
         }
         
+        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+        }
+
+        
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
         //$input['line_items'] = json_encode($input['line_items']);
         $this->replace($input);

app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php

@@ -45,6 +45,10 @@ class UpdateRecurringInvoiceRequest extends Request
     {
         $input = $this->all();
 
+        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+        }
+        
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
         //$input['line_items'] = json_encode($input['line_items']);
         $this->replace($input);

app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php

@@ -48,6 +48,10 @@ class StoreRecurringQuoteRequest extends Request
             $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
         }
         
+        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+        }
+        
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
         //$input['line_items'] = json_encode($input['line_items']);
         $this->replace($input);

app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php

@@ -45,7 +45,13 @@ class UpdateRecurringQuoteRequest extends Request
     {
         $input = $this->all();
 
+        if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+            $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+        }
+
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
+
+        
         $this->replace($input);
     }
 }

app/Models/Payment.php

@@ -57,6 +57,7 @@ class Payment extends BaseModel
     const TYPE_TOKEN = 'token';
 
     protected $fillable = [
+        'assigned_user_id',
         'client_id',
         'type_id',
         'amount',

tests/Feature/RecurringInvoicesCronTest.php

@@ -32,11 +32,13 @@ class RecurringInvoicesCronTest extends TestCase
     {
         parent::setUp();
 
+        RecurringInvoice::truncate();
+
         $this->makeTestData();
     }
 
     public function testCountCorrectNumberOfRecurringInvoicesDue()
-    {
+    {        
         //spin up 5 valid and 1 invalid recurring invoices
         $recurring_invoices = RecurringInvoice::where('next_send_date', '<=', Carbon::now()->addMinutes(30))->get();