mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-01 10:54:36 -04:00
Triggered actions for credits
This commit is contained in:
parent
293367cd16
commit
4deb820346
@ -200,6 +200,7 @@ class CreditController extends BaseController
|
|||||||
|
|
||||||
$credit = $credit->service()
|
$credit = $credit->service()
|
||||||
->fillDefaults()
|
->fillDefaults()
|
||||||
|
->triggeredActions($request)
|
||||||
->save();
|
->save();
|
||||||
|
|
||||||
event(new CreditWasCreated($credit, $credit->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
|
event(new CreditWasCreated($credit, $credit->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
|
||||||
@ -377,7 +378,9 @@ class CreditController extends BaseController
|
|||||||
|
|
||||||
$credit = $this->credit_repository->save($request->all(), $credit);
|
$credit = $this->credit_repository->save($request->all(), $credit);
|
||||||
|
|
||||||
$credit->service()->deletePdf();
|
$credit->service()
|
||||||
|
->triggeredActions($request)
|
||||||
|
->deletePdf();
|
||||||
|
|
||||||
event(new CreditWasUpdated($credit, $credit->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
|
event(new CreditWasUpdated($credit, $credit->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
|
||||||
|
|
||||||
|
@ -524,14 +524,25 @@ class StripePaymentDriver extends BaseDriver
|
|||||||
if ($request->type === 'charge.succeeded' || $request->type === 'payment_intent.succeeded') {
|
if ($request->type === 'charge.succeeded' || $request->type === 'payment_intent.succeeded') {
|
||||||
|
|
||||||
foreach ($request->data as $transaction) {
|
foreach ($request->data as $transaction) {
|
||||||
$payment = Payment::query()
|
|
||||||
->where('transaction_reference', $transaction['payment_intent'])
|
if(array_key_exists('payment_intent', $transaction))
|
||||||
|
{
|
||||||
|
$payment = Payment::query()
|
||||||
->where('company_id', $request->getCompany()->id)
|
->where('company_id', $request->getCompany()->id)
|
||||||
->where(function ($query) use ($transaction) {
|
->where(function ($query) use ($transaction) {
|
||||||
$query->where('transaction_reference', $transaction['payment_intent'])
|
$query->where('transaction_reference', $transaction['payment_intent'])
|
||||||
->orWhere('transaction_reference', $transaction['id']);
|
->orWhere('transaction_reference', $transaction['id']);
|
||||||
})
|
})
|
||||||
->first();
|
->first();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$payment = Payment::query()
|
||||||
|
->where('company_id', $request->getCompany()->id)
|
||||||
|
->where('transaction_reference', $transaction['id'])
|
||||||
|
->first();
|
||||||
|
}
|
||||||
|
|
||||||
if ($payment) {
|
if ($payment) {
|
||||||
$payment->status_id = Payment::STATUS_COMPLETED;
|
$payment->status_id = Payment::STATUS_COMPLETED;
|
||||||
$payment->save();
|
$payment->save();
|
||||||
|
@ -14,6 +14,7 @@ namespace App\Services\Credit;
|
|||||||
use App\Jobs\Util\UnlinkFile;
|
use App\Jobs\Util\UnlinkFile;
|
||||||
use App\Models\Credit;
|
use App\Models\Credit;
|
||||||
use App\Services\Credit\CreateInvitations;
|
use App\Services\Credit\CreateInvitations;
|
||||||
|
use App\Services\Credit\TriggeredActions;
|
||||||
use App\Utils\Traits\MakesHash;
|
use App\Utils\Traits\MakesHash;
|
||||||
|
|
||||||
class CreditService
|
class CreditService
|
||||||
@ -150,6 +151,13 @@ class CreditService
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function triggeredActions($request)
|
||||||
|
{
|
||||||
|
$this->invoice = (new TriggeredActions($this->credit, $request))->run();
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Saves the credit.
|
* Saves the credit.
|
||||||
* @return Credit object
|
* @return Credit object
|
||||||
|
Loading…
x
Reference in New Issue
Block a user