From 428a1a221cf3a7798f408e527cf036e1cb4f5486 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 24 Jun 2021 20:12:05 +1000 Subject: [PATCH 1/2] Minor fixes --- app/Http/Controllers/PaymentWebhookController.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/Http/Controllers/PaymentWebhookController.php b/app/Http/Controllers/PaymentWebhookController.php index 2c83d1a5eb63..01b38c3abab3 100644 --- a/app/Http/Controllers/PaymentWebhookController.php +++ b/app/Http/Controllers/PaymentWebhookController.php @@ -21,8 +21,6 @@ class PaymentWebhookController extends Controller public function __invoke(PaymentWebhookRequest $request, string $company_key, string $company_gateway_id) { - // MultiDB::findAndSetDbByCompanyKey($company_key); - $payment = $request->getPayment(); if(!$payment) @@ -33,7 +31,6 @@ class PaymentWebhookController extends Controller if(!$client) return response()->json(['message' => 'Client record not found.'], 400); - return $request->getCompanyGateway() ->driver($client) ->processWebhookRequest($request, $payment); From 74aa6d46d595ad25183b557c10da77a4511d6782 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 24 Jun 2021 21:26:14 +1000 Subject: [PATCH 2/2] Fixes for client settings --- app/Repositories/SubscriptionRepository.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Repositories/SubscriptionRepository.php b/app/Repositories/SubscriptionRepository.php index ddbc550e0d2b..90ab10a12803 100644 --- a/app/Repositories/SubscriptionRepository.php +++ b/app/Repositories/SubscriptionRepository.php @@ -13,6 +13,7 @@ namespace App\Repositories; +use App\DataMapper\ClientSettings; use App\DataMapper\InvoiceItem; use App\Factory\InvoiceFactory; use App\Models\Client; @@ -53,6 +54,7 @@ class SubscriptionRepository extends BaseRepository 'company_id' => $subscription->company_id, 'group_settings_id' => $subscription->group_id, 'country_id' => $subscription->company->settings->country_id, + 'settings' => ClientSettings::defaults(), ]); $contact = ClientContact::factory()->create([