From 053b8a4319117a54612cc30c985d46241fdf9dee Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 19 May 2022 16:50:36 +1000 Subject: [PATCH] Fixes for trial layout --- .../ClientPortal/NinjaPlanController.php | 7 - public/images/checkmark-round.svg | 1 + public/images/checkmark.svg | 1 + public/images/test.svg | 11 + .../components/general/sidebar/main.blade.php | 2 +- .../portal/ninja2020/plan/trial.blade.php | 1555 ++++++++++++++--- 6 files changed, 1320 insertions(+), 257 deletions(-) create mode 100644 public/images/checkmark-round.svg create mode 100644 public/images/checkmark.svg create mode 100644 public/images/test.svg diff --git a/app/Http/Controllers/ClientPortal/NinjaPlanController.php b/app/Http/Controllers/ClientPortal/NinjaPlanController.php index 93b85bf68027..1c8abd67003a 100644 --- a/app/Http/Controllers/ClientPortal/NinjaPlanController.php +++ b/app/Http/Controllers/ClientPortal/NinjaPlanController.php @@ -59,13 +59,6 @@ class NinjaPlanController extends Controller Auth::guard('contact')->loginUsingId($client_contact->id,true); - // /* Current paid users get pushed straight to subscription overview page*/ - // if($account->isPaidHostedClient()) - // return redirect('/client/dashboard'); - - // /* Users that are not paid get pushed to a custom purchase page */ - // return $this->render('subscriptions.ninja_plan', ['settings' => $client_contact->company->settings]); - return $this->plan(); } diff --git a/public/images/checkmark-round.svg b/public/images/checkmark-round.svg new file mode 100644 index 000000000000..cdd8105662da --- /dev/null +++ b/public/images/checkmark-round.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/checkmark.svg b/public/images/checkmark.svg new file mode 100644 index 000000000000..d44ffbf0ad6e --- /dev/null +++ b/public/images/checkmark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/images/test.svg b/public/images/test.svg new file mode 100644 index 000000000000..82e4f790d8c1 --- /dev/null +++ b/public/images/test.svg @@ -0,0 +1,11 @@ + + Vector 1580-svg + + + + + + + \ No newline at end of file diff --git a/resources/views/portal/ninja2020/components/general/sidebar/main.blade.php b/resources/views/portal/ninja2020/components/general/sidebar/main.blade.php index 8044253e0108..b25bb252b53a 100644 --- a/resources/views/portal/ninja2020/components/general/sidebar/main.blade.php +++ b/resources/views/portal/ninja2020/components/general/sidebar/main.blade.php @@ -1,5 +1,5 @@
diff --git a/resources/views/portal/ninja2020/plan/trial.blade.php b/resources/views/portal/ninja2020/plan/trial.blade.php index 95c6ed3e9b24..cfdb3635245b 100644 --- a/resources/views/portal/ninja2020/plan/trial.blade.php +++ b/resources/views/portal/ninja2020/plan/trial.blade.php @@ -2,261 +2,1318 @@ @section('meta_title', ctrans('texts.account_management')) @section('body') + - - + + -
- -
-

Start your 14 day Pro Trial!

-

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
  • -
  • Interlink Multiple Companies (x10) with 1 Login
  • -
  • Customize Invoice Designs & Email Templates
  • -
  • Custom Settings for Different Client "Groups"
  • -
  • Client Subscriptions: Recurring & Auto-billing
  • -
  • Password Protected Client-Side Portal
  • -
  • API Integration with 3rd Party Apps
  • -
  • & Much More!
  • -
- -
- -
-
- -
- @csrf - - - -
- -
- -
- -
-
- -
- -
- -
-
- +
+
+
+

+ 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 + + +
+ + +
+
+ + +
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+ +
+
+ * 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

+

+ $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! +
+
+
+
-
- -
-
- -
-
-
- -
- -
- -
-
-
- -
- -
-
- * At the end of your 14 day trial your card will be charged $10/month. Cancel anytime. -
- - - -
- - -
-
- -
- Discounted Plans -
-
-
- - -
-
-
-

- Enterprise Plan (1-2 Users) Annual - Buy 10 months, get 2 free! $140 -

-
- -
-
-
-
- -
-
-
-

- Pro Plan Annual - Buy 10 months, get 2 free! $100 -

-
- -
-
-
-
@endsection