1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 00:41:34 +02:00

Fixes for trials in subscriptions

This commit is contained in:
David Bomba 2023-10-14 08:42:09 +11:00
parent 9db0159b06
commit 373690789e

View File

@ -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;
}