Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Subscriptions

Browse Source
This commit is contained in:
David Bomba 2021-03-29 21:43:42 +11:00
parent c2406563ef
commit f1ece9ab6b
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Requests/Subscription/StoreSubscriptionRequest.php
View File

@ -57,4 +57,17 @@ class StoreSubscriptionRequest extends Request
'name' => Rule::unique('subscriptions')->where('company_id', auth()->user()->company()->id)
];
}
protected function prepareForValidation()
{
$input = $this->all();
if(array_key_exists('webhook_configuration', $input) && (!is_object(json_decode($input['webhook_configuration']))))
$input['webhook_configuration'] = new \stdClass;
if(!array_key_exists('webhook_configuration', $input))
$input['webhook_configuration'] = new \stdClass;
$this->replace($input);
}
}

5
app/Services/Subscription/SubscriptionService.php
View File

@ -21,6 +21,7 @@ use App\Models\ClientSubscription;
use App\Models\Invoice;
use App\Models\PaymentHash;
use App\Models\Product;
use App\Models\RecurringInvoice;
use App\Models\Subscription;
use App\Models\SystemLog;
use App\Repositories\InvoiceRepository;
@ -80,7 +81,7 @@ class SubscriptionService
$recurring_invoice->client_id = $client_contact->client_id;
$recurring_invoice->line_items = $subscription_repo->generateLineItems($this->subscription, true);
$recurring_invoice->subscription_id = $this->subscription->id;
$recurring_invoice->frequency_id = $this->subscription->frequency_id;
$recurring_invoice->frequency_id = $this->subscription->frequency_id ?: RecurringInvoice::FREQUENCY_MONTHLY;
$recurring_invoice->date = now();
$recurring_invoice->next_send_date = now()->addSeconds($this->subscription->trial_duration);
$recurring_invoice->remaining_cycles = -1;
@ -102,7 +103,7 @@ class SubscriptionService
//execute any webhooks
$this->triggerWebhook();
if(strlen($this->subscription->webhook_configuration->post_purchase_url) >=1)
if(property_exists($this->subscription->webhook_configuration, 'post_purchase_url') && strlen($this->subscription->webhook_configuration->post_purchase_url) >=1)
return redirect($this->subscription->webhook_configuration->post_purchase_url);
return redirect('/client/recurring_invoices/'.$recurring_invoice->hashed_id);