Merge pull request #5591 from turbo124/v5-develop

Fixes for gateway fees

CODE_OF_CONDUCT.md

@@ -0,0 +1,4 @@
+# Invoice Ninja Code of Conduct
+
+The development team has invested a tremendous amount of time and energy into this project. While we appreciate that bugs can be frustrating we ask that our community refrain from insults and snide remarks. We're happy to provide support to both our hosted and selfhosted communities but ask that feedback is always polite.
+

app/Http/Controllers/BaseController.php

@@ -395,7 +395,8 @@ class BaseController extends Controller
             'company' => function ($query) use ($created_at, $user) {
                 $query->whereNotNull('created_at')->with('documents');
             },
-            'company.clients' => function ($query) use ($user) {
+            'company.clients' => function ($query) use ($created_at, $user) {
+                $query->where('clients.created_at', '>=', $created_at)->with('contacts.company', 'gateway_tokens', 'documents');
 
                 if(!$user->hasPermission('view_client'))
                   $query->where('clients.user_id', $user->id)->orWhere('clients.assigned_user_id', $user->id);

app/Http/Controllers/ClientPortal/InvoiceController.php

@@ -50,6 +50,8 @@ class InvoiceController extends Controller
     {
         set_time_limit(0);
 
+        $invoice->service()->removeUnpaidGatewayFees()->save();
+
         $data = [
             'invoice' => $invoice,
         ];

app/Http/Controllers/ClientPortal/PaymentController.php

@@ -97,6 +97,10 @@ class PaymentController extends Controller
         $payable_invoices = collect($request->payable_invoices);
         $invoices = Invoice::whereIn('id', $this->transformKeys($payable_invoices->pluck('invoice_id')->toArray()))->get();
 
+        $invoices->each(function($invoice){
+            $invoice->service()->removeUnpaidGatewayFees()->save();
+        });
+
         /* pop non payable invoice from the $payable_invoices array */
 
         $payable_invoices = $payable_invoices->filter(function ($payable_invoice) use ($invoices) {

app/Services/Invoice/InvoiceService.php

@@ -110,6 +110,7 @@ class InvoiceService
 
     public function addGatewayFee(CompanyGateway $company_gateway, $gateway_type_id, float $amount)
     {
+
         $this->invoice = (new AddGatewayFee($company_gateway, $gateway_type_id, $this->invoice, $amount))->run();
 
         return $this;