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

Updated query

Browse Source
This commit is contained in:
Lars Kusch 2021-10-27 20:59:50 +02:00 committed by GitHub
parent b71c4965e2
commit c259e25bb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/PaymentDrivers/StripePaymentDriver.php
View File

@ -516,15 +516,13 @@ class StripePaymentDriver extends BaseDriver
foreach ($request->data as $transaction) { foreach ($request->data as $transaction) {
$payment = Payment::query() $payment = Payment::query()
->where('transaction_reference', $transaction['id'])
->where('company_id', $request->getCompany()->id)
->first();
if (empty($payment)){
$payment = Payment::query()
->where('transaction_reference', $transaction['payment_intent']) ->where('transaction_reference', $transaction['payment_intent'])
->where('company_id', $request->getCompany()->id) ->where('company_id', $request->getCompany()->id)
->where(function ($query) use ($transaction) {
$query->where('transaction_reference', $transaction['payment_intent'])
->orWhere('transaction_reference', $transaction['id']);
})
->first(); ->first();
}
if ($payment) { if ($payment) {
$payment->status_id = Payment::STATUS_COMPLETED; $payment->status_id = Payment::STATUS_COMPLETED;
$payment->save(); $payment->save();
@ -541,16 +539,14 @@ class StripePaymentDriver extends BaseDriver
], $this->stripe_connect_auth); ], $this->stripe_connect_auth);
if ($charge->captured) { if ($charge->captured) {
$payment = Payment::query()
->where('transaction_reference', $transaction['id'])
->where('company_id', $request->getCompany()->id)
->first();
if (empty($payment)){
$payment = Payment::query() $payment = Payment::query()
->where('transaction_reference', $transaction['payment_intent']) ->where('transaction_reference', $transaction['payment_intent'])
->where('company_id', $request->getCompany()->id) ->where('company_id', $request->getCompany()->id)
->where(function ($query) use ($transaction) {
$query->where('transaction_reference', $transaction['payment_intent'])
->orWhere('transaction_reference', $transaction['id']);
})
->first(); ->first();
}
if ($payment) { if ($payment) {
$payment->status_id = Payment::STATUS_COMPLETED; $payment->status_id = Payment::STATUS_COMPLETED;
$payment->save(); $payment->save();