From 364f7addb64f53666f26fa4fc820de44ea2e2db5 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 15 May 2021 14:00:29 +1000 Subject: [PATCH] Fixes for subdomain resolution for MultiDB --- app/Http/Middleware/SetDomainNameDb.php | 2 +- app/Transformers/SubscriptionTransformer.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Middleware/SetDomainNameDb.php b/app/Http/Middleware/SetDomainNameDb.php index edc91ff0f26e..74035b97a49b 100644 --- a/app/Http/Middleware/SetDomainNameDb.php +++ b/app/Http/Middleware/SetDomainNameDb.php @@ -41,7 +41,7 @@ class SetDomainNameDb if (strpos($request->getHost(), 'invoicing.co') !== false) { - $subdomain = array_first(explode('.', $request->getHost())); + $subdomain = explode('.', $request->getHost())[0]; $query = [ 'subdomain' => $subdomain, diff --git a/app/Transformers/SubscriptionTransformer.php b/app/Transformers/SubscriptionTransformer.php index 8ad12f5334d0..52bf5a5e7632 100644 --- a/app/Transformers/SubscriptionTransformer.php +++ b/app/Transformers/SubscriptionTransformer.php @@ -33,6 +33,7 @@ class SubscriptionTransformer extends EntityTransformer public function transform(Subscription $subscription): array { + $company = $subscription->company; return [ 'id' => $this->encodePrimaryKey($subscription->id), @@ -59,7 +60,8 @@ class SubscriptionTransformer extends EntityTransformer 'allow_plan_changes' => (bool)$subscription->allow_plan_changes, 'refund_period' => (int)$subscription->refund_period, 'webhook_configuration' => $subscription->webhook_configuration ?: [], - 'purchase_page' => (string)route('client.subscription.purchase', $subscription->hashed_id), + 'purchase_page' => (string)$company->domain() . "/client/subscription/{$subscription->hashed_id}/purchase", + //'purchase_page' => (string)route('client.subscription.purchase', $subscription->hashed_id), 'currency_id' => (string) $subscription->currency_id, 'is_deleted' => (bool)$subscription->is_deleted, 'created_at' => (int)$subscription->created_at,