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

Merge pull request #6123 from turbo124/v5-develop

Browse Source 
Fixes for client settings
This commit is contained in:
David Bomba 2021-06-24 21:26:35 +10:00 committed by GitHub
commit 79e56a4355
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/PaymentWebhookController.php
View File

@ -21,8 +21,6 @@ class PaymentWebhookController extends Controller
public function __invoke(PaymentWebhookRequest $request, string $company_key, string $company_gateway_id) public function __invoke(PaymentWebhookRequest $request, string $company_key, string $company_gateway_id)
{ {
// MultiDB::findAndSetDbByCompanyKey($company_key);
$payment = $request->getPayment(); $payment = $request->getPayment();
if(!$payment) if(!$payment)
@ -33,7 +31,6 @@ class PaymentWebhookController extends Controller
if(!$client) if(!$client)
return response()->json(['message' => 'Client record not found.'], 400); return response()->json(['message' => 'Client record not found.'], 400);
return $request->getCompanyGateway() return $request->getCompanyGateway()
->driver($client) ->driver($client)
->processWebhookRequest($request, $payment); ->processWebhookRequest($request, $payment);

2
app/Repositories/SubscriptionRepository.php
View File

@ -13,6 +13,7 @@
namespace App\Repositories; namespace App\Repositories;
use App\DataMapper\ClientSettings;
use App\DataMapper\InvoiceItem; use App\DataMapper\InvoiceItem;
use App\Factory\InvoiceFactory; use App\Factory\InvoiceFactory;
use App\Models\Client; use App\Models\Client;
@ -53,6 +54,7 @@ class SubscriptionRepository extends BaseRepository
'company_id' => $subscription->company_id, 'company_id' => $subscription->company_id,
'group_settings_id' => $subscription->group_id, 'group_settings_id' => $subscription->group_id,
'country_id' => $subscription->company->settings->country_id, 'country_id' => $subscription->company->settings->country_id,
'settings' => ClientSettings::defaults(),
]); ]);
$contact = ClientContact::factory()->create([ $contact = ClientContact::factory()->create([