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

Make navigating subscriptions easier

Browse Source
This commit is contained in:
David Bomba 2021-06-27 19:20:56 +10:00
parent 1de22ed901
commit 021761d33d
4 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Jobs/Account/CreateAccount.php
View File

@ -77,6 +77,9 @@ class CreateAccount
$sp794f3f->save(); $sp794f3f->save();
if(Ninja::isHosted())
$sp794f3f->startTrial();
$sp035a66 = CreateCompany::dispatchNow($this->request, $sp794f3f); $sp035a66 = CreateCompany::dispatchNow($this->request, $sp794f3f);
$sp035a66->load('account'); $sp035a66->load('account');
$sp794f3f->default_company_id = $sp035a66->id; $sp794f3f->default_company_id = $sp035a66->id;

15
app/Models/Account.php
View File

@ -227,6 +227,21 @@ class Account extends BaseModel
return $plan_details && $plan_details['trial']; return $plan_details && $plan_details['trial'];
} }
public function startTrial($plan)
{
if (! Ninja::isNinja()) {
return;
}
if ($this->trial_started && $this->trial_started != '0000-00-00') {
return;
}
$this->trial_plan = $plan;
$this->trial_started = now();
$this->save();
}
public function getPlanDetails($include_inactive = false, $include_trial = true) public function getPlanDetails($include_inactive = false, $include_trial = true)
{ {
$plan = $this->plan; $plan = $this->plan;

1
app/Transformers/ActivityTransformer.php
View File

@ -36,6 +36,7 @@ class ActivityTransformer extends EntityTransformer
'id' => (string) $this->encodePrimaryKey($activity->id), 'id' => (string) $this->encodePrimaryKey($activity->id),
'activity_type_id' => (string) $activity->activity_type_id, 'activity_type_id' => (string) $activity->activity_type_id,
'client_id' => $activity->client_id ? (string) $this->encodePrimaryKey($activity->client_id) : '', 'client_id' => $activity->client_id ? (string) $this->encodePrimaryKey($activity->client_id) : '',
'recurring_invoice_id' => $activity->recurring_invoice_id ? (string) $this->encodePrimaryKey($activity->recurring_invoice_id) : '',
'company_id' => $activity->company_id ? (string) $this->encodePrimaryKey($activity->company_id) : '', 'company_id' => $activity->company_id ? (string) $this->encodePrimaryKey($activity->company_id) : '',
'user_id' => (string) $this->encodePrimaryKey($activity->user_id), 'user_id' => (string) $this->encodePrimaryKey($activity->user_id),
'invoice_id' => $activity->invoice_id ? (string) $this->encodePrimaryKey($activity->invoice_id) : '', 'invoice_id' => $activity->invoice_id ? (string) $this->encodePrimaryKey($activity->invoice_id) : '',

8
resources/views/portal/ninja2020/components/livewire/subscriptions-recurring-invoices-table.blade.php
View File

@ -40,6 +40,8 @@
{{ ctrans('texts.date') }} {{ ctrans('texts.date') }}
</p> </p>
</th> </th>
<th class="px-6 py-3 border-b border-gray-200 bg-primary text-left text-xs leading-4 font-medium text-white uppercase tracking-wider">
</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -63,6 +65,12 @@
<td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 text-gray-500"> <td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 text-gray-500">
{{ $recurring_invoice->formatDate($recurring_invoice->date, $recurring_invoice->client->date_format()) }} {{ $recurring_invoice->formatDate($recurring_invoice->date, $recurring_invoice->client->date_format()) }}
</td> </td>
<td class="px-6 py-4 whitespace-no-wrap text-sm leading-5 text-gray-500">
<a href="{{ route('client.recurring_invoice.show', $recurring_invoice->hashed_id) }}"
class="button-link text-primary">
{{ ctrans('texts.view') }}
</a>
</td>
</tr> </tr>
@empty @empty
<tr class="bg-white group hover:bg-gray-100"> <tr class="bg-white group hover:bg-gray-100">