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

Fixes for signature dates and IP addresses

Browse Source
This commit is contained in:
David Bomba 2023-07-26 12:23:22 +10:00
parent 85de0be560
commit 2391fe2dda
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ClientPortal/QuoteController.php
View File

@ -185,7 +185,7 @@ class QuoteController extends Controller
$quote->service()->approve(auth()->user())->save(); $quote->service()->approve(auth()->user())->save();
if (request()->has('signature') && ! is_null(request()->signature) && ! empty(request()->signature)) { if (request()->has('signature') && ! is_null(request()->signature) && ! empty(request()->signature)) {
InjectSignature::dispatch($quote, auth()->guard('contact')->user()->id, request()->signature); InjectSignature::dispatch($quote, auth()->guard('contact')->user()->id, request()->signature, request()->getClientIp());
} }
} }

2
app/Http/Controllers/VendorPortal/PurchaseOrderController.php
View File

@ -186,7 +186,7 @@ class PurchaseOrderController extends Controller
->save(); ->save();
if (request()->has('signature') && ! is_null(request()->signature) && ! empty(request()->signature)) { if (request()->has('signature') && ! is_null(request()->signature) && ! empty(request()->signature)) {
(new InjectSignature($purchase_order, auth()->guard('vendor')->user()->id, request()->signature))->handle(); (new InjectSignature($purchase_order, auth()->guard('vendor')->user()->id, request()->signature, request()->getClientIp()))->handle();
} }
event(new PurchaseOrderWasAccepted($purchase_order, auth()->guard('vendor')->user(), $purchase_order->company, Ninja::eventVars())); event(new PurchaseOrderWasAccepted($purchase_order, auth()->guard('vendor')->user(), $purchase_order->company, Ninja::eventVars()));

9
app/Jobs/Invoice/InjectSignature.php
View File

@ -25,19 +25,24 @@ class InjectSignature implements ShouldQueue
public $contact_id; public $contact_id;
public $ip;
/** /**
* Create a new job instance. * Create a new job instance.
* *
* @param $entity * @param $entity
* @param string $signature * @param string $signature
*/ */
public function __construct($entity, $contact_id, string $signature) public function __construct($entity, $contact_id, string $signature, ?string $ip)
{ {
$this->entity = $entity; $this->entity = $entity;
$this->contact_id = $contact_id; $this->contact_id = $contact_id;
$this->signature = $signature; $this->signature = $signature;
$this->ip = $ip;
} }
/** /**
@ -70,8 +75,8 @@ class InjectSignature implements ShouldQueue
$invitation->signature_base64 = $this->signature; $invitation->signature_base64 = $this->signature;
$invitation->signature_date = now(); $invitation->signature_date = now();
$invitation->signature_ip = $this->ip;
$invitation->save(); $invitation->save();
} }
} }

2
app/Services/ClientPortal/InstantPayment.php
View File

@ -179,7 +179,7 @@ class InstantPayment
$contact_id = auth()->guard('contact')->user() ? auth()->guard('contact')->user()->id : null; $contact_id = auth()->guard('contact')->user() ? auth()->guard('contact')->user()->id : null;
$invoices->each(function ($invoice) use($contact_id) { $invoices->each(function ($invoice) use($contact_id) {
InjectSignature::dispatch($invoice, $contact_id, $this->request->signature); InjectSignature::dispatch($invoice, $contact_id, $this->request->signature, request()->getClientIp());
}); });
} }