Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up for subscriptions

Browse Source
This commit is contained in:
David Bomba 2021-04-16 13:58:14 +10:00
parent c04afa5127
commit 464d810a70
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Jobs/Util/Import.php
View File

@ -674,6 +674,8 @@ class Import implements ShouldQueue
$resource['invitations'][$key]['user_id'] = $modified['user_id']; $resource['invitations'][$key]['user_id'] = $modified['user_id'];
$resource['invitations'][$key]['company_id'] = $this->company->id; $resource['invitations'][$key]['company_id'] = $this->company->id;
unset($resource['invitations'][$key]['recurring_invoice_id']); unset($resource['invitations'][$key]['recurring_invoice_id']);
unset($resource['invitations'][$key]['id']);
} }
$modified['invitations'] = $this->deDuplicateInvitations($resource['invitations']); $modified['invitations'] = $this->deDuplicateInvitations($resource['invitations']);
@ -736,6 +738,7 @@ class Import implements ShouldQueue
$resource['invitations'][$key]['user_id'] = $modified['user_id']; $resource['invitations'][$key]['user_id'] = $modified['user_id'];
$resource['invitations'][$key]['company_id'] = $this->company->id; $resource['invitations'][$key]['company_id'] = $this->company->id;
unset($resource['invitations'][$key]['invoice_id']); unset($resource['invitations'][$key]['invoice_id']);
unset($resource['invitations'][$key]['id']);
} }
$modified['invitations'] = $this->deDuplicateInvitations($resource['invitations']); $modified['invitations'] = $this->deDuplicateInvitations($resource['invitations']);
@ -864,6 +867,7 @@ class Import implements ShouldQueue
$resource['invitations'][$key]['user_id'] = $modified['user_id']; $resource['invitations'][$key]['user_id'] = $modified['user_id'];
$resource['invitations'][$key]['company_id'] = $this->company->id; $resource['invitations'][$key]['company_id'] = $this->company->id;
unset($resource['invitations'][$key]['invoice_id']); unset($resource['invitations'][$key]['invoice_id']);
unset($resource['invitations'][$key]['id']);
} }
$modified['invitations'] = $this->deDuplicateInvitations($resource['invitations']); $modified['invitations'] = $this->deDuplicateInvitations($resource['invitations']);

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

@ -66,7 +66,7 @@ class SubscriptionService
if($payment_hash->data->billing_context->context == 'change_plan') { if($payment_hash->data->billing_context->context == 'change_plan') {
return $this->handlePlanChange($payment_hash); return $this->handlePlanChange($payment_hash);
}; }
// if we have a recurring product - then generate a recurring invoice // if we have a recurring product - then generate a recurring invoice
if(strlen($this->subscription->recurring_product_ids) >=1){ if(strlen($this->subscription->recurring_product_ids) >=1){
@ -430,7 +430,7 @@ class SubscriptionService
*/ */
private function handlePlanChange($payment_hash) private function handlePlanChange($payment_hash)
{ {
$old_recurring_invoice = RecurringInvoice::find($payment_hash->data->billing_context->recurring_invoice); $old_recurring_invoice = RecurringInvoice::find($payment_hash->data->billing_context->recurring_invoice);
$recurring_invoice = $this->createNewRecurringInvoice($old_recurring_invoice); $recurring_invoice = $this->createNewRecurringInvoice($old_recurring_invoice);
@ -444,6 +444,7 @@ class SubscriptionService
'contact' => auth('contact')->user()->hashed_id, 'contact' => auth('contact')->user()->hashed_id,
]; ];
$response = $this->triggerWebhook($context); $response = $this->triggerWebhook($context);
nlog($response); nlog($response);
@ -465,7 +466,7 @@ class SubscriptionService
$old_recurring_invoice->service()->stop()->save(); $old_recurring_invoice->service()->stop()->save();
$recurring_invoice_repo = new RecurringInvoiceRepository(); $recurring_invoice_repo = new RecurringInvoiceRepository();
$recurring_invoice_repo->archive($$old_recurring_invoice); $recurring_invoice_repo->archive($old_recurring_invoice);
$recurring_invoice = $this->convertInvoiceToRecurring($old_recurring_invoice->client_id); $recurring_invoice = $this->convertInvoiceToRecurring($old_recurring_invoice->client_id);
$recurring_invoice = $recurring_invoice_repo->save([], $recurring_invoice); $recurring_invoice = $recurring_invoice_repo->save([], $recurring_invoice);

2
resources/views/portal/ninja2020/components/livewire/subscription-plan-switch.blade.php
View File

@ -2,7 +2,7 @@
<div class="col-span-12 md:col-span-5 md:col-start-4 px-4 py-5"> <div class="col-span-12 md:col-span-5 md:col-start-4 px-4 py-5">
<!-- Total price --> <!-- Total price -->
@if(isset($state['invoice'])) @if($amount > 0)
<div class="relative mt-8"> <div class="relative mt-8">
<div class="absolute inset-0 flex items-center"> <div class="absolute inset-0 flex items-center">