From af8becfc689361aa293cb4090dd47fa883bf3407 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 17 Sep 2022 11:49:53 +1000 Subject: [PATCH 01/13] Upgrades --- .../ClientPortal/NinjaPlanController.php | 2 +- .../portal/ninja2020/plan/trial.blade.php | 860 +++++++++++++----- 2 files changed, 624 insertions(+), 238 deletions(-) diff --git a/app/Http/Controllers/ClientPortal/NinjaPlanController.php b/app/Http/Controllers/ClientPortal/NinjaPlanController.php index f146037435..78fab8df7c 100644 --- a/app/Http/Controllers/ClientPortal/NinjaPlanController.php +++ b/app/Http/Controllers/ClientPortal/NinjaPlanController.php @@ -196,7 +196,7 @@ class NinjaPlanController extends Controller public function plan() { - // return $this->trial(); + return $this->trial(); //harvest the current plan $data = []; $data['late_invoice'] = false; diff --git a/resources/views/portal/ninja2020/plan/trial.blade.php b/resources/views/portal/ninja2020/plan/trial.blade.php index cfdb363524..75383b47ff 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! +

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

+

+ Pay annually for 10 months + 2 free! +

+

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

+

+ Pay annually for 10 months + 2 free! +

+

+ $14Per month +

+
+
+ + +
+
+ +
+
+
All Free Features +
+
    +
  • 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 +1712,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 +1737,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, + } }, } }) From e545f452a0e6e83070611aaf3bffef52fea744e7 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 17 Sep 2022 12:51:59 +1000 Subject: [PATCH 02/13] Working on upgrades --- public/images/checkmark-green.svg | 1 + .../portal/ninja2020/plan/trial.blade.php | 195 ++++++++++++++++-- 2 files changed, 180 insertions(+), 16 deletions(-) create mode 100644 public/images/checkmark-green.svg diff --git a/public/images/checkmark-green.svg b/public/images/checkmark-green.svg new file mode 100644 index 0000000000..bcb6300493 --- /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 75383b47ff..cef67f7ca4 100644 --- a/resources/views/portal/ninja2020/plan/trial.blade.php +++ b/resources/views/portal/ninja2020/plan/trial.blade.php @@ -1167,7 +1167,7 @@ Ensure the default browser behavior of the `hidden` attribute. top: 0px; width: 30px; height: 30px; - background: url('../src/images/checkmark-round.svg') center/contain no-repeat; + background: url('/images/checkmark-round.svg') center/contain no-repeat; } .list-checkmark { @@ -1187,11 +1187,11 @@ Ensure the default browser behavior of the `hidden` attribute. top: 4px; width: 16px; height: 16px; - background: url('../src/images/checkmark.svg') center/contain no-repeat; + background: url('/images/checkmark.svg') center/contain no-repeat; } .list-checkmark_green li::before { - background: url('../src/images/checkmark-green.svg') center/contain no-repeat; + background: url('/images/checkmark-green.svg') center/contain no-repeat; } /* Main Content */ @@ -1213,7 +1213,7 @@ Ensure the default browser behavior of the `hidden` attribute. bottom: 0; width: 60%; height: 100%; - background: url(../src/images/test.svg) right center/cover no-repeat; + background: url(/images/test.svg) right center/cover no-repeat; z-index: 1; } @@ -1585,7 +1585,7 @@ Ensure the default browser behavior of the `hidden` attribute.
-
+

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

@@ -1594,7 +1594,7 @@ Ensure the default browser behavior of the `hidden` attribute.