From 373690789e79a06e3a859a4c8ff86dd2c9e7cc5c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 14 Oct 2023 08:42:09 +1100 Subject: [PATCH] Fixes for trials in subscriptions --- app/Services/Subscription/SubscriptionService.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Services/Subscription/SubscriptionService.php b/app/Services/Subscription/SubscriptionService.php index 64b13fa38db3..3794273d82d4 100644 --- a/app/Services/Subscription/SubscriptionService.php +++ b/app/Services/Subscription/SubscriptionService.php @@ -234,6 +234,9 @@ class SubscriptionService // Redirects from here work just fine. Livewire will respect it. $client_contact = ClientContact::find($this->decodePrimaryKey($data['contact_id'])); + if(is_string($data['client_id'])) + $data['client_id'] = $this->decodePrimaryKey($data['client_id']); + if (!$this->subscription->trial_enabled) { return new \Exception("Trials are disabled for this product"); } @@ -256,7 +259,7 @@ class SubscriptionService if (array_key_exists('coupon', $data) && ($data['coupon'] == $this->subscription->promo_code) && $this->subscription->promo_discount > 0) { $recurring_invoice->discount = $this->subscription->promo_discount; $recurring_invoice->is_amount_discount = $this->subscription->is_amount_discount; - } elseif (strlen($this->subscription->promo_code) == 0 && $this->subscription->promo_discount > 0) { + } elseif (strlen($this->subscription->promo_code ?? '') == 0 && $this->subscription->promo_discount > 0) { $recurring_invoice->discount = $this->subscription->promo_discount; $recurring_invoice->is_amount_discount = $this->subscription->is_amount_discount; }