Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00
Code Issues Releases Activity

Merge pull request #7973 from turbo124/v5-develop

Browse Source 
Catch Stripe payment intents without charges key
This commit is contained in:
David Bomba 2022-11-23 07:43:45 +11:00 committed by GitHub
commit b1fea68fc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/BankTransaction/StoreBankTransactionRequest.php
View File

@ -44,7 +44,7 @@ class StoreBankTransactionRequest extends Request
{
$input = $this->all();
if(array_key_exists('bank_integration_id', $input) && strlen($input['bank_integration_id']) > 1)
if(array_key_exists('bank_integration_id', $input) && strlen($input['bank_integration_id']) > 1 && !is_numeric($input['bank_integration_id']))
$input['bank_integration_id'] = $this->decodePrimaryKey($input['bank_integration_id']);
$this->replace($input);

4
app/PaymentDrivers/Stripe/ImportCustomers.php
View File

@ -63,7 +63,11 @@ class ImportCustomers
$this->addCustomer($customer);
}
//handle
if(is_array($customers->data) && end($customers->data) && array_key_exists('id', end($customers->data)))
$starting_after = end($customers->data)['id'];
else
break;
} while ($customers->has_more);
}

2
app/PaymentDrivers/Stripe/Jobs/PaymentIntentWebhook.php
View File

@ -93,7 +93,7 @@ class PaymentIntentWebhook implements ShouldQueue
return;
if(optional($this->stripe_request['object']['charges']['data'][0])['id']){
if(isset($this->stripe_request['object']['charges']) && optional($this->stripe_request['object']['charges']['data'][0])['id']){
$company = Company::where('company_key', $this->company_key)->first();

4
routes/api.php
View File

@ -182,7 +182,7 @@ Route::group(['middleware' => ['throttle:300,1', 'api_db', 'token_auth', 'locale
Route::put('expenses/{expense}/upload', [ExpenseController::class, 'upload']);
Route::post('expenses/bulk', [ExpenseController::class, 'bulk'])->name('expenses.bulk');
Route::post('export', [ExportController::class, 'index'])->name('export.index');
Route::post('export', [ExportController::class, 'index'])->middleware('throttle:2,1')->name('export.index');
Route::resource('expense_categories', ExpenseCategoryController::class); // name = (expense_categories. index / create / show / update / destroy / edit
Route::post('expense_categories/bulk', [ExpenseCategoryController::class, 'bulk'])->name('expense_categories.bulk');
@ -192,7 +192,7 @@ Route::group(['middleware' => ['throttle:300,1', 'api_db', 'token_auth', 'locale
Route::put('group_settings/{group_setting}/upload', [GroupSettingController::class, 'upload'])->name('group_settings.upload');
Route::post('import', [ImportController::class, 'import'])->name('import.import');
Route::post('import_json', [ImportJsonController::class, 'import'])->name('import.import_json');
Route::post('import_json', [ImportJsonController::class, 'import'])->middleware('throttle:2,1')->name('import.import_json');
Route::post('preimport', [ImportController::class, 'preimport'])->name('import.preimport');
Route::resource('invoices', InvoiceController::class); // name = (invoices. index / create / show / update / destroy / edit