diff --git a/app/Http/Controllers/ClientPortal/NinjaPlanController.php b/app/Http/Controllers/ClientPortal/NinjaPlanController.php index f146037435c2..24ff46adb4d1 100644 --- a/app/Http/Controllers/ClientPortal/NinjaPlanController.php +++ b/app/Http/Controllers/ClientPortal/NinjaPlanController.php @@ -179,7 +179,7 @@ class NinjaPlanController extends Controller ->queue(); $ninja_company = Company::on('db-ninja-01')->find(config('ninja.ninja_default_company_id')); - $ninja_company->notification(new NewAccountNotification($account, $client))->ninja(); + $ninja_company->notification(new NewAccountNotification($subscription->company->account, $client))->ninja(); return $this->render('plan.trial_confirmed', $data); } diff --git a/public/images/checkmark-green.svg b/public/images/checkmark-green.svg new file mode 100644 index 000000000000..bcb6300493b7 --- /dev/null +++ b/public/images/checkmark-green.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/views/portal/ninja2020/plan/trial.blade.php b/resources/views/portal/ninja2020/plan/trial.blade.php index cfdb3635245b..c5e65ed3dfd1 100644 --- a/resources/views/portal/ninja2020/plan/trial.blade.php +++ b/resources/views/portal/ninja2020/plan/trial.blade.php @@ -5,15 +5,6 @@ -
-
-
-

- Enjoy 14 days of our Pro Plan -

-
    -
  • Unlimited Clients & Invoices & Quotes
  • -
  • Remove "Created by Invoice Ninja"
  • -
  • 10 Professional Invoice & Quote Templates
  • -
  • Send Invoice Emails Sent via Your Gmail
  • -
  • Attach Invoice PDF's to Client Emails
  • -
  • Customize Auto-Reminder Emails
  • -
  • Display Client E-Signatures on Invoices
  • -
  • Enable a Client "Approve Terms' Checkbox
  • -
-

- & Much More! -

-
-
-
-
-

- Start your 14 day Pro Trial! -

- -
- @csrf - - -
- - -
-
- - -
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- +
+
+

+ Free Trial +

+

+ 14 Day Pro Plan! +

+ + @csrf + + +
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ -
-
-
-
- @foreach($countries as $country) @endforeach
-
-
-
-
- -
-
- * At the end of your 14 day trial your card will be charged - $10/month. Cancel anytime. -
- -
+
+
+ +
+
+
+ * At the end of your 14 day trial your card will be charged $10/month. Cancel anytime. +
+
+ +
+ +
-
-
-

- Skip the 14-day trial and get a discounted annual upgrade! +
+
+

+ Pro Plan Includes +

+
    +
  • Unlimited Clients & Invoices & Quotes
  • +
  • Remove "Created by Invoice Ninja"
  • +
  • Send Invoice Emails via Gmail or MSN Accounts
  • +
  • 10 Professional Invoice & Quote Template Designs
  • +
  • Branded URL Option: "YourBrand".Invoicing.co"
  • +
  • Customize Invoice Designs & Email Templates
  • +
  • Create Client Subscriptions: Recurring & Auto-billing
  • +
  • API Integration with 3rd Party Apps & Platforms
  • +
  • Display Clients E-Signature on Invoices & Quotes
  • +
  • Setup Custom Payment Auto-Reminder Emails
  • +
+

+ & Much More! +

+
+
+

+
+

+ Skip the 14-day trial and go into a monthly or annual upgrade!

-
-
-
-
-

PRO Plan

-

- $100/year -

-

- Buy 10 months, get 2 free! -

-
-
-
Whats included
-
    -
  • Unlimited Clients & Invoicing
  • -
  • Remove "Created by Invoice Ninja"
  • -
  • API Integration with 3rd Party Apps
  • -
-

- & Much More! -

- Buy Now! -
-
-
-
-
-
-

Enterprise Plan

-

- $140/year -

-

- Buy 10 months, get 2 free! -

-
-
-
Whats included
-
    -
  • Additional Account Users
  • -
  • Fully Branded Client Portal
  • -
  • Attach 3rd Party Documents
  • -
-

- & Much More! -

- Buy Now! -
+
+
+ + +
-
+ + +
+
+
+
+

Ninja Pro

+

+ 30 day money back guarantee! +

+

+ $10Per month +

+ +
+
+
All Free Features +
+
    +
  • Unlimited Clients & Invoices
  • +
  • Remove "Created by Invoice Ninja"
  • +
  • Email Invoices via Gmail & MSN
  • +
  • Branded URL: 'YourSite".Invoicing.co'
  • +
  • 10 Professional Invoice Templates
  • +
  • Customize Invoice Designs
  • +
  • Recurring & Auto-Billing Invoices
  • +
  • API Integration with 3rd Party Apps
  • +
  • Password Protect Client-Side Portal
  • +
  • Set Up Auto-Reminder Emails
  • +
  • Auto-Attached Invoice PDF to Emails
  • +
  • Display Clients E-Signature on Invoices
  • +
  • Enable an 'Approve Terms' Checkbox
  • +
  • Reports: Invoices, Expenses, P&L, more
  • +
  • Bulk Email Invoices, Quotes, Credits
  • +
  • Interlink 10 Companies with 1 Login
  • +
  • Create Unique "Client Group" Settings
  • +
+
+
+
+
+
+
+

Enterprise Plan

+

+ 30 day money back guarantee! +

+

+ $14Per month +

+
+ @csrf +
+ + +
+
+ + +
+
+
All Free Features + Pro +
+
    +
  • Create Additional Account Users (up to 20!) & Set Access Permissions per User
  • +
  • Attach Files to Emails & Client-Portal (pdf, jpg, ppt, xls, doc & more)
  • +
  • Fully Branded Client Portal: "Billing.YourCompany.com"
  • +
+
+
+
+
+ + +
+
+
+
+

Ninja Pro

+

+ Pay annually for 10 months + 2 free! +

+

+ $100Per year +

+ +
+
+
All Free Features +
+
    +
  • Unlimited Clients & Invoices
  • +
  • Remove "Created by Invoice Ninja"
  • +
  • Email Invoices via Gmail & MSN
  • +
  • Branded URL: 'YourSite".Invoicing.co'
  • +
  • 10 Professional Invoice Templates
  • +
  • Customize Invoice Designs
  • +
  • Recurring & Auto-Billing Invoices
  • +
  • API Integration with 3rd Party Apps
  • +
  • Password Protect Client-Side Portal
  • +
  • Set Up Auto-Reminder Emails
  • +
  • Auto-Attached Invoice PDF to Emails
  • +
  • Display Clients E-Signature on Invoices
  • +
  • Enable an 'Approve Terms' Checkbox
  • +
  • Reports: Invoices, Expenses, P&L, more
  • +
  • Bulk Email Invoices, Quotes, Credits
  • +
  • Interlink 10 Companies with 1 Login
  • +
  • Create Unique "Client Group" Settings
  • +
+
+
+
+
+
+
+

Enterprise Plan

+

+ Pay annually for 10 months + 2 free! +

+

+ $140Per Year +

+
+
+ + +
+
+ +
+
+
All Free Features + Pro +
+
    +
  • Create Additional Account Users (up to 20!) & Set Access Permissions per User
  • +
  • Attach Files to Emails & Client-Portal (pdf, jpg, ppt, xls, doc & more)
  • +
  • Fully Branded Client Portal: "Billing.YourCompany.com"
  • +
+
+
+
+
+ +
-
+
@endsection @@ -1333,7 +1807,7 @@ var elements = stripe.elements({ var cardElement = elements.create('card', { value: { postalCode: document.querySelector('input[name=postal_code]').content, - name: document.querySelector('input[name=name]').content + name: document.querySelector('input[name=name]').content, } }); @@ -1358,6 +1832,13 @@ var country_value = e.options[e.selectedIndex].value; payment_method_data: { billing_details: { name: document.querySelector('input[name=name]').content, + address: { + line1: document.querySelector('input[name=address1]').content, + line2: document.querySelector('input[name=address2]').content, + city: document.querySelector('input[name=city]').content, + postal_code: document.querySelector('input[name=postal_code]').content, + state: document.querySelector('input[name=state]').content, + } }, } }) @@ -1382,11 +1863,78 @@ var country_value = e.options[e.selectedIndex].value; 'input[name="gateway_response"]' ).value = JSON.stringify(result.setupIntent); - document.getElementById('card-form').submit(); + form.submit(); }); }); + + + + + @endpush \ No newline at end of file diff --git a/resources/views/portal/ninja2020/plan/trial_confirmed.blade.php b/resources/views/portal/ninja2020/plan/trial_confirmed.blade.php index 7374865d6dc2..dd4f8dc94d21 100644 --- a/resources/views/portal/ninja2020/plan/trial_confirmed.blade.php +++ b/resources/views/portal/ninja2020/plan/trial_confirmed.blade.php @@ -4,17 +4,8 @@ @section('body') @push('head') - @endpush - -
-
-
-
- -
-
-

Create. Send. Get Paid.

-

- Your Pro Plan trial is
loaded and ready to go! -

- - Account Login - -
-
-
-
+
+
+
+
+ +
+
+

Create. Send. Get Paid.

+

+ Your Pro Plan trial is
loaded and ready to go! +

+ + Account Login + +
+
+
+
@endsection \ No newline at end of file