Merge pull request #4764 from turbo124/v5-stable

5.0.54

VERSION.txt

@@ -1 +1 @@
-5.0.53
+5.0.54

app/Console/Commands/CreateSingleAccount.php

@@ -223,7 +223,7 @@ class CreateSingleAccount extends Command
                     'company_id' => $company->id,
                 ]);
 
-        $client->id_number = $this->getNextClientNumber($client);
+        $client->number = $this->getNextClientNumber($client);
 
         $settings = $client->settings;
         $settings->currency_id = "1";

app/Console/Commands/CreateTestData.php

@@ -400,7 +400,7 @@ class CreateTestData extends Command
                     'company_id' => $company->id,
                 ]);
 
-        $client->id_number = $this->getNextClientNumber($client);
+        $client->number = $this->getNextClientNumber($client);
 
         $settings = $client->settings;
         $settings->currency_id = (string) rand(1, 79);

app/Console/Commands/DemoMode.php

@@ -286,7 +286,7 @@ class DemoMode extends Command
                     'company_id' => $company->id,
                 ]);
 
-        $client->id_number = $this->getNextClientNumber($client);
+        $client->number = $this->getNextClientNumber($client);
 
         $settings = $client->settings;
         $settings->currency_id = (string) rand(1, 3);
@@ -307,6 +307,14 @@ class DemoMode extends Command
                 'client_id' => $client->id,
                 'company_id' => $client->company_id,
             ]);
+
+        Expense::all()->each(function ($expense){
+
+            $expense->number = $this->getNextExpenseNumber($expense);
+            $expense->save();
+
+        });
+        
     }
 
     private function createVendor($client, $assigned_user_id = null)
@@ -329,15 +337,23 @@ class DemoMode extends Command
                 'company_id' => $client->company_id,
                 'is_primary' => 0,
             ]);
+
+
+        $vendor->id_number = $this->getNextVendorNumber($vendor);
+        $vendor->save();
     }
 
     private function createTask($client, $assigned_user_id = null)
     {
-        $vendor = Task::factory()->create([
+        $task = Task::factory()->create([
                 'user_id' => $client->user->id,
                 'company_id' => $client->company_id,
                 'client_id' => $client->id
             ]);
+
+        $task->number = $this->getNextTaskNumber($task);
+        $task->save();
+
     }
 
     private function createProject($client, $assigned_user_id = null)

app/Events/Invoice/InvoiceWasPaid.php

@@ -13,6 +13,7 @@ namespace App\Events\Invoice;
 
 use App\Models\Company;
 use App\Models\Invoice;
+use App\Models\Payment;
 use Illuminate\Queue\SerializesModels;
 
 /**
@@ -27,6 +28,8 @@ class InvoiceWasPaid
      */
     public $invoice;
 
+    public $payment;
+
     public $company;
 
     public $event_vars;
@@ -38,9 +41,10 @@ class InvoiceWasPaid
      * @param Company $company
      * @param array $event_vars
      */
-    public function __construct(Invoice $invoice, Company $company, array $event_vars)
+    public function __construct(Invoice $invoice, Payment $payment, Company $company, array $event_vars)
     {
         $this->invoice = $invoice;
+        $this->payment = $payment;
         $this->company = $company;
         $this->event_vars = $event_vars;
     }

app/Factory/InvoiceFactory.php

@@ -44,6 +44,7 @@ class InvoiceFactory
         $invoice->custom_value4 = 0;
         $invoice->amount = 0;
         $invoice->balance = 0;
+        $invoice->paid_to_date = 0;
         $invoice->partial = 0;
         $invoice->user_id = $user_id;
         $invoice->company_id = $company_id;

app/Factory/InvoiceToRecurringInvoiceFactory.php

@@ -50,6 +50,7 @@ class InvoiceToRecurringInvoiceFactory
         $recurring_invoice->last_sent_date = null;
         $recurring_invoice->next_send_date = null;
         $recurring_invoice->remaining_cycles = 0;
+        $recurring_invoice->paid_to_date = 0;
 
         return $recurring_invoice;
     }

app/Factory/QuoteFactory.php

@@ -45,6 +45,7 @@ class QuoteFactory
         $quote->partial = 0;
         $quote->user_id = $user_id;
         $quote->company_id = $company_id;
+        $quote->paid_to_date = 0;
 
         return $quote;
     }

app/Factory/RecurringInvoiceFactory.php

@@ -49,6 +49,7 @@ class RecurringInvoiceFactory
         $invoice->last_sent_date = null;
         $invoice->next_send_date = null;
         $invoice->remaining_cycles = 0;
+        $invoice->paid_to_date = 0;
 
         return $invoice;
     }

app/Factory/RecurringInvoiceToInvoiceFactory.php

@@ -50,6 +50,7 @@ class RecurringInvoiceToInvoiceFactory
         $invoice->recurring_id = $recurring_invoice->id;
         $invoice->client_id = $client->id;
         $invoice->auto_bill_enabled = $recurring_invoice->auto_bill_enabled;
+        $invoice->paid_to_date = 0;
 
         return $invoice;
     }

app/Http/Controllers/ActivityController.php

@@ -136,7 +136,7 @@ class ActivityController extends BaseController
         $backup = $activity->backup;
 
         if (! $backup || ! $backup->html_backup) {
-            return response()->json(['message'=> 'No backup exists for this activity', 'errors' => new stdClass], 404);
+            return response()->json(['message'=> ctrans('texts.no_backup_exists'), 'errors' => new stdClass], 404);
         }
 
         $pdf = $this->makePdf(null, null, $backup->html_backup);

app/Http/Controllers/BaseController.php

@@ -150,7 +150,7 @@ class BaseController extends Controller
      */
     public function notFound()
     {
-        return response()->json(['message' => '404 | Nothing to see here!'], 404)
+        return response()->json(['message' => ctrans('texts.api_404')], 404)
                          ->header('X-API-VERSION', config('ninja.minimum_client_version'))
                          ->header('X-APP-VERSION', config('ninja.app_version'));
     }
@@ -198,7 +198,7 @@ class BaseController extends Controller
         $updated_at = request()->has('updated_at') ? request()->input('updated_at') : 0;
 
         if (auth()->user()->getCompany()->is_large && ! request()->has('updated_at')) {
-            return response()->json(['message' => 'Cannot load a large account without a updated_at parameter', 'errors' =>[]], 401);
+            return response()->json(['message' => ctrans('texts.large_account_update_parameter'), 'errors' =>[]], 401);
         }
 
         $updated_at = date('Y-m-d H:i:s', $updated_at);

app/Http/Controllers/ClientPortal/PaymentController.php

@@ -78,7 +78,7 @@ class PaymentController extends Controller
     public function process(Request $request)
     {
         $is_credit_payment = false;
-        $token = false;
+        $tokens = [];
 
         if ($request->input('company_gateway_id') == CompanyGateway::GATEWAY_CREDIT) {
             $is_credit_payment = true;
@@ -115,8 +115,7 @@ class PaymentController extends Controller
 
         /* This loop checks for under / over payments and returns the user if a check fails */
 
-        foreach($payable_invoices as $payable_invoice)
+        foreach ($payable_invoices as $payable_invoice) {
-        {
 
             /*Match the payable invoice to the Model Invoice*/
 
@@ -173,8 +172,7 @@ class PaymentController extends Controller
         //$payable_invoices = $payable_invoices->map(function ($payable_invoice) use ($invoices, $settings) {
         $payable_invoice_collection = collect();
 
-        foreach($payable_invoices as $payable_invoice)
+        foreach ($payable_invoices as $payable_invoice) {
-        {
             // nlog($payable_invoice);
 
             $payable_invoice['amount'] = Number::parseFloat($payable_invoice['amount']);
@@ -229,12 +227,15 @@ class PaymentController extends Controller
         $fee_totals = $first_invoice->amount - $starting_invoice_amount;
 
         if ($gateway) {
-            $token = auth()->user()->client->gateway_token($gateway->id, $payment_method_id);
+            $tokens = auth()->user()->client->gateway_tokens()
+                ->whereCompanyGatewayId($gateway->id)
+                ->whereGatewayTypeId($payment_method_id)
+                ->get();
         }
 
         $payment_hash = new PaymentHash;
         $payment_hash->hash = Str::random(128);
-        $payment_hash->data = ['invoices' => $payable_invoices->toArray() , 'credits' => $credit_totals];
+        $payment_hash->data = ['invoices' => $payable_invoices->toArray(), 'credits' => $credit_totals];
         $payment_hash->fee_total = $fee_totals;
         $payment_hash->fee_invoice_id = $first_invoice->id;
         $payment_hash->save();
@@ -250,7 +251,7 @@ class PaymentController extends Controller
             'payment_hash' => $payment_hash->hash,
             'total' => $totals,
             'invoices' => $payable_invoices,
-            'token' => $token,
+            'tokens' => $tokens,
             'payment_method_id' => $payment_method_id,
             'amount_with_fee' => $invoice_totals + $fee_totals,
         ];
@@ -266,7 +267,7 @@ class PaymentController extends Controller
                 ->setPaymentHash($payment_hash)
                 ->checkRequirements()
                 ->processPaymentView($data);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             SystemLogger::dispatch(
                 $e->getMessage(),
                 SystemLog::CATEGORY_GATEWAY_RESPONSE,
@@ -292,7 +293,7 @@ class PaymentController extends Controller
                 ->setPaymentHash($payment_hash)
                 ->checkRequirements()
                 ->processPaymentResponse($request);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             SystemLogger::dispatch(
                 $e->getMessage(),
                 SystemLog::CATEGORY_GATEWAY_RESPONSE,
@@ -300,15 +301,13 @@ class PaymentController extends Controller
                 SystemLog::TYPE_FAILURE,
                 auth('contact')->user()->client
             );
-
-            throw new PaymentFailed($e->getMessage());
         }
     }
 
     /**
      * Pay for invoice/s using credits only.
      *
-     * @param  Request $request The request object
+     * @param Request $request The request object
      * @return Response         The response view
      */
     public function credit_response(Request $request)

app/Http/Controllers/ClientPortal/PaymentMethodController.php

@@ -151,7 +151,8 @@ class PaymentMethodController extends Controller
             event(new MethodDeleted($payment_method, auth('contact')->user()->company, Ninja::eventVars()));
             $payment_method->delete();
         } catch (Exception $e) {
-            Log::error(json_encode($e));
+            
+            nlog($e->getMessage());
 
             return back();
         }

app/Http/Controllers/CompanyController.php

@@ -501,6 +501,6 @@ class CompanyController extends BaseController
             }
         }
 
-        return response()->json(['message' => 'success'], 200);
+        return response()->json(['message' => ctrans('texts.success')], 200);
     }
 }

app/Http/Controllers/CompanyUserController.php

@@ -115,7 +115,7 @@ class CompanyUserController extends BaseController
         $company_user = CompanyUser::whereUserId($user->id)->whereCompanyId($company->id)->first();
 
         if (! $company_user) {
-            throw new ModelNotFoundException('Company User record not found');
+            throw new ModelNotFoundException(ctrans('texts.company_user_not_found'));
 
             return;
         }

app/Http/Controllers/CreditController.php

@@ -484,7 +484,7 @@ class CreditController extends BaseController
         $credits = Credit::withTrashed()->whereIn('id', $this->transformKeys($ids));
 
         if (! $credits) {
-            return response()->json(['message' => 'No Credits Found']);
+            return response()->json(['message' => ctrans('texts.no_credits_found')]);
         }
 
         $credits->each(function ($credit, $key) use ($action) {
@@ -561,7 +561,7 @@ class CreditController extends BaseController
                 break;
 
             default:
-                return response()->json(['message' => "The requested action `{$action}` is not available."], 400);
+                return response()->json(['message' => ctrans('texts.action_unavailable', ['action' => $action])], 400);
                 break;
         }
     }

app/Http/Controllers/DocumentController.php

@@ -124,7 +124,7 @@ class DocumentController extends BaseController
     {
         $this->document_repo->delete($document);
 
-        return response()->json(['message'=>'success']);
+        return response()->json(['message'=> ctrans('texts.success')]);
     }
 
     public function bulk()
@@ -136,7 +136,7 @@ class DocumentController extends BaseController
         $documents = Document::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get();
 
         if (! $invoices) {
-            return response()->json(['message' => 'No Documents Found']);
+            return response()->json(['message' => ctrans('texts.no_documents_found')]);
         }
 
         /*

app/Http/Controllers/GroupSettingController.php

@@ -481,7 +481,7 @@ class GroupSettingController extends BaseController
         $group_settings = GroupSetting::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get();
 
         if (! $group_settings) {
-            return response()->json(['message' => 'No Group Settings Found']);
+            return response()->json(['message' => ctrans('texts.no_group_settings_found')]);
         }
 
         /*

app/Http/Controllers/ImportController.php

@@ -95,7 +95,7 @@ class ImportController extends Controller
     {
         CSVImport::dispatch($request->all(), auth()->user()->company());
         
-        return response()->json(['message' => 'Importing data, email will be sent on completion'], 200);
+        return response()->json(['message' => ctrans('texts.import_started')], 200);
     }
 
     private function getEntityMap($entity_type)

app/Http/Controllers/InvoiceController.php

@@ -387,7 +387,7 @@ class InvoiceController extends BaseController
         }
 
         if ($invoice->isLocked()) {
-            return response()->json(['message' => 'Invoice is locked, no modifications allowed']);
+            return response()->json(['message' => ctrans('texts.locked_invoice')]);
         }
 
         $invoice = $this->invoice_repo->save($request->all(), $invoice);
@@ -526,13 +526,13 @@ class InvoiceController extends BaseController
         if ($action == 'download' && $invoices->count() > 1) {
             $invoices->each(function ($invoice) {
                 if (auth()->user()->cannot('view', $invoice)) {
-                    return response()->json(['message' => 'Insufficient privileges to access invoice '.$invoice->number]);
+                    return response()->json(['message' => ctrans('text.access_denied')]);
                 }
             });
 
             ZipInvoices::dispatch($invoices, $invoices->first()->company, auth()->user()->email);
 
-            return response()->json(['message' => 'Email Sent!'], 200);
+            return response()->json(['message' => ctrans('texts.sent_message')], 200);
         }
 
         /*
@@ -649,7 +649,7 @@ class InvoiceController extends BaseController
                 break;
             case 'mark_paid':
                 if ($invoice->balance < 0 || $invoice->status_id == Invoice::STATUS_PAID || $invoice->is_deleted === true) {
-                    return $this->errorResponse(['message' => 'Invoice cannot be marked as paid'], 400);
+                    return $this->errorResponse(['message' => ctrans('texts.invoice_cannot_be_marked_paid')], 400);
                 }
 
                 $invoice = $invoice->service()->markPaid();
@@ -686,9 +686,7 @@ class InvoiceController extends BaseController
                 }
                 break;
             case 'delete':
-                //need to make sure the invoice is cancelled first!!
+
-                //$invoice->service()->handleCancellation()s->save();
-nlog("inside delete");
                 $this->invoice_repo->delete($invoice);
 
                 if (! $bulk) {
@@ -735,7 +733,7 @@ nlog("inside delete");
                 break;
 
             default:
-                return response()->json(['message' => "The requested action `{$action}` is not available."], 400);
+                return response()->json(['message' => ctrans('texts.action_unavailable', ['action' => $action])], 400);
                 break;
         }
     }

app/Http/Controllers/LicenseController.php

@@ -134,7 +134,7 @@ class LicenseController extends BaseController
         }
 
         $error = [
-            'message' => 'Invalid license, or invalid environment '.config('ninja.environment'),
+            'message' => ctrans('texts.invoice_license_or_environment', ['environment' => config('ninja.environment')]),
             'errors' => new stdClass,
         ];
 

app/Http/Controllers/OpenAPI/ClientSchema.php

@@ -33,6 +33,7 @@
  *       @OA\Property(property="custom_value4", type="string", example="", description="________"),
  *       @OA\Property(property="vat_number", type="string", example="", description="________"),
  *       @OA\Property(property="id_number", type="string", example="", description="________"),
+ *       @OA\Property(property="number", type="string", example="", description="________"),
  *       @OA\Property(property="shipping_address1", type="string", example="", description="________"),
  *       @OA\Property(property="shipping_address2", type="string", example="", description="________"),
  *       @OA\Property(property="shipping_city", type="string", example="", description="________"),

app/Http/Controllers/OpenAPI/CreditSchema.php

@@ -30,6 +30,7 @@
  *       @OA\Property(property="line_items", type="object", example="", description="_________"),
  *       @OA\Property(property="amount", type="number", format="float", example="10.00", description="_________"),
  *       @OA\Property(property="balance", type="number", format="float", example="10.00", description="_________"),
+ *       @OA\Property(property="paid_to_date", type="number", format="float", example="10.00", description="_________"),
  *       @OA\Property(property="discount", type="number", format="float", example="10.00", description="_________"),
  *       @OA\Property(property="partial", type="number", format="float", example="10.00", description="_________"),
  *       @OA\Property(property="is_amount_discount", type="boolean", example=true, description="_________"),

app/Http/Controllers/OpenAPI/InvoiceSchema.php

@@ -29,6 +29,7 @@
  *       @OA\Property(property="line_items", type="object", example="", description="_________"),
  *       @OA\Property(property="amount", type="number", format="float", example="10.00", description="_________"),
  *       @OA\Property(property="balance", type="number", format="float", example="10.00", description="_________"),
+ *       @OA\Property(property="paid_to_date", type="number", format="float", example="10.00", description="_________"),
  *       @OA\Property(property="discount", type="number", format="float", example="10.00", description="_________"),
  *       @OA\Property(property="partial", type="number", format="float", example="10.00", description="_________"),
  *       @OA\Property(property="is_amount_discount", type="boolean", example=true, description="_________"),

app/Http/Controllers/OpenAPI/QuoteSchema.php

@@ -29,6 +29,7 @@
  *       @OA\Property(property="line_items", type="object", example="", description="_________"),
  *       @OA\Property(property="amount", type="number", format="float", example="10.00", description="_________"),
  *       @OA\Property(property="balance", type="number", format="float", example="10.00", description="_________"),
+ *       @OA\Property(property="paid_to_date", type="number", format="float", example="10.00", description="_________"),
  *       @OA\Property(property="discount", type="number", format="float", example="10.00", description="_________"),
  *       @OA\Property(property="partial", type="number", format="float", example="10.00", description="_________"),
  *       @OA\Property(property="is_amount_discount", type="boolean", example=true, description="_________"),

app/Http/Controllers/OpenAPI/VendorSchema.php

@@ -35,6 +35,7 @@
  *       @OA\Property(property="custom_value4", type="string", example="", description="________"),
  *       @OA\Property(property="vat_number", type="string", example="", description="________"),
  *       @OA\Property(property="id_number", type="string", example="", description="________"),
+ *       @OA\Property(property="number", type="string", example="", description="________"),
  *       @OA\Property(property="is_deleted", type="boolean", example=true, description="________"),
  *       @OA\Property(property="last_login", type="number", format="integer", example="134341234234", description="Timestamp"),
  *       @OA\Property(property="created_at", type="number", format="integer", example="134341234234", description="Timestamp"),

app/Http/Controllers/PaymentController.php

@@ -435,11 +435,6 @@ class PaymentController extends BaseController
      */
     public function destroy(DestroyPaymentRequest $request, Payment $payment)
     {
-        // $payment->service()->deletePayment();
-
-        // $payment->is_deleted = true;
-        // $payment->save();
-        // $payment->delete();
 
         $this->payment_repo->delete($payment);
 

app/Http/Controllers/PingController.php

@@ -74,7 +74,7 @@ class PingController extends BaseController
     public function health()
     {
         if (Ninja::isNinja()) {
-            return response()->json(['message' => 'Route not available', 'errors'=>[]], 403);
+            return response()->json(['message' => ctrans('texts.route_not_available'), 'errors'=>[]], 403);
         }
 
         return response()->json(SystemHealth::check(), 200);

app/Http/Controllers/PreviewController.php

@@ -81,7 +81,7 @@ class PreviewController extends BaseController
             $design_object = json_decode(json_encode(request()->input('design')));
 
             if (! is_object($design_object)) {
-                return response()->json(['message' => 'Invalid custom design object'], 400);
+                return response()->json(['message' => ctrans('texts.invalid_design_object')], 400);
             }
 
             $entity = ucfirst(request()->input('entity'));

app/Http/Controllers/QuoteController.php

@@ -507,7 +507,7 @@ class QuoteController extends BaseController
         $quotes = Quote::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get();
 
         if (! $quotes) {
-            return response()->json(['message' => 'No Quote/s Found']);
+            return response()->json(['message' => ctrans('texts.quote_not_found')]);
         }
 
         /*
@@ -517,13 +517,13 @@ class QuoteController extends BaseController
         if ($action == 'download' && $quotes->count() >= 1) {
             $quotes->each(function ($quote) {
                 if (auth()->user()->cannot('view', $quote)) {
-                    return response()->json(['message'=>'Insufficient privileges to access quote '.$quote->number]);
+                    return response()->json(['message'=> ctrans('texts.access_denied')]);
                 }
             });
 
             ZipInvoices::dispatch($quotes, $quotes->first()->company, auth()->user()->email);
 
-            return response()->json(['message' => 'Email Sent!'], 200);
+            return response()->json(['message' => ctrans('texts.sent_message')], 200);
         }
 
         if ($action == 'convert') {
@@ -651,7 +651,7 @@ class QuoteController extends BaseController
             case 'approve':
             //make sure it hasn't already been approved!!
                 if ($quote->status_id != Quote::STATUS_SENT) {
-                    return response()->json(['message' => 'Unable to approve this quote as it has expired.'], 400);
+                    return response()->json(['message' => ctrans('texts.quote_unapprovable')], 400);
                 }
 
                 return $this->itemResponse($quote->service()->approve()->save());
@@ -692,7 +692,7 @@ class QuoteController extends BaseController
             case 'email':
                 $quote->service()->sendEmail();
 
-                return response()->json(['message'=>'email sent'], 200);
+                return response()->json(['message'=> ctrans('texts.sent_message')], 200);
                 break;
             case 'mark_sent':
                 $quote->service()->markSent()->save();
@@ -702,7 +702,7 @@ class QuoteController extends BaseController
                 }
                 break;
             default:
-                return response()->json(['message' => "The requested action `{$action}` is not available."], 400);
+                return response()->json(['message' => ctrans('texts.action_unavailable',['action' => $action])], 400);
                 break;
         }
     }

app/Http/Controllers/SchedulerController.php

@@ -7,9 +7,9 @@ class SchedulerController extends Controller
     public function index()
     {
         if (auth()->user()->company()->account->latest_version == '0.0.0') {
-            return response()->json(['message' => 'Scheduler has never run'], 400);
+            return response()->json(['message' => ctrans('texts.scheduler_has_never_run')], 400);
         } else {
-            return response()->json(['message' => 'Scheduler has run'], 200);
+            return response()->json(['message' => ctrans('texts.scheduler_has_run')], 200);
         }
     }
 }

app/Http/Controllers/SelfUpdateController.php

@@ -59,7 +59,7 @@ class SelfUpdateController extends BaseController
         define('STDIN', fopen('php://stdin', 'r'));
 
         if (Ninja::isNinja()) {
-            return response()->json(['message' => 'Self update not available on this system.'], 403);
+            return response()->json(['message' => ctrans('texts.self_update_not_available')], 403);
         }
 
         /* .git MUST be owned/writable by the webserver user */

app/Http/Controllers/SettingsController.php

@@ -1,101 +0,0 @@
-<?php
-/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://opensource.org/licenses/AAL
- */
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-
-/**
- * Class SettingsController.
- */
-class SettingsController extends BaseController
-{
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @return void
-     */
-    public function index()
-    {
-        //
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return void
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param Request $request
-     * @return void
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param int $id
-     * @return void
-     */
-    public function show($id)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param int $id
-     * @return void
-     */
-    public function edit($id)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param Request $request
-     * @param int $id
-     * @return void
-     */
-    public function update(Request $request, $id)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param int $id
-     * @return void
-     */
-    public function destroy($id)
-    {
-        //
-    }
-}

app/Http/Controllers/TranslationController.php

@@ -1,123 +0,0 @@
-<?php
-/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://opensource.org/licenses/AAL
- */
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Cache;
-
-/**
- * Class TranslationController.
- */
-class TranslationController extends BaseController
-{
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @return void
-     */
-    public function index()
-    {
-        $strings = Cache::rememberForever('lang.js', function () {
-            $lang = config('app.locale');
-
-            $files = glob(resource_path('lang/'.$lang.'/*.php'));
-            $strings = [];
-
-            foreach ($files as $file) {
-                $name = basename($file, '.php');
-                $strings[$name] = require $file;
-            }
-
-            return $strings;
-        });
-
-        header('Content-Type: text/javascript');
-        echo 'i18n = '.$this->easyMinify(json_encode($strings)).';';
-        exit();
-    }
-
-    private function easyMinify($javascript)
-    {
-        return preg_replace(["/\s+\n/", "/\n\s+/", '/ +/'], ["\n", "\n ", ' '], $javascript);
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return void
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param Request $request
-     * @return void
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param int $id
-     * @return void
-     */
-    public function show($id)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param int $id
-     * @return void
-     */
-    public function edit($id)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param Request $request
-     * @param int $id
-     * @return void
-     */
-    public function update(Request $request, $id)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param int $id
-     * @return void
-     */
-    public function destroy($id)
-    {
-        //
-    }
-}

app/Http/Controllers/UserController.php

@@ -668,6 +668,6 @@ class UserController extends BaseController
             $company_user->delete();
         }
 
-        return response()->json(['message' => 'User detached from company'], 200);
+        return response()->json(['message' => ctrans('texts.user_detached')], 200);
     }
 }

app/Http/Controllers/WebhookController.php

@@ -364,7 +364,7 @@ class WebhookController extends BaseController
         $webhook->save();
 
         if (! $webhook->id) {
-            return response()->json('Failed to create Webhook', 400);
+            return response()->json(ctrans('texts.create_webhook_failure'), 400);
         }
 
         return $this->itemResponse($webhook);

app/Http/Livewire/RequiredClientInfo.php

@@ -65,6 +65,8 @@ class RequiredClientInfo extends Component
 
     public $show_form = false;
 
+    public function mount() {}
+
     public function handleSubmit(array $data): bool
     {
         $rules = [];

app/Http/Requests/Client/EditClientRequest.php

@@ -25,13 +25,4 @@ class EditClientRequest extends Request
         return auth()->user()->can('edit', $this->client);
     }
 
-    // public function prepareForValidation()
-    // {
-    //     $input = $this->all();
-
-    //     //$input['id'] = $this->encodePrimaryKey($input['id']);
-
-    //     $this->replace($input);
-
-    // }
 }

app/Http/Requests/Quote/StoreQuoteRequest.php

@@ -32,51 +32,6 @@ class StoreQuoteRequest extends Request
         return auth()->user()->can('create', Quote::class);
     }
 
-    protected function prepareForValidation()
-    {
-        $input = $this->all();
-
-        if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
-            $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
-        }
-
-        if ($input['client_id']) {
-            $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)) {
-                    unset($input['client_contacts'][$key]);
-                }
-            }
-        }
-
-        if (isset($input['invitations'])) {
-            foreach ($input['invitations'] as $key => $value) {
-                if (isset($input['invitations'][$key]['id']) && is_numeric($input['invitations'][$key]['id'])) {
-                    unset($input['invitations'][$key]['id']);
-                }
-
-                if (isset($input['invitations'][$key]['id']) && is_string($input['invitations'][$key]['id'])) {
-                    $input['invitations'][$key]['id'] = $this->decodePrimaryKey($input['invitations'][$key]['id']);
-                }
-
-                if (is_string($input['invitations'][$key]['client_contact_id'])) {
-                    $input['invitations'][$key]['client_contact_id'] = $this->decodePrimaryKey($input['invitations'][$key]['client_contact_id']);
-                }
-            }
-        }
-
-        $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
-        //$input['line_items'] = json_encode($input['line_items']);
-        $this->replace($input);
-    }
-
     public function rules()
     {
         $rules = [];
@@ -98,4 +53,17 @@ class StoreQuoteRequest extends Request
 
         return $rules;
     }
+
+    protected function prepareForValidation()
+    {
+        $input = $this->all();
+
+        $input = $this->decodePrimaryKeys($input);
+
+        $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
+        $input['amount'] = 0;
+        $input['balance'] = 0;
+        
+        $this->replace($input);
+    }
 }

app/Http/Requests/Quote/UpdateQuoteRequest.php

@@ -59,22 +59,12 @@ class UpdateQuoteRequest extends Request
     {
         $input = $this->all();
 
-        if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
+        $input = $this->decodePrimaryKeys($input);
-            $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
-        }
-
-        if (isset($input['client_id'])) {
-            $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
-        }
 
         if (isset($input['line_items'])) {
             $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']);
-        }
-
         if (array_key_exists('documents', $input)) {
             unset($input['documents']);
         }

app/Http/ValidationRules/Company/ValidCompanyQuantity.php

@@ -33,6 +33,6 @@ class ValidCompanyQuantity implements Rule
      */
     public function message()
     {
-        return 'Limit of 10 companies per account.';
+        return ctrans('texts.company_limit_reached');
     }
 }

app/Http/ValidationRules/Credit/CreditsSumRule.php

@@ -48,6 +48,6 @@ class CreditsSumRule implements Rule
      */
     public function message()
     {
-        return "Total credits applied cannot be MORE than total of invoices";
+        return ctrans('texts.credits_applied_validation');
     }
 }

app/Http/ValidationRules/Credit/UniqueCreditNumberRule.php

@@ -41,7 +41,7 @@ class UniqueCreditNumberRule implements Rule
      */
     public function message()
     {
-        return 'Credit number already taken';
+        return ctrans('texts.credit_number_taken');
     }
 
     /**

app/Http/ValidationRules/Credit/ValidCreditsRules.php

@@ -44,7 +44,8 @@ class ValidCreditsRules implements Rule
     private function checkCreditsAreHomogenous()
     {
         if (! array_key_exists('client_id', $this->input)) {
-            $this->error_msg = 'Client id is required';
+
+            $this->error_msg = ctrans('texts.client_id_required');
 
             return false;
         }
@@ -57,44 +58,32 @@ class ValidCreditsRules implements Rule
             $cred = Credit::find($this->decodePrimaryKey($credit['credit_id']));
 
             if (! $cred) {
-                $this->error_msg = 'Credit not found ';
+                $this->error_msg = ctrans('texts.credit_not_found');
 
                 return false;
             }
 
             if ($cred->client_id != $this->input['client_id']) {
-                $this->error_msg = 'Selected invoices are not from a single client';
+                $this->error_msg = ctrans('texts.invoices_dont_match_client');
 
                 return false;
             }
         }
 
         if (! (array_unique($unique_array) == $unique_array)) {
-            $this->error_msg = 'Duplicate credits submitted.';
+            $this->error_msg = ctrans('texts.duplicate_credits_submitted');
 
             return false;
         }
 
         if (count($this->input['credits']) >= 1 && count($this->input['invoices']) == 0) {
-            $this->error_msg = 'You must have an invoice set when using a credit in a payment';
+            $this->error_msg = ctrans('texts.credit_with_no_invoice');
 
             return false;
         }
 
         if (count($this->input['credits']) >= 1) {
 
-        //    $total_payments = $this->input['amount'] + array_sum(array_column($this->input['credits'], 'amount'));
-
-// nlog(print_r($this->input,1));
-// nlog("total payments = {$total_payments}");
-// nlog("total credits available = " . array_sum(array_column($this->input['credits'], 'amount')));
-// nlog("total invoices payable = " . array_sum(array_column($this->input['invoices'], 'amount')));
-
-            // if($total_payments > array_sum(array_column($this->input['invoices'], 'amount'))){
-
-            //     $this->error_msg = "Sum of total payments and credits is greater than the total of invoices";
-            //     return false;
-            // }
         }
 
         return true;

app/Http/ValidationRules/Expense/UniqueExpenseNumberRule.php

@@ -41,7 +41,7 @@ class UniqueExpenseNumberRule implements Rule
      */
     public function message()
     {
-        return 'Expense number already taken';
+        return ctrans('texts.expense_number_taken');
     }
 
     /**
@@ -57,20 +57,7 @@ class UniqueExpenseNumberRule implements Rule
                           ->where('number', $this->input['number'])
                           ->withTrashed();
 
-        // if(isset($this->input['client_id']))
-        //     $expense->where('client_id', $this->input['client_id']);
-
         return $expense->exists();
 
-        // $expense = Expense::where('client_id', $this->input['client_id'])
-        //                 ->where('number', $this->input['number'])
-        //                 ->withTrashed()
-        //                 ->exists();
-
-        // if ($expense) {
-        //     return false;
-        // }
-
-        // return true;
     }
 }

app/Http/ValidationRules/Invoice/UniqueInvoiceNumberRule.php

@@ -41,7 +41,7 @@ class UniqueInvoiceNumberRule implements Rule
      */
     public function message()
     {
-        return 'Invoice number already taken';
+        return ctrans('texts.invoice_number_taken');
     }
 
     /**

app/Http/ValidationRules/Payment/ValidInvoicesRules.php

@@ -44,7 +44,8 @@ class ValidInvoicesRules implements Rule
     private function checkInvoicesAreHomogenous()
     {
         if (! array_key_exists('client_id', $this->input)) {
-            $this->error_msg = 'Client id is required';
+
+            $this->error_msg = ctrans('texts.client_id_required');
 
             return false;
         }
@@ -60,14 +61,14 @@ class ValidInvoicesRules implements Rule
 
             if (! $inv) {
 
-                $this->error_msg = 'Invoice not found ';
+                $this->error_msg = ctrans('texts.invoice_not_found');
 
                 return false;
             }
 
             if ($inv->client_id != $this->input['client_id']) {
 
-                $this->error_msg = 'Selected invoices are not from a single client';
+                $this->error_msg = ctrans('texts.invoices_dont_match_client');
 
                 return false;
             }
@@ -83,14 +84,14 @@ class ValidInvoicesRules implements Rule
             }
             else if($invoice['amount'] > $inv->balance) {
 
-                $this->error_msg = 'Amount cannot be greater than invoice balance';
+                $this->error_msg = ctrans('texts.amount_greater_than_balance');
 
                 return false;
             }
         }
 
         if (! (array_unique($unique_array) == $unique_array)) {
-            $this->error_msg = 'Duplicate invoices submitted.';
+            $this->error_msg = ctrans('texts.duplicate_invoices_submitted');
 
             return false;
         }

app/Http/ValidationRules/Payment/ValidRefundableRequest.php

@@ -41,7 +41,7 @@ class ValidRefundableRequest implements Rule
     public function passes($attribute, $value)
     {
         if (! array_key_exists('id', $this->input)) {
-            $this->error_msg = 'Payment `id` required.';
+            $this->error_msg = ctrans('texts.payment_id_required');
 
             return false;
         }
@@ -49,7 +49,7 @@ class ValidRefundableRequest implements Rule
         $payment = Payment::whereId($this->input['id'])->first();
 
         if (! $payment) {
-            $this->error_msg = 'Unable to retrieve specified payment';
+            $this->error_msg = ctrans('texts.unable_to_retrieve_payment');
 
             return false;
         }
@@ -57,31 +57,17 @@ class ValidRefundableRequest implements Rule
         $request_invoices = request()->has('invoices') ? $this->input['invoices'] : [];
         $request_credits = request()->has('credits') ? $this->input['credits'] : [];
 
-        // foreach($request_invoices as $key => $value)
-        //     $request_invoices[$key]['invoice_id'] = $this->decodePrimaryKey($value['invoice_id']);
-
-        // foreach($request_credits as $key => $value)
-        //     $request_credits[$key]['credit_id'] = $this->decodePrimaryKey($value['credit_id']);
-
         if ($payment->invoices()->exists()) {
             foreach ($payment->invoices as $paymentable_invoice) {
                 $this->checkInvoice($paymentable_invoice, $request_invoices);
             }
         }
 
-        // if($payment->credits()->exists())
-        // {
-        //     foreach($payment->credits as $paymentable_credit)
-        //         $this->checkCredit($paymentable_credit, $request_credits);
-        // }
 
         foreach ($request_invoices as $request_invoice) {
             $this->checkInvoiceIsPaymentable($request_invoice, $payment);
         }
 
-        // foreach($request_credits as $request_credit)
-        //     $this->checkCreditIsPaymentable($request_credit, $payment);
-
         if (strlen($this->error_msg) > 0) {
             return false;
         }
@@ -97,12 +83,12 @@ class ValidRefundableRequest implements Rule
             $paymentable_invoice = $payment->invoices->where('id', $invoice->id)->first();
 
             if (! $paymentable_invoice) {
-                $this->error_msg = 'Invoice id '.$invoice->hashed_id.' is not related to this payment';
+                $this->error_msg = ctrans('texts.invoice_not_related_to_payment', ['invoice' => $invoice->hashed_id]);
 
                 return false;
             }
         } else {
-            $this->error_msg = 'Invoice id '.$invoice->hashed_id.' is not related to this payment';
+            $this->error_msg = ctrans('texts.invoice_not_related_to_payment', ['invoice' => $invoice->hashed_id]);
 
             return false;
         }
@@ -116,12 +102,12 @@ class ValidRefundableRequest implements Rule
             $paymentable_credit = $payment->credits->where('id', $credit->id)->first();
 
             if (! $paymentable_invoice) {
-                $this->error_msg = 'Credit id '.$credit->hashed_id.' is not related to this payment';
+                $this->error_msg = ctrans('texts.credit_not_related_to_payment', ['credit' => $credit->hashed_id]);
 
                 return false;
             }
         } else {
-            $this->error_msg = 'Credit id '.$credit->hashed_id.' is not related to this payment';
+            $this->error_msg = ctrans('texts.credit_not_related_to_payment', ['credit' => $credit->hashed_id]);
 
             return false;
         }
@@ -140,7 +126,7 @@ class ValidRefundableRequest implements Rule
                 if ($request_invoice['amount'] > $refundable_amount) {
                     $invoice = $paymentable;
 
-                    $this->error_msg = 'Attempting to refund more than allowed for invoice id '.$invoice->hashed_id.', maximum refundable amount is '.$refundable_amount;
+                    $this->error_msg = ctrans('texts.max_refundable_invoice', ['invoice' => $invoice->hashed_id, 'amount' => $refundable_amount]);
 
                     return false;
                 }
@@ -148,7 +134,7 @@ class ValidRefundableRequest implements Rule
         }
 
         if (! $record_found) {
-            $this->error_msg = 'Attempting to refund a payment with invoices attached, please specify valid invoice/s to be refunded.';
+            $this->error_msg = ctrans('texts.refund_without_invoices');
 
             return false;
         }
@@ -167,7 +153,7 @@ class ValidRefundableRequest implements Rule
                 if ($request_credit['amount'] > $refundable_amount) {
                     $credit = $paymentable;
 
-                    $this->error_msg = 'Attempting to refund more than allowed for credit '.$credit->number.', maximum refundable amount is '.$refundable_amount;
+                    $this->error_msg = ctrans('texts.max_refundable_credit',['credit' => $credit->hashed_id, 'amount' => $refundable_amount]);
 
                     return false;
                 }
@@ -175,7 +161,7 @@ class ValidRefundableRequest implements Rule
         }
 
         if (! $record_found) {
-            $this->error_msg = 'Attempting to refund a payment with credits attached, please specify valid credit/s to be refunded.';
+            $this->error_msg = ctrans('texts.refund_without_credits');
 
             return false;
         }

app/Http/ValidationRules/PaymentAmountsBalanceRule.php

@@ -33,7 +33,7 @@ class PaymentAmountsBalanceRule implements Rule
      */
     public function message()
     {
-        return 'Amounts do not balance correctly.';
+        return ctrans('texts.amounts_do_not_balance');
     }
 
     private function calculateAmounts() :bool
@@ -69,10 +69,8 @@ class PaymentAmountsBalanceRule implements Rule
             }
         } else {
             return true;
-        } // if no invoices are present, then this is an unapplied payment, let this pass validation!
+        } 
-
+        
-        // nlog("payment amounts = {$payment_amounts}");
-        // nlog("invoice amounts = {$invoice_amounts}");
 
         return  $payment_amounts >= $invoice_amounts;
     }

app/Http/ValidationRules/PaymentAppliedValidAmount.php

@@ -37,7 +37,7 @@ class PaymentAppliedValidAmount implements Rule
      */
     public function message()
     {
-        return 'Insufficient applied amount remaining to cover payment.';
+        return ctrans('texts.insufficient_applied_amount_remaining');
     }
 
     private function calculateAmounts() :bool

app/Http/ValidationRules/Project/ValidProjectForClient.php

@@ -53,6 +53,6 @@ class ValidProjectForClient implements Rule
      */
     public function message()
     {
-        return "Project client does not match entity client";
+        return ctrans('texts.project_client_do_not_match');
     }
 }

app/Http/ValidationRules/Quote/UniqueQuoteNumberRule.php

@@ -41,7 +41,7 @@ class UniqueQuoteNumberRule implements Rule
      */
     public function message()
     {
-        return 'Quote number already taken';
+        return ctrans('texts.quote_number_taken');
     }
 
     /**

app/Http/ValidationRules/Recurring/UniqueRecurringInvoiceNumberRule.php

@@ -41,7 +41,7 @@ class UniqueRecurringInvoiceNumberRule implements Rule
      */
     public function message()
     {
-        return "Recurring Invoice number {$this->input['number']} already taken";
+        return ctrans('texts.recurring_invoice_number_taken', ['number' => $this->input['number']]);
     }
 
     /**

app/Http/ValidationRules/User/RelatedUserRule.php

@@ -40,7 +40,7 @@ class RelatedUserRule implements Rule
      */
     public function message()
     {
-        return 'User not associated with this account';
+        return ctrans('texts.user_not_associated_with_account');
     }
 
     /**

app/Http/ValidationRules/ValidCreditsPresentRule.php

@@ -37,26 +37,13 @@ class ValidCreditsPresentRule implements Rule
      */
     public function message()
     {
-        return 'Insufficient balance on credit.';
+        return ctrans('texts.insufficient_credit_balance');
     }
 
     private function validCreditsPresent() :bool
     {
         //todo need to ensure the clients credits are here not random ones!
 
-        // if (request()->input('credits') && is_array(request()->input('credits'))) {
-        //     foreach (request()->input('credits') as $credit) {
-        //         $cred = Credit::find($this->decodePrimaryKey($credit['credit_id']));
-
-        //         if (! $cred || $cred->balance == 0) {
-        //             return false;
-        //         }
-        //     }
-        // }
-
-        // return  true;
-
-
         if (request()->input('credits') && is_array(request()->input('credits'))) {
             $credit_collection = Credit::whereIn('id', $this->transformKeys(array_column(request()->input('credits'), 'credit_id')))
                                        ->where('balance', '>', 0)

app/Http/ValidationRules/ValidPayableInvoicesRule.php

@@ -40,7 +40,7 @@ class ValidPayableInvoicesRule implements Rule
 
         foreach ($invoices as $invoice) {
             if (! $invoice->isPayable()) {
-                $this->error_msg = 'One or more of these invoices have been paid';
+                $this->error_msg = ctrans('texts.one_or_more_invoices_paid');
 
                 return false;
             }

app/Http/ValidationRules/ValidRefundableInvoices.php

@@ -40,7 +40,7 @@ class ValidRefundableInvoices implements Rule
     public function passes($attribute, $value)
     {
         if (! array_key_exists('id', $this->input)) {
-            $this->error_msg = 'Payment `id` required.';
+            $this->error_msg = ctrans('texts.payment_id_required');
 
             return false;
         }
@@ -48,17 +48,11 @@ class ValidRefundableInvoices implements Rule
         $payment = Payment::whereId($this->input['id'])->first();
 
         if (! $payment) {
-            $this->error_msg = "Payment couldn't be retrieved cannot be refunded ";
+            $this->error_msg = ctrans('texts.unable_to_retrieve_payment');
 
             return false;
         }
 
-        /*We are not sending the Refunded amount in the 'amount field, this is the Payment->amount, need to skip this check. */
-        // if (request()->has('amount') && (request()->input('amount') > ($payment->amount - $payment->refunded))) {
-        //     $this->error_msg = "Attempting to refund more than payment amount, enter a value equal to or lower than the payment amount of ". $payment->amount;
-        //     return false;
-        // }
-
         /*If no invoices has been sent, then we apply the payment to the client account*/
         $invoices = [];
 
@@ -70,7 +64,7 @@ class ValidRefundableInvoices implements Rule
 
         foreach ($invoices as $invoice) {
             if (! $invoice->isRefundable()) {
-                $this->error_msg = 'Invoice id '.$invoice->hashed_id.' cannot be refunded';
+                $this->error_msg = ctrans('texts.invoice_cannot_be_refunded', ['invoice' => $invoice->hashed_id]);
 
                 return false;
             }
@@ -82,7 +76,7 @@ class ValidRefundableInvoices implements Rule
                     $pivot_record = $payment->paymentables->where('paymentable_id', $invoice->id)->first();
 
                     if ($val['amount'] > ($pivot_record->amount - $pivot_record->refunded)) {
-                        $this->error_msg = 'Attempting to refund '.$val['amount'].' only '.($pivot_record->amount - $pivot_record->refunded).' available for refund';
+                        $this->error_msg = ctrans('texts.attempted_refund_failed', ['amount' => $val['amount'], 'refundable_amount' => ($pivot_record->amount - $pivot_record->refunded)]);
 
                         return false;
                     }

app/Http/ValidationRules/ValidUserForCompany.php

@@ -34,7 +34,6 @@ class ValidUserForCompany implements Rule
      */
     public function message()
     {
-        return 'This user is unable to be attached to this company. Perhaps they have already registered a user on another account?';
+        return ctrans('texts.user_not_associated_with_this_account');
-        //return ctrans('texts.email_already_register');
     }
 }

app/Import/Definitions/ClientMap.php

@@ -78,8 +78,8 @@ class ClientMap
             16 => 'texts.custom_value',
             17 => 'texts.custom_value',
             18 => 'texts.custom_value',
-            19 => 'texts.address1',
+            19 => 'texts.shipping_address1',
-            20 => 'texts.address2',
+            20 => 'texts.shipping_address2',
             21 => 'texts.shipping_city',
             22 => 'texts.shipping_state',
             23 => 'texts.shipping_postal_code',

app/Jobs/Credit/ApplyCreditPayment.php

@@ -57,17 +57,31 @@ class ApplyCreditPayment implements ShouldQueue
             if ($cred->id == $this->credit->id) {
                 $cred->pivot->amount = $this->amount;
                 $cred->pivot->save();
+
+                $cred->paid_to_date += $this->amount;
+                $cred->save();
             }
         });
 
         $credit_balance = $this->credit->balance;
 
         if ($this->amount == $credit_balance) { //total credit applied.
-            $this->credit->setStatus(Credit::STATUS_APPLIED);
+
-            $this->credit->updateBalance($this->amount * -1);
+            $this->credit
+                ->service()
+                ->setStatus(Credit::STATUS_APPLIED)
+                ->adjustBalance($this->amount * -1)
+                ->updatePaidToDate($this->amount)
+                ->save();
+
         } elseif ($this->amount < $credit_balance) { //compare number appropriately
-            $this->credit->setStatus(Credit::STATUS_PARTIAL);
+
-            $this->credit->updateBalance($this->amount * -1);
+            $this->credit
+                ->service()
+                ->setStatus(Credit::STATUS_PARTIAL)
+                ->adjustBalance($this->amount * -1)
+                ->updatePaidToDate($this->amount)
+                ->save();
         }
 
         /* Update Payment Applied Amount*/

app/Jobs/Util/Import.php

@@ -896,14 +896,6 @@ class Import implements ShouldQueue
                 ],
             ];
 
-            //depending on the status, we do a final action.
-           //s$payment = $this->updatePaymentForStatus($payment, $modified['status_id']);
-
-            // if($modified['is_deleted'])
-            //     $payment->service()->deletePayment();
-
-            // if(isset($modified['deleted_at']))
-            //     $payment->delete();
         }
 
         Payment::reguard();

app/Listeners/Activity/CreditArchivedActivity.php

@@ -49,6 +49,6 @@ class CreditArchivedActivity implements ShouldQueue
         $fields->company_id = $event->credit->company_id;
         $fields->activity_type_id = Activity::ARCHIVE_CREDIT;
 
-        $this->activity_repo->save($fields, $$event->credit, $event->event_vars);
+        $this->activity_repo->save($fields, $event->credit, $event->event_vars);
     }
 }

app/Listeners/Invoice/InvoicePaidActivity.php

@@ -47,7 +47,8 @@ class InvoicePaidActivity implements ShouldQueue
         $fields->user_id = $event->invoice->user_id;
         $fields->company_id = $event->invoice->company_id;
         $fields->activity_type_id = Activity::PAID_INVOICE;
-
+        $fields->payment_id = $event->payment->id;
+        
         $this->activity_repo->save($fields, $event->invoice, $event->event_vars);
 
         try {

app/Mail/Engine/PaymentEmailEngine.php

@@ -123,6 +123,7 @@ class PaymentEmailEngine extends BaseEmailEngine
         $data['$address1'] = ['value' => $this->client->address1 ?: ' ', 'label' => ctrans('texts.address1')];
         $data['$address2'] = ['value' => $this->client->address2 ?: ' ', 'label' => ctrans('texts.address2')];
         $data['$id_number'] = ['value' => $this->client->id_number ?: ' ', 'label' => ctrans('texts.id_number')];
+        $data['$client.number'] = ['value' => $this->client->number ?: ' ', 'label' => ctrans('texts.number')];
         $data['$vat_number'] = ['value' => $this->client->vat_number ?: ' ', 'label' => ctrans('texts.vat_number')];
         $data['$website'] = ['value' => $this->client->present()->website() ?: ' ', 'label' => ctrans('texts.website')];
         $data['$phone'] = ['value' => $this->client->present()->phone() ?: ' ', 'label' => ctrans('texts.phone')];

app/Models/Client.php

@@ -73,7 +73,8 @@ class Client extends BaseModel implements HasLocalePreference
         'id_number',
         'group_settings_id',
         'public_notes',
-        'phone'
+        'phone',
+        'number',
     ];
 
     protected $with = [

app/Models/Credit.php

@@ -261,4 +261,5 @@ class Credit extends BaseModel
             }
         });
     }
+
 }

app/Models/Vendor.php

@@ -44,6 +44,7 @@ class Vendor extends BaseModel
         'custom_value2',
         'custom_value3',
         'custom_value4',
+        'number',
     ];
 
     protected $casts = [

app/PaymentDrivers/Authorize/AuthorizeCreateCustomer.php

@@ -17,7 +17,9 @@ use App\Models\Client;
 use App\PaymentDrivers\AuthorizePaymentDriver;
 use net\authorize\api\contract\v1\CreateCustomerProfileRequest;
 use net\authorize\api\contract\v1\CustomerProfileType;
+use net\authorize\api\contract\v1\GetCustomerProfileRequest;
 use net\authorize\api\controller\CreateCustomerProfileController;
+use net\authorize\api\controller\GetCustomerProfileController;
 
 /**
  * Class BaseDriver.
@@ -75,4 +77,46 @@ class AuthorizeCreateCustomer
             throw new GenericPaymentDriverFailure($message);
         }
     }
+
+    public function get($profileIdRequested)
+    {
+
+        error_reporting(E_ALL & ~E_DEPRECATED);
+
+        $this->authorize->init();
+        $request = new GetCustomerProfileRequest();
+        $request->setMerchantAuthentication($this->authorize->merchant_authentication);
+        $request->setCustomerProfileId($profileIdRequested);
+        
+        $controller = new GetCustomerProfileController($request);
+        $response = $controller->executeWithApiResponse($this->authorize->merchant_authentication);
+
+        if (($response != null) && ($response->getMessages()->getResultCode() == "Ok") )
+        {
+            echo "GetCustomerProfile SUCCESS : " .  "\n";
+            $profileSelected = $response->getProfile();
+            $paymentProfilesSelected = $profileSelected->getPaymentProfiles();
+            echo "Profile Has " . count($paymentProfilesSelected). " Payment Profiles" . "\n";
+
+                if($response->getSubscriptionIds() != null) 
+                {
+                    if($response->getSubscriptionIds() != null)
+                    {
+
+                        echo "List of subscriptions:";
+                        foreach($response->getSubscriptionIds() as $subscriptionid)
+                            echo $subscriptionid . "\n";
+
+                    }
+                }
+        }
+        else
+        {
+            echo "ERROR :  GetCustomerProfile: Invalid response\n";
+            $errorMessages = $response->getMessages()->getMessage();
+            echo "Response : " . $errorMessages[0]->getCode() . "  " .$errorMessages[0]->getText() . "\n";
+        }
+
+        return $response;
+    }
 }

app/PaymentDrivers/Authorize/AuthorizeCreditCard.php

@@ -68,7 +68,7 @@ class AuthorizeCreditCard
         $payment_profile = $authorise_payment_method->addPaymentMethodToClient($gateway_customer_reference, $data);
         $payment_profile_id = $payment_profile->getPaymentProfile()->getCustomerPaymentProfileId();
 
-        if ($request->has('store_card') && $request->input('store_card') === 'true') {
+        if ($request->has('store_card') && $request->input('store_card') === true) {
             $authorise_payment_method->payment_method = GatewayType::CREDIT_CARD;
             $client_gateway_token = $authorise_payment_method->createClientGatewayToken($payment_profile, $gateway_customer_reference);
         }
@@ -80,7 +80,7 @@ class AuthorizeCreditCard
 
     private function processTokenPayment($request)
     {
-        $client_gateway_token = ClientGatewayToken::find($this->decodePrimaryKey($request->token));
+        $client_gateway_token =ClientGatewayToken::where('token', $request->token)->firstOrFail();
 
         $data = (new ChargePaymentProfile($this->authorize))->chargeCustomerProfile($client_gateway_token->gateway_customer_reference, $client_gateway_token->token, $request->input('amount_with_fee'));
 

app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php

@@ -13,15 +13,18 @@
 namespace App\PaymentDrivers\Authorize;
 
 use App\Exceptions\GenericPaymentDriverFailure;
+use App\Exceptions\PaymentFailed;
 use App\Models\GatewayType;
 use App\PaymentDrivers\AuthorizePaymentDriver;
 use net\authorize\api\contract\v1\CreateCustomerPaymentProfileRequest;
 use net\authorize\api\contract\v1\CustomerAddressType;
 use net\authorize\api\contract\v1\CustomerPaymentProfileType;
+use net\authorize\api\contract\v1\DeleteCustomerPaymentProfileRequest;
 use net\authorize\api\contract\v1\GetCustomerPaymentProfileRequest;
 use net\authorize\api\contract\v1\OpaqueDataType;
 use net\authorize\api\contract\v1\PaymentType;
 use net\authorize\api\controller\CreateCustomerPaymentProfileController;
+use net\authorize\api\controller\DeleteCustomerPaymentProfileController;
 use net\authorize\api\controller\GetCustomerPaymentProfileController;
 use stdClass;
 
@@ -94,12 +97,14 @@ class AuthorizePaymentMethod
 
         if ($client_gateway_token = $this->authorize->findClientGatewayRecord()) {
             $payment_profile = $this->addPaymentMethodToClient($client_gateway_token->gateway_customer_reference, $data);
+            $gateway_customer_reference = $client_gateway_token->gateway_customer_reference;
         } else {
             $gateway_customer_reference = (new AuthorizeCreateCustomer($this->authorize, $this->authorize->client))->create($data);
             $payment_profile = $this->addPaymentMethodToClient($gateway_customer_reference, $data);
+
+            $this->createClientGatewayToken($payment_profile, $gateway_customer_reference);
         }
 
-        $this->createClientGatewayToken($payment_profile, $gateway_customer_reference);
 
         return redirect()->route('client.payment_methods.index');
     }
@@ -116,6 +121,7 @@ class AuthorizePaymentMethod
         $data['token'] = $payment_profile->getPaymentProfile()->getCustomerPaymentProfileId();
         $data['payment_method_id'] = $this->payment_method_id;
         $data['payment_meta'] = $this->buildPaymentMethod($payment_profile);
+        $data['payment_method_id'] = GatewayType::CREDIT_CARD;
 
         $additional['gateway_customer_reference'] = $gateway_customer_reference;
 
@@ -206,7 +212,8 @@ class AuthorizePaymentMethod
                 $message = $errorMessages[0]->getCode().'  '.$errorMessages[0]->getText();
             }
 
-            throw new GenericPaymentDriverFailure($message);
+            throw new PaymentFailed($message, 500);
+
         }
     }
 
@@ -245,4 +252,37 @@ class AuthorizePaymentMethod
             throw new GenericPaymentDriverFailure('Error communicating with Authorize.net');
         }
     }
+
+    public function deletePaymentProfile($gateway_customer_reference, $payment_profile_id) {
+
+        error_reporting(E_ALL & ~E_DEPRECATED);
+
+        $this->authorize->init();
+
+        // Set the transaction's refId
+        $refId = 'ref' . time();
+        
+          // Use an existing payment profile ID for this Merchant name and Transaction key
+          
+          $request = new DeleteCustomerPaymentProfileRequest();
+          $request->setMerchantAuthentication($this->authorize->merchant_authentication);
+          $request->setCustomerProfileId($gateway_customer_reference);
+          $request->setCustomerPaymentProfileId($payment_profile_id);
+          $controller = new DeleteCustomerPaymentProfileController($request);
+
+          $response = $controller->executeWithApiResponse($this->authorize->mode());
+          if (($response != null) && ($response->getMessages()->getResultCode() == "Ok") )
+          {
+              nlog("SUCCESS: Delete Customer Payment Profile  SUCCESS  :");
+           }
+          else
+          {
+              nlog("ERROR :  Delete Customer Payment Profile: Invalid response\n");
+              $errorMessages = $response->getMessages()->getMessage();
+              nlog("Response : " . $errorMessages[0]->getCode() . "  " .$errorMessages[0]->getText() . "\n");
+          }
+
+          return $response;
+  }
+
 }

app/PaymentDrivers/AuthorizePaymentDriver.php

@@ -156,6 +156,6 @@ class AuthorizePaymentDriver extends BaseDriver
      */
     public function detach(ClientGatewayToken $token)
     {
-        // Authorize.net doesn't support this feature.
+        return (new AuthorizePaymentMethod($this))->deletePaymentProfile($token->gateway_customer_reference, $token->token);
     }
 }

app/PaymentDrivers/BaseDriver.php

@@ -187,7 +187,7 @@ class BaseDriver extends AbstractPaymentDriver
         $payment->invoices()->sync($invoices);
 
         $invoices->each(function ($invoice) use ($payment) {
-            event(new InvoiceWasPaid($invoice, $payment->company, Ninja::eventVars()));
+            event(new InvoiceWasPaid($invoice, $payment, $payment->company, Ninja::eventVars()));
         });
 
         return $payment->service()->applyNumber()->save();

app/PaymentDrivers/CheckoutCom/CreditCard.php

@@ -43,7 +43,9 @@ class CreditCard
      */
     public function authorizeView($data)
     {
-        return render('gateways.checkout.credit_card.authorize');
+        $data['gateway'] = $this->checkout;
+
+        return render('gateways.checkout.credit_card.authorize', $data);
     }
 
     /**
@@ -91,7 +93,7 @@ class CreditCard
         $this->checkout->payment_hash->data = array_merge((array) $this->checkout->payment_hash->data, $state);
         $this->checkout->payment_hash->save();
 
-        if ($request->has('token') && !is_null($request->token) && $request->pay_with_token) {
+        if ($request->has('token') && !is_null($request->token) && !empty($request->token)) {
             return $this->attemptPaymentUsingToken($request);
         }
 

app/PaymentDrivers/CheckoutComPaymentDriver.php

@@ -208,4 +208,9 @@ class CheckoutComPaymentDriver extends BaseDriver
             return $this->processInternallyFailedPayment($this, $e);
         }
     }
+
+    public function detach(ClientGatewayToken $clientGatewayToken)
+    {
+        // Gateway doesn't support this feature.
+    }
 }

app/PaymentDrivers/Stripe/ACH.php

@@ -39,6 +39,8 @@ class ACH
 
     public function authorizeView(array $data)
     {
+        $data['gateway'] = $this->stripe;
+
         return render('gateways.stripe.ach.authorize', array_merge($data));
     }
 
@@ -63,7 +65,12 @@ class ACH
 
     public function verificationView(ClientGatewayToken $token)
     {
-        return render('gateways.stripe.ach.verify', compact('token'));
+        $data = [
+            'token' => $token,
+            'gateway' => $this->stripe,
+        ];
+
+        return render('gateways.stripe.ach.verify', $data);
     }
 
     public function processVerification(Request $request, ClientGatewayToken $token)

app/PaymentDrivers/Stripe/CreditCard.php

@@ -66,13 +66,7 @@ class CreditCard
             'description' => collect($data['invoices'])->pluck('id'), // TODO: More meaningful description.
         ];
 
-        if ($data['token']) {
+        $payment_intent_data['setup_future_usage'] = 'off_session';
-            $payment_intent_data['payment_method'] = $data['token']->token;
-        } else {
-            $payment_intent_data['setup_future_usage'] = 'off_session';
-            // $payment_intent_data['save_payment_method'] = true;
-            // $payment_intent_data['confirm'] = true;
-        }
 
         $data['intent'] = $this->stripe->createPaymentIntent($payment_intent_data);
         $data['gateway'] = $this->stripe;

app/Repositories/ClientRepository.php

@@ -60,8 +60,8 @@ class ClientRepository extends BaseRepository
 
         $client->fill($data);
 
-        if (!isset($client->id_number) || empty($client->id_number)) {
+        if (!isset($client->number) || empty($client->number)) {
-            $client->id_number = $this->getNextClientNumber($client);
+            $client->number = $this->getNextClientNumber($client);
         }
 
         if (empty($data['name'])) {

app/Repositories/Migration/PaymentMigrationRepository.php

@@ -117,6 +117,10 @@ class PaymentMigrationRepository extends BaseRepository
                 $inv->pivot->amount = $invoice_totals;
                 $inv->pivot->refunded = $refund_totals;
                 $inv->pivot->save();
+
+                $inv->paid_to_date += $invoice_totals;
+                $inv->save();
+
             });
         }
 
@@ -130,6 +134,9 @@ class PaymentMigrationRepository extends BaseRepository
             $payment->credits->each(function ($cre) use ($credit_totals) {
                 $cre->pivot->amount = $credit_totals;
                 $cre->pivot->save();
+
+                $cre->paid_to_date += $invoice_totals;
+                $cre->save();
             });
         }
 

app/Repositories/PaymentRepository.php

@@ -118,8 +118,6 @@ class PaymentRepository extends BaseRepository
         if (array_key_exists('invoices', $data) && is_array($data['invoices']) && count($data['invoices']) > 0) {
             $invoice_totals = array_sum(array_column($data['invoices'], 'amount'));
 
-nlog("invoice totals = {$invoice_totals}");
-
             $invoices = Invoice::whereIn('id', array_column($data['invoices'], 'invoice_id'))->get();
 
             $payment->invoices()->saveMany($invoices);

app/Repositories/VendorRepository.php

@@ -47,8 +47,8 @@ class VendorRepository extends BaseRepository
 
         $vendor->save();
 
-        if ($vendor->id_number == '' || ! $vendor->id_number) {
+        if ($vendor->number == '' || ! $vendor->number) {
-            $vendor->id_number = $this->getNextVendorNumber($vendor);
+            $vendor->number = $this->getNextVendorNumber($vendor);
         } //todo write tests for this and make sure that custom vendor numbers also works as expected from here
 
         $vendor->save();

app/Services/Client/PaymentMethod.php

@@ -209,7 +209,7 @@ class PaymentMethod
                 $payment_urls = [];
             }
 
-            $payment_urls[] = [
+            $this->payment_urls[] = [
                     'label' => ctrans('texts.apply_credit'),
                     'company_gateway_id'  => CompanyGateway::GATEWAY_CREDIT,
                     'gateway_type_id' => GatewayType::CREDIT,
@@ -238,6 +238,5 @@ class PaymentMethod
 
         return true;
     }
-}
-
 
+}

app/Services/Credit/ApplyPayment.php

@@ -70,6 +70,7 @@ class ApplyPayment
         }
 
         $this->credit->balance -= $this->amount_applied;
+        $this->credit->paid_to_date += $this->amount_applied;
 
         if ((int)$this->credit->balance == 0) {
             $this->credit->status_id = Credit::STATUS_APPLIED;
@@ -110,6 +111,8 @@ class ApplyPayment
         $this->payment->currency_id = $this->credit->client->getSetting('currency_id');
         $this->payment->save();
 
+        $this->payment->service()->applyNumber()->save();
+        
         $this->payment
              ->invoices()
              ->attach($this->invoice->id, ['amount' => $this->amount_applied]);
@@ -133,6 +136,7 @@ class ApplyPayment
         $this->invoice
                  ->service()
                  ->updateBalance($this->amount_applied * -1)
+                 ->updatePaidToDate($this->amount_applied)
                  ->updateStatus()
                  ->save();
 
@@ -144,7 +148,7 @@ class ApplyPayment
 
         if ((int)$this->invoice->balance == 0) {
             $this->invoice->service()->deletePdf();
-            event(new InvoiceWasPaid($this->invoice, $this->payment->company, Ninja::eventVars()));
+            event(new InvoiceWasPaid($this->invoice, $payment, $this->payment->company, Ninja::eventVars()));
         }
     }
 }

app/Services/Credit/CreditService.php

@@ -97,6 +97,12 @@ class CreditService
         return $this;
     }
 
+    public function updatePaidToDate($adjustment)
+    {
+        $this->credit->paid_to_date += $adjustment;
+        
+        return $this;
+    }
 
     public function fillDefaults()
     {

app/Services/Invoice/ApplyPayment.php

@@ -104,14 +104,24 @@ class ApplyPayment extends AbstractService
              ->ledger()
              ->updatePaymentBalance($amount_paid);
 
-        $this->invoice->client->service()->updateBalance($amount_paid)->save();
+        $this->invoice
+             ->client
+             ->service()
+             ->updateBalance($amount_paid)
+             ->save();
 
         /* Update Pivot Record amount */
         $this->payment->invoices->each(function ($inv) use($amount_paid){
+
             if ($inv->id == $this->invoice->id) {
+
                 $inv->pivot->amount = ($amount_paid*-1);
                 $inv->pivot->save();
+
+                $inv->paid_to_date += floatval($amount_paid*-1);         
+                $inv->save();
             }
+
         });
 
         $this->invoice->service()->applyNumber()->save();

app/Services/Invoice/AutoBillInvoice.php

@@ -49,18 +49,12 @@ class AutoBillInvoice extends AbstractService
         $this->invoice = $this->invoice->service()->markSent()->save();
 
         /* Mark the invoice as paid if there is no balance */
-        if ((int)$this->invoice->balance == 0) {
+        if ((int)$this->invoice->balance == 0) 
             return $this->invoice->service()->markPaid()->save();
-        }
+        
-
         //if the credits cover the payments, we stop here, build the payment with credits and exit early
-
+        if ($this->client->getSetting('use_credits_payment') != 'off') 
-        if ($this->client->getSetting('use_credits_payment') != 'off') {
             $this->applyCreditPayment();
-        }
-
-        // info("partial = {$this->invoice->partial}");
-        // info("balance = {$this->invoice->balance}");
 
         /* Determine $amount */
         if ($this->invoice->partial > 0) {
@@ -76,15 +70,12 @@ class AutoBillInvoice extends AbstractService
         $gateway_token = $this->getGateway($amount);
 
         /* Bail out if no payment methods available */
-        if (! $gateway_token || ! $gateway_token->gateway->driver($this->client)->token_billing) {
+        if (! $gateway_token || ! $gateway_token->gateway->driver($this->client)->token_billing) 
             return $this->invoice;
-        }
+        
-
         /* $gateway fee */
         $fee = $gateway_token->gateway->calcGatewayFee($amount, $gateway_token->gateway_type_id, $this->invoice->uses_inclusive_taxes);
 
-        //todo determine exact fee as per PaymentController
-
         /* Build payment hash */
         $payment_hash = PaymentHash::create([
             'hash' => Str::random(128),
@@ -122,18 +113,24 @@ class AutoBillInvoice extends AbstractService
 
         $payment->invoices()->attach($this->invoice->id, ['amount' => $amount]);
 
-        $this->invoice->service()->setStatus(Invoice::STATUS_PAID)->save();
+        $this->invoice
+             ->service()
+             ->setStatus(Invoice::STATUS_PAID)
+             ->save();
 
         foreach ($this->used_credit as $credit) {
             $current_credit = Credit::find($credit['credit_id']);
-            $payment->credits()->attach($current_credit->id, ['amount' => $credit['amount']]);
+            $payment->credits()
+                    ->attach($current_credit->id, ['amount' => $credit['amount']]);
 
             info("adjusting credit balance {$current_credit->balance} by this amount ". $credit['amount']);
 
-            $current_credit->balance -= $credit['amount'];
+            $current_credit->service()
+                           ->adjustBalance($credit['amount']*-1)
+                           ->updatePaidToDate($credit['amount'])
+                           ->setCalculatedStatus()
+                           ->save();
 
-            $current_credit->service()->setCalculatedStatus()->save();
-            // $this->applyPaymentToCredit($current_credit, $credit['amount']);
         }
 
         $payment->ledger()
@@ -153,7 +150,10 @@ class AutoBillInvoice extends AbstractService
 
         event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
 
-        return $this->invoice->service()->setCalculatedStatus()->save();
+        return $this->invoice
+                    ->service()
+                    ->setCalculatedStatus()
+                    ->save();
     }
 
     /**
@@ -190,10 +190,11 @@ class AutoBillInvoice extends AbstractService
             if ($is_partial_amount) {
 
                 //more credit than needed
-                if ($credit->balance >= $this->invoice->partial) {
+                if ($credit->balance > $this->invoice->partial) {
                     $this->used_credit[$key]['credit_id'] = $credit->id;
                     $this->used_credit[$key]['amount'] = $this->invoice->partial;
                     $this->invoice->balance -= $this->invoice->partial;
+                    $this->invoice->paid_to_date += $this->invoice->partial;
                     $this->invoice->partial = 0;
                     break;
                 } else {
@@ -201,19 +202,23 @@ class AutoBillInvoice extends AbstractService
                     $this->used_credit[$key]['amount'] = $credit->balance;
                     $this->invoice->partial -= $credit->balance;
                     $this->invoice->balance -= $credit->balance;
+                    $this->invoice->paid_to_date += $credit->balance;
                 }
             } else {
 
                 //more credit than needed
-                if ($credit->balance >= $this->invoice->balance) {
+                if ($credit->balance > $this->invoice->balance) {
                     $this->used_credit[$key]['credit_id'] = $credit->id;
                     $this->used_credit[$key]['amount'] = $this->invoice->balance;
+                    $this->invoice->paid_to_date += $this->invoice->balance;
                     $this->invoice->balance = 0;
+
                     break;
                 } else {
                     $this->used_credit[$key]['credit_id'] = $credit->id;
                     $this->used_credit[$key]['amount'] = $credit->balance;
                     $this->invoice->balance -= $credit->balance;
+                    $this->invoice->paid_to_date += $credit->balance;
                 }
             }
         }

app/Services/Invoice/HandleReversal.php

@@ -38,14 +38,12 @@ class HandleReversal extends AbstractService
     public function run()
     {
         /* Check again!! */
-        if (! $this->invoice->invoiceReversable($this->invoice)) {
+        if (! $this->invoice->invoiceReversable($this->invoice)) 
             return $this->invoice;
-        }
 
         /* If the invoice has been cancelled - we need to unwind the cancellation before reversing*/
-        if ($this->invoice->status_id == Invoice::STATUS_CANCELLED) {
+        if ($this->invoice->status_id == Invoice::STATUS_CANCELLED) 
             $this->invoice = $this->invoice->service()->reverseCancellation()->save();
-        }
 
         $balance_remaining = $this->invoice->balance;
 
@@ -57,18 +55,19 @@ class HandleReversal extends AbstractService
                                     ->get();
 
         $paymentables->each(function ($paymentable) use ($total_paid) {
+
             $reversable_amount = $paymentable->amount - $paymentable->refunded;
-
             $total_paid -= $reversable_amount;
-
             $paymentable->amount = $paymentable->refunded;
             $paymentable->save();
+
         });
 
         /* Generate a credit for the $total_paid amount */
         $notes = 'Credit for reversal of '.$this->invoice->number;
 
         if ($total_paid > 0) {
+
             $credit = CreditFactory::create($this->invoice->company_id, $this->invoice->user_id);
             $credit->client_id = $this->invoice->client_id;
             $credit->invoice_id = $this->invoice->id;
@@ -79,16 +78,13 @@ class HandleReversal extends AbstractService
             $item->notes = $notes;
 
             $line_items[] = $item;
-
             $credit->line_items = $line_items;
-
             $credit->save();
 
             $credit_calc = new InvoiceSum($credit);
             $credit_calc->build();
 
             $credit = $credit_calc->purgeTaxes()->getCredit();
-
             $credit->service()->markSent()->save();
         }
 
@@ -105,6 +101,9 @@ class HandleReversal extends AbstractService
             //harvest the credit record and add in the amount for the credit.
             $paymentable_credit->pivot->amount = $total_paid;
             $paymentable_credit->pivot->save();
+
+            $paymentable_credit->paid_to_date += $total_paid;
+            $paymentable_credit->save();
         }
 
         /* Set invoice balance to 0 */
@@ -113,7 +112,8 @@ class HandleReversal extends AbstractService
         }
 
         $this->invoice->balance = 0;
-
+        $this->invoice->paid_to_date = 0;
+        
         /* Set invoice status to reversed... somehow*/
         $this->invoice->service()->setStatus(Invoice::STATUS_REVERSED)->save();
 

app/Services/Invoice/InvoiceService.php

@@ -112,6 +112,13 @@ class InvoiceService
         return $this;
     }
 
+    public function updatePaidToDate($adjustment)
+    {
+        $this->invoice->paid_to_date += $adjustment;
+
+        return $this;
+    }
+
     public function createInvitations()
     {
         $this->invoice = (new CreateInvitations($this->invoice))->run();

app/Services/Invoice/MarkPaid.php

@@ -70,6 +70,7 @@ class MarkPaid extends AbstractService
         
         $this->invoice->service()
                 ->updateBalance($payment->amount * -1)
+                ->updatePaidToDate($payment->amount)
                 ->setStatus(Invoice::STATUS_PAID)
                 ->applyNumber()
                 ->save();
@@ -79,7 +80,7 @@ class MarkPaid extends AbstractService
         
         /* Update Invoice balance */
         event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
-        event(new InvoiceWasPaid($this->invoice, $payment->company, Ninja::eventVars()));
+        event(new InvoiceWasPaid($this->invoice, $payment, $payment->company, Ninja::eventVars()));
 
         $payment->ledger()
                 ->updatePaymentBalance($payment->amount * -1);

app/Services/Invoice/UpdateBalance.php

@@ -33,7 +33,7 @@ class UpdateBalance extends AbstractService
         }
 
         $this->invoice->balance += floatval($this->balance_adjustment);
-
+        
         if ($this->invoice->balance == 0) {
             $this->invoice->status_id = Invoice::STATUS_PAID;
         }

app/Services/Payment/DeletePayment.php

@@ -55,7 +55,6 @@ class DeletePayment
     private function cleanupPayment()
     {
         $this->payment->is_deleted = true;
-        // $entity->save();
         $this->payment->delete();
         
         return $this;
@@ -78,10 +77,22 @@ class DeletePayment
     private function adjustInvoices()
     {
         if ($this->payment->invoices()->exists()) {
+
             $this->payment->invoices()->each(function ($paymentable_invoice) {
-                $paymentable_invoice->service()->updateBalance($paymentable_invoice->pivot->amount)->save();
+
-                $paymentable_invoice->ledger()->updateInvoiceBalance($paymentable_invoice->pivot->amount, "Adjusting invoice {$paymentable_invoice->number} due to deletion of Payment {$this->payment->number}")->save();
+                $paymentable_invoice->service()
-                $paymentable_invoice->client->service()->updateBalance($paymentable_invoice->pivot->amount)->save();
+                                    ->updateBalance($paymentable_invoice->pivot->amount)
+                                    ->updatePaidToDate($paymentable_invoice->pivot->amount * -1)
+                                    ->save();
+
+                $paymentable_invoice->ledger()
+                                    ->updateInvoiceBalance($paymentable_invoice->pivot->amount, "Adjusting invoice {$paymentable_invoice->number} due to deletion of Payment {$this->payment->number}")
+                                    ->save();
+
+                $paymentable_invoice->client
+                                    ->service()
+                                    ->updateBalance($paymentable_invoice->pivot->amount)
+                                    ->save();
 
                 if ($paymentable_invoice->balance == $paymentable_invoice->amount) {
                     $paymentable_invoice->service()->setStatus(Invoice::STATUS_SENT)->save();
@@ -101,10 +112,12 @@ class DeletePayment
     {
         if ($this->payment->credits()->exists()) {
             $this->payment->credits()->each(function ($paymentable_credit) {
-                $paymentable_credit->balance += $paymentable_credit->pivot->amount;
+                
-                $paymentable_credit->setStatus(Credit::STATUS_SENT);
+                $paymentable_credit->service()
-                //fire event for this credit
+                                   ->updateBalance($paymentable_credit->pivot->amount)
-                //
+                                   ->updatePaidToDate($paymentable_credit->pivot->amount*-1)
+                                   ->setStatus(Credit::STATUS_SENT)
+                                   ->save();
             });
         }
 

app/Services/Payment/PaymentService.php

@@ -59,11 +59,16 @@ class PaymentService
         $client = $this->payment->client;
 
         $invoices->each(function ($invoice) {
+            
             if ($invoice->pivot->amount > 0) {
-                $invoice->status_id = Invoice::STATUS_SENT;
+
-                $invoice->balance = $invoice->pivot->amount;
+                $invoice->service()
-                $invoice->save();
+                        ->updateBalance($invoice->pivot->amount)
+                        ->updatePaidToDate($invoice->pivot->amount*-1)
+                        ->setStatus(Invoice::STATUS_SENT)
+                        ->save();
             }
+
         });
 
         $this->payment

app/Services/Payment/RefundPayment.php

@@ -188,18 +188,26 @@ class RefundPayment
                 if ($available_credit > $this->total_refund) {
                     $paymentable_credit->pivot->refunded += $this->total_refund;
                     $paymentable_credit->pivot->save();
-                    $paymentable_credit->balance += $this->total_refund;
+                    
-                    $paymentable_credit->service()->setStatus(Credit::STATUS_SENT)->save();
+                    $paymentable_credit->service()
-                    //$paymentable_credit->save();
+                                       ->setStatus(Credit::STATUS_SENT)
+                                       ->updateBalance($this->total_refund)
+                                       ->updatePaidToDate($this->total_refund*-1)
+                                       ->save();
 
                     $this->total_refund = 0;
+
                 } else {
+
                     $paymentable_credit->pivot->refunded += $available_credit;
                     $paymentable_credit->pivot->save();
 
                     $paymentable_credit->balance += $available_credit;
-                    $paymentable_credit->service()->setStatus(Credit::STATUS_SENT)->save();
+                    $paymentable_credit->service()
-//                    $paymentable_credit->save();
+                                      ->setStatus(Credit::STATUS_SENT)
+                                       ->adjustBalance($available_credit)
+                                       ->updatePaidToDate($available_credit*-1)
+                                      ->save();
 
                     $this->total_refund -= $available_credit;
                 }

app/Services/Payment/UpdateInvoicePayment.php

@@ -79,6 +79,7 @@ class UpdateInvoicePayment
             $invoice->service() //caution what if we amount paid was less than partial - we wipe it!
                 ->clearPartial()
                 ->updateBalance($paid_amount * -1)
+                ->updatePaidToDate($paid_amount)
                 ->updateStatus()
                 ->save();
 

app/Services/Quote/CreateInvitations.php

@@ -41,6 +41,7 @@ class CreateInvitations
             $invitation = QuoteInvitation::whereCompanyId($this->quote->company_id)
                 ->whereClientContactId($contact->id)
                 ->whereQuoteId($this->quote->id)
+                ->withTrashed()
                 ->first();
 
             if (! $invitation && $contact->send_email) {

app/Transformers/ClientTransformer.php

@@ -147,6 +147,7 @@ class ClientTransformer extends EntityTransformer
             'archived_at' => (int) $client->deleted_at,
             'created_at' => (int) $client->created_at,
             'display_name' => $client->present()->name(),
+            'number' => (string) $client->number ?: '',
         ];
     }
 }

app/Transformers/CreditTransformer.php

@@ -136,6 +136,7 @@ class CreditTransformer extends EntityTransformer
             'line_items' => $credit->line_items ?: (array) [],
             'entity_type' => 'credit',
             'exchange_rate' => (float) $credit->exchange_rate,
+            'paid_to_date' => (float) $credit->paid_to_date,
         ];
     }
 }

app/Transformers/InvoiceTransformer.php

@@ -140,6 +140,8 @@ class InvoiceTransformer extends EntityTransformer
             'reminder2_sent' => $invoice->reminder2_sent ?: '',
             'reminder3_sent' => $invoice->reminder3_sent ?: '',
             'reminder_last_sent' => $invoice->reminder_last_sent ?: '',
+            'paid_to_date' => (float) $invoice->paid_to_date,
+
         ];
     }
 }

app/Transformers/QuoteTransformer.php

@@ -137,6 +137,7 @@ class QuoteTransformer extends EntityTransformer
             'line_items' => $quote->line_items ?: (array) [],
             'entity_type' => 'quote',
             'exchange_rate' => (float) $quote->exchange_rate,
+            'paid_to_date' => (float) $quote->paid_to_date,
             'project_id' => $this->encodePrimaryKey($quote->project_id),
         ];
     }

app/Transformers/RecurringInvoiceTransformer.php

@@ -138,6 +138,7 @@ class RecurringInvoiceTransformer extends EntityTransformer
             'auto_bill' => (string) $invoice->auto_bill,
             'auto_bill_enabled' => (bool) $invoice->auto_bill_enabled,
             'due_date_days' => (string) $invoice->due_date_days ?: '',
+            'paid_to_date' => (float) $invoice->paid_to_date,
         ];
     }
 }