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

Fixes for demo mode

Browse Source
This commit is contained in:
David Bomba 2022-11-29 20:09:54 +11:00
parent a1339675c7
commit 806689c63d
5 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Console/Commands/DemoMode.php
View File

@ -83,6 +83,12 @@ class DemoMode extends Command
$cached_tables = config('ninja.cached_tables'); $cached_tables = config('ninja.cached_tables');
$this->info('Migrating');
Artisan::call('migrate:fresh --force');
$this->info('Seeding');
Artisan::call('db:seed --force');
foreach ($cached_tables as $name => $class) { foreach ($cached_tables as $name => $class) {
if (! Cache::has($name)) { if (! Cache::has($name)) {
// check that the table exists in case the migration is pending // check that the table exists in case the migration is pending
@ -105,11 +111,7 @@ class DemoMode extends Command
} }
} }
$this->info('Migrating');
Artisan::call('migrate:fresh --force');
$this->info('Seeding');
Artisan::call('db:seed --force');
$this->info('Seeding Random Data'); $this->info('Seeding Random Data');
$this->createSmallAccount(); $this->createSmallAccount();

2
app/PaymentDrivers/Stripe/ACH.php
View File

@ -331,7 +331,7 @@ class ACH
$data = [ $data = [
'gateway_type_id' => $cgt->gateway_type_id, 'gateway_type_id' => $cgt->gateway_type_id,
'payment_type' => PaymentType::ACH, 'payment_type' => PaymentType::ACH,
'transaction_reference' => $response->charges->data[0]->id, 'transaction_reference' => isset($response->latest_charge) ? $response->latest_charge : $response->charges->data[0]->id,
'amount' => $amount, 'amount' => $amount,
]; ];

2
app/PaymentDrivers/Stripe/BrowserPay.php
View File

@ -135,7 +135,7 @@ class BrowserPay implements MethodInterface
'payment_method' => $gateway_response->payment_method, 'payment_method' => $gateway_response->payment_method,
'payment_type' => PaymentType::parseCardType(strtolower($payment_method->card->brand)), 'payment_type' => PaymentType::parseCardType(strtolower($payment_method->card->brand)),
'amount' => $this->stripe->convertFromStripeAmount($gateway_response->amount, $this->stripe->client->currency()->precision, $this->stripe->client->currency()), 'amount' => $this->stripe->convertFromStripeAmount($gateway_response->amount, $this->stripe->client->currency()->precision, $this->stripe->client->currency()),
'transaction_reference' => optional($payment_intent->charges->data[0])->id, 'transaction_reference' => isset($payment_intent->latest_charge) ? $payment_intent->latest_charge : $payment_intent->charges->data[0]->id,
'gateway_type_id' => GatewayType::APPLE_PAY, 'gateway_type_id' => GatewayType::APPLE_PAY,
]; ];

7
app/PaymentDrivers/Stripe/Charge.php
View File

@ -145,16 +145,15 @@ class Charge
$status = Payment::STATUS_COMPLETED; $status = Payment::STATUS_COMPLETED;
} }
if($response?->status == 'processing'){ if(!in_array($response?->status, ['succeeded', 'processing'])){
//allows us to jump over the next stage - used for SEPA
}elseif($response?->status != 'succeeded'){
$this->stripe->processInternallyFailedPayment($this->stripe, new \Exception('Auto billing failed.',400)); $this->stripe->processInternallyFailedPayment($this->stripe, new \Exception('Auto billing failed.',400));
} }
$data = [ $data = [
'gateway_type_id' => $cgt->gateway_type_id, 'gateway_type_id' => $cgt->gateway_type_id,
'payment_type' => $this->transformPaymentTypeToConstant($payment_method_type), 'payment_type' => $this->transformPaymentTypeToConstant($payment_method_type),
'transaction_reference' => $response->charges->data[0]->id, 'transaction_reference' => isset($response->latest_charge) ? $response->latest_charge : $response->charges->data[0]->id,
// 'transaction_reference' => $response->charges->data[0]->id,
'amount' => $amount, 'amount' => $amount,
]; ];

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

@ -267,6 +267,39 @@ class PaymentIntentWebhook implements ShouldQueue
} }
} }
// private function updateSepaPayment($payment_hash, $client, $meta)
// {
// $company_gateway = CompanyGateway::find($this->company_gateway_id);
// $payment_method_type = GatewayType::SEPA;
// $driver = $company_gateway->driver($client)->init()->setPaymentMethod($payment_method_type);
// $payment_hash->data = array_merge((array) $payment_hash->data, $this->stripe_request);
// $payment_hash->save();
// $driver->setPaymentHash($payment_hash);
// $data = [
// 'payment_method' => $payment_hash->data->object->payment_method,
// 'payment_type' => PaymentType::parseCardType(strtolower($meta['card_details'])) ?: PaymentType::CREDIT_CARD_OTHER,
// 'amount' => $payment_hash->data->amount_with_fee,
// 'transaction_reference' => $meta['transaction_reference'],
// 'gateway_type_id' => GatewayType::CREDIT_CARD,
// ];
// $payment = $driver->createPayment($data, Payment::STATUS_COMPLETED);
// SystemLogger::dispatch(
// ['response' => $this->stripe_request, 'data' => $data],
// SystemLog::CATEGORY_GATEWAY_RESPONSE,
// SystemLog::EVENT_GATEWAY_SUCCESS,
// SystemLog::TYPE_STRIPE,
// $client,
// $client->company,
// );
// }
private function updateCreditCardPayment($payment_hash, $client, $meta) private function updateCreditCardPayment($payment_hash, $client, $meta)
{ {