From d65b689ec60b6b9251ab0a5a49c033bdf493b22e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 12 Oct 2021 20:54:52 +1100 Subject: [PATCH] Minor fixes for subscriptions --- .../Subscription/SubscriptionService.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/app/Services/Subscription/SubscriptionService.php b/app/Services/Subscription/SubscriptionService.php index eff83c90f644..8771b9034c8c 100644 --- a/app/Services/Subscription/SubscriptionService.php +++ b/app/Services/Subscription/SubscriptionService.php @@ -693,6 +693,8 @@ class SubscriptionService public function convertInvoiceToRecurring($client_id) :RecurringInvoice { + $client = Client::find($client_id); + $subscription_repo = new SubscriptionRepository(); $recurring_invoice = RecurringInvoiceFactory::create($this->subscription->company_id, $this->subscription->user_id); @@ -702,10 +704,23 @@ class SubscriptionService $recurring_invoice->frequency_id = $this->subscription->frequency_id ?: RecurringInvoice::FREQUENCY_MONTHLY; $recurring_invoice->date = now(); $recurring_invoice->remaining_cycles = -1; - + $recurring_invoice->auto_bill = $client->getSetting('auto_bill'); + $recurring_invoice->auto_bill_enabled = $this->setAutoBillFlag($recurring_invoice->auto_bill); + $recurring_invoice->due_date_days = 'terms'; + return $recurring_invoice; } + private function setAutoBillFlag($auto_bill) + { + if ($auto_bill == 'always' || $auto_bill == 'optout') { + return true; + } + + return false; + + } + /** * Hit a 3rd party API if defined in the subscription *