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

Minor fixes for check data

Browse Source
This commit is contained in:
David Bomba 2021-11-07 17:12:51 +11:00
parent dc0efd2d91
commit 3b4afd4537
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Commands/CheckData.php
View File

@ -447,8 +447,8 @@ class CheckData extends Command
payments.id = paymentables.payment_id payments.id = paymentables.payment_id
WHERE paymentable_type = 'App\\Models\\Credit' WHERE paymentable_type = 'App\\Models\\Credit'
AND paymentables.deleted_at is NULL AND paymentables.deleted_at is NULL
AND payments.client_id = 85; AND payments.client_id = ?;
") ); "), [$client->id] );
return $results; return $results;
} }

1
app/PaymentDrivers/BaseDriver.php
View File

@ -233,7 +233,6 @@ class BaseDriver extends AbstractPaymentDriver
} }
$payment = PaymentFactory::create($this->client->company->id, $this->client->user->id); $payment = PaymentFactory::create($this->client->company->id, $this->client->user->id);
$payment->client_id = $this->client->id; $payment->client_id = $this->client->id;
$payment->company_gateway_id = $this->company_gateway->id; $payment->company_gateway_id = $this->company_gateway->id;

2
app/Services/Payment/PaymentService.php
View File

@ -112,7 +112,7 @@ class PaymentService
/* Iterate through the invoices and apply credits to them */ /* Iterate through the invoices and apply credits to them */
collect($payment_hash->invoices())->each(function ($payable_invoice) use ($payment_hash) { collect($payment_hash->invoices())->each(function ($payable_invoice) use ($payment_hash) {
$invoice = Invoice::find($this->decodePrimaryKey($payable_invoice->invoice_id)); $invoice = Invoice::withTrashed()->find($this->decodePrimaryKey($payable_invoice->invoice_id));
$amount = $payable_invoice->amount; $amount = $payable_invoice->amount;

2
routes/api.php
View File

@ -216,7 +216,7 @@ Route::match(['get', 'post'], 'payment_notification_webhook/{company_key}/{compa
->middleware(['guest']) ->middleware(['guest'])
->name('payment_notification_webhook'); ->name('payment_notification_webhook');
Route::post('api/v1/postmark_webhook', 'PostMarkController@webhook')->middleware(['throttle:5000,1']); Route::post('api/v1/postmark_webhook', 'PostMarkController@webhook')->middleware(['throttle:10000,1']);
Route::get('token_hash_router', 'OneTimeTokenController@router'); Route::get('token_hash_router', 'OneTimeTokenController@router');
Route::get('webcron', 'WebCronController@index'); Route::get('webcron', 'WebCronController@index');
Route::post('api/v1/get_migration_account', 'HostedMigrationController@getAccount')->middleware('guest'); Route::post('api/v1/get_migration_account', 'HostedMigrationController@getAccount')->middleware('guest');