Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-04 02:54:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Trial FLow

Browse Source
This commit is contained in:
David Bomba 2022-02-23 17:48:22 +11:00
parent bba3c79553
commit a8c775d818
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/ClientPortal/NinjaPlanController.php
View File

@ -116,8 +116,6 @@ class NinjaPlanController extends Controller
$gateway_driver->attach($stripe_response->payment_method, $customer); $gateway_driver->attach($stripe_response->payment_method, $customer);
$method = $gateway_driver->getStripePaymentMethod($stripe_response->payment_method); $method = $gateway_driver->getStripePaymentMethod($stripe_response->payment_method);
$this->storePaymentMethod($method, $request->payment_method_id, $customer);
$payment_meta = new \stdClass; $payment_meta = new \stdClass;
$payment_meta->exp_month = (string) $method->card->exp_month; $payment_meta->exp_month = (string) $method->card->exp_month;
$payment_meta->exp_year = (string) $method->card->exp_year; $payment_meta->exp_year = (string) $method->card->exp_year;
@ -142,7 +140,7 @@ class NinjaPlanController extends Controller
//create recurring invoice //create recurring invoice
$subscription_repo = new SubscriptionRepository(); $subscription_repo = new SubscriptionRepository();
$subscription = Subscription::find(6); $subscription = Subscription::find(6);
$recurring_invoice = RecurringInvoiceFactory::create($subscription->company_id, $subscription->user_id); $recurring_invoice = RecurringInvoiceFactory::create($subscription->company_id, $subscription->user_id);
$recurring_invoice->client_id = $client->id; $recurring_invoice->client_id = $client->id;
$recurring_invoice->line_items = $subscription_repo->generateLineItems($subscription, true, false); $recurring_invoice->line_items = $subscription_repo->generateLineItems($subscription, true, false);
@ -154,7 +152,6 @@ class NinjaPlanController extends Controller
$recurring_invoice->auto_bill_enabled = $this->setAutoBillFlag($recurring_invoice->auto_bill); $recurring_invoice->auto_bill_enabled = $this->setAutoBillFlag($recurring_invoice->auto_bill);
$recurring_invoice->due_date_days = 'terms'; $recurring_invoice->due_date_days = 'terms';
$recurring_invoice->next_send_date = now()->addDays(14)->format('Y-m-d'); $recurring_invoice->next_send_date = now()->addDays(14)->format('Y-m-d');
$recurring_invoice->next_send_date = $recurring_invoice->nextSendDate();
$recurring_invoice->save(); $recurring_invoice->save();
$recurring_invoice->service()->start(); $recurring_invoice->service()->start();
@ -176,8 +173,7 @@ class NinjaPlanController extends Controller
public function plan() public function plan()
{ {
return $this->trial();
//harvest the current plan //harvest the current plan
$data = []; $data = [];
$data['late_invoice'] = false; $data['late_invoice'] = false;
@ -188,6 +184,9 @@ class NinjaPlanController extends Controller
if($account) if($account)
{ {
//offer the option to have a free trial
if(!$account->trial_started)
return $this->trial();
if(Carbon::parse($account->plan_expires)->lt(now())){ if(Carbon::parse($account->plan_expires)->lt(now())){
//expired get the most recent invoice for payment //expired get the most recent invoice for payment

3
resources/views/portal/ninja2020/plan/trial.blade.php
View File

@ -168,8 +168,9 @@
<div class="form-group mb-2"> <div class="form-group mb-2">
<select name="country" id="country" class="form-select w-full py-2 text-gray-700"> <select name="country" id="country" class="form-select w-full py-2 text-gray-700">
<option value="{{ $client->country->id}}" selected>{{ $client->country->iso_3166_2 }} ({{ $client->country->name }})</option>
@foreach($countries as $country) @foreach($countries as $country)
<option value="{{ $client->country->id }}">{{ $client->country->iso_3166_2 }} ({{ $client->country->name }})</option> <option value="{{ $country->id }}">{{ $country->iso_3166_2 }} ({{ $country->name }})></option>
@endforeach @endforeach
</select> </select>
</div> </div>