From 1ebaea42d15cdfc8637be93c7e9889c2ce6d7009 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 8 Dec 2022 13:46:48 +1100
Subject: [PATCH 01/17] Fixes for translations

---
 lang/en/texts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/en/texts.php b/lang/en/texts.php
index 9fc9764b2a61..82480c63daf9 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -4778,7 +4778,7 @@ $LANG = array(
     'invoice_task_project' => 'Invoice Task Project',
     'invoice_task_project_help' => 'Add the project to the invoice line items',
     'bulk_action' => 'Bulk Action',
-    'phone_validation_error' => 'This mobile/cell phone number is not valid, please enter in E.164 format',
+    'phone_validation_error' => 'This mobile (cell) phone number is not valid, please enter in E.164 format',
     'transaction' => 'Transaction',
     'disable_2fa' => 'Disable 2FA',
     'change_number' => 'Change Number',

From 70db8052c0f94f3ed6330b48d45947f0f666fe62 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 8 Dec 2022 14:19:43 +1100
Subject: [PATCH 02/17] add checks prior to attempting to add in payment types

---
 app/Models/PaymentType.php                    |  1 +
 app/Utils/Traits/Pdf/PDF.php                  |  2 ++
 .../2022_05_12_56879_add_stripe_klarna.php    | 34 ++++++++++++++-----
 .../2022_07_12_45766_add_matomo.php           |  1 +
 lang/en/texts.php                             |  2 +-
 5 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/app/Models/PaymentType.php b/app/Models/PaymentType.php
index 21b165014c65..5459a83774a8 100644
--- a/app/Models/PaymentType.php
+++ b/app/Models/PaymentType.php
@@ -56,6 +56,7 @@ class PaymentType extends StaticModel
     const INSTANT_BANK_PAY = 45;
     const FPX = 46;
     const KLARNA = 47;
+    const Interac_E_Transfer = 48;
 
     public static function parseCardType($cardName)
     {
diff --git a/app/Utils/Traits/Pdf/PDF.php b/app/Utils/Traits/Pdf/PDF.php
index 21f41daf8273..f81407b9f9c0 100644
--- a/app/Utils/Traits/Pdf/PDF.php
+++ b/app/Utils/Traits/Pdf/PDF.php
@@ -21,9 +21,11 @@ class PDF extends FPDI
     {
         $this->SetXY(0, -5);
         $this->SetFont('Arial', 'I', 9);
+
         $this->SetTextColor(135, 135, 135);
 
         $trans = ctrans('texts.pdf_page_info', ['current' => $this->PageNo(), 'total' => '{nb}']);
+        $trans = iconv('UTF-8', 'ISO-8859-7', $trans);
         $this->Cell(0, 5, $trans, 0, 0, $this->text_alignment);
     }
 
diff --git a/database/migrations/2022_05_12_56879_add_stripe_klarna.php b/database/migrations/2022_05_12_56879_add_stripe_klarna.php
index 969553634d52..e85e0e733879 100644
--- a/database/migrations/2022_05_12_56879_add_stripe_klarna.php
+++ b/database/migrations/2022_05_12_56879_add_stripe_klarna.php
@@ -14,21 +14,37 @@ return new class extends Migration {
      */
     public function up()
     {
-        Schema::table('payment_types', function (Blueprint $table) {
-            $type = new PaymentType();
+        $pt = PaymentType::find(47);
 
+        if(!$pt)
+        {
+            $type = new PaymentType();
             $type->id = 47;
             $type->name = 'Klarna';
             $type->gateway_type_id = GatewayType::KLARNA;
-
             $type->save();
-        });
-        $type = new GatewayType();
+        }
 
-        $type->id = 23;
-        $type->alias = 'klarna';
-        $type->name = 'Klarna';
 
-        $type->save();
+        $pt = PaymentType::find(48);
+
+        if(!$pt)
+        {
+            $type = new PaymentType();
+            $type->id = 48;
+            $type->name = 'Interac E-Transfer';
+            $type->save();
+        }
+
+        $gt = GatewayType::find(23);
+
+        if(!$gt)
+        {
+            $type = new GatewayType();
+            $type->id = 23;
+            $type->alias = 'klarna';
+            $type->name = 'Klarna';
+            $type->save();
+        }
     }
 };
diff --git a/database/migrations/2022_07_12_45766_add_matomo.php b/database/migrations/2022_07_12_45766_add_matomo.php
index 5df323980c73..6eb354c2784a 100644
--- a/database/migrations/2022_07_12_45766_add_matomo.php
+++ b/database/migrations/2022_07_12_45766_add_matomo.php
@@ -17,5 +17,6 @@ return new class extends Migration
             $table->string('matomo_url',191)->nullable();
             $table->bigInteger('matomo_id')->nullable();
         });
+
     }
 };
\ No newline at end of file
diff --git a/lang/en/texts.php b/lang/en/texts.php
index 82480c63daf9..e15dd9f6cf23 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -4891,7 +4891,7 @@ $LANG = array(
     'restored_transaction_rule' => 'Successfully restored transaction rule',
     'search_transaction_rule' => 'Search Transaction Rule',
     'search_transaction_rules' => 'Search Transaction Rules',
-
+    'payment_type_Interac E-Transfer' => 'Interac E-Transfer',
 );
 
 return $LANG;

From ecb4ee7b8f2d4da4a7386320b87afae5f061d507 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 8 Dec 2022 14:35:10 +1100
Subject: [PATCH 03/17] Add transaction filters for payments and expenses

---
 app/Filters/ExpenseFilters.php | 14 ++++++++++++++
 app/Filters/PaymentFilters.php | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php
index d7e10ac0f4f1..657680140a69 100644
--- a/app/Filters/ExpenseFilters.php
+++ b/app/Filters/ExpenseFilters.php
@@ -92,6 +92,20 @@ class ExpenseFilters extends QueryFilters
         return $this->builder;
     }
 
+    /**
+     * Returns a list of expenses that can be matched to bank transactions
+     */
+    public function match_transactions($value = '')
+    {
+
+        if($value == 'true')
+        {
+            return $this->builder->where('is_deleted',0)->whereNull('transaction_id');
+        }
+
+        return $this->builder;
+    }
+
 
     /**
      * Filters the list based on the status
diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php
index 823cb9fcf741..e09c49e35557 100644
--- a/app/Filters/PaymentFilters.php
+++ b/app/Filters/PaymentFilters.php
@@ -81,6 +81,20 @@ class PaymentFilters extends QueryFilters
         });
     }
 
+    /**
+     * Returns a list of payments that can be matched to bank transactions
+     */
+    public function match_transactions($value = '')
+    {
+
+        if($value == 'true')
+        {
+            return $this->builder->where('is_deleted',0)->whereNull('transaction_id');
+        }
+
+        return $this->builder;
+    }
+
     /**
      * Sorts the list based on $sort.
      *

From 3cc7d344ca6de75f44ec1bc699a997591431281f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 8 Dec 2022 14:49:37 +1100
Subject: [PATCH 04/17] Update lang files

---
 lang/en/texts.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lang/en/texts.php b/lang/en/texts.php
index e15dd9f6cf23..297089b539a7 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -4892,6 +4892,9 @@ $LANG = array(
     'search_transaction_rule' => 'Search Transaction Rule',
     'search_transaction_rules' => 'Search Transaction Rules',
     'payment_type_Interac E-Transfer' => 'Interac E-Transfer',
+    'delete_bank_account' => 'Delete Bank Account',
+    'archive_transaction' => 'Archive Transaction',
+    'delete_transaction' => 'Delete Transaction',
 );
 
 return $LANG;

From a3b1ea41e33b002c7776ea2a4ec2d69e55e2eaaf Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 8 Dec 2022 17:37:43 +1100
Subject: [PATCH 05/17] Minor clean up of layout files

---
 resources/views/portal/ninja2020/layout/app.blade.php   | 2 --
 resources/views/portal/ninja2020/layout/clean.blade.php | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/resources/views/portal/ninja2020/layout/app.blade.php b/resources/views/portal/ninja2020/layout/app.blade.php
index 23e6f36be1b0..ae2a0c6b0a46 100644
--- a/resources/views/portal/ninja2020/layout/app.blade.php
+++ b/resources/views/portal/ninja2020/layout/app.blade.php
@@ -66,8 +66,6 @@
         <script src="{{ asset('vendor/alpinejs@2.8.2/alpine.js') }}" defer></script>
 
         <!-- Fonts -->
-        {{-- <link rel="dns-prefetch" href="https://fonts.gstatic.com"> --}}
-        {{-- <link href="https://fonts.googleapis.com/css?family=Open+Sans&display=swap" rel="stylesheet" type="text/css" defer> --}}
         <style>
             @font-face {
               font-family: 'Open Sans';
diff --git a/resources/views/portal/ninja2020/layout/clean.blade.php b/resources/views/portal/ninja2020/layout/clean.blade.php
index 06129549c545..70e5f98b6017 100644
--- a/resources/views/portal/ninja2020/layout/clean.blade.php
+++ b/resources/views/portal/ninja2020/layout/clean.blade.php
@@ -66,9 +66,6 @@
         <script src="{{ asset('vendor/alpinejs@2.8.2/alpine.js') }}" defer></script>
 
         <!-- Fonts -->
-        {{-- <link rel="dns-prefetch" href="https://fonts.gstatic.com">
-        <link href="https://fonts.googleapis.com/css?family=Open+Sans&display=swap" rel="stylesheet" type="text/css" defer>
- --}}
         <style>
             @font-face {
               font-family: 'Open Sans';

From 7c50231c26a05a88e8971f2ad3b0153fca8efd8e Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 8 Dec 2022 22:27:09 +1100
Subject: [PATCH 06/17] Use redirect away for mollie

---
 app/PaymentDrivers/Mollie/CreditCard.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/PaymentDrivers/Mollie/CreditCard.php b/app/PaymentDrivers/Mollie/CreditCard.php
index 8268f80f638d..0a6eb420a9e9 100644
--- a/app/PaymentDrivers/Mollie/CreditCard.php
+++ b/app/PaymentDrivers/Mollie/CreditCard.php
@@ -91,7 +91,7 @@ class CreditCard
                 if ($payment->status === 'open') {
                     $this->mollie->payment_hash->withData('payment_id', $payment->id);
 
-                    return redirect($payment->getCheckoutUrl());
+                    return redirect()->away($payment->getCheckoutUrl());
                 }
             } catch (\Exception $e) {
                 return $this->processUnsuccessfulPayment($e);
@@ -151,7 +151,7 @@ class CreditCard
             if ($payment->status === 'open') {
                 $this->mollie->payment_hash->withData('payment_id', $payment->id);
 
-                return redirect($payment->getCheckoutUrl());
+                return redirect()->away($payment->getCheckoutUrl());
             }
         } catch (\Exception $e) {
             $this->processUnsuccessfulPayment($e);

From a2e94bb27ef763743401a36ddfcf062b0e1af633 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 9 Dec 2022 08:31:22 +1100
Subject: [PATCH 07/17] Disable auto billing on recurring invoices and
 generated invoices if disabled in client portal

---
 app/Http/Livewire/RecurringInvoices/UpdateAutoBilling.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/Http/Livewire/RecurringInvoices/UpdateAutoBilling.php b/app/Http/Livewire/RecurringInvoices/UpdateAutoBilling.php
index 8170fbf12d66..548521dddfc6 100644
--- a/app/Http/Livewire/RecurringInvoices/UpdateAutoBilling.php
+++ b/app/Http/Livewire/RecurringInvoices/UpdateAutoBilling.php
@@ -12,6 +12,7 @@
 
 namespace App\Http\Livewire\RecurringInvoices;
 
+use App\Models\Invoice;
 use Livewire\Component;
 
 class UpdateAutoBilling extends Component
@@ -24,6 +25,12 @@ class UpdateAutoBilling extends Component
         if ($this->invoice->auto_bill == 'optin' || $this->invoice->auto_bill == 'optout') {
             $this->invoice->auto_bill_enabled = ! $this->invoice->auto_bill_enabled;
             $this->invoice->saveQuietly();
+
+            Invoice::where('recurring_id', $this->invoice->id)
+                        ->whereIn('status_id', [2,3])
+                        ->where('is_deleted',0)
+                        ->where('balance', '>', 0)
+                        ->update(['auto_bill_enabled' => $this->invoice->auto_bill_enabled]);
         }
     }
 

From 62950e7549bc3ef8bf1bf8ac36646660005ac554 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 9 Dec 2022 08:36:06 +1100
Subject: [PATCH 08/17] Fixes for type hints

---
 app/Helpers/Invoice/InvoiceSum.php          | 2 +-
 app/Helpers/Invoice/InvoiceSumInclusive.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Helpers/Invoice/InvoiceSum.php b/app/Helpers/Invoice/InvoiceSum.php
index b1c170a26736..5d981f597edf 100644
--- a/app/Helpers/Invoice/InvoiceSum.php
+++ b/app/Helpers/Invoice/InvoiceSum.php
@@ -49,7 +49,7 @@ class InvoiceSum
     /**
      * Constructs the object with Invoice and Settings object.
      *
-     * @param      Invoice  $invoice   The invoice
+     * @param      \App\Models\RecurringInvoice|\App\Models\Quote|\App\Models\Credit|\App\Models\PurchaseOrder|\App\Models\Invoice  $invoice   The entity
      */
     public function __construct($invoice)
     {
diff --git a/app/Helpers/Invoice/InvoiceSumInclusive.php b/app/Helpers/Invoice/InvoiceSumInclusive.php
index ad38f2754691..c540f825bc01 100644
--- a/app/Helpers/Invoice/InvoiceSumInclusive.php
+++ b/app/Helpers/Invoice/InvoiceSumInclusive.php
@@ -46,7 +46,7 @@ class InvoiceSumInclusive
     /**
      * Constructs the object with Invoice and Settings object.
      *
-     * @param      Invoice  $invoice   The invoice
+     * @param      \App\Models\RecurringInvoice|\App\Models\Quote|\App\Models\Credit|\App\Models\PurchaseOrder|\App\Models\Invoice  $invoice   The entity
      */
     public function __construct($invoice)
     {

From b2ff2a1c181657a52e1fdff10b27b786a56efb6d Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 9 Dec 2022 09:33:19 +1100
Subject: [PATCH 09/17] Catch mollie payments if redirect URL is null

---
 app/PaymentDrivers/Mollie/CreditCard.php      | 14 ++++++++--
 .../mollie/mollie_placeholder.blade.php       | 26 +++++++++++++++++++
 .../portal/ninja2020/layout/clean.blade.php   |  2 +-
 3 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 resources/views/portal/ninja2020/gateways/mollie/mollie_placeholder.blade.php

diff --git a/app/PaymentDrivers/Mollie/CreditCard.php b/app/PaymentDrivers/Mollie/CreditCard.php
index 0a6eb420a9e9..f8427a60e142 100644
--- a/app/PaymentDrivers/Mollie/CreditCard.php
+++ b/app/PaymentDrivers/Mollie/CreditCard.php
@@ -91,7 +91,11 @@ class CreditCard
                 if ($payment->status === 'open') {
                     $this->mollie->payment_hash->withData('payment_id', $payment->id);
 
-                    return redirect()->away($payment->getCheckoutUrl());
+                    if(!$payment->getCheckoutUrl())
+                        return render('gateways.mollie.mollie_placeholder');
+                    else
+                        return redirect()->away($payment->getCheckoutUrl());
+
                 }
             } catch (\Exception $e) {
                 return $this->processUnsuccessfulPayment($e);
@@ -151,7 +155,13 @@ class CreditCard
             if ($payment->status === 'open') {
                 $this->mollie->payment_hash->withData('payment_id', $payment->id);
 
-                return redirect()->away($payment->getCheckoutUrl());
+                nlog("Mollie");
+                nlog($payment);
+
+                if(!$payment->getCheckoutUrl())
+                    return render('gateways.mollie.mollie_placeholder');
+                else
+                    return redirect()->away($payment->getCheckoutUrl());
             }
         } catch (\Exception $e) {
             $this->processUnsuccessfulPayment($e);
diff --git a/resources/views/portal/ninja2020/gateways/mollie/mollie_placeholder.blade.php b/resources/views/portal/ninja2020/gateways/mollie/mollie_placeholder.blade.php
new file mode 100644
index 000000000000..ac142c4253dd
--- /dev/null
+++ b/resources/views/portal/ninja2020/gateways/mollie/mollie_placeholder.blade.php
@@ -0,0 +1,26 @@
+@extends('portal.ninja2020.layout.clean')
+@section('meta_title', 'Mollie')
+
+@section('body')
+    <div class="grid lg:grid-cols-3">
+        <div class="hidden lg:block col-span-1 bg-red-100 h-screen">
+            <img src="{{ asset('images/client-portal-new-image.jpg') }}"
+                 class="w-full h-screen object-cover"
+                 alt="Background image">
+        </div>
+
+        <div class="col-span-2 h-screen flex">
+            <div class="m-auto md:w-1/2 lg:w-1/4 flex flex-col items-center">
+                <span class="flex items-center text-2xl">
+                    {{ ctrans('texts.payment_error_code',['code' => 500]) }}
+                 </span>
+
+                <a class="button-link text-sm mt-2" href="{{ url(request()->getSchemeAndHttpHost() . '/client') }}">
+                    {{ ctrans('texts.back_to', ['url' => parse_url(request()->getHttpHost())['host'] ?? request()->getHttpHost()]) }}
+                </a>
+            </div>
+        </div>
+    </div>
+@endsection
+
+
diff --git a/resources/views/portal/ninja2020/layout/clean.blade.php b/resources/views/portal/ninja2020/layout/clean.blade.php
index 70e5f98b6017..0164b2de9525 100644
--- a/resources/views/portal/ninja2020/layout/clean.blade.php
+++ b/resources/views/portal/ninja2020/layout/clean.blade.php
@@ -3,7 +3,7 @@
 
     <head>
         <!-- Error: {{ session('error') }} -->
-         @if (isset($company) && $company->matomo_url && $company->matomo_id)
+        @if (isset($company) && $company->matomo_url && $company->matomo_id)
             <script>
                 var _paq = window._paq = window._paq || [];
                 /* tracker methods like "setCustomDimension" should be called before "trackPageView" */

From 4c6342916f3a154c4b83a71f6d8d7b687582a972 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 9 Dec 2022 09:42:40 +1100
Subject: [PATCH 10/17] Add proper description to mollie credit card
 transactions

---
 app/PaymentDrivers/Mollie/CreditCard.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/PaymentDrivers/Mollie/CreditCard.php b/app/PaymentDrivers/Mollie/CreditCard.php
index f8427a60e142..601aafe1f27e 100644
--- a/app/PaymentDrivers/Mollie/CreditCard.php
+++ b/app/PaymentDrivers/Mollie/CreditCard.php
@@ -52,6 +52,8 @@ class CreditCard
     {
         $amount = $this->mollie->convertToMollieAmount((float) $this->mollie->payment_hash->data->amount_with_fee);
 
+        $description = sprintf('%s: %s', ctrans('texts.invoices'), \implode(', ', collect($this->mollie->payment_hash->invoices())->pluck('invoice_number')->toArray()));
+
         $this->mollie->payment_hash
             ->withData('gateway_type_id', GatewayType::CREDIT_CARD)
             ->withData('client_id', $this->mollie->client->id);
@@ -68,7 +70,7 @@ class CreditCard
                     'mandateId' => $request->token,
                     'customerId' => $cgt->gateway_customer_reference,
                     'sequenceType' => 'recurring',
-                    'description' => \sprintf('Hash: %s', $this->mollie->payment_hash->hash),
+                    'description' => $description,
                     'webhookUrl'  => $this->mollie->company_gateway->webhookUrl(),
                     'idempotencyKey' => uniqid("st",true),
                     'metadata' => [
@@ -108,7 +110,7 @@ class CreditCard
                     'currency' => $this->mollie->client->currency()->code,
                     'value' => $amount,
                 ],
-                'description' => \sprintf('Hash: %s', $this->mollie->payment_hash->hash),
+                'description' => $description,
                 'redirectUrl' => route('mollie.3ds_redirect', [
                     'company_key' => $this->mollie->client->company->company_key,
                     'company_gateway_id' => $this->mollie->company_gateway->hashed_id,

From af465ac31ac3b3e36c2fd37062c3c8822a0be50d Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 9 Dec 2022 10:10:42 +1100
Subject: [PATCH 11/17] Minor fixes for stripe translations

---
 app/PaymentDrivers/Stripe/ACH.php          | 12 ++++++------
 app/PaymentDrivers/Stripe/Charge.php       |  4 ++--
 app/PaymentDrivers/Stripe/CreditCard.php   |  2 +-
 app/PaymentDrivers/Stripe/Klarna.php       |  4 ++--
 app/PaymentDrivers/StripePaymentDriver.php |  2 +-
 lang/en/texts.php                          |  4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/PaymentDrivers/Stripe/ACH.php b/app/PaymentDrivers/Stripe/ACH.php
index 5a5d893dfeb0..eccdc0b70494 100644
--- a/app/PaymentDrivers/Stripe/ACH.php
+++ b/app/PaymentDrivers/Stripe/ACH.php
@@ -173,9 +173,9 @@ class ACH
                           ->first();
 
         if ($invoice) {
-            $description = ctrans('texts.stripe_paymenttext', ['invoicenumber' => $invoice->number, 'amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
+            $description = ctrans('texts.stripe_payment_text', ['invoicenumber' => $invoice->number, 'amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
         } else {
-            $description = ctrans('texts.stripe_paymenttext_without_invoice', ['amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
+            $description = ctrans('texts.stripe_payment_text_without_invoice', ['amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
         }
 
 
@@ -211,9 +211,9 @@ class ACH
                           ->first();
 
         if ($invoice) {
-            $description = ctrans('texts.stripe_paymenttext', ['invoicenumber' => $invoice->number, 'amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
+            $description = ctrans('texts.stripe_payment_text', ['invoicenumber' => $invoice->number, 'amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
         } else {
-            $description = ctrans('texts.stripe_paymenttext_without_invoice', ['amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
+            $description = ctrans('texts.stripe_payment_text_without_invoice', ['amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
         }
 
         if (substr($cgt->token, 0, 2) === 'pm') {
@@ -455,9 +455,9 @@ class ACH
                           ->first();
 
         if ($invoice) {
-            $description = ctrans('texts.stripe_paymenttext', ['invoicenumber' => $invoice->number, 'amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
+            $description = ctrans('texts.stripe_payment_text', ['invoicenumber' => $invoice->number, 'amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
         } else {
-            $description = ctrans('texts.stripe_paymenttext_without_invoice', ['amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
+            $description = ctrans('texts.stripe_payment_text_without_invoice', ['amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
         }
 
         if (substr($source->token, 0, 2) === 'pm') {
diff --git a/app/PaymentDrivers/Stripe/Charge.php b/app/PaymentDrivers/Stripe/Charge.php
index b0e5f1a17ce9..f023580f661c 100644
--- a/app/PaymentDrivers/Stripe/Charge.php
+++ b/app/PaymentDrivers/Stripe/Charge.php
@@ -63,9 +63,9 @@ class Charge
         $invoice = Invoice::whereIn('id', $this->transformKeys(array_column($payment_hash->invoices(), 'invoice_id')))->withTrashed()->first();
 
         if ($invoice) {
-            $description = ctrans('texts.stripe_paymenttext', ['invoicenumber' => $invoice->number, 'amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
+            $description = ctrans('texts.stripe_payment_text', ['invoicenumber' => $invoice->number, 'amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
         } else {
-            $description = ctrans('texts.stripe_paymenttext_without_invoice', ['amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
+            $description = ctrans('texts.stripe_payment_text_without_invoice', ['amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
         }
 
         $this->stripe->init();
diff --git a/app/PaymentDrivers/Stripe/CreditCard.php b/app/PaymentDrivers/Stripe/CreditCard.php
index e9bba8bd26e9..fb2f4e6b901d 100644
--- a/app/PaymentDrivers/Stripe/CreditCard.php
+++ b/app/PaymentDrivers/Stripe/CreditCard.php
@@ -63,7 +63,7 @@ class CreditCard
 
         // $description = $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')) . " for client {$this->stripe->client->present()->name()}";
         $invoice_numbers = collect($data['invoices'])->pluck('invoice_number')->implode(',');
-        $description = ctrans('texts.stripe_paymenttext', ['invoicenumber' => $invoice_numbers, 'amount' => Number::formatMoney($data['total']['amount_with_fee'], $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
+        $description = ctrans('texts.stripe_payment_text', ['invoicenumber' => $invoice_numbers, 'amount' => Number::formatMoney($data['total']['amount_with_fee'], $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
 
         $payment_intent_data = [
             'amount' => $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency()),
diff --git a/app/PaymentDrivers/Stripe/Klarna.php b/app/PaymentDrivers/Stripe/Klarna.php
index 718d3f8cfa1a..eb30191b4a44 100644
--- a/app/PaymentDrivers/Stripe/Klarna.php
+++ b/app/PaymentDrivers/Stripe/Klarna.php
@@ -53,9 +53,9 @@ class Klarna
         $invoice_numbers = collect($data['invoices'])->pluck('invoice_number');
 
         if ($invoice_numbers->count() > 0) {
-            $description = ctrans('texts.stripe_paymenttext', ['invoicenumber' => $invoice_numbers->implode(', '), 'amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
+            $description = ctrans('texts.stripe_payment_text', ['invoicenumber' => $invoice_numbers->implode(', '), 'amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
         } else {
-            $description = ctrans('texts.stripe_paymenttext_without_invoice', ['amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
+            $description = ctrans('texts.stripe_payment_text_without_invoice', ['amount' => Number::formatMoney($amount, $this->stripe->client), 'client' => $this->stripe->client->present()->name()]);
         }
 
         $intent = \Stripe\PaymentIntent::create([
diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php
index e6fa402b3a00..b44e63ceb755 100644
--- a/app/PaymentDrivers/StripePaymentDriver.php
+++ b/app/PaymentDrivers/StripePaymentDriver.php
@@ -98,7 +98,7 @@ class StripePaymentDriver extends BaseDriver
         GatewayType::BECS => BECS::class,
         GatewayType::ACSS => ACSS::class,
         GatewayType::FPX => FPX::class,
-        GatewayType::KLARNA => KLARNA::class,
+        GatewayType::KLARNA => Klarna::class,
     ];
 
     const SYSTEM_LOG_TYPE = SystemLog::TYPE_STRIPE;
diff --git a/lang/en/texts.php b/lang/en/texts.php
index 297089b539a7..f210375b12ef 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -254,8 +254,8 @@ $LANG = array(
     'notification_invoice_paid' => 'A payment of :amount was made by client :client towards Invoice :invoice.',
     'notification_invoice_sent' => 'The following client :client was emailed Invoice :invoice for :amount.',
     'notification_invoice_viewed' => 'The following client :client viewed Invoice :invoice for :amount.',
-    'stripe_paymenttext' => 'Invoice :invoicenumber for :amount for client :client',
-    'stripe_paymenttext_without_invoice' => 'Payment with no invoice for amount :amount for client :client',
+    'stripe_payment_text' => 'Invoice :invoicenumber for :amount for client :client',
+    'stripe_payment_text_without_invoice' => 'Payment with no invoice for amount :amount for client :client',
     'reset_password' => 'You can reset your account password by clicking the following button:',
     'secure_payment' => 'Secure Payment',
     'card_number' => 'Card Number',

From 41dcb7cf4ab1cea818b391f39dc3121252b95f8c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 9 Dec 2022 12:35:37 +1100
Subject: [PATCH 12/17] Subscriptions v2

---
 app/Http/Livewire/BillingPortalPurchasev2.php |  2 +-
 app/Import/Providers/Csv.php                  |  2 +
 app/Services/Bank/BankMatchingService.php     |  2 +
 app/Services/Bank/ProcessBankRules.php        |  7 ++
 .../billing-portal-purchasev2.blade.php       | 64 ++++++++++---------
 5 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/app/Http/Livewire/BillingPortalPurchasev2.php b/app/Http/Livewire/BillingPortalPurchasev2.php
index dd8e89b7a447..1cfc3df365be 100644
--- a/app/Http/Livewire/BillingPortalPurchasev2.php
+++ b/app/Http/Livewire/BillingPortalPurchasev2.php
@@ -234,7 +234,7 @@ class BillingPortalPurchasev2 extends Component
                     'price' => Number::formatMoney($total, $this->subscription->company).' / '. RecurringInvoice::frequencyForKey($this->subscription->frequency_id),
                     'total' => $total,
                     'qty' => $qty,
-                    'is_recurring' => true
+                    'is_recurring' => true,
                 ]);
             }
 
diff --git a/app/Import/Providers/Csv.php b/app/Import/Providers/Csv.php
index ecc1f15dce7e..4da3dad96184 100644
--- a/app/Import/Providers/Csv.php
+++ b/app/Import/Providers/Csv.php
@@ -107,6 +107,8 @@ class Csv extends BaseImport implements ImportInterface
         $this->transformer = new BankTransformer($this->company);
         $bank_transaction_count = $this->ingest($data, $entity_type);
         $this->entity_count['bank_transactions'] = $bank_transaction_count;
+        
+        nlog("bank matching co id = {$this->company->id}");
 
         BankMatchingService::dispatchSync($this->company->id, $this->company->db);
 
diff --git a/app/Services/Bank/BankMatchingService.php b/app/Services/Bank/BankMatchingService.php
index 8afb84ff6737..00f1e1183c9f 100644
--- a/app/Services/Bank/BankMatchingService.php
+++ b/app/Services/Bank/BankMatchingService.php
@@ -37,6 +37,8 @@ class BankMatchingService implements ShouldQueue
 
     protected $db;
 
+    protected $middleware_key;
+    
     public function __construct($company_id, $db)
     {
         $this->company_id = $company_id;
diff --git a/app/Services/Bank/ProcessBankRules.php b/app/Services/Bank/ProcessBankRules.php
index 86743bcb366d..2a2c2bae63bb 100644
--- a/app/Services/Bank/ProcessBankRules.php
+++ b/app/Services/Bank/ProcessBankRules.php
@@ -46,6 +46,10 @@ class ProcessBankRules extends AbstractService
 
         $this->credit_rules = $this->bank_transaction->company->credit_rules();
 
+        if(!is_array($this->credit_rules))
+            return;
+
+
         $this->invoices = Invoice::where('company_id', $this->bank_transaction->company_id)
                                 ->whereIn('status_id', [1,2,3])
                                 ->where('is_deleted', 0)
@@ -81,6 +85,9 @@ class ProcessBankRules extends AbstractService
 
         $this->categories = collect(Cache::get('bank_categories'));
 
+        if(!is_array($this->debit_rules))
+            return;
+
         foreach($this->debit_rules as $bank_transaction_rule)
         {
             
diff --git a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
index 07d2096e3165..1eb309caae87 100644
--- a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
@@ -14,9 +14,9 @@
             @if(!empty($subscription->recurring_product_ids))
                 @foreach($recurring_products as $index => $product)
                     <li class="flex py-6">
-                      @if(false)
-                      <div class="h-24 w-24 flex-shrink-0 overflow-hidden rounded-md border border-gray-200">
-                        <img src="https://tailwindui.com/img/ecommerce-images/shopping-cart-page-04-product-01.jpg" alt="Salmon orange fabric pouch with match zipper, gray zipper pull, and adjustable hip belt." class="h-full w-full object-cover object-center">
+                      @if(filter_var($product->custom_value1, FILTER_VALIDATE_URL))
+                      <div class="h-24 w-24 flex-shrink-0 overflow-hidden rounded-md border border-gray-200 mr-2">
+                        <img src="{{$product->custom_value1}}" alt="" class="h-full w-full object-cover object-center">
                       </div>
                       @endif
                       <div class="ml-0 flex flex-1 flex-col">
@@ -52,9 +52,9 @@
             @if(!empty($subscription->product_ids))
                 @foreach($products as $product)
                     <li class="flex py-6">
-                      @if(false)
+                      @if(filter_var($product->custom_value1, FILTER_VALIDATE_URL))
                       <div class="h-24 w-24 flex-shrink-0 overflow-hidden rounded-md border border-gray-200">
-                        <img src="https://tailwindui.com/img/ecommerce-images/shopping-cart-page-04-product-01.jpg" alt="Salmon orange fabric pouch with match zipper, gray zipper pull, and adjustable hip belt." class="h-full w-full object-cover object-center">
+                        <img src="{{$product->custom_value1}}" alt="" class="h-full w-full object-cover object-center">
                       </div>
                       @endif
                       <div class="ml-0 flex flex-1 flex-col">
@@ -79,10 +79,11 @@
             </ul>
         </div>
 
+        @if(!empty($subscription->optional_recurring_product_ids) || !empty($subscription->optional_product_ids))
         <div class="w-full p-4 md:max-w-3xl">
             <h2 class="text-2xl font-normal text-left border-b-4">Optional products</h2>
         </div>
-
+        @endif
         <div class="w-full px-4 md:max-w-3xl">
 
             <!-- Optional Recurring Products-->
@@ -90,11 +91,11 @@
                 @if(!empty($subscription->optional_recurring_product_ids))
                     @foreach($optional_recurring_products as $index => $product)
                         <li class="flex py-6">
-                          @if(false)
-                          <div class="h-24 w-24 flex-shrink-0 overflow-hidden rounded-md border border-gray-200 mr-2">
-                            <img src="https://tailwindui.com/img/ecommerce-images/shopping-cart-page-04-product-01.jpg" alt="Salmon orange fabric pouch with match zipper, gray zipper pull, and adjustable hip belt." class="h-full w-full object-cover object-center">
-                          </div>
-                          @endif
+                      @if(filter_var($product->custom_value1, FILTER_VALIDATE_URL))
+                      <div class="h-24 w-24 flex-shrink-0 overflow-hidden rounded-md border border-gray-200">
+                        <img src="{{$product->custom_value1}}" alt="" class="h-full w-full object-cover object-center">
+                      </div>
+                      @endif
                           <div class="ml-0 flex flex-1 flex-col">
                             <div>
                               <div class="flex justify-between text-base font-medium text-gray-900">
@@ -104,19 +105,19 @@
                               <p class="mt-1 text-sm text-gray-500"></p>
                             </div>
                             <div class="flex content-end text-sm mt-1">
+                                @if(is_numeric($product->custom_value2))
                                 <p class="text-gray-500 w-full"></p>
                                 <div class="flex place-content-end">
                                     <p class="text-sm font-light text-gray-700 text-right mr-2 mt-2">{{ ctrans('texts.qty') }}</p>
-                                    <input wire:model.debounce.300ms="data.{{ $index }}.optional_recurring_qty" type="text" class="w-1/4 rounded-md border-gray-300 shadow-sm sm:text-sm text-center" placeholder="0"/>
+                                    <select wire:model.debounce.300ms="data.{{ $index }}.optional_recurring_qty" class="rounded-md border-gray-300 shadow-sm sm:text-sm">
+                                        <option value="0" selected="selected">0</option>
+                                        @for ($i = 1; $i < $product->custom_value2; $i++)
+                                        <option value="{{$i}}">{{$i}}</option>
+                                        @endfor
+                                    </select>
                                 </div>
+                                @endif
                             </div>
-                             
-                            @error("data.{$index}.optional_recurring_qty") 
-                            <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative" role="alert">
-                              <span class="block sm:inline">{{ $message }} </span>
-                              <span class="absolute top-0 bottom-0 right-0 px-4 py-3">
-                            </div>
-                            @enderror
                           </div>
                         </li>
                     @endforeach    
@@ -124,11 +125,11 @@
                 @if(!empty($subscription->optional_product_ids))
                     @foreach($optional_products as $index => $product)
                         <li class="flex py-6">
-                          @if(false)
-                          <div class="h-24 w-24 flex-shrink-0 overflow-hidden rounded-md border border-gray-200 mr-2">
-                            <img src="https://tailwindui.com/img/ecommerce-images/shopping-cart-page-04-product-01.jpg" alt="Salmon orange fabric pouch with match zipper, gray zipper pull, and adjustable hip belt." class="h-full w-full object-cover object-center">
-                          </div>
-                          @endif
+                      @if(filter_var($product->custom_value1, FILTER_VALIDATE_URL))
+                      <div class="h-24 w-24 flex-shrink-0 overflow-hidden rounded-md border border-gray-200">
+                        <img src="{{$product->custom_value1}}" alt="" class="h-full w-full object-cover object-center">
+                      </div>
+                      @endif
                           <div class="ml-0 flex flex-1 flex-col">
                             <div>
                               <div class="flex justify-between text-base font-medium text-gray-900">
@@ -138,18 +139,19 @@
                               <p class="mt-1 text-sm text-gray-500"></p>
                             </div>
                             <div class="flex content-end text-sm mt-1">
+                                @if(is_numeric($product->custom_value2))
                                 <p class="text-gray-500 w-full"></p>
                                 <div class="flex place-content-end">
                                     <p class="text-sm font-light text-gray-700 text-right mr-2 mt-2">{{ ctrans('texts.qty') }}</p>
-                                    <input type="text" wire:model.debounce.300ms="data.{{ $index }}.optional_qty" class="w-1/4 rounded-md border-gray-300 shadow-sm sm:text-sm text-center" placeholder="0">
+                                    <select wire:model.debounce.300ms="data.{{ $index }}.optional_qty" class="rounded-md border-gray-300 shadow-sm sm:text-sm">
+                                        <option value="0" selected="selected">0</option>
+                                        @for ($i = 1; $i < $product->custom_value2; $i++)
+                                        <option value="{{$i}}">{{$i}}</option>
+                                        @endfor
+                                    </select>
                                 </div>
+                                @endif
                             </div>
-                            @error("data.{$index}.optional_qty") 
-                            <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative" role="alert">
-                            <span class="block sm:inline">{{ $message }} </span>
-                              <span class="absolute top-0 bottom-0 right-0 px-4 py-3">
-                            </div>
-                            @enderror
                           </div>
                         </li>
                     @endforeach    

From d6f327c4ef46c61212ccb6eae882e2a702ed1680 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 9 Dec 2022 13:47:54 +1100
Subject: [PATCH 13/17] Fixes for bank rule tests

---
 app/Http/Livewire/BillingPortalPurchasev2.php | 49 ++---------
 app/Services/Bank/ProcessBankRules.php        | 14 ++--
 .../billing-portal-purchasev2.blade.php       | 83 ++++++++++++-------
 3 files changed, 69 insertions(+), 77 deletions(-)

diff --git a/app/Http/Livewire/BillingPortalPurchasev2.php b/app/Http/Livewire/BillingPortalPurchasev2.php
index 1cfc3df365be..f2d3ad226a56 100644
--- a/app/Http/Livewire/BillingPortalPurchasev2.php
+++ b/app/Http/Livewire/BillingPortalPurchasev2.php
@@ -188,12 +188,13 @@ class BillingPortalPurchasev2 extends Component
     public $optional_recurring_products;
     public $optional_products;
     public $total;
+    public $discount;
 
     public function mount()
     {
         MultiDB::setDb($this->company->db);
 
-        $this->quantity = 1;
+        $this->discount = 0;
 
         $this->data = [];
 
@@ -310,23 +311,19 @@ class BillingPortalPurchasev2 extends Component
 
     public function updatedData()
     {
+
     }
 
     public function updating($prop)
     {
-        // $this->resetValidation($prop);
-        // $this->resetErrorBag($prop);
+
     }
 
     public function updated($propertyName)
     {
-        $x = $this->validateOnly($propertyName, $this->rules(), [], $this->attributes());
 
-        // // $validatedData = $this->validate();
         $this->buildBundle();
 
-        // $order_validator = Validator::make($this->all(), $this->rules(), [], $this->attributes());
-
     }
 
     public function rules()
@@ -526,7 +523,7 @@ class BillingPortalPurchasev2 extends Component
             ]],
             'user_input_promo_code' => $this->coupon,
             'coupon' => empty($this->subscription->promo_code) ? '' : $this->coupon,
-            'quantity' => $this->quantity,
+            // 'quantity' => $this->quantity,
         ];
 
         $is_eligible = $this->subscription->service()->isEligible($this->contact);
@@ -569,7 +566,7 @@ class BillingPortalPurchasev2 extends Component
     {
         return $this->subscription->service()->startTrial([
             'email' => $this->email ?? $this->contact->email,
-            'quantity' => $this->quantity,
+            // 'quantity' => $this->quantity,
             'contact_id' => $this->contact->id,
             'client_id' => $this->contact->client->id,
         ]);
@@ -598,41 +595,11 @@ class BillingPortalPurchasev2 extends Component
         ]);
     }
 
-    /**
-     * Update quantity property.
-     *
-     * @param string $option
-     * @return int
-     */
-    public function updateQuantity(string $option): int
-    {
-        $this->handleCoupon();
-
-        if ($this->quantity == 1 && $option == 'decrement') {
-            $this->price = $this->price * 1;
-            return $this->quantity;
-        }
-
-        if ($this->quantity > $this->subscription->max_seats_limit && $option == 'increment') {
-            $this->price = $this->price * $this->subscription->max_seats_limit;
-            return $this->quantity;
-        }
-
-        if ($option == 'increment') {
-            $this->quantity++;
-            $this->price = $this->price * $this->quantity;
-            return $this->quantity;
-        }
-
-            $this->quantity--;
-            $this->price = $this->price * $this->quantity;
-
-            return $this->quantity;
-    }
-
     public function handleCoupon()
     {
 
+        nlog("coupy coup");
+
         if($this->steps['discount_applied']){
             $this->price = $this->subscription->promo_price;
             return;
diff --git a/app/Services/Bank/ProcessBankRules.php b/app/Services/Bank/ProcessBankRules.php
index 2a2c2bae63bb..99ef98064a02 100644
--- a/app/Services/Bank/ProcessBankRules.php
+++ b/app/Services/Bank/ProcessBankRules.php
@@ -44,12 +44,6 @@ class ProcessBankRules extends AbstractService
     private function matchCredit()
     {
 
-        $this->credit_rules = $this->bank_transaction->company->credit_rules();
-
-        if(!is_array($this->credit_rules))
-            return;
-
-
         $this->invoices = Invoice::where('company_id', $this->bank_transaction->company_id)
                                 ->whereIn('status_id', [1,2,3])
                                 ->where('is_deleted', 0)
@@ -69,6 +63,8 @@ class ProcessBankRules extends AbstractService
             return;
         }
 
+        $this->credit_rules = $this->bank_transaction->company->credit_rules();
+
         //stub for credit rules
         foreach($this->credit_rules as $rule)
         {
@@ -85,14 +81,16 @@ class ProcessBankRules extends AbstractService
 
         $this->categories = collect(Cache::get('bank_categories'));
 
-        if(!is_array($this->debit_rules))
-            return;
+
 
         foreach($this->debit_rules as $bank_transaction_rule)
         {
             
             $matches = 0;
 
+            if(!is_array($bank_transaction_rule['rules']))
+                continue;
+
             foreach($bank_transaction_rule['rules'] as $rule)
             {
                 $rule_count = count($bank_transaction_rule['rules']);
diff --git a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
index 1eb309caae87..98d41f7e2929 100644
--- a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
@@ -34,8 +34,15 @@
                             <p class="text-gray-500 w-full"></p>
                             <div class="flex place-content-end">
                                 <p class="text-sm font-light text-gray-700 text-right mr-2 mt-2">{{ ctrans('texts.qty') }}</p>
-                                <input wire:model.debounce.300ms="data.{{ $index }}.recurring_qty" type="text" class="w-1/4 rounded-md border-gray-300 shadow-sm sm:text-sm text-center" placeholder="0"/>
+
+                                    <select wire:model.debounce.300ms="data.{{ $index }}.recurring_qty" class="rounded-md border-gray-300 shadow-sm sm:text-sm">
+                                        <option value="1" selected="selected">1</option>
+                                        @for ($i = 2; $i <= $subscription->max_seats_limit; $i++)
+                                        <option value="{{$i}}">{{$i}}</option>
+                                        @endfor
+                                    </select>
                             </div>
+
                             @endif
                         </div>
                         @error("data.{$index}.recurring_qty") 
@@ -102,16 +109,24 @@
                                 <h3>{!! nl2br($product->notes) !!}</h3>
                                 <p class="ml-0">{{ \App\Utils\Number::formatMoney($product->price, $subscription->company) }} </p>
                               </div>
-                              <p class="mt-1 text-sm text-gray-500"></p>
+                              
                             </div>
-                            <div class="flex content-end text-sm mt-1">
+                            <div class="flex justify-between text-sm mt-1">
                                 @if(is_numeric($product->custom_value2))
-                                <p class="text-gray-500 w-full"></p>
+                                <p class="text-gray-500 w-3/4"></p>
                                 <div class="flex place-content-end">
+                                    @if($subscription->use_inventory_management && $product->in_stock_quantity == 0)
+                                    <p class="w-full text-sm font-light text-red-500 text-right mr-2 mt-2">Out of stock</p>
+                                    @else
                                     <p class="text-sm font-light text-gray-700 text-right mr-2 mt-2">{{ ctrans('texts.qty') }}</p>
-                                    <select wire:model.debounce.300ms="data.{{ $index }}.optional_recurring_qty" class="rounded-md border-gray-300 shadow-sm sm:text-sm">
+                                    @endif
+                                    <select wire:model.debounce.300ms="data.{{ $index }}.optional_recurring_qty" class="rounded-md border-gray-300 shadow-sm sm:text-sm" 
+                                        @if($subscription->use_inventory_management && $product->in_stock_quantity == 0)
+                                        disabled 
+                                        @endif
+                                        >
                                         <option value="0" selected="selected">0</option>
-                                        @for ($i = 1; $i < $product->custom_value2; $i++)
+                                        @for ($i = 1; $i <= ($subscription->use_inventory_management ? min($product->in_stock_quantity,$product->custom_value2) : $product->custom_value2); $i++)
                                         <option value="{{$i}}">{{$i}}</option>
                                         @endfor
                                     </select>
@@ -138,18 +153,23 @@
                               </div>
                               <p class="mt-1 text-sm text-gray-500"></p>
                             </div>
-                            <div class="flex content-end text-sm mt-1">
+                            <div class="flex justify-between text-sm mt-1">
                                 @if(is_numeric($product->custom_value2))
-                                <p class="text-gray-500 w-full"></p>
+                                <p class="text-gray-500 w-3/4"></p>
                                 <div class="flex place-content-end">
+                                    @if($subscription->use_inventory_management && $product->in_stock_quantity == 0)
+                                    <p class="w-full text-sm font-light text-red-500 text-right mr-2 mt-2">Out of stock</p>
+                                    @else
                                     <p class="text-sm font-light text-gray-700 text-right mr-2 mt-2">{{ ctrans('texts.qty') }}</p>
+                                    @endif
                                     <select wire:model.debounce.300ms="data.{{ $index }}.optional_qty" class="rounded-md border-gray-300 shadow-sm sm:text-sm">
                                         <option value="0" selected="selected">0</option>
-                                        @for ($i = 1; $i < $product->custom_value2; $i++)
+                                        @for ($i = 1; $i <= ($subscription->use_inventory_management ? min($product->in_stock_quantity,$product->custom_value2) : $product->custom_value2); $i++)
                                         <option value="{{$i}}">{{$i}}</option>
                                         @endfor
                                     </select>
                                 </div>
+
                                 @endif
                             </div>
                           </div>
@@ -175,30 +195,37 @@
                 @endforeach
 
                 @if(!empty($subscription->promo_code) && !$subscription->trial_enabled)
-                <form wire:submit.prevent="handleCoupon" class="">
-                @csrf
-                    <div class="mt-2">
-                      <label for="email" class="block text-sm font-medium text-white">{{ ctrans('texts.promo_code') }}</label>
-                      <div class="mt-1 flex rounded-md shadow-sm">
-                        <div class="relative flex flex-grow items-stretch focus-within:z-10">
-                          <div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
+                    <form wire:submit.prevent="handleCoupon" class="">
+                    @csrf
+                        <div class="mt-2">
+                          <label for="coupon" class="block text-sm font-medium text-white">{{ ctrans('texts.promo_code') }}</label>
+                          <div class="mt-1 flex rounded-md shadow-sm">
+                            <div class="relative flex flex-grow items-stretch focus-within:z-10">
+                              <div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
+                              </div>
+                              <input type="text" wire:model.debounce.300ms="coupon" class="block w-full rounded-none rounded-l-md border-gray-300 pl-2 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm text-gray-700" placeholder="">
+                            </div>
+                            <button class="relative -ml-px inline-flex items-center space-x-2 rounded-r-md border border-gray-300 bg-gray-50 px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-100 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500">
+                              
+                              <span>{{ ctrans('texts.apply') }}</span>
+                            </button>
                           </div>
-                          <input type="text" wire:model.debounce.300ms="coupon" class="block w-full rounded-none rounded-l-md border-gray-300 pl-10 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm" placeholder="">
                         </div>
-                        <button type="button" class="relative -ml-px inline-flex items-center space-x-2 rounded-r-md border border-gray-300 bg-gray-50 px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-100 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500">
-                          
-                          <span>{{ ctrans('texts.apply') }}</span>
-                        </button>
-                      </div>
-                    </div>
-                </form>
+                    </form>
                 @endif
 
                 <div class="border-t-2 border-gray-200 border-opacity-50 mt-8">
-                  <div class="flex font-semibold justify-between py-6 text-sm uppercase">
-                    <span>{{ ctrans('texts.total') }}</span>
-                    <span>{{ $total }}</span>
-                  </div>
+                  
+                    @if($discount)
+                    <div class="flex font-semibold justify-between py-6 text-sm uppercase">
+                        <span>{{ ctrans('texts.discount') }}</span>
+                        <span>{{ $discount }}</span>
+                    </div>
+                    @endif
+                    <div class="flex font-semibold justify-between py-6 text-sm uppercase">
+                        <span>{{ ctrans('texts.total') }}</span>
+                        <span>{{ $total }}</span>
+                    </div>
                   <button class="bg-white font-semibold hover:bg-gray-600 py-3 text-sm text-blue-500 uppercase w-full">Checkout</button>
                 </div>
             </div>

From 8f4350bcb9e779b8724518b4256cbad0879a3adb Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 9 Dec 2022 14:36:39 +1100
Subject: [PATCH 14/17] Subscriptions v2

---
 app/Http/Livewire/BillingPortalPurchasev2.php | 82 +++++++++++--------
 .../billing-portal-purchasev2.blade.php       | 15 ++--
 2 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/app/Http/Livewire/BillingPortalPurchasev2.php b/app/Http/Livewire/BillingPortalPurchasev2.php
index f2d3ad226a56..b5ec79933125 100644
--- a/app/Http/Livewire/BillingPortalPurchasev2.php
+++ b/app/Http/Livewire/BillingPortalPurchasev2.php
@@ -97,7 +97,6 @@ class BillingPortalPurchasev2 extends Component
      */
     public $payment_method_id;
 
-    private $user_coupon;
 
     /**
      * List of steps that frontend form follows.
@@ -189,12 +188,14 @@ class BillingPortalPurchasev2 extends Component
     public $optional_products;
     public $total;
     public $discount;
+    public $sub_total;
 
     public function mount()
     {
         MultiDB::setDb($this->company->db);
 
         $this->discount = 0;
+        $this->sub_total = 0;
 
         $this->data = [];
 
@@ -213,17 +214,34 @@ class BillingPortalPurchasev2 extends Component
         $this->optional_recurring_products = $this->subscription->service()->optional_recurring_products();
         $this->optional_products = $this->subscription->service()->optional_products();
 
-        // $this->buildBundle();
         $this->bundle = collect();
         
     }
 
+    /**
+     * Handle a coupon being entered into the checkout
+     */
+
+    public function handleCoupon()
+    {
+
+        if($this->coupon == $this->subscription->promo_code) 
+            $this->buildBundle();
+        else
+            $this->discount = 0;
+
+    }
+
+    /**
+     * Build the bundle in the checkout
+     */
     public function buildBundle()
     {
             $this->bundle = collect();
 
             $data = $this->data;
 
+            /* Recurring products can have a variable quantity */
             foreach($this->recurring_products as $key => $p)
             {
 
@@ -239,6 +257,7 @@ class BillingPortalPurchasev2 extends Component
                 ]);
             }
 
+            /* One time products can only have a single quantity */
             foreach($this->products as $key => $p)
             {
 
@@ -252,10 +271,13 @@ class BillingPortalPurchasev2 extends Component
                     'qty' => $qty,
                     'is_recurring' => false
                 ]);
+
             }
 
             foreach($this->data as $key => $value)
             {
+
+                /* Optional recurring products can have a variable quantity */
                 if(isset($this->data[$key]['optional_recurring_qty']))
                 {
                     $p = $this->optional_recurring_products->first(function ($v,$k) use($key){
@@ -279,6 +301,7 @@ class BillingPortalPurchasev2 extends Component
 
                 }
 
+                /* Optional products can have a variable quantity */
                 if(isset($this->data[$key]['optional_qty']))
                 {
                     $p = $this->optional_products->first(function ($v,$k) use($key){
@@ -301,10 +324,25 @@ class BillingPortalPurchasev2 extends Component
 
                 }
 
-
             }
 
-        $this->total = Number::formatMoney($this->bundle->sum('total'), $this->subscription->company);
+        $this->sub_total = Number::formatMoney($this->bundle->sum('total'), $this->subscription->company);
+        $this->total = $this->sub_total;
+
+        if($this->coupon == $this->subscription->promo_code) 
+        {
+
+            if($this->subscription->is_amount_discount)
+                $discount = $this->subscription->promo_discount;
+            else
+                $discount = round($this->bundle->sum('total') * ($this->subscription->promo_discount / 100), 2);
+
+            $this->discount = Number::formatMoney($discount, $this->subscription->company);
+
+            $this->total = Number::formatMoney(($this->bundle->sum('total') - $discount), $this->subscription->company);
+
+        }
+
 
         return $this;
     }
@@ -329,9 +367,6 @@ class BillingPortalPurchasev2 extends Component
     public function rules()
     {
         $rules = [
-            'data.*.recurring_qty' => 'numeric|between:0,1000',
-            'data.*.optional_recurring_qty' => 'numeric|between:0,1000',
-            'data.*.optional_qty' => 'numeric|between:0,1000',
         ];
 
         return $rules;
@@ -340,9 +375,6 @@ class BillingPortalPurchasev2 extends Component
     public function attributes()
     {
         $attributes = [
-            'data.*.recurring_qty' => 'recurring_qty',
-            'data.*.optional_recurring_qty' => 'optional_recurring_qty',
-            'data.*.optional_qty' => 'optional_qty',
         ];
 
         return $attributes;
@@ -566,7 +598,7 @@ class BillingPortalPurchasev2 extends Component
     {
         return $this->subscription->service()->startTrial([
             'email' => $this->email ?? $this->contact->email,
-            // 'quantity' => $this->quantity,
+            'quantity' => $this->quantity,
             'contact_id' => $this->contact->id,
             'client_id' => $this->contact->client->id,
         ]);
@@ -585,7 +617,6 @@ class BillingPortalPurchasev2 extends Component
             return;
         }
 
-
         return $this->subscription->service()->handleNoPaymentRequired([
             'email' => $this->email ?? $this->contact->email,
             'quantity' => $this->quantity,
@@ -595,25 +626,6 @@ class BillingPortalPurchasev2 extends Component
         ]);
     }
 
-    public function handleCoupon()
-    {
-
-        nlog("coupy coup");
-
-        if($this->steps['discount_applied']){
-            $this->price = $this->subscription->promo_price;
-            return;
-        }
-
-        if ($this->coupon == $this->subscription->promo_code) {
-            $this->price = $this->subscription->promo_price;
-            $this->quantity = 1;
-            $this->steps['discount_applied'] = true;
-        }
-        else
-            $this->price = $this->subscription->price;
-    }
-
     public function passwordlessLogin()
     {
         $this->passwordless_login_btn = true;
@@ -648,10 +660,10 @@ class BillingPortalPurchasev2 extends Component
         return render('components.livewire.billing-portal-purchasev2');
     }
 
-    public function changeData()
-    {
+    // public function changeData()
+    // {
 
-        nlog($this->data);
+    //     nlog($this->data);
 
-    }
+    // }
 }
diff --git a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
index 98d41f7e2929..79aa9982ebcd 100644
--- a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
@@ -197,13 +197,13 @@
                 @if(!empty($subscription->promo_code) && !$subscription->trial_enabled)
                     <form wire:submit.prevent="handleCoupon" class="">
                     @csrf
-                        <div class="mt-2">
+                        <div class="mt-4">
                           <label for="coupon" class="block text-sm font-medium text-white">{{ ctrans('texts.promo_code') }}</label>
                           <div class="mt-1 flex rounded-md shadow-sm">
                             <div class="relative flex flex-grow items-stretch focus-within:z-10">
                               <div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
                               </div>
-                              <input type="text" wire:model.debounce.300ms="coupon" class="block w-full rounded-none rounded-l-md border-gray-300 pl-2 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm text-gray-700" placeholder="">
+                              <input type="text" wire:model.defer="coupon" class="block w-full rounded-none rounded-l-md border-gray-300 pl-2 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm text-gray-700" placeholder="">
                             </div>
                             <button class="relative -ml-px inline-flex items-center space-x-2 rounded-r-md border border-gray-300 bg-gray-50 px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-100 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500">
                               
@@ -214,15 +214,18 @@
                     </form>
                 @endif
 
-                <div class="border-t-2 border-gray-200 border-opacity-50 mt-8">
-                  
+                <div class="border-t-2 border-gray-200 border-opacity-50 mt-4">
                     @if($discount)
-                    <div class="flex font-semibold justify-between py-6 text-sm uppercase">
+                    <div class="flex font-semibold justify-between py-1 text-sm uppercase">
+                        <span>{{ ctrans('texts.subtotal') }}</span>
+                        <span>{{ $sub_total }}</span>
+                    </div>
+                    <div class="flex font-semibold justify-between py-1 text-sm uppercase">
                         <span>{{ ctrans('texts.discount') }}</span>
                         <span>{{ $discount }}</span>
                     </div>
                     @endif
-                    <div class="flex font-semibold justify-between py-6 text-sm uppercase">
+                    <div class="flex font-semibold justify-between py-1 text-sm uppercase border-t-2">
                         <span>{{ ctrans('texts.total') }}</span>
                         <span>{{ $total }}</span>
                     </div>

From be2d6afc63a32d21515b492408cd1ef8af57bf47 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 9 Dec 2022 15:41:54 +1100
Subject: [PATCH 15/17] OTP for subscriptions

---
 app/Http/Livewire/BillingPortalPurchasev2.php | 31 +++++-
 .../billing-portal-purchasev2.blade.php       | 94 ++++++++++++++++++-
 2 files changed, 122 insertions(+), 3 deletions(-)

diff --git a/app/Http/Livewire/BillingPortalPurchasev2.php b/app/Http/Livewire/BillingPortalPurchasev2.php
index b5ec79933125..4a6bea54f8e0 100644
--- a/app/Http/Livewire/BillingPortalPurchasev2.php
+++ b/app/Http/Livewire/BillingPortalPurchasev2.php
@@ -189,6 +189,10 @@ class BillingPortalPurchasev2 extends Component
     public $total;
     public $discount;
     public $sub_total;
+    public $authenticated = false;
+    public $otp;
+    public $login;
+    public $value;
 
     public function mount()
     {
@@ -218,10 +222,35 @@ class BillingPortalPurchasev2 extends Component
         
     }
 
+    public function updatedLogin()
+    {
+                nlog($this->login);
+
+    }
+    public function handleLogin()
+    {
+        nlog($this->all());
+
+        nlog($this->login);
+        nlog($this->otp);
+        nlog($this->value);
+    }
+
+
+    public function handleEmail()
+    {
+         $this->validateOnly('email', ['email' => 'required|bail|email:rfc']);
+         $rand = rand(100000,999999);
+
+         $email_hash = "{$this->email}:" . $rand;
+         
+         Cache::put($email_hash, 120);
+
+    }
+
     /**
      * Handle a coupon being entered into the checkout
      */
-
     public function handleCoupon()
     {
 
diff --git a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
index 79aa9982ebcd..a4c087ae2dcd 100644
--- a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
@@ -229,9 +229,99 @@
                         <span>{{ ctrans('texts.total') }}</span>
                         <span>{{ $total }}</span>
                     </div>
-                  <button class="bg-white font-semibold hover:bg-gray-600 py-3 text-sm text-blue-500 uppercase w-full">Checkout</button>
+
+                    @if($authenticated)
+                    <button class="bg-white font-semibold hover:bg-gray-600 py-3 text-sm text-blue-500 uppercase w-full">Checkout</button>
+                    @else
+                    <form wire:submit.prevent="handleEmail" class="">
+                    @csrf
+                        <div class="mt-4">
+                          <label for="email" class="block text-sm font-medium text-white">{{ ctrans('texts.email') }}</label>
+                          <div class="mt-1 flex rounded-md shadow-sm">
+                            <div class="relative flex flex-grow items-stretch focus-within:z-10">
+                              <div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
+                              </div>
+                              <input type="text" wire:model.defer="email" class="block w-full rounded-none rounded-l-md border-gray-300 pl-2 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm text-gray-700" placeholder="">
+                            </div>
+                            <button class="relative -ml-px inline-flex items-center space-x-2 rounded-r-md border border-gray-300 bg-gray-50 px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-100 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500">
+                              
+                              <span>{{ ctrans('texts.login') }}</span>
+                            </button>
+                          </div>
+                            @error("email") 
+                            <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative" role="alert">
+                                <span class="block sm:inline">{{ $message }} </span>
+                                <span class="absolute top-0 bottom-0 right-0 px-4 py-3">
+                            </div>
+                            @enderror
+                        </div>
+                    </form>
+                    @endif
+
+                    <div class="py-6 px-6 w-80 border mx-auto text-center my-6">
+                    <form wire:submit.prevent="handleLogin" action="#" class="" x-data="otpForm()">
+                        <div class="flex justify-between">
+                          <template x-for="(input, index) in length" :key="index">
+                            <input
+                                type="text"
+                                maxlength="1"
+                                class="border border-gray-500 w-10 h-10 text-center text-gray-700"
+                                :x-ref="index"
+                                x-on:input="handleInput($event)"
+                                x-on:paste="handlePaste($event)"
+                                x-on:keydown.backspace="$event.target.value || handleBackspace($event.target.getAttribute('x-ref'))"
+                            />
+                          </template>
+                        </div>
+                        <input type="hidden" wire:model.defer="login" x-model="value" x-data="value">
+                         <button type="submit" class="btn-primary mx-auto block bg-gray-500 w-full p-2 mt-2 text-white">
+                            {{ ctrans('texts.login') }}
+                        </button>
+                        <p class="absolute bottom-0" x-text="`value: ${value}`"></p>
+
+                    </form>
+                    </div>
+
                 </div>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+<script>
+    function otpForm() {
+        return {
+            length: 6,
+            value: "",
+
+            handleInput(e) {
+                const input = e.target;
+
+                this.value = Array.from(Array(this.length), (element, i) => {
+                return this.$refs[i].value || "";
+                }).join("");
+
+                if (input.nextElementSibling && input.value) {
+                    input.nextElementSibling.focus();
+                    input.nextElementSibling.select();
+                }
+            },
+
+            handlePaste(e) {
+                const paste = e.clipboardData.getData('text');
+                this.value = paste;
+
+                const inputs = Array.from(Array(this.length));
+
+                inputs.forEach((element, i) => {
+                    this.$refs[i].value = paste[i] || '';
+                });
+            },
+
+            handleBackspace(e) {
+                const previous = parseInt(e, 10) - 1;
+                this.$refs[previous] && this.$refs[previous].focus();
+            },
+      };
+    }
+</script>
\ No newline at end of file

From 1ca6810132ff45d8aaf07f641d882acc58965f3b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 9 Dec 2022 16:50:48 +1100
Subject: [PATCH 16/17] Subscriptions v2

---
 app/Http/Livewire/BillingPortalPurchasev2.php | 16 ++---
 app/Services/Invoice/UpdateReminder.php       |  2 -
 .../billing-portal-purchasev2.blade.php       | 63 +++++++++++--------
 3 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/app/Http/Livewire/BillingPortalPurchasev2.php b/app/Http/Livewire/BillingPortalPurchasev2.php
index 4a6bea54f8e0..4f0569f2fcf7 100644
--- a/app/Http/Livewire/BillingPortalPurchasev2.php
+++ b/app/Http/Livewire/BillingPortalPurchasev2.php
@@ -222,24 +222,16 @@ class BillingPortalPurchasev2 extends Component
         
     }
 
-    public function updatedLogin()
+
+    public function handleLogin($log)
     {
-                nlog($this->login);
-
+        nlog($log);
     }
-    public function handleLogin()
-    {
-        nlog($this->all());
-
-        nlog($this->login);
-        nlog($this->otp);
-        nlog($this->value);
-    }
-
 
     public function handleEmail()
     {
          $this->validateOnly('email', ['email' => 'required|bail|email:rfc']);
+     
          $rand = rand(100000,999999);
 
          $email_hash = "{$this->email}:" . $rand;
diff --git a/app/Services/Invoice/UpdateReminder.php b/app/Services/Invoice/UpdateReminder.php
index 40962a7ced78..9e627d33a90c 100644
--- a/app/Services/Invoice/UpdateReminder.php
+++ b/app/Services/Invoice/UpdateReminder.php
@@ -145,8 +145,6 @@ class UpdateReminder extends AbstractService
             $reminder_date = $this->addTimeInterval($this->invoice->last_sent_date, (int) $this->settings->endless_reminder_frequency_id);
 
             if ($reminder_date) {
-                // $reminder_date->addSeconds($offset);
-
                 if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date))) {
                     $date_collection->push($reminder_date);
                 }
diff --git a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
index a4c087ae2dcd..67c5e676d34c 100644
--- a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
@@ -258,46 +258,44 @@
                     </form>
                     @endif
 
+                    @if($email && !$errors->has('email'))
                     <div class="py-6 px-6 w-80 border mx-auto text-center my-6">
-                    <form wire:submit.prevent="handleLogin" action="#" class="" x-data="otpForm()">
-                        <div class="flex justify-between">
-                          <template x-for="(input, index) in length" :key="index">
-                            <input
-                                type="text"
-                                maxlength="1"
-                                class="border border-gray-500 w-10 h-10 text-center text-gray-700"
-                                :x-ref="index"
-                                x-on:input="handleInput($event)"
-                                x-on:paste="handlePaste($event)"
-                                x-on:keydown.backspace="$event.target.value || handleBackspace($event.target.getAttribute('x-ref'))"
-                            />
-                          </template>
-                        </div>
-                        <input type="hidden" wire:model.defer="login" x-model="value" x-data="value">
-                         <button type="submit" class="btn-primary mx-auto block bg-gray-500 w-full p-2 mt-2 text-white">
-                            {{ ctrans('texts.login') }}
-                        </button>
-                        <p class="absolute bottom-0" x-text="`value: ${value}`"></p>
-
-                    </form>
+                        <form wire:submit.prevent="handleLogin" class="" x-data="otpForm()">
+                            <p class="mb-4">Enter the code we emailed</p>
+                            <div class="flex justify-between">
+                              <template x-for="(input, index) in length" :key="index">
+                                <input
+                                    type="text"
+                                    maxlength="1"
+                                    class="border border-gray-500 w-10 h-10 text-center text-gray-700"
+                                    :x-ref="index"
+                                    x-on:input="handleInput($event)"
+                                    x-on:paste="handlePaste($event)"
+                                    x-on:keydown.backspace="$event.target.value || handleBackspace($event.target.getAttribute('x-ref'))"
+                                />
+                              </template>
+                            </div>
+                             <button x-on:click="buttonDisabled = true" x-bind:disabled="buttonDisabled" class="btn-primary mx-auto block bg-gray-500 w-full p-2 mt-2 text-white">
+                                {{ ctrans('texts.verify') }}
+                            </button>
+                        </form>
                     </div>
-
+                    @endif
                 </div>
             </div>
         </div>
     </div>
-</div>
-
 <script>
     function otpForm() {
         return {
             length: 6,
-            value: "",
+            login: "",
+            buttonDisabled: true,
 
             handleInput(e) {
                 const input = e.target;
 
-                this.value = Array.from(Array(this.length), (element, i) => {
+                this.login = Array.from(Array(this.length), (element, i) => {
                 return this.$refs[i].value || "";
                 }).join("");
 
@@ -305,6 +303,15 @@
                     input.nextElementSibling.focus();
                     input.nextElementSibling.select();
                 }
+
+                if(this.login.length == 6){
+                    this.$wire.handleLogin(this.login);
+                    this.buttonDisabled = false;
+                }
+                else{
+                    this.buttonDisabled = true;   
+                }
+
             },
 
             handlePaste(e) {
@@ -324,4 +331,6 @@
             },
       };
     }
-</script>
\ No newline at end of file
+</script>
+</div>
+

From 68688e5b980dff187b50739ad0d26f3ed3f7f30a Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 9 Dec 2022 19:39:27 +1100
Subject: [PATCH 17/17] Subscriptions v2

---
 app/Http/Livewire/BillingPortalPurchasev2.php | 62 ++++++++++++++++---
 app/Utils/HtmlEngine.php                      |  3 +
 lang/en/texts.php                             |  1 +
 .../billing-portal-purchasev2.blade.php       | 18 +++---
 4 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/app/Http/Livewire/BillingPortalPurchasev2.php b/app/Http/Livewire/BillingPortalPurchasev2.php
index 4f0569f2fcf7..35933f13d043 100644
--- a/app/Http/Livewire/BillingPortalPurchasev2.php
+++ b/app/Http/Livewire/BillingPortalPurchasev2.php
@@ -31,6 +31,7 @@ use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
+use Illuminate\Validation\Rule;
 use Livewire\Component;
 
 class BillingPortalPurchasev2 extends Component
@@ -222,10 +223,30 @@ class BillingPortalPurchasev2 extends Component
         
     }
 
-
-    public function handleLogin($log)
+    public function loginValidation()
     {
-        nlog($log);
+        $this->resetErrorBag('login');
+        $this->resetValidation('login');   
+    }
+
+    public function handleLogin()
+    {
+
+        $code = Cache::get("subscriptions:otp:{$this->email}");
+
+        $this->validateOnly('login', ['login' => ['required',Rule::in([$code])]], ['login' => ctrans('texts.invalid_code')]);
+
+        $contact = ClientContact::where('email', $this->email)->first();
+
+        if($contact){
+            Auth::guard('contact')->loginUsingId($contact->id, true);
+            $this->contact = $contact;
+        }
+        else {
+
+        }
+
+
     }
 
     public function handleEmail()
@@ -234,9 +255,9 @@ class BillingPortalPurchasev2 extends Component
      
          $rand = rand(100000,999999);
 
-         $email_hash = "{$this->email}:" . $rand;
+         $email_hash = "subscriptions:otp:{$this->email}";
          
-         Cache::put($email_hash, 120);
+         Cache::put($email_hash, $rand, 120);
 
     }
 
@@ -368,18 +389,36 @@ class BillingPortalPurchasev2 extends Component
         return $this;
     }
 
-    public function updatedData()
+    private function createClientContact()
     {
 
-    }
+        $company = $this->subscription->company;
+        $user = $this->subscription->user;
+        $user->setCompany($company);
 
-    public function updating($prop)
-    {
+        $client_repo = new ClientRepository(new ClientContactRepository());
+        $data = [
+            'name' => '',
+            'contacts' => [
+                ['email' => $this->email],
+            ],
+            'client_hash' => Str::random(40),
+            'settings' => ClientSettings::defaults(),
+        ];
 
-    }
+        $client = $client_repo->save($data, ClientFactory::create($company->id, $user->id));
+
+        $this->contact = $client->fresh()->contacts()->first();
+        Auth::guard('contact')->loginUsingId($this->contact->id, true);
+
+    } 
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     public function updated($propertyName)
     {
+        if(in_array($propertyName, ['login','email']))
+            return;
 
         $this->buildBundle();
 
@@ -440,6 +479,9 @@ class BillingPortalPurchasev2 extends Component
         }
     }
 
+   
+
+
     /**
      * Create a blank client. Used for new customers purchasing.
      *
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index a2a98275804e..f1958ef62195 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -285,6 +285,9 @@ class HtmlEngine
             $data['$amount_raw'] = ['value' => $this->entity->amount, 'label' => ctrans('texts.amount')];         
         }
 
+        // $data['$amount_in_words'] = ['value' => (new \NumberFormatter($this->client->locale(), \NumberFormatter::SPELLOUT))->format($this->entity->amount), 'label' => ''];
+        // $data['$balance_in_words'] = ['value' => (new \NumberFormatter($this->client->locale(), \NumberFormatter::SPELLOUT))->format($this->entity->balance), 'label' => ''];
+
         // $data['$balance_due'] = $data['$balance_due'];
         $data['$outstanding'] = &$data['$balance_due'];
         $data['$partial_due'] = ['value' => Number::formatMoney($this->entity->partial, $this->client) ?: '&nbsp;', 'label' => ctrans('texts.partial_due')];
diff --git a/lang/en/texts.php b/lang/en/texts.php
index f210375b12ef..090ba0f2dde9 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -4895,6 +4895,7 @@ $LANG = array(
     'delete_bank_account' => 'Delete Bank Account',
     'archive_transaction' => 'Archive Transaction',
     'delete_transaction' => 'Delete Transaction',
+    'otp_code_message' => 'Enter the code emailed.'
 );
 
 return $LANG;
diff --git a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
index 67c5e676d34c..c8e5dd7e2d5e 100644
--- a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
@@ -254,6 +254,7 @@
                                 <span class="absolute top-0 bottom-0 right-0 px-4 py-3">
                             </div>
                             @enderror
+                            
                         </div>
                     </form>
                     @endif
@@ -261,7 +262,7 @@
                     @if($email && !$errors->has('email'))
                     <div class="py-6 px-6 w-80 border mx-auto text-center my-6">
                         <form wire:submit.prevent="handleLogin" class="" x-data="otpForm()">
-                            <p class="mb-4">Enter the code we emailed</p>
+                            <p class="mb-4">{{ ctrans('texts.otp_code_message')}}</p>
                             <div class="flex justify-between">
                               <template x-for="(input, index) in length" :key="index">
                                 <input
@@ -275,10 +276,13 @@
                                 />
                               </template>
                             </div>
-                             <button x-on:click="buttonDisabled = true" x-bind:disabled="buttonDisabled" class="btn-primary mx-auto block bg-gray-500 w-full p-2 mt-2 text-white">
-                                {{ ctrans('texts.verify') }}
-                            </button>
                         </form>
+                        @error("login") 
+                            <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative" role="alert">
+                                <span class="block sm:inline">{{ $message }} </span>
+                                <span class="absolute top-0 bottom-0 right-0 px-4 py-3">
+                            </div>
+                        @enderror
                     </div>
                     @endif
                 </div>
@@ -290,7 +294,6 @@
         return {
             length: 6,
             login: "",
-            buttonDisabled: true,
 
             handleInput(e) {
                 const input = e.target;
@@ -306,10 +309,6 @@
 
                 if(this.login.length == 6){
                     this.$wire.handleLogin(this.login);
-                    this.buttonDisabled = false;
-                }
-                else{
-                    this.buttonDisabled = true;   
                 }
 
             },
@@ -328,6 +327,7 @@
             handleBackspace(e) {
                 const previous = parseInt(e, 10) - 1;
                 this.$refs[previous] && this.$refs[previous].focus();
+                this.$wire.loginValidation(); 
             },
       };
     }