From 1ed28fb1d67f1b944e3153933840c7185b8c6d97 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 10 Oct 2024 09:34:36 +1100
Subject: [PATCH 01/81] Improve privacy and terms section of client portal

---
 .../components/general/footer.blade.php       |  4 +-
 .../components/general/pop-up.blade.php       | 38 ++++++++++---------
 .../general/vendor_footer.blade.php           |  4 +-
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/resources/views/portal/ninja2020/components/general/footer.blade.php b/resources/views/portal/ninja2020/components/general/footer.blade.php
index f00ad63f105..d2e4320eb0d 100644
--- a/resources/views/portal/ninja2020/components/general/footer.blade.php
+++ b/resources/views/portal/ninja2020/components/general/footer.blade.php
@@ -34,13 +34,13 @@
 
     @if(strlen($client->getSetting('client_portal_privacy_policy')) > 1)
         @component('portal.ninja2020.components.general.pop-up', ['title' => __('texts.privacy_policy') ,'show_property' => 'privacy'])
-            {!! $client->getSetting('client_portal_privacy_policy') !!}
+            {{ $client->getSetting('client_portal_privacy_policy') }}
         @endcomponent
     @endif
 
     @if(strlen($client->getSetting('client_portal_terms')) > 1)
         @component('portal.ninja2020.components.general.pop-up', ['title' => __('texts.terms') ,'show_property' => 'tos'])
-            {!! $client->getSetting('client_portal_terms') !!}
+            {{ $client->getSetting('client_portal_terms') }}
         @endcomponent
     @endif
 
diff --git a/resources/views/portal/ninja2020/components/general/pop-up.blade.php b/resources/views/portal/ninja2020/components/general/pop-up.blade.php
index 5ef6c888749..692ab2958c5 100644
--- a/resources/views/portal/ninja2020/components/general/pop-up.blade.php
+++ b/resources/views/portal/ninja2020/components/general/pop-up.blade.php
@@ -1,26 +1,28 @@
 <div class="fixed z-10 inset-0 overflow-y-auto" style="display:none;" x-show="{{ $show_property }}">
-    <div class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
-        <div class="fixed inset-0 transition-opacity">
+    <div class="flex items-center justify-center min-h-screen px-4 pt-4 pb-20 text-center sm:block sm:p-0">
+        <div class="fixed inset-0 transition-opacity" aria-hidden="true">
             <div class="absolute inset-0 bg-gray-500 opacity-75"></div>
         </div>
 
-        <span class="hidden sm:inline-block sm:align-middle sm:h-screen"></span>&#8203;
+        <span class="hidden sm:inline-block sm:align-middle sm:h-screen" aria-hidden="true">&#8203;</span>
 
-        <div class="inline-block align-bottom bg-white rounded-lg px-4 pt-5 pb-4 text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-sm sm:w-full sm:p-6" role="dialog" aria-modal="true" aria-labelledby="modal-headline">
-            <div class="flex items-center justify-between">
-                <h3 class="text-lg leading-6 font-medium text-gray-900" id="modal-headline">
-                    {{ $title }}
-                </h3>
-                <button @click="{{ $show_property }} = false" class="focus:outline-none" aria-label="Close pop-up">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-x">
-                        <line x1="18" y1="6" x2="6" y2="18"></line>
-                        <line x1="6" y1="6" x2="18" y2="18"></line>
-                    </svg>
-                </button>
-            </div>
-            <div class="mt-4 text-sm leading-5 text-gray-500">
-                {!! $slot !!}
+        <div class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:w-full sm:max-w-4xl" style="width: 90%;" role="dialog" aria-modal="true" aria-labelledby="modal-headline">
+            <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+                <div class="flex items-center justify-between">
+                    <h3 class="text-lg leading-6 font-medium text-gray-900" id="modal-headline">
+                        {{ $title }}
+                    </h3>
+                    <button @click="{{ $show_property }} = false" class="focus:outline-none" aria-label="Close pop-up">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-x">
+                            <line x1="18" y1="6" x2="6" y2="18"></line>
+                            <line x1="6" y1="6" x2="18" y2="18"></line>
+                        </svg>
+                    </button>
+                </div>
+                <div class="mt-4 text-sm leading-5 text-gray-500">
+                   {!! nl2br(e($slot)) !!}
+                </div>
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/components/general/vendor_footer.blade.php b/resources/views/portal/ninja2020/components/general/vendor_footer.blade.php
index 43d1db33b8d..4fae470b6c6 100644
--- a/resources/views/portal/ninja2020/components/general/vendor_footer.blade.php
+++ b/resources/views/portal/ninja2020/components/general/vendor_footer.blade.php
@@ -34,13 +34,13 @@
 
     @if(strlen($settings->client_portal_privacy_policy) > 1)
         @component('portal.ninja2020.components.general.pop-up', ['title' => __('texts.privacy_policy') ,'show_property' => 'privacy'])
-            {!! $settings->client_portal_privacy_policy !!}
+            {!! nl2br($settings->client_portal_privacy_policy) !!}
         @endcomponent
     @endif
 
     @if(strlen($settings->client_portal_terms) > 1)
         @component('portal.ninja2020.components.general.pop-up', ['title' => __('texts.terms') ,'show_property' => 'tos'])
-            {!! $settings->client_portal_terms !!}
+            {!! nl2br($settings->client_portal_terms) !!}
         @endcomponent
     @endif
 

From 124904ce5e8bd7a0c755d47aa041b8dcd2a5dc0f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 10 Oct 2024 12:41:55 +1100
Subject: [PATCH 02/81] fixed for square

---
 .../BillingPortal/Authentication/Register.php |  2 +-
 .../Authentication/RegisterOrLogin.php        |  6 +-
 app/Models/Subscription.php                   | 19 ++++++
 .../CBAPowerBoard/CreditCard.php              |  4 +-
 .../CBAPowerBoardPaymentDriver.php            |  9 +++
 public/build/assets/app-6dd57ed5.css          |  1 -
 public/build/manifest.json                    |  2 +-
 .../billing-portal/v3/cart/cart.blade.php     |  6 +-
 .../v3/cart/one-time-products.blade.php       | 24 +++----
 .../cart/optional-one-time-products.blade.php |  2 +-
 .../optional-recurring-products.blade.php     |  2 +-
 .../auth/includes/register/popup.blade.php    | 67 +++++++++++++------
 .../billing-portal-purchasev2.blade.php       | 10 +--
 .../square/credit_card/pay_livewire.blade.php | 43 ++++++------
 14 files changed, 119 insertions(+), 78 deletions(-)
 delete mode 100644 public/build/assets/app-6dd57ed5.css

diff --git a/app/Livewire/BillingPortal/Authentication/Register.php b/app/Livewire/BillingPortal/Authentication/Register.php
index e6ead95bc70..ca552f78a7d 100644
--- a/app/Livewire/BillingPortal/Authentication/Register.php
+++ b/app/Livewire/BillingPortal/Authentication/Register.php
@@ -101,7 +101,7 @@ public function registerForm()
 
         $this->register_fields = [...collect($this->subscription->company->client_registration_fields ?? [])->toArray()];
 
-        $first_gateway = collect($this->subscription->company->company_gateways)
+        $first_gateway = collect($this->subscription->company->company_gateways()->withoutTrashed()->get())
             ->sortBy('sort_order')
             ->first();
 
diff --git a/app/Livewire/BillingPortal/Authentication/RegisterOrLogin.php b/app/Livewire/BillingPortal/Authentication/RegisterOrLogin.php
index 3016bc8f1db..acc1e14a605 100644
--- a/app/Livewire/BillingPortal/Authentication/RegisterOrLogin.php
+++ b/app/Livewire/BillingPortal/Authentication/RegisterOrLogin.php
@@ -202,11 +202,7 @@ public function registerForm()
 
         $this->register_fields = [...collect($this->subscription->company->client_registration_fields ?? [])->toArray()];
 
-        // if ($this->subscription->company->settings->client_portal_terms || $this->subscription->company->settings->client_portal_privacy_policy) {
-        //     $this->register_fields[] = ['key' => 'terms', 'required' => true, 'visible' => 'true'];
-        // }
-
-        $first_gateway = collect($this->subscription->company->company_gateways)
+        $first_gateway = collect($this->subscription->company->company_gateways()->withoutTrashed()->get())
             ->sortBy('sort_order')
             ->first();
 
diff --git a/app/Models/Subscription.php b/app/Models/Subscription.php
index 765556c410d..ffe724ec71b 100644
--- a/app/Models/Subscription.php
+++ b/app/Models/Subscription.php
@@ -201,4 +201,23 @@ public function nextDateByInterval($date, $frequency_id)
                 return null;
         }
     }
+    
+    /**
+     * Calculates the maximum product quantity available
+     *
+     * @param  mixed $product
+     * @return int
+     */
+    public function maxQuantity(mixed $product): int
+    {
+        $max_quantity = data_get($product, 'max_quantity', 0);
+        $in_stock_quantity = data_get($product, 'in_stock_quantity', 0);
+        $max_limit = 100;
+
+        if(!$this->use_inventory_management)
+            return $max_quantity != 0 ? $max_quantity : $max_limit;
+
+        return $max_quantity !=0 ? $max_quantity : min($max_limit, $in_stock_quantity);
+        
+    }
 }
diff --git a/app/PaymentDrivers/CBAPowerBoard/CreditCard.php b/app/PaymentDrivers/CBAPowerBoard/CreditCard.php
index fa7141f08de..8b31479679f 100644
--- a/app/PaymentDrivers/CBAPowerBoard/CreditCard.php
+++ b/app/PaymentDrivers/CBAPowerBoard/CreditCard.php
@@ -264,7 +264,7 @@ public function livewirePaymentView(array $data): string
         return 'gateways.powerboard.credit_card.pay_livewire';
     }
 
-    public function tokenBilling($request, $cgt, $client_present = false)
+    public function tokenBilling($cgt, $client_present = false)
     {
 
         $payload = [
@@ -352,7 +352,7 @@ public function paymentResponse(PaymentResponseRequest $request)
                         ->where('token', $request->token)
                         ->first();
 
-            return $this->tokenBilling($request, $cgt, true);
+            return $this->tokenBilling($cgt, true);
             
         }
         elseif($request->browser_details)
diff --git a/app/PaymentDrivers/CBAPowerBoardPaymentDriver.php b/app/PaymentDrivers/CBAPowerBoardPaymentDriver.php
index 7e0c494af4a..578efe80d8c 100644
--- a/app/PaymentDrivers/CBAPowerBoardPaymentDriver.php
+++ b/app/PaymentDrivers/CBAPowerBoardPaymentDriver.php
@@ -175,6 +175,15 @@ public function getClientRequiredFields(): array
 
     public function tokenBilling(ClientGatewayToken $cgt, PaymentHash $payment_hash)
     {
+        
+        $this->init();
+
+        $this->setPaymentMethod($cgt->gateway_type_id);
+        $this->setPaymentHash($payment_hash);
+        $this->setClient($cgt->client);
+
+        return $this->payment_method->tokenBilling($cgt, false);
+
     }
 
     public function importCustomers()
diff --git a/public/build/assets/app-6dd57ed5.css b/public/build/assets/app-6dd57ed5.css
deleted file mode 100644
index f4783a6f593..00000000000
--- a/public/build/assets/app-6dd57ed5.css
+++ /dev/null
@@ -1 +0,0 @@
-*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:#e5e7eb}:before,:after{--tw-content: ""}html,:host{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:Open Sans,ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-feature-settings:normal;font-variation-settings:normal;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-feature-settings:inherit;font-variation-settings:inherit;font-size:100%;font-weight:inherit;line-height:inherit;letter-spacing:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dl,dd,h1,h2,h3,h4,h5,h6,hr,figure,p,pre{margin:0}fieldset{margin:0;padding:0}legend{padding:0}ol,ul,menu{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{opacity:1;color:#9ca3af}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}button,[role=button]{cursor:pointer}:disabled{cursor:default}img,svg,video,canvas,audio,iframe,embed,object{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]{display:none}[type=text],input:where(:not([type])),[type=email],[type=url],[type=password],[type=number],[type=date],[type=datetime-local],[type=month],[type=search],[type=tel],[type=time],[type=week],[multiple],textarea,select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#6b7280;border-width:1px;border-radius:0;padding:.5rem .75rem;font-size:1rem;line-height:1.5rem;--tw-shadow: 0 0 #0000}[type=text]:focus,input:where(:not([type])):focus,[type=email]:focus,[type=url]:focus,[type=password]:focus,[type=number]:focus,[type=date]:focus,[type=datetime-local]:focus,[type=month]:focus,[type=search]:focus,[type=tel]:focus,[type=time]:focus,[type=week]:focus,[multiple]:focus,textarea:focus,select:focus{outline:2px solid transparent;outline-offset:2px;--tw-ring-inset: var(--tw-empty, );--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: #2563eb;--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow);border-color:#2563eb}input::-moz-placeholder,textarea::-moz-placeholder{color:#6b7280;opacity:1}input::placeholder,textarea::placeholder{color:#6b7280;opacity:1}::-webkit-datetime-edit-fields-wrapper{padding:0}::-webkit-date-and-time-value{min-height:1.5em;text-align:inherit}::-webkit-datetime-edit{display:inline-flex}::-webkit-datetime-edit,::-webkit-datetime-edit-year-field,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute-field,::-webkit-datetime-edit-second-field,::-webkit-datetime-edit-millisecond-field,::-webkit-datetime-edit-meridiem-field{padding-top:0;padding-bottom:0}select{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e");background-position:right .5rem center;background-repeat:no-repeat;background-size:1.5em 1.5em;padding-right:2.5rem;-webkit-print-color-adjust:exact;print-color-adjust:exact}[multiple],[size]:where(select:not([size="1"])){background-image:initial;background-position:initial;background-repeat:unset;background-size:initial;padding-right:.75rem;-webkit-print-color-adjust:unset;print-color-adjust:unset}[type=checkbox],[type=radio]{-webkit-appearance:none;-moz-appearance:none;appearance:none;padding:0;-webkit-print-color-adjust:exact;print-color-adjust:exact;display:inline-block;vertical-align:middle;background-origin:border-box;-webkit-user-select:none;-moz-user-select:none;user-select:none;flex-shrink:0;height:1rem;width:1rem;color:#2563eb;background-color:#fff;border-color:#6b7280;border-width:1px;--tw-shadow: 0 0 #0000}[type=checkbox]{border-radius:0}[type=radio]{border-radius:100%}[type=checkbox]:focus,[type=radio]:focus{outline:2px solid transparent;outline-offset:2px;--tw-ring-inset: var(--tw-empty, );--tw-ring-offset-width: 2px;--tw-ring-offset-color: #fff;--tw-ring-color: #2563eb;--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}[type=checkbox]:checked,[type=radio]:checked{border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:center;background-repeat:no-repeat}[type=checkbox]:checked{background-image:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e")}@media (forced-colors: active){[type=checkbox]:checked{-webkit-appearance:auto;-moz-appearance:auto;appearance:auto}}[type=radio]:checked{background-image:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3ccircle cx='8' cy='8' r='3'/%3e%3c/svg%3e")}@media (forced-colors: active){[type=radio]:checked{-webkit-appearance:auto;-moz-appearance:auto;appearance:auto}}[type=checkbox]:checked:hover,[type=checkbox]:checked:focus,[type=radio]:checked:hover,[type=radio]:checked:focus{border-color:transparent;background-color:currentColor}[type=checkbox]:indeterminate{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 16 16'%3e%3cpath stroke='white' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M4 8h8'/%3e%3c/svg%3e");border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:center;background-repeat:no-repeat}@media (forced-colors: active){[type=checkbox]:indeterminate{-webkit-appearance:auto;-moz-appearance:auto;appearance:auto}}[type=checkbox]:indeterminate:hover,[type=checkbox]:indeterminate:focus{border-color:transparent;background-color:currentColor}[type=file]{background:unset;border-color:inherit;border-width:0;border-radius:0;padding:0;font-size:unset;line-height:inherit}[type=file]:focus{outline:1px solid ButtonText;outline:1px auto -webkit-focus-ring-color}*,:before,:after{--tw-border-spacing-x: 0;--tw-border-spacing-y: 0;--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }::backdrop{--tw-border-spacing-x: 0;--tw-border-spacing-y: 0;--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }.container{width:100%}@media (min-width: 640px){.container{max-width:640px}}@media (min-width: 768px){.container{max-width:768px}}@media (min-width: 1024px){.container{max-width:1024px}}@media (min-width: 1280px){.container{max-width:1280px}}@media (min-width: 1536px){.container{max-width:1536px}}.form-input,.form-textarea,.form-select,.form-multiselect{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#6b7280;border-width:1px;border-radius:0;padding:.5rem .75rem;font-size:1rem;line-height:1.5rem;--tw-shadow: 0 0 #0000}.form-input:focus,.form-textarea:focus,.form-select:focus,.form-multiselect:focus{outline:2px solid transparent;outline-offset:2px;--tw-ring-inset: var(--tw-empty, );--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: #2563eb;--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow);border-color:#2563eb}.form-select{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e");background-position:right .5rem center;background-repeat:no-repeat;background-size:1.5em 1.5em;padding-right:2.5rem;-webkit-print-color-adjust:exact;print-color-adjust:exact}.form-select:where([size]:not([size="1"])){background-image:initial;background-position:initial;background-repeat:unset;background-size:initial;padding-right:.75rem;-webkit-print-color-adjust:unset;print-color-adjust:unset}.form-checkbox,.form-radio{-webkit-appearance:none;-moz-appearance:none;appearance:none;padding:0;-webkit-print-color-adjust:exact;print-color-adjust:exact;display:inline-block;vertical-align:middle;background-origin:border-box;-webkit-user-select:none;-moz-user-select:none;user-select:none;flex-shrink:0;height:1rem;width:1rem;color:#2563eb;background-color:#fff;border-color:#6b7280;border-width:1px;--tw-shadow: 0 0 #0000}.form-checkbox{border-radius:0}.form-radio{border-radius:100%}.form-checkbox:focus,.form-radio:focus{outline:2px solid transparent;outline-offset:2px;--tw-ring-inset: var(--tw-empty, );--tw-ring-offset-width: 2px;--tw-ring-offset-color: #fff;--tw-ring-color: #2563eb;--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.form-checkbox:checked,.form-radio:checked{border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:center;background-repeat:no-repeat}.form-checkbox:checked{background-image:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e")}@media (forced-colors: active){.form-checkbox:checked{-webkit-appearance:auto;-moz-appearance:auto;appearance:auto}}.form-radio:checked{background-image:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3ccircle cx='8' cy='8' r='3'/%3e%3c/svg%3e")}@media (forced-colors: active){.form-radio:checked{-webkit-appearance:auto;-moz-appearance:auto;appearance:auto}}.form-checkbox:checked:hover,.form-checkbox:checked:focus,.form-radio:checked:hover,.form-radio:checked:focus{border-color:transparent;background-color:currentColor}.form-checkbox:indeterminate{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 16 16'%3e%3cpath stroke='white' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M4 8h8'/%3e%3c/svg%3e");border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:center;background-repeat:no-repeat}@media (forced-colors: active){.form-checkbox:indeterminate{-webkit-appearance:auto;-moz-appearance:auto;appearance:auto}}.form-checkbox:indeterminate:hover,.form-checkbox:indeterminate:focus{border-color:transparent;background-color:currentColor}.prose{color:var(--tw-prose-body);max-width:65ch}.prose :where(p):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:1.25em;margin-bottom:1.25em}.prose :where([class~=lead]):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-lead);font-size:1.25em;line-height:1.6;margin-top:1.2em;margin-bottom:1.2em}.prose :where(a):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-links);text-decoration:underline;font-weight:500}.prose :where(strong):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-bold);font-weight:600}.prose :where(a strong):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(blockquote strong):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(thead th strong):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(ol):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:decimal;margin-top:1.25em;margin-bottom:1.25em;padding-inline-start:1.625em}.prose :where(ol[type=A]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:upper-alpha}.prose :where(ol[type=a]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:lower-alpha}.prose :where(ol[type=A s]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:upper-alpha}.prose :where(ol[type=a s]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:lower-alpha}.prose :where(ol[type=I]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:upper-roman}.prose :where(ol[type=i]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:lower-roman}.prose :where(ol[type=I s]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:upper-roman}.prose :where(ol[type=i s]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:lower-roman}.prose :where(ol[type="1"]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:decimal}.prose :where(ul):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:disc;margin-top:1.25em;margin-bottom:1.25em;padding-inline-start:1.625em}.prose :where(ol>li):not(:where([class~=not-prose],[class~=not-prose] *))::marker{font-weight:400;color:var(--tw-prose-counters)}.prose :where(ul>li):not(:where([class~=not-prose],[class~=not-prose] *))::marker{color:var(--tw-prose-bullets)}.prose :where(dt):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-headings);font-weight:600;margin-top:1.25em}.prose :where(hr):not(:where([class~=not-prose],[class~=not-prose] *)){border-color:var(--tw-prose-hr);border-top-width:1px;margin-top:3em;margin-bottom:3em}.prose :where(blockquote):not(:where([class~=not-prose],[class~=not-prose] *)){font-weight:500;font-style:italic;color:var(--tw-prose-quotes);border-inline-start-width:.25rem;border-inline-start-color:var(--tw-prose-quote-borders);quotes:"“""”""‘""’";margin-top:1.6em;margin-bottom:1.6em;padding-inline-start:1em}.prose :where(blockquote p:first-of-type):not(:where([class~=not-prose],[class~=not-prose] *)):before{content:open-quote}.prose :where(blockquote p:last-of-type):not(:where([class~=not-prose],[class~=not-prose] *)):after{content:close-quote}.prose :where(h1):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-headings);font-weight:800;font-size:2.25em;margin-top:0;margin-bottom:.8888889em;line-height:1.1111111}.prose :where(h1 strong):not(:where([class~=not-prose],[class~=not-prose] *)){font-weight:900;color:inherit}.prose :where(h2):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-headings);font-weight:700;font-size:1.5em;margin-top:2em;margin-bottom:1em;line-height:1.3333333}.prose :where(h2 strong):not(:where([class~=not-prose],[class~=not-prose] *)){font-weight:800;color:inherit}.prose :where(h3):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-headings);font-weight:600;font-size:1.25em;margin-top:1.6em;margin-bottom:.6em;line-height:1.6}.prose :where(h3 strong):not(:where([class~=not-prose],[class~=not-prose] *)){font-weight:700;color:inherit}.prose :where(h4):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-headings);font-weight:600;margin-top:1.5em;margin-bottom:.5em;line-height:1.5}.prose :where(h4 strong):not(:where([class~=not-prose],[class~=not-prose] *)){font-weight:700;color:inherit}.prose :where(img):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:2em;margin-bottom:2em}.prose :where(picture):not(:where([class~=not-prose],[class~=not-prose] *)){display:block;margin-top:2em;margin-bottom:2em}.prose :where(video):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:2em;margin-bottom:2em}.prose :where(kbd):not(:where([class~=not-prose],[class~=not-prose] *)){font-weight:500;font-family:inherit;color:var(--tw-prose-kbd);box-shadow:0 0 0 1px rgb(var(--tw-prose-kbd-shadows) / 10%),0 3px 0 rgb(var(--tw-prose-kbd-shadows) / 10%);font-size:.875em;border-radius:.3125rem;padding-top:.1875em;padding-inline-end:.375em;padding-bottom:.1875em;padding-inline-start:.375em}.prose :where(code):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-code);font-weight:600;font-size:.875em}.prose :where(code):not(:where([class~=not-prose],[class~=not-prose] *)):before{content:"`"}.prose :where(code):not(:where([class~=not-prose],[class~=not-prose] *)):after{content:"`"}.prose :where(a code):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(h1 code):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(h2 code):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit;font-size:.875em}.prose :where(h3 code):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit;font-size:.9em}.prose :where(h4 code):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(blockquote code):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(thead th code):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(pre):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-pre-code);background-color:var(--tw-prose-pre-bg);overflow-x:auto;font-weight:400;font-size:.875em;line-height:1.7142857;margin-top:1.7142857em;margin-bottom:1.7142857em;border-radius:.375rem;padding-top:.8571429em;padding-inline-end:1.1428571em;padding-bottom:.8571429em;padding-inline-start:1.1428571em}.prose :where(pre code):not(:where([class~=not-prose],[class~=not-prose] *)){background-color:transparent;border-width:0;border-radius:0;padding:0;font-weight:inherit;color:inherit;font-size:inherit;font-family:inherit;line-height:inherit}.prose :where(pre code):not(:where([class~=not-prose],[class~=not-prose] *)):before{content:none}.prose :where(pre code):not(:where([class~=not-prose],[class~=not-prose] *)):after{content:none}.prose :where(table):not(:where([class~=not-prose],[class~=not-prose] *)){width:100%;table-layout:auto;margin-top:2em;margin-bottom:2em;font-size:.875em;line-height:1.7142857}.prose :where(thead):not(:where([class~=not-prose],[class~=not-prose] *)){border-bottom-width:1px;border-bottom-color:var(--tw-prose-th-borders)}.prose :where(thead th):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-headings);font-weight:600;vertical-align:bottom;padding-inline-end:.5714286em;padding-bottom:.5714286em;padding-inline-start:.5714286em}.prose :where(tbody tr):not(:where([class~=not-prose],[class~=not-prose] *)){border-bottom-width:1px;border-bottom-color:var(--tw-prose-td-borders)}.prose :where(tbody tr:last-child):not(:where([class~=not-prose],[class~=not-prose] *)){border-bottom-width:0}.prose :where(tbody td):not(:where([class~=not-prose],[class~=not-prose] *)){vertical-align:baseline}.prose :where(tfoot):not(:where([class~=not-prose],[class~=not-prose] *)){border-top-width:1px;border-top-color:var(--tw-prose-th-borders)}.prose :where(tfoot td):not(:where([class~=not-prose],[class~=not-prose] *)){vertical-align:top}.prose :where(th,td):not(:where([class~=not-prose],[class~=not-prose] *)){text-align:start}.prose :where(figure>*):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:0;margin-bottom:0}.prose :where(figcaption):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-captions);font-size:.875em;line-height:1.4285714;margin-top:.8571429em}.prose{--tw-prose-body: #374151;--tw-prose-headings: #111827;--tw-prose-lead: #4b5563;--tw-prose-links: #111827;--tw-prose-bold: #111827;--tw-prose-counters: #6b7280;--tw-prose-bullets: #d1d5db;--tw-prose-hr: #e5e7eb;--tw-prose-quotes: #111827;--tw-prose-quote-borders: #e5e7eb;--tw-prose-captions: #6b7280;--tw-prose-kbd: #111827;--tw-prose-kbd-shadows: 17 24 39;--tw-prose-code: #111827;--tw-prose-pre-code: #e5e7eb;--tw-prose-pre-bg: #1f2937;--tw-prose-th-borders: #d1d5db;--tw-prose-td-borders: #e5e7eb;--tw-prose-invert-body: #d1d5db;--tw-prose-invert-headings: #fff;--tw-prose-invert-lead: #9ca3af;--tw-prose-invert-links: #fff;--tw-prose-invert-bold: #fff;--tw-prose-invert-counters: #9ca3af;--tw-prose-invert-bullets: #4b5563;--tw-prose-invert-hr: #374151;--tw-prose-invert-quotes: #f3f4f6;--tw-prose-invert-quote-borders: #374151;--tw-prose-invert-captions: #9ca3af;--tw-prose-invert-kbd: #fff;--tw-prose-invert-kbd-shadows: 255 255 255;--tw-prose-invert-code: #fff;--tw-prose-invert-pre-code: #d1d5db;--tw-prose-invert-pre-bg: rgb(0 0 0 / 50%);--tw-prose-invert-th-borders: #4b5563;--tw-prose-invert-td-borders: #374151;font-size:1rem;line-height:1.75}.prose :where(picture>img):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:0;margin-bottom:0}.prose :where(li):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:.5em;margin-bottom:.5em}.prose :where(ol>li):not(:where([class~=not-prose],[class~=not-prose] *)){padding-inline-start:.375em}.prose :where(ul>li):not(:where([class~=not-prose],[class~=not-prose] *)){padding-inline-start:.375em}.prose :where(.prose>ul>li p):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:.75em;margin-bottom:.75em}.prose :where(.prose>ul>li>p:first-child):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:1.25em}.prose :where(.prose>ul>li>p:last-child):not(:where([class~=not-prose],[class~=not-prose] *)){margin-bottom:1.25em}.prose :where(.prose>ol>li>p:first-child):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:1.25em}.prose :where(.prose>ol>li>p:last-child):not(:where([class~=not-prose],[class~=not-prose] *)){margin-bottom:1.25em}.prose :where(ul ul,ul ol,ol ul,ol ol):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:.75em;margin-bottom:.75em}.prose :where(dl):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:1.25em;margin-bottom:1.25em}.prose :where(dd):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:.5em;padding-inline-start:1.625em}.prose :where(hr+*):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:0}.prose :where(h2+*):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:0}.prose :where(h3+*):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:0}.prose :where(h4+*):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:0}.prose :where(thead th:first-child):not(:where([class~=not-prose],[class~=not-prose] *)){padding-inline-start:0}.prose :where(thead th:last-child):not(:where([class~=not-prose],[class~=not-prose] *)){padding-inline-end:0}.prose :where(tbody td,tfoot td):not(:where([class~=not-prose],[class~=not-prose] *)){padding-top:.5714286em;padding-inline-end:.5714286em;padding-bottom:.5714286em;padding-inline-start:.5714286em}.prose :where(tbody td:first-child,tfoot td:first-child):not(:where([class~=not-prose],[class~=not-prose] *)){padding-inline-start:0}.prose :where(tbody td:last-child,tfoot td:last-child):not(:where([class~=not-prose],[class~=not-prose] *)){padding-inline-end:0}.prose :where(figure):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:2em;margin-bottom:2em}.prose :where(.prose>:first-child):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:0}.prose :where(.prose>:last-child):not(:where([class~=not-prose],[class~=not-prose] *)){margin-bottom:0}.button{border-radius:.25rem;padding:.75rem 1rem;font-size:.875rem;line-height:1rem;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-duration:.15s;transition-timing-function:cubic-bezier(.4,0,.2,1)}button:disabled{cursor:not-allowed;opacity:.5}.button-primary{--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}.button-primary:hover{font-weight:600}.button-block{display:block;width:100%}.button-danger{--tw-bg-opacity: 1;background-color:rgb(239 68 68 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}.button-danger:hover{--tw-bg-opacity: 1;background-color:rgb(220 38 38 / var(--tw-bg-opacity))}.button-secondary{--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity))}.button-secondary:hover{--tw-bg-opacity: 1;background-color:rgb(229 231 235 / var(--tw-bg-opacity))}.button-link{--tw-text-opacity: 1;color:rgb(55 65 81 / var(--tw-text-opacity))}.button-link:hover{--tw-text-opacity: 1;color:rgb(17 24 39 / var(--tw-text-opacity));text-decoration-line:underline}.button-link:focus{text-decoration-line:underline;outline:2px solid transparent;outline-offset:2px}.validation{margin-top:.5rem;margin-bottom:.25rem;border-left-width:2px;--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity));padding:.25rem .75rem}.validation-fail{--tw-border-opacity: 1;border-color:rgb(239 68 68 / var(--tw-border-opacity));font-size:.875rem;line-height:1.25rem;--tw-text-opacity: 1;color:rgb(55 65 81 / var(--tw-text-opacity))}.validation-pass{--tw-border-opacity: 1;border-color:rgb(16 185 129 / var(--tw-border-opacity));font-size:.875rem;line-height:1.25rem;--tw-text-opacity: 1;color:rgb(55 65 81 / var(--tw-text-opacity))}.input{margin-top:.5rem;align-items:center;border-radius:.25rem;border-width:1px;--tw-border-opacity: 1;border-color:rgb(209 213 219 / var(--tw-border-opacity));padding:.5rem 1rem;font-size:.875rem;line-height:1.25rem}.input:focus{--tw-bg-opacity: 1;background-color:rgb(249 250 251 / var(--tw-bg-opacity));outline:2px solid transparent;outline-offset:2px}.input-label{font-size:.875rem;line-height:1.25rem;--tw-text-opacity: 1;color:rgb(75 85 99 / var(--tw-text-opacity))}.input-slim{padding-top:.5rem;padding-bottom:.5rem}.form-checkbox{cursor:pointer;border-radius:.25rem;border-width:1px;--tw-border-opacity: 1;border-color:rgb(209 213 219 / var(--tw-border-opacity))}.form-select{border-width:1px;--tw-border-opacity: 1;border-color:rgb(209 213 219 / var(--tw-border-opacity))}.alert{margin-top:.5rem;margin-bottom:.25rem;border-left-width:2px;--tw-border-opacity: 1;border-color:rgb(156 163 175 / var(--tw-border-opacity));--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity));padding:.75rem 1rem;font-size:.875rem;line-height:1.25rem}.alert-success{--tw-border-opacity: 1;border-color:rgb(16 185 129 / var(--tw-border-opacity))}.alert-failure{--tw-border-opacity: 1;border-color:rgb(239 68 68 / var(--tw-border-opacity))}.badge{display:inline-flex;align-items:center;border-radius:9999px;padding:.125rem .625rem;font-size:.75rem;font-weight:500;line-height:1rem}.badge-light{--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(31 41 55 / var(--tw-text-opacity))}.badge-primary{--tw-bg-opacity: 1;background-color:rgb(191 219 254 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(59 130 246 / var(--tw-text-opacity))}.badge-danger{--tw-bg-opacity: 1;background-color:rgb(254 226 226 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(239 68 68 / var(--tw-text-opacity))}.badge-success{--tw-bg-opacity: 1;background-color:rgb(209 250 229 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(16 185 129 / var(--tw-text-opacity))}.badge-secondary{--tw-bg-opacity: 1;background-color:rgb(31 41 55 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(229 231 235 / var(--tw-text-opacity))}.badge-warning{--tw-bg-opacity: 1;background-color:rgb(59 130 246 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(217 119 6 / var(--tw-text-opacity))}.badge-info{--tw-bg-opacity: 1;background-color:rgb(219 234 254 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(59 130 246 / var(--tw-text-opacity))}@media (min-width: 640px){.dataTables_length{margin-top:1.25rem!important;margin-bottom:1.25rem!important}}@media (min-width: 1024px){.dataTables_length{margin-top:1rem!important;margin-bottom:1rem!important}}.dataTables_length select{margin-left:.5rem!important;margin-right:.5rem!important;--tw-bg-opacity: 1 !important;background-color:rgb(255 255 255 / var(--tw-bg-opacity))!important;margin-top:.5rem;align-items:center;border-radius:.25rem;border-width:1px;--tw-border-opacity: 1;border-color:rgb(209 213 219 / var(--tw-border-opacity));padding:.5rem 1rem;font-size:.875rem;line-height:1.25rem}.dataTables_length select:focus{--tw-bg-opacity: 1;background-color:rgb(249 250 251 / var(--tw-bg-opacity));outline:2px solid transparent;outline-offset:2px}.dataTables_filter{margin-bottom:1rem}.dataTables_filter input{margin-top:.5rem;align-items:center;border-radius:.25rem;border-width:1px;--tw-border-opacity: 1;border-color:rgb(209 213 219 / var(--tw-border-opacity));padding:.5rem 1rem;font-size:.875rem;line-height:1.25rem}.dataTables_filter input:focus{--tw-bg-opacity: 1;background-color:rgb(249 250 251 / var(--tw-bg-opacity));outline:2px solid transparent;outline-offset:2px}@media (min-width: 1024px){.dataTables_filter{margin-top:-3rem!important}}.dataTables_paginate{padding-bottom:1.5rem!important;padding-top:.5rem!important}.dataTables_paginate .paginate_button{margin-right:.25rem!important;cursor:pointer!important;border-width:1px!important;--tw-border-opacity: 1 !important;border-color:rgb(209 213 219 / var(--tw-border-opacity))!important;--tw-bg-opacity: 1 !important;background-color:rgb(255 255 255 / var(--tw-bg-opacity))!important;font-weight:500!important;--tw-text-opacity: 1 !important;color:rgb(55 65 81 / var(--tw-text-opacity))!important;border-radius:.25rem;padding:.75rem 1rem;font-size:.875rem;line-height:1rem;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-duration:.15s;transition-timing-function:cubic-bezier(.4,0,.2,1)}.dataTables_paginate .current{--tw-bg-opacity: 1 !important;background-color:rgb(37 99 235 / var(--tw-bg-opacity))!important;--tw-text-opacity: 1 !important;color:rgb(255 255 255 / var(--tw-text-opacity))!important}.dataTables_info{font-size:.875rem!important;line-height:1.25rem!important}.dataTables_empty{padding-top:1rem!important;padding-bottom:1rem!important}.pagination{display:flex!important;align-items:center!important}.pagination .page-link{margin-top:-1px!important;display:inline-flex!important;cursor:pointer!important;align-items:center!important;border-top-width:2px!important;border-color:transparent!important;padding-left:1rem!important;padding-right:1rem!important;padding-top:1rem!important;font-size:.875rem!important;font-weight:500!important;line-height:1.25rem!important;--tw-text-opacity: 1 !important;color:rgb(107 114 128 / var(--tw-text-opacity))!important;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter!important;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter!important;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter!important;transition-duration:.15s!important;transition-timing-function:cubic-bezier(.4,0,.2,1)!important}.pagination .page-link:hover{--tw-border-opacity: 1 !important;border-color:rgb(209 213 219 / var(--tw-border-opacity))!important;--tw-text-opacity: 1 !important;color:rgb(55 65 81 / var(--tw-text-opacity))!important}.pagination .page-link:focus{--tw-border-opacity: 1;border-color:rgb(156 163 175 / var(--tw-border-opacity));--tw-text-opacity: 1;color:rgb(55 65 81 / var(--tw-text-opacity));outline:2px solid transparent;outline-offset:2px}.pagination .active>span{--tw-border-opacity: 1 !important;border-color:rgb(37 99 235 / var(--tw-border-opacity))!important;--tw-text-opacity: 1 !important;color:rgb(37 99 235 / var(--tw-text-opacity))!important}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border-width:0}.pointer-events-none{pointer-events:none}.pointer-events-auto{pointer-events:auto}.visible{visibility:visible}.collapse{visibility:collapse}.static{position:static}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.sticky{position:sticky}.inset-0{top:0;right:0;bottom:0;left:0}.inset-x-0{left:0;right:0}.inset-y-0{top:0;bottom:0}.bottom-0{bottom:0}.left-0{left:0}.left-1{left:.25rem}.right-0{right:0}.top-0{top:0}.top-1{top:.25rem}.z-0{z-index:0}.z-10{z-index:10}.z-30{z-index:30}.z-40{z-index:40}.z-50{z-index:50}.col-auto{grid-column:auto}.col-span-1{grid-column:span 1 / span 1}.col-span-12{grid-column:span 12 / span 12}.col-span-2{grid-column:span 2 / span 2}.col-span-3{grid-column:span 3 / span 3}.col-span-4{grid-column:span 4 / span 4}.col-span-6{grid-column:span 6 / span 6}.col-span-8{grid-column:span 8 / span 8}.float-right{float:right}.m-0{margin:0}.m-auto{margin:auto}.-my-2{margin-top:-.5rem;margin-bottom:-.5rem}.-my-6{margin-top:-1.5rem;margin-bottom:-1.5rem}.mx-2{margin-left:.5rem;margin-right:.5rem}.mx-4{margin-left:1rem;margin-right:1rem}.mx-6{margin-left:1.5rem;margin-right:1.5rem}.mx-\[22px\]{margin-left:22px;margin-right:22px}.mx-\[40px\]{margin-left:40px;margin-right:40px}.mx-\[auto\],.mx-auto{margin-left:auto;margin-right:auto}.my-10{margin-top:2.5rem;margin-bottom:2.5rem}.my-2{margin-top:.5rem;margin-bottom:.5rem}.my-3{margin-top:.75rem;margin-bottom:.75rem}.my-4{margin-top:1rem;margin-bottom:1rem}.my-6{margin-top:1.5rem;margin-bottom:1.5rem}.-ml-1{margin-left:-.25rem}.-ml-4{margin-left:-1rem}.-ml-px{margin-left:-1px}.-mr-1{margin-right:-.25rem}.-mr-14{margin-right:-3.5rem}.-mt-4{margin-top:-1rem}.-mt-6{margin-top:-1.5rem}.mb-0{margin-bottom:0}.mb-1{margin-bottom:.25rem}.mb-1\.5{margin-bottom:.375rem}.mb-10{margin-bottom:2.5rem}.mb-12{margin-bottom:3rem}.mb-2{margin-bottom:.5rem}.mb-3{margin-bottom:.75rem}.mb-4{margin-bottom:1rem}.mb-5{margin-bottom:1.25rem}.mb-6{margin-bottom:1.5rem}.mb-8{margin-bottom:2rem}.mb-\[10px\]{margin-bottom:10px}.mb-\[11px\]{margin-bottom:11px}.mb-\[20px\]{margin-bottom:20px}.mb-\[25px\]{margin-bottom:25px}.mb-\[26px\]{margin-bottom:26px}.mb-\[36px\]{margin-bottom:36px}.mb-\[40px\]{margin-bottom:40px}.mb-\[5px\]{margin-bottom:5px}.ml-0{margin-left:0}.ml-1{margin-left:.25rem}.ml-2{margin-left:.5rem}.ml-3{margin-left:.75rem}.ml-4{margin-left:1rem}.ml-5{margin-left:1.25rem}.ml-\[10px\]{margin-left:10px}.mr-0{margin-right:0}.mr-1{margin-right:.25rem}.mr-2{margin-right:.5rem}.mr-3{margin-right:.75rem}.mr-4{margin-right:1rem}.mr-5{margin-right:1.25rem}.mr-6{margin-right:1.5rem}.mt-0{margin-top:0}.mt-1{margin-top:.25rem}.mt-10{margin-top:2.5rem}.mt-2{margin-top:.5rem}.mt-20{margin-top:5rem}.mt-3{margin-top:.75rem}.mt-4{margin-top:1rem}.mt-5{margin-top:1.25rem}.mt-6{margin-top:1.5rem}.mt-8{margin-top:2rem}.mt-\[30px\]{margin-top:30px}.mt-\[50px\]{margin-top:50px}.mt-\[auto\]{margin-top:auto}.block{display:block}.inline-block{display:inline-block}.flex{display:flex}.inline-flex{display:inline-flex}.table{display:table}.grid{display:grid}.contents{display:contents}.hidden{display:none}.h-0{height:0px}.h-10{height:2.5rem}.h-12{height:3rem}.h-14{height:3.5rem}.h-16{height:4rem}.h-24{height:6rem}.h-3{height:.75rem}.h-4{height:1rem}.h-5{height:1.25rem}.h-6{height:1.5rem}.h-64{height:16rem}.h-8{height:2rem}.h-\[1px\]{height:1px}.h-\[40px\]{height:40px}.h-auto{height:auto}.h-fit{height:-moz-fit-content;height:fit-content}.h-full{height:100%}.h-screen{height:100vh}.min-h-\[450px\]{min-height:450px}.min-h-screen{min-height:100vh}.w-0{width:0px}.w-1{width:.25rem}.w-1\/2{width:50%}.w-1\/4{width:25%}.w-1\/6{width:16.666667%}.w-10{width:2.5rem}.w-12{width:3rem}.w-14{width:3.5rem}.w-16{width:4rem}.w-24{width:6rem}.w-3{width:.75rem}.w-3\/4{width:75%}.w-4{width:1rem}.w-4\/5{width:80%}.w-4\/6{width:66.666667%}.w-48{width:12rem}.w-5{width:1.25rem}.w-5\/6{width:83.333333%}.w-56{width:14rem}.w-6{width:1.5rem}.w-64{width:16rem}.w-8{width:2rem}.w-80{width:20rem}.w-\[100\%\]{width:100%}.w-\[87px\]{width:87px}.w-auto{width:auto}.w-full{width:100%}.w-screen{width:100vw}.min-w-full{min-width:100%}.max-w-2xl{max-width:42rem}.max-w-4xl{max-width:56rem}.max-w-\[212px\]{max-width:212px}.max-w-\[450px\]{max-width:450px}.max-w-\[625px\]{max-width:625px}.max-w-xl{max-width:36rem}.max-w-xs{max-width:20rem}.flex-1{flex:1 1 0%}.flex-shrink{flex-shrink:1}.flex-shrink-0{flex-shrink:0}.shrink{flex-shrink:1}.shrink-0{flex-shrink:0}.flex-grow,.grow{flex-grow:1}.grow-0{flex-grow:0}.basis-1\/2{flex-basis:50%}.basis-full{flex-basis:100%}.table-auto{table-layout:auto}.border-collapse{border-collapse:collapse}.origin-top-right{transform-origin:top right}.-translate-x-full{--tw-translate-x: -100%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.translate-x-0{--tw-translate-x: 0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.translate-y-0{--tw-translate-y: 0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.translate-y-4{--tw-translate-y: 1rem;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.scale-100{--tw-scale-x: 1;--tw-scale-y: 1;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.scale-95{--tw-scale-x: .95;--tw-scale-y: .95;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.transform{transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}@keyframes spin{to{transform:rotate(360deg)}}.animate-spin{animation:spin 1s linear infinite}.cursor-pointer{cursor:pointer}.resize{resize:both}.list-none{list-style-type:none}.appearance-none{-webkit-appearance:none;-moz-appearance:none;appearance:none}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.grid-cols-6{grid-template-columns:repeat(6,minmax(0,1fr))}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.flex-col-reverse{flex-direction:column-reverse}.flex-wrap{flex-wrap:wrap}.place-content-end{place-content:end}.place-items-center{place-items:center}.content-center{align-content:center}.content-start{align-content:flex-start}.items-start{align-items:flex-start}.items-end{align-items:flex-end}.items-center{align-items:center}.items-stretch{align-items:stretch}.justify-start{justify-content:flex-start}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.justify-stretch{justify-content:stretch}.gap-0\.5{gap:.125rem}.gap-1{gap:.25rem}.gap-2{gap:.5rem}.gap-3{gap:.75rem}.gap-4{gap:1rem}.gap-5{gap:1.25rem}.gap-6{gap:1.5rem}.gap-8{gap:2rem}.gap-\[13px\]{gap:13px}.gap-\[44px\]{gap:44px}.gap-x-2{-moz-column-gap:.5rem;column-gap:.5rem}.gap-y-\[20px\]{row-gap:20px}.space-x-0>:not([hidden])~:not([hidden]){--tw-space-x-reverse: 0;margin-right:calc(0px * var(--tw-space-x-reverse));margin-left:calc(0px * calc(1 - var(--tw-space-x-reverse)))}.space-x-1>:not([hidden])~:not([hidden]){--tw-space-x-reverse: 0;margin-right:calc(.25rem * var(--tw-space-x-reverse));margin-left:calc(.25rem * calc(1 - var(--tw-space-x-reverse)))}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse: 0;margin-right:calc(.5rem * var(--tw-space-x-reverse));margin-left:calc(.5rem * calc(1 - var(--tw-space-x-reverse)))}.space-x-3>:not([hidden])~:not([hidden]){--tw-space-x-reverse: 0;margin-right:calc(.75rem * var(--tw-space-x-reverse));margin-left:calc(.75rem * calc(1 - var(--tw-space-x-reverse)))}.space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse: 0;margin-right:calc(1rem * var(--tw-space-x-reverse));margin-left:calc(1rem * calc(1 - var(--tw-space-x-reverse)))}.space-y-10>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(2.5rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(2.5rem * var(--tw-space-y-reverse))}.space-y-2>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(.5rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(.5rem * var(--tw-space-y-reverse))}.space-y-3>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(.75rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(.75rem * var(--tw-space-y-reverse))}.space-y-4>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(1rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(1rem * var(--tw-space-y-reverse))}.space-y-5>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(1.25rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(1.25rem * var(--tw-space-y-reverse))}.divide-y>:not([hidden])~:not([hidden]){--tw-divide-y-reverse: 0;border-top-width:calc(1px * calc(1 - var(--tw-divide-y-reverse)));border-bottom-width:calc(1px * var(--tw-divide-y-reverse))}.divide-gray-200>:not([hidden])~:not([hidden]){--tw-divide-opacity: 1;border-color:rgb(229 231 235 / var(--tw-divide-opacity))}.overflow-hidden{overflow:hidden}.overflow-x-auto{overflow-x:auto}.overflow-y-auto{overflow-y:auto}.overflow-y-scroll{overflow-y:scroll}.truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.overflow-ellipsis{text-overflow:ellipsis}.whitespace-nowrap{white-space:nowrap}.break-words{overflow-wrap:break-word}.break-all{word-break:break-all}.rounded{border-radius:.25rem}.rounded-\[10px\]{border-radius:10px}.rounded-full{border-radius:9999px}.rounded-lg{border-radius:.5rem}.rounded-md{border-radius:.375rem}.rounded-none{border-radius:0}.rounded-sm{border-radius:.125rem}.rounded-b-lg{border-bottom-right-radius:.5rem;border-bottom-left-radius:.5rem}.rounded-l-md{border-top-left-radius:.375rem;border-bottom-left-radius:.375rem}.rounded-r-md{border-top-right-radius:.375rem;border-bottom-right-radius:.375rem}.rounded-t-lg{border-top-left-radius:.5rem;border-top-right-radius:.5rem}.border{border-width:1px}.border-0{border-width:0px}.border-2{border-width:2px}.border-4{border-width:4px}.border-b{border-bottom-width:1px}.border-b-2{border-bottom-width:2px}.border-l-2{border-left-width:2px}.border-r{border-right-width:1px}.border-t{border-top-width:1px}.border-t-2{border-top-width:2px}.border-t-4{border-top-width:4px}.border-t-\[0px\]{border-top-width:0px}.border-t-\[10px\]{border-top-width:10px}.border-t-\[1px\]{border-top-width:1px}.border-solid{border-style:solid}.border-dashed{border-style:dashed}.border-none{border-style:none}.border-\[\#E5E7EB\]{--tw-border-opacity: 1;border-color:rgb(229 231 235 / var(--tw-border-opacity))}.border-blue-500{--tw-border-opacity: 1;border-color:rgb(59 130 246 / var(--tw-border-opacity))}.border-emerald-500{--tw-border-opacity: 1;border-color:rgb(16 185 129 / var(--tw-border-opacity))}.border-fuchsia-600{--tw-border-opacity: 1;border-color:rgb(192 38 211 / var(--tw-border-opacity))}.border-gray-100{--tw-border-opacity: 1;border-color:rgb(243 244 246 / var(--tw-border-opacity))}.border-gray-200{--tw-border-opacity: 1;border-color:rgb(229 231 235 / var(--tw-border-opacity))}.border-gray-300{--tw-border-opacity: 1;border-color:rgb(209 213 219 / var(--tw-border-opacity))}.border-gray-500{--tw-border-opacity: 1;border-color:rgb(107 114 128 / var(--tw-border-opacity))}.border-gray-600{--tw-border-opacity: 1;border-color:rgb(75 85 99 / var(--tw-border-opacity))}.border-red-300{--tw-border-opacity: 1;border-color:rgb(252 165 165 / var(--tw-border-opacity))}.border-red-400{--tw-border-opacity: 1;border-color:rgb(248 113 113 / var(--tw-border-opacity))}.border-red-500{--tw-border-opacity: 1;border-color:rgb(239 68 68 / var(--tw-border-opacity))}.border-red-900{--tw-border-opacity: 1;border-color:rgb(127 29 29 / var(--tw-border-opacity))}.border-transparent{border-color:transparent}.border-opacity-50{--tw-border-opacity: .5}.bg-\[\#F2F9FE\]{--tw-bg-opacity: 1;background-color:rgb(242 249 254 / var(--tw-bg-opacity))}.bg-blue-50{--tw-bg-opacity: 1;background-color:rgb(239 246 255 / var(--tw-bg-opacity))}.bg-blue-500{--tw-bg-opacity: 1;background-color:rgb(59 130 246 / var(--tw-bg-opacity))}.bg-blue-600{--tw-bg-opacity: 1;background-color:rgb(37 99 235 / var(--tw-bg-opacity))}.bg-blue-700{--tw-bg-opacity: 1;background-color:rgb(29 78 216 / var(--tw-bg-opacity))}.bg-emerald-600{--tw-bg-opacity: 1;background-color:rgb(5 150 105 / var(--tw-bg-opacity))}.bg-gray-100{--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity))}.bg-gray-200{--tw-bg-opacity: 1;background-color:rgb(229 231 235 / var(--tw-bg-opacity))}.bg-gray-50{--tw-bg-opacity: 1;background-color:rgb(249 250 251 / var(--tw-bg-opacity))}.bg-gray-500{--tw-bg-opacity: 1;background-color:rgb(107 114 128 / var(--tw-bg-opacity))}.bg-gray-600{--tw-bg-opacity: 1;background-color:rgb(75 85 99 / var(--tw-bg-opacity))}.bg-red-100{--tw-bg-opacity: 1;background-color:rgb(254 226 226 / var(--tw-bg-opacity))}.bg-red-500{--tw-bg-opacity: 1;background-color:rgb(239 68 68 / var(--tw-bg-opacity))}.bg-transparent{background-color:transparent}.bg-white{--tw-bg-opacity: 1;background-color:rgb(255 255 255 / var(--tw-bg-opacity))}.bg-opacity-100{--tw-bg-opacity: 1}.bg-clip-padding{background-clip:padding-box}.fill-current{fill:currentColor}.object-cover{-o-object-fit:cover;object-fit:cover}.object-scale-down{-o-object-fit:scale-down;object-fit:scale-down}.object-center{-o-object-position:center;object-position:center}.p-1{padding:.25rem}.p-10{padding:2.5rem}.p-2{padding:.5rem}.p-2\.5{padding:.625rem}.p-3{padding:.75rem}.p-4{padding:1rem}.p-5{padding:1.25rem}.p-6{padding:1.5rem}.p-8{padding:2rem}.p-\[12px\]{padding:12px}.p-\[20px\]{padding:20px}.px-0{padding-left:0;padding-right:0}.px-1{padding-left:.25rem;padding-right:.25rem}.px-12{padding-left:3rem;padding-right:3rem}.px-2{padding-left:.5rem;padding-right:.5rem}.px-3{padding-left:.75rem;padding-right:.75rem}.px-4{padding-left:1rem;padding-right:1rem}.px-5{padding-left:1.25rem;padding-right:1.25rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.px-\[12px\]{padding-left:12px;padding-right:12px}.px-\[20px\]{padding-left:20px;padding-right:20px}.px-\[22px\]{padding-left:22px;padding-right:22px}.py-0{padding-top:0;padding-bottom:0}.py-1{padding-top:.25rem;padding-bottom:.25rem}.py-10{padding-top:2.5rem;padding-bottom:2.5rem}.py-2{padding-top:.5rem;padding-bottom:.5rem}.py-3{padding-top:.75rem;padding-bottom:.75rem}.py-4{padding-top:1rem;padding-bottom:1rem}.py-5{padding-top:1.25rem;padding-bottom:1.25rem}.py-6{padding-top:1.5rem;padding-bottom:1.5rem}.py-8{padding-top:2rem;padding-bottom:2rem}.py-\[33px\]{padding-top:33px;padding-bottom:33px}.py-\[36px\]{padding-top:36px;padding-bottom:36px}.py-\[9\.5px\]{padding-top:9.5px;padding-bottom:9.5px}.pb-10{padding-bottom:2.5rem}.pb-2{padding-bottom:.5rem}.pb-20{padding-bottom:5rem}.pb-3{padding-bottom:.75rem}.pb-4{padding-bottom:1rem}.pb-6{padding-bottom:1.5rem}.pb-8{padding-bottom:2rem}.pb-\[20px\]{padding-bottom:20px}.pb-\[56px\]{padding-bottom:56px}.pb-\[58px\]{padding-bottom:58px}.pl-0{padding-left:0}.pl-1\.5{padding-left:.375rem}.pl-2{padding-left:.5rem}.pl-3{padding-left:.75rem}.pl-\[18px\]{padding-left:18px}.pr-10{padding-right:2.5rem}.pr-2{padding-right:.5rem}.pr-4{padding-right:1rem}.pr-\[18px\]{padding-right:18px}.pt-0{padding-top:0}.pt-2{padding-top:.5rem}.pt-4{padding-top:1rem}.pt-5{padding-top:1.25rem}.pt-6{padding-top:1.5rem}.pt-\[20px\]{padding-top:20px}.pt-\[29px\]{padding-top:29px}.pt-\[35px\]{padding-top:35px}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.align-middle{vertical-align:middle}.align-bottom{vertical-align:bottom}.font-\[\'Open_Sans\'\]{font-family:Open Sans}.text-2xl{font-size:1.5rem;line-height:2rem}.text-3xl{font-size:1.875rem;line-height:2.25rem}.text-5xl{font-size:3rem;line-height:1}.text-\[12px\]{font-size:12px}.text-\[14px\]{font-size:14px}.text-\[15px\]{font-size:15px}.text-\[16px\]{font-size:16px}.text-\[22px\]{font-size:22px}.text-\[24px\]{font-size:24px}.text-\[35px\]{font-size:35px}.text-base{font-size:1rem;line-height:1.5rem}.text-lg{font-size:1.125rem;line-height:1.75rem}.text-sm{font-size:.875rem;line-height:1.25rem}.text-xl{font-size:1.25rem;line-height:1.75rem}.text-xs{font-size:.75rem;line-height:1rem}.font-\[16px\]{font-weight:16px}.font-bold{font-weight:700}.font-light{font-weight:300}.font-medium{font-weight:500}.font-normal{font-weight:400}.font-semibold{font-weight:600}.uppercase{text-transform:uppercase}.lowercase{text-transform:lowercase}.capitalize{text-transform:capitalize}.italic{font-style:italic}.leading-4{line-height:1rem}.leading-5{line-height:1.25rem}.leading-6{line-height:1.5rem}.leading-9{line-height:2.25rem}.leading-\[1\.2rem\]{line-height:1.2rem}.leading-\[1\.35em\]{line-height:1.35em}.leading-\[1\.36em\]{line-height:1.36em}.leading-\[1\.375em\]{line-height:1.375em}.leading-\[1\.3em\]{line-height:1.3em}.leading-\[1\.5em\]{line-height:1.5em}.leading-\[1\.75em\]{line-height:1.75em}.leading-normal{line-height:1.5}.leading-tight{line-height:1.25}.tracking-tight{letter-spacing:-.025em}.tracking-wide{letter-spacing:.025em}.tracking-wider{letter-spacing:.05em}.text-\[\#212529\]{--tw-text-opacity: 1;color:rgb(33 37 41 / var(--tw-text-opacity))}.text-\[\#6C727F\]{--tw-text-opacity: 1;color:rgb(108 114 127 / var(--tw-text-opacity))}.text-black{--tw-text-opacity: 1;color:rgb(0 0 0 / var(--tw-text-opacity))}.text-blue-500{--tw-text-opacity: 1;color:rgb(59 130 246 / var(--tw-text-opacity))}.text-blue-600{--tw-text-opacity: 1;color:rgb(37 99 235 / var(--tw-text-opacity))}.text-blue-700{--tw-text-opacity: 1;color:rgb(29 78 216 / var(--tw-text-opacity))}.text-emerald-600{--tw-text-opacity: 1;color:rgb(5 150 105 / var(--tw-text-opacity))}.text-gray-300{--tw-text-opacity: 1;color:rgb(209 213 219 / var(--tw-text-opacity))}.text-gray-400{--tw-text-opacity: 1;color:rgb(156 163 175 / var(--tw-text-opacity))}.text-gray-500{--tw-text-opacity: 1;color:rgb(107 114 128 / var(--tw-text-opacity))}.text-gray-600{--tw-text-opacity: 1;color:rgb(75 85 99 / var(--tw-text-opacity))}.text-gray-700{--tw-text-opacity: 1;color:rgb(55 65 81 / var(--tw-text-opacity))}.text-gray-800{--tw-text-opacity: 1;color:rgb(31 41 55 / var(--tw-text-opacity))}.text-gray-900{--tw-text-opacity: 1;color:rgb(17 24 39 / var(--tw-text-opacity))}.text-indigo-600{--tw-text-opacity: 1;color:rgb(79 70 229 / var(--tw-text-opacity))}.text-red-400{--tw-text-opacity: 1;color:rgb(248 113 113 / var(--tw-text-opacity))}.text-red-500{--tw-text-opacity: 1;color:rgb(239 68 68 / var(--tw-text-opacity))}.text-red-600{--tw-text-opacity: 1;color:rgb(220 38 38 / var(--tw-text-opacity))}.text-red-700{--tw-text-opacity: 1;color:rgb(185 28 28 / var(--tw-text-opacity))}.text-red-900{--tw-text-opacity: 1;color:rgb(127 29 29 / var(--tw-text-opacity))}.text-white{--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}.underline{text-decoration-line:underline}.line-through{text-decoration-line:line-through}.no-underline{text-decoration-line:none}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.opacity-0{opacity:0}.opacity-100{opacity:1}.opacity-25{opacity:.25}.opacity-75{opacity:.75}.shadow{--tw-shadow: 0 1px 3px 0 rgb(0 0 0 / .1), 0 1px 2px -1px rgb(0 0 0 / .1);--tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.shadow-lg{--tw-shadow: 0 10px 15px -3px rgb(0 0 0 / .1), 0 4px 6px -4px rgb(0 0 0 / .1);--tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.shadow-sm{--tw-shadow: 0 1px 2px 0 rgb(0 0 0 / .05);--tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.shadow-xl{--tw-shadow: 0 20px 25px -5px rgb(0 0 0 / .1), 0 8px 10px -6px rgb(0 0 0 / .1);--tw-shadow-colored: 0 20px 25px -5px var(--tw-shadow-color), 0 8px 10px -6px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.outline-none{outline:2px solid transparent;outline-offset:2px}.outline{outline-style:solid}.ring-1{--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 #0000)}.ring-black{--tw-ring-opacity: 1;--tw-ring-color: rgb(0 0 0 / var(--tw-ring-opacity))}.ring-opacity-5{--tw-ring-opacity: .05}.grayscale{--tw-grayscale: grayscale(100%);filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.invert{--tw-invert: invert(100%);filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.transition{transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.transition-all{transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.transition-colors{transition-property:color,background-color,border-color,text-decoration-color,fill,stroke;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.transition-opacity{transition-property:opacity;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.duration-100{transition-duration:.1s}.duration-1000{transition-duration:1s}.duration-150{transition-duration:.15s}.duration-200{transition-duration:.2s}.duration-300{transition-duration:.3s}.duration-75{transition-duration:75ms}.ease-in{transition-timing-function:cubic-bezier(.4,0,1,1)}.ease-in-out{transition-timing-function:cubic-bezier(.4,0,.2,1)}.ease-linear{transition-timing-function:linear}.ease-out{transition-timing-function:cubic-bezier(0,0,.2,1)}.placeholder\:text-gray-500::-moz-placeholder{--tw-text-opacity: 1;color:rgb(107 114 128 / var(--tw-text-opacity))}.placeholder\:text-gray-500::placeholder{--tw-text-opacity: 1;color:rgb(107 114 128 / var(--tw-text-opacity))}.after\:absolute:after{content:var(--tw-content);position:absolute}.after\:left-\[8px\]:after{content:var(--tw-content);left:8px}.after\:top-\[5px\]:after{content:var(--tw-content);top:5px}.after\:h-\[30px\]:after{content:var(--tw-content);height:30px}.after\:w-\[30px\]:after{content:var(--tw-content);width:30px}.after\:rounded-full:after{content:var(--tw-content);border-radius:9999px}.after\:bg-white:after{content:var(--tw-content);--tw-bg-opacity: 1;background-color:rgb(255 255 255 / var(--tw-bg-opacity))}.after\:transition-all:after{content:var(--tw-content);transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.after\:content-\[\'\'\]:after{--tw-content: "";content:var(--tw-content)}.focus-within\:z-10:focus-within{z-index:10}.hover\:list-disc:hover{list-style-type:disc}.hover\:border-blue-600:hover{--tw-border-opacity: 1;border-color:rgb(37 99 235 / var(--tw-border-opacity))}.hover\:border-gray-600:hover{--tw-border-opacity: 1;border-color:rgb(75 85 99 / var(--tw-border-opacity))}.hover\:border-gray-800:hover{--tw-border-opacity: 1;border-color:rgb(31 41 55 / var(--tw-border-opacity))}.hover\:border-transparent:hover{border-color:transparent}.hover\:bg-blue-500:hover{--tw-bg-opacity: 1;background-color:rgb(59 130 246 / var(--tw-bg-opacity))}.hover\:bg-blue-600:hover{--tw-bg-opacity: 1;background-color:rgb(37 99 235 / var(--tw-bg-opacity))}.hover\:bg-gray-100:hover{--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity))}.hover\:bg-gray-200:hover{--tw-bg-opacity: 1;background-color:rgb(229 231 235 / var(--tw-bg-opacity))}.hover\:bg-red-900:hover{--tw-bg-opacity: 1;background-color:rgb(127 29 29 / var(--tw-bg-opacity))}.hover\:font-semibold:hover{font-weight:600}.hover\:text-blue-600:hover{--tw-text-opacity: 1;color:rgb(37 99 235 / var(--tw-text-opacity))}.hover\:text-gray-300:hover{--tw-text-opacity: 1;color:rgb(209 213 219 / var(--tw-text-opacity))}.hover\:text-gray-500:hover{--tw-text-opacity: 1;color:rgb(107 114 128 / var(--tw-text-opacity))}.hover\:text-gray-600:hover{--tw-text-opacity: 1;color:rgb(75 85 99 / var(--tw-text-opacity))}.hover\:text-gray-700:hover{--tw-text-opacity: 1;color:rgb(55 65 81 / var(--tw-text-opacity))}.hover\:text-gray-800:hover{--tw-text-opacity: 1;color:rgb(31 41 55 / var(--tw-text-opacity))}.hover\:text-gray-900:hover{--tw-text-opacity: 1;color:rgb(17 24 39 / var(--tw-text-opacity))}.hover\:text-indigo-900:hover{--tw-text-opacity: 1;color:rgb(49 46 129 / var(--tw-text-opacity))}.hover\:text-red-500:hover{--tw-text-opacity: 1;color:rgb(239 68 68 / var(--tw-text-opacity))}.hover\:text-white:hover{--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}.hover\:underline:hover{text-decoration-line:underline}.hover\:opacity-80:hover{opacity:.8}.hover\:shadow-2xl:hover{--tw-shadow: 0 25px 50px -12px rgb(0 0 0 / .25);--tw-shadow-colored: 0 25px 50px -12px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.hover\:shadow-lg:hover{--tw-shadow: 0 10px 15px -3px rgb(0 0 0 / .1), 0 4px 6px -4px rgb(0 0 0 / .1);--tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.hover\:shadow-sm:hover{--tw-shadow: 0 1px 2px 0 rgb(0 0 0 / .05);--tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.focus\:border-blue-300:focus{--tw-border-opacity: 1;border-color:rgb(147 197 253 / var(--tw-border-opacity))}.focus\:border-blue-500:focus{--tw-border-opacity: 1;border-color:rgb(59 130 246 / var(--tw-border-opacity))}.focus\:border-fuchsia-300:focus{--tw-border-opacity: 1;border-color:rgb(240 171 252 / var(--tw-border-opacity))}.focus\:border-indigo-500:focus{--tw-border-opacity: 1;border-color:rgb(99 102 241 / var(--tw-border-opacity))}.focus\:border-red-500:focus{--tw-border-opacity: 1;border-color:rgb(239 68 68 / var(--tw-border-opacity))}.focus\:bg-gray-100:focus{--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity))}.focus\:bg-gray-600:focus{--tw-bg-opacity: 1;background-color:rgb(75 85 99 / var(--tw-bg-opacity))}.focus\:bg-white:focus{--tw-bg-opacity: 1;background-color:rgb(255 255 255 / var(--tw-bg-opacity))}.focus\:font-semibold:focus{font-weight:600}.focus\:text-gray-500:focus{--tw-text-opacity: 1;color:rgb(107 114 128 / var(--tw-text-opacity))}.focus\:text-gray-600:focus{--tw-text-opacity: 1;color:rgb(75 85 99 / var(--tw-text-opacity))}.focus\:text-gray-900:focus{--tw-text-opacity: 1;color:rgb(17 24 39 / var(--tw-text-opacity))}.focus\:underline:focus{text-decoration-line:underline}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}.focus\:ring:focus{--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(3px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 #0000)}.focus\:ring-1:focus{--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 #0000)}.focus\:ring-blue-500:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity))}.focus\:ring-gray-500:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(107 114 128 / var(--tw-ring-opacity))}.focus\:ring-indigo-500:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(99 102 241 / var(--tw-ring-opacity))}.focus\:ring-indigo-600:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(79 70 229 / var(--tw-ring-opacity))}.focus\:ring-red-500:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(239 68 68 / var(--tw-ring-opacity))}.focus\:ring-opacity-50:focus{--tw-ring-opacity: .5}.focus-visible\:outline-none:focus-visible{outline:2px solid transparent;outline-offset:2px}.focus-visible\:ring-2:focus-visible{--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 #0000)}.focus-visible\:ring-offset-2:focus-visible{--tw-ring-offset-width: 2px}.active\:bg-gray-50:active{--tw-bg-opacity: 1;background-color:rgb(249 250 251 / var(--tw-bg-opacity))}.active\:text-gray-800:active{--tw-text-opacity: 1;color:rgb(31 41 55 / var(--tw-text-opacity))}.active\:outline-none:active{outline:2px solid transparent;outline-offset:2px}.disabled\:pointer-events-none:disabled{pointer-events:none}.disabled\:cursor-not-allowed:disabled{cursor:not-allowed}.disabled\:bg-gray-50:disabled{--tw-bg-opacity: 1;background-color:rgb(249 250 251 / var(--tw-bg-opacity))}.disabled\:opacity-50:disabled{opacity:.5}.disabled\:opacity-75:disabled{opacity:.75}.group:hover .group-hover\:border-transparent{border-color:transparent}.group:hover .group-hover\:text-white{--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}.group:hover .group-hover\:opacity-100{opacity:1}.peer:checked~.peer-checked\:text-black{--tw-text-opacity: 1;color:rgb(0 0 0 / var(--tw-text-opacity))}.peer:checked~.peer-checked\:after\:translate-x-\[140\%\]:after{content:var(--tw-content);--tw-translate-x: 140%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.peer:focus~.peer-focus\:outline-none{outline:2px solid transparent;outline-offset:2px}@media (min-width: 640px){.sm\:inset-0{top:0;right:0;bottom:0;left:0}.sm\:col-span-2{grid-column:span 2 / span 2}.sm\:col-span-3{grid-column:span 3 / span 3}.sm\:col-span-4{grid-column:span 4 / span 4}.sm\:col-span-6{grid-column:span 6 / span 6}.sm\:-mx-6{margin-left:-1.5rem;margin-right:-1.5rem}.sm\:mx-0{margin-left:0;margin-right:0}.sm\:my-8{margin-top:2rem;margin-bottom:2rem}.sm\:ml-3{margin-left:.75rem}.sm\:ml-4{margin-left:1rem}.sm\:ml-6{margin-left:1.5rem}.sm\:mt-0{margin-top:0}.sm\:mt-4{margin-top:1rem}.sm\:mt-6{margin-top:1.5rem}.sm\:block{display:block}.sm\:inline-block{display:inline-block}.sm\:inline{display:inline}.sm\:flex{display:flex}.sm\:grid{display:grid}.sm\:hidden{display:none}.sm\:h-10{height:2.5rem}.sm\:h-screen{height:100vh}.sm\:w-10{width:2.5rem}.sm\:w-auto{width:auto}.sm\:w-full{width:100%}.sm\:max-w-lg{max-width:32rem}.sm\:max-w-sm{max-width:24rem}.sm\:flex-shrink-0{flex-shrink:0}.sm\:translate-y-0{--tw-translate-y: 0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.sm\:scale-100{--tw-scale-x: 1;--tw-scale-y: 1;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.sm\:scale-95{--tw-scale-x: .95;--tw-scale-y: .95;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.sm\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.sm\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.sm\:flex-row-reverse{flex-direction:row-reverse}.sm\:flex-nowrap{flex-wrap:nowrap}.sm\:items-start{align-items:flex-start}.sm\:items-center{align-items:center}.sm\:justify-center{justify-content:center}.sm\:justify-between{justify-content:space-between}.sm\:gap-4{gap:1rem}.sm\:rounded-lg{border-radius:.5rem}.sm\:p-0{padding:0}.sm\:p-6{padding:1.5rem}.sm\:px-0{padding-left:0;padding-right:0}.sm\:px-6{padding-left:1.5rem;padding-right:1.5rem}.sm\:text-left{text-align:left}.sm\:align-middle{vertical-align:middle}.sm\:text-sm{font-size:.875rem;line-height:1.25rem}}@media (min-width: 768px){.md\:col-span-1{grid-column:span 1 / span 1}.md\:col-span-2{grid-column:span 2 / span 2}.md\:col-span-4{grid-column:span 4 / span 4}.md\:col-span-5{grid-column:span 5 / span 5}.md\:col-span-6{grid-column:span 6 / span 6}.md\:col-start-2{grid-column-start:2}.md\:col-start-4{grid-column-start:4}.md\:mx-0,.md\:mx-\[0\]{margin-left:0;margin-right:0}.md\:-mr-1{margin-right:-.25rem}.md\:mb-6{margin-bottom:1.5rem}.md\:mb-\[46px\]{margin-bottom:46px}.md\:ml-2{margin-left:.5rem}.md\:ml-6{margin-left:1.5rem}.md\:mr-0{margin-right:0}.md\:mr-2{margin-right:.5rem}.md\:mt-0{margin-top:0}.md\:mt-10{margin-top:2.5rem}.md\:mt-5{margin-top:1.25rem}.md\:block{display:block}.md\:flex{display:flex}.md\:grid{display:grid}.md\:hidden{display:none}.md\:min-h-\[411px\]{min-height:411px}.md\:w-1\/2{width:50%}.md\:w-1\/3{width:33.333333%}.md\:max-w-3xl{max-width:48rem}.md\:max-w-xl{max-width:36rem}.md\:flex-shrink-0{flex-shrink:0}.md\:shrink{flex-shrink:1}.md\:grow-0{flex-grow:0}.md\:basis-1\/2{flex-basis:50%}.md\:basis-\[449px\]{flex-basis:449px}.md\:grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.md\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.md\:flex-row{flex-direction:row}.md\:flex-col{flex-direction:column}.md\:items-center{align-items:center}.md\:justify-center{justify-content:center}.md\:justify-between{justify-content:space-between}.md\:gap-6{gap:1.5rem}.md\:gap-x-\[21px\]{-moz-column-gap:21px;column-gap:21px}.md\:gap-y-6{row-gap:1.5rem}.md\:border-r{border-right-width:1px}.md\:border-\[\#E5E7EB\]{--tw-border-opacity: 1;border-color:rgb(229 231 235 / var(--tw-border-opacity))}.md\:p-24{padding:6rem}.md\:px-8{padding-left:2rem;padding-right:2rem}.md\:px-\[40px\]{padding-left:40px;padding-right:40px}.md\:pb-\[40px\]{padding-bottom:40px}.md\:pl-4{padding-left:1rem}.md\:pl-\[52px\]{padding-left:52px}.md\:pl-\[61px\]{padding-left:61px}.md\:pr-\[20px\]{padding-right:20px}.md\:pr-\[48px\]{padding-right:48px}.md\:pt-0{padding-top:0}.md\:pt-\[58px\]{padding-top:58px}.md\:text-left{text-align:left}.md\:text-center{text-align:center}.md\:text-2xl{font-size:1.5rem;line-height:2rem}.md\:text-\[30px\]{font-size:30px}.md\:text-\[32px\]{font-size:32px}.md\:text-sm{font-size:.875rem;line-height:1.25rem}}@media (min-width: 1024px){.lg\:col-span-3{grid-column:span 3 / span 3}.lg\:col-span-6{grid-column:span 6 / span 6}.lg\:col-span-7{grid-column:span 7 / span 7}.lg\:col-span-8{grid-column:span 8 / span 8}.lg\:col-start-3{grid-column-start:3}.lg\:col-start-4{grid-column-start:4}.lg\:-mx-8{margin-left:-2rem;margin-right:-2rem}.lg\:-mb-1{margin-bottom:-.25rem}.lg\:-ml-5{margin-left:-1.25rem}.lg\:mt-24{margin-top:6rem}.lg\:block{display:block}.lg\:flex{display:flex}.lg\:grid{display:grid}.lg\:hidden{display:none}.lg\:h-screen{height:100vh}.lg\:w-1\/2{width:50%}.lg\:w-1\/3{width:33.333333%}.lg\:w-1\/4{width:25%}.lg\:w-1\/5{width:20%}.lg\:max-w-\[80\%\]{max-width:80%}.lg\:grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.lg\:items-center{align-items:center}.lg\:gap-4{gap:1rem}.lg\:rounded-lg{border-radius:.5rem}.lg\:px-16{padding-left:4rem;padding-right:4rem}.lg\:px-2{padding-left:.5rem;padding-right:.5rem}.lg\:px-4{padding-left:1rem;padding-right:1rem}.lg\:px-8{padding-left:2rem;padding-right:2rem}.lg\:py-2{padding-top:.5rem;padding-bottom:.5rem}}@media (min-width: 1280px){.xl\:col-span-4{grid-column:span 4 / span 4}.xl\:col-span-6{grid-column:span 6 / span 6}.xl\:col-span-8{grid-column:span 8 / span 8}.xl\:col-span-9{grid-column:span 9 / span 9}.xl\:col-start-4{grid-column-start:4}.xl\:ml-5{margin-left:1.25rem}.xl\:mt-0{margin-top:0}.xl\:mt-32{margin-top:8rem}.xl\:flex{display:flex}.xl\:w-auto{width:auto}.xl\:basis-auto{flex-basis:auto}.xl\:flex-row{flex-direction:row}.xl\:flex-nowrap{flex-wrap:nowrap}.xl\:justify-center{justify-content:center}.xl\:border-r{border-right-width:1px}.xl\:border-\[\#E5E7EB\]{--tw-border-opacity: 1;border-color:rgb(229 231 235 / var(--tw-border-opacity))}.xl\:px-16{padding-left:4rem;padding-right:4rem}.xl\:px-20{padding-left:5rem;padding-right:5rem}.xl\:px-5{padding-left:1.25rem;padding-right:1.25rem}.xl\:pr-20{padding-right:5rem}}@media (prefers-color-scheme: dark){.dark\:border-gray-600{--tw-border-opacity: 1;border-color:rgb(75 85 99 / var(--tw-border-opacity))}.dark\:bg-gray-700{--tw-bg-opacity: 1;background-color:rgb(55 65 81 / var(--tw-bg-opacity))}.dark\:text-white{--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}.dark\:placeholder-gray-400::-moz-placeholder{--tw-placeholder-opacity: 1;color:rgb(156 163 175 / var(--tw-placeholder-opacity))}.dark\:placeholder-gray-400::placeholder{--tw-placeholder-opacity: 1;color:rgb(156 163 175 / var(--tw-placeholder-opacity))}.dark\:focus\:border-blue-500:focus{--tw-border-opacity: 1;border-color:rgb(59 130 246 / var(--tw-border-opacity))}.dark\:focus\:ring-blue-500:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity))}}
diff --git a/public/build/manifest.json b/public/build/manifest.json
index 54d07c3a195..0762b8f31d9 100644
--- a/public/build/manifest.json
+++ b/public/build/manifest.json
@@ -372,7 +372,7 @@
     "src": "resources/js/setup/setup.js"
   },
   "resources/sass/app.scss": {
-    "file": "assets/app-6dd57ed5.css",
+    "file": "assets/app-ee6f3b1c.css",
     "isEntry": true,
     "src": "resources/sass/app.scss"
   }
diff --git a/resources/views/billing-portal/v3/cart/cart.blade.php b/resources/views/billing-portal/v3/cart/cart.blade.php
index 39c846df96c..0d6f6f69318 100644
--- a/resources/views/billing-portal/v3/cart/cart.blade.php
+++ b/resources/views/billing-portal/v3/cart/cart.blade.php
@@ -1,10 +1,10 @@
 <div>
-    <livewire:billing-portal.cart.recurring-products
+    <livewire:billing-portal.cart.one-time-products
         :subscription="$subscription"
         :context="$context"
     />
 
-    <livewire:billing-portal.cart.one-time-products
+    <livewire:billing-portal.cart.recurring-products
         :subscription="$subscription"
         :context="$context"
     />
@@ -18,6 +18,8 @@
         :context="$context"
     />
 
+    <div class="mt-10"></div>
+
     <livewire:billing-portal.cart.optional-one-time-products
         :subscription="$subscription"
         :context="$context"
diff --git a/resources/views/billing-portal/v3/cart/one-time-products.blade.php b/resources/views/billing-portal/v3/cart/one-time-products.blade.php
index 12ed06f652c..0239196b274 100644
--- a/resources/views/billing-portal/v3/cart/one-time-products.blade.php
+++ b/resources/views/billing-portal/v3/cart/one-time-products.blade.php
@@ -29,20 +29,18 @@ class="h-full w-full object-cover object-center border rounded-md"
 
                 <div class="flex flex-col-reverse space-y-3">
                     <div class="flex">
-                        @if($subscription->per_seat_enabled)
-                            @if($subscription->use_inventory_management && $product['in_stock_quantity'] <= 0)
-                                <p class="text-sm font-light text-red-500 text-right mr-2 mt-2">{{ ctrans('texts.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 id="{{ $product['hashed_id'] }}" wire:change="quantity($event.target.id, $event.target.value)" class="rounded-md border-gray-300 shadow-sm sm:text-sm" {{ $subscription->use_inventory_management && $product['in_stock_quantity'] < 1 ? 'disabled' : '' }}>
-                                <option {{ $entry['quantity'] == '0' ? 'selected' : '' }} value="0" selected="selected">0</option>
-                                @for ($i = 1; $i <= ($subscription->use_inventory_management ? min($product['in_stock_quantity'], min(100,$product['max_quantity'])) : min(100,$product['max_quantity'])); $i++)
-                                    <option {{ $entry['quantity'] == $i ? 'selected' : '' }} value="{{ $i }}">{{ $i }}</option>
-                                @endfor
-                            </select>
+                        @if($subscription->use_inventory_management && $product['in_stock_quantity'] <= 0)
+                            <p class="text-sm font-light text-red-500 text-right mr-2 mt-2">{{ ctrans('texts.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 id="{{ $product['hashed_id'] }}" wire:change="quantity($event.target.id, $event.target.value)" class="rounded-md border-gray-300 shadow-sm sm:text-sm" {{ $subscription->use_inventory_management && $product['in_stock_quantity'] < 1 ? 'disabled' : '' }}>
+                            <option value="1" selected="selected">1</option>
+                            @for ($i = 2; $i <= $subscription->maxQuantity($product); $i++)
+                                <option {{ $entry['quantity'] == $i ? 'selected' : '' }} value="{{ $i }}">{{ $i }}</option>
+                            @endfor
+                        </select>
                     </div>
                 </div>
             </div>
diff --git a/resources/views/billing-portal/v3/cart/optional-one-time-products.blade.php b/resources/views/billing-portal/v3/cart/optional-one-time-products.blade.php
index 5b5839c1cac..7be4504c90c 100644
--- a/resources/views/billing-portal/v3/cart/optional-one-time-products.blade.php
+++ b/resources/views/billing-portal/v3/cart/optional-one-time-products.blade.php
@@ -37,7 +37,7 @@ class="h-full w-full object-cover object-center border rounded-md"
                             
                         <select id="{{ $product['hashed_id'] }}" wire:change="quantity($event.target.id, $event.target.value)" class="rounded-md border-gray-300 shadow-sm sm:text-sm" {{ $subscription->use_inventory_management && $product['in_stock_quantity'] < 1 ? 'disabled' : '' }}>
                             <option {{ $entry['quantity'] == '0' ? 'selected' : '' }} value="0" selected="selected">0</option>
-                            @for ($i = 1; $i <= ($subscription->use_inventory_management ? min($product['in_stock_quantity'], min(100,$product['max_quantity'])) : min(100,$product['max_quantity'])); $i++)
+                            @for ($i = 1; $i <= $subscription->maxQuantity($product); $i++)
                                 <option {{ $entry['quantity'] == $i ? 'selected' : '' }} value="{{ $i }}">{{ $i }}</option>
                             @endfor
                         </select>
diff --git a/resources/views/billing-portal/v3/cart/optional-recurring-products.blade.php b/resources/views/billing-portal/v3/cart/optional-recurring-products.blade.php
index 92b3bdba98c..425b8ae1cf0 100644
--- a/resources/views/billing-portal/v3/cart/optional-recurring-products.blade.php
+++ b/resources/views/billing-portal/v3/cart/optional-recurring-products.blade.php
@@ -38,7 +38,7 @@ class="h-full w-full object-cover object-center border rounded-md"
 
                         <select id="{{ $product['hashed_id'] }}" wire:change="quantity($event.target.id, $event.target.value)" class="rounded-md border-gray-300 shadow-sm sm:text-sm" {{ $subscription->use_inventory_management && $product['in_stock_quantity'] < 1 ? 'disabled' : '' }}>
                             <option {{ $entry['quantity'] == '0' ? 'selected' : '' }} value="0" selected="selected">0</option>
-                            @for ($i = 1; $i <= ($subscription->use_inventory_management ? min($product['in_stock_quantity'], min(100,$product['max_quantity'])) : min(100,$product['max_quantity'])); $i++)
+                            @for ($i = 1; $i <= $subscription->maxQuantity($product); $i++)
                                 <option {{ $entry['quantity'] == $i ? 'selected' : '' }} value="{{ $i }}">{{ $i }}</option>
                             @endfor
                         </select>
diff --git a/resources/views/portal/ninja2020/auth/includes/register/popup.blade.php b/resources/views/portal/ninja2020/auth/includes/register/popup.blade.php
index eedfc3db6ef..a7a0dc676b7 100644
--- a/resources/views/portal/ninja2020/auth/includes/register/popup.blade.php
+++ b/resources/views/portal/ninja2020/auth/includes/register/popup.blade.php
@@ -2,30 +2,53 @@
 
 <span class="text-gray-300">/</span>
 
-<div x-show="{{ $property }}" class="fixed bottom-0 inset-x-0 px-4 pb-4 sm:inset-0 sm:flex sm:items-center sm:justify-center z-10">
-    <div x-show="{{ $property }}" x-transition:enter="ease-out duration-300" x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-200" x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0" class="fixed inset-0 transition-opacity">
-        <div class="absolute inset-0 bg-gray-500 opacity-75"></div>
-    </div>
+<div x-show="{{ $property }}" class="fixed inset-0 overflow-y-auto z-50" aria-labelledby="modal-title" role="dialog" aria-modal="true">
+    <div class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
+        <div x-show="{{ $property }}" 
+             x-transition:enter="ease-out duration-300" 
+             x-transition:enter-start="opacity-0" 
+             x-transition:enter-end="opacity-100" 
+             x-transition:leave="ease-in duration-200" 
+             x-transition:leave-start="opacity-100" 
+             x-transition:leave-end="opacity-0" 
+             class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity" 
+             aria-hidden="true"></div>
 
-    <div x-show="{{ $property }}" x-transition:enter="ease-out duration-300" x-transition:enter-start="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95" x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100" x-transition:leave="ease-in duration-200" x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100" x-transition:leave-end="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95" class="relative bg-white rounded-lg px-4 pt-5 pb-4 overflow-hidden shadow-xl transform transition-all sm:max-w-lg sm:w-full sm:p-6" role="dialog" aria-modal="true" aria-labelledby="modal-headline">
-        <div class="hidden sm:block absolute top-0 right-0 pt-4 pr-4">
-            <button @click="{{ $property }} = false" type="button" class="text-gray-400 hover:text-gray-500 focus:outline-none focus:text-gray-500 transition ease-in-out duration-150" aria-label="Close">
-                <svg class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
-                </svg>
-            </button>
-        </div>
-        <div class="sm:flex sm:items-start">
-            <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
-                <h3 class="text-lg leading-6 font-medium text-gray-900" id="modal-headline">
-                    {{ $title }}
-                </h3>
-                <div class="mt-2">
-                    <p class="text-sm leading-5 text-gray-500 h-64 overflow-y-scroll">
-                        {{ $content }}
-                    </p>
+        <span class="hidden sm:inline-block sm:align-middle sm:h-screen" aria-hidden="true">&#8203;</span>
+
+        <div x-show="{{ $property }}" 
+             x-transition:enter="ease-out duration-300" 
+             x-transition:enter-start="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95" 
+             x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100" 
+             x-transition:leave="ease-in duration-200" 
+             x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100" 
+             x-transition:leave-end="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95" 
+             class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-4xl sm:w-full"
+             style="width: 90%; max-height: 90vh;">
+            
+            <div class="absolute top-0 right-0 pt-4 pr-4">
+                <button @click="{{ $property }} = false" type="button" class="bg-white rounded-md text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
+                    <span class="sr-only">Close</span>
+                    <svg class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+                    </svg>
+                </button>
+            </div>
+            
+            <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+                <div class="sm:flex sm:items-start">
+                    <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left w-full">
+                        <h3 class="text-lg leading-6 font-medium text-gray-900" id="modal-headline">
+                            {{ $title }}
+                        </h3>
+                        <div class="mt-2" style="max-height: calc(90vh - 200px); overflow-y: auto;">
+                            <p class="text-sm leading-5 text-gray-500 whitespace-pre-line">
+                                {!! nl2br(e($content)) !!}
+                            </p>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
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 c9e81ebc7cf..986d0d727c0 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
@@ -75,7 +75,7 @@
                                         @endfor
                                     }
                                     @else
-                                        @for ($i = 2; $i <= ($subscription->use_inventory_management ? min($product->in_stock_quantity, max(100,$product->max_quantity)) : max(100,$product->max_quantity)); $i++)
+                                        @for ($i = 2; $i <= $subscription->maxQuantity($product); $i++)
                                         <option value="{{$i}}">{{$i}}</option>
                                         @endfor
                                     @endif
@@ -169,7 +169,7 @@
                                         @endif
                                         >
                                         <option value="0" selected="selected">0</option>
-                                        @for ($i = 1; $i <= ($subscription->use_inventory_management ? min($product->in_stock_quantity, max(100,$product->max_quantity)) : max(100,$product->max_quantity)); $i++)
+                                        @for ($i = 1; $i <= $subscription->maxQuantity($product); $i++)
                                         <option value="{{$i}}">{{$i}}</option>
                                         @endfor
                                     </select>
@@ -211,7 +211,7 @@
                                     @endif
                                     <select wire:model.live.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 <= ($subscription->use_inventory_management ? min($product->in_stock_quantity, min(100,$product->max_quantity)) : min(100,$product->max_quantity)); $i++)
+                                        @for ($i = 1; $i <= $subscription->maxQuantity($product); $i++)
                                         <option value="{{$i}}">{{$i}}</option>
                                         @endfor
                                     </select>
@@ -289,10 +289,6 @@
 
 
                     @if($discount)
-                    <!-- <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>
diff --git a/resources/views/portal/ninja2020/gateways/square/credit_card/pay_livewire.blade.php b/resources/views/portal/ninja2020/gateways/square/credit_card/pay_livewire.blade.php
index 219b4d2e739..9a548d27d9d 100644
--- a/resources/views/portal/ninja2020/gateways/square/credit_card/pay_livewire.blade.php
+++ b/resources/views/portal/ninja2020/gateways/square/credit_card/pay_livewire.blade.php
@@ -57,35 +57,34 @@
 
     @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.pay_with')])
         <div class="flex flex-col" id="loader">
-            <div class="loader ease-linear rounded-full border-4 border-t-4 border-gray-200 h-12 w-12 mb-4"></div>
+            <div class="loader ease-linear rounded-full border-4 border-t-4 border-gray-200 h-12 w-12 mb-4" id="loader"></div>
         </div>
 
-        <ul class="list-none hover:list-disc " id="payment-list">
-        @if (count($tokens) > 0)
-            @foreach($tokens as $token)
-            <li class="py-2 hover:text-blue hover:bg-blue-600">
-                <label class="mr-4">
-                    <input
-                        type="radio"
-                        data-token="{{ $token->token }}"
-                        name="payment-type"
-                        class="form-check-input text-indigo-600 rounded-full cursor-pointer toggle-payment-with-token toggle-payment-with-token"
-                        />
-                    <span class="ml-1 cursor-pointer">**** {{ $token->meta?->last4 }} - {{ $token->meta?->exp_month ?? 'xx' }}/{{ $token->meta?->exp_year ?? 'xx' }}</span>
-                </label>
-            </li>
-            @endforeach
-        @endisset
-
-            <li class="py-2 hover:text-blue hover:bg-blue-600">
-                <label>
+        <ul class="list-none space-y-2" id="payment-list">
+            @if (count($tokens) > 0)
+                @foreach($tokens as $token)
+                <li class="py-2 hover:bg-gray-100 rounded transition-colors duration-150">
+                    <label class="flex items-center cursor-pointer px-2">
+                        <input
+                            type="radio"
+                            data-token="{{ $token->token }}"
+                            name="payment-type"
+                            class="form-radio text-indigo-600 rounded-full cursor-pointer toggle-payment-with-token"/>
+                        <span class="ml-2 cursor-pointer">**** {{ $token->meta?->last4 }} - {{ $token->meta?->exp_month ?? 'xx' }}/{{ $token->meta?->exp_year ?? 'xx' }}</span>
+                    </label>
+                </li>
+                @endforeach
+            @endisset
+
+                <li class="py-2 hover:bg-gray-100 rounded transition-colors duration-150">
+                <label class="flex items-center cursor-pointer px-2">
                     <input
                         type="radio"
                         id="toggle-payment-with-credit-card"
-                        class="form-check-input text-indigo-600 rounded-full cursor-pointer"
+                        class="form-radio text-indigo-600 rounded-full cursor-pointer"
                         name="payment-type"
                         checked/>
-                    <span class="ml-1 cursor-pointer">{{ __('texts.new_card') }}</span>
+                    <span class="ml-2 cursor-pointer">{{ __('texts.new_card') }}</span>
                 </label>
             </li>    
         </ul>

From 9b80f74d54a5595bdeb43834f603a389158d22b0 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 10 Oct 2024 12:52:14 +1100
Subject: [PATCH 03/81] Improvements for square payments

---
 public/build/assets/app-ee6f3b1c.css          |  1 +
 .../assets/square-credit-card-2fc5c3fa.js     |  9 ------
 .../assets/square-credit-card-9e88c754.js     |  9 ++++++
 public/build/manifest.json                    |  2 +-
 .../js/clients/payments/square-credit-card.js | 29 ++++++++++++++++++-
 .../square/credit_card/pay_livewire.blade.php |  4 +--
 6 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 public/build/assets/app-ee6f3b1c.css
 delete mode 100644 public/build/assets/square-credit-card-2fc5c3fa.js
 create mode 100644 public/build/assets/square-credit-card-9e88c754.js

diff --git a/public/build/assets/app-ee6f3b1c.css b/public/build/assets/app-ee6f3b1c.css
new file mode 100644
index 00000000000..01ddbcc148b
--- /dev/null
+++ b/public/build/assets/app-ee6f3b1c.css
@@ -0,0 +1 @@
+*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:#e5e7eb}:before,:after{--tw-content: ""}html,:host{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:Open Sans,ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-feature-settings:normal;font-variation-settings:normal;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-feature-settings:inherit;font-variation-settings:inherit;font-size:100%;font-weight:inherit;line-height:inherit;letter-spacing:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dl,dd,h1,h2,h3,h4,h5,h6,hr,figure,p,pre{margin:0}fieldset{margin:0;padding:0}legend{padding:0}ol,ul,menu{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{opacity:1;color:#9ca3af}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}button,[role=button]{cursor:pointer}:disabled{cursor:default}img,svg,video,canvas,audio,iframe,embed,object{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]{display:none}[type=text],input:where(:not([type])),[type=email],[type=url],[type=password],[type=number],[type=date],[type=datetime-local],[type=month],[type=search],[type=tel],[type=time],[type=week],[multiple],textarea,select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#6b7280;border-width:1px;border-radius:0;padding:.5rem .75rem;font-size:1rem;line-height:1.5rem;--tw-shadow: 0 0 #0000}[type=text]:focus,input:where(:not([type])):focus,[type=email]:focus,[type=url]:focus,[type=password]:focus,[type=number]:focus,[type=date]:focus,[type=datetime-local]:focus,[type=month]:focus,[type=search]:focus,[type=tel]:focus,[type=time]:focus,[type=week]:focus,[multiple]:focus,textarea:focus,select:focus{outline:2px solid transparent;outline-offset:2px;--tw-ring-inset: var(--tw-empty, );--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: #2563eb;--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow);border-color:#2563eb}input::-moz-placeholder,textarea::-moz-placeholder{color:#6b7280;opacity:1}input::placeholder,textarea::placeholder{color:#6b7280;opacity:1}::-webkit-datetime-edit-fields-wrapper{padding:0}::-webkit-date-and-time-value{min-height:1.5em;text-align:inherit}::-webkit-datetime-edit{display:inline-flex}::-webkit-datetime-edit,::-webkit-datetime-edit-year-field,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute-field,::-webkit-datetime-edit-second-field,::-webkit-datetime-edit-millisecond-field,::-webkit-datetime-edit-meridiem-field{padding-top:0;padding-bottom:0}select{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e");background-position:right .5rem center;background-repeat:no-repeat;background-size:1.5em 1.5em;padding-right:2.5rem;-webkit-print-color-adjust:exact;print-color-adjust:exact}[multiple],[size]:where(select:not([size="1"])){background-image:initial;background-position:initial;background-repeat:unset;background-size:initial;padding-right:.75rem;-webkit-print-color-adjust:unset;print-color-adjust:unset}[type=checkbox],[type=radio]{-webkit-appearance:none;-moz-appearance:none;appearance:none;padding:0;-webkit-print-color-adjust:exact;print-color-adjust:exact;display:inline-block;vertical-align:middle;background-origin:border-box;-webkit-user-select:none;-moz-user-select:none;user-select:none;flex-shrink:0;height:1rem;width:1rem;color:#2563eb;background-color:#fff;border-color:#6b7280;border-width:1px;--tw-shadow: 0 0 #0000}[type=checkbox]{border-radius:0}[type=radio]{border-radius:100%}[type=checkbox]:focus,[type=radio]:focus{outline:2px solid transparent;outline-offset:2px;--tw-ring-inset: var(--tw-empty, );--tw-ring-offset-width: 2px;--tw-ring-offset-color: #fff;--tw-ring-color: #2563eb;--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}[type=checkbox]:checked,[type=radio]:checked{border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:center;background-repeat:no-repeat}[type=checkbox]:checked{background-image:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e")}@media (forced-colors: active){[type=checkbox]:checked{-webkit-appearance:auto;-moz-appearance:auto;appearance:auto}}[type=radio]:checked{background-image:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3ccircle cx='8' cy='8' r='3'/%3e%3c/svg%3e")}@media (forced-colors: active){[type=radio]:checked{-webkit-appearance:auto;-moz-appearance:auto;appearance:auto}}[type=checkbox]:checked:hover,[type=checkbox]:checked:focus,[type=radio]:checked:hover,[type=radio]:checked:focus{border-color:transparent;background-color:currentColor}[type=checkbox]:indeterminate{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 16 16'%3e%3cpath stroke='white' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M4 8h8'/%3e%3c/svg%3e");border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:center;background-repeat:no-repeat}@media (forced-colors: active){[type=checkbox]:indeterminate{-webkit-appearance:auto;-moz-appearance:auto;appearance:auto}}[type=checkbox]:indeterminate:hover,[type=checkbox]:indeterminate:focus{border-color:transparent;background-color:currentColor}[type=file]{background:unset;border-color:inherit;border-width:0;border-radius:0;padding:0;font-size:unset;line-height:inherit}[type=file]:focus{outline:1px solid ButtonText;outline:1px auto -webkit-focus-ring-color}*,:before,:after{--tw-border-spacing-x: 0;--tw-border-spacing-y: 0;--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }::backdrop{--tw-border-spacing-x: 0;--tw-border-spacing-y: 0;--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }.container{width:100%}@media (min-width: 640px){.container{max-width:640px}}@media (min-width: 768px){.container{max-width:768px}}@media (min-width: 1024px){.container{max-width:1024px}}@media (min-width: 1280px){.container{max-width:1280px}}@media (min-width: 1536px){.container{max-width:1536px}}.form-input,.form-textarea,.form-select,.form-multiselect{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#6b7280;border-width:1px;border-radius:0;padding:.5rem .75rem;font-size:1rem;line-height:1.5rem;--tw-shadow: 0 0 #0000}.form-input:focus,.form-textarea:focus,.form-select:focus,.form-multiselect:focus{outline:2px solid transparent;outline-offset:2px;--tw-ring-inset: var(--tw-empty, );--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: #2563eb;--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow);border-color:#2563eb}.form-select{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e");background-position:right .5rem center;background-repeat:no-repeat;background-size:1.5em 1.5em;padding-right:2.5rem;-webkit-print-color-adjust:exact;print-color-adjust:exact}.form-select:where([size]:not([size="1"])){background-image:initial;background-position:initial;background-repeat:unset;background-size:initial;padding-right:.75rem;-webkit-print-color-adjust:unset;print-color-adjust:unset}.form-checkbox,.form-radio{-webkit-appearance:none;-moz-appearance:none;appearance:none;padding:0;-webkit-print-color-adjust:exact;print-color-adjust:exact;display:inline-block;vertical-align:middle;background-origin:border-box;-webkit-user-select:none;-moz-user-select:none;user-select:none;flex-shrink:0;height:1rem;width:1rem;color:#2563eb;background-color:#fff;border-color:#6b7280;border-width:1px;--tw-shadow: 0 0 #0000}.form-checkbox{border-radius:0}.form-radio{border-radius:100%}.form-checkbox:focus,.form-radio:focus{outline:2px solid transparent;outline-offset:2px;--tw-ring-inset: var(--tw-empty, );--tw-ring-offset-width: 2px;--tw-ring-offset-color: #fff;--tw-ring-color: #2563eb;--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.form-checkbox:checked,.form-radio:checked{border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:center;background-repeat:no-repeat}.form-checkbox:checked{background-image:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e")}@media (forced-colors: active){.form-checkbox:checked{-webkit-appearance:auto;-moz-appearance:auto;appearance:auto}}.form-radio:checked{background-image:url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3ccircle cx='8' cy='8' r='3'/%3e%3c/svg%3e")}@media (forced-colors: active){.form-radio:checked{-webkit-appearance:auto;-moz-appearance:auto;appearance:auto}}.form-checkbox:checked:hover,.form-checkbox:checked:focus,.form-radio:checked:hover,.form-radio:checked:focus{border-color:transparent;background-color:currentColor}.form-checkbox:indeterminate{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 16 16'%3e%3cpath stroke='white' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M4 8h8'/%3e%3c/svg%3e");border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:center;background-repeat:no-repeat}@media (forced-colors: active){.form-checkbox:indeterminate{-webkit-appearance:auto;-moz-appearance:auto;appearance:auto}}.form-checkbox:indeterminate:hover,.form-checkbox:indeterminate:focus{border-color:transparent;background-color:currentColor}.prose{color:var(--tw-prose-body);max-width:65ch}.prose :where(p):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:1.25em;margin-bottom:1.25em}.prose :where([class~=lead]):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-lead);font-size:1.25em;line-height:1.6;margin-top:1.2em;margin-bottom:1.2em}.prose :where(a):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-links);text-decoration:underline;font-weight:500}.prose :where(strong):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-bold);font-weight:600}.prose :where(a strong):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(blockquote strong):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(thead th strong):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(ol):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:decimal;margin-top:1.25em;margin-bottom:1.25em;padding-inline-start:1.625em}.prose :where(ol[type=A]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:upper-alpha}.prose :where(ol[type=a]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:lower-alpha}.prose :where(ol[type=A s]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:upper-alpha}.prose :where(ol[type=a s]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:lower-alpha}.prose :where(ol[type=I]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:upper-roman}.prose :where(ol[type=i]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:lower-roman}.prose :where(ol[type=I s]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:upper-roman}.prose :where(ol[type=i s]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:lower-roman}.prose :where(ol[type="1"]):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:decimal}.prose :where(ul):not(:where([class~=not-prose],[class~=not-prose] *)){list-style-type:disc;margin-top:1.25em;margin-bottom:1.25em;padding-inline-start:1.625em}.prose :where(ol>li):not(:where([class~=not-prose],[class~=not-prose] *))::marker{font-weight:400;color:var(--tw-prose-counters)}.prose :where(ul>li):not(:where([class~=not-prose],[class~=not-prose] *))::marker{color:var(--tw-prose-bullets)}.prose :where(dt):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-headings);font-weight:600;margin-top:1.25em}.prose :where(hr):not(:where([class~=not-prose],[class~=not-prose] *)){border-color:var(--tw-prose-hr);border-top-width:1px;margin-top:3em;margin-bottom:3em}.prose :where(blockquote):not(:where([class~=not-prose],[class~=not-prose] *)){font-weight:500;font-style:italic;color:var(--tw-prose-quotes);border-inline-start-width:.25rem;border-inline-start-color:var(--tw-prose-quote-borders);quotes:"“""”""‘""’";margin-top:1.6em;margin-bottom:1.6em;padding-inline-start:1em}.prose :where(blockquote p:first-of-type):not(:where([class~=not-prose],[class~=not-prose] *)):before{content:open-quote}.prose :where(blockquote p:last-of-type):not(:where([class~=not-prose],[class~=not-prose] *)):after{content:close-quote}.prose :where(h1):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-headings);font-weight:800;font-size:2.25em;margin-top:0;margin-bottom:.8888889em;line-height:1.1111111}.prose :where(h1 strong):not(:where([class~=not-prose],[class~=not-prose] *)){font-weight:900;color:inherit}.prose :where(h2):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-headings);font-weight:700;font-size:1.5em;margin-top:2em;margin-bottom:1em;line-height:1.3333333}.prose :where(h2 strong):not(:where([class~=not-prose],[class~=not-prose] *)){font-weight:800;color:inherit}.prose :where(h3):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-headings);font-weight:600;font-size:1.25em;margin-top:1.6em;margin-bottom:.6em;line-height:1.6}.prose :where(h3 strong):not(:where([class~=not-prose],[class~=not-prose] *)){font-weight:700;color:inherit}.prose :where(h4):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-headings);font-weight:600;margin-top:1.5em;margin-bottom:.5em;line-height:1.5}.prose :where(h4 strong):not(:where([class~=not-prose],[class~=not-prose] *)){font-weight:700;color:inherit}.prose :where(img):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:2em;margin-bottom:2em}.prose :where(picture):not(:where([class~=not-prose],[class~=not-prose] *)){display:block;margin-top:2em;margin-bottom:2em}.prose :where(video):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:2em;margin-bottom:2em}.prose :where(kbd):not(:where([class~=not-prose],[class~=not-prose] *)){font-weight:500;font-family:inherit;color:var(--tw-prose-kbd);box-shadow:0 0 0 1px rgb(var(--tw-prose-kbd-shadows) / 10%),0 3px 0 rgb(var(--tw-prose-kbd-shadows) / 10%);font-size:.875em;border-radius:.3125rem;padding-top:.1875em;padding-inline-end:.375em;padding-bottom:.1875em;padding-inline-start:.375em}.prose :where(code):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-code);font-weight:600;font-size:.875em}.prose :where(code):not(:where([class~=not-prose],[class~=not-prose] *)):before{content:"`"}.prose :where(code):not(:where([class~=not-prose],[class~=not-prose] *)):after{content:"`"}.prose :where(a code):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(h1 code):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(h2 code):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit;font-size:.875em}.prose :where(h3 code):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit;font-size:.9em}.prose :where(h4 code):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(blockquote code):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(thead th code):not(:where([class~=not-prose],[class~=not-prose] *)){color:inherit}.prose :where(pre):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-pre-code);background-color:var(--tw-prose-pre-bg);overflow-x:auto;font-weight:400;font-size:.875em;line-height:1.7142857;margin-top:1.7142857em;margin-bottom:1.7142857em;border-radius:.375rem;padding-top:.8571429em;padding-inline-end:1.1428571em;padding-bottom:.8571429em;padding-inline-start:1.1428571em}.prose :where(pre code):not(:where([class~=not-prose],[class~=not-prose] *)){background-color:transparent;border-width:0;border-radius:0;padding:0;font-weight:inherit;color:inherit;font-size:inherit;font-family:inherit;line-height:inherit}.prose :where(pre code):not(:where([class~=not-prose],[class~=not-prose] *)):before{content:none}.prose :where(pre code):not(:where([class~=not-prose],[class~=not-prose] *)):after{content:none}.prose :where(table):not(:where([class~=not-prose],[class~=not-prose] *)){width:100%;table-layout:auto;margin-top:2em;margin-bottom:2em;font-size:.875em;line-height:1.7142857}.prose :where(thead):not(:where([class~=not-prose],[class~=not-prose] *)){border-bottom-width:1px;border-bottom-color:var(--tw-prose-th-borders)}.prose :where(thead th):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-headings);font-weight:600;vertical-align:bottom;padding-inline-end:.5714286em;padding-bottom:.5714286em;padding-inline-start:.5714286em}.prose :where(tbody tr):not(:where([class~=not-prose],[class~=not-prose] *)){border-bottom-width:1px;border-bottom-color:var(--tw-prose-td-borders)}.prose :where(tbody tr:last-child):not(:where([class~=not-prose],[class~=not-prose] *)){border-bottom-width:0}.prose :where(tbody td):not(:where([class~=not-prose],[class~=not-prose] *)){vertical-align:baseline}.prose :where(tfoot):not(:where([class~=not-prose],[class~=not-prose] *)){border-top-width:1px;border-top-color:var(--tw-prose-th-borders)}.prose :where(tfoot td):not(:where([class~=not-prose],[class~=not-prose] *)){vertical-align:top}.prose :where(th,td):not(:where([class~=not-prose],[class~=not-prose] *)){text-align:start}.prose :where(figure>*):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:0;margin-bottom:0}.prose :where(figcaption):not(:where([class~=not-prose],[class~=not-prose] *)){color:var(--tw-prose-captions);font-size:.875em;line-height:1.4285714;margin-top:.8571429em}.prose{--tw-prose-body: #374151;--tw-prose-headings: #111827;--tw-prose-lead: #4b5563;--tw-prose-links: #111827;--tw-prose-bold: #111827;--tw-prose-counters: #6b7280;--tw-prose-bullets: #d1d5db;--tw-prose-hr: #e5e7eb;--tw-prose-quotes: #111827;--tw-prose-quote-borders: #e5e7eb;--tw-prose-captions: #6b7280;--tw-prose-kbd: #111827;--tw-prose-kbd-shadows: 17 24 39;--tw-prose-code: #111827;--tw-prose-pre-code: #e5e7eb;--tw-prose-pre-bg: #1f2937;--tw-prose-th-borders: #d1d5db;--tw-prose-td-borders: #e5e7eb;--tw-prose-invert-body: #d1d5db;--tw-prose-invert-headings: #fff;--tw-prose-invert-lead: #9ca3af;--tw-prose-invert-links: #fff;--tw-prose-invert-bold: #fff;--tw-prose-invert-counters: #9ca3af;--tw-prose-invert-bullets: #4b5563;--tw-prose-invert-hr: #374151;--tw-prose-invert-quotes: #f3f4f6;--tw-prose-invert-quote-borders: #374151;--tw-prose-invert-captions: #9ca3af;--tw-prose-invert-kbd: #fff;--tw-prose-invert-kbd-shadows: 255 255 255;--tw-prose-invert-code: #fff;--tw-prose-invert-pre-code: #d1d5db;--tw-prose-invert-pre-bg: rgb(0 0 0 / 50%);--tw-prose-invert-th-borders: #4b5563;--tw-prose-invert-td-borders: #374151;font-size:1rem;line-height:1.75}.prose :where(picture>img):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:0;margin-bottom:0}.prose :where(li):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:.5em;margin-bottom:.5em}.prose :where(ol>li):not(:where([class~=not-prose],[class~=not-prose] *)){padding-inline-start:.375em}.prose :where(ul>li):not(:where([class~=not-prose],[class~=not-prose] *)){padding-inline-start:.375em}.prose :where(.prose>ul>li p):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:.75em;margin-bottom:.75em}.prose :where(.prose>ul>li>p:first-child):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:1.25em}.prose :where(.prose>ul>li>p:last-child):not(:where([class~=not-prose],[class~=not-prose] *)){margin-bottom:1.25em}.prose :where(.prose>ol>li>p:first-child):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:1.25em}.prose :where(.prose>ol>li>p:last-child):not(:where([class~=not-prose],[class~=not-prose] *)){margin-bottom:1.25em}.prose :where(ul ul,ul ol,ol ul,ol ol):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:.75em;margin-bottom:.75em}.prose :where(dl):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:1.25em;margin-bottom:1.25em}.prose :where(dd):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:.5em;padding-inline-start:1.625em}.prose :where(hr+*):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:0}.prose :where(h2+*):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:0}.prose :where(h3+*):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:0}.prose :where(h4+*):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:0}.prose :where(thead th:first-child):not(:where([class~=not-prose],[class~=not-prose] *)){padding-inline-start:0}.prose :where(thead th:last-child):not(:where([class~=not-prose],[class~=not-prose] *)){padding-inline-end:0}.prose :where(tbody td,tfoot td):not(:where([class~=not-prose],[class~=not-prose] *)){padding-top:.5714286em;padding-inline-end:.5714286em;padding-bottom:.5714286em;padding-inline-start:.5714286em}.prose :where(tbody td:first-child,tfoot td:first-child):not(:where([class~=not-prose],[class~=not-prose] *)){padding-inline-start:0}.prose :where(tbody td:last-child,tfoot td:last-child):not(:where([class~=not-prose],[class~=not-prose] *)){padding-inline-end:0}.prose :where(figure):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:2em;margin-bottom:2em}.prose :where(.prose>:first-child):not(:where([class~=not-prose],[class~=not-prose] *)){margin-top:0}.prose :where(.prose>:last-child):not(:where([class~=not-prose],[class~=not-prose] *)){margin-bottom:0}.button{border-radius:.25rem;padding:.75rem 1rem;font-size:.875rem;line-height:1rem;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-duration:.15s;transition-timing-function:cubic-bezier(.4,0,.2,1)}button:disabled{cursor:not-allowed;opacity:.5}.button-primary{--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}.button-primary:hover{font-weight:600}.button-block{display:block;width:100%}.button-danger{--tw-bg-opacity: 1;background-color:rgb(239 68 68 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}.button-danger:hover{--tw-bg-opacity: 1;background-color:rgb(220 38 38 / var(--tw-bg-opacity))}.button-secondary{--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity))}.button-secondary:hover{--tw-bg-opacity: 1;background-color:rgb(229 231 235 / var(--tw-bg-opacity))}.button-link{--tw-text-opacity: 1;color:rgb(55 65 81 / var(--tw-text-opacity))}.button-link:hover{--tw-text-opacity: 1;color:rgb(17 24 39 / var(--tw-text-opacity));text-decoration-line:underline}.button-link:focus{text-decoration-line:underline;outline:2px solid transparent;outline-offset:2px}.validation{margin-top:.5rem;margin-bottom:.25rem;border-left-width:2px;--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity));padding:.25rem .75rem}.validation-fail{--tw-border-opacity: 1;border-color:rgb(239 68 68 / var(--tw-border-opacity));font-size:.875rem;line-height:1.25rem;--tw-text-opacity: 1;color:rgb(55 65 81 / var(--tw-text-opacity))}.validation-pass{--tw-border-opacity: 1;border-color:rgb(16 185 129 / var(--tw-border-opacity));font-size:.875rem;line-height:1.25rem;--tw-text-opacity: 1;color:rgb(55 65 81 / var(--tw-text-opacity))}.input{margin-top:.5rem;align-items:center;border-radius:.25rem;border-width:1px;--tw-border-opacity: 1;border-color:rgb(209 213 219 / var(--tw-border-opacity));padding:.5rem 1rem;font-size:.875rem;line-height:1.25rem}.input:focus{--tw-bg-opacity: 1;background-color:rgb(249 250 251 / var(--tw-bg-opacity));outline:2px solid transparent;outline-offset:2px}.input-label{font-size:.875rem;line-height:1.25rem;--tw-text-opacity: 1;color:rgb(75 85 99 / var(--tw-text-opacity))}.input-slim{padding-top:.5rem;padding-bottom:.5rem}.form-checkbox{cursor:pointer;border-radius:.25rem;border-width:1px;--tw-border-opacity: 1;border-color:rgb(209 213 219 / var(--tw-border-opacity))}.form-select{border-width:1px;--tw-border-opacity: 1;border-color:rgb(209 213 219 / var(--tw-border-opacity))}.alert{margin-top:.5rem;margin-bottom:.25rem;border-left-width:2px;--tw-border-opacity: 1;border-color:rgb(156 163 175 / var(--tw-border-opacity));--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity));padding:.75rem 1rem;font-size:.875rem;line-height:1.25rem}.alert-success{--tw-border-opacity: 1;border-color:rgb(16 185 129 / var(--tw-border-opacity))}.alert-failure{--tw-border-opacity: 1;border-color:rgb(239 68 68 / var(--tw-border-opacity))}.badge{display:inline-flex;align-items:center;border-radius:9999px;padding:.125rem .625rem;font-size:.75rem;font-weight:500;line-height:1rem}.badge-light{--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(31 41 55 / var(--tw-text-opacity))}.badge-primary{--tw-bg-opacity: 1;background-color:rgb(191 219 254 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(59 130 246 / var(--tw-text-opacity))}.badge-danger{--tw-bg-opacity: 1;background-color:rgb(254 226 226 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(239 68 68 / var(--tw-text-opacity))}.badge-success{--tw-bg-opacity: 1;background-color:rgb(209 250 229 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(16 185 129 / var(--tw-text-opacity))}.badge-secondary{--tw-bg-opacity: 1;background-color:rgb(31 41 55 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(229 231 235 / var(--tw-text-opacity))}.badge-warning{--tw-bg-opacity: 1;background-color:rgb(59 130 246 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(217 119 6 / var(--tw-text-opacity))}.badge-info{--tw-bg-opacity: 1;background-color:rgb(219 234 254 / var(--tw-bg-opacity));--tw-text-opacity: 1;color:rgb(59 130 246 / var(--tw-text-opacity))}@media (min-width: 640px){.dataTables_length{margin-top:1.25rem!important;margin-bottom:1.25rem!important}}@media (min-width: 1024px){.dataTables_length{margin-top:1rem!important;margin-bottom:1rem!important}}.dataTables_length select{margin-left:.5rem!important;margin-right:.5rem!important;--tw-bg-opacity: 1 !important;background-color:rgb(255 255 255 / var(--tw-bg-opacity))!important;margin-top:.5rem;align-items:center;border-radius:.25rem;border-width:1px;--tw-border-opacity: 1;border-color:rgb(209 213 219 / var(--tw-border-opacity));padding:.5rem 1rem;font-size:.875rem;line-height:1.25rem}.dataTables_length select:focus{--tw-bg-opacity: 1;background-color:rgb(249 250 251 / var(--tw-bg-opacity));outline:2px solid transparent;outline-offset:2px}.dataTables_filter{margin-bottom:1rem}.dataTables_filter input{margin-top:.5rem;align-items:center;border-radius:.25rem;border-width:1px;--tw-border-opacity: 1;border-color:rgb(209 213 219 / var(--tw-border-opacity));padding:.5rem 1rem;font-size:.875rem;line-height:1.25rem}.dataTables_filter input:focus{--tw-bg-opacity: 1;background-color:rgb(249 250 251 / var(--tw-bg-opacity));outline:2px solid transparent;outline-offset:2px}@media (min-width: 1024px){.dataTables_filter{margin-top:-3rem!important}}.dataTables_paginate{padding-bottom:1.5rem!important;padding-top:.5rem!important}.dataTables_paginate .paginate_button{margin-right:.25rem!important;cursor:pointer!important;border-width:1px!important;--tw-border-opacity: 1 !important;border-color:rgb(209 213 219 / var(--tw-border-opacity))!important;--tw-bg-opacity: 1 !important;background-color:rgb(255 255 255 / var(--tw-bg-opacity))!important;font-weight:500!important;--tw-text-opacity: 1 !important;color:rgb(55 65 81 / var(--tw-text-opacity))!important;border-radius:.25rem;padding:.75rem 1rem;font-size:.875rem;line-height:1rem;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-duration:.15s;transition-timing-function:cubic-bezier(.4,0,.2,1)}.dataTables_paginate .current{--tw-bg-opacity: 1 !important;background-color:rgb(37 99 235 / var(--tw-bg-opacity))!important;--tw-text-opacity: 1 !important;color:rgb(255 255 255 / var(--tw-text-opacity))!important}.dataTables_info{font-size:.875rem!important;line-height:1.25rem!important}.dataTables_empty{padding-top:1rem!important;padding-bottom:1rem!important}.pagination{display:flex!important;align-items:center!important}.pagination .page-link{margin-top:-1px!important;display:inline-flex!important;cursor:pointer!important;align-items:center!important;border-top-width:2px!important;border-color:transparent!important;padding-left:1rem!important;padding-right:1rem!important;padding-top:1rem!important;font-size:.875rem!important;font-weight:500!important;line-height:1.25rem!important;--tw-text-opacity: 1 !important;color:rgb(107 114 128 / var(--tw-text-opacity))!important;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter!important;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter!important;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter!important;transition-duration:.15s!important;transition-timing-function:cubic-bezier(.4,0,.2,1)!important}.pagination .page-link:hover{--tw-border-opacity: 1 !important;border-color:rgb(209 213 219 / var(--tw-border-opacity))!important;--tw-text-opacity: 1 !important;color:rgb(55 65 81 / var(--tw-text-opacity))!important}.pagination .page-link:focus{--tw-border-opacity: 1;border-color:rgb(156 163 175 / var(--tw-border-opacity));--tw-text-opacity: 1;color:rgb(55 65 81 / var(--tw-text-opacity));outline:2px solid transparent;outline-offset:2px}.pagination .active>span{--tw-border-opacity: 1 !important;border-color:rgb(37 99 235 / var(--tw-border-opacity))!important;--tw-text-opacity: 1 !important;color:rgb(37 99 235 / var(--tw-text-opacity))!important}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border-width:0}.pointer-events-none{pointer-events:none}.pointer-events-auto{pointer-events:auto}.visible{visibility:visible}.collapse{visibility:collapse}.static{position:static}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.sticky{position:sticky}.inset-0{top:0;right:0;bottom:0;left:0}.inset-x-0{left:0;right:0}.inset-y-0{top:0;bottom:0}.bottom-0{bottom:0}.left-0{left:0}.left-1{left:.25rem}.right-0{right:0}.top-0{top:0}.top-1{top:.25rem}.z-0{z-index:0}.z-10{z-index:10}.z-30{z-index:30}.z-40{z-index:40}.z-50{z-index:50}.col-auto{grid-column:auto}.col-span-1{grid-column:span 1 / span 1}.col-span-12{grid-column:span 12 / span 12}.col-span-2{grid-column:span 2 / span 2}.col-span-3{grid-column:span 3 / span 3}.col-span-4{grid-column:span 4 / span 4}.col-span-6{grid-column:span 6 / span 6}.col-span-8{grid-column:span 8 / span 8}.float-right{float:right}.m-0{margin:0}.m-auto{margin:auto}.-my-2{margin-top:-.5rem;margin-bottom:-.5rem}.-my-6{margin-top:-1.5rem;margin-bottom:-1.5rem}.mx-2{margin-left:.5rem;margin-right:.5rem}.mx-4{margin-left:1rem;margin-right:1rem}.mx-6{margin-left:1.5rem;margin-right:1.5rem}.mx-\[22px\]{margin-left:22px;margin-right:22px}.mx-\[40px\]{margin-left:40px;margin-right:40px}.mx-\[auto\],.mx-auto{margin-left:auto;margin-right:auto}.my-10{margin-top:2.5rem;margin-bottom:2.5rem}.my-2{margin-top:.5rem;margin-bottom:.5rem}.my-3{margin-top:.75rem;margin-bottom:.75rem}.my-4{margin-top:1rem;margin-bottom:1rem}.my-6{margin-top:1.5rem;margin-bottom:1.5rem}.-ml-1{margin-left:-.25rem}.-ml-4{margin-left:-1rem}.-ml-px{margin-left:-1px}.-mr-1{margin-right:-.25rem}.-mr-14{margin-right:-3.5rem}.-mt-4{margin-top:-1rem}.-mt-6{margin-top:-1.5rem}.mb-0{margin-bottom:0}.mb-1{margin-bottom:.25rem}.mb-1\.5{margin-bottom:.375rem}.mb-10{margin-bottom:2.5rem}.mb-12{margin-bottom:3rem}.mb-2{margin-bottom:.5rem}.mb-3{margin-bottom:.75rem}.mb-4{margin-bottom:1rem}.mb-5{margin-bottom:1.25rem}.mb-6{margin-bottom:1.5rem}.mb-8{margin-bottom:2rem}.mb-\[10px\]{margin-bottom:10px}.mb-\[11px\]{margin-bottom:11px}.mb-\[20px\]{margin-bottom:20px}.mb-\[25px\]{margin-bottom:25px}.mb-\[26px\]{margin-bottom:26px}.mb-\[36px\]{margin-bottom:36px}.mb-\[40px\]{margin-bottom:40px}.mb-\[5px\]{margin-bottom:5px}.ml-0{margin-left:0}.ml-1{margin-left:.25rem}.ml-2{margin-left:.5rem}.ml-3{margin-left:.75rem}.ml-4{margin-left:1rem}.ml-5{margin-left:1.25rem}.ml-\[10px\]{margin-left:10px}.mr-0{margin-right:0}.mr-1{margin-right:.25rem}.mr-2{margin-right:.5rem}.mr-3{margin-right:.75rem}.mr-4{margin-right:1rem}.mr-5{margin-right:1.25rem}.mr-6{margin-right:1.5rem}.mt-0{margin-top:0}.mt-1{margin-top:.25rem}.mt-10{margin-top:2.5rem}.mt-2{margin-top:.5rem}.mt-20{margin-top:5rem}.mt-3{margin-top:.75rem}.mt-4{margin-top:1rem}.mt-5{margin-top:1.25rem}.mt-6{margin-top:1.5rem}.mt-8{margin-top:2rem}.mt-\[30px\]{margin-top:30px}.mt-\[50px\]{margin-top:50px}.mt-\[auto\]{margin-top:auto}.block{display:block}.inline-block{display:inline-block}.flex{display:flex}.inline-flex{display:inline-flex}.table{display:table}.grid{display:grid}.contents{display:contents}.hidden{display:none}.h-0{height:0px}.h-10{height:2.5rem}.h-12{height:3rem}.h-14{height:3.5rem}.h-16{height:4rem}.h-24{height:6rem}.h-3{height:.75rem}.h-4{height:1rem}.h-5{height:1.25rem}.h-6{height:1.5rem}.h-64{height:16rem}.h-8{height:2rem}.h-\[1px\]{height:1px}.h-\[40px\]{height:40px}.h-auto{height:auto}.h-fit{height:-moz-fit-content;height:fit-content}.h-full{height:100%}.h-screen{height:100vh}.min-h-\[450px\]{min-height:450px}.min-h-screen{min-height:100vh}.w-0{width:0px}.w-1{width:.25rem}.w-1\/2{width:50%}.w-1\/4{width:25%}.w-1\/6{width:16.666667%}.w-10{width:2.5rem}.w-12{width:3rem}.w-14{width:3.5rem}.w-16{width:4rem}.w-24{width:6rem}.w-3{width:.75rem}.w-3\/4{width:75%}.w-4{width:1rem}.w-4\/5{width:80%}.w-4\/6{width:66.666667%}.w-48{width:12rem}.w-5{width:1.25rem}.w-5\/6{width:83.333333%}.w-56{width:14rem}.w-6{width:1.5rem}.w-64{width:16rem}.w-8{width:2rem}.w-80{width:20rem}.w-\[100\%\]{width:100%}.w-\[87px\]{width:87px}.w-auto{width:auto}.w-full{width:100%}.w-screen{width:100vw}.min-w-full{min-width:100%}.max-w-2xl{max-width:42rem}.max-w-4xl{max-width:56rem}.max-w-\[212px\]{max-width:212px}.max-w-\[450px\]{max-width:450px}.max-w-\[625px\]{max-width:625px}.max-w-xl{max-width:36rem}.max-w-xs{max-width:20rem}.flex-1{flex:1 1 0%}.flex-shrink{flex-shrink:1}.flex-shrink-0{flex-shrink:0}.shrink{flex-shrink:1}.shrink-0{flex-shrink:0}.flex-grow,.grow{flex-grow:1}.grow-0{flex-grow:0}.basis-1\/2{flex-basis:50%}.basis-full{flex-basis:100%}.table-auto{table-layout:auto}.border-collapse{border-collapse:collapse}.origin-top-right{transform-origin:top right}.-translate-x-full{--tw-translate-x: -100%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.translate-x-0{--tw-translate-x: 0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.translate-y-0{--tw-translate-y: 0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.translate-y-4{--tw-translate-y: 1rem;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.scale-100{--tw-scale-x: 1;--tw-scale-y: 1;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.scale-95{--tw-scale-x: .95;--tw-scale-y: .95;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.transform{transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}@keyframes spin{to{transform:rotate(360deg)}}.animate-spin{animation:spin 1s linear infinite}.cursor-pointer{cursor:pointer}.resize{resize:both}.list-none{list-style-type:none}.appearance-none{-webkit-appearance:none;-moz-appearance:none;appearance:none}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.grid-cols-6{grid-template-columns:repeat(6,minmax(0,1fr))}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.flex-col-reverse{flex-direction:column-reverse}.flex-wrap{flex-wrap:wrap}.place-content-end{place-content:end}.place-items-center{place-items:center}.content-center{align-content:center}.content-start{align-content:flex-start}.items-start{align-items:flex-start}.items-end{align-items:flex-end}.items-center{align-items:center}.items-stretch{align-items:stretch}.justify-start{justify-content:flex-start}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.justify-stretch{justify-content:stretch}.gap-0\.5{gap:.125rem}.gap-1{gap:.25rem}.gap-2{gap:.5rem}.gap-3{gap:.75rem}.gap-4{gap:1rem}.gap-5{gap:1.25rem}.gap-6{gap:1.5rem}.gap-8{gap:2rem}.gap-\[13px\]{gap:13px}.gap-\[44px\]{gap:44px}.gap-x-2{-moz-column-gap:.5rem;column-gap:.5rem}.gap-y-\[20px\]{row-gap:20px}.space-x-0>:not([hidden])~:not([hidden]){--tw-space-x-reverse: 0;margin-right:calc(0px * var(--tw-space-x-reverse));margin-left:calc(0px * calc(1 - var(--tw-space-x-reverse)))}.space-x-1>:not([hidden])~:not([hidden]){--tw-space-x-reverse: 0;margin-right:calc(.25rem * var(--tw-space-x-reverse));margin-left:calc(.25rem * calc(1 - var(--tw-space-x-reverse)))}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse: 0;margin-right:calc(.5rem * var(--tw-space-x-reverse));margin-left:calc(.5rem * calc(1 - var(--tw-space-x-reverse)))}.space-x-3>:not([hidden])~:not([hidden]){--tw-space-x-reverse: 0;margin-right:calc(.75rem * var(--tw-space-x-reverse));margin-left:calc(.75rem * calc(1 - var(--tw-space-x-reverse)))}.space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse: 0;margin-right:calc(1rem * var(--tw-space-x-reverse));margin-left:calc(1rem * calc(1 - var(--tw-space-x-reverse)))}.space-y-10>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(2.5rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(2.5rem * var(--tw-space-y-reverse))}.space-y-2>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(.5rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(.5rem * var(--tw-space-y-reverse))}.space-y-3>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(.75rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(.75rem * var(--tw-space-y-reverse))}.space-y-4>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(1rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(1rem * var(--tw-space-y-reverse))}.space-y-5>:not([hidden])~:not([hidden]){--tw-space-y-reverse: 0;margin-top:calc(1.25rem * calc(1 - var(--tw-space-y-reverse)));margin-bottom:calc(1.25rem * var(--tw-space-y-reverse))}.divide-y>:not([hidden])~:not([hidden]){--tw-divide-y-reverse: 0;border-top-width:calc(1px * calc(1 - var(--tw-divide-y-reverse)));border-bottom-width:calc(1px * var(--tw-divide-y-reverse))}.divide-gray-200>:not([hidden])~:not([hidden]){--tw-divide-opacity: 1;border-color:rgb(229 231 235 / var(--tw-divide-opacity))}.overflow-hidden{overflow:hidden}.overflow-x-auto{overflow-x:auto}.overflow-y-auto{overflow-y:auto}.overflow-y-scroll{overflow-y:scroll}.truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.overflow-ellipsis{text-overflow:ellipsis}.whitespace-nowrap{white-space:nowrap}.whitespace-pre-line{white-space:pre-line}.break-words{overflow-wrap:break-word}.break-all{word-break:break-all}.rounded{border-radius:.25rem}.rounded-\[10px\]{border-radius:10px}.rounded-full{border-radius:9999px}.rounded-lg{border-radius:.5rem}.rounded-md{border-radius:.375rem}.rounded-none{border-radius:0}.rounded-sm{border-radius:.125rem}.rounded-b-lg{border-bottom-right-radius:.5rem;border-bottom-left-radius:.5rem}.rounded-l-md{border-top-left-radius:.375rem;border-bottom-left-radius:.375rem}.rounded-r-md{border-top-right-radius:.375rem;border-bottom-right-radius:.375rem}.rounded-t-lg{border-top-left-radius:.5rem;border-top-right-radius:.5rem}.border{border-width:1px}.border-0{border-width:0px}.border-2{border-width:2px}.border-4{border-width:4px}.border-b{border-bottom-width:1px}.border-b-2{border-bottom-width:2px}.border-l-2{border-left-width:2px}.border-r{border-right-width:1px}.border-t{border-top-width:1px}.border-t-2{border-top-width:2px}.border-t-4{border-top-width:4px}.border-t-\[0px\]{border-top-width:0px}.border-t-\[10px\]{border-top-width:10px}.border-t-\[1px\]{border-top-width:1px}.border-solid{border-style:solid}.border-dashed{border-style:dashed}.border-none{border-style:none}.border-\[\#E5E7EB\]{--tw-border-opacity: 1;border-color:rgb(229 231 235 / var(--tw-border-opacity))}.border-blue-500{--tw-border-opacity: 1;border-color:rgb(59 130 246 / var(--tw-border-opacity))}.border-emerald-500{--tw-border-opacity: 1;border-color:rgb(16 185 129 / var(--tw-border-opacity))}.border-fuchsia-600{--tw-border-opacity: 1;border-color:rgb(192 38 211 / var(--tw-border-opacity))}.border-gray-100{--tw-border-opacity: 1;border-color:rgb(243 244 246 / var(--tw-border-opacity))}.border-gray-200{--tw-border-opacity: 1;border-color:rgb(229 231 235 / var(--tw-border-opacity))}.border-gray-300{--tw-border-opacity: 1;border-color:rgb(209 213 219 / var(--tw-border-opacity))}.border-gray-500{--tw-border-opacity: 1;border-color:rgb(107 114 128 / var(--tw-border-opacity))}.border-gray-600{--tw-border-opacity: 1;border-color:rgb(75 85 99 / var(--tw-border-opacity))}.border-red-300{--tw-border-opacity: 1;border-color:rgb(252 165 165 / var(--tw-border-opacity))}.border-red-400{--tw-border-opacity: 1;border-color:rgb(248 113 113 / var(--tw-border-opacity))}.border-red-500{--tw-border-opacity: 1;border-color:rgb(239 68 68 / var(--tw-border-opacity))}.border-red-900{--tw-border-opacity: 1;border-color:rgb(127 29 29 / var(--tw-border-opacity))}.border-transparent{border-color:transparent}.border-opacity-50{--tw-border-opacity: .5}.bg-\[\#F2F9FE\]{--tw-bg-opacity: 1;background-color:rgb(242 249 254 / var(--tw-bg-opacity))}.bg-blue-50{--tw-bg-opacity: 1;background-color:rgb(239 246 255 / var(--tw-bg-opacity))}.bg-blue-500{--tw-bg-opacity: 1;background-color:rgb(59 130 246 / var(--tw-bg-opacity))}.bg-blue-600{--tw-bg-opacity: 1;background-color:rgb(37 99 235 / var(--tw-bg-opacity))}.bg-blue-700{--tw-bg-opacity: 1;background-color:rgb(29 78 216 / var(--tw-bg-opacity))}.bg-emerald-600{--tw-bg-opacity: 1;background-color:rgb(5 150 105 / var(--tw-bg-opacity))}.bg-gray-100{--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity))}.bg-gray-200{--tw-bg-opacity: 1;background-color:rgb(229 231 235 / var(--tw-bg-opacity))}.bg-gray-50{--tw-bg-opacity: 1;background-color:rgb(249 250 251 / var(--tw-bg-opacity))}.bg-gray-500{--tw-bg-opacity: 1;background-color:rgb(107 114 128 / var(--tw-bg-opacity))}.bg-gray-600{--tw-bg-opacity: 1;background-color:rgb(75 85 99 / var(--tw-bg-opacity))}.bg-red-100{--tw-bg-opacity: 1;background-color:rgb(254 226 226 / var(--tw-bg-opacity))}.bg-red-500{--tw-bg-opacity: 1;background-color:rgb(239 68 68 / var(--tw-bg-opacity))}.bg-transparent{background-color:transparent}.bg-white{--tw-bg-opacity: 1;background-color:rgb(255 255 255 / var(--tw-bg-opacity))}.bg-opacity-100{--tw-bg-opacity: 1}.bg-opacity-75{--tw-bg-opacity: .75}.bg-clip-padding{background-clip:padding-box}.fill-current{fill:currentColor}.object-cover{-o-object-fit:cover;object-fit:cover}.object-scale-down{-o-object-fit:scale-down;object-fit:scale-down}.object-center{-o-object-position:center;object-position:center}.p-1{padding:.25rem}.p-10{padding:2.5rem}.p-2{padding:.5rem}.p-2\.5{padding:.625rem}.p-3{padding:.75rem}.p-4{padding:1rem}.p-5{padding:1.25rem}.p-6{padding:1.5rem}.p-8{padding:2rem}.p-\[12px\]{padding:12px}.p-\[20px\]{padding:20px}.px-0{padding-left:0;padding-right:0}.px-1{padding-left:.25rem;padding-right:.25rem}.px-12{padding-left:3rem;padding-right:3rem}.px-2{padding-left:.5rem;padding-right:.5rem}.px-3{padding-left:.75rem;padding-right:.75rem}.px-4{padding-left:1rem;padding-right:1rem}.px-5{padding-left:1.25rem;padding-right:1.25rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.px-\[12px\]{padding-left:12px;padding-right:12px}.px-\[20px\]{padding-left:20px;padding-right:20px}.px-\[22px\]{padding-left:22px;padding-right:22px}.py-0{padding-top:0;padding-bottom:0}.py-1{padding-top:.25rem;padding-bottom:.25rem}.py-10{padding-top:2.5rem;padding-bottom:2.5rem}.py-2{padding-top:.5rem;padding-bottom:.5rem}.py-3{padding-top:.75rem;padding-bottom:.75rem}.py-4{padding-top:1rem;padding-bottom:1rem}.py-5{padding-top:1.25rem;padding-bottom:1.25rem}.py-6{padding-top:1.5rem;padding-bottom:1.5rem}.py-8{padding-top:2rem;padding-bottom:2rem}.py-\[33px\]{padding-top:33px;padding-bottom:33px}.py-\[36px\]{padding-top:36px;padding-bottom:36px}.py-\[9\.5px\]{padding-top:9.5px;padding-bottom:9.5px}.pb-10{padding-bottom:2.5rem}.pb-2{padding-bottom:.5rem}.pb-20{padding-bottom:5rem}.pb-3{padding-bottom:.75rem}.pb-4{padding-bottom:1rem}.pb-6{padding-bottom:1.5rem}.pb-8{padding-bottom:2rem}.pb-\[20px\]{padding-bottom:20px}.pb-\[56px\]{padding-bottom:56px}.pb-\[58px\]{padding-bottom:58px}.pl-0{padding-left:0}.pl-1\.5{padding-left:.375rem}.pl-2{padding-left:.5rem}.pl-3{padding-left:.75rem}.pl-\[18px\]{padding-left:18px}.pr-10{padding-right:2.5rem}.pr-2{padding-right:.5rem}.pr-4{padding-right:1rem}.pr-\[18px\]{padding-right:18px}.pt-0{padding-top:0}.pt-2{padding-top:.5rem}.pt-4{padding-top:1rem}.pt-5{padding-top:1.25rem}.pt-6{padding-top:1.5rem}.pt-\[20px\]{padding-top:20px}.pt-\[29px\]{padding-top:29px}.pt-\[35px\]{padding-top:35px}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.align-middle{vertical-align:middle}.align-bottom{vertical-align:bottom}.font-\[\'Open_Sans\'\]{font-family:Open Sans}.text-2xl{font-size:1.5rem;line-height:2rem}.text-3xl{font-size:1.875rem;line-height:2.25rem}.text-5xl{font-size:3rem;line-height:1}.text-\[12px\]{font-size:12px}.text-\[14px\]{font-size:14px}.text-\[15px\]{font-size:15px}.text-\[16px\]{font-size:16px}.text-\[22px\]{font-size:22px}.text-\[24px\]{font-size:24px}.text-\[35px\]{font-size:35px}.text-base{font-size:1rem;line-height:1.5rem}.text-lg{font-size:1.125rem;line-height:1.75rem}.text-sm{font-size:.875rem;line-height:1.25rem}.text-xl{font-size:1.25rem;line-height:1.75rem}.text-xs{font-size:.75rem;line-height:1rem}.font-\[16px\]{font-weight:16px}.font-bold{font-weight:700}.font-light{font-weight:300}.font-medium{font-weight:500}.font-normal{font-weight:400}.font-semibold{font-weight:600}.uppercase{text-transform:uppercase}.lowercase{text-transform:lowercase}.capitalize{text-transform:capitalize}.italic{font-style:italic}.leading-4{line-height:1rem}.leading-5{line-height:1.25rem}.leading-6{line-height:1.5rem}.leading-9{line-height:2.25rem}.leading-\[1\.2rem\]{line-height:1.2rem}.leading-\[1\.35em\]{line-height:1.35em}.leading-\[1\.36em\]{line-height:1.36em}.leading-\[1\.375em\]{line-height:1.375em}.leading-\[1\.3em\]{line-height:1.3em}.leading-\[1\.5em\]{line-height:1.5em}.leading-\[1\.75em\]{line-height:1.75em}.leading-normal{line-height:1.5}.leading-tight{line-height:1.25}.tracking-tight{letter-spacing:-.025em}.tracking-wide{letter-spacing:.025em}.tracking-wider{letter-spacing:.05em}.text-\[\#212529\]{--tw-text-opacity: 1;color:rgb(33 37 41 / var(--tw-text-opacity))}.text-\[\#6C727F\]{--tw-text-opacity: 1;color:rgb(108 114 127 / var(--tw-text-opacity))}.text-black{--tw-text-opacity: 1;color:rgb(0 0 0 / var(--tw-text-opacity))}.text-blue-500{--tw-text-opacity: 1;color:rgb(59 130 246 / var(--tw-text-opacity))}.text-blue-600{--tw-text-opacity: 1;color:rgb(37 99 235 / var(--tw-text-opacity))}.text-blue-700{--tw-text-opacity: 1;color:rgb(29 78 216 / var(--tw-text-opacity))}.text-emerald-600{--tw-text-opacity: 1;color:rgb(5 150 105 / var(--tw-text-opacity))}.text-gray-300{--tw-text-opacity: 1;color:rgb(209 213 219 / var(--tw-text-opacity))}.text-gray-400{--tw-text-opacity: 1;color:rgb(156 163 175 / var(--tw-text-opacity))}.text-gray-500{--tw-text-opacity: 1;color:rgb(107 114 128 / var(--tw-text-opacity))}.text-gray-600{--tw-text-opacity: 1;color:rgb(75 85 99 / var(--tw-text-opacity))}.text-gray-700{--tw-text-opacity: 1;color:rgb(55 65 81 / var(--tw-text-opacity))}.text-gray-800{--tw-text-opacity: 1;color:rgb(31 41 55 / var(--tw-text-opacity))}.text-gray-900{--tw-text-opacity: 1;color:rgb(17 24 39 / var(--tw-text-opacity))}.text-indigo-600{--tw-text-opacity: 1;color:rgb(79 70 229 / var(--tw-text-opacity))}.text-red-400{--tw-text-opacity: 1;color:rgb(248 113 113 / var(--tw-text-opacity))}.text-red-500{--tw-text-opacity: 1;color:rgb(239 68 68 / var(--tw-text-opacity))}.text-red-600{--tw-text-opacity: 1;color:rgb(220 38 38 / var(--tw-text-opacity))}.text-red-700{--tw-text-opacity: 1;color:rgb(185 28 28 / var(--tw-text-opacity))}.text-red-900{--tw-text-opacity: 1;color:rgb(127 29 29 / var(--tw-text-opacity))}.text-white{--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}.underline{text-decoration-line:underline}.line-through{text-decoration-line:line-through}.no-underline{text-decoration-line:none}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.opacity-0{opacity:0}.opacity-100{opacity:1}.opacity-25{opacity:.25}.opacity-75{opacity:.75}.shadow{--tw-shadow: 0 1px 3px 0 rgb(0 0 0 / .1), 0 1px 2px -1px rgb(0 0 0 / .1);--tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.shadow-lg{--tw-shadow: 0 10px 15px -3px rgb(0 0 0 / .1), 0 4px 6px -4px rgb(0 0 0 / .1);--tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.shadow-sm{--tw-shadow: 0 1px 2px 0 rgb(0 0 0 / .05);--tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.shadow-xl{--tw-shadow: 0 20px 25px -5px rgb(0 0 0 / .1), 0 8px 10px -6px rgb(0 0 0 / .1);--tw-shadow-colored: 0 20px 25px -5px var(--tw-shadow-color), 0 8px 10px -6px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.outline-none{outline:2px solid transparent;outline-offset:2px}.outline{outline-style:solid}.ring-1{--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 #0000)}.ring-black{--tw-ring-opacity: 1;--tw-ring-color: rgb(0 0 0 / var(--tw-ring-opacity))}.ring-opacity-5{--tw-ring-opacity: .05}.grayscale{--tw-grayscale: grayscale(100%);filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.invert{--tw-invert: invert(100%);filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.transition{transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.transition-all{transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.transition-colors{transition-property:color,background-color,border-color,text-decoration-color,fill,stroke;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.transition-opacity{transition-property:opacity;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.duration-100{transition-duration:.1s}.duration-1000{transition-duration:1s}.duration-150{transition-duration:.15s}.duration-200{transition-duration:.2s}.duration-300{transition-duration:.3s}.duration-75{transition-duration:75ms}.ease-in{transition-timing-function:cubic-bezier(.4,0,1,1)}.ease-in-out{transition-timing-function:cubic-bezier(.4,0,.2,1)}.ease-linear{transition-timing-function:linear}.ease-out{transition-timing-function:cubic-bezier(0,0,.2,1)}.placeholder\:text-gray-500::-moz-placeholder{--tw-text-opacity: 1;color:rgb(107 114 128 / var(--tw-text-opacity))}.placeholder\:text-gray-500::placeholder{--tw-text-opacity: 1;color:rgb(107 114 128 / var(--tw-text-opacity))}.after\:absolute:after{content:var(--tw-content);position:absolute}.after\:left-\[8px\]:after{content:var(--tw-content);left:8px}.after\:top-\[5px\]:after{content:var(--tw-content);top:5px}.after\:h-\[30px\]:after{content:var(--tw-content);height:30px}.after\:w-\[30px\]:after{content:var(--tw-content);width:30px}.after\:rounded-full:after{content:var(--tw-content);border-radius:9999px}.after\:bg-white:after{content:var(--tw-content);--tw-bg-opacity: 1;background-color:rgb(255 255 255 / var(--tw-bg-opacity))}.after\:transition-all:after{content:var(--tw-content);transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.after\:content-\[\'\'\]:after{--tw-content: "";content:var(--tw-content)}.focus-within\:z-10:focus-within{z-index:10}.hover\:list-disc:hover{list-style-type:disc}.hover\:border-blue-600:hover{--tw-border-opacity: 1;border-color:rgb(37 99 235 / var(--tw-border-opacity))}.hover\:border-gray-600:hover{--tw-border-opacity: 1;border-color:rgb(75 85 99 / var(--tw-border-opacity))}.hover\:border-gray-800:hover{--tw-border-opacity: 1;border-color:rgb(31 41 55 / var(--tw-border-opacity))}.hover\:border-transparent:hover{border-color:transparent}.hover\:bg-blue-500:hover{--tw-bg-opacity: 1;background-color:rgb(59 130 246 / var(--tw-bg-opacity))}.hover\:bg-blue-600:hover{--tw-bg-opacity: 1;background-color:rgb(37 99 235 / var(--tw-bg-opacity))}.hover\:bg-gray-100:hover{--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity))}.hover\:bg-gray-200:hover{--tw-bg-opacity: 1;background-color:rgb(229 231 235 / var(--tw-bg-opacity))}.hover\:bg-red-900:hover{--tw-bg-opacity: 1;background-color:rgb(127 29 29 / var(--tw-bg-opacity))}.hover\:font-semibold:hover{font-weight:600}.hover\:text-blue-600:hover{--tw-text-opacity: 1;color:rgb(37 99 235 / var(--tw-text-opacity))}.hover\:text-gray-300:hover{--tw-text-opacity: 1;color:rgb(209 213 219 / var(--tw-text-opacity))}.hover\:text-gray-500:hover{--tw-text-opacity: 1;color:rgb(107 114 128 / var(--tw-text-opacity))}.hover\:text-gray-600:hover{--tw-text-opacity: 1;color:rgb(75 85 99 / var(--tw-text-opacity))}.hover\:text-gray-700:hover{--tw-text-opacity: 1;color:rgb(55 65 81 / var(--tw-text-opacity))}.hover\:text-gray-800:hover{--tw-text-opacity: 1;color:rgb(31 41 55 / var(--tw-text-opacity))}.hover\:text-gray-900:hover{--tw-text-opacity: 1;color:rgb(17 24 39 / var(--tw-text-opacity))}.hover\:text-indigo-900:hover{--tw-text-opacity: 1;color:rgb(49 46 129 / var(--tw-text-opacity))}.hover\:text-red-500:hover{--tw-text-opacity: 1;color:rgb(239 68 68 / var(--tw-text-opacity))}.hover\:text-white:hover{--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}.hover\:underline:hover{text-decoration-line:underline}.hover\:opacity-80:hover{opacity:.8}.hover\:shadow-2xl:hover{--tw-shadow: 0 25px 50px -12px rgb(0 0 0 / .25);--tw-shadow-colored: 0 25px 50px -12px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.hover\:shadow-lg:hover{--tw-shadow: 0 10px 15px -3px rgb(0 0 0 / .1), 0 4px 6px -4px rgb(0 0 0 / .1);--tw-shadow-colored: 0 10px 15px -3px var(--tw-shadow-color), 0 4px 6px -4px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.hover\:shadow-sm:hover{--tw-shadow: 0 1px 2px 0 rgb(0 0 0 / .05);--tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000),var(--tw-ring-shadow, 0 0 #0000),var(--tw-shadow)}.focus\:border-blue-300:focus{--tw-border-opacity: 1;border-color:rgb(147 197 253 / var(--tw-border-opacity))}.focus\:border-blue-500:focus{--tw-border-opacity: 1;border-color:rgb(59 130 246 / var(--tw-border-opacity))}.focus\:border-fuchsia-300:focus{--tw-border-opacity: 1;border-color:rgb(240 171 252 / var(--tw-border-opacity))}.focus\:border-indigo-500:focus{--tw-border-opacity: 1;border-color:rgb(99 102 241 / var(--tw-border-opacity))}.focus\:border-red-500:focus{--tw-border-opacity: 1;border-color:rgb(239 68 68 / var(--tw-border-opacity))}.focus\:bg-gray-100:focus{--tw-bg-opacity: 1;background-color:rgb(243 244 246 / var(--tw-bg-opacity))}.focus\:bg-gray-600:focus{--tw-bg-opacity: 1;background-color:rgb(75 85 99 / var(--tw-bg-opacity))}.focus\:bg-white:focus{--tw-bg-opacity: 1;background-color:rgb(255 255 255 / var(--tw-bg-opacity))}.focus\:font-semibold:focus{font-weight:600}.focus\:text-gray-600:focus{--tw-text-opacity: 1;color:rgb(75 85 99 / var(--tw-text-opacity))}.focus\:text-gray-900:focus{--tw-text-opacity: 1;color:rgb(17 24 39 / var(--tw-text-opacity))}.focus\:underline:focus{text-decoration-line:underline}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}.focus\:ring:focus{--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(3px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 #0000)}.focus\:ring-1:focus{--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 #0000)}.focus\:ring-2:focus{--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 #0000)}.focus\:ring-blue-500:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity))}.focus\:ring-gray-500:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(107 114 128 / var(--tw-ring-opacity))}.focus\:ring-indigo-500:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(99 102 241 / var(--tw-ring-opacity))}.focus\:ring-indigo-600:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(79 70 229 / var(--tw-ring-opacity))}.focus\:ring-red-500:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(239 68 68 / var(--tw-ring-opacity))}.focus\:ring-opacity-50:focus{--tw-ring-opacity: .5}.focus\:ring-offset-2:focus{--tw-ring-offset-width: 2px}.focus-visible\:outline-none:focus-visible{outline:2px solid transparent;outline-offset:2px}.focus-visible\:ring-2:focus-visible{--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 #0000)}.focus-visible\:ring-offset-2:focus-visible{--tw-ring-offset-width: 2px}.active\:bg-gray-50:active{--tw-bg-opacity: 1;background-color:rgb(249 250 251 / var(--tw-bg-opacity))}.active\:text-gray-800:active{--tw-text-opacity: 1;color:rgb(31 41 55 / var(--tw-text-opacity))}.active\:outline-none:active{outline:2px solid transparent;outline-offset:2px}.disabled\:pointer-events-none:disabled{pointer-events:none}.disabled\:cursor-not-allowed:disabled{cursor:not-allowed}.disabled\:bg-gray-50:disabled{--tw-bg-opacity: 1;background-color:rgb(249 250 251 / var(--tw-bg-opacity))}.disabled\:opacity-50:disabled{opacity:.5}.disabled\:opacity-75:disabled{opacity:.75}.group:hover .group-hover\:border-transparent{border-color:transparent}.group:hover .group-hover\:text-white{--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}.group:hover .group-hover\:opacity-100{opacity:1}.peer:checked~.peer-checked\:text-black{--tw-text-opacity: 1;color:rgb(0 0 0 / var(--tw-text-opacity))}.peer:checked~.peer-checked\:after\:translate-x-\[140\%\]:after{content:var(--tw-content);--tw-translate-x: 140%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.peer:focus~.peer-focus\:outline-none{outline:2px solid transparent;outline-offset:2px}@media (min-width: 640px){.sm\:inset-0{top:0;right:0;bottom:0;left:0}.sm\:col-span-2{grid-column:span 2 / span 2}.sm\:col-span-3{grid-column:span 3 / span 3}.sm\:col-span-4{grid-column:span 4 / span 4}.sm\:col-span-6{grid-column:span 6 / span 6}.sm\:-mx-6{margin-left:-1.5rem;margin-right:-1.5rem}.sm\:mx-0{margin-left:0;margin-right:0}.sm\:my-8{margin-top:2rem;margin-bottom:2rem}.sm\:ml-3{margin-left:.75rem}.sm\:ml-4{margin-left:1rem}.sm\:ml-6{margin-left:1.5rem}.sm\:mt-0{margin-top:0}.sm\:mt-4{margin-top:1rem}.sm\:mt-6{margin-top:1.5rem}.sm\:block{display:block}.sm\:inline-block{display:inline-block}.sm\:inline{display:inline}.sm\:flex{display:flex}.sm\:grid{display:grid}.sm\:hidden{display:none}.sm\:h-10{height:2.5rem}.sm\:h-screen{height:100vh}.sm\:w-10{width:2.5rem}.sm\:w-auto{width:auto}.sm\:w-full{width:100%}.sm\:max-w-4xl{max-width:56rem}.sm\:max-w-lg{max-width:32rem}.sm\:max-w-sm{max-width:24rem}.sm\:flex-shrink-0{flex-shrink:0}.sm\:translate-y-0{--tw-translate-y: 0px;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.sm\:scale-100{--tw-scale-x: 1;--tw-scale-y: 1;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.sm\:scale-95{--tw-scale-x: .95;--tw-scale-y: .95;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.sm\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.sm\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.sm\:flex-row-reverse{flex-direction:row-reverse}.sm\:flex-nowrap{flex-wrap:nowrap}.sm\:items-start{align-items:flex-start}.sm\:items-center{align-items:center}.sm\:justify-center{justify-content:center}.sm\:justify-between{justify-content:space-between}.sm\:gap-4{gap:1rem}.sm\:rounded-lg{border-radius:.5rem}.sm\:p-0{padding:0}.sm\:p-6{padding:1.5rem}.sm\:px-0{padding-left:0;padding-right:0}.sm\:px-6{padding-left:1.5rem;padding-right:1.5rem}.sm\:pb-4{padding-bottom:1rem}.sm\:text-left{text-align:left}.sm\:align-middle{vertical-align:middle}.sm\:text-sm{font-size:.875rem;line-height:1.25rem}}@media (min-width: 768px){.md\:col-span-1{grid-column:span 1 / span 1}.md\:col-span-2{grid-column:span 2 / span 2}.md\:col-span-4{grid-column:span 4 / span 4}.md\:col-span-5{grid-column:span 5 / span 5}.md\:col-span-6{grid-column:span 6 / span 6}.md\:col-start-2{grid-column-start:2}.md\:col-start-4{grid-column-start:4}.md\:mx-0,.md\:mx-\[0\]{margin-left:0;margin-right:0}.md\:-mr-1{margin-right:-.25rem}.md\:mb-6{margin-bottom:1.5rem}.md\:mb-\[46px\]{margin-bottom:46px}.md\:ml-2{margin-left:.5rem}.md\:ml-6{margin-left:1.5rem}.md\:mr-0{margin-right:0}.md\:mr-2{margin-right:.5rem}.md\:mt-0{margin-top:0}.md\:mt-10{margin-top:2.5rem}.md\:mt-5{margin-top:1.25rem}.md\:block{display:block}.md\:flex{display:flex}.md\:grid{display:grid}.md\:hidden{display:none}.md\:min-h-\[411px\]{min-height:411px}.md\:w-1\/2{width:50%}.md\:w-1\/3{width:33.333333%}.md\:max-w-3xl{max-width:48rem}.md\:max-w-xl{max-width:36rem}.md\:flex-shrink-0{flex-shrink:0}.md\:shrink{flex-shrink:1}.md\:grow-0{flex-grow:0}.md\:basis-1\/2{flex-basis:50%}.md\:basis-\[449px\]{flex-basis:449px}.md\:grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.md\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.md\:flex-row{flex-direction:row}.md\:flex-col{flex-direction:column}.md\:items-center{align-items:center}.md\:justify-center{justify-content:center}.md\:justify-between{justify-content:space-between}.md\:gap-6{gap:1.5rem}.md\:gap-x-\[21px\]{-moz-column-gap:21px;column-gap:21px}.md\:gap-y-6{row-gap:1.5rem}.md\:border-r{border-right-width:1px}.md\:border-\[\#E5E7EB\]{--tw-border-opacity: 1;border-color:rgb(229 231 235 / var(--tw-border-opacity))}.md\:p-24{padding:6rem}.md\:px-8{padding-left:2rem;padding-right:2rem}.md\:px-\[40px\]{padding-left:40px;padding-right:40px}.md\:pb-\[40px\]{padding-bottom:40px}.md\:pl-4{padding-left:1rem}.md\:pl-\[52px\]{padding-left:52px}.md\:pl-\[61px\]{padding-left:61px}.md\:pr-\[20px\]{padding-right:20px}.md\:pr-\[48px\]{padding-right:48px}.md\:pt-0{padding-top:0}.md\:pt-\[58px\]{padding-top:58px}.md\:text-left{text-align:left}.md\:text-center{text-align:center}.md\:text-2xl{font-size:1.5rem;line-height:2rem}.md\:text-\[30px\]{font-size:30px}.md\:text-\[32px\]{font-size:32px}.md\:text-sm{font-size:.875rem;line-height:1.25rem}}@media (min-width: 1024px){.lg\:col-span-3{grid-column:span 3 / span 3}.lg\:col-span-6{grid-column:span 6 / span 6}.lg\:col-span-7{grid-column:span 7 / span 7}.lg\:col-span-8{grid-column:span 8 / span 8}.lg\:col-start-3{grid-column-start:3}.lg\:col-start-4{grid-column-start:4}.lg\:-mx-8{margin-left:-2rem;margin-right:-2rem}.lg\:-mb-1{margin-bottom:-.25rem}.lg\:-ml-5{margin-left:-1.25rem}.lg\:mt-24{margin-top:6rem}.lg\:block{display:block}.lg\:flex{display:flex}.lg\:grid{display:grid}.lg\:hidden{display:none}.lg\:h-screen{height:100vh}.lg\:w-1\/2{width:50%}.lg\:w-1\/3{width:33.333333%}.lg\:w-1\/4{width:25%}.lg\:w-1\/5{width:20%}.lg\:max-w-\[80\%\]{max-width:80%}.lg\:grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.lg\:items-center{align-items:center}.lg\:gap-4{gap:1rem}.lg\:rounded-lg{border-radius:.5rem}.lg\:px-16{padding-left:4rem;padding-right:4rem}.lg\:px-2{padding-left:.5rem;padding-right:.5rem}.lg\:px-4{padding-left:1rem;padding-right:1rem}.lg\:px-8{padding-left:2rem;padding-right:2rem}.lg\:py-2{padding-top:.5rem;padding-bottom:.5rem}}@media (min-width: 1280px){.xl\:col-span-4{grid-column:span 4 / span 4}.xl\:col-span-6{grid-column:span 6 / span 6}.xl\:col-span-8{grid-column:span 8 / span 8}.xl\:col-span-9{grid-column:span 9 / span 9}.xl\:col-start-4{grid-column-start:4}.xl\:ml-5{margin-left:1.25rem}.xl\:mt-0{margin-top:0}.xl\:mt-32{margin-top:8rem}.xl\:flex{display:flex}.xl\:w-auto{width:auto}.xl\:basis-auto{flex-basis:auto}.xl\:flex-row{flex-direction:row}.xl\:flex-nowrap{flex-wrap:nowrap}.xl\:justify-center{justify-content:center}.xl\:border-r{border-right-width:1px}.xl\:border-\[\#E5E7EB\]{--tw-border-opacity: 1;border-color:rgb(229 231 235 / var(--tw-border-opacity))}.xl\:px-16{padding-left:4rem;padding-right:4rem}.xl\:px-20{padding-left:5rem;padding-right:5rem}.xl\:px-5{padding-left:1.25rem;padding-right:1.25rem}.xl\:pr-20{padding-right:5rem}}@media (prefers-color-scheme: dark){.dark\:border-gray-600{--tw-border-opacity: 1;border-color:rgb(75 85 99 / var(--tw-border-opacity))}.dark\:bg-gray-700{--tw-bg-opacity: 1;background-color:rgb(55 65 81 / var(--tw-bg-opacity))}.dark\:text-white{--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}.dark\:placeholder-gray-400::-moz-placeholder{--tw-placeholder-opacity: 1;color:rgb(156 163 175 / var(--tw-placeholder-opacity))}.dark\:placeholder-gray-400::placeholder{--tw-placeholder-opacity: 1;color:rgb(156 163 175 / var(--tw-placeholder-opacity))}.dark\:focus\:border-blue-500:focus{--tw-border-opacity: 1;border-color:rgb(59 130 246 / var(--tw-border-opacity))}.dark\:focus\:ring-blue-500:focus{--tw-ring-opacity: 1;--tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity))}}
diff --git a/public/build/assets/square-credit-card-2fc5c3fa.js b/public/build/assets/square-credit-card-2fc5c3fa.js
deleted file mode 100644
index fdd7554e820..00000000000
--- a/public/build/assets/square-credit-card-2fc5c3fa.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import{i,w as d}from"./wait-8f4ae121.js";/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://www.elastic.co/licensing/elastic-license
- */class s{constructor(){this.appId=document.querySelector("meta[name=square-appId]").content,this.locationId=document.querySelector("meta[name=square-locationId]").content,this.isLoaded=!1}async init(){this.payments=Square.payments(this.appId,this.locationId),this.card=await this.payments.card(),await this.card.attach("#card-container"),this.isLoaded=!0;let e=document.querySelector(".sq-card-iframe-container");e&&e.setAttribute("style","150px !important"),document.querySelector(".toggle-payment-with-token")&&document.getElementById("card-container").classList.add("hidden")}async completePaymentWithoutToken(e){document.getElementById("errors").hidden=!0,e.target.parentElement.disabled=!0;let t=await this.card.tokenize(),o;try{const n={amount:document.querySelector("meta[name=amount]").content,billingContact:JSON.parse(document.querySelector("meta[name=square_contact]").content),currencyCode:document.querySelector("meta[name=currencyCode]").content,intent:"CHARGE"};o=(await this.payments.verifyBuyer(t.token,n)).token}catch{e.target.parentElement.disabled=!0}if(document.querySelector('input[name="verificationToken"]').value=o,t.status==="OK"){document.getElementById("sourceId").value=t.token;let n=document.querySelector('input[name="token-billing-checkbox"]:checked');return n&&(document.querySelector('input[name="store_card"]').value=n.value),document.getElementById("server_response").submit()}document.getElementById("errors").textContent=t.errors[0].message,document.getElementById("errors").hidden=!1,e.target.parentElement.disabled=!1}async completePaymentUsingToken(e){return e.target.parentElement.disabled=!0,document.getElementById("server_response").submit()}async verifyBuyer(e){const t={amount:document.querySelector("meta[name=amount]").content,billingContact:document.querySelector("meta[name=square_contact]").content,currencyCode:document.querySelector("meta[name=currencyCode]").content,intent:"CHARGE"};return(await this.payments.verifyBuyer(e,t)).token}async handle(){document.getElementById("payment-list").classList.add("hidden"),await this.init().then(()=>{var e,t,o,n;(e=document.getElementById("authorize-card"))==null||e.addEventListener("click",a=>this.completePaymentWithoutToken(a)),(t=document.getElementById("pay-now"))==null||t.addEventListener("click",a=>document.querySelector("input[name=token]").value?this.completePaymentUsingToken(a):this.completePaymentWithoutToken(a)),Array.from(document.getElementsByClassName("toggle-payment-with-token")).forEach(a=>a.addEventListener("click",async r=>{document.getElementById("card-container").classList.add("hidden"),document.getElementById("save-card--container").style.display="none",document.querySelector("input[name=token]").value=r.target.dataset.token})),(o=document.getElementById("toggle-payment-with-credit-card"))==null||o.addEventListener("click",async a=>{document.getElementById("card-container").classList.remove("hidden"),document.getElementById("save-card--container").style.display="grid",document.querySelector("input[name=token]").value=""}),document.getElementById("loader").classList.add("hidden"),document.getElementById("payment-list").classList.remove("hidden"),(n=document.getElementById("toggle-payment-with-credit-card"))==null||n.click()})}}function c(){new s().handle()}i()?c():d("#square-credit-card-payment").then(()=>c());
diff --git a/public/build/assets/square-credit-card-9e88c754.js b/public/build/assets/square-credit-card-9e88c754.js
new file mode 100644
index 00000000000..8aa2801b3a3
--- /dev/null
+++ b/public/build/assets/square-credit-card-9e88c754.js
@@ -0,0 +1,9 @@
+import{i as c,w as d}from"./wait-8f4ae121.js";/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */class s{constructor(){this.appId=document.querySelector("meta[name=square-appId]").content,this.locationId=document.querySelector("meta[name=square-locationId]").content,this.isLoaded=!1}async init(){this.payments=Square.payments(this.appId,this.locationId),this.card=await this.payments.card(),await this.card.attach("#card-container"),this.isLoaded=!0;let t=document.querySelector(".sq-card-iframe-container");t&&t.setAttribute("style","150px !important"),document.querySelector(".toggle-payment-with-token")&&document.getElementById("card-container").classList.add("hidden")}async completePaymentWithoutToken(t){document.getElementById("errors").hidden=!0,t.target.parentElement.disabled=!0;let n=document.getElementById("pay-now");this.payNowButton=n,this.payNowButton.disabled=!0,this.payNowButton.querySelector("svg").classList.remove("hidden"),this.payNowButton.querySelector("span").classList.add("hidden");let a=await this.card.tokenize(),o;try{const e={amount:document.querySelector("meta[name=amount]").content,billingContact:JSON.parse(document.querySelector("meta[name=square_contact]").content),currencyCode:document.querySelector("meta[name=currencyCode]").content,intent:"CHARGE"};o=(await this.payments.verifyBuyer(a.token,e)).token}catch{t.target.parentElement.disabled=!0}if(document.querySelector('input[name="verificationToken"]').value=o,a.status==="OK"){document.getElementById("sourceId").value=a.token;let e=document.querySelector('input[name="token-billing-checkbox"]:checked');return e&&(document.querySelector('input[name="store_card"]').value=e.value),document.getElementById("server_response").submit()}document.getElementById("errors").textContent=a.errors[0].message,document.getElementById("errors").hidden=!1,t.target.parentElement.disabled=!1,this.payNowButton.disabled=!1,this.payNowButton.querySelector("svg").classList.add("hidden"),this.payNowButton.querySelector("span").classList.remove("hidden")}async completePaymentUsingToken(t){t.target.parentElement.disabled=!0;let n=document.getElementById("pay-now");return this.payNowButton=n,this.payNowButton.disabled=!0,this.payNowButton.querySelector("svg").classList.remove("hidden"),this.payNowButton.querySelector("span").classList.add("hidden"),document.getElementById("server_response").submit()}async verifyBuyer(t){const n={amount:document.querySelector("meta[name=amount]").content,billingContact:document.querySelector("meta[name=square_contact]").content,currencyCode:document.querySelector("meta[name=currencyCode]").content,intent:"CHARGE"};return(await this.payments.verifyBuyer(t,n)).token}async handle(){document.getElementById("payment-list").classList.add("hidden"),await this.init().then(()=>{var t,n,a,o;(t=document.getElementById("authorize-card"))==null||t.addEventListener("click",e=>this.completePaymentWithoutToken(e)),(n=document.getElementById("pay-now"))==null||n.addEventListener("click",e=>document.querySelector("input[name=token]").value?this.completePaymentUsingToken(e):this.completePaymentWithoutToken(e)),Array.from(document.getElementsByClassName("toggle-payment-with-token")).forEach(e=>e.addEventListener("click",async r=>{document.getElementById("card-container").classList.add("hidden"),document.getElementById("save-card--container").style.display="none",document.querySelector("input[name=token]").value=r.target.dataset.token})),(a=document.getElementById("toggle-payment-with-credit-card"))==null||a.addEventListener("click",async e=>{document.getElementById("card-container").classList.remove("hidden"),document.getElementById("save-card--container").style.display="grid",document.querySelector("input[name=token]").value=""}),Array.from(document.getElementsByClassName("loader")).forEach(e=>{e.classList.add("hidden")}),document.getElementById("payment-list").classList.remove("hidden"),(o=document.getElementById("toggle-payment-with-credit-card"))==null||o.click()})}}function i(){new s().handle()}c()?i():d("#square-credit-card-payment").then(()=>i());
diff --git a/public/build/manifest.json b/public/build/manifest.json
index 0762b8f31d9..c14a825024f 100644
--- a/public/build/manifest.json
+++ b/public/build/manifest.json
@@ -174,7 +174,7 @@
     "src": "resources/js/clients/payments/razorpay-aio.js"
   },
   "resources/js/clients/payments/square-credit-card.js": {
-    "file": "assets/square-credit-card-2fc5c3fa.js",
+    "file": "assets/square-credit-card-9e88c754.js",
     "imports": [
       "_wait-8f4ae121.js"
     ],
diff --git a/resources/js/clients/payments/square-credit-card.js b/resources/js/clients/payments/square-credit-card.js
index 73ea9ea503a..3e140192816 100644
--- a/resources/js/clients/payments/square-credit-card.js
+++ b/resources/js/clients/payments/square-credit-card.js
@@ -49,6 +49,14 @@ class SquareCreditCard {
         document.getElementById('errors').hidden = true;
         e.target.parentElement.disabled = true;
 
+        let payNowButton = document.getElementById('pay-now');
+        this.payNowButton = payNowButton;
+
+        this.payNowButton.disabled = true;
+
+        this.payNowButton.querySelector('svg').classList.remove('hidden');
+        this.payNowButton.querySelector('span').classList.add('hidden');
+
         let result = await this.card.tokenize();
 
         /* SCA */
@@ -99,11 +107,23 @@ class SquareCreditCard {
         document.getElementById('errors').hidden = false;
 
         e.target.parentElement.disabled = false;
+        this.payNowButton.disabled = false;
+
+        this.payNowButton.querySelector('svg').classList.add('hidden');
+        this.payNowButton.querySelector('span').classList.remove('hidden');
     }
 
     async completePaymentUsingToken(e) {
         e.target.parentElement.disabled = true;
 
+        let payNowButton = document.getElementById('pay-now');
+        this.payNowButton = payNowButton;
+
+        this.payNowButton.disabled = true;
+
+        this.payNowButton.querySelector('svg').classList.remove('hidden');
+        this.payNowButton.querySelector('span').classList.add('hidden');
+
         return document.getElementById('server_response').submit();
     }
 
@@ -173,7 +193,14 @@ class SquareCreditCard {
                     document.querySelector('input[name=token]').value = '';
                 });
 
-            document.getElementById('loader').classList.add('hidden');
+                Array.from(
+                        document.getElementsByClassName('loader')
+                    ).forEach((element) => {
+
+                    element.classList.add('hidden');
+
+                });
+
             document.getElementById('payment-list').classList.remove('hidden');
             document.getElementById('toggle-payment-with-credit-card')?.click();
 
diff --git a/resources/views/portal/ninja2020/gateways/square/credit_card/pay_livewire.blade.php b/resources/views/portal/ninja2020/gateways/square/credit_card/pay_livewire.blade.php
index 9a548d27d9d..62c8814fa29 100644
--- a/resources/views/portal/ninja2020/gateways/square/credit_card/pay_livewire.blade.php
+++ b/resources/views/portal/ninja2020/gateways/square/credit_card/pay_livewire.blade.php
@@ -56,8 +56,8 @@
     @include('portal.ninja2020.gateways.includes.payment_details')
 
     @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.pay_with')])
-        <div class="flex flex-col" id="loader">
-            <div class="loader ease-linear rounded-full border-4 border-t-4 border-gray-200 h-12 w-12 mb-4" id="loader"></div>
+        <div class="flex flex-col" >
+            <div class="loader ease-linear rounded-full border-4 border-t-4 border-gray-200 h-12 w-12 mb-4"></div>
         </div>
 
         <ul class="list-none space-y-2" id="payment-list">

From 945ff51a143e9cd74f908b923bc1ac5d4892122f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 10 Oct 2024 14:03:36 +1100
Subject: [PATCH 04/81] Updates for powerboard layout

---
 .../credit_card/pay_livewire.blade.php         | 18 +++++++++---------
 .../square/credit_card/pay_livewire.blade.php  |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/resources/views/portal/ninja2020/gateways/powerboard/credit_card/pay_livewire.blade.php b/resources/views/portal/ninja2020/gateways/powerboard/credit_card/pay_livewire.blade.php
index d0215dab2a3..d4b7bcea440 100644
--- a/resources/views/portal/ninja2020/gateways/powerboard/credit_card/pay_livewire.blade.php
+++ b/resources/views/portal/ninja2020/gateways/powerboard/credit_card/pay_livewire.blade.php
@@ -36,31 +36,31 @@
     @include('portal.ninja2020.gateways.includes.payment_details')
 
     @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.pay_with')])
-        <ul class="list-none">
+        <ul class="list-none space-y-2">
         @if(count($tokens) > 0)
             @foreach($tokens as $token)
-            <li class="py-2 cursor-pointer">
-                <label class="mr-4">
+            <li class="py-2 hover:bg-gray-100 rounded transition-colors duration-150">
+                <label class="flex items-center cursor-pointer px-2">
                     <input
                         type="radio"
                         data-token="{{ $token->token }}"
                         name="payment-type"
-                        class="form-check-input text-indigo-600 rounded-full cursor-pointer toggle-payment-with-token toggle-payment-with-token"/>
-                    <span class="ml-1 cursor-pointer">**** {{ $token->meta?->last4 }}</span>
+                        class="form-radio text-indigo-600 rounded-full cursor-pointer toggle-payment-with-token"/>
+                    <span class="ml-2 cursor-pointer">**** {{ $token->meta?->last4 }}</span>
                 </label>
             </li>
             @endforeach
         @endisset
 
-            <li class="py-2 cursor-pointer">
-                <label>
+            <li class="py-2 hover:bg-gray-100 rounded transition-colors duration-150">
+                <label class="flex items-center cursor-pointer px-2">
                     <input
                         type="radio"
                         id="toggle-payment-with-credit-card"
-                        class="form-check-input text-indigo-600 rounded-full cursor-pointer"
+                        class="form-radio text-indigo-600 rounded-full cursor-pointer"
                         name="payment-type"
                         checked/>
-                    <span class="ml-1 cursor-pointer">{{ __('texts.new_card') }}</span>
+                    <span class="ml-2 cursor-pointer">{{ __('texts.new_card') }}</span>
                 </label>
             </li>    
         </ul>
diff --git a/resources/views/portal/ninja2020/gateways/square/credit_card/pay_livewire.blade.php b/resources/views/portal/ninja2020/gateways/square/credit_card/pay_livewire.blade.php
index 62c8814fa29..628b3dbacc2 100644
--- a/resources/views/portal/ninja2020/gateways/square/credit_card/pay_livewire.blade.php
+++ b/resources/views/portal/ninja2020/gateways/square/credit_card/pay_livewire.blade.php
@@ -56,7 +56,7 @@
     @include('portal.ninja2020.gateways.includes.payment_details')
 
     @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.pay_with')])
-        <div class="flex flex-col" >
+        <div class="flex flex-col">
             <div class="loader ease-linear rounded-full border-4 border-t-4 border-gray-200 h-12 w-12 mb-4"></div>
         </div>
 

From 0818513ade4f2dd99bebaa48a08c85007390ab4c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 10 Oct 2024 16:04:30 +1100
Subject: [PATCH 05/81] Improvements for company imports

---
 app/Jobs/Company/CompanyImport.php            | 47 +++++++++++++++++++
 .../EDocument/Gateway/Storecove/Storecove.php |  2 +-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php
index 44ed1870321..71336ef0a77 100644
--- a/app/Jobs/Company/CompanyImport.php
+++ b/app/Jobs/Company/CompanyImport.php
@@ -331,6 +331,7 @@ public function handle()
                      ->purgeCompanyData()
                      ->importCompany()
                      ->importData()
+                     ->miscTransformations()
                      ->postImportCleanup();
 
                 $data = [
@@ -359,6 +360,52 @@ public function handle()
         
     }
 
+    private function miscTransformations()
+    {
+        Invoice::withTrashed()
+                ->where('company_id', $this->company->id)
+                ->cursor()
+                ->each(function ($invoice){
+
+                $items = $invoice->line_items;
+
+                foreach($items as $key => $value)
+                {
+
+                    if(isset($value->task_id) && strlen($value->task_id) >1) {
+
+                        $t_id = $this->transformId('tasks',$value->task_id);
+
+                        if($t = Task::withTrashed()->where('company_id', $this->company->id)->where('id',$t_id)->first())
+                        {
+                            $items[$key]->task_id = $t->hashed_id;
+                        }
+                        
+                    }
+
+                                        
+                    
+                    if (isset($value->expense_id) && strlen($value->expense_id) > 1) {
+                        
+                        $e_id = $this->transformId('expenses', $value->expense_id);
+
+                        if ($e = Expense::withTrashed()->where('company_id', $this->company->id)->where('id', $e_id)->first()) {
+                            $items[$key]->expense_id = $e->hashed_id;
+                        }
+
+                    }
+
+                }
+
+                $invoice->line_items = array_values($items);
+                $invoice->saveQuietly();
+
+
+        });
+
+        return $this;
+    }
+
     //
     private function postImportCleanup()
     {
diff --git a/app/Services/EDocument/Gateway/Storecove/Storecove.php b/app/Services/EDocument/Gateway/Storecove/Storecove.php
index b9d4744055b..22dcecb5ef9 100644
--- a/app/Services/EDocument/Gateway/Storecove/Storecove.php
+++ b/app/Services/EDocument/Gateway/Storecove/Storecove.php
@@ -222,7 +222,7 @@ public function createLegalEntity(array $data, ?Company $company = null)
         }
 
         $company_defaults = [
-            'acts_as_receiver' => true,
+            'acts_as_receiver' => false,
             'acts_as_sender' => true,
             'advertisements' => ['invoice'],
         ];

From 056490fd8f821683f5d4af634702c600d288b5fc Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 11 Oct 2024 11:32:15 +1100
Subject: [PATCH 06/81] Minor fixes

---
 app/Filters/InvoiceFilters.php         | 5 +----
 app/Livewire/BillingPortal/Summary.php | 2 +-
 app/PaymentDrivers/BaseDriver.php      | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php
index 9f3a935146f..5c2d83be66a 100644
--- a/app/Filters/InvoiceFilters.php
+++ b/app/Filters/InvoiceFilters.php
@@ -276,7 +276,7 @@ public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
-        if (!is_array($sort_col) || count($sort_col) != 2 || in_array($sort_col[0], ['documents'])) {
+        if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col[0], \Illuminate\Support\Facades\Schema::getColumnListing($this->builder->getModel()->getTable()))) {
             return $this->builder;
         }
 
@@ -290,9 +290,6 @@ public function sort(string $sort = ''): Builder
         }
 
         if($sort_col[0] == 'number') {
-            // return $this->builder->orderByRaw('CAST(number AS UNSIGNED), number ' . $dir);
-            // return $this->builder->orderByRaw("number REGEXP '^[A-Za-z]+$',CAST(number as SIGNED INTEGER),CAST(REPLACE(number,'-','')AS SIGNED INTEGER) ,number");
-            // return $this->builder->orderByRaw('ABS(number) ' . $dir);
             return $this->builder->orderByRaw("REGEXP_REPLACE(invoices.number,'[^0-9]+','')+0 " . $dir);
         }
 
diff --git a/app/Livewire/BillingPortal/Summary.php b/app/Livewire/BillingPortal/Summary.php
index 3e824f95efe..22f24021be7 100644
--- a/app/Livewire/BillingPortal/Summary.php
+++ b/app/Livewire/BillingPortal/Summary.php
@@ -116,7 +116,7 @@ public function recurringPurchasesTotal(bool $raw = false)
         return \sprintf(
             '%s/%s',
             Number::formatMoney($recurring + $recurring_optional, $this->subscription->company),
-            RecurringInvoice::frequencyForKey($this->subscription->frequency_id)
+            RecurringInvoice::frequencyForKey($this->subscription->frequency_id ?? 0)
         );
     }
 
diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index 2ca2bc71d4f..580ac5bd007 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -405,7 +405,6 @@ public function confirmGatewayFee($data = []): void
                             return $item;
                         })
                         ->whereIn('type_id', ['3'])
-                        // ->where('gross_line_total', '<=', round($fee_total,2))
                         ->count();
 
         if($invoice && $fee_count == 0){

From 6bb1f75292f168e5e71c10610332c6ce1de0295b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 11 Oct 2024 15:07:20 +1100
Subject: [PATCH 07/81] Minor fixes

---
 app/Jobs/Util/Import.php          | 19 ++++++++++++-------
 app/PaymentDrivers/BaseDriver.php |  7 +------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index b13ea2a9f07..b9b89cc0e70 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -432,15 +432,20 @@ private function processCompany(array $data): void
             }
         }
 
-        $rules = (new UpdateCompanyRequest())->rules();
+        // $rules = (new UpdateCompanyRequest())->rules();
 
-        unset($rules['expense_mailbox']);
-        
-        $validator = Validator::make($data, $rules);
+        // unset($rules['expense_mailbox']);
+        // unset($rules['e_invoice']);
+        // unset($rules['smtp_port']);
+        // unset($rules['settings']);
 
-        if ($validator->fails()) {
-            throw new MigrationValidatorFailed(json_encode($validator->errors()));
-        }
+        // $validator = Validator::make($data, $rules);
+
+        // nlog($validator->errors());
+
+        // if ($validator->fails()) {
+        //     throw new MigrationValidatorFailed(json_encode($validator->errors()));
+        // }
 
         if (isset($data['account_id'])) {
             unset($data['account_id']);
diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index 580ac5bd007..61617e6f764 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -455,12 +455,7 @@ public function confirmGatewayFee($data = []): void
             $new_balance = $invoice->balance;
 
             if (floatval($new_balance) - floatval($balance) != 0) {
-                $adjustment = $new_balance - $balance;
-
-                $invoice
-                ->ledger()
-                ->updateInvoiceBalance($adjustment, 'Adjustment for adding gateway fee **Base Driver**');
-
+                $adjustment = $new_balance - $balance; 
                 $invoice->client->service()->calculateBalance();
             }
 

From 8009f5afb22f68ec1f15a8bcb75429ff1c4fe6c8 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 11 Oct 2024 15:35:05 +1100
Subject: [PATCH 08/81] Fixes for task exports

---
 app/Export/CSV/TaskExport.php | 22 +++++++----
 lang/en/texts.php             |  3 +-
 lang/fr_CA/texts.php          |  3 ++
 lang/nl/texts.php             | 24 +++++++++++-
 lang/sl/texts.php             | 69 ++++++++++++++++++++++++++++++++---
 lang/vi/texts.php             | 38 ++++++++++---------
 6 files changed, 127 insertions(+), 32 deletions(-)

diff --git a/app/Export/CSV/TaskExport.php b/app/Export/CSV/TaskExport.php
index 742654ee913..18efab12e89 100644
--- a/app/Export/CSV/TaskExport.php
+++ b/app/Export/CSV/TaskExport.php
@@ -62,10 +62,9 @@ public function init(): Builder
 
         if (count($this->input['report_keys']) == 0) {
             $this->input['report_keys'] = array_values($this->task_report_keys);
+            $this->input['report_keys'] = array_merge($this->input['report_keys'], array_diff($this->forced_client_fields, $this->input['report_keys']));
         }
 
-        $this->input['report_keys'] = array_merge($this->input['report_keys'], array_diff($this->forced_client_fields, $this->input['report_keys']));
-
         $query = Task::query()
                         ->withTrashed()
                         ->where('company_id', $this->company->id);
@@ -207,15 +206,23 @@ private function iterateLogs(Task $task, array $entity)
                 $entity['task.end_time'] = ctrans('texts.is_running');
             }
 
+            $seconds = $task->calcDuration();
+            $time_log_entry = (isset($item[1]) && $item[1] != 0) ? $item[1] - $item[0] : ctrans('texts.is_running');
+
             if (in_array('task.duration', $this->input['report_keys']) || in_array('duration', $this->input['report_keys'])) {
-                $seconds = $task->calcDuration();
                 $entity['task.duration'] = $seconds;
-                $entity['task.duration_words'] =  $seconds > 86400 ? CarbonInterval::seconds($seconds)->locale($this->company->locale())->cascade()->forHumans() : now()->startOfDay()->addSeconds($seconds)->format('H:i:s');
+            }
 
-                $time_log_entry = (isset($item[1]) && $item[1] != 0) ? $item[1] - $item[0] : ctrans('texts.is_running');
+            if (in_array('task.time_log', $this->input['report_keys']) || in_array('time_log', $this->input['report_keys'])) {
                 $entity['task.time_log'] = $time_log_entry;
-                $entity['task.time_log_duration_words'] =  is_int($time_log_entry) && $time_log_entry > 86400 ? CarbonInterval::seconds($time_log_entry)->locale($this->company->locale())->cascade()->forHumans() : $time_log_entry;
+            }
 
+            if (in_array('task.time_log_duration_words', $this->input['report_keys']) || in_array('time_log_duration_words', $this->input['report_keys'])) {
+                $entity['task.time_log_duration_words'] =  is_int($time_log_entry) ? CarbonInterval::seconds($time_log_entry)->locale($this->company->locale())->cascade()->forHumans() : $time_log_entry;
+            }
+
+            if (in_array('task.duration_words', $this->input['report_keys']) || in_array('duration_words', $this->input['report_keys'])) {
+                $entity['task.duration_words'] =  $seconds > 86400 ? CarbonInterval::seconds($seconds)->locale($this->company->locale())->cascade()->forHumans() : now()->startOfDay()->addSeconds($seconds)->format('H:i:s');
             }
 
             if (in_array('task.billable', $this->input['report_keys']) || in_array('billable', $this->input['report_keys'])) {
@@ -227,7 +234,6 @@ private function iterateLogs(Task $task, array $entity)
             }
 
             
-            
             $this->storage_array[] = $entity;
 
             $entity['task.start_date'] = '';
@@ -237,7 +243,7 @@ private function iterateLogs(Task $task, array $entity)
             $entity['task.duration'] = '';
             $entity['task.duration_words'] = '';
             $entity['task.time_log'] = '';
-            $entity['task.time_log_duration_words'];
+            $entity['task.time_log_duration_words'] = '';
             $entity['task.billable'] = '';
             $entity['task.item_notes'] = '';
 
diff --git a/lang/en/texts.php b/lang/en/texts.php
index 5ab54ab89e9..6089824a10e 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5359,7 +5359,8 @@
     'updated_records' => 'Updated Records',
     'vat_not_registered' => 'Seller not VAT registered',
     'small_company_info' => 'No disclosure of sales tax in accordance with § 19 UStG',
-    'log_duration_words' => 'Log duration in words'
+    'log_duration_words' => 'Time log duration in words',
+    'log_duration' => 'Time log duration'
 );
 
 return $lang;
diff --git a/lang/fr_CA/texts.php b/lang/fr_CA/texts.php
index 58c055f1413..0729cb34b35 100644
--- a/lang/fr_CA/texts.php
+++ b/lang/fr_CA/texts.php
@@ -5355,6 +5355,9 @@
     'quick_actions' => 'Actions rapides',
     'end_all_sessions_help' => 'Déconnecte tous les utilisateurs et oblige tous les utilisateurs actifs à se réauthentifier.',
     'updated_records' => 'Enregistrements mis à jour',
+    'vat_not_registered' => 'Vendeur non enregistré aux taxes',
+    'small_company_info' => 'Aucune déclaration de taxe de vente conformément à l\'article 19 UStG',
+    'log_duration_words' => 'Durée du journal en mots'
 );
 
 return $lang;
diff --git a/lang/nl/texts.php b/lang/nl/texts.php
index 320a4895f54..d6ed5a8a4a8 100644
--- a/lang/nl/texts.php
+++ b/lang/nl/texts.php
@@ -2361,7 +2361,7 @@
     'currency_gold_troy_ounce' => 'Gouden Troy Ounce',
     'currency_nicaraguan_córdoba' => 'Nicaraguaans Córdoba',
     'currency_malagasy_ariary' => 'Malagassische ariarium',
-    "currency_tongan_paanga" => "Tongaanse pa'anga",
+    "currency_tongan_pa_anga" => "Tongaanse pa'anga",
 
     'review_app_help' => 'We hopen dat u veel gemak heeft aan het gebruik van deze app.<br/> Als u :link zou overwegen, stellen wij dat zeer op prijs!',
     'writing_a_review' => 'een recensie schrijven',
@@ -5338,6 +5338,28 @@
     'no_unread_notifications' => 'U bent weer helemaal bij! Er zijn geen nieuwe notificaties.',
     'how_to_import_data' => 'Hoe u gegevens kunt importeren',
     'download_example_file' => 'Download voorbeeldbestand',
+    'expense_mailbox' => 'Inkomend e-mailadres',
+    'expense_mailbox_help' => 'Het inkomende e-mailadres waarop declaraties ontvangen kunnen worden. Bijv. declaratie@invoiceninja.com',
+    'expense_mailbox_active' => 'Mailbox voor declaraties',
+    'expense_mailbox_active_help' => 'Maakt het mogelijk om declaraties zoals kassabonnen te verwerken voor kostenrapportages',
+    'inbound_mailbox_allow_company_users' => 'Bedrijfsafzenders toestaan',
+    'inbound_mailbox_allow_company_users_help' => 'Sta gebruikers binnen het bedrijf toe om declaraties in te sturen',
+    'inbound_mailbox_allow_vendors' => 'Leveranciersafzenders toestaan',
+    'inbound_mailbox_allow_vendors_help' => 'Sta bedrijfsafzenders toe om declaraties in te sturen',
+    'inbound_mailbox_allow_clients' => 'Sta klantafzenders toe',
+    'inbound_mailbox_allow_clients_help' => 'Sta klanten toe om declaraties in te sturen',
+    'inbound_mailbox_whitelist' => 'Lijst met toegestane afzenders',
+    'inbound_mailbox_whitelist_help' => 'Door komma\'s gescheiden lijst met e-mailadressen die declaraties mogen insturen voor verwerking',
+    'inbound_mailbox_blacklist' => 'Lijst met geblokkeerde afzenders',
+    'inbound_mailbox_blacklist_help' => 'Door komma\'s gescheiden lijst met e-mailadressen die geblokkeerd zijn en declaraties niet mogen insturen voor verwerking',
+    'inbound_mailbox_allow_unknown' => 'Sta alle afzenders toe',
+    'inbound_mailbox_allow_unknown_help' => 'Sta iedereen toe om declaraties in te sturen voor verwerking',
+    'quick_actions' => 'Snelle acties',
+    'end_all_sessions_help' => 'Logt alle gebruikers uit en vereist dat alle actieve gebruikers opnieuw inloggen.',
+    'updated_records' => 'Items bijgewerkt',
+    'vat_not_registered' => 'Seller not VAT registered',
+    'small_company_info' => 'No disclosure of sales tax in accordance with § 19 UStG',
+    'log_duration_words' => 'Log duration in words'
 );
 
 return $lang;
diff --git a/lang/sl/texts.php b/lang/sl/texts.php
index dd57ebfa526..f3abe5c8c86 100644
--- a/lang/sl/texts.php
+++ b/lang/sl/texts.php
@@ -1065,7 +1065,7 @@
     'user_create_all' => 'Ustvarja stranke, račune, itd.',
     'user_view_all' => 'Vidi stranke, račune, itd.',
     'user_edit_all' => 'Ureja stranke, račune, itd.',
-    'partial_due' => 'Delno plačilo do',
+    'partial_due' => 'Delno plačilo',
     'restore_vendor' => 'Obnovi dobavitelja',
     'restored_vendor' => 'Dobavitelj uspešno obnovljen',
     'restored_expense' => 'Strošek uspešno obnovljen',
@@ -2365,7 +2365,7 @@
     'currency_gold_troy_ounce' => 'Gold Troy Ounce',
     'currency_nicaraguan_córdoba' => 'Nicaraguan Córdoba',
     'currency_malagasy_ariary' => 'Malagasy ariary',
-    "currency_tongan_paanga" => "Tongan Pa'anga",
+    "currency_tongan_pa_anga" => "Tongan Pa'anga",
 
     'review_app_help' => 'Upamo da uživate v uporabi aplikacije.<br/>Zelo bi cenili klik na :link!',
     'writing_a_review' => 'pisanje pregleda (kritike)',
@@ -2493,6 +2493,8 @@
     'local_storage_required' => 'Napaka: Lokalna hramba ni na voljo.',
     'your_password_reset_link' => 'Povezava za ponastavitev gesla',
     'subdomain_taken' => 'Poddomena že v uporabi',
+    'expense_mailbox_taken' => 'The inbound mailbox is already in use',
+    'expense_mailbox_invalid' => 'The inbound mailbox does not match the required schema',
     'client_login' => 'Vpis stranke',
     'converted_amount' => 'Pretvorjeni znesek',
     'default' => 'Privzeto',
@@ -3890,7 +3892,7 @@
     'payment_method_saving_failed' => 'Payment method can\'t be saved for future use.',
     'pay_with' => 'Pay with',
     'n/a' => 'N/A',
-    'by_clicking_next_you_accept_terms' => 'By clicking "Next step" you accept terms.',
+    'by_clicking_next_you_accept_terms' => 'By clicking "Next" you accept terms.',
     'not_specified' => 'Not specified',
     'before_proceeding_with_payment_warning' => 'Before proceeding with payment, you have to fill following fields',
     'after_completing_go_back_to_previous_page' => 'After completing, go back to previous page.',
@@ -5125,7 +5127,7 @@
     'all_contacts' => 'All Contacts',
     'insert_below' => 'Insert Below',
     'nordigen_handler_subtitle' => 'Bank account authentication. Selecting your institution to complete the request with your account credentials.',
-    'nordigen_handler_error_heading_unknown' => 'An error has occured',
+    'nordigen_handler_error_heading_unknown' => 'An error has occurred',
     'nordigen_handler_error_contents_unknown' => 'An unknown error has occurred! Reason:',
     'nordigen_handler_error_heading_token_invalid' => 'Invalid Token',
     'nordigen_handler_error_contents_token_invalid' => 'The provided token was invalid. Contact support for help, if this issue persists.',
@@ -5239,7 +5241,7 @@
     'local_domain_help' => 'EHLO domain (optional)',
     'port_help' => 'ie. 25,587,465',
     'host_help' => 'ie. smtp.gmail.com',
-    'always_show_required_fields' => 'Allows show required fields form',
+    'always_show_required_fields' => 'Always show required fields form',
     'always_show_required_fields_help' => 'Displays the required fields form always at checkout',
     'advanced_cards' => 'Advanced Cards',
     'activity_140' => 'Statement sent to :client',
@@ -5302,6 +5304,63 @@
     'latest_requires_php_version' => 'Note: the latest version requires PHP :version',
     'auto_expand_product_table_notes' => 'Automatically expand products table notes',
     'auto_expand_product_table_notes_help' => 'Automatically expands the notes section within the products table to display more lines.',
+    'institution_number' => 'Institution Number',
+    'transit_number' => 'Transit Number',
+    'personal' => 'Personal',
+    'address_information' => 'Address Information',
+    'enter_the_information_for_the_bank_account' => 'Enter the Information for the Bank Account',
+    'account_holder_information' => 'Account Holder Information',
+    'enter_information_for_the_account_holder' => 'Enter Information for the Account Holder',
+    'customer_type' => 'Customer Type',
+    'process_date' => 'Process Date',
+    'forever_free' => 'Forever Free',
+    'comments_only' => 'Comments Only',
+    'payment_balance_on_file' => 'Payment Balance On File',
+    'ubl_email_attachment_help' => 'For more e-invoice settings please navigate :here',
+    'stop_task_to_add_task_entry' => 'You need to stop the task before adding a new item.',
+    'xml_file' => 'XML File',
+    'one_page_checkout' => 'One-Page Checkout',
+    'one_page_checkout_help' => 'Enable the new single page payment flow',
+    'applies_to' => 'Applies To',
+    'accept_purchase_order' => 'Accept Purchase Order',
+    'round_to_seconds' => 'Round To Seconds',
+    'activity_142' => 'Quote :number reminder 1 sent',
+    'activity_143' => 'Auto Bill succeeded for invoice :invoice',
+    'activity_144' => 'Auto Bill failed for invoice :invoice. :notes',
+    'activity_145' => 'EInvoice :invoice for :client was e-delivered. :notes',
+    'payment_failed' => 'Payment Failed',
+    'ssl_host_override' => 'SSL Host Override',
+    'upload_logo_short' => 'Upload Logo',
+    'country_Melilla' => 'Melilla',
+    'country_Ceuta' => 'Ceuta',
+    'country_Canary Islands' => 'Canary Islands',
+    'lang_Vietnamese' => 'Vietnamese',
+    'invoice_status_changed' => 'Please note that the status of your invoice has been updated. We recommend refreshing the page to view the most current version.',
+    'no_unread_notifications' => 'You’re all caught up! No new notifications.',
+    'how_to_import_data' => 'How to import data',
+    'download_example_file' => 'Download example file',
+    'expense_mailbox' => 'Inbound e-mail address',
+    'expense_mailbox_help' => 'The inbound email address which accepts expense documents. ie. expense@invoiceninja.com',
+    'expense_mailbox_active' => 'Expense Mailbox',
+    'expense_mailbox_active_help' => 'Enables processing of documents such as receipts for expense reporting',
+    'inbound_mailbox_allow_company_users' => 'Allow Company Senders',
+    'inbound_mailbox_allow_company_users_help' => 'Allows users within the company to send expense documents.',
+    'inbound_mailbox_allow_vendors' => 'Allow Vendor Senders',
+    'inbound_mailbox_allow_vendors_help' => 'Allows company vendors to send expense documents',
+    'inbound_mailbox_allow_clients' => 'Allow Client Senders',
+    'inbound_mailbox_allow_clients_help' => 'Allows clients to send expense documents',
+    'inbound_mailbox_whitelist' => 'Inbound sender allow list',
+    'inbound_mailbox_whitelist_help' => 'Comma separated list of emails that should be allowed to send emails for processing',
+    'inbound_mailbox_blacklist' => 'Inbound sender banned list',
+    'inbound_mailbox_blacklist_help' => 'Comma separate list of emails that are disallowed to send emails for processing',
+    'inbound_mailbox_allow_unknown' => 'Allow All Senders',
+    'inbound_mailbox_allow_unknown_help' => 'Allow anyone to send an expense email for processing',
+    'quick_actions' => 'Quick Actions',
+    'end_all_sessions_help' => 'Logs out all users and requires all active users to reauthenticate.',
+    'updated_records' => 'Updated Records',
+    'vat_not_registered' => 'Seller not VAT registered',
+    'small_company_info' => 'No disclosure of sales tax in accordance with § 19 UStG',
+    'log_duration_words' => 'Log duration in words'
 );
 
 return $lang;
diff --git a/lang/vi/texts.php b/lang/vi/texts.php
index 87bbe716168..88220cd7be8 100644
--- a/lang/vi/texts.php
+++ b/lang/vi/texts.php
@@ -13,7 +13,7 @@
     'postal_code' => 'Mã bưu chính',
     'country_id' => 'Quốc gia',
     'contacts' => 'Liên hệ',
-    'first_name' => 'Họ & tên',
+    'first_name' => 'Họ',
     'last_name' => 'Tên',
     'phone' => 'Số điện thoại',
     'email' => 'Email',
@@ -26,7 +26,7 @@
     'invoice' => 'Hóa đơn',
     'client' => 'Khách hàng',
     'invoice_date' => 'Ngày hóa đơn',
-    'due_date' => 'Hạn thanh toán',
+    'due_date' => 'Đã thanh toán',
     'invoice_number' => 'Số hóa đơn',
     'invoice_number_short' => 'Hóa đơn #',
     'po_number' => 'Số PO',
@@ -42,7 +42,7 @@
     'line_total' => 'Tổng',
     'subtotal' => 'Thành tiền',
     'net_subtotal' => 'Tính',
-    'paid_to_date' => 'Hạn thanh toán',
+    'paid_to_date' => 'Đã thanh toán đến ngày',
     'balance_due' => 'Số tiền thanh toán',
     'invoice_design_id' => 'Thiết kế',
     'terms' => 'Điều khoản',
@@ -135,7 +135,7 @@
     'status' => 'Trạng thái',
     'invoice_total' => 'Tổng hóa đơn',
     'frequency' => 'Chu kỳ',
-    'range' => 'phạm vi',
+    'range' => 'Phạm vi',
     'start_date' => 'Ngày bắt đầu',
     'end_date' => 'Ngày kết thúc',
     'transaction_reference' => 'Tham chiếu giao dịch',
@@ -386,7 +386,7 @@
     'more_designs_self_host_text' => '',
     'buy' => 'Mua',
     'bought_designs' => 'Đã thêm thành công các thiết kế hóa đơn bổ sung',
-    'sent' => 'gởi',
+    'sent' => 'Đã gửi',
     'vat_number' => 'Số VAT',
     'payment_title' => 'Nhập địa chỉ thanh toán và thông tin thẻ tín dụng của bạn',
     'payment_cvv' => '* Đây là số 3-4 chữ số ở mặt sau thẻ của bạn',
@@ -738,7 +738,7 @@
     'activity_7' => ':contact đã xem hóa đơn :invoice gửi đến :client',
     'activity_8' => ':user hóa đơn lưu trữ :invoice',
     'activity_9' => ':user đã xóa hóa đơn :invoice',
-    'activity_10' => ':user đã nhập thanh toán :payment cho :payment _số tiền trên hóa đơn :invoice cho :client',
+    'activity_10' => ':user đã nhập thanh toán :payment bởi :payment _số tiền trên hóa đơn :invoice cho :client',
     'activity_11' => ':user cập nhật thanh toán :payment',
     'activity_12' => ':user thanh toán đã lưu trữ :payment',
     'activity_13' => ':user đã xóa thanh toán :payment',
@@ -835,7 +835,7 @@
     'invalid_csv_header' => 'Tiêu đề CSV không hợp lệ',
     'client_portal' => 'Cổng thông tin khách hàng',
     'admin' => 'Quản trị viên',
-    'disabled' => 'Tàn tật',
+    'disabled' => 'Vô hiệu hóa',
     'show_archived_users' => 'Hiển thị người dùng đã lưu trữ',
     'notes' => 'Ghi chú',
     'invoice_will_create' => 'hóa đơn sẽ được tạo',
@@ -959,7 +959,7 @@
     'quote_message_button' => 'Để xem báo giá cho :amount , hãy nhấp vào nút bên dưới.',
     'payment_message_button' => 'Cảm ơn bạn đã thanh toán :amount .',
     'payment_type_direct_debit' => 'Ghi nợ trực tiếp',
-    'bank_accounts' => 'Thẻ tín dụng & ngân hàng',
+    'bank_accounts' => 'Thẻ tín dụng & Ngân hàng',
     'add_bank_account' => 'Thêm tài khoản ngân hàng',
     'setup_account' => 'Thiết lập tài khoản',
     'import_expenses' => 'Chi phí nhập khẩu',
@@ -2364,7 +2364,7 @@
     'currency_gold_troy_ounce' => 'Ounce vàng Troy',
     'currency_nicaraguan_córdoba' => 'Córdoba Nicaragua',
     'currency_malagasy_ariary' => 'Tiếng Malagasy',
-    "currency_tongan_paanga" => "Tonga Pa&#39;anga",
+    "currency_tongan_pa_anga" => "Tongan Pa'anga",
 
     'review_app_help' => 'Chúng tôi hy vọng bạn thích sử dụng ứng dụng này.<br/> Nếu bạn cân nhắc :link chúng tôi sẽ rất cảm kích!',
     'writing_a_review' => 'viết đánh giá',
@@ -3097,7 +3097,7 @@
     'uploaded_logo' => 'Đã tải logo thành công',
     'saved_settings' => 'Đã lưu cài đặt thành công',
     'device_settings' => 'Cài đặt thiết bị',
-    'credit_cards_and_banks' => 'Thẻ tín dụng & ngân hàng',
+    'credit_cards_and_banks' => 'Thẻ tín dụng & Ngân hàng',
     'price' => 'Giá',
     'email_sign_up' => 'Đăng ký Email',
     'google_sign_up' => 'Đăng ký Google',
@@ -3738,8 +3738,8 @@
     'document_upload_help' => 'Cho phép khách hàng tải lên tài liệu',
     'expense_total' => 'Tổng chi phí',
     'enter_taxes' => 'Nhập Thuế',
-    'by_rate' => 'Theo Tỷ giá',
-    'by_amount' => 'Theo Số Lượng',
+    'by_rate' => 'Theo tỷ giá',
+    'by_amount' => 'Theo số lượng',
     'enter_amount' => 'Nhập số tiền',
     'before_taxes' => 'Trước thuế',
     'after_taxes' => 'Sau thuế',
@@ -4106,7 +4106,7 @@
     'auto_bill_disabled' => 'Tự động hóa đơn bị vô hiệu hóa',
     'select_payment_method' => 'Chọn phương thức thanh toán:',
     'login_without_password' => 'Đăng nhập không cần mật khẩu',
-    'email_sent' => 'Email khi một hóa đơn được <b>gởi</b>',
+    'email_sent' => 'Email khi một hóa đơn được <b>đã gửi</b>',
     'one_time_purchases' => 'Mua một lần',
     'recurring_purchases' => 'Mua hàng định kỳ',
     'you_might_be_interested_in_following' => 'Bạn có thể quan tâm đến những điều sau đây',
@@ -4266,7 +4266,7 @@
     'uninvoiced' => 'Chưa xuất hóa đơn',
     'subdomain_guide' => 'Tên miền phụ được sử dụng trong cổng thông tin khách hàng để cá nhân hóa các liên kết phù hợp với thương hiệu của bạn. Ví dụ: https://your-brand.invoicing.co',
     'send_time' => 'Gửi thời gian',
-    'import_settings' => 'Nhập Cài Đặt',
+    'import_settings' => 'Nhập cài đặt',
     'json_file_missing' => 'Vui lòng cung cấp tệp JSON',
     'json_option_missing' => 'Vui lòng chọn để nhập cài đặt và/hoặc dữ liệu',
     'json' => 'JSON',
@@ -4975,7 +4975,7 @@
     'e_invoice' => 'Hóa đơn điện tử',
     'light_dark_mode' => 'Chế độ sáng/tối',
     'activities' => 'Các hoạt động',
-    'recent_transactions' => "Sau đây là các giao dịch gần đây nhất của công ty bạn:",
+    'recent_transactions' => "Các giao dịch gần đây nhất của công ty bạn:",
     'country_Palestine' => "Palestine",
     'country_Taiwan' => 'Đài Loan',
     'duties' => 'Nhiệm vụ',
@@ -5031,7 +5031,7 @@
     'county' => 'Quận',
     'tax_details' => 'Chi tiết thuế',
     'activity_10_online' => ':contact đã thanh toán :payment cho hóa đơn :invoice cho :client',
-    'activity_10_manual' => ':user đã nhập thanh toán :payment cho hóa đơn :invoice cho :client',
+    'activity_10_manual' => ':user đã nhập thanh toán :payment bởi hóa đơn :invoice cho :client',
     'default_payment_type' => 'Loại thanh toán mặc định',
     'number_precision' => 'Độ chính xác của số',
     'number_precision_help' => 'Kiểm soát số lượng số thập phân được hỗ trợ trong giao diện',
@@ -5355,7 +5355,11 @@
     'inbound_mailbox_allow_unknown' => 'Cho phép tất cả người gửi',
     'inbound_mailbox_allow_unknown_help' => 'Cho phép bất cứ ai đến gửi email Chi phí để xử lý',
     'quick_actions' => 'Hành động nhanh',
-    'end_all_sessions_help' => 'Đăng xuất tất cả người dùng và yêu cầu tất cả người dùng đang hoạt động đến xác thực lại.'
+    'end_all_sessions_help' => 'Đăng xuất tất cả người dùng và yêu cầu tất cả người dùng đang hoạt động đến xác thực lại.',
+    'updated_records' => 'Hồ sơ đã cập nhật',
+    'vat_not_registered' => 'Người bán không đăng ký VAT',
+    'small_company_info' => 'Không tiết lộ thuế bán hàng theo § 19 UStG',
+    'log_duration_words' => 'Thời lượng ghi nhật ký bằng từ'
 );
 
 return $lang;

From a0d2154967579b00503c974c913408b17bfc5e29 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 12 Oct 2024 09:23:48 +1100
Subject: [PATCH 09/81] Minor fixes

---
 app/PaymentDrivers/BaseDriver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index 61617e6f764..7a1f9b0d386 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -404,7 +404,7 @@ public function confirmGatewayFee($data = []): void
                             $item->gross_line_total = round($item->gross_line_total, 2);
                             return $item;
                         })
-                        ->whereIn('type_id', ['3'])
+                        ->whereIn('type_id', ['3','4'])
                         ->count();
 
         if($invoice && $fee_count == 0){

From ea6d98806d9613053bc91a7765b53859a6984d5c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 12 Oct 2024 16:44:00 +1100
Subject: [PATCH 10/81] updates for stale invoice checks

---
 .../Subscription/CleanStaleInvoiceOrder.php   | 177 +++++++++++++++++-
 1 file changed, 168 insertions(+), 9 deletions(-)

diff --git a/app/Jobs/Subscription/CleanStaleInvoiceOrder.php b/app/Jobs/Subscription/CleanStaleInvoiceOrder.php
index fccc11b7ee4..2b94793a118 100644
--- a/app/Jobs/Subscription/CleanStaleInvoiceOrder.php
+++ b/app/Jobs/Subscription/CleanStaleInvoiceOrder.php
@@ -59,7 +59,7 @@ public function handle(InvoiceRepository $repo): void
 
             Invoice::query()
                    ->withTrashed()
-                   ->where('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
+                   ->where('status_id', Invoice::STATUS_SENT)
                    ->where('updated_at', '<', now()->subHour())
                    ->where('balance', '>', 0)
                    ->whereJsonContains('line_items', ['type_id' => '3'])
@@ -68,6 +68,85 @@ public function handle(InvoiceRepository $repo): void
                        $invoice->service()->removeUnpaidGatewayFees();
                    });
 
+
+            Invoice::query()
+                   ->withTrashed()
+                   ->where('status_id', Invoice::STATUS_PARTIAL)
+                   ->where('balance', '>', 0)
+                   ->whereJsonContains('line_items', ['type_id' => '3'])
+                   ->cursor()
+                   ->each(function ($invoice) {
+
+                       $type_3_count = 0;
+                       $type_4_count = 0;
+                                        
+                        foreach ($invoice->line_items as $line_item) {
+                            if ($line_item->type_id == '3') {
+                                $type_3_count++;
+                            } elseif ($line_item->type_id == '4') {
+                                $type_4_count++;
+                            }
+                        }
+
+                       if ($type_4_count == 1) {
+                           $invoice->service()->removeUnpaidGatewayFees();
+                       } elseif ($type_3_count == 1) {
+
+                           $items = $invoice->line_items;
+
+                           foreach ($items as $key => $value) {
+
+                               if ($value->type_id == "3") {
+                                   $items[$key]->type_id = "4";
+                               }
+
+                           }
+
+                           $invoice->line_items = array_values($items);
+                           $invoice->calc()->getInvoice();
+
+                       }
+
+                   });
+
+
+            Invoice::query()
+                    ->withTrashed()
+                    ->where('status_id', Invoice::STATUS_PAID)
+                    ->whereJsonContains('line_items', ['type_id' => '3'])
+                    ->cursor()
+                    ->each(function ($invoice) {
+
+                        $type_3_count = 0;
+                        $type_4_count = 0;
+                                                
+                        foreach ($invoice->line_items as $line_item) {
+                            if ($line_item->type_id == '3') {
+                                $type_3_count++;
+                            } elseif ($line_item->type_id == '4') {
+                                $type_4_count++;
+                            }
+                        }
+
+                        if ($type_4_count == 0 && $type_3_count == 1) {
+
+                            $items = $invoice->line_items;
+
+                            foreach ($items as $key => $value) {
+
+                                if ($value->type_id == "3") {
+                                    $items[$key]->type_id = "4";
+                                }
+
+                            }
+
+                            $invoice->line_items = array_values($items);
+                            $invoice->saveQuietly();
+
+                        }
+
+                    });
+
             return;
         }
 
@@ -76,14 +155,15 @@ public function handle(InvoiceRepository $repo): void
             MultiDB::setDB($db);
 
             Invoice::query()
-                    ->withTrashed()
-                    ->where('is_proforma', 1)
-                    ->where('created_at', '<', now()->subHour())
-                    ->cursor()
-                    ->each(function ($invoice) use ($repo) {
-                        $invoice->is_proforma = false;
-                        $repo->delete($invoice);
-                    });
+                ->withTrashed()
+                ->where('status_id', Invoice::STATUS_SENT)
+                ->where('is_proforma', 1)
+                ->where('created_at', '<', now()->subHour())
+                ->cursor()
+                ->each(function ($invoice) use ($repo) {
+                    $invoice->is_proforma = false;
+                    $repo->delete($invoice);
+                });
 
             Invoice::query()
                 ->withTrashed()
@@ -96,6 +176,85 @@ public function handle(InvoiceRepository $repo): void
                     $invoice->service()->removeUnpaidGatewayFees();
                 });
 
+            Invoice::query()
+                ->withTrashed()
+                ->where('status_id', Invoice::STATUS_PARTIAL)
+                ->whereJsonContains('line_items', ['type_id' => '3'])
+                ->cursor()
+                ->each(function ($invoice) {
+
+                    $type_3_count = 0;
+                    $type_4_count = 0;
+
+                    foreach ($invoice->line_items as $line_item) {
+                        if ($line_item->type_id == '3') {
+                            $type_3_count++;
+                        } elseif ($line_item->type_id == '4') {
+                            $type_4_count++;
+                        }
+                    }
+
+                    if ($type_4_count == 1) {
+                        $invoice->service()->removeUnpaidGatewayFees();
+                    } elseif ($type_3_count == 1) {
+
+                        $items = $invoice->line_items;
+
+                        foreach ($items as $key => $value) {
+
+                            if ($value->type_id == "3") {
+                                $items[$key]->type_id = "4";
+                            }
+
+                        }
+
+                        $invoice->line_items = array_values($items);
+                        $invoice->calc()->getInvoice();
+
+                    }
+
+                });
+
+
+            Invoice::query()
+                    ->withTrashed()
+                    ->where('status_id', Invoice::STATUS_PAID)
+                    ->whereJsonContains('line_items', ['type_id' => '3'])
+                    ->cursor()
+                    ->each(function ($invoice) {
+
+                        $type_3_count = 0;
+                        $type_4_count = 0;
+
+                                                
+                        foreach ($invoice->line_items as $line_item) {
+                            if ($line_item->type_id == '3') {
+                                $type_3_count++;
+                            } elseif ($line_item->type_id == '4') {
+                                $type_4_count++;
+                            }
+                        }
+
+                        if ($type_4_count == 0 && $type_3_count == 1) {
+
+                            $items = $invoice->line_items;
+
+                            foreach ($items as $key => $value) {
+
+                                if ($value->type_id == "3") {
+                                    $items[$key]->type_id = "4";
+                                }
+
+                            }
+
+                            $invoice->line_items = array_values($items);
+                            $invoice->saveQuietly();
+
+                        }
+
+                    });
+
+
             \DB::connection($db)->table('password_resets')->where('created_at', '<', now()->subHours(12))->delete();
 
         }

From acdf3a75a5f7d894168325b35b0e41d15bb5d64e Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 12 Oct 2024 17:00:56 +1100
Subject: [PATCH 11/81] Static Analysis

---
 app/DataMapper/Tax/TaxModel.php                           | 2 +-
 app/Models/Account.php                                    | 2 +-
 app/Repositories/ClientRepository.php                     | 2 +-
 app/Repositories/Migration/PaymentMigrationRepository.php | 2 +-
 app/Repositories/PaymentRepository.php                    | 2 +-
 app/Utils/HtmlEngine.php                                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/DataMapper/Tax/TaxModel.php b/app/DataMapper/Tax/TaxModel.php
index 09593305bf5..9fccb14b500 100644
--- a/app/DataMapper/Tax/TaxModel.php
+++ b/app/DataMapper/Tax/TaxModel.php
@@ -35,7 +35,7 @@ public function __construct(public mixed $model = null)
             $this->regions = $this->init();
         } else {
 
-            if(is_null($model->seller_subregion)) {
+            if(is_null($model->seller_subregion)) {//@phpstan-ignore-line
                 $this->seller_subregion = '';
             }
 
diff --git a/app/Models/Account.php b/app/Models/Account.php
index aecfbffabce..92c5203a8da 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -58,7 +58,7 @@
  * @property bool $is_scheduler_running
  * @property int|null $trial_duration
  * @property bool $is_onboarding
- * @property object|null $onboarding
+ * @property object|array|null $onboarding
  * @property bool $is_migrated
  * @property string|null $platform
  * @property int|null $hosted_client_count
diff --git a/app/Repositories/ClientRepository.php b/app/Repositories/ClientRepository.php
index b392413c944..535e1606371 100644
--- a/app/Repositories/ClientRepository.php
+++ b/app/Repositories/ClientRepository.php
@@ -78,7 +78,7 @@ public function save(array $data, Client $client): ?Client
 
         $client->save();
 
-        if (! isset($client->number) || empty($client->number) || strlen($client->number) == 0) {
+        if (! isset($client->number) || empty($client->number) || strlen($client->number ?? '') == 0) {//@phpstan-ignore-line
             $x = 1;
 
             do {
diff --git a/app/Repositories/Migration/PaymentMigrationRepository.php b/app/Repositories/Migration/PaymentMigrationRepository.php
index 0ece566f2e0..163df17bbc0 100644
--- a/app/Repositories/Migration/PaymentMigrationRepository.php
+++ b/app/Repositories/Migration/PaymentMigrationRepository.php
@@ -105,7 +105,7 @@ private function applyPayment(array $data, Payment $payment): ?Payment
         }
 
         /*Ensure payment number generated*/
-        if (! $payment->number || strlen($payment->number) == 0) {
+        if (! $payment->number || strlen($payment->number) == 0) {//@phpstan-ignore-line
             $payment->number = $payment->client->getNextPaymentNumber($payment->client, $payment);
         }
 
diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php
index 57cf7df5d0f..13b4a4f7c75 100644
--- a/app/Repositories/PaymentRepository.php
+++ b/app/Repositories/PaymentRepository.php
@@ -133,7 +133,7 @@ private function applyPayment(array $data, Payment $payment): Payment
         }
 
         /*Ensure payment number generated*/
-        if (! $payment->number || strlen($payment->number) == 0) {
+        if (! $payment->number || strlen($payment->number ?? '') == 0) { //@phpstan-ignore-line
             $payment->service()->applyNumber();
         }
 
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 452fce9bc83..61ae70ae5bc 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -830,7 +830,7 @@ private function taxLabel(): string
             }
         }
 
-        if (!$this->entity->company->tax_data->regions->EU->has_sales_above_threshold ?? false){
+        if (!$this->entity->company->tax_data->regions->EU->has_sales_above_threshold ?? false){ //@phpstan-ignore-line
             $tax_label .= ctrans('text.small_company_info') ."<br>";
         }
 

From 2927611b4e5b2ffb7e5af8481c99f9892e6e0c07 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 12 Oct 2024 17:59:47 +1100
Subject: [PATCH 12/81] Static Analysis

---
 .../Quickbooks/Jobs/QuickbooksImport.php      | 182 +++++++-------
 composer.lock                                 | 237 +++++++++---------
 2 files changed, 209 insertions(+), 210 deletions(-)

diff --git a/app/Services/Quickbooks/Jobs/QuickbooksImport.php b/app/Services/Quickbooks/Jobs/QuickbooksImport.php
index 3bafdbd046e..140bbbb3707 100644
--- a/app/Services/Quickbooks/Jobs/QuickbooksImport.php
+++ b/app/Services/Quickbooks/Jobs/QuickbooksImport.php
@@ -120,116 +120,116 @@ private function processEntitySync(string $entity, $records): void
         };
     }
 
-    private function syncQbToNinjaInvoices($records): void
-    {
+    // private function syncQbToNinjaInvoices($records): void
+    // {
        
 
-    }
+    // }
 
     
 
-    private function syncQbToNinjaVendors(array $records): void
-    {
+    // private function syncQbToNinjaVendors(array $records): void
+    // {
 
-        $transformer = new VendorTransformer($this->company);
-
-        foreach($records as $record)
-        {
-            $ninja_data = $transformer->qbToNinja($record);
-
-            if($vendor = $this->findVendor($ninja_data))
-            {
-                $vendor->fill($ninja_data[0]);
-                $vendor->saveQuietly();
-
-                $contact = $vendor->contacts()->where('email', $ninja_data[1]['email'])->first();
-
-                if(!$contact)
-                {
-                    $contact = VendorContactFactory::create($this->company->id, $this->company->owner()->id);
-                    $contact->vendor_id = $vendor->id;
-                    $contact->send_email = true;
-                    $contact->is_primary = true;
-                    $contact->fill($ninja_data[1]);
-                    $contact->saveQuietly(); 
-                }
-                elseif($this->qbs->syncable('vendor', \App\Enum\SyncDirection::PULL)){
-                    $contact->fill($ninja_data[1]);
-                    $contact->saveQuietly();
-                }
+    //     $transformer = new VendorTransformer($this->company);
 
-            }
+    //     foreach($records as $record)
+    //     {
+    //         $ninja_data = $transformer->qbToNinja($record);
 
-        }
-    }
+    //         if($vendor = $this->findVendor($ninja_data))
+    //         {
+    //             $vendor->fill($ninja_data[0]);
+    //             $vendor->saveQuietly();
 
-    private function syncQbToNinjaExpenses(array $records): void
-    {
+    //             $contact = $vendor->contacts()->where('email', $ninja_data[1]['email'])->first();
 
-        $transformer = new ExpenseTransformer($this->company);
+    //             if(!$contact)
+    //             {
+    //                 $contact = VendorContactFactory::create($this->company->id, $this->company->owner()->id);
+    //                 $contact->vendor_id = $vendor->id;
+    //                 $contact->send_email = true;
+    //                 $contact->is_primary = true;
+    //                 $contact->fill($ninja_data[1]);
+    //                 $contact->saveQuietly(); 
+    //             }
+    //             elseif($this->qbs->syncable('vendor', \App\Enum\SyncDirection::PULL)){
+    //                 $contact->fill($ninja_data[1]);
+    //                 $contact->saveQuietly();
+    //             }
 
-        foreach($records as $record)
-        {
-            $ninja_data = $transformer->qbToNinja($record);
+    //         }
 
-            if($expense = $this->findExpense($ninja_data))
-            {
-                $expense->fill($ninja_data);
-                $expense->saveQuietly();
-            }
+    //     }
+    // }
 
-        }
-    }
+    // private function syncQbToNinjaExpenses(array $records): void
+    // {
 
-    private function findExpense(array $qb_data): ?Expense
-    {
-        $expense = $qb_data;
+    //     $transformer = new ExpenseTransformer($this->company);
+
+    //     foreach($records as $record)
+    //     {
+    //         $ninja_data = $transformer->qbToNinja($record);
 
-        $search = Expense::query()
-                        ->withTrashed()
-                        ->where('company_id', $this->company->id)
-                        ->where('number', $expense['number']);
+    //         if($expense = $this->findExpense($ninja_data))
+    //         {
+    //             $expense->fill($ninja_data);
+    //             $expense->saveQuietly();
+    //         }
+
+    //     }
+    // }
+
+    // private function findExpense(array $qb_data): ?Expense
+    // {
+    //     $expense = $qb_data;
+
+    //     $search = Expense::query()
+    //                     ->withTrashed()
+    //                     ->where('company_id', $this->company->id)
+    //                     ->where('number', $expense['number']);
                         
-        if($search->count() == 0) {
-            return ExpenseFactory::create($this->company->id, $this->company->owner()->id);
-        }
-        elseif($search->count() == 1) {
-            return $this->qbs->syncable('expense', \App\Enum\SyncDirection::PULL) ? $search->first() : null;
-        }
+    //     if($search->count() == 0) {
+    //         return ExpenseFactory::create($this->company->id, $this->company->owner()->id);
+    //     }
+    //     elseif($search->count() == 1) {
+    //         return $this->qbs->syncable('expense', \App\Enum\SyncDirection::PULL) ? $search->first() : null;
+    //     }
         
-        return null;
-    }
-
-    private function findVendor(array $qb_data) :?Vendor
-    {
-        $vendor = $qb_data[0];
-        $contact = $qb_data[1];
-        $vendor_meta = $qb_data[2];
-
-        $search = Vendor::query()
-                        ->withTrashed()
-                        ->where('company_id', $this->company->id)
-                        ->where(function ($q) use ($vendor, $vendor_meta, $contact){
-
-                            $q->where('vendor_hash', $vendor_meta['vendor_hash'])
-                            ->orWhere('number', $vendor['number'])
-                            ->orWhereHas('contacts', function ($q) use ($contact){
-                                $q->where('email', $contact['email']);
-                            });
-
-                        });
+    //     return null;
+    // }
+
+    // private function findVendor(array $qb_data) :?Vendor
+    // {
+    //     $vendor = $qb_data[0];
+    //     $contact = $qb_data[1];
+    //     $vendor_meta = $qb_data[2];
+
+    //     $search = Vendor::query()
+    //                     ->withTrashed()
+    //                     ->where('company_id', $this->company->id)
+    //                     ->where(function ($q) use ($vendor, $vendor_meta, $contact){
+
+    //                         $q->where('vendor_hash', $vendor_meta['vendor_hash'])
+    //                         ->orWhere('number', $vendor['number'])
+    //                         ->orWhereHas('contacts', function ($q) use ($contact){
+    //                             $q->where('email', $contact['email']);
+    //                         });
+
+    //                     });
                         
-        if($search->count() == 0) {
-            //new client
-            return VendorFactory::create($this->company->id, $this->company->owner()->id);
-        }
-        elseif($search->count() == 1) {
-
-            return $this->qbs->syncable('vendor', \App\Enum\SyncDirection::PULL) ? $search->first() : null;
-        }
+    //     if($search->count() == 0) {
+    //         //new client
+    //         return VendorFactory::create($this->company->id, $this->company->owner()->id);
+    //     }
+    //     elseif($search->count() == 1) {
+
+    //         return $this->qbs->syncable('vendor', \App\Enum\SyncDirection::PULL) ? $search->first() : null;
+    //     }
         
-        return null;
-    }
+    //     return null;
+    // }
 
     public function middleware()
     {
diff --git a/composer.lock b/composer.lock
index 6bdcff2655b..1f6ad7ffe7a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -535,16 +535,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.323.2",
+            "version": "3.324.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "030b93340f0e7d6fd20276037087d3eab8f16575"
+                "reference": "5b824a9b8015a38f18c53b023975c0f63c7bd3dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/030b93340f0e7d6fd20276037087d3eab8f16575",
-                "reference": "030b93340f0e7d6fd20276037087d3eab8f16575",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5b824a9b8015a38f18c53b023975c0f63c7bd3dc",
+                "reference": "5b824a9b8015a38f18c53b023975c0f63c7bd3dc",
                 "shasum": ""
             },
             "require": {
@@ -627,9 +627,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.323.2"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.324.1"
             },
-            "time": "2024-10-07T18:11:24+00:00"
+            "time": "2024-10-11T18:22:01+00:00"
         },
         {
             "name": "babenkoivan/elastic-adapter",
@@ -1580,16 +1580,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "4.1.1",
+            "version": "4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "7a8252418689feb860ea8dfeab66d64a56a64df8"
+                "reference": "dadd35300837a3a2184bd47d403333b15d0a9bd0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/7a8252418689feb860ea8dfeab66d64a56a64df8",
-                "reference": "7a8252418689feb860ea8dfeab66d64a56a64df8",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/dadd35300837a3a2184bd47d403333b15d0a9bd0",
+                "reference": "dadd35300837a3a2184bd47d403333b15d0a9bd0",
                 "shasum": ""
             },
             "require": {
@@ -1602,7 +1602,7 @@
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
                 "jetbrains/phpstorm-stubs": "2023.2",
-                "phpstan/phpstan": "1.12.0",
+                "phpstan/phpstan": "1.12.6",
                 "phpstan/phpstan-phpunit": "1.4.0",
                 "phpstan/phpstan-strict-rules": "^1.6",
                 "phpunit/phpunit": "10.5.30",
@@ -1668,7 +1668,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/4.1.1"
+                "source": "https://github.com/doctrine/dbal/tree/4.2.1"
             },
             "funding": [
                 {
@@ -1684,7 +1684,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-03T08:58:39+00:00"
+            "time": "2024-10-10T18:01:27+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -2035,16 +2035,16 @@
         },
         {
             "name": "dragonmantank/cron-expression",
-            "version": "v3.3.3",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dragonmantank/cron-expression.git",
-                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a"
+                "reference": "8c784d071debd117328803d86b2097615b457500"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
-                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500",
+                "reference": "8c784d071debd117328803d86b2097615b457500",
                 "shasum": ""
             },
             "require": {
@@ -2057,10 +2057,14 @@
             "require-dev": {
                 "phpstan/extension-installer": "^1.0",
                 "phpstan/phpstan": "^1.0",
-                "phpstan/phpstan-webmozart-assert": "^1.0",
                 "phpunit/phpunit": "^7.0|^8.0|^9.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Cron\\": "src/Cron/"
@@ -2084,7 +2088,7 @@
             ],
             "support": {
                 "issues": "https://github.com/dragonmantank/cron-expression/issues",
-                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3"
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0"
             },
             "funding": [
                 {
@@ -2092,7 +2096,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-10T19:36:49+00:00"
+            "time": "2024-10-09T13:47:03+00:00"
         },
         {
             "name": "egulias/email-validator",
@@ -3882,16 +3886,16 @@
         },
         {
             "name": "horstoeko/zugferd",
-            "version": "v1.0.65",
+            "version": "v1.0.66",
             "source": {
                 "type": "git",
                 "url": "https://github.com/horstoeko/zugferd.git",
-                "reference": "ccafcda546f6867b3203420331fd436baf028187"
+                "reference": "2a009cd78d6aab7771f2a6dbf31c8c0cfd4f3fc5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/horstoeko/zugferd/zipball/ccafcda546f6867b3203420331fd436baf028187",
-                "reference": "ccafcda546f6867b3203420331fd436baf028187",
+                "url": "https://api.github.com/repos/horstoeko/zugferd/zipball/2a009cd78d6aab7771f2a6dbf31c8c0cfd4f3fc5",
+                "reference": "2a009cd78d6aab7771f2a6dbf31c8c0cfd4f3fc5",
                 "shasum": ""
             },
             "require": {
@@ -3951,9 +3955,9 @@
             ],
             "support": {
                 "issues": "https://github.com/horstoeko/zugferd/issues",
-                "source": "https://github.com/horstoeko/zugferd/tree/v1.0.65"
+                "source": "https://github.com/horstoeko/zugferd/tree/v1.0.66"
             },
-            "time": "2024-10-06T09:56:35+00:00"
+            "time": "2024-10-11T09:37:47+00:00"
         },
         {
             "name": "horstoeko/zugferdvisualizer",
@@ -4883,16 +4887,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.26.0",
+            "version": "v11.27.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "b8cb8998701d5b3cfe68539d3c3da1fc59ddd82b"
+                "reference": "a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/b8cb8998701d5b3cfe68539d3c3da1fc59ddd82b",
-                "reference": "b8cb8998701d5b3cfe68539d3c3da1fc59ddd82b",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9",
+                "reference": "a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9",
                 "shasum": ""
             },
             "require": {
@@ -5088,7 +5092,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-10-01T14:29:34+00:00"
+            "time": "2024-10-09T04:17:35+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -5620,38 +5624,38 @@
         },
         {
             "name": "lcobucci/jwt",
-            "version": "5.3.0",
+            "version": "5.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lcobucci/jwt.git",
-                "reference": "08071d8d2c7f4b00222cc4b1fb6aa46990a80f83"
+                "reference": "aac4fd512681fd5cb4b77d2105ab7ec700c72051"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/08071d8d2c7f4b00222cc4b1fb6aa46990a80f83",
-                "reference": "08071d8d2c7f4b00222cc4b1fb6aa46990a80f83",
+                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/aac4fd512681fd5cb4b77d2105ab7ec700c72051",
+                "reference": "aac4fd512681fd5cb4b77d2105ab7ec700c72051",
                 "shasum": ""
             },
             "require": {
                 "ext-openssl": "*",
                 "ext-sodium": "*",
-                "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+                "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
                 "psr/clock": "^1.0"
             },
             "require-dev": {
-                "infection/infection": "^0.27.0",
-                "lcobucci/clock": "^3.0",
+                "infection/infection": "^0.29",
+                "lcobucci/clock": "^3.2",
                 "lcobucci/coding-standard": "^11.0",
-                "phpbench/phpbench": "^1.2.9",
+                "phpbench/phpbench": "^1.2",
                 "phpstan/extension-installer": "^1.2",
                 "phpstan/phpstan": "^1.10.7",
                 "phpstan/phpstan-deprecation-rules": "^1.1.3",
                 "phpstan/phpstan-phpunit": "^1.3.10",
                 "phpstan/phpstan-strict-rules": "^1.5.0",
-                "phpunit/phpunit": "^10.2.6"
+                "phpunit/phpunit": "^11.1"
             },
             "suggest": {
-                "lcobucci/clock": ">= 3.0"
+                "lcobucci/clock": ">= 3.2"
             },
             "type": "library",
             "autoload": {
@@ -5677,7 +5681,7 @@
             ],
             "support": {
                 "issues": "https://github.com/lcobucci/jwt/issues",
-                "source": "https://github.com/lcobucci/jwt/tree/5.3.0"
+                "source": "https://github.com/lcobucci/jwt/tree/5.4.0"
             },
             "funding": [
                 {
@@ -5689,7 +5693,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-04-11T23:07:54+00:00"
+            "time": "2024-10-08T22:06:45+00:00"
         },
         {
             "name": "league/commonmark",
@@ -5881,16 +5885,16 @@
         },
         {
             "name": "league/csv",
-            "version": "9.16.0",
+            "version": "9.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/csv.git",
-                "reference": "998280c6c34bd67d8125fdc8b45bae28d761b440"
+                "reference": "8cab815fb11ec93aa2f7b8a57b3daa1f1a364011"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/998280c6c34bd67d8125fdc8b45bae28d761b440",
-                "reference": "998280c6c34bd67d8125fdc8b45bae28d761b440",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/8cab815fb11ec93aa2f7b8a57b3daa1f1a364011",
+                "reference": "8cab815fb11ec93aa2f7b8a57b3daa1f1a364011",
                 "shasum": ""
             },
             "require": {
@@ -5898,17 +5902,16 @@
                 "php": "^8.1.2"
             },
             "require-dev": {
-                "doctrine/collections": "^2.2.2",
                 "ext-dom": "*",
                 "ext-xdebug": "*",
-                "friendsofphp/php-cs-fixer": "^3.57.1",
-                "phpbench/phpbench": "^1.2.15",
-                "phpstan/phpstan": "^1.11.1",
-                "phpstan/phpstan-deprecation-rules": "^1.2.0",
+                "friendsofphp/php-cs-fixer": "^3.64.0",
+                "phpbench/phpbench": "^1.3.1",
+                "phpstan/phpstan": "^1.12.5",
+                "phpstan/phpstan-deprecation-rules": "^1.2.1",
                 "phpstan/phpstan-phpunit": "^1.4.0",
-                "phpstan/phpstan-strict-rules": "^1.6.0",
-                "phpunit/phpunit": "^10.5.16 || ^11.1.3",
-                "symfony/var-dumper": "^6.4.6 || ^7.0.7"
+                "phpstan/phpstan-strict-rules": "^1.6.1",
+                "phpunit/phpunit": "^10.5.16 || ^11.4.0",
+                "symfony/var-dumper": "^6.4.8 || ^7.1.5"
             },
             "suggest": {
                 "ext-dom": "Required to use the XMLConverter and the HTMLConverter classes",
@@ -5926,7 +5929,7 @@
                     "src/functions_include.php"
                 ],
                 "psr-4": {
-                    "League\\Csv\\": "src"
+                    "League\\Csv\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5965,20 +5968,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-05-24T11:04:54+00:00"
+            "time": "2024-10-10T10:30:28+00:00"
         },
         {
             "name": "league/flysystem",
-            "version": "3.29.0",
+            "version": "3.29.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "0adc0d9a51852e170e0028a60bd271726626d3f0"
+                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0adc0d9a51852e170e0028a60bd271726626d3f0",
-                "reference": "0adc0d9a51852e170e0028a60bd271726626d3f0",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319",
+                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319",
                 "shasum": ""
             },
             "require": {
@@ -6046,9 +6049,9 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.29.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.29.1"
             },
-            "time": "2024-09-29T11:59:11+00:00"
+            "time": "2024-10-08T08:58:34+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
@@ -6358,16 +6361,16 @@
         },
         {
             "name": "livewire/livewire",
-            "version": "v3.5.9",
+            "version": "v3.5.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/livewire/livewire.git",
-                "reference": "d04a229058afa76116d0e39209943a8ea3a7f888"
+                "reference": "774092003edb2670615ef09f3a9fbdd335d6d0d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/d04a229058afa76116d0e39209943a8ea3a7f888",
-                "reference": "d04a229058afa76116d0e39209943a8ea3a7f888",
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/774092003edb2670615ef09f3a9fbdd335d6d0d7",
+                "reference": "774092003edb2670615ef09f3a9fbdd335d6d0d7",
                 "shasum": ""
             },
             "require": {
@@ -6422,7 +6425,7 @@
             "description": "A front-end framework for Laravel.",
             "support": {
                 "issues": "https://github.com/livewire/livewire/issues",
-                "source": "https://github.com/livewire/livewire/tree/v3.5.9"
+                "source": "https://github.com/livewire/livewire/tree/v3.5.10"
             },
             "funding": [
                 {
@@ -6430,20 +6433,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-10-01T12:40:06+00:00"
+            "time": "2024-10-10T20:03:38+00:00"
         },
         {
             "name": "maennchen/zipstream-php",
-            "version": "3.1.0",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maennchen/ZipStream-PHP.git",
-                "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1"
+                "reference": "6187e9cc4493da94b9b63eb2315821552015fca9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/b8174494eda667f7d13876b4a7bfef0f62a7c0d1",
-                "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1",
+                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/6187e9cc4493da94b9b63eb2315821552015fca9",
+                "reference": "6187e9cc4493da94b9b63eb2315821552015fca9",
                 "shasum": ""
             },
             "require": {
@@ -6499,19 +6502,15 @@
             ],
             "support": {
                 "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
-                "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.1.0"
+                "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.1.1"
             },
             "funding": [
                 {
                     "url": "https://github.com/maennchen",
                     "type": "github"
-                },
-                {
-                    "url": "https://opencollective.com/zipstream",
-                    "type": "open_collective"
                 }
             ],
-            "time": "2023-06-21T14:59:35+00:00"
+            "time": "2024-10-10T12:33:01+00:00"
         },
         {
             "name": "mailgun/mailgun-php",
@@ -6802,16 +6801,16 @@
         },
         {
             "name": "mindee/mindee",
-            "version": "v1.11.1",
+            "version": "v1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mindee/mindee-api-php.git",
-                "reference": "1ffbbdab646202f6b9547d12399841feba75c68e"
+                "reference": "4088e5d7e5aef72162dbea10386c64c3f071aa23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mindee/mindee-api-php/zipball/1ffbbdab646202f6b9547d12399841feba75c68e",
-                "reference": "1ffbbdab646202f6b9547d12399841feba75c68e",
+                "url": "https://api.github.com/repos/mindee/mindee-api-php/zipball/4088e5d7e5aef72162dbea10386c64c3f071aa23",
+                "reference": "4088e5d7e5aef72162dbea10386c64c3f071aa23",
                 "shasum": ""
             },
             "require": {
@@ -6850,9 +6849,9 @@
             "description": "Mindee Client Library for PHP",
             "support": {
                 "issues": "https://github.com/mindee/mindee-api-php/issues",
-                "source": "https://github.com/mindee/mindee-api-php/tree/v1.11.1"
+                "source": "https://github.com/mindee/mindee-api-php/tree/v1.12.0"
             },
-            "time": "2024-09-20T14:46:42+00:00"
+            "time": "2024-10-11T15:47:16+00:00"
         },
         {
             "name": "mollie/mollie-api-php",
@@ -7675,16 +7674,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.3.0",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a"
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a",
-                "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
                 "shasum": ""
             },
             "require": {
@@ -7727,9 +7726,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
             },
-            "time": "2024-09-29T13:56:26+00:00"
+            "time": "2024-10-08T18:51:32+00:00"
         },
         {
             "name": "nordigen/nordigen-php",
@@ -15196,16 +15195,16 @@
         },
         {
             "name": "turbo124/beacon",
-            "version": "v2.0.2",
+            "version": "v2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/turbo124/beacon.git",
-                "reference": "95f3de3bdcbb786329cd7050f319520588920466"
+                "reference": "eb7ff81a49b2aa75d62459f36ad06b88181e1e00"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/turbo124/beacon/zipball/95f3de3bdcbb786329cd7050f319520588920466",
-                "reference": "95f3de3bdcbb786329cd7050f319520588920466",
+                "url": "https://api.github.com/repos/turbo124/beacon/zipball/eb7ff81a49b2aa75d62459f36ad06b88181e1e00",
+                "reference": "eb7ff81a49b2aa75d62459f36ad06b88181e1e00",
                 "shasum": ""
             },
             "require": {
@@ -15252,9 +15251,9 @@
                 "turbo124"
             ],
             "support": {
-                "source": "https://github.com/turbo124/beacon/tree/v2.0.2"
+                "source": "https://github.com/turbo124/beacon/tree/v2.0.3"
             },
-            "time": "2024-06-27T01:23:05+00:00"
+            "time": "2024-10-12T06:57:20+00:00"
         },
         {
             "name": "twig/intl-extra",
@@ -17458,35 +17457,35 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "11.0.6",
+            "version": "11.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "ebdffc9e09585dafa71b9bffcdb0a229d4704c45"
+                "reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ebdffc9e09585dafa71b9bffcdb0a229d4704c45",
-                "reference": "ebdffc9e09585dafa71b9bffcdb0a229d4704c45",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f7f08030e8811582cc459871d28d6f5a1a4d35ca",
+                "reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^5.1.0",
+                "nikic/php-parser": "^5.3.1",
                 "php": ">=8.2",
-                "phpunit/php-file-iterator": "^5.0.1",
+                "phpunit/php-file-iterator": "^5.1.0",
                 "phpunit/php-text-template": "^4.0.1",
                 "sebastian/code-unit-reverse-lookup": "^4.0.1",
                 "sebastian/complexity": "^4.0.1",
                 "sebastian/environment": "^7.2.0",
                 "sebastian/lines-of-code": "^3.0.1",
-                "sebastian/version": "^5.0.1",
+                "sebastian/version": "^5.0.2",
                 "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.0"
+                "phpunit/phpunit": "^11.4.1"
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -17524,7 +17523,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.6"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.7"
             },
             "funding": [
                 {
@@ -17532,7 +17531,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-08-22T04:37:56+00:00"
+            "time": "2024-10-09T06:21:38+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -17781,16 +17780,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.4.0",
+            "version": "11.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "89fe0c530133c08f7fff89d3d727154e4e504925"
+                "reference": "7875627f15f4da7e7f0823d1f323f7295a77334e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/89fe0c530133c08f7fff89d3d727154e4e504925",
-                "reference": "89fe0c530133c08f7fff89d3d727154e4e504925",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7875627f15f4da7e7f0823d1f323f7295a77334e",
+                "reference": "7875627f15f4da7e7f0823d1f323f7295a77334e",
                 "shasum": ""
             },
             "require": {
@@ -17861,7 +17860,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.4.0"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.4.1"
             },
             "funding": [
                 {
@@ -17877,7 +17876,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-10-05T08:39:03+00:00"
+            "time": "2024-10-08T15:38:37+00:00"
         },
         {
             "name": "react/cache",
@@ -19280,16 +19279,16 @@
         },
         {
             "name": "sebastian/version",
-            "version": "5.0.1",
+            "version": "5.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "45c9debb7d039ce9b97de2f749c2cf5832a06ac4"
+                "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/45c9debb7d039ce9b97de2f749c2cf5832a06ac4",
-                "reference": "45c9debb7d039ce9b97de2f749c2cf5832a06ac4",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c687e3387b99f5b03b6caa64c74b63e2936ff874",
+                "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874",
                 "shasum": ""
             },
             "require": {
@@ -19322,7 +19321,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/version/issues",
                 "security": "https://github.com/sebastianbergmann/version/security/policy",
-                "source": "https://github.com/sebastianbergmann/version/tree/5.0.1"
+                "source": "https://github.com/sebastianbergmann/version/tree/5.0.2"
             },
             "funding": [
                 {
@@ -19330,7 +19329,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-03T05:13:08+00:00"
+            "time": "2024-10-09T05:16:32+00:00"
         },
         {
             "name": "spatie/backtrace",

From 61962471dcc786e7037df8889c5ffd35b70bb55c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 12 Oct 2024 19:57:42 +1100
Subject: [PATCH 13/81] v5.10.35

---
 VERSION.txt                                | 2 +-
 app/Http/Controllers/ExpenseController.php | 2 +-
 config/ninja.php                           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 92dd9acf815..0a97a3c565e 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.10.34
\ No newline at end of file
+5.10.35
\ No newline at end of file
diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php
index 8827cbc470c..8f122f5dedb 100644
--- a/app/Http/Controllers/ExpenseController.php
+++ b/app/Http/Controllers/ExpenseController.php
@@ -647,7 +647,7 @@ public function edocument(EDocumentRequest $request)
         $user = auth()->user();
 
         foreach ($request->file("documents") as $file) {
-            ImportEDocument::dispatch($file->get(), $file->getClientOriginalName(), $request->file("documents")->getMimeType(), $user->company());
+            ImportEDocument::dispatch($file->get(), $file->getClientOriginalName(), $file->getMimeType(), $user->company());
         }
 
         return response()->json(['message' => 'Processing....'], 200);
diff --git a/config/ninja.php b/config/ninja.php
index 1f7c89b434f..db690e85b83 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,8 @@
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.10.34'),
-    'app_tag' => env('APP_TAG', '5.10.34'),
+    'app_version' => env('APP_VERSION', '5.10.35'),
+    'app_tag' => env('APP_TAG', '5.10.35'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),

From 12775c1efe48ccdbbef488d23f733e1c3ea64352 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Oct 2024 08:10:05 +1100
Subject: [PATCH 14/81] Updates for templates to check for valid data prior to
 iterating

---
 .../views/templates/delivery_notes/td12.html  |  3 ++
 .../views/templates/delivery_notes/td13.html  |  3 ++
 .../views/templates/delivery_notes/td4.html   | 53 ++++++++++---------
 .../views/templates/delivery_notes/td5.html   | 51 ++++++++++--------
 resources/views/templates/payments/tp6.html   | 16 +++---
 resources/views/templates/payments/tp7.html   | 40 +++++++-------
 resources/views/templates/payments/tr8.html   | 15 +++---
 resources/views/templates/payments/tr9.html   |  2 +
 resources/views/templates/projects/tp11.html  |  2 +-
 resources/views/templates/statements/ts1.html |  8 +--
 resources/views/templates/statements/ts2.html |  6 +--
 resources/views/templates/tasks/tt10.html     |  2 +-
 12 files changed, 113 insertions(+), 88 deletions(-)

diff --git a/resources/views/templates/delivery_notes/td12.html b/resources/views/templates/delivery_notes/td12.html
index 92058f24ad3..4f0aaaa89b9 100644
--- a/resources/views/templates/delivery_notes/td12.html
+++ b/resources/views/templates/delivery_notes/td12.html
@@ -180,7 +180,9 @@
         </tr>
     </table>
 
+    <!-- If you are using this template for other entities such as quotes, you'll want to ensure that you change the variable from invoices => quotes here -->
     <ninja>
+        {% if invoices is defined and invoices is not empty %}
         {% set invoice = invoices|first %}
         <table width="100%" cellspacing="0" cellpadding="0" class="">
             <thead class="table-header">
@@ -204,6 +206,7 @@
                 {% endfor %}
             </tbody>
         </table>
+        {% endif %}
     </ninja>
 
     <table width="100%" cellspacing="0" cellpadding="0" class="">
diff --git a/resources/views/templates/delivery_notes/td13.html b/resources/views/templates/delivery_notes/td13.html
index f095de7a207..5c59e1363b7 100644
--- a/resources/views/templates/delivery_notes/td13.html
+++ b/resources/views/templates/delivery_notes/td13.html
@@ -170,7 +170,9 @@
         </tr>
     </table>
 
+    <!-- If you are using this template for other entities such as quotes, you'll want to ensure that you change the variable from invoices => quotes here -->
     <ninja>
+        {% if invoices is defined and invoices is not empty %}
         {% set invoice = invoices|first %}
         <table width="100%" cellspacing="0" cellpadding="0" class="">
             <thead class="table-header">
@@ -190,6 +192,7 @@
                 {% endfor %}
             </tbody>
         </table>
+        {% endif %}
     </ninja>
 
     <table width="100%" cellspacing="0" cellpadding="0" class="">
diff --git a/resources/views/templates/delivery_notes/td4.html b/resources/views/templates/delivery_notes/td4.html
index 8470cddf0c2..e22427fa3cc 100644
--- a/resources/views/templates/delivery_notes/td4.html
+++ b/resources/views/templates/delivery_notes/td4.html
@@ -203,31 +203,36 @@
             </td>
         </tr>
     </table>
-
+    
+    <!-- If you are using this template for other entities such as quotes, you'll want to ensure that you change the variable from invoices => quotes here -->
     <ninja>
-        {% set invoice = invoices|first %}
-        <table width="100%" cellspacing="0" cellpadding="0" class="">
-            <thead class="table-header">
-                <tr class="table-header primary-color-highlight">
-                    <th class="">$item_label #</th>
-                    <th class="" width="50%">$description_label</th>
-                    <th class="centered">$quantity_label</th>
-                    <!-- <th class="totals-row-label centered">Delivered</th>
-                <th class="totals-row-label centered">Backorder</th> -->
-                </tr>
-            </thead>
-            <tbody class="table-body">
-                {% for item in invoice.line_items|filter(item => item.type_id == 1) %}
-                <tr class="item-row">
-                    <td class="">{{ item.product_key }}</td>
-                    <td class="">{{ item.notes }}</td>
-                    <td class="centered">{{ item.quantity }}</td>
-                    <!-- <td class="totals-row-label centered">{{ item.quantity }}</td>
-                <td class="totals-row-label centered">{{ item.quantity - item.quantity }}</td> -->
-                </tr>
-                {% endfor %}
-            </tbody>
-        </table>
+        {% if invoices is defined and invoices is not empty %}
+
+            {% set invoice = invoices|first %}
+            <table width="100%" cellspacing="0" cellpadding="0" class="">
+                <thead class="table-header">
+                    <tr class="table-header primary-color-highlight">
+                        <th class="">$item_label #</th>
+                        <th class="" width="50%">$description_label</th>
+                        <th class="centered">$quantity_label</th>
+                        <!-- <th class="totals-row-label centered">Delivered</th>
+                    <th class="totals-row-label centered">Backorder</th> -->
+                    </tr>
+                </thead>
+                <tbody class="table-body">
+                    {% for item in invoice.line_items|filter(item => item.type_id == 1) %}
+                    <tr class="item-row">
+                        <td class="">{{ item.product_key }}</td>
+                        <td class="">{{ item.notes }}</td>
+                        <td class="centered">{{ item.quantity }}</td>
+                        <!-- <td class="totals-row-label centered">{{ item.quantity }}</td>
+                    <td class="totals-row-label centered">{{ item.quantity - item.quantity }}</td> -->
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+
+        {% endif %}
     </ninja>
 
     <table width="100%" cellspacing="0" cellpadding="0" class="">
diff --git a/resources/views/templates/delivery_notes/td5.html b/resources/views/templates/delivery_notes/td5.html
index 54a168d3e2a..159d555b2d7 100644
--- a/resources/views/templates/delivery_notes/td5.html
+++ b/resources/views/templates/delivery_notes/td5.html
@@ -206,30 +206,35 @@
                         </tr>
                     </table>
 
+                    <!-- If you are using this template for other entities such as quotes, you'll want to ensure that you change the variable from invoices => quotes here -->
                     <ninja>
-                        {% set invoice = invoices|first %}
-                        <table width="100%" cellspacing="0" cellpadding="0" class="">
-                            <thead class="table-header">
-                                <tr class="table-header primary-color-highlight">
-                                    <th class="">$item_label #</th>
-                                    <th class="" width="50%">$description_label</th>
-                                    <th class="centered">$quantity_label</th>
-                                    <!-- <th class="totals-row-label centered">Delivered</th>
-                <th class="totals-row-label centered">Backorder</th> -->
-                                </tr>
-                            </thead>
-                            <tbody class="table-body">
-                                {% for item in invoice.line_items|filter(item => item.type_id == 1) %}
-                                <tr class="item-row">
-                                    <td class="">{{ item.product_key }}</td>
-                                    <td class="">{{ item.notes }}</td>
-                                    <td class="centered">{{ item.quantity }}</td>
-                                    <!-- <td class="totals-row-label centered">{{ item.quantity }}</td>
-                <td class="totals-row-label centered">{{ item.quantity - item.quantity }}</td> -->
-                                </tr>
-                                {% endfor %}
-                            </tbody>
-                        </table>
+                        {% if invoices is defined and invoices is not empty %}
+
+                            {% set invoice = invoices|first %}
+                            <table width="100%" cellspacing="0" cellpadding="0" class="">
+                                <thead class="table-header">
+                                    <tr class="table-header primary-color-highlight">
+                                        <th class="">$item_label #</th>
+                                        <th class="" width="50%">$description_label</th>
+                                        <th class="centered">$quantity_label</th>
+                                        <!-- <th class="totals-row-label centered">Delivered</th>
+                    <th class="totals-row-label centered">Backorder</th> -->
+                                    </tr>
+                                </thead>
+                                <tbody class="table-body">
+                                    {% for item in invoice.line_items|filter(item => item.type_id == 1) %}
+                                    <tr class="item-row">
+                                        <td class="">{{ item.product_key }}</td>
+                                        <td class="">{{ item.notes }}</td>
+                                        <td class="centered">{{ item.quantity }}</td>
+                                        <!-- <td class="totals-row-label centered">{{ item.quantity }}</td>
+                    <td class="totals-row-label centered">{{ item.quantity - item.quantity }}</td> -->
+                                    </tr>
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+
+                        {% endif %}
                     </ninja>
 
                     <table width="100%" cellspacing="0" cellpadding="0" class="">
diff --git a/resources/views/templates/payments/tp6.html b/resources/views/templates/payments/tp6.html
index ed3e7d85f1a..52a60d0a74a 100644
--- a/resources/views/templates/payments/tp6.html
+++ b/resources/views/templates/payments/tp6.html
@@ -208,9 +208,9 @@
                                                                         style="border:0;border-collapse:collapse;margin:0;padding:0;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#525f7f;font-size:15px;line-height:24px;white-space:nowrap">
                                                                         <span>
                                                                             <ninja>
-                                                                                {% set payment = payments|first %}
-                                                                                {% if payment %}
-                                                                                {{ payment.method }}
+                                                                                {% if payments is defined and payments is not empty %}
+                                                                                    {% set payment = payments|first %}
+                                                                                        {{ payment.method }}
                                                                                 {% endif %}
                                                                             </ninja>
                                                                         </span>
@@ -303,9 +303,9 @@
                                                                 </tr>
                                                                 <ninja>
                                                                     {% set totalPrice = 0 %}
-                                                                    {% for payment in payments %}
-                                                                    {% for pivot in payment.paymentables|filter(pivot =>
-                                                                    pivot.is_credit == '0') %}
+                                                                    {% if payments is defined and payments is not empty %}
+                                                                        {% for payment in payments %}
+                                                                            {% for pivot in payment.paymentables|filter(pivot => pivot.is_credit == '0') %}
                                                                     <tr>
                                                                         <td
                                                                             style="border:0;border-collapse:collapse;margin:0;padding:0;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#8898aa;font-size:12px;line-height:16px;font-weight:bold;text-transform:uppercase">
@@ -375,7 +375,7 @@
 
                                                                     {% set totalPrice = totalPrice + pivot.amount_raw %}
 
-                                                                    {% endfor %}
+                                                                        {% endfor %}
                                                                     {% endfor %}
 
                                                                     <tr>
@@ -396,6 +396,8 @@
                                                                             style="border:0;border-collapse:collapse;margin:0;padding:0;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;vertical-align:middle;color:#525f7f;font-size:15px;line-height:24px;font-weight:bold">
                                                                             ${{ totalPrice|format_currency(currency_code) }}
                                                                         <td>
+                                                                    
+                                                                    {% endif %}
                                                                 </ninja>
                                                 </tr>
                                                 <tr>
diff --git a/resources/views/templates/payments/tp7.html b/resources/views/templates/payments/tp7.html
index dfcc377401d..22be9c8d99f 100644
--- a/resources/views/templates/payments/tp7.html
+++ b/resources/views/templates/payments/tp7.html
@@ -108,9 +108,11 @@ <h1 class="primary-color-highlight" style="margin-top:0;">$receipt_label {%if pa
             <h4 class="italic" style="margin-bottom:0.5rem;">$to_label</h3>
                 <p style="margin-bottom:0.5rem;">$client.name</p>
                 <ninja>
-                    {% set payment = payments|first %}
-                    {% if payment.client.vat_number %}
-                    <p>$vat_number_label: $vat_number</p>
+                    {% if payments is defined and payments is not empty %}
+                        {% set payment = payments|first %}
+                        {% if payment.client.vat_number %}
+                        <p>$vat_number_label: $vat_number</p>
+                        {% endif %}
                     {% endif %}
                 </ninja>
         </div>
@@ -129,23 +131,23 @@ <h4 class="italic" style="margin-bottom:0.5rem;">$to_label</h3>
         </div>
 
         <ninja>
-            {% if payments|e %}
-            {% for payment in payments %}
-            <div class="four-col-grid bottom-border" style="padding:2px;">
-                <div>
-                    <p class="primary-color-highlight">#{{ payment.number }}</p>
+            {% if payments is defined and payments is not empty %}
+                {% for payment in payments %}
+                <div class="four-col-grid bottom-border" style="padding:2px;">
+                    <div>
+                        <p class="primary-color-highlight">#{{ payment.number }}</p>
+                    </div>
+                    <div>
+                        <p>{{ payment.date }}</p>
+                    </div>
+                    <div>
+                        <p>{{ payment.method }}</p>
+                    </div>
+                    <div>
+                        <p>{{ payment.amount }}</p>
+                    </div>
                 </div>
-                <div>
-                    <p>{{ payment.date }}</p>
-                </div>
-                <div>
-                    <p>{{ payment.method }}</p>
-                </div>
-                <div>
-                    <p>{{ payment.amount }}</p>
-                </div>
-            </div>
-            {% endfor %}
+                {% endfor %}
             {% endif %}
         </ninja>
 
diff --git a/resources/views/templates/payments/tr8.html b/resources/views/templates/payments/tr8.html
index acfacb995a2..ae9598792c4 100644
--- a/resources/views/templates/payments/tr8.html
+++ b/resources/views/templates/payments/tr8.html
@@ -96,8 +96,9 @@
     <div class="two-col-grid" style="">
         <div class="pull-left">
             <ninja>
-                <h1 class="primary-color-highlight" style="margin-top:0; margin-bottom:0rem;">$refund_label {% if
-                    payments|length == 1%}#$number {% endif %}</h2>
+                {% if payments is defined and payments is not empty %}
+                <h1 class="primary-color-highlight" style="margin-top:0; margin-bottom:0rem;">$refund_label {% if payments|length == 1%}#$number {% endif %}</h2>
+                {% endif %}
             </ninja>
         </div>
         <div class="pull-right"><img src="$company.logo" class="company-logo"></div>
@@ -108,9 +109,11 @@ <h1 class="primary-color-highlight" style="margin-top:0; margin-bottom:0rem;">$r
             <h4 class="italic" style="margin-bottom:0.5rem;">$to_label</h3>
                 <p style="margin-bottom:0.5rem;">$client.name</p>
                 <ninja>
-                    {% set payment = payments|first %}
-                    {% if payment.client.vat_number %}
-                    <p>$vat_number_label: $vat_number</p>
+                    {% if payments is defined and payments is not empty %}
+                        {% set payment = payments|first %}
+                        {% if payment.client.vat_number %}
+                        <p>$vat_number_label: $vat_number</p>
+                        {% endif %}
                     {% endif %}
                 </ninja>
         </div>
@@ -123,7 +126,7 @@ <h4 class="italic" style="margin-bottom:0.5rem;">$to_label</h3>
     <div class="" style="margin-top:20px;">
 
         <ninja>
-            {% if payments|e %}
+            {% if payments is defined and payments is not empty %}
             {% set totalInvoices = 0 %}
             {% set totalRefunds = 0 %}
             {% for payment in payments %}
diff --git a/resources/views/templates/payments/tr9.html b/resources/views/templates/payments/tr9.html
index 2a77d0b3815..e21ed2f5cc2 100644
--- a/resources/views/templates/payments/tr9.html
+++ b/resources/views/templates/payments/tr9.html
@@ -8,6 +8,7 @@
 
 <body>
     <ninja>
+        {% if payments is defined and payments is not empty %}
         {%set payment = payments|first %}
         {%set pivot = payment.paymentables|filter(pivot => pivot.refunded_raw > 0)|first %}
         <table align="center" bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="600"
@@ -522,6 +523,7 @@
                 </tr>
             </tbody>
         </table>
+        {% endif %}
     </ninja>
 </body>
 
diff --git a/resources/views/templates/projects/tp11.html b/resources/views/templates/projects/tp11.html
index 757b22769e4..6110a66cd36 100644
--- a/resources/views/templates/projects/tp11.html
+++ b/resources/views/templates/projects/tp11.html
@@ -52,7 +52,7 @@
 </head>
 <body>
     <ninja>
-        {% if projects|e %}
+        {% if projects is defined and projects is not empty %}
         {% for project in projects %}
 
         <h1>{{ project.name }}</h1>
diff --git a/resources/views/templates/statements/ts1.html b/resources/views/templates/statements/ts1.html
index b5bbb8256ed..ff40197910a 100644
--- a/resources/views/templates/statements/ts1.html
+++ b/resources/views/templates/statements/ts1.html
@@ -132,7 +132,7 @@ <h2>Statement</h2>
         </div>
     </div>
     <ninja>
-        {% if invoices|e %}
+        {% if invoices is defined and invoices is not empty %}
         <div class="entity-container">
             <h2>Invoices<h2>
                 <table width="100%" cellspacing="0" cellpadding="0" class="">
@@ -162,7 +162,7 @@ <h2>Invoices<h2>
     </ninja>
 
     <ninja>
-        {% if payments|e %}
+        {% if payments is defined and payments is not empty %}
         <div class="entity-container">
             <h2>Payments<h2>
                     <table width="100%" cellspacing="0" cellpadding="0" class="">
@@ -194,7 +194,7 @@ <h2>Payments<h2>
     </ninja>
 
     <ninja>
-        {% if credits|e %}
+        {% if credits is defined and credits is not empty %}
         <div class="entity-container">
             <h2>Credits<h2>
                     <table width="100%" cellspacing="0" cellpadding="0" class="">
@@ -222,7 +222,7 @@ <h2>Credits<h2>
     </ninja>
 
     <ninja>
-        {% if aging %}
+        {% if aging is defined %}
         <div class="entity-container">
             <h2>Aging<h2>
                     <table width="100%" cellspacing="0" cellpadding="0" class="">
diff --git a/resources/views/templates/statements/ts2.html b/resources/views/templates/statements/ts2.html
index cbfd6ca5db8..4bb94ca4291 100644
--- a/resources/views/templates/statements/ts2.html
+++ b/resources/views/templates/statements/ts2.html
@@ -148,7 +148,7 @@ <h2>$statement_label</h2>
     </div>
 
     <ninja>
-        {% if invoices|e %}
+        {% if invoices is defined and invoices is not empty %}
         <div id="entity-container">
             <h2>{{ t('invoices') }}<h2>
                     <table width="100%" cellspacing="0" cellpadding="0" class="">
@@ -189,7 +189,7 @@ <h2>{{ t('invoices') }}<h2>
     </ninja>
 
     <ninja>
-        {% if invoices|e and show_payments %}
+        {% if invoices is defined and invoices is not empty and show_payments %}
         <div id="entity-container">
             <h2>{{ t('payments') }}<h2>
                     <table width="100%" cellspacing="0" cellpadding="0" class="">
@@ -270,7 +270,7 @@ <h2>{{ t('payments') }}<h2>
     </ninja>
 
     <ninja>
-        {% if credits|e and show_credits %}
+        {% if credits is defined and credits is not empty and show_credits %}
         <div id="entity-container">
             <h2>{{ t('credits') }}<h2>
                     <table width="100%" cellspacing="0" cellpadding="0" class="">
diff --git a/resources/views/templates/tasks/tt10.html b/resources/views/templates/tasks/tt10.html
index f4d8f99ac97..58d5df07120 100644
--- a/resources/views/templates/tasks/tt10.html
+++ b/resources/views/templates/tasks/tt10.html
@@ -43,7 +43,7 @@
 
 <body>
     <ninja>
-        {% if tasks %}
+        {% if tasks is defined and tasks is not empty %}
         <table>
             <thead>
                 <tr>

From 4b0db3eefdf0c7e6644fecf16de79b2c90bc4ceb Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 13 Oct 2024 09:30:22 +1100
Subject: [PATCH 15/81] Fixes for previews with custom surcharge taxes

---
 app/Http/Controllers/InvoiceController.php | 10 +++++++++-
 app/Http/Controllers/PreviewController.php |  6 ++++++
 app/Models/Company.php                     |  8 ++++----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index b7d72affb9f..b7b4e6561a6 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -165,9 +165,17 @@ public function create(CreateInvoiceRequest $request)
     {
         /** @var \App\Models\User $user */
         $user = auth()->user();
+
+        /** @var \App\Models\Company $company */
+        $company = auth()->user()->company();
+
         $invoice = InvoiceFactory::create($user->company()->id, $user->id);
         $invoice->date = now()->addSeconds($user->company()->utc_offset())->format('Y-m-d');
-
+        $invoice->custom_surcharge_tax1 = $company->custom_surcharge_taxes1;
+        $invoice->custom_surcharge_tax2 = $company->custom_surcharge_taxes2;
+        $invoice->custom_surcharge_tax3 = $company->custom_surcharge_taxes3;
+        $invoice->custom_surcharge_tax4 = $company->custom_surcharge_taxes4;
+        
         return $this->itemResponse($invoice);
     }
 
diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index c144e059372..29c5debd62f 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -71,6 +71,12 @@ public function live(PreviewInvoiceRequest $request): mixed
             $entity_obj->footer = empty($entity_obj->footer) ? $settings->{$entity_prop."_footer"} : $entity_obj->footer;
             $entity_obj->terms = empty($entity_obj->terms) ? $settings->{$entity_prop."_terms"} : $entity_obj->terms;
             $entity_obj->public_notes = empty($entity_obj->public_notes) ? $request->getClient()->public_notes : $entity_obj->public_notes;
+            
+            $entity_obj->custom_surcharge_tax1 = $client->company->custom_surcharge_taxes1;
+            $entity_obj->custom_surcharge_tax2 = $client->company->custom_surcharge_taxes2;
+            $entity_obj->custom_surcharge_tax3 = $client->company->custom_surcharge_taxes3;
+            $entity_obj->custom_surcharge_tax4 = $client->company->custom_surcharge_taxes4;
+            
             $invitation->setRelation($request->entity, $entity_obj);
         }
 
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 87eec1f4025..3e36b1b65e3 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -41,10 +41,10 @@
  * @property bool $update_products
  * @property bool $show_product_details
  * @property bool $client_can_register
- * @property int $custom_surcharge_taxes1
- * @property int $custom_surcharge_taxes2
- * @property int $custom_surcharge_taxes3
- * @property int $custom_surcharge_taxes4
+ * @property bool $custom_surcharge_taxes1
+ * @property bool $custom_surcharge_taxes2
+ * @property bool $custom_surcharge_taxes3
+ * @property bool $custom_surcharge_taxes4
  * @property int $show_product_cost
  * @property int $enabled_tax_rates
  * @property int $enabled_modules

From 1281a07a730161fd46913519abb3f35895400f6c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 14 Oct 2024 08:33:15 +1100
Subject: [PATCH 16/81] Fixes for template actions

---
 app/Services/Template/TemplateService.php    | 6 +++---
 resources/views/templates/projects/tp11.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php
index adf28bec68c..3dc748e4b64 100644
--- a/app/Services/Template/TemplateService.php
+++ b/app/Services/Template/TemplateService.php
@@ -21,6 +21,7 @@
 use App\Models\PurchaseOrder;
 use App\Models\Quote;
 use App\Models\RecurringInvoice;
+use App\Models\Task;
 use App\Models\User;
 use App\Models\Vendor;
 use App\Utils\HostedPDF\NinjaPdf;
@@ -61,7 +62,7 @@ class TemplateService
 
     private ?Vendor $vendor = null;
 
-    private Invoice | Quote | Credit | PurchaseOrder | RecurringInvoice $entity;
+    private Invoice | Quote | Credit | PurchaseOrder | RecurringInvoice | Task | Project $entity;
 
     private Payment $payment;
 
@@ -92,7 +93,7 @@ private function init(): self
 
         $loader = new \Twig\Loader\FilesystemLoader(storage_path());
         $this->twig = new \Twig\Environment($loader, [
-                'debug' => true,
+            'debug' => true,
         ]);
 
         $string_extension = new \Twig\Extension\StringLoaderExtension();
@@ -100,7 +101,6 @@ private function init(): self
         $this->twig->addExtension(new IntlExtension());
         $this->twig->addExtension(new \Twig\Extension\DebugExtension());
 
-
         $function = new \Twig\TwigFunction('img', function ($string, $style = '') {
             return '<img src="' . $string . '" style="' . $style . '"></img>';
         });
diff --git a/resources/views/templates/projects/tp11.html b/resources/views/templates/projects/tp11.html
index 6110a66cd36..757b22769e4 100644
--- a/resources/views/templates/projects/tp11.html
+++ b/resources/views/templates/projects/tp11.html
@@ -52,7 +52,7 @@
 </head>
 <body>
     <ninja>
-        {% if projects is defined and projects is not empty %}
+        {% if projects|e %}
         {% for project in projects %}
 
         <h1>{{ project.name }}</h1>

From 78eeccea62247e8b18a1abe9ea977c1ad14a9a13 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 14 Oct 2024 08:33:37 +1100
Subject: [PATCH 17/81] v5.10.36

---
 VERSION.txt      | 2 +-
 config/ninja.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 0a97a3c565e..649253d3487 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.10.35
\ No newline at end of file
+5.10.36
\ No newline at end of file
diff --git a/config/ninja.php b/config/ninja.php
index db690e85b83..4303ccafeb9 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,8 @@
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.10.35'),
-    'app_tag' => env('APP_TAG', '5.10.35'),
+    'app_version' => env('APP_VERSION', '5.10.36'),
+    'app_tag' => env('APP_TAG', '5.10.36'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),

From 7b49438a969674a764889d9529b37acca89d109d Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 14 Oct 2024 08:37:30 +1100
Subject: [PATCH 18/81] Static Analysis

---
 app/Services/Template/TemplateService.php | 28 ++++++++++++-----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php
index 3dc748e4b64..e23d60ce0ae 100644
--- a/app/Services/Template/TemplateService.php
+++ b/app/Services/Template/TemplateService.php
@@ -1311,19 +1311,21 @@ private function clientDetails(bool $include_labels = false): self
      */
     private function resolveEntity(): string
     {
-        $entity_string = '';
-
-        //@phpstan-ignore-next-line
-        match($this->entity) {
-            ($this->entity instanceof Invoice) => $entity_string = 'invoice',
-            ($this->entity instanceof Quote)  => $entity_string = 'quote',
-            ($this->entity instanceof Credit) => $entity_string = 'credit',
-            ($this->entity instanceof RecurringInvoice) => $entity_string = 'invoice',
-            ($this->entity instanceof PurchaseOrder) => $entity_string = 'purchase_order',
-            default => $entity_string = 'invoice',
-        };
-
-        return $entity_string;
+        switch ($this->entity) {
+            case  ($this->entity instanceof Invoice):
+               return 'invoice';
+            case  ($this->entity instanceof Quote):
+               return 'quote';
+            case  ($this->entity instanceof Credit):
+               return 'credit';
+            case  ($this->entity instanceof RecurringInvoice):
+               return 'invoice';
+            case  ($this->entity instanceof PurchaseOrder):
+               return 'purchase_order';
+            
+            default:
+               return 'invoice';
+        }
 
     }
 

From 6bc9f679a9391717b11d79970fa3755e293b88d3 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 14 Oct 2024 10:27:14 +1100
Subject: [PATCH 19/81] tests for importing documents

---
 .../EDocument/Imports/ParseEDocument.php      |  14 +-
 .../EDocument/Imports/UblEDocument.php        |  45 ++++
 .../Einvoice/ImportEInvoiceTest.php           |  39 ++++
 tests/Integration/Einvoice/samples/peppol.xml | 211 ++++++++++++++++++
 4 files changed, 306 insertions(+), 3 deletions(-)
 create mode 100644 app/Services/EDocument/Imports/UblEDocument.php
 create mode 100644 tests/Integration/Einvoice/ImportEInvoiceTest.php
 create mode 100644 tests/Integration/Einvoice/samples/peppol.xml

diff --git a/app/Services/EDocument/Imports/ParseEDocument.php b/app/Services/EDocument/Imports/ParseEDocument.php
index b58d4d7664b..cbcab0dadbe 100644
--- a/app/Services/EDocument/Imports/ParseEDocument.php
+++ b/app/Services/EDocument/Imports/ParseEDocument.php
@@ -11,12 +11,13 @@
 
 namespace App\Services\EDocument\Imports;
 
+use Exception;
+use App\Utils\Ninja;
 use App\Models\Company;
 use App\Models\Expense;
 use App\Services\AbstractService;
-use App\Utils\Ninja;
-use Exception;
 use Illuminate\Http\UploadedFile;
+use App\Services\EDocument\Imports\UblEDocument;
 
 class ParseEDocument extends AbstractService
 {
@@ -56,9 +57,16 @@ public function run(): Expense
             case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_2.0"):
                 try {
                     return (new ZugferdEDocument($this->file, $this->company))->run();
-                } catch (Exception $e) {
+                } catch (Throwable $e) {
                     nlog("Zugferd Exception: " . $e->getMessage());
                 }
+            case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:oasis:names:specification:ubl"):
+                try {
+                    return (new UblEDocument($this->file, $this->company))->run();
+                }
+                catch(\Throwable $e){
+                    nlog("UBL Import Exception: " . $e->getMessage());
+                }
         }
 
         // MINDEE OCR - try to parse via mindee external service
diff --git a/app/Services/EDocument/Imports/UblEDocument.php b/app/Services/EDocument/Imports/UblEDocument.php
new file mode 100644
index 00000000000..af7f78dc292
--- /dev/null
+++ b/app/Services/EDocument/Imports/UblEDocument.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Services\EDocument\Imports;
+
+use App\Models\Company;
+use App\Factory\ExpenseFactory;
+use Illuminate\Http\UploadedFile;
+use App\Utils\Traits\SavesDocuments;
+
+class UblEDocument extends AbstractService
+{
+    use SavesDocuments;
+
+    /**
+     * @throws Exception
+     */
+    public function __construct(public UploadedFile $file, public Company $company)
+    {
+        # curl -X POST http://localhost:8000/api/v1/edocument/upload -H "Content-Type: multipart/form-data" -H "X-API-TOKEN: 7tdDdkz987H3AYIWhNGXy8jTjJIoDhkAclCDLE26cTCj1KYX7EBHC66VEitJwWhn" -H "X-Requested-With: XMLHttpRequest" -F _method=PUT -F documents[]=@einvoice.xml
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function run(): Expense
+    {
+
+        //parse doc
+
+        //append file as an attachment to the document
+
+        $expense = ExpenseFactory::create($this->company->id, $this->company->owner()->id);
+
+        return $expense;
+    }
+}
\ No newline at end of file
diff --git a/tests/Integration/Einvoice/ImportEInvoiceTest.php b/tests/Integration/Einvoice/ImportEInvoiceTest.php
new file mode 100644
index 00000000000..3ab77c88e32
--- /dev/null
+++ b/tests/Integration/Einvoice/ImportEInvoiceTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace Tests\Integration\Einvoice;
+
+use Tests\TestCase;
+use InvoiceNinja\EInvoice\EInvoice;
+
+
+/**
+ * 
+ */
+class ImportEInvoiceTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    public function testParsingDocument()
+    {
+        $peppol_doc = file_get_contents(base_path('tests/Integration/Einvoice/samples/peppol.xml'));
+
+        $this->assertNotNull($peppol_doc);
+        
+        $e = new EInvoice();
+        $invoice = $e->decode('Peppol', $peppol_doc, 'xml');
+
+        $this->assertNotNull($invoice);
+    }
+}
\ No newline at end of file
diff --git a/tests/Integration/Einvoice/samples/peppol.xml b/tests/Integration/Einvoice/samples/peppol.xml
new file mode 100644
index 00000000000..ecfc3b32e3e
--- /dev/null
+++ b/tests/Integration/Einvoice/samples/peppol.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+    xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+    xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+    <cbc:UBLVersionID>2.1</cbc:UBLVersionID>
+    <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+    <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+    <cbc:ID>Snippet1</cbc:ID>
+    <cbc:IssueDate>2017-11-13</cbc:IssueDate>
+    <cbc:DueDate>2017-12-01</cbc:DueDate>
+    <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+    <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+    <cbc:AccountingCost>4025:123:4343</cbc:AccountingCost>
+    <cbc:BuyerReference>0150abc</cbc:BuyerReference>
+    <cac:AccountingSupplierParty>
+        <cac:Party>
+            <cbc:EndpointID schemeID="0088">9482348239847239874</cbc:EndpointID>
+            <cac:PartyIdentification>
+                <cbc:ID>99887766</cbc:ID>
+            </cac:PartyIdentification>
+            <cac:PartyName>
+                <cbc:Name>SupplierTradingName Ltd.</cbc:Name>
+            </cac:PartyName>
+            <cac:PostalAddress>
+                <cbc:StreetName>Main street 1</cbc:StreetName>
+                <cbc:AdditionalStreetName>Postbox 123</cbc:AdditionalStreetName>
+                <cbc:CityName>London</cbc:CityName>
+                <cbc:PostalZone>GB 123 EW</cbc:PostalZone>
+                <cac:Country>
+                    <cbc:IdentificationCode>GB</cbc:IdentificationCode>
+                </cac:Country> 
+            </cac:PostalAddress>
+            <cac:PartyTaxScheme>
+                <cbc:CompanyID>GB1232434</cbc:CompanyID>
+                <cac:TaxScheme>
+                    <cbc:ID>VAT</cbc:ID>
+                </cac:TaxScheme>
+            </cac:PartyTaxScheme>
+            <cac:PartyLegalEntity>
+                <cbc:RegistrationName>SupplierOfficialName Ltd</cbc:RegistrationName>
+                <cbc:CompanyID>GB983294</cbc:CompanyID>
+            </cac:PartyLegalEntity>
+        </cac:Party>
+    </cac:AccountingSupplierParty>
+    <cac:AccountingCustomerParty>
+        <cac:Party>
+            <cbc:EndpointID schemeID="0002">FR23342</cbc:EndpointID>
+            <cac:PartyIdentification>
+                <cbc:ID schemeID="0002">FR23342</cbc:ID>
+            </cac:PartyIdentification>
+            <cac:PartyName>
+                <cbc:Name>BuyerTradingName AS</cbc:Name>
+            </cac:PartyName>
+            <cac:PostalAddress>
+                <cbc:StreetName>Hovedgatan 32</cbc:StreetName>
+                <cbc:AdditionalStreetName>Po box 878</cbc:AdditionalStreetName>
+                <cbc:CityName>Stockholm</cbc:CityName>
+                <cbc:PostalZone>456 34</cbc:PostalZone>
+                <cac:Country>
+                    <cbc:IdentificationCode>SE</cbc:IdentificationCode>
+                </cac:Country>
+            </cac:PostalAddress>
+            <cac:PartyTaxScheme>
+                <cbc:CompanyID>SE4598375937</cbc:CompanyID>
+                <cac:TaxScheme>
+                    <cbc:ID>VAT</cbc:ID>
+                </cac:TaxScheme>
+            </cac:PartyTaxScheme>
+            <cac:PartyLegalEntity>
+                <cbc:RegistrationName>Buyer Official Name</cbc:RegistrationName>
+                <cbc:CompanyID schemeID="0183">39937423947</cbc:CompanyID>
+            </cac:PartyLegalEntity>
+            <cac:Contact>
+                <cbc:Name>Lisa Johnson</cbc:Name>
+                <cbc:Telephone>23434234</cbc:Telephone>
+                <cbc:ElectronicMail>lj@buyer.se</cbc:ElectronicMail>
+            </cac:Contact>
+        </cac:Party>
+    </cac:AccountingCustomerParty>
+    <cac:Delivery>
+        <cbc:ActualDeliveryDate>2017-11-01</cbc:ActualDeliveryDate>
+        <cac:DeliveryLocation>
+            <cbc:ID schemeID="0088">9483759475923478</cbc:ID>
+            <cac:Address>
+                <cbc:StreetName>Delivery street 2</cbc:StreetName>
+                <cbc:AdditionalStreetName>Building 56</cbc:AdditionalStreetName>
+                <cbc:CityName>Stockholm</cbc:CityName>
+                <cbc:PostalZone>21234</cbc:PostalZone>
+                <cac:Country>
+                    <cbc:IdentificationCode>SE</cbc:IdentificationCode>
+                </cac:Country>
+            </cac:Address>
+        </cac:DeliveryLocation>
+        <cac:DeliveryParty>
+            <cac:PartyName>
+                <cbc:Name>Delivery party Name</cbc:Name>
+            </cac:PartyName>
+        </cac:DeliveryParty>
+    </cac:Delivery>
+    <cac:PaymentMeans>
+        <cbc:PaymentMeansCode name="Credit transfer">30</cbc:PaymentMeansCode>
+        <cbc:PaymentID>Snippet1</cbc:PaymentID>
+        <cac:PayeeFinancialAccount>
+            <cbc:ID>IBAN32423940</cbc:ID>
+            <cbc:Name>AccountName</cbc:Name>
+            <cac:FinancialInstitutionBranch>
+                <cbc:ID>BIC324098</cbc:ID>
+            </cac:FinancialInstitutionBranch>
+        </cac:PayeeFinancialAccount>
+    </cac:PaymentMeans>
+    <cac:PaymentTerms>
+        <cbc:Note>Payment within 10 days, 2% discount</cbc:Note>
+    </cac:PaymentTerms>
+    <cac:AllowanceCharge>
+        <cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+        <cbc:AllowanceChargeReason>Insurance</cbc:AllowanceChargeReason>
+        <cbc:Amount currencyID="EUR">25</cbc:Amount>
+        <cac:TaxCategory>
+            <cbc:ID>S</cbc:ID>
+            <cbc:Percent>25.0</cbc:Percent>
+            <cac:TaxScheme>
+                <cbc:ID>VAT</cbc:ID>
+            </cac:TaxScheme>
+        </cac:TaxCategory>
+    </cac:AllowanceCharge>
+    <cac:TaxTotal>
+        <cbc:TaxAmount currencyID="EUR">331.25</cbc:TaxAmount>
+        <cac:TaxSubtotal>
+            <cbc:TaxableAmount currencyID="EUR">1325</cbc:TaxableAmount>
+            <cbc:TaxAmount currencyID="EUR">331.25</cbc:TaxAmount>
+            <cac:TaxCategory>
+                <cbc:ID>S</cbc:ID>
+                <cbc:Percent>25.0</cbc:Percent>
+                <cac:TaxScheme>
+                    <cbc:ID>VAT</cbc:ID>
+                </cac:TaxScheme>
+            </cac:TaxCategory>
+        </cac:TaxSubtotal>
+    </cac:TaxTotal>
+    <cac:LegalMonetaryTotal>
+        <cbc:LineExtensionAmount currencyID="EUR">1300</cbc:LineExtensionAmount>
+        <cbc:TaxExclusiveAmount currencyID="EUR">1325</cbc:TaxExclusiveAmount>
+        <cbc:TaxInclusiveAmount currencyID="EUR">1656.25</cbc:TaxInclusiveAmount>
+        <cbc:ChargeTotalAmount currencyID="EUR">25</cbc:ChargeTotalAmount>
+        <cbc:PayableAmount currencyID="EUR">1656.25</cbc:PayableAmount>
+    </cac:LegalMonetaryTotal>
+
+    <cac:InvoiceLine>
+        <cbc:ID>1</cbc:ID>
+        <cbc:InvoicedQuantity unitCode="DAY">7</cbc:InvoicedQuantity>
+        <cbc:LineExtensionAmount currencyID="EUR">2800</cbc:LineExtensionAmount>
+        <cbc:AccountingCost>Konteringsstreng</cbc:AccountingCost>
+        <cac:OrderLineReference>
+            <cbc:LineID>123</cbc:LineID>
+        </cac:OrderLineReference>
+        <cac:Item>
+            <cbc:Description>Description of item</cbc:Description>
+            <cbc:Name>item name</cbc:Name>
+            <cac:StandardItemIdentification>
+                <cbc:ID schemeID="0088">21382183120983</cbc:ID>
+            </cac:StandardItemIdentification>
+            <cac:OriginCountry>
+                <cbc:IdentificationCode>NO</cbc:IdentificationCode>
+            </cac:OriginCountry>
+            <cac:CommodityClassification>
+                <cbc:ItemClassificationCode listID="SRV">09348023</cbc:ItemClassificationCode>
+            </cac:CommodityClassification>
+            <cac:ClassifiedTaxCategory>
+                <cbc:ID>S</cbc:ID>
+                <cbc:Percent>25.0</cbc:Percent>
+                <cac:TaxScheme>
+                    <cbc:ID>VAT</cbc:ID>
+                </cac:TaxScheme>
+            </cac:ClassifiedTaxCategory>
+        </cac:Item>
+        <cac:Price>
+            <cbc:PriceAmount currencyID="EUR">400</cbc:PriceAmount>
+        </cac:Price>
+    </cac:InvoiceLine>
+    <cac:InvoiceLine>
+        <cbc:ID>2</cbc:ID>
+        <cbc:InvoicedQuantity unitCode="DAY">-3</cbc:InvoicedQuantity>
+        <cbc:LineExtensionAmount currencyID="EUR">-1500</cbc:LineExtensionAmount>
+        <cac:OrderLineReference>
+            <cbc:LineID>123</cbc:LineID>
+        </cac:OrderLineReference>
+        <cac:Item>
+            <cbc:Description>Description 2</cbc:Description>
+            <cbc:Name>item name 2</cbc:Name>
+            <cac:StandardItemIdentification>
+                <cbc:ID schemeID="0088">21382183120983</cbc:ID>
+            </cac:StandardItemIdentification>
+            <cac:OriginCountry>
+                <cbc:IdentificationCode>NO</cbc:IdentificationCode>
+            </cac:OriginCountry>
+            <cac:CommodityClassification>
+                <cbc:ItemClassificationCode listID="SRV">09348023</cbc:ItemClassificationCode>
+            </cac:CommodityClassification>
+            <cac:ClassifiedTaxCategory>
+                <cbc:ID>S</cbc:ID>
+                <cbc:Percent>25.0</cbc:Percent>
+                <cac:TaxScheme>
+                    <cbc:ID>VAT</cbc:ID>
+                </cac:TaxScheme>
+            </cac:ClassifiedTaxCategory>
+        </cac:Item>
+        <cac:Price>
+            <cbc:PriceAmount currencyID="EUR">500</cbc:PriceAmount>
+        </cac:Price>
+    </cac:InvoiceLine>
+</Invoice>
\ No newline at end of file

From f0c3a5223f109fd6f9f8c48149744a4b80fc556f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 14 Oct 2024 10:29:39 +1100
Subject: [PATCH 20/81] tests for importing documents

---
 app/Services/EDocument/Imports/ParseEDocument.php |  4 ++--
 app/Services/EDocument/Imports/UblEDocument.php   |  4 ++--
 tests/Integration/Einvoice/ImportEInvoiceTest.php | 11 +++++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/Services/EDocument/Imports/ParseEDocument.php b/app/Services/EDocument/Imports/ParseEDocument.php
index cbcab0dadbe..b935692d53a 100644
--- a/app/Services/EDocument/Imports/ParseEDocument.php
+++ b/app/Services/EDocument/Imports/ParseEDocument.php
@@ -37,7 +37,7 @@ public function __construct(private UploadedFile $file, private Company $company
      * @developer the function should be implemented with local first aproach to save costs of external providers (like mindee ocr)
      *
      * @return Expense
-     * @throws \Exception
+     * @throws \Throwable
      */
     public function run(): Expense
     {
@@ -57,7 +57,7 @@ public function run(): Expense
             case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_2.0"):
                 try {
                     return (new ZugferdEDocument($this->file, $this->company))->run();
-                } catch (Throwable $e) {
+                } catch (\Throwable $e) {
                     nlog("Zugferd Exception: " . $e->getMessage());
                 }
             case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:oasis:names:specification:ubl"):
diff --git a/app/Services/EDocument/Imports/UblEDocument.php b/app/Services/EDocument/Imports/UblEDocument.php
index af7f78dc292..2391a1ccf0b 100644
--- a/app/Services/EDocument/Imports/UblEDocument.php
+++ b/app/Services/EDocument/Imports/UblEDocument.php
@@ -21,7 +21,7 @@ class UblEDocument extends AbstractService
     use SavesDocuments;
 
     /**
-     * @throws Exception
+     * @throws \Throwable
      */
     public function __construct(public UploadedFile $file, public Company $company)
     {
@@ -29,7 +29,7 @@ public function __construct(public UploadedFile $file, public Company $company)
     }
 
     /**
-     * @throws Exception
+     * @throws \Throwable
      */
     public function run(): Expense
     {
diff --git a/tests/Integration/Einvoice/ImportEInvoiceTest.php b/tests/Integration/Einvoice/ImportEInvoiceTest.php
index 3ab77c88e32..e25226e3567 100644
--- a/tests/Integration/Einvoice/ImportEInvoiceTest.php
+++ b/tests/Integration/Einvoice/ImportEInvoiceTest.php
@@ -29,11 +29,22 @@ public function testParsingDocument()
     {
         $peppol_doc = file_get_contents(base_path('tests/Integration/Einvoice/samples/peppol.xml'));
 
+        //file present
         $this->assertNotNull($peppol_doc);
         
         $e = new EInvoice();
         $invoice = $e->decode('Peppol', $peppol_doc, 'xml');
 
+        //decodes as expected
         $this->assertNotNull($invoice);
+
+        //has prop we expect
+        $this->assertObjectHasProperty('UBLVersionID', $invoice);
+        
+        //has hydrated correctly
+        $this->assertInstanceOf(\InvoiceNinja\EInvoice\Models\Peppol\Invoice::class, $invoice);
+
+
+        
     }
 }
\ No newline at end of file

From a63cc03af5f5044e4d3f1b6293bca2a0c52d1e0b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 14 Oct 2024 10:31:48 +1100
Subject: [PATCH 21/81] tests for importing documents

---
 app/Services/EDocument/Imports/UblEDocument.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Services/EDocument/Imports/UblEDocument.php b/app/Services/EDocument/Imports/UblEDocument.php
index 2391a1ccf0b..70e4bec09d1 100644
--- a/app/Services/EDocument/Imports/UblEDocument.php
+++ b/app/Services/EDocument/Imports/UblEDocument.php
@@ -13,6 +13,7 @@
 
 use App\Models\Company;
 use App\Factory\ExpenseFactory;
+use App\Services\AbstractService;
 use Illuminate\Http\UploadedFile;
 use App\Utils\Traits\SavesDocuments;
 
@@ -31,13 +32,15 @@ public function __construct(public UploadedFile $file, public Company $company)
     /**
      * @throws \Throwable
      */
-    public function run(): Expense
+    public function run(): \App\Models\Expense
     {
 
         //parse doc
 
         //append file as an attachment to the document
 
+
+        /** @var \App\Models\Expense $expense */
         $expense = ExpenseFactory::create($this->company->id, $this->company->owner()->id);
 
         return $expense;

From 7402f7c1108cd1dc11452f34374f7effcfeca071 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 14 Oct 2024 14:46:51 +1100
Subject: [PATCH 22/81] Working on importing expense einvoices

---
 .../EDocument/Imports/UblEDocument.php        |   97 +-
 app/Services/EDocument/Standards/Peppol.php   |    1 -
 .../Einvoice/ImportEInvoiceTest.php           |   53 +-
 .../Integration/Einvoice/samples/peppol.xslt  | 1848 +++++++++++++++++
 4 files changed, 1996 insertions(+), 3 deletions(-)
 create mode 100644 tests/Integration/Einvoice/samples/peppol.xslt

diff --git a/app/Services/EDocument/Imports/UblEDocument.php b/app/Services/EDocument/Imports/UblEDocument.php
index 70e4bec09d1..9c23e2bb856 100644
--- a/app/Services/EDocument/Imports/UblEDocument.php
+++ b/app/Services/EDocument/Imports/UblEDocument.php
@@ -11,10 +11,16 @@
 
 namespace App\Services\EDocument\Imports;
 
+use App\Models\Vendor;
 use App\Models\Company;
+use App\Models\Country;
+use App\Factory\VendorFactory;
 use App\Factory\ExpenseFactory;
+use App\Factory\VendorContactFactory;
 use App\Services\AbstractService;
 use Illuminate\Http\UploadedFile;
+
+use InvoiceNinja\EInvoice\EInvoice;
 use App\Utils\Traits\SavesDocuments;
 
 class UblEDocument extends AbstractService
@@ -36,13 +42,102 @@ public function run(): \App\Models\Expense
     {
 
         //parse doc
+        // try{
+            $e = new EInvoice();
+            $invoice = $e->decode('Peppol', $this->file->get(), 'xml');
+
+            return $this->buildAndSaveExpense($invoice);
+
+        // }
+        // catch(\Throwable $e){
+        //     return $e->getMessage();
+        // }
+
+    }
+
+    private function buildAndSaveExpense(\InvoiceNinja\EInvoice\Models\Peppol\Invoice $invoice): Expense
+    {
 
-        //append file as an attachment to the document
+        $vendor = $this->findOrCreateVendor($invoice);
 
 
         /** @var \App\Models\Expense $expense */
         $expense = ExpenseFactory::create($this->company->id, $this->company->owner()->id);
 
         return $expense;
+
+
+    }
+
+    private function findOrCreateVendor(\InvoiceNinja\EInvoice\Models\Peppol\Invoice $invoice): Vendor
+    {
+        $asp = $invoice->AccountingSupplierParty;
+        
+        $vat_number = $asp->Party->PartyTaxScheme->CompanyID ?? false;
+        $id_number = $asp->Party->PartyIdentification->ID ?? false;
+        $routing_id = $asp->Party->EndpointID ?? false;
+        $vendor_name = $asp->Party->PartyName->Name ?? false;
+
+        $vendor = Vendor::query()
+                    ->where('company_id', $this->company->id)
+                    ->where(function ($q) use ($vat_number, $routing_id, $id_number, $vendor_name){
+
+                        $q->when($routing_id, function ($q) use ($routing_id){
+                            $q->where('routing_id', $routing_id);
+                        })
+                        ->when($vat_number, function ($q) use ($vat_number){
+                            $q->orWhere('vat_number', $vat_number);
+                        })
+                        ->when($id_number, function ($q) use ($id_number){
+                            $q->orWhere('id_number', $id_number);
+                        })
+                        ->when($vendor_name, function ($q) use ($vendor_name){
+                            $q->orWhere('name', $vendor_name);
+                        });
+
+                    })->first();
+
+        return $vendor ?? $this->newVendor($invoice);
+    }
+
+    private function newVendor(\InvoiceNinja\EInvoice\Models\Peppol\Invoice $invoice): Vendor
+    {
+        $vendor = VendorFactory::create($this->company->id, $this->company->owner()->id);
+
+        $data = [
+            'name' => data_get($invoice, 'AccountingSupplierParty.Party.PartyName.Name', ''),
+            'routing_id' => data_get($invoice, 'AccountingSupplierParty.Party.EndpointID', ''),
+            'vat_number' => data_get($invoice, 'AccountingSupplierParty.Party.PartyTaxScheme.CompanyID', ''),
+            'address1' => data_get($invoice, 'AccountingSupplierParty.Party.PostalAddress.StreetName',''),
+            'address2' => data_get($invoice, 'AccountingSupplierParty.Party.PostalAddress.AdditionalStreetName',''),
+            'city' => data_get($invoice, 'AccountingSupplierParty.Party.PostalAddress.CityName',''),
+            'state' => data_get($invoice, 'AccountingSupplierParty.Party.PostalAddress.CountrySubentity',''),
+            'postal_code' => data_get($invoice, 'AccountingSupplierParty.Party.PostalAddress.PostalZone',''),
+            'country_id' => $this->resovelCountry(data_get($invoice, 'AccountingSupplierParty.Party.PostalAddress.Country.IdentificationCode','')),
+        ];
+
+        $vendor->fill($data);
+        $vendor->save();
+
+        if(data_get($invoice, 'AccountingSupplierParty.Party.Contact',false))
+        {
+            $vc = VendorContactFactory::create($this->company->id, $this->company->owner()->id);
+            $vc->vendor_id = $vendor->id;
+            $vc->first_name = data_get($invoice, 'AccountingSupplierParty.Party.Contact.Name','');
+            $vc->phone = data_get($invoice, 'AccountingSupplierParty.Party.Contact.Telephone', '');
+            $vc->email = data_get($invoice, 'AccountingSupplierParty.Party.Contact.ElectronicMail', '');
+            $vc->save();
+        }
+
+        return $vendor->fresh();
+
+    }
+
+    private function resolveCountry(?string $iso_country_code): int
+    {
+        return Country::query()
+                        ->where('iso_3166_2', $iso_country_code)
+                        ->orWhere('iso_3166_3', $iso_country_code)
+                        ->first() ?? (int)$this->company->settings->country_id;
     }
 }
\ No newline at end of file
diff --git a/app/Services/EDocument/Standards/Peppol.php b/app/Services/EDocument/Standards/Peppol.php
index e89722ff1c6..74c83d23e21 100644
--- a/app/Services/EDocument/Standards/Peppol.php
+++ b/app/Services/EDocument/Standards/Peppol.php
@@ -992,7 +992,6 @@ private function getAccountingCustomerParty(): AccountingCustomerParty
         $physical_location->Address = $address;
 
         $party->PhysicalLocation = $physical_location;
-        ;
 
         $contact = new Contact();
         $contact->ElectronicMail = $this->invoice->client->present()->email();
diff --git a/tests/Integration/Einvoice/ImportEInvoiceTest.php b/tests/Integration/Einvoice/ImportEInvoiceTest.php
index e25226e3567..465147ff0bf 100644
--- a/tests/Integration/Einvoice/ImportEInvoiceTest.php
+++ b/tests/Integration/Einvoice/ImportEInvoiceTest.php
@@ -45,6 +45,57 @@ public function testParsingDocument()
         $this->assertInstanceOf(\InvoiceNinja\EInvoice\Models\Peppol\Invoice::class, $invoice);
 
 
-        
+
     }
+
+    // public function testHtmlConversion()
+    // {
+                
+    //     // Load the XML source
+    //     $xml = new \DOMDocument();
+    //     $xml->load(base_path('tests/Integration/Einvoice/samples/peppol.xml'));
+
+    //     // Load XSLT stylesheet
+    //     $xsl = new \DOMDocument();
+    //     $xsl->load(base_path('tests/Integration/Einvoice/samples/peppol.xslt'));
+
+    //     // Configure the transformer
+    //     $proc = new \XSLTProcessor();
+    //     $proc->importStyleSheet($xsl); // attach the xsl rules
+
+    //     $transformed = $proc->transformToXML($xml);
+
+    //     // determining if output is html document
+    //     $html = $transformed;
+
+    //     // splitting up html document at doctype and doc
+    //     $html_array = explode("\n", $html, 15);
+
+    //     $html_doc = array_pop($html_array);
+
+    //     $html_doctype = implode("\n", $html_array);
+
+    //     // convert XHTML syntax to HTML5
+    //     // <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+    //     // <!DOCTYPE html>
+
+
+    //     $html_doctype = preg_replace("/<!DOCTYPE [^>]+>/", "<!DOCTYPE html>", $html_doctype);
+
+    //     // <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+    //     // <html lang="en">
+
+
+    //     $html_doctype = preg_replace('/ xmlns=\"http:\/\/www.w3.org\/1999\/xhtml\"| xml:lang="[^\"]*\"/', '', $html_doctype);
+
+
+    //     // <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    //     // to this --> <meta charset="utf-8" />
+
+    //     $html_doctype = preg_replace('/<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=(.*[a-z0-9-])\" \/>/i', '<meta charset="\1" />', $html_doctype);
+
+    //     $html = $html_doctype . "\n" . $html_doc;
+    //     nlog($html);
+
+    // }
 }
\ No newline at end of file
diff --git a/tests/Integration/Einvoice/samples/peppol.xslt b/tests/Integration/Einvoice/samples/peppol.xslt
new file mode 100644
index 00000000000..a59fcc1404e
--- /dev/null
+++ b/tests/Integration/Einvoice/samples/peppol.xslt
@@ -0,0 +1,1848 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xsl:stylesheet xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+                xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+                xmlns:iso="http://purl.oclc.org/dsdl/schematron"
+                xmlns:saxon="http://saxon.sf.net/"
+                xmlns:schold="http://www.ascc.net/xml/schematron"
+                xmlns:u="utils"
+                xmlns:ubl-creditnote="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2"
+                xmlns:ubl-invoice="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+                xmlns:xhtml="http://www.w3.org/1999/xhtml"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0"><!--Implementers: please note that overriding process-prolog or process-root is 
+    the preferred method for meta-stylesheets to use where possible. -->
+   <xsl:param name="archiveDirParameter"/>
+   <xsl:param name="archiveNameParameter"/>
+   <xsl:param name="fileNameParameter"/>
+   <xsl:param name="fileDirParameter"/>
+   <xsl:variable name="document-uri">
+      <xsl:value-of select="document-uri(/)"/>
+   </xsl:variable>
+   <!--PHASES-->
+   <!--PROLOG-->
+   <!--XSD TYPES FOR XSLT2-->
+   <!--KEYS AND FUNCTIONS-->
+   <!-- <function xmlns="http://www.w3.org/1999/XSL/Transform"
+             name="u:gln"
+             as="xs:boolean">
+      <param name="val"/>
+      <variable name="length" select="string-length($val) - 1"/>
+      <variable name="digits"
+                select="reverse(for $i in string-to-codepoints(substring($val, 0, $length + 1)) return $i - 48)"/>
+      <variable name="weightedSum"
+                select="sum(for $i in (0 to $length - 1) return $digits[$i + 1] * (1 + ((($i + 1) mod 2) * 2)))"/>
+      <value-of select="(10 - ($weightedSum mod 10)) mod 10 = number(substring($val, $length + 1, 1))"/>
+   </function> -->
+   <!-- <function xmlns="http://www.w3.org/1999/XSL/Transform"
+             name="u:slack"
+             as="xs:boolean">
+      <param name="exp" as="xs:decimal"/>
+      <param name="val" as="xs:decimal"/>
+      <param name="slack" as="xs:decimal"/>
+      <value-of select="xs:decimal($exp + $slack) &gt;= $val and xs:decimal($exp - $slack) &lt;= $val"/>
+   </function> -->
+   <!-- <function xmlns="http://www.w3.org/1999/XSL/Transform"
+             name="u:mod11"
+             as="xs:boolean">
+      <param name="val"/>
+      <variable name="length" select="string-length($val) - 1"/>
+      <variable name="digits"
+                select="reverse(for $i in string-to-codepoints(substring($val, 0, $length + 1)) return $i - 48)"/>
+      <variable name="weightedSum"
+                select="sum(for $i in (0 to $length - 1) return $digits[$i + 1] * (($i mod 6) + 2))"/>
+      <value-of select="number($val) &gt; 0 and (11 - ($weightedSum mod 11)) mod 11 = number(substring($val, $length + 1, 1))"/>
+   </function> -->
+   <!-- <function xmlns="http://www.w3.org/1999/XSL/Transform"
+             name="u:mod97-0208"
+             as="xs:boolean">
+      <param name="val"/>
+      <variable name="checkdigits" select="substring($val,9,2)"/>
+      <variable name="calculated_digits"
+                select="xs:string(97 - (xs:integer(substring($val,1,8)) mod 97))"/>
+      <value-of select="number($checkdigits) = number($calculated_digits)"/>
+   </function> -->
+   <!-- <function xmlns="http://www.w3.org/1999/XSL/Transform"
+             name="u:checkCodiceIPA"
+             as="xs:boolean">
+      <param name="arg" as="xs:string?"/>
+      <variable name="allowed-characters">
+      ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789</variable>
+      <sequence select="if ( (string-length(translate($arg, $allowed-characters, '')) = 0) and (string-length($arg) = 6) ) then true() else false()"/>
+   </function> -->
+   <function xmlns="http://www.w3.org/1999/XSL/Transform"
+             name="u:checkCF"
+             as="xs:boolean">
+      <param name="arg" as="xs:string?"/>
+      <sequence select="   if ( (string-length($arg) = 16) or (string-length($arg) = 11) )      then    (    if ((string-length($arg) = 16))     then    (     if (u:checkCF16($arg))      then     (      true()     )     else     (      false()     )    )    else    (     if(($arg castable as xs:integer)) then true() else false()       )   )   else   (    false()   )   "/>
+   </function>
+   <function xmlns="http://www.w3.org/1999/XSL/Transform"
+             name="u:checkCF16"
+             as="xs:boolean">
+      <param name="arg" as="xs:string?"/>
+      <variable name="allowed-characters">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz</variable>
+      <sequence select="     if (  (string-length(translate(substring($arg,1,6), $allowed-characters, '')) = 0) and         (substring($arg,7,2) castable as xs:integer) and        (string-length(translate(substring($arg,9,1), $allowed-characters, '')) = 0) and        (substring($arg,10,2) castable as xs:integer) and         (substring($arg,12,3) castable as xs:string) and        (substring($arg,15,1) castable as xs:integer) and         (string-length(translate(substring($arg,16,1), $allowed-characters, '')) = 0)      )      then true()     else false()     "/>
+   </function>
+   <function xmlns="http://www.w3.org/1999/XSL/Transform"
+             name="u:checkPIVAseIT"
+             as="xs:boolean">
+      <param name="arg" as="xs:string"/>
+      <variable name="paese" select="substring($arg,1,2)"/>
+      <variable name="codice" select="substring($arg,3)"/>
+      <sequence select="     if ( $paese = 'IT' or $paese = 'it' )    then    (     if ( ( string-length($codice) = 11 ) and ( if (u:checkPIVA($codice)!=0) then false() else true() ))     then     (      true()     )     else     (      false()     )    )    else    (     true()    )      "/>
+   </function>
+   <function xmlns="http://www.w3.org/1999/XSL/Transform"
+             name="u:checkPIVA"
+             as="xs:integer">
+      <param name="arg" as="xs:string?"/>
+      <sequence select="     if (not($arg castable as xs:integer))       then 1      else ( u:addPIVA($arg,xs:integer(0)) mod 10 )"/>
+   </function>
+   <function xmlns="http://www.w3.org/1999/XSL/Transform"
+             name="u:addPIVA"
+             as="xs:integer">
+      <param name="arg" as="xs:string"/>
+      <param name="pari" as="xs:integer"/>
+      <variable name="tappo"
+                select="if (not($arg castable as xs:integer)) then 0 else 1"/>
+      <variable name="mapper"
+                select="if ($tappo = 0) then 0 else                    ( if ($pari = 1)                     then ( xs:integer(substring('0246813579', ( xs:integer(substring($arg,1,1)) +1 ) ,1)) )                     else ( xs:integer(substring($arg,1,1) ) )                   )"/>
+      <sequence select="if ($tappo = 0) then $mapper else ( xs:integer($mapper) + u:addPIVA(substring(xs:string($arg),2), (if($pari=0) then 1 else 0) ) )"/>
+   </function>
+   <function xmlns="http://www.w3.org/1999/XSL/Transform"
+             name="u:abn"
+             as="xs:boolean">
+      <param name="val"/>
+      <value-of select="( ((string-to-codepoints(substring($val,1,1)) - 49) * 10) + ((string-to-codepoints(substring($val,2,1)) - 48) * 1) + ((string-to-codepoints(substring($val,3,1)) - 48) * 3) + ((string-to-codepoints(substring($val,4,1)) - 48) * 5) + ((string-to-codepoints(substring($val,5,1)) - 48) * 7) + ((string-to-codepoints(substring($val,6,1)) - 48) * 9) + ((string-to-codepoints(substring($val,7,1)) - 48) * 11) + ((string-to-codepoints(substring($val,8,1)) - 48) * 13) + ((string-to-codepoints(substring($val,9,1)) - 48) * 15) + ((string-to-codepoints(substring($val,10,1)) - 48) * 17) + ((string-to-codepoints(substring($val,11,1)) - 48) * 19)) mod 89 = 0 "/>
+   </function>
+   <function xmlns="http://www.w3.org/1999/XSL/Transform"
+             name="u:TinVerification"
+             as="xs:boolean">
+      <param name="val" as="xs:string"/>
+      <variable name="digits"
+                select="    for $ch in string-to-codepoints($val)    return codepoints-to-string($ch)"/>
+      <variable name="checksum"
+                select="    (number($digits[8])*2) +    (number($digits[7])*4) +    (number($digits[6])*8) +    (number($digits[5])*16) +    (number($digits[4])*32) +    (number($digits[3])*64) +    (number($digits[2])*128) +    (number($digits[1])*256) "/>
+      <value-of select="($checksum  mod 11) mod 10 = number($digits[9])"/>
+   </function>
+   <function xmlns="http://www.w3.org/1999/XSL/Transform"
+             name="u:checkSEOrgnr"
+             as="xs:boolean">
+      <param name="number" as="xs:string"/>
+      <choose>
+      <!-- Check if input is numeric -->
+         <when test="not(matches($number, '^\d+$'))">
+            <sequence select="false()"/>
+         </when>
+         <otherwise>
+        <!-- verify the check number of the provided identifier according to the Luhn algorithm-->
+            <variable name="mainPart" select="substring($number, 1, 9)"/>
+            <variable name="checkDigit" select="substring($number, 10, 1)"/>
+            <variable name="sum" as="xs:integer">
+               <value-of select="sum(       for $pos in 1 to string-length($mainPart) return         if ($pos mod 2 = 1)         then (number(substring($mainPart, string-length($mainPart) - $pos + 1, 1)) * 2) mod 10 +           (number(substring($mainPart, string-length($mainPart) - $pos + 1, 1)) * 2) idiv 10         else number(substring($mainPart, string-length($mainPart) - $pos + 1, 1))      )"/>
+            </variable>
+            <variable name="calculatedCheckDigit" select="(10 - $sum mod 10) mod 10"/>
+            <sequence select="$calculatedCheckDigit = number($checkDigit)"/>
+         </otherwise>
+      </choose>
+   </function>
+   <!--DEFAULT RULES-->
+   <!--MODE: SCHEMATRON-SELECT-FULL-PATH-->
+   <!--This mode can be used to generate an ugly though full XPath for locators-->
+   <xsl:template match="*" mode="schematron-select-full-path">
+      <xsl:apply-templates select="." mode="schematron-get-full-path"/>
+   </xsl:template>
+   <!--MODE: SCHEMATRON-FULL-PATH-->
+   <!--This mode can be used to generate an ugly though full XPath for locators-->
+   <xsl:template match="*" mode="schematron-get-full-path">
+      <xsl:apply-templates select="parent::*" mode="schematron-get-full-path"/>
+      <xsl:text>/</xsl:text>
+      <xsl:choose>
+         <xsl:when test="namespace-uri()=''">
+            <xsl:value-of select="name()"/>
+         </xsl:when>
+         <xsl:otherwise>
+            <xsl:text>*:</xsl:text>
+            <xsl:value-of select="local-name()"/>
+            <xsl:text>[namespace-uri()='</xsl:text>
+            <xsl:value-of select="namespace-uri()"/>
+            <xsl:text>']</xsl:text>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:variable name="preceding"
+                    select="count(preceding-sibling::*[local-name()=local-name(current())                                   and namespace-uri() = namespace-uri(current())])"/>
+      <xsl:text>[</xsl:text>
+      <xsl:value-of select="1+ $preceding"/>
+      <xsl:text>]</xsl:text>
+   </xsl:template>
+   <xsl:template match="@*" mode="schematron-get-full-path">
+      <xsl:apply-templates select="parent::*" mode="schematron-get-full-path"/>
+      <xsl:text>/</xsl:text>
+      <xsl:choose>
+         <xsl:when test="namespace-uri()=''">@<xsl:value-of select="name()"/>
+         </xsl:when>
+         <xsl:otherwise>
+            <xsl:text>@*[local-name()='</xsl:text>
+            <xsl:value-of select="local-name()"/>
+            <xsl:text>' and namespace-uri()='</xsl:text>
+            <xsl:value-of select="namespace-uri()"/>
+            <xsl:text>']</xsl:text>
+         </xsl:otherwise>
+      </xsl:choose>
+   </xsl:template>
+   <!--MODE: SCHEMATRON-FULL-PATH-2-->
+   <!--This mode can be used to generate prefixed XPath for humans-->
+   <xsl:template match="node() | @*" mode="schematron-get-full-path-2">
+      <xsl:for-each select="ancestor-or-self::*">
+         <xsl:text>/</xsl:text>
+         <xsl:value-of select="name(.)"/>
+         <xsl:if test="preceding-sibling::*[name(.)=name(current())]">
+            <xsl:text>[</xsl:text>
+            <xsl:value-of select="count(preceding-sibling::*[name(.)=name(current())])+1"/>
+            <xsl:text>]</xsl:text>
+         </xsl:if>
+      </xsl:for-each>
+      <xsl:if test="not(self::*)">
+         <xsl:text/>/@<xsl:value-of select="name(.)"/>
+      </xsl:if>
+   </xsl:template>
+   <!--MODE: SCHEMATRON-FULL-PATH-3-->
+   <!--This mode can be used to generate prefixed XPath for humans 
+	(Top-level element has index)-->
+   <xsl:template match="node() | @*" mode="schematron-get-full-path-3">
+      <xsl:for-each select="ancestor-or-self::*">
+         <xsl:text>/</xsl:text>
+         <xsl:value-of select="name(.)"/>
+         <xsl:if test="parent::*">
+            <xsl:text>[</xsl:text>
+            <xsl:value-of select="count(preceding-sibling::*[name(.)=name(current())])+1"/>
+            <xsl:text>]</xsl:text>
+         </xsl:if>
+      </xsl:for-each>
+      <xsl:if test="not(self::*)">
+         <xsl:text/>/@<xsl:value-of select="name(.)"/>
+      </xsl:if>
+   </xsl:template>
+   <!--MODE: GENERATE-ID-FROM-PATH -->
+   <xsl:template match="/" mode="generate-id-from-path"/>
+   <xsl:template match="text()" mode="generate-id-from-path">
+      <xsl:apply-templates select="parent::*" mode="generate-id-from-path"/>
+      <xsl:value-of select="concat('.text-', 1+count(preceding-sibling::text()), '-')"/>
+   </xsl:template>
+   <xsl:template match="comment()" mode="generate-id-from-path">
+      <xsl:apply-templates select="parent::*" mode="generate-id-from-path"/>
+      <xsl:value-of select="concat('.comment-', 1+count(preceding-sibling::comment()), '-')"/>
+   </xsl:template>
+   <xsl:template match="processing-instruction()" mode="generate-id-from-path">
+      <xsl:apply-templates select="parent::*" mode="generate-id-from-path"/>
+      <xsl:value-of select="concat('.processing-instruction-', 1+count(preceding-sibling::processing-instruction()), '-')"/>
+   </xsl:template>
+   <xsl:template match="@*" mode="generate-id-from-path">
+      <xsl:apply-templates select="parent::*" mode="generate-id-from-path"/>
+      <xsl:value-of select="concat('.@', name())"/>
+   </xsl:template>
+   <xsl:template match="*" mode="generate-id-from-path" priority="-0.5">
+      <xsl:apply-templates select="parent::*" mode="generate-id-from-path"/>
+      <xsl:text>.</xsl:text>
+      <xsl:value-of select="concat('.',name(),'-',1+count(preceding-sibling::*[name()=name(current())]),'-')"/>
+   </xsl:template>
+   <!--MODE: GENERATE-ID-2 -->
+   <xsl:template match="/" mode="generate-id-2">U</xsl:template>
+   <xsl:template match="*" mode="generate-id-2" priority="2">
+      <xsl:text>U</xsl:text>
+      <xsl:number level="multiple" count="*"/>
+   </xsl:template>
+   <xsl:template match="node()" mode="generate-id-2">
+      <xsl:text>U.</xsl:text>
+      <xsl:number level="multiple" count="*"/>
+      <xsl:text>n</xsl:text>
+      <xsl:number count="node()"/>
+   </xsl:template>
+   <xsl:template match="@*" mode="generate-id-2">
+      <xsl:text>U.</xsl:text>
+      <xsl:number level="multiple" count="*"/>
+      <xsl:text>_</xsl:text>
+      <xsl:value-of select="string-length(local-name(.))"/>
+      <xsl:text>_</xsl:text>
+      <xsl:value-of select="translate(name(),':','.')"/>
+   </xsl:template>
+   <!--Strip characters-->
+   <xsl:template match="text()" priority="-1"/>
+   <!--SCHEMA SETUP-->
+   <xsl:template match="/">
+      <xsl:apply-templates select="/" mode="M24"/>
+      <xsl:apply-templates select="/" mode="M25"/>
+      <xsl:apply-templates select="/" mode="M26"/>
+      <xsl:apply-templates select="/" mode="M27"/>
+      <xsl:apply-templates select="/" mode="M28"/>
+      <xsl:apply-templates select="/" mode="M29"/>
+      <xsl:apply-templates select="/" mode="M30"/>
+      <xsl:apply-templates select="/" mode="M35"/>
+      <xsl:apply-templates select="/" mode="M36"/>
+      <xsl:apply-templates select="/" mode="M37"/>
+      <xsl:apply-templates select="/" mode="M38"/>
+      <xsl:apply-templates select="/" mode="M39"/>
+   </xsl:template>
+   <!--SCHEMATRON PATTERNS-->
+   <xsl:param name="profile"
+              select="       if (/*/cbc:ProfileID and matches(normalize-space(/*/cbc:ProfileID), 'urn:fdc:peppol.eu:2017:poacc:billing:([0-9]{2}):1.0')) then         tokenize(normalize-space(/*/cbc:ProfileID), ':')[7]       else         'Unknown'"/>
+   <xsl:param name="supplierCountry"
+              select="       if (/*/cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)) then         upper-case(normalize-space(/*/cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)))       else         if (/*/cac:TaxRepresentativeParty/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)) then           upper-case(normalize-space(/*/cac:TaxRepresentativeParty/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)))         else           if (/*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode) then             upper-case(normalize-space(/*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode))           else             'XX'"/>
+   <xsl:param name="customerCountry"
+              select="   if (/*/cac:AccountingCustomerParty/cac:Party/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)) then   upper-case(normalize-space(/*/cac:AccountingCustomerParty/cac:Party/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)))   else   if (/*/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode) then   upper-case(normalize-space(/*/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode))   else   'XX'"/>
+   <xsl:param name="documentCurrencyCode" select="/*/cbc:DocumentCurrencyCode"/>
+   <!--PATTERN -->
+   <!--RULE -->
+   <xsl:template match="//*[not(*) and not(normalize-space())]"
+                 priority="1000"
+                 mode="M24">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="false()"/>
+         <xsl:otherwise>Document MUST not contain empty
+        elements.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M24"/>
+   </xsl:template>
+   <xsl:template match="text()" priority="-1" mode="M24"/>
+   <xsl:template match="@*|node()" priority="-2" mode="M24">
+      <xsl:apply-templates select="*" mode="M24"/>
+   </xsl:template>
+   <!--PATTERN -->
+   <!--RULE -->
+   <xsl:template match="ubl-creditnote:CreditNote" priority="1000" mode="M25">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="(count(cac:AdditionalDocumentReference[cbc:DocumentTypeCode='50']) &lt;= 1)"/>
+         <xsl:otherwise>Only one project reference is allowed on document level<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M25"/>
+   </xsl:template>
+   <xsl:template match="text()" priority="-1" mode="M25"/>
+   <xsl:template match="@*|node()" priority="-2" mode="M25">
+      <xsl:apply-templates select="*" mode="M25"/>
+   </xsl:template>
+   <!--PATTERN -->
+   <!--RULE -->
+   <xsl:template match="ubl-creditnote:CreditNote | ubl-invoice:Invoice"
+                 priority="1023"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="cbc:ProfileID"/>
+         <xsl:otherwise>Business process MUST be
+        provided.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="$profile != 'Unknown'"/>
+         <xsl:otherwise>Business process
+        MUST be in the format 'urn:fdc:peppol.eu:2017:poacc:billing:NN:1.0' where NN indicates the
+        process number.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="count(cbc:Note) &lt;= 1"/>
+         <xsl:otherwise>No more than one
+        note is allowed on document level.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="cbc:BuyerReference or cac:OrderReference/cbc:ID"/>
+         <xsl:otherwise>A buyer reference or purchase order reference MUST be provided.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="starts-with(normalize-space(cbc:CustomizationID/text()), 'urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0')"/>
+         <xsl:otherwise>Specification identifier MUST have the value
+        'urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0'.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="count(cac:TaxTotal[cac:TaxSubtotal]) = 1"/>
+         <xsl:otherwise>Only
+        one tax total with tax subtotals MUST be provided.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="count(cac:TaxTotal[not(cac:TaxSubtotal)]) = (if (cbc:TaxCurrencyCode) then 1 else 0)"/>
+         <xsl:otherwise>Only one tax total without tax subtotals MUST be provided when tax currency
+        code is provided.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not(cbc:TaxCurrencyCode) or (cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:TaxCurrencyCode)] &lt;= 0 and cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:DocumentCurrencyCode)] &lt;= 0) or (cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:TaxCurrencyCode)] &gt;= 0 and cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:DocumentCurrencyCode)] &gt;= 0) "/>
+         <xsl:otherwise>Invoice total VAT amount and Invoice total VAT amount in accounting currency
+        MUST have the same operational sign<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:TaxCurrencyCode" priority="1022" mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not(normalize-space(text()) = normalize-space(../cbc:DocumentCurrencyCode/text()))"/>
+         <xsl:otherwise>VAT accounting currency code MUST be different from invoice currency code when
+        provided.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AccountingCustomerParty/cac:Party"
+                 priority="1021"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="cbc:EndpointID"/>
+         <xsl:otherwise>Buyer electronic address
+        MUST be provided<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AccountingSupplierParty/cac:Party"
+                 priority="1020"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="cbc:EndpointID"/>
+         <xsl:otherwise>Seller electronic address
+        MUST be provided<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="ubl-invoice:Invoice/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)] | ubl-invoice:Invoice/cac:InvoiceLine/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)] | ubl-creditnote:CreditNote/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)] | ubl-creditnote:CreditNote/cac:CreditNoteLine/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)]"
+                 priority="1019"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="false()"/>
+         <xsl:otherwise>Allowance/charge base amount MUST
+        be provided when allowance/charge percentage is provided.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="ubl-invoice:Invoice/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount] | ubl-invoice:Invoice/cac:InvoiceLine/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount] | ubl-creditnote:CreditNote/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount] | ubl-creditnote:CreditNote/cac:CreditNoteLine/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount]"
+                 priority="1018"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="false()"/>
+         <xsl:otherwise>Allowance/charge percentage MUST
+        be provided when allowance/charge base amount is provided.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="ubl-invoice:Invoice/cac:AllowanceCharge | ubl-invoice:Invoice/cac:InvoiceLine/cac:AllowanceCharge | ubl-creditnote:CreditNote/cac:AllowanceCharge | ubl-creditnote:CreditNote/cac:CreditNoteLine/cac:AllowanceCharge"
+                 priority="1017"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="           not(cbc:MultiplierFactorNumeric and cbc:BaseAmount) or u:slack(if (cbc:Amount) then             cbc:Amount           else             0, (xs:decimal(cbc:BaseAmount) * xs:decimal(cbc:MultiplierFactorNumeric)) div 100, 0.02)"/>
+         <xsl:otherwise>Allowance/charge amount must equal base amount * percentage/100 if base amount
+        and percentage exists<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="normalize-space(cbc:ChargeIndicator/text()) = 'true' or normalize-space(cbc:ChargeIndicator/text()) = 'false'"/>
+         <xsl:otherwise>Allowance/charge ChargeIndicator value MUST equal 'true' or 'false'<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="         cac:PaymentMeans[some $code in tokenize('49 59', '\s')           satisfies normalize-space(cbc:PaymentMeansCode) = $code]"
+                 priority="1016"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="cac:PaymentMandate/cbc:ID"/>
+         <xsl:otherwise>Mandate
+        reference MUST be provided for direct debit.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:Amount | cbc:BaseAmount | cbc:PriceAmount | cac:TaxTotal[cac:TaxSubtotal]/cbc:TaxAmount | cbc:TaxableAmount | cbc:LineExtensionAmount | cbc:TaxExclusiveAmount | cbc:TaxInclusiveAmount | cbc:AllowanceTotalAmount | cbc:ChargeTotalAmount | cbc:PrepaidAmount | cbc:PayableRoundingAmount | cbc:PayableAmount"
+                 priority="1015"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="@currencyID = $documentCurrencyCode"/>
+         <xsl:otherwise>All
+        currencyID attributes must have the same value as the invoice currency code (BT-5), except
+        for the invoice total VAT amount in accounting currency (BT-111).<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="ubl-invoice:Invoice[cac:InvoicePeriod/cbc:StartDate]/cac:InvoiceLine/cac:InvoicePeriod/cbc:StartDate | ubl-creditnote:CreditNote[cac:InvoicePeriod/cbc:StartDate]/cac:CreditNoteLine/cac:InvoicePeriod/cbc:StartDate"
+                 priority="1014"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="xs:date(text()) &gt;= xs:date(../../../cac:InvoicePeriod/cbc:StartDate)"/>
+         <xsl:otherwise>Start
+        date of line period MUST be within invoice period.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="ubl-invoice:Invoice[cac:InvoicePeriod/cbc:EndDate]/cac:InvoiceLine/cac:InvoicePeriod/cbc:EndDate | ubl-creditnote:CreditNote[cac:InvoicePeriod/cbc:EndDate]/cac:CreditNoteLine/cac:InvoicePeriod/cbc:EndDate"
+                 priority="1013"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="xs:date(text()) &lt;= xs:date(../../../cac:InvoicePeriod/cbc:EndDate)"/>
+         <xsl:otherwise>End
+        date of line period MUST be within invoice period.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:InvoiceLine | cac:CreditNoteLine"
+                 priority="1012"
+                 mode="M26">
+      <xsl:variable name="lineExtensionAmount"
+                    select="           if (cbc:LineExtensionAmount) then             xs:decimal(cbc:LineExtensionAmount)           else             0"/>
+      <xsl:variable name="quantity"
+                    select="           if (/ubl-invoice:Invoice) then             (if (cbc:InvoicedQuantity) then               xs:decimal(cbc:InvoicedQuantity)             else               1)           else             (if (cbc:CreditedQuantity) then               xs:decimal(cbc:CreditedQuantity)             else               1)"/>
+      <xsl:variable name="priceAmount"
+                    select="           if (cac:Price/cbc:PriceAmount) then             xs:decimal(cac:Price/cbc:PriceAmount)           else             0"/>
+      <xsl:variable name="baseQuantity"
+                    select="           if (cac:Price/cbc:BaseQuantity and xs:decimal(cac:Price/cbc:BaseQuantity) != 0) then             xs:decimal(cac:Price/cbc:BaseQuantity)           else             1"/>
+      <xsl:variable name="allowancesTotal"
+                    select="           if (cac:AllowanceCharge[normalize-space(cbc:ChargeIndicator) = 'false']) then             round(sum(cac:AllowanceCharge[normalize-space(cbc:ChargeIndicator) = 'false']/cbc:Amount/xs:decimal(.)) * 10 * 10) div 100           else             0"/>
+      <xsl:variable name="chargesTotal"
+                    select="           if (cac:AllowanceCharge[normalize-space(cbc:ChargeIndicator) = 'true']) then             round(sum(cac:AllowanceCharge[normalize-space(cbc:ChargeIndicator) = 'true']/cbc:Amount/xs:decimal(.)) * 10 * 10) div 100           else             0"/>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="u:slack($lineExtensionAmount, ($quantity * ($priceAmount div $baseQuantity)) + $chargesTotal - $allowancesTotal, 0.02)"/>
+         <xsl:otherwise>Invoice line net amount MUST equal (Invoiced quantity * (Item net price/item
+        price base quantity) + Sum of invoice line charge amount - sum of invoice line allowance
+        amount<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not(cac:Price/cbc:BaseQuantity) or xs:decimal(cac:Price/cbc:BaseQuantity) &gt; 0"/>
+         <xsl:otherwise>Base quantity MUST be a positive number above zero.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="(count(cac:DocumentReference) &lt;= 1)"/>
+         <xsl:otherwise>Only
+        one invoiced object is allowed pr line<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="(not(cac:DocumentReference) or (cac:DocumentReference/cbc:DocumentTypeCode='130'))"/>
+         <xsl:otherwise>Element Document reference can only be used for Invoice line object<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:Price/cac:AllowanceCharge" priority="1011" mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="normalize-space(cbc:ChargeIndicator) = 'false'"/>
+         <xsl:otherwise>Charge on price level is NOT allowed. Only value 'false' allowed.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not(cbc:BaseAmount) or xs:decimal(../cbc:PriceAmount) = xs:decimal(cbc:BaseAmount) - xs:decimal(cbc:Amount)"/>
+         <xsl:otherwise>Item net price MUST equal (Gross price - Allowance amount) when gross price is
+        provided.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:Price/cbc:BaseQuantity[@unitCode]"
+                 priority="1010"
+                 mode="M26">
+      <xsl:variable name="hasQuantity"
+                    select="../../cbc:InvoicedQuantity or ../../cbc:CreditedQuantity"/>
+      <xsl:variable name="quantity"
+                    select="           if (/ubl-invoice:Invoice) then             ../../cbc:InvoicedQuantity           else             ../../cbc:CreditedQuantity"/>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not($hasQuantity) or @unitCode = $quantity/@unitCode"/>
+         <xsl:otherwise>Unit code of price base quantity MUST be same as invoiced quantity.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:EndpointID[@schemeID = '0088'] | cac:PartyIdentification/cbc:ID[@schemeID = '0088'] | cbc:CompanyID[@schemeID = '0088']"
+                 priority="1009"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="matches(normalize-space(), '^[0-9]+$') and u:gln(normalize-space())"/>
+         <xsl:otherwise>GLN
+        must have a valid format according to GS1 rules.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:EndpointID[@schemeID = '0192'] | cac:PartyIdentification/cbc:ID[@schemeID = '0192'] | cbc:CompanyID[@schemeID = '0192']"
+                 priority="1008"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="matches(normalize-space(), '^[0-9]{9}$') and u:mod11(normalize-space())"/>
+         <xsl:otherwise>Norwegian
+        organization number MUST be stated in the correct format.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:EndpointID[@schemeID = '0184'] | cac:PartyIdentification/cbc:ID[@schemeID = '0184'] | cbc:CompanyID[@schemeID = '0184']"
+                 priority="1007"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="(string-length(text()) = 10) and (substring(text(), 1, 2) = 'DK') and (string-length(translate(substring(text(), 3, 8), '1234567890', '')) = 0)"/>
+         <xsl:otherwise>Danish organization number (CVR) MUST be stated in the correct format.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:EndpointID[@schemeID = '0208'] | cac:PartyIdentification/cbc:ID[@schemeID = '0208'] | cbc:CompanyID[@schemeID = '0208']"
+                 priority="1006"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="matches(normalize-space(), '^[0-9]{10}$') and u:mod97-0208(normalize-space())"/>
+         <xsl:otherwise>Belgian enterprise number MUST be stated in the correct format.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:EndpointID[@schemeID = '0201'] | cac:PartyIdentification/cbc:ID[@schemeID = '0201'] | cbc:CompanyID[@schemeID = '0201']"
+                 priority="1005"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="u:checkCodiceIPA(normalize-space())"/>
+         <xsl:otherwise>IPA
+        Code (Codice Univoco Unità Organizzativa) must be stated in the correct format<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:EndpointID[@schemeID = '0210'] | cac:PartyIdentification/cbc:ID[@schemeID = '0210'] | cbc:CompanyID[@schemeID = '0210']"
+                 priority="1004"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="u:checkCF(normalize-space())"/>
+         <xsl:otherwise>Tax Code
+        (Codice Fiscale) must be stated in the correct format<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:EndpointID[@schemeID = '9907']"
+                 priority="1003"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="u:checkCF(normalize-space())"/>
+         <xsl:otherwise>Tax Code
+        (Codice Fiscale) must be stated in the correct format<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:EndpointID[@schemeID = '0211'] | cac:PartyIdentification/cbc:ID[@schemeID = '0211'] | cbc:CompanyID[@schemeID = '0211']"
+                 priority="1002"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="u:checkPIVAseIT(normalize-space())"/>
+         <xsl:otherwise>Italian
+        VAT Code (Partita Iva) must be stated in the correct format<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:EndpointID[@schemeID = '0007'] | cac:PartyIdentification/cbc:ID[@schemeID = '0007'] | cbc:CompanyID[@schemeID = '0007']"
+                 priority="1001"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string-length(normalize-space()) = 10 and string(number(normalize-space())) != 'NaN' and u:checkSEOrgnr(normalize-space())"/>
+         <xsl:otherwise>Swedish organization number MUST be stated in the correct format.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:EndpointID[@schemeID = '0151'] | cac:PartyIdentification/cbc:ID[@schemeID = '0151'] | cbc:CompanyID[@schemeID = '0151']"
+                 priority="1000"
+                 mode="M26">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="matches(normalize-space(), '^[0-9]{11}$') and u:abn(normalize-space())"/>
+         <xsl:otherwise>Australian
+        Business Number (ABN) MUST be stated in the correct format.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <xsl:template match="text()" priority="-1" mode="M26"/>
+   <xsl:template match="@*|node()" priority="-2" mode="M26">
+      <xsl:apply-templates select="*" mode="M26"/>
+   </xsl:template>
+   <!--PATTERN -->
+   <!--RULE -->
+   <xsl:template match="cac:AccountingSupplierParty/cac:Party[$supplierCountry = 'NO']"
+                 priority="1000"
+                 mode="M27">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="normalize-space(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'TAX']/cbc:CompanyID) = 'Foretaksregisteret'"/>
+         <xsl:otherwise>For Norwegian suppliers, most invoice issuers are required to append
+        "Foretaksregisteret" to their
+        invoice. "Dersom selger er aksjeselskap, allmennaksjeselskap eller filial av utenlandsk
+        selskap skal også ordet «Foretaksregisteret» fremgå av salgsdokumentet, jf.
+        foretaksregisterloven § 10-2."<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/substring(cbc:CompanyID, 1, 2)='NO' and matches(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/substring(cbc:CompanyID,3), '^[0-9]{9}MVA$')           and u:mod11(substring(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID, 3, 9)) or not(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/substring(cbc:CompanyID, 1, 2)='NO')"/>
+         <xsl:otherwise>For Norwegian suppliers, a VAT number MUST be the country code prefix NO
+        followed by a valid Norwegian organization number (nine numbers) followed by the letters
+        MVA.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M27"/>
+   </xsl:template>
+   <xsl:template match="text()" priority="-1" mode="M27"/>
+   <xsl:template match="@*|node()" priority="-2" mode="M27">
+      <xsl:apply-templates select="*" mode="M27"/>
+   </xsl:template>
+   <!--PATTERN -->
+   <xsl:variable name="DKSupplierCountry"
+                 select="concat(ubl-creditnote:CreditNote/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode, ubl-invoice:Invoice/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)"/>
+   <xsl:variable name="DKCustomerCountry"
+                 select="concat(ubl-creditnote:CreditNote/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode, ubl-invoice:Invoice/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)"/>
+   <!--RULE -->
+   <xsl:template match="ubl-creditnote:CreditNote[$DKSupplierCountry = 'DK'] | ubl-invoice:Invoice[$DKSupplierCountry = 'DK']"
+                 priority="1004"
+                 mode="M28">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="(normalize-space(cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID/text()) != '')"/>
+         <xsl:otherwise>Danish suppliers MUST provide legal entity (CVR-number)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not(((boolean(cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID))           and (normalize-space(cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID/@schemeID) != '0184'))       )"/>
+         <xsl:otherwise>For Danish Suppliers it is mandatory to specify schemeID as "0184" (DK
+        CVR-number) when PartyLegalEntity/CompanyID is used for AccountingSupplierParty<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not((boolean(/ubl-creditnote:CreditNote) and ($DKCustomerCountry = 'DK'))       and (number(cac:LegalMonetaryTotal/cbc:PayableAmount/text()) &lt; 0)       )"/>
+         <xsl:otherwise>For Danish Suppliers, a Credit note cannot have a negative total
+        (PayableAmount)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M28"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="ubl-creditnote:CreditNote[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']/cac:AccountingSupplierParty/cac:Party/cac:PartyIdentification | ubl-creditnote:CreditNote[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']/cac:AccountingCustomerParty/cac:Party/cac:PartyIdentification | ubl-invoice:Invoice[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']/cac:AccountingSupplierParty/cac:Party/cac:PartyIdentification | ubl-invoice:Invoice[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']/cac:AccountingCustomerParty/cac:Party/cac:PartyIdentification"
+                 priority="1003"
+                 mode="M28">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not((boolean(cbc:ID))        and (normalize-space(cbc:ID/@schemeID) = '')       )"/>
+         <xsl:otherwise>For Danish Suppliers it is mandatory to use schemeID when
+        PartyIdentification/ID is used for AccountingCustomerParty or AccountingSupplierParty<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M28"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="ubl-invoice:Invoice[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']/cac:PaymentMeans"
+                 priority="1002"
+                 mode="M28">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="contains(' 1 10 31 42 48 49 50 58 59 93 97 ', concat(' ', cbc:PaymentMeansCode, ' '))"/>
+         <xsl:otherwise>For Danish suppliers the following Payment means codes are allowed: 1, 10, 31,
+        42, 48, 49, 50, 58, 59, 93 and 97<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not(((cbc:PaymentMeansCode = '31') or (cbc:PaymentMeansCode = '42'))       and not((normalize-space(cac:PayeeFinancialAccount/cbc:ID/text()) != '') and (normalize-space(cac:PayeeFinancialAccount/cac:FinancialInstitutionBranch/cbc:ID/text()) != ''))       )"/>
+         <xsl:otherwise>For Danish suppliers bank account and registration account is mandatory if
+        payment means is 31 or 42<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not((cbc:PaymentMeansCode = '49')       and not((normalize-space(cac:PaymentMandate/cbc:ID/text()) != '')           and (normalize-space(cac:PaymentMandate/cac:PayerFinancialAccount/cbc:ID/text()) != ''))       )"/>
+         <xsl:otherwise>For Danish suppliers PaymentMandate/ID and PayerFinancialAccount/ID are
+        mandatory when payment means is 49<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not((cbc:PaymentMeansCode = '50')       and not(((substring(cbc:PaymentID, 1, 3) = '01#')           or (substring(cbc:PaymentID, 1, 3) = '04#')           or (substring(cbc:PaymentID, 1, 3) = '15#'))         and (string-length(cac:PayeeFinancialAccount/cbc:ID/text()) = 7)         )       )"/>
+         <xsl:otherwise>For Danish Suppliers PaymentID is mandatory and MUST start with 01#, 04# or 15#
+        (kortartkode), and PayeeFinancialAccount/ID (Giro kontonummer) is mandatory and must be 7
+        characters long, when payment means equals 50 (Giro)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not((cbc:PaymentMeansCode = '50')       and ((substring(cbc:PaymentID, 1, 3) = '04#')          or (substring(cbc:PaymentID, 1, 3)  = '15#'))       and not(string-length(cbc:PaymentID) = 19)       )"/>
+         <xsl:otherwise>For Danish Suppliers if the PaymentID is prefixed with 04# or 15# the 16 digits
+        instruction Id must be added to the PaymentID eg. "04#1234567890123456" when Payment means
+        equals 50 (Giro)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not((cbc:PaymentMeansCode = '93')       and not(((substring(cbc:PaymentID, 1, 3) = '71#')           or (substring(cbc:PaymentID, 1, 3) = '73#')           or (substring(cbc:PaymentID, 1, 3) = '75#'))         and (string-length(cac:PayeeFinancialAccount/cbc:ID/text()) = 8)         )       )"/>
+         <xsl:otherwise>For Danish Suppliers the PaymentID is mandatory and MUST start with 71#, 73# or
+        75# (kortartkode) and PayeeFinancialAccount/ID (Kreditornummer) is mandatory and must be
+        exactly 8 characters long, when Payment means equals 93 (FIK)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not((cbc:PaymentMeansCode = '93')       and ((substring(cbc:PaymentID, 1, 3) = '71#')          or (substring(cbc:PaymentID, 1, 3)  = '75#'))       and not((string-length(cbc:PaymentID) = 18)          or (string-length(cbc:PaymentID) = 19))       )"/>
+         <xsl:otherwise>For Danish Suppliers if the PaymentID is prefixed with 71# or 75# the 15-16
+        digits instruction Id must be added to the PaymentID eg. "71#1234567890123456" when payment
+        Method equals 93 (FIK)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M28"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="ubl-creditnote:CreditNote[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']/cac:CreditNoteLine | ubl-invoice:Invoice[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']/cac:InvoiceLine"
+                 priority="1001"
+                 mode="M28">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not((cac:Item/cac:CommodityClassification/cbc:ItemClassificationCode/@listID = 'TST')       and not((cac:Item/cac:CommodityClassification/cbc:ItemClassificationCode/@listVersionID = '19.05.01')           or (cac:Item/cac:CommodityClassification/cbc:ItemClassificationCode/@listVersionID = '19.0501')           )       )"/>
+         <xsl:otherwise>If ItemClassification is provided from Danish suppliers, UNSPSC version
+        19.0501 should be used.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M28"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AllowanceCharge[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']"
+                 priority="1000"
+                 mode="M28">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="not((cbc:AllowanceChargeReasonCode = 'ZZZ')       and not((string-length(normalize-space(cbc:AllowanceChargeReason/text())) = 4)         and (number(cbc:AllowanceChargeReason) &gt;= 0)         and (number(cbc:AllowanceChargeReason) &lt;= 9999))       )"/>
+         <xsl:otherwise>When specifying non-VAT Taxes for Danish customers, Danish suppliers MUST use
+        the AllowanceChargeReasonCode="ZZZ" and the 4-digit Tax category MUST be specified in
+        AllowanceChargeReason<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M28"/>
+   </xsl:template>
+   <xsl:template match="text()" priority="-1" mode="M28"/>
+   <xsl:template match="@*|node()" priority="-2" mode="M28">
+      <xsl:apply-templates select="*" mode="M28"/>
+   </xsl:template>
+   <!--PATTERN -->
+   <!--RULE -->
+   <xsl:template match="cac:AccountingSupplierParty/cac:Party[$supplierCountry = 'IT']/cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) != 'VAT']"
+                 priority="1001"
+                 mode="M29">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="matches(normalize-space(cbc:CompanyID),'^[A-Z0-9]{11,16}$')"/>
+         <xsl:otherwise>[IT-R-001] BT-32 (Seller tax registration identifier) - For Italian suppliers
+        BT-32 minimum length 11 and maximum length shall be 16. Per i fornitori italiani il BT-32
+        deve avere una lunghezza tra 11 e 16 caratteri<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M29"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AccountingSupplierParty/cac:Party[$supplierCountry = 'IT']"
+                 priority="1000"
+                 mode="M29">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="cac:PostalAddress/cbc:StreetName"/>
+         <xsl:otherwise>[IT-R-002] BT-35
+        (Seller address line 1) - Italian suppliers MUST provide the postal address line 1 - I
+        fornitori italiani devono indicare l'indirizzo postale.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="cac:PostalAddress/cbc:CityName"/>
+         <xsl:otherwise>[IT-R-003] BT-37
+        (Seller city) - Italian suppliers MUST provide the postal address city - I fornitori
+        italiani devono indicare la città di residenza.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="cac:PostalAddress/cbc:PostalZone"/>
+         <xsl:otherwise>"&gt;[IT-R-004] BT-38
+        (Seller post code) - Italian suppliers MUST provide the postal address post code - I
+        fornitori italiani devono indicare il CAP di residenza.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M29"/>
+   </xsl:template>
+   <xsl:template match="text()" priority="-1" mode="M29"/>
+   <xsl:template match="@*|node()" priority="-2" mode="M29">
+      <xsl:apply-templates select="*" mode="M29"/>
+   </xsl:template>
+   <!--PATTERN -->
+   <!--RULE -->
+   <xsl:template match="//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE' and cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2) = 'SE']"
+                 priority="1007"
+                 mode="M30">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string-length(normalize-space(cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/cbc:CompanyID)) = 14"/>
+         <xsl:otherwise>For Swedish suppliers, Swedish VAT-numbers must consist of 14 characters.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string(number(substring(cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/cbc:CompanyID, 3, 12))) != 'NaN'"/>
+         <xsl:otherwise>For Swedish suppliers, the Swedish VAT-numbers must have the trailing 12
+        characters in numeric form<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M30"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="//cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity[../cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE' and cbc:CompanyID]"
+                 priority="1006"
+                 mode="M30">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string(number(cbc:CompanyID)) != 'NaN'"/>
+         <xsl:otherwise>Swedish
+        organisation numbers should be numeric.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string-length(normalize-space(cbc:CompanyID)) = 10"/>
+         <xsl:otherwise>Swedish
+        organisation numbers consist of 10 characters.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="u:checkSEOrgnr(normalize-space(cbc:CompanyID))"/>
+         <xsl:otherwise>The
+        last digit of a Swedish organization number must be valid according to the Luhn algorithm.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M30"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE' and exists(cac:PartyLegalEntity/cbc:CompanyID)]/cac:PartyTaxScheme[normalize-space(upper-case(cac:TaxScheme/cbc:ID)) != 'VAT']/cbc:CompanyID"
+                 priority="1005"
+                 mode="M30">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="normalize-space(upper-case(.)) = 'GODKÄND FÖR F-SKATT'"/>
+         <xsl:otherwise>For Swedish suppliers, when using Seller tax registration identifier, 'Godkänd
+        för F-skatt' must be stated<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M30"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="//cac:TaxCategory[//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE' and cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2) = 'SE'] and cbc:ID = 'S'] | //cac:ClassifiedTaxCategory[//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE' and cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2) = 'SE'] and cbc:ID = 'S']"
+                 priority="1004"
+                 mode="M30">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="number(cbc:Percent) = 25 or number(cbc:Percent) = 12 or number(cbc:Percent) = 6"/>
+         <xsl:otherwise>For Swedish suppliers, only standard VAT rate of 6, 12 or 25 are used<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M30"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="//cac:PaymentMeans[//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE'] and normalize-space(cbc:PaymentMeansCode) = '30' and normalize-space(cac:PayeeFinancialAccount/cac:FinancialInstitutionBranch/cbc:ID) = 'SE:PLUSGIRO']/cac:PayeeFinancialAccount/cbc:ID"
+                 priority="1003"
+                 mode="M30">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string(number(normalize-space(.))) != 'NaN'"/>
+         <xsl:otherwise>For
+        Swedish suppliers using Plusgiro, the Account ID must be numeric <xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string-length(normalize-space(.)) &gt;= 2 and string-length(normalize-space(.)) &lt;= 8"/>
+         <xsl:otherwise>For Swedish suppliers using Plusgiro, the Account ID must have 2-8 characters<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M30"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="//cac:PaymentMeans[//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE'] and normalize-space(cbc:PaymentMeansCode) = '30' and normalize-space(cac:PayeeFinancialAccount/cac:FinancialInstitutionBranch/cbc:ID) = 'SE:BANKGIRO']/cac:PayeeFinancialAccount/cbc:ID"
+                 priority="1002"
+                 mode="M30">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string(number(normalize-space(.))) != 'NaN'"/>
+         <xsl:otherwise>For
+        Swedish suppliers using Bankgiro, the Account ID must be numeric <xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string-length(normalize-space(.)) = 7 or string-length(normalize-space(.)) = 8"/>
+         <xsl:otherwise>For Swedish suppliers using Bankgiro, the Account ID must have 7-8 characters<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M30"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="//cac:PaymentMeans[//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE'] and (cbc:PaymentMeansCode = normalize-space('50') or cbc:PaymentMeansCode = normalize-space('56'))]"
+                 priority="1001"
+                 mode="M30">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="false()"/>
+         <xsl:otherwise>For Swedish suppliers using Swedish
+        Bankgiro or Plusgiro, the proper way to indicate this is to use Code 30 for PaymentMeans and
+        FinancialInstitutionBranch ID with code SE:BANKGIRO or SE:PLUSGIRO<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M30"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="//cac:PaymentMeans[//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE']  and //cac:AccountingCustomerParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE'] and (cbc:PaymentMeansCode = normalize-space('31'))]"
+                 priority="1000"
+                 mode="M30">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="false()"/>
+         <xsl:otherwise>For domestic transactions between Swedish
+        trading partners, credit transfer should be indicated by PaymentMeansCode="30"<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M30"/>
+   </xsl:template>
+   <xsl:template match="text()" priority="-1" mode="M30"/>
+   <xsl:template match="@*|node()" priority="-2" mode="M30">
+      <xsl:apply-templates select="*" mode="M30"/>
+   </xsl:template>
+   <xsl:param name="isGreekSender"
+              select="($supplierCountry ='GR') or ($supplierCountry ='EL')"/>
+   <xsl:param name="isGreekReceiver"
+              select="($customerCountry ='GR') or ($customerCountry ='EL')"/>
+   <xsl:param name="isGreekSenderandReceiver"
+              select="$isGreekSender and $isGreekReceiver"/>
+   <xsl:param name="accountingSupplierCountry"
+              select="     if (/*/cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)) then     upper-case(normalize-space(/*/cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)))     else     if (/*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode) then     upper-case(normalize-space(/*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode))     else     'XX'"/>
+   <!--PATTERN -->
+   <xsl:variable name="dateRegExp"
+                 select="'^(0?[1-9]|[12][0-9]|3[01])[-\\/ ]?(0?[1-9]|1[0-2])[-\\/ ]?(19|20)[0-9]{2}'"/>
+   <xsl:variable name="greekDocumentType"
+                 select="tokenize('1.1 1.6 2.1 2.4 5.1 5.2 ','\s')"/>
+   <xsl:variable name="tokenizedUblIssueDate" select="tokenize(/*/cbc:IssueDate,'-')"/>
+   <!--RULE -->
+   <xsl:template match="/ubl-invoice:Invoice/cbc:ID[$isGreekSender] | /ubl-creditnote:CreditNote/cbc:ID[$isGreekSender]"
+                 priority="1007"
+                 mode="M35">
+      <xsl:variable name="IdSegments" select="tokenize(.,'\|')"/>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="count($IdSegments) = 6"/>
+         <xsl:otherwise> When the Supplier is
+        Greek, the Invoice Id should consist of 6 segments<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string-length(normalize-space($IdSegments[1])) = 9                                   and u:TinVerification($IdSegments[1])                                  and ($IdSegments[1] = /*/cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 3, 9)                                  or $IdSegments[1] = /*/cac:TaxRepresentativeParty/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 3, 9) )"/>
+         <xsl:otherwise>When the Supplier is Greek, the Invoice Id first segment must be a valid TIN
+        Number and match either the Supplier's or the Tax Representative's Tin Number<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:variable name="tokenizedIdDate" select="tokenize($IdSegments[2],'/')"/>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string-length(normalize-space($IdSegments[2]))&gt;0                                   and matches($IdSegments[2],$dateRegExp)                                  and ($tokenizedIdDate[1] = $tokenizedUblIssueDate[3]                                     and $tokenizedIdDate[2] = $tokenizedUblIssueDate[2]                                    and $tokenizedIdDate[3] = $tokenizedUblIssueDate[1])"/>
+         <xsl:otherwise>When the Supplier is Greek, the Invoice Id second segment must be a valid Date
+        that matches the invoice Issue Date<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string-length(normalize-space($IdSegments[3]))&gt;0 and string(number($IdSegments[3])) != 'NaN' and xs:integer($IdSegments[3]) &gt;= 0"/>
+         <xsl:otherwise>When Supplier is Greek, the Invoice Id third segment must be a positive integer<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string-length(normalize-space($IdSegments[4]))&gt;0 and (some $c in $greekDocumentType satisfies $IdSegments[4] = $c)"/>
+         <xsl:otherwise>When Supplier is Greek, the Invoice Id in the fourth segment must be a valid
+        greek document type<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string-length($IdSegments[5]) &gt; 0 "/>
+         <xsl:otherwise>When Supplier
+        is Greek, the Invoice Id fifth segment must not be empty<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string-length($IdSegments[6]) &gt; 0 "/>
+         <xsl:otherwise>When Supplier
+        is Greek, the Invoice Id sixth segment must not be empty<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M35"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AccountingSupplierParty[$isGreekSender]/cac:Party"
+                 priority="1006"
+                 mode="M35">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string-length(./cac:PartyName/cbc:Name)&gt;0"/>
+         <xsl:otherwise>Greek
+        Suppliers must provide their full name as they are registered in the Greek Business Registry
+        (G.E.MH.) as a legal entity or in the Tax Registry as a natural person <xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="count(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID)=1 and                             substring(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID,1,2) = 'EL' and                             u:TinVerification(substring(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID,3))"/>
+         <xsl:otherwise>Greek suppliers must provide their Seller Tax Registration Number, prefixed
+        by the country code<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M35"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AccountingSupplierParty[$isGreekSender]/cac:Party/cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID"
+                 priority="1005"
+                 mode="M35">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="substring(.,1,2) = 'EL' and u:TinVerification(substring(.,3))"/>
+         <xsl:otherwise>For the Greek Suppliers, the VAT must start with 'EL' and must be a valid TIN
+        number<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M35"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="/ubl-invoice:Invoice[$isGreekSender and ( /*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'GR')] | /ubl-creditnote:CreditNote[$isGreekSender and ( /*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'GR')]"
+                 priority="1004"
+                 mode="M35">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="count(cac:AdditionalDocumentReference[cbc:DocumentDescription = '##M.AR.K##'])=1"/>
+         <xsl:otherwise> When Supplier is Greek, there must be one MARK Number<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="count(cac:AdditionalDocumentReference[cbc:DocumentDescription = '##INVOICE|URL##'])=1"/>
+         <xsl:otherwise>
+        When Supplier is Greek, there should be one invoice url<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="(count(cac:AdditionalDocumentReference[cbc:DocumentDescription = '##INVOICE|URL##']) = 0 ) or (count(cac:AdditionalDocumentReference[cbc:DocumentDescription = '##INVOICE|URL##']) = 1 )"/>
+         <xsl:otherwise> When Supplier is Greek, there should be no more than one invoice url<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M35"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AdditionalDocumentReference[$isGreekSender and ( /*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'GR') and cbc:DocumentDescription = '##M.AR.K##']/cbc:ID"
+                 priority="1003"
+                 mode="M35">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="matches(.,'^[1-9]([0-9]*)')"/>
+         <xsl:otherwise> When Supplier is
+        Greek, the MARK Number must be a positive integer<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M35"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AdditionalDocumentReference[$isGreekSender and cbc:DocumentDescription = '##INVOICE|URL##']"
+                 priority="1002"
+                 mode="M35">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string-length(normalize-space(cac:Attachment/cac:ExternalReference/cbc:URI))&gt;0"/>
+         <xsl:otherwise>When Supplier is Greek and the INVOICE URL Document reference exists, the
+        External Reference URI should be present<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M35"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AccountingCustomerParty[$isGreekSender]/cac:Party"
+                 priority="1001"
+                 mode="M35">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string-length(./cac:PartyName/cbc:Name)&gt;0"/>
+         <xsl:otherwise>Greek
+        Suppliers must provide the full name of the buyer<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M35"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AccountingSupplierParty/cac:Party[$accountingSupplierCountry='GR' or $accountingSupplierCountry='EL']/cbc:EndpointID"
+                 priority="1000"
+                 mode="M35">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="./@schemeID='9933' and u:TinVerification(.)"/>
+         <xsl:otherwise>Greek
+        suppliers that send an invoice through the PEPPOL network must use a correct TIN number as
+        an electronic address according to PEPPOL Electronic Address Identifier scheme (schemeID
+        9933).<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M35"/>
+   </xsl:template>
+   <xsl:template match="text()" priority="-1" mode="M35"/>
+   <xsl:template match="@*|node()" priority="-2" mode="M35">
+      <xsl:apply-templates select="*" mode="M35"/>
+   </xsl:template>
+   <!--PATTERN -->
+   <!--RULE -->
+   <xsl:template match="cac:AccountingCustomerParty[$isGreekSenderandReceiver]/cac:Party"
+                 priority="1001"
+                 mode="M36">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="count(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID)=1 and                             substring(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID,1,2) = 'EL' and                             u:TinVerification(substring(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID,3))"/>
+         <xsl:otherwise>Greek Suppliers must provide the VAT number of the buyer, if the buyer is Greek <xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M36"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AccountingCustomerParty[$isGreekSenderandReceiver]/cac:Party/cbc:EndpointID"
+                 priority="1000"
+                 mode="M36">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="./@schemeID='9933' and u:TinVerification(.)"/>
+         <xsl:otherwise>Greek
+        Suppliers that send an invoice through the PEPPOL network to a greek buyer must use a
+        correct TIN number as an electronic address according to PEPPOL Electronic Address
+        Identifier scheme (SchemeID 9933)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M36"/>
+   </xsl:template>
+   <xsl:template match="text()" priority="-1" mode="M36"/>
+   <xsl:template match="@*|node()" priority="-2" mode="M36">
+      <xsl:apply-templates select="*" mode="M36"/>
+   </xsl:template>
+   <!--PATTERN -->
+   <xsl:variable name="SupplierCountry"
+                 select="concat(ubl-creditnote:CreditNote/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode, ubl-invoice:Invoice/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)"/>
+   <xsl:variable name="CustomerCountry"
+                 select="concat(ubl-creditnote:CreditNote/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode, ubl-invoice:Invoice/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)"/>
+   <!--RULE -->
+   <xsl:template match="ubl-creditnote:CreditNote[$SupplierCountry = 'IS'] | ubl-invoice:Invoice[$SupplierCountry = 'IS']"
+                 priority="1001"
+                 mode="M37">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="( ( not(contains(normalize-space(cbc:InvoiceTypeCode),' ')) and contains( ' 380 381 ',concat(' ',normalize-space(cbc:InvoiceTypeCode),' ') ) ) ) or ( ( not(contains(normalize-space(cbc:CreditNoteTypeCode),' ')) and contains( ' 380 381 ',concat(' ',normalize-space(cbc:CreditNoteTypeCode),' ') ) ) )"/>
+         <xsl:otherwise>[IS-R-001]-If seller is icelandic then invoice type should be 380 or 381 — Ef
+        seljandi er íslenskur þá ætti gerð reiknings (BT-3) að vera sölureikningur (380) eða
+        kreditreikningur (381).<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="exists(cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID) and cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID/@schemeID = '0196'"/>
+         <xsl:otherwise>[IS-R-002]-If seller is icelandic then it shall contain sellers legal id — Ef
+        seljandi er íslenskur þá skal reikningur innihalda íslenska kennitölu seljanda (BT-30).<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="exists(cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cbc:StreetName) and exists(cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cbc:PostalZone)"/>
+         <xsl:otherwise>[IS-R-003]-If seller is icelandic then it shall contain his address with street
+        name and zip code — Ef seljandi er íslenskur þá skal heimilisfang seljanda innihalda
+        götuheiti og póstnúmer (BT-35 og BT-38).<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="exists(cac:PaymentMeans[cbc:PaymentMeansCode = '9']/cac:PayeeFinancialAccount/cbc:ID)         and string-length(normalize-space(cac:PaymentMeans[cbc:PaymentMeansCode = '9']/cac:PayeeFinancialAccount/cbc:ID)) = 12        or not(exists(cac:PaymentMeans[cbc:PaymentMeansCode = '9']))"/>
+         <xsl:otherwise>[IS-R-006]-If seller is icelandic and payment means code is 9 then a 12 digit
+        account id must exist — Ef seljandi er íslenskur og greiðslumáti (BT-81) er krafa (kóti 9)
+        þá skal koma fram 12 stafa númer (bankanúmer, höfuðbók 66 og reikningsnúmer) (BT-84)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="exists(cac:PaymentMeans[cbc:PaymentMeansCode = '42']/cac:PayeeFinancialAccount/cbc:ID)         and string-length(normalize-space(cac:PaymentMeans[cbc:PaymentMeansCode = '42']/cac:PayeeFinancialAccount/cbc:ID)) = 12        or not(exists(cac:PaymentMeans[cbc:PaymentMeansCode = '42']))"/>
+         <xsl:otherwise>[IS-R-007]-If seller is icelandic and payment means code is 42 then a 12 digit
+        account id must exist — Ef seljandi er íslenskur og greiðslumáti (BT-81) er millifærsla
+        (kóti 42) þá skal koma fram 12 stafa reikningnúmer (BT-84)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="(exists(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']) and string-length(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']/cbc:ID) = 10 and (string(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']/cbc:ID) castable as xs:date)) or not(exists(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']))"/>
+         <xsl:otherwise>[IS-R-008]-If seller is icelandic and invoice contains supporting description
+        EINDAGI then the id form must be YYYY-MM-DD — Ef seljandi er íslenskur þá skal eindagi
+        (BT-122, DocumentDescription = EINDAGI) vera á forminu YYYY-MM-DD.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="(exists(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']) and exists(cbc:DueDate)) or not(exists(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']))"/>
+         <xsl:otherwise>[IS-R-009]-If seller is icelandic and invoice contains supporting description
+        EINDAGI invoice must have due date — Ef seljandi er íslenskur þá skal reikningur sem
+        inniheldur eindaga (BT-122, DocumentDescription = EINDAGI) einnig hafa gjalddaga (BT-9).<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="(exists(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']) and (cbc:DueDate) &lt;= (cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']/cbc:ID)) or not(exists(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']))"/>
+         <xsl:otherwise>[IS-R-010]-If seller is icelandic and invoice contains supporting description
+        EINDAGI the id date must be same or later than due date — Ef seljandi er íslenskur þá skal
+        eindagi (BT-122, DocumentDescription = EINDAGI) skal vera sami eða síðar en gjalddagi (BT-9)
+        ef eindagi er til staðar.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M37"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="ubl-creditnote:CreditNote[$SupplierCountry = 'IS' and $CustomerCountry = 'IS']/cac:AccountingCustomerParty | ubl-invoice:Invoice[$SupplierCountry = 'IS' and $CustomerCountry = 'IS']/cac:AccountingCustomerParty"
+                 priority="1000"
+                 mode="M37">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="exists(cac:Party/cac:PartyLegalEntity/cbc:CompanyID) and cac:Party/cac:PartyLegalEntity/cbc:CompanyID/@schemeID = '0196'"/>
+         <xsl:otherwise>[IS-R-004]-If seller and buyer are icelandic then the invoice shall contain the
+        buyers icelandic legal identifier — Ef seljandi og kaupandi eru íslenskir þá skal
+        reikningurinn innihalda íslenska kennitölu kaupanda (BT-47).<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="exists(cac:Party/cac:PostalAddress/cbc:StreetName) and exists(cac:Party/cac:PostalAddress/cbc:PostalZone)"/>
+         <xsl:otherwise>[IS-R-005]-If seller and buyer are icelandic then the invoice shall contain the
+        buyers address with street name and zip code — Ef seljandi og kaupandi eru íslenskir þá skal
+        heimilisfang kaupanda innihalda götuheiti og póstnúmer (BT-50 og BT-53)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M37"/>
+   </xsl:template>
+   <xsl:template match="text()" priority="-1" mode="M37"/>
+   <xsl:template match="@*|node()" priority="-2" mode="M37">
+      <xsl:apply-templates select="*" mode="M37"/>
+   </xsl:template>
+   <!--PATTERN -->
+   <xsl:variable name="supplierCountryIsNL"
+                 select="(upper-case(normalize-space(/*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)) = 'NL')"/>
+   <xsl:variable name="customerCountryIsNL"
+                 select="(upper-case(normalize-space(/*/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)) = 'NL')"/>
+   <xsl:variable name="taxRepresentativeCountryIsNL"
+                 select="(upper-case(normalize-space(/*/cac:TaxRepresentativeParty/cac:PostalAddress/cac:Country/cbc:IdentificationCode)) = 'NL')"/>
+   <!--RULE -->
+   <xsl:template match="cbc:CreditNoteTypeCode[$supplierCountryIsNL]"
+                 priority="1008"
+                 mode="M38">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="/*/cac:BillingReference/cac:InvoiceDocumentReference/cbc:ID"/>
+         <xsl:otherwise>[NL-R-001] For suppliers in the Netherlands, if the document is a creditnote,
+        the document MUST contain an invoice reference
+        (cac:BillingReference/cac:InvoiceDocumentReference/cbc:ID)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M38"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AccountingSupplierParty/cac:Party/cac:PostalAddress[$supplierCountryIsNL]"
+                 priority="1007"
+                 mode="M38">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="cbc:StreetName and cbc:CityName and cbc:PostalZone"/>
+         <xsl:otherwise>[NL-R-002]
+        For suppliers in the Netherlands the supplier's address
+        (cac:AccountingSupplierParty/cac:Party/cac:PostalAddress) MUST contain street name
+        (cbc:StreetName), city (cbc:CityName) and post code (cbc:PostalZone)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M38"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID[$supplierCountryIsNL]"
+                 priority="1006"
+                 mode="M38">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="(contains(concat(' ', string-join(@schemeID, ' '), ' '), ' 0106 ') or contains(concat(' ', string-join(@schemeID, ' '), ' '), ' 0190 ')) and (normalize-space(.) != '')"/>
+         <xsl:otherwise>[NL-R-003] For suppliers in the Netherlands, the legal entity identifier MUST
+        be either a KVK or OIN number (schemeID 0106 or 0190)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M38"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AccountingCustomerParty/cac:Party/cac:PostalAddress[$supplierCountryIsNL and $customerCountryIsNL]"
+                 priority="1005"
+                 mode="M38">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="cbc:StreetName and cbc:CityName and cbc:PostalZone"/>
+         <xsl:otherwise>[NL-R-004]
+        For suppliers in the Netherlands, if the customer is in the Netherlands, the customer
+        address (cac:AccountingCustomerParty/cac:Party/cac:PostalAddress) MUST contain the street
+        name (cbc:StreetName), the city (cbc:CityName) and post code (cbc:PostalZone)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M38"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AccountingCustomerParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID[$supplierCountryIsNL and $customerCountryIsNL]"
+                 priority="1004"
+                 mode="M38">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="(contains(concat(' ', string-join(@schemeID, ' '), ' '), ' 0106 ') or contains(concat(' ', string-join(@schemeID, ' '), ' '), ' 0190 ')) and (normalize-space(.) != '')"/>
+         <xsl:otherwise>[NL-R-005] For suppliers in the Netherlands, if the customer is in the
+        Netherlands, the customer's legal entity identifier MUST be either a KVK or OIN number
+        (schemeID 0106 or 0190)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M38"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:TaxRepresentativeParty/cac:PostalAddress[$supplierCountryIsNL and $taxRepresentativeCountryIsNL]"
+                 priority="1003"
+                 mode="M38">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="cbc:StreetName and cbc:CityName and cbc:PostalZone"/>
+         <xsl:otherwise>[NL-R-006]
+        For suppliers in the Netherlands, if the fiscal representative is in the Netherlands, the
+        representative's address (cac:TaxRepresentativeParty/cac:PostalAddress) MUST contain street
+        name (cbc:StreetName), city (cbc:CityName) and post code (cbc:PostalZone)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M38"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:LegalMonetaryTotal[$supplierCountryIsNL]"
+                 priority="1002"
+                 mode="M38">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="(/ubl-invoice:Invoice and xs:decimal(cbc:PayableAmount) &lt;= 0.0) or (/ubl-creditnote:CreditNote and xs:decimal(cbc:PayableAmount) &gt;= 0.0) or (//cac:PaymentMeans)"/>
+         <xsl:otherwise>[NL-R-007] For suppliers in the Netherlands, the supplier MUST provide a means
+        of payment (cac:PaymentMeans) if the payment is from customer to supplier<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M38"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:PaymentMeans[$supplierCountryIsNL]"
+                 priority="1001"
+                 mode="M38">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="normalize-space(cbc:PaymentMeansCode) = '30' or         normalize-space(cbc:PaymentMeansCode) = '48' or         normalize-space(cbc:PaymentMeansCode) = '49' or         normalize-space(cbc:PaymentMeansCode) = '57' or         normalize-space(cbc:PaymentMeansCode) = '58' or         normalize-space(cbc:PaymentMeansCode) = '59'"/>
+         <xsl:otherwise>[NL-R-008] For suppliers in the Netherlands, the payment means code
+        (cac:PaymentMeans/cbc:PaymentMeansCode) MUST be one of 30, 48, 49, 57, 58 or 59<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M38"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:OrderLineReference/cbc:LineID[$supplierCountryIsNL]"
+                 priority="1000"
+                 mode="M38">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="exists(/*/cac:OrderReference/cbc:ID)"/>
+         <xsl:otherwise>[NL-R-009] For
+        suppliers in the Netherlands, if an order line reference (cac:OrderLineReference/cbc:LineID)
+        is used, there must be an order reference on the document level (cac:OrderReference/cbc:ID)<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M38"/>
+   </xsl:template>
+   <xsl:template match="text()" priority="-1" mode="M38"/>
+   <xsl:template match="@*|node()" priority="-2" mode="M38">
+      <xsl:apply-templates select="*" mode="M38"/>
+   </xsl:template>
+   <!--PATTERN -->
+   <xsl:variable name="ISO3166"
+                 select="tokenize('AD AE AF AG AI AL AM AO AQ AR AS AT AU AW AX AZ BA BB BD BE BF BG BH BI BJ BL BM BN BO BQ BR BS BT BV BW BY BZ CA CC CD CF CG CH CI CK CL CM CN CO CR CU CV CW CX CY CZ DE DJ DK DM DO DZ EC EE EG EH ER ES ET FI FJ FK FM FO FR GA GB GD GE GF GG GH GI GL GM GN GP GQ GR GS GT GU GW GY HK HM HN HR HT HU ID IE IL IM IN IO IQ IR IS IT JE JM JO JP KE KG KH KI KM KN KP KR KW KY KZ LA LB LC LI LK LR LS LT LU LV LY MA MC MD ME MF MG MH MK ML MM MN MO MP MQ MR MS MT MU MV MW MX MY MZ NA NC NE NF NG NI NL NO NP NR NU NZ OM PA PE PF PG PH PK PL PM PN PR PS PT PW PY QA RE RO RS RU RW SA SB SC SD SE SG SH SI SJ SK SL SM SN SO SR SS ST SV SX SY SZ TC TD TF TG TH TJ TK TL TM TN TO TR TT TV TW TZ UA UG UM US UY UZ VA VC VE VG VI VN VU WF WS YE YT ZA ZM ZW 1A XI', '\s')"/>
+   <xsl:variable name="ISO4217"
+                 select="tokenize('AED AFN ALL AMD ANG AOA ARS AUD AWG AZN BAM BBD BDT BGN BHD BIF BMD BND BOB BOV BRL BSD BTN BWP BYN BZD CAD CDF CHE CHF CHW CLF CLP CNY COP COU CRC CUC CUP CVE CZK DJF DKK DOP DZD EGP ERN ETB EUR FJD FKP GBP GEL GHS GIP GMD GNF GTQ GYD HKD HNL HRK HTG HUF IDR ILS INR IQD IRR ISK JMD JOD JPY KES KGS KHR KMF KPW KRW KWD KYD KZT LAK LBP LKR LRD LSL LYD MAD MDL MGA MKD MMK MNT MOP MRO MUR MVR MWK MXN MXV MYR MZN NAD NGN NIO NOK NPR NZD OMR PAB PEN PGK PHP PKR PLN PYG QAR RON RSD RUB RWF SAR SBD SCR SDG SEK SGD SHP SLL SOS SRD SSP STN SVC SYP SZL THB TJS TMT TND TOP TRY TTD TWD TZS UAH UGX USD USN UYI UYU UZS VEF VND VUV WST XAF XAG XAU XBA XBB XBC XBD XCD XDR XOF XPD XPF XPT XSU XTS XUA XXX YER ZAR ZMW ZWL', '\s')"/>
+   <xsl:variable name="MIMECODE"
+                 select="tokenize('application/pdf image/png image/jpeg text/csv application/vnd.openxmlformats-officedocument.spreadsheetml.sheet application/vnd.oasis.opendocument.spreadsheet', '\s')"/>
+   <xsl:variable name="UNCL2005" select="tokenize('3 35 432', '\s')"/>
+   <xsl:variable name="UNCL5189"
+                 select="tokenize('41 42 60 62 63 64 65 66 67 68 70 71 88 95 100 102 103 104 105', '\s')"/>
+   <xsl:variable name="UNCL7161"
+                 select="tokenize('AA AAA AAC AAD AAE AAF AAH AAI AAS AAT AAV AAY AAZ ABA ABB ABC ABD ABF ABK ABL ABN ABR ABS ABT ABU ACF ACG ACH ACI ACJ ACK ACL ACM ACS ADC ADE ADJ ADK ADL ADM ADN ADO ADP ADQ ADR ADT ADW ADY ADZ AEA AEB AEC AED AEF AEH AEI AEJ AEK AEL AEM AEN AEO AEP AES AET AEU AEV AEW AEX AEY AEZ AJ AU CA CAB CAD CAE CAF CAI CAJ CAK CAL CAM CAN CAO CAP CAQ CAR CAS CAT CAU CAV CAW CAX CAY CAZ CD CG CS CT DAB DAC DAD DAF DAG DAH DAI DAJ DAK DAL DAM DAN DAO DAP DAQ DL EG EP ER FAA FAB FAC FC FH FI GAA HAA HD HH IAA IAB ID IF IR IS KO L1 LA LAA LAB LF MAE MI ML NAA OA PA PAA PC PL RAB RAC RAD RAF RE RF RH RV SA SAA SAD SAE SAI SG SH SM SU TAB TAC TT TV V1 V2 WH XAA YY ZZZ', '\s')"/>
+   <xsl:variable name="UNCL5305" select="tokenize('AE E S Z G O K L M', '\s')"/>
+   <xsl:variable name="eaid"
+                 select="tokenize('0002 0007 0009 0037 0060 0088 0096 0097 0106 0130 0135 0142 0151 0183 0184 0188 0190 0191 0192 0193 0195 0196 0198 0199 0200 0201 0202 0204 0208 0209 0210 0211 0212 0213 0215 0216 0218 0221 0230 9901 9910 9913 9914 9915 9918 9919 9920 9922 9923 9924 9925 9926 9927 9928 9929 9930 9931 9932 9933 9934 9935 9936 9937 9938 9939 9940 9941 9942 9943 9944 9945 9946 9947 9948 9949 9950 9951 9952 9953 9957 9959', '\s')"/>
+   <!--RULE -->
+   <xsl:template match="cbc:EmbeddedDocumentBinaryObject[@mimeCode]"
+                 priority="1016"
+                 mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="           some $code in $MIMECODE             satisfies @mimeCode = $code"/>
+         <xsl:otherwise>Mime code must be according to subset of IANA code list.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AllowanceCharge[cbc:ChargeIndicator = 'false']/cbc:AllowanceChargeReasonCode"
+                 priority="1015"
+                 mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="           some $code in $UNCL5189             satisfies normalize-space(text()) = $code"/>
+         <xsl:otherwise>Reason code MUST be according to subset of UNCL 5189 D.16B.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:AllowanceCharge[cbc:ChargeIndicator = 'true']/cbc:AllowanceChargeReasonCode"
+                 priority="1014"
+                 mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="           some $code in $UNCL7161             satisfies normalize-space(text()) = $code"/>
+         <xsl:otherwise>Reason code MUST be according to UNCL 7161 D.16B.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:InvoicePeriod/cbc:DescriptionCode"
+                 priority="1013"
+                 mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="           some $code in $UNCL2005             satisfies normalize-space(text()) = $code"/>
+         <xsl:otherwise>Invoice period description code must be according to UNCL 2005 D.16B.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:Amount | cbc:BaseAmount | cbc:PriceAmount | cbc:TaxAmount | cbc:TaxableAmount | cbc:LineExtensionAmount | cbc:TaxExclusiveAmount | cbc:TaxInclusiveAmount | cbc:AllowanceTotalAmount | cbc:ChargeTotalAmount | cbc:PrepaidAmount | cbc:PayableRoundingAmount | cbc:PayableAmount"
+                 priority="1012"
+                 mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="           some $code in $ISO4217             satisfies @currencyID = $code"/>
+         <xsl:otherwise>Currency code must be according to ISO 4217:2005<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:InvoiceTypeCode" priority="1011" mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="           $profile != '01' or (some $code in tokenize('71 80 82 84 102 218 219 331 380 382 383 386 388 393 395 553 575 623 780 817 870 875 876 877', '\s')             satisfies normalize-space(text()) = $code)"/>
+         <xsl:otherwise>Invoice type code MUST be set according to the profile.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:CreditNoteTypeCode" priority="1010" mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="           $profile != '01' or (some $code in tokenize('381 396 81 83 532', '\s')             satisfies normalize-space(text()) = $code)"/>
+         <xsl:otherwise>Credit note type code MUST be set according to the profile.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:IssueDate | cbc:DueDate | cbc:TaxPointDate | cbc:StartDate | cbc:EndDate | cbc:ActualDeliveryDate"
+                 priority="1009"
+                 mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="string-length(text()) = 10 and (string(.) castable as xs:date)"/>
+         <xsl:otherwise>A date
+        MUST be formatted YYYY-MM-DD.<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cbc:EndpointID[@schemeID]" priority="1008" mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="         some $code in $eaid         satisfies @schemeID = $code"/>
+         <xsl:otherwise>Electronic
+        address identifier scheme must be from the codelist "Electronic Address Identifier Scheme"<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-G']"
+                 priority="1007"
+                 mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="normalize-space(cbc:ID)='G'"/>
+         <xsl:otherwise>Tax Category
+        G MUST be used when exemption reason code is VATEX-EU-G<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-O']"
+                 priority="1006"
+                 mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="normalize-space(cbc:ID)='O'"/>
+         <xsl:otherwise>Tax Category
+        O MUST be used when exemption reason code is VATEX-EU-O<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-IC']"
+                 priority="1005"
+                 mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="normalize-space(cbc:ID)='K'"/>
+         <xsl:otherwise>Tax Category
+        K MUST be used when exemption reason code is VATEX-EU-IC<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-AE']"
+                 priority="1004"
+                 mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="normalize-space(cbc:ID)='AE'"/>
+         <xsl:otherwise>Tax
+        Category AE MUST be used when exemption reason code is VATEX-EU-AE<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-D']"
+                 priority="1003"
+                 mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="normalize-space(cbc:ID)='E'"/>
+         <xsl:otherwise>Tax Category
+        E MUST be used when exemption reason code is VATEX-EU-D<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-F']"
+                 priority="1002"
+                 mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="normalize-space(cbc:ID)='E'"/>
+         <xsl:otherwise>Tax Category
+        E MUST be used when exemption reason code is VATEX-EU-F<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-I']"
+                 priority="1001"
+                 mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="normalize-space(cbc:ID)='E'"/>
+         <xsl:otherwise>Tax Category
+        E MUST be used when exemption reason code is VATEX-EU-I<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <!--RULE -->
+   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-J']"
+                 priority="1000"
+                 mode="M39">
+
+		<!--ASSERT -->
+      <xsl:choose>
+         <xsl:when test="normalize-space(cbc:ID)='E'"/>
+         <xsl:otherwise>Tax Category
+        E MUST be used when exemption reason code is VATEX-EU-J<xsl:value-of select="string('&#xA;')"/>
+         </xsl:otherwise>
+      </xsl:choose>
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+   <xsl:template match="text()" priority="-1" mode="M39"/>
+   <xsl:template match="@*|node()" priority="-2" mode="M39">
+      <xsl:apply-templates select="*" mode="M39"/>
+   </xsl:template>
+</xsl:stylesheet>

From b58be6fdd669fe3e419a2fad07038a0ec3c67f18 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Oct 2024 14:22:47 +1100
Subject: [PATCH 23/81] Working on hydrating XML => UBL => PDF

---
 .../Requests/Account/CreateAccountRequest.php |    4 +-
 app/Http/Requests/Email/SendEmailRequest.php  |   23 +-
 app/Jobs/EDocument/ImportEDocument.php        |   12 +-
 app/Models/Vendor.php                         |    1 +
 .../EDocument/Imports/ParseEDocument.php      |    4 +-
 app/Services/EDocument/Imports/Ubl2Pdf.php    |  134 +
 .../EDocument/Imports/UblEDocument.php        |  168 +-
 app/Utils/Statics.php                         |    2 +
 ...214658_add_routing_id_to_vendors_table.php |   27 +
 tests/Feature/InvoiceEmailTest.php            |   21 +
 .../Einvoice/ImportEInvoiceTest.php           |  104 +-
 .../Integration/Einvoice/samples/peppol.xslt  | 3184 +++++++----------
 12 files changed, 1772 insertions(+), 1912 deletions(-)
 create mode 100644 app/Services/EDocument/Imports/Ubl2Pdf.php
 create mode 100644 database/migrations/2024_10_14_214658_add_routing_id_to_vendors_table.php

diff --git a/app/Http/Requests/Account/CreateAccountRequest.php b/app/Http/Requests/Account/CreateAccountRequest.php
index 6ea3cdb1d1e..ef8a95214df 100644
--- a/app/Http/Requests/Account/CreateAccountRequest.php
+++ b/app/Http/Requests/Account/CreateAccountRequest.php
@@ -37,9 +37,9 @@ public function authorize()
     public function rules()
     {
         if (Ninja::isHosted()) {
-            $email_rules = ['bail', 'required', 'email:rfc,dns', new NewUniqueUserRule(), new BlackListRule(), new EmailBlackListRule()];
+            $email_rules = ['bail', 'required', 'max:255', 'email:rfc,dns', new NewUniqueUserRule(), new BlackListRule(), new EmailBlackListRule()];
         } else {
-            $email_rules = ['bail', 'required', 'email:rfc,dns', new NewUniqueUserRule()];
+            $email_rules = ['bail', 'required', 'max:255', 'email:rfc,dns', new NewUniqueUserRule()];
         }
 
         return [
diff --git a/app/Http/Requests/Email/SendEmailRequest.php b/app/Http/Requests/Email/SendEmailRequest.php
index 60d82aec59a..6a5e56bcec0 100644
--- a/app/Http/Requests/Email/SendEmailRequest.php
+++ b/app/Http/Requests/Email/SendEmailRequest.php
@@ -22,7 +22,7 @@ class SendEmailRequest extends Request
 {
     use MakesHash;
 
-    private string $entity_plural = '';
+    private string $entity_plural = 'invoices';
     private string $error_message = '';
 
     public array $templates = [
@@ -92,9 +92,8 @@ public function prepareForValidation()
             $input['entity_id'] = $this->decodePrimaryKey($input['entity_id']);
         }
 
-        $this->entity_plural = Str::plural($input['entity']) ?? '';
-
         if (isset($input['entity']) && in_array($input['entity'], ['invoice','quote','credit','recurring_invoice','purchase_order','payment'])) {
+            $this->entity_plural = Str::plural($input['entity']) ?? '';
             $input['entity'] = "App\Models\\".ucfirst(Str::camel($input['entity']));
         }
 
@@ -106,13 +105,15 @@ public function prepareForValidation()
             })->slice(0, 4)->toArray();
         }
 
+
         $this->replace($input);
     }
 
-    public function message()
+    public function messages()
     {
         return [
-            'template' => 'Invalid template.',
+            'template.in' => 'Template :input is anot a valid template.',
+            'entity.in' => 'Entity :input is not a valid entity.'
         ];
     }
 
@@ -134,8 +135,7 @@ private function checkUserAbleToSend()
         }
 
         /*Make sure we have all the require ingredients to send a template*/
-        if (isset($input['entity']) && array_key_exists('entity_id', $input) && is_string($input['entity']) && $input['entity_id']) {
-
+        if (isset($input['entity']) && array_key_exists('entity_id', $input) && in_array($input['entity'], ['App\Models\Invoice','App\Models\Quote','App\Models\Credit','App\Models\RecurringInvoice','App\Models\PurchaseOrder','App\Models\Payment'])) {
 
             $company = $user->company();
 
@@ -148,11 +148,12 @@ private function checkUserAbleToSend()
             if ($entity_obj && ($company->id == $entity_obj->company_id) && $user->can('edit', $entity_obj)) {
                 return true;
             }
-        } else {
-            $this->error_message = "Invalid entity or entity_id";
-        }
+            else {
+                $this->error_message = "Invalid entity or entity_id";
+            }
+        } 
 
-        return false;
+        return true;
     }
 
     protected function failedAuthorization()
diff --git a/app/Jobs/EDocument/ImportEDocument.php b/app/Jobs/EDocument/ImportEDocument.php
index 5cf50845f2b..e403caa704e 100644
--- a/app/Jobs/EDocument/ImportEDocument.php
+++ b/app/Jobs/EDocument/ImportEDocument.php
@@ -11,16 +11,17 @@
 
 namespace App\Jobs\EDocument;
 
-use App\Models\Expense;
-use App\Services\EDocument\Imports\ParseEDocument;
-use App\Utils\TempFile;
 use Exception;
 use App\Models\Company;
+use App\Models\Expense;
+use App\Utils\TempFile;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use App\Services\EDocument\Imports\ParseEDocument;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use App\Services\EDocument\Imports\ZugferdEDocument;
 
@@ -31,8 +32,6 @@ class ImportEDocument implements ShouldQueue
     use Queueable;
     use SerializesModels;
 
-    public $tries = 1;
-
     public function __construct(private readonly string $file_content, private string $file_name, private string $file_mime_type, private Company $company)
     {
 
@@ -46,7 +45,6 @@ public function __construct(private readonly string $file_content, private strin
      */
     public function handle(): Expense
     {
-
         $file = TempFile::UploadedFileFromRaw($this->file_content, $this->file_name, $this->file_mime_type);
 
         return (new ParseEDocument($file, $this->company))->run();
@@ -63,6 +61,8 @@ public function failed($exception = null)
         if ($exception) {
             nlog("EXCEPTION:: ImportEDocument:: " . $exception->getMessage());
         }
+        
+        $this->fail($exception); //manually fail - prevents future jobs with the same name from being discarded
 
         config(['queue.failed.driver' => null]);
     }
diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php
index 3fed5a51239..2e096683483 100644
--- a/app/Models/Vendor.php
+++ b/app/Models/Vendor.php
@@ -118,6 +118,7 @@ class Vendor extends BaseModel
         'language_id',
         'classification',
         'is_tax_exempt',
+        'routing_id',
     ];
 
     protected $casts = [
diff --git a/app/Services/EDocument/Imports/ParseEDocument.php b/app/Services/EDocument/Imports/ParseEDocument.php
index b935692d53a..913e293950b 100644
--- a/app/Services/EDocument/Imports/ParseEDocument.php
+++ b/app/Services/EDocument/Imports/ParseEDocument.php
@@ -41,6 +41,8 @@ public function __construct(private UploadedFile $file, private Company $company
      */
     public function run(): Expense
     {
+        nlog("starting");
+        nlog($this->company->id);
 
         /** @var \App\Models\Account $account */
         $account = $this->company->owner()->account;
@@ -51,7 +53,6 @@ public function run(): Expense
         // ZUGFERD - try to parse via Zugferd lib
         switch (true) {
             case ($extension == 'pdf' || $mimetype == 'application/pdf'):
-            case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017"):
             case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0"):
             case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_2.1"):
             case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_2.0"):
@@ -60,6 +61,7 @@ public function run(): Expense
                 } catch (\Throwable $e) {
                     nlog("Zugferd Exception: " . $e->getMessage());
                 }
+            case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017"):
             case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:oasis:names:specification:ubl"):
                 try {
                     return (new UblEDocument($this->file, $this->company))->run();
diff --git a/app/Services/EDocument/Imports/Ubl2Pdf.php b/app/Services/EDocument/Imports/Ubl2Pdf.php
new file mode 100644
index 00000000000..fe6712226c3
--- /dev/null
+++ b/app/Services/EDocument/Imports/Ubl2Pdf.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Services\EDocument\Imports;
+
+use App\Models\Vendor;
+use App\Models\Company;
+use App\Models\Country;
+use App\Models\Expense;
+use App\Factory\VendorFactory;
+use App\Factory\ExpenseFactory;
+use App\Services\AbstractService;
+use Illuminate\Http\UploadedFile;
+use InvoiceNinja\EInvoice\EInvoice;
+use App\Utils\Traits\SavesDocuments;
+use App\Factory\VendorContactFactory;
+use App\Models\Currency;
+use App\Repositories\ExpenseRepository;
+
+class Ubl2Pdf extends AbstractService
+{
+
+    /**
+     * @throws \Throwable
+     */
+    public function __construct(public \InvoiceNinja\EInvoice\Models\Peppol\Invoice $invoice, public Company $company)
+    {
+    }
+
+    public function run()
+    {
+        $client = $this->clientDetails();
+        $supplier = $this->supplierDetails();
+        $invoiceLines = $this->invoiceLines();
+        $totals = $this->totals();
+    }
+
+    private function clientDetails(): array
+    {
+        return [
+            'name' => data_get($this->invoice, 'AccountingCustomerParty.Party.PartyName.0.Name',''),
+            'address1' => data_get($this->invoice, 'AccountingCustomerParty.Party.PostalAddress.StreetName',''),
+            'address2' => data_get($this->invoice, 'AccountingCustomerParty.Party.PostalAddress.AdditionalStreetName',''),
+            'city' => data_get($this->invoice, 'AccountingCustomerParty.Party.PostalAddress.CityName',''),
+            'state' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.CountrySubentity',''),
+            'postal_code' => data_get($this->invoice, 'AccountingCustomerParty.Party.PostalAddress.PostalZone',''),
+            'country_id' => data_get($this->invoice, 'AccountingCustomerParty.Party.PostalAddress.Country.IdentificationCode.value',''),
+            'vat_number' => data_get($this->invoice, 'AccountingCustomerParty.Party.PartyTaxScheme.0.CompanyID.value',''),
+            'contacts' => [
+                'first_name' => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Name',''),
+                'phone' => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Telephone',''),
+                'email' => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.ElectronicMail',''),
+            ],
+            'settings' => [
+                'currency_id' => $this->resolveCurrencyId(data_get($this->invoice, 'DocumentCurrencyCode.value', $this->company->currency()->code))
+            ]
+        ];
+    }
+
+    private function supplierDetails(): array
+    {
+        return [
+            'name' => data_get($this->invoice, 'AccountingSupplierParty.Party.PartyName.0.name', ''),
+            'address1' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.StreetName', ''),
+            'address2' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.AdditionalStreetName', ''),
+            'city' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.CityName', ''),
+            'state' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.CountrySubentity', ''),
+            'postal_code' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.PostalZone', ''),
+            'country_id' => $this->resolveCountry(data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.Country.IdentificationCode.value', '')),
+            'vat_number' => data_get($this->invoice, 'AccountingSupplierParty.Party.PartyTaxScheme.0.CompanyID.value', ''),
+            'contacts' => [
+                'first_name' => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Name', ''),
+                'phone' => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Telephone', ''),
+                'email' => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.ElectronicMail', ''),
+            ],
+        ];
+    }
+
+    private function invoiceLines(): array
+    {
+        $lines = data_get($this->invoice, 'invoiceLine', []);
+        return array_map(function ($line) {
+            return [
+                'quantity' => data_get($line, 'InvoicedQuantity',0),
+                'unit_code' => data_get($line, 'InvoicedQuantity.UnitCode',0),
+                'line_extension_amount' => data_get($line, 'LineExtensionAmount',0),
+                'item' => [
+                    'name' => data_get($line, 'Item.Name',''),
+                    'description' => data_get($line, 'Item.Description',''),
+                ],
+                'price' => data_get($line, 'Price.PriceAmount',0),
+            ];
+        }, $lines);
+    }
+
+    private function totals(): array
+    {
+        return [
+            'line_extension_amount' => data_get($this->invoice, 'LegalMonetaryTotal.LineExtensionAmount',0),
+            'tax_exclusive_amount' => data_get($this->invoice, 'LegalMonetaryTotal.TaxExclusiveAmount',0),
+            'tax_inclusive_amount' => data_get($this->invoice, 'LegalMonetaryTotal.TaxInclusiveAmount',0),
+            'charge_total_amount' => data_get($this->invoice, 'LegalMonetaryTotal.ChargeTotalAmount',0),
+            'payable_amount' => data_get($this->invoice, 'LegalMonetaryTotal.PayableAmount',0),
+        ];
+    }
+
+    private function resolveCountry(?string $iso_country_code): int
+    {
+        return Country::query()
+                        ->where('iso_3166_2', $iso_country_code)
+                        ->orWhere('iso_3166_3', $iso_country_code)
+                        ->first()?->id ?? (int)$this->company->settings->country_id;
+    }
+
+
+    private function resolveCurrencyId(string $currency_code): int
+    {
+        
+        /** @var \Illuminate\Support\Collection<\App\Models\Currency> */
+        $currencies = app('currencies');
+
+        return $currencies->first(function (Currency $c) use ($currency_code) {
+            return $c->code === $currency_code;
+        })?->id ?? (int) $this->company->settings->currency_id;
+    }
+}
\ No newline at end of file
diff --git a/app/Services/EDocument/Imports/UblEDocument.php b/app/Services/EDocument/Imports/UblEDocument.php
index 9c23e2bb856..44bb86cc8ad 100644
--- a/app/Services/EDocument/Imports/UblEDocument.php
+++ b/app/Services/EDocument/Imports/UblEDocument.php
@@ -14,14 +14,17 @@
 use App\Models\Vendor;
 use App\Models\Company;
 use App\Models\Country;
+use App\Models\Expense;
 use App\Factory\VendorFactory;
 use App\Factory\ExpenseFactory;
-use App\Factory\VendorContactFactory;
 use App\Services\AbstractService;
 use Illuminate\Http\UploadedFile;
 
 use InvoiceNinja\EInvoice\EInvoice;
 use App\Utils\Traits\SavesDocuments;
+use App\Factory\VendorContactFactory;
+use App\Models\Currency;
+use App\Repositories\ExpenseRepository;
 
 class UblEDocument extends AbstractService
 {
@@ -41,18 +44,12 @@ public function __construct(public UploadedFile $file, public Company $company)
     public function run(): \App\Models\Expense
     {
 
-        //parse doc
-        // try{
             $e = new EInvoice();
+
             $invoice = $e->decode('Peppol', $this->file->get(), 'xml');
 
             return $this->buildAndSaveExpense($invoice);
 
-        // }
-        // catch(\Throwable $e){
-        //     return $e->getMessage();
-        // }
-
     }
 
     private function buildAndSaveExpense(\InvoiceNinja\EInvoice\Models\Peppol\Invoice $invoice): Expense
@@ -60,23 +57,116 @@ private function buildAndSaveExpense(\InvoiceNinja\EInvoice\Models\Peppol\Invoic
 
         $vendor = $this->findOrCreateVendor($invoice);
 
+        $TaxExclusiveAmount = data_get($invoice, 'LegalMonetaryTotal.TaxExclusiveAmount.amount', 0);
+        $TaxInclusiveAmount = data_get($invoice, 'LegalMonetaryTotal.TaxExclusiveAmount.amount', 0);
+        $ChargeTotalAmount = data_get($invoice, 'LegalMonetaryTotal.ChargeTotalAmount.amount', 0);
+        $PayableAmount = data_get($invoice, 'LegalMonetaryTotal.PayableAmount.amount', 0);
+        $TaxAmount = data_get($invoice, 'TaxTotal.0.TaxAmount.amount', 0);
+        $tax_sub_totals = data_get($invoice, 'TaxTotal.0.TaxSubtotal', []);
+        $currency_code = data_get($invoice, 'DocumentCurrencyCode.value', $this->company->currency()->code);
+        $date = data_get($invoice, 'IssueDate', now()->format('Y-m-d'));
+
+        $payment_means = [];
+        $payment_means[] = data_get($invoice, 'PaymentMeans.0.PaymentMeansCode.name', false);
+        $payment_means[] = data_get($invoice, 'PaymentMeans.0.PaymentID.value', false);
+        $payment_means[] = data_get($invoice, 'PaymentMeans.0.PayeeFinancialAccount.ID.value', false);
+        $payment_means[] = data_get($invoice, 'PaymentMeans.0.PayeeFinancialAccount.Name', false);
+        $payment_means[] = data_get($invoice, 'PaymentMeans.0.PayeeFinancialAccount.FinancialInstitutionBranch.ID.value', false);
+        $payment_means[] = data_get($invoice, 'PaymentTerms.0.Note', false);
+
+        $private_notes = collect($payment_means)
+                                ->reject(function ($means){
+                                    return $means === false;
+                                })->implode("\n");
+
+        $invoice_items = data_get($invoice, 'InvoiceLine', []);
+
+        $items = [];
+
+        foreach($invoice_items as $key => $item)
+        {
+            $items[$key]['name'] = data_get($item, 'Item.Name', false);
+            $items[$key]['description'] = data_get($item, 'Item.Description', false);
+        }
+
+        $public_notes = collect($items)->reject(function ($item){
+            return $item['name'] === false && $item['description'] === false;
+        })->map(function ($item){
+            return $item['name'] ?? ' ' . ' ## '. $item['description'] ?? ' '; //@phpstan-ignore-line
+        })->implode("\n");
 
         /** @var \App\Models\Expense $expense */
         $expense = ExpenseFactory::create($this->company->id, $this->company->owner()->id);
+        $expense->vendor_id = $vendor->id;
+        $expense->amount = $this->company->expense_inclusive_taxes ? $TaxInclusiveAmount : $TaxExclusiveAmount;
+        $expense->currency_id = $this->resolveCurrencyId($currency_code);
+        $expense->date = $date;
+        $expense->private_notes = $private_notes;
+        $expense->public_notes = $public_notes;
+
+            $tax_level = 1;
+
+            foreach ($tax_sub_totals as $key => $sub_tax) {
+                $amount = data_get($sub_tax, 'TaxAmount.amount', 0);
+                $taxable_amount = data_get($sub_tax, 'TaxableAmount.amount', 0);
+                $tax_rate = data_get($sub_tax, 'TaxCategory.Percent', 0);
+                $id = data_get($sub_tax, 'TaxCategory.ID.value', '');
+                $tax_name = data_get($sub_tax, 'TaxCategory.TaxScheme.ID.value', '');
+
+                if (!$this->company->calculate_expense_tax_by_amount && $tax_rate > 0) {
+
+                    $expense->{"tax_rate{$tax_level}"} = $tax_rate;
+                    $expense->{"tax_name{$tax_level}"} = $tax_name;
+                    $expense->calculate_tax_by_amount = false;
+
+                }
+                else {
+                    $expense->calculate_tax_by_amount = true;
+                    $expense->{"tax_amount{$tax_level}"} = $amount; //@phpstan-ignore-line
+
+                }
+
+                $tax_level++;
+
+                if ($tax_level == 4) {
+                    break;
+                }
+            }
+
+
+        $expense->save();
+
+        $repo = new ExpenseRepository();
+
+        $data = [];
+        $data['documents'][] = $this->file;
+        
+        $expense = $repo->save($data, $expense);
 
         return $expense;
 
 
     }
 
+    private function resolveCurrencyId(string $currency_code): int
+    {
+        
+        /** @var \Illuminate\Support\Collection<\App\Models\Currency> */
+        $currencies = app('currencies');
+
+        return $currencies->first(function (Currency $c) use ($currency_code) {
+            return $c->code === $currency_code;
+        })?->id ?? (int) $this->company->settings->currency_id;
+    }
+
     private function findOrCreateVendor(\InvoiceNinja\EInvoice\Models\Peppol\Invoice $invoice): Vendor
     {
         $asp = $invoice->AccountingSupplierParty;
         
-        $vat_number = $asp->Party->PartyTaxScheme->CompanyID ?? false;
-        $id_number = $asp->Party->PartyIdentification->ID ?? false;
-        $routing_id = $asp->Party->EndpointID ?? false;
-        $vendor_name = $asp->Party->PartyName->Name ?? false;
+        $vat_number = $this->resolveVendorVat($invoice);
+        $id_number = $this->resolveVendorIdNumber($invoice);
+        $routing_id = data_get($invoice, 'AccountingSupplierParty.Party.EndpointID.value', false);
+        $vendor_name = $this->resolveSupplierName($invoice);
 
         $vendor = Vendor::query()
                     ->where('company_id', $this->company->id)
@@ -85,13 +175,13 @@ private function findOrCreateVendor(\InvoiceNinja\EInvoice\Models\Peppol\Invoice
                         $q->when($routing_id, function ($q) use ($routing_id){
                             $q->where('routing_id', $routing_id);
                         })
-                        ->when($vat_number, function ($q) use ($vat_number){
+                        ->when(strlen($vat_number) > 1, function ($q) use ($vat_number){
                             $q->orWhere('vat_number', $vat_number);
                         })
-                        ->when($id_number, function ($q) use ($id_number){
+                        ->when(strlen($id_number) > 1, function ($q) use ($id_number){
                             $q->orWhere('id_number', $id_number);
                         })
-                        ->when($vendor_name, function ($q) use ($vendor_name){
+                        ->when(strlen($vendor_name) > 1, function ($q) use ($vendor_name){
                             $q->orWhere('name', $vendor_name);
                         });
 
@@ -100,24 +190,62 @@ private function findOrCreateVendor(\InvoiceNinja\EInvoice\Models\Peppol\Invoice
         return $vendor ?? $this->newVendor($invoice);
     }
 
+    private function resolveSupplierName(\InvoiceNinja\EInvoice\Models\Peppol\Invoice $invoice): string
+    {
+        if(data_get($invoice, 'AccountingSupplierParty.Party.PartyName', false)){
+            $party_name = data_get($invoice, 'AccountingSupplierParty.Party.PartyName', false);
+            return data_get($party_name[0], 'Name', '');
+        }
+
+        if (data_get($invoice, 'AccountingSupplierParty.Party.PartyLegalEntity', false)) {
+            $ple = data_get($invoice, 'AccountingSupplierParty.Party.PartyName', false);
+            return data_get($ple[0], 'RegistrationName', '');
+        }
+        
+        return '';
+    }
+
+    private function resolveVendorIdNumber(\InvoiceNinja\EInvoice\Models\Peppol\Invoice $invoice):string
+    {
+         
+        $pts = data_get($invoice, 'AccountingSupplierParty.Party.PartyIdentification', false);
+
+        return $pts ? data_get($pts[0], 'ID.value', '') : '';
+
+    }
+
+    private function resolveVendorVat(\InvoiceNinja\EInvoice\Models\Peppol\Invoice $invoice):string
+    {
+         
+        $pts = data_get($invoice, 'AccountingSupplierParty.Party.PartyTaxScheme', false);
+
+        return $pts ? data_get($pts[0], 'CompanyID.value', '') : '';
+
+    }
+
     private function newVendor(\InvoiceNinja\EInvoice\Models\Peppol\Invoice $invoice): Vendor
     {
         $vendor = VendorFactory::create($this->company->id, $this->company->owner()->id);
 
+    
         $data = [
-            'name' => data_get($invoice, 'AccountingSupplierParty.Party.PartyName.Name', ''),
-            'routing_id' => data_get($invoice, 'AccountingSupplierParty.Party.EndpointID', ''),
-            'vat_number' => data_get($invoice, 'AccountingSupplierParty.Party.PartyTaxScheme.CompanyID', ''),
+            'name' => $this->resolveSupplierName($invoice),
+            'routing_id' => data_get($invoice, 'AccountingSupplierParty.Party.EndpointID.value', ''),
+            'vat_number' => $this->resolveVendorVat($invoice),
+            'id_number' => $this->resolveVendorIdNumber($invoice),
             'address1' => data_get($invoice, 'AccountingSupplierParty.Party.PostalAddress.StreetName',''),
             'address2' => data_get($invoice, 'AccountingSupplierParty.Party.PostalAddress.AdditionalStreetName',''),
             'city' => data_get($invoice, 'AccountingSupplierParty.Party.PostalAddress.CityName',''),
             'state' => data_get($invoice, 'AccountingSupplierParty.Party.PostalAddress.CountrySubentity',''),
             'postal_code' => data_get($invoice, 'AccountingSupplierParty.Party.PostalAddress.PostalZone',''),
-            'country_id' => $this->resovelCountry(data_get($invoice, 'AccountingSupplierParty.Party.PostalAddress.Country.IdentificationCode','')),
+            'country_id' => $this->resolveCountry(data_get($invoice, 'AccountingSupplierParty.Party.PostalAddress.Country.IdentificationCode.value','')),
+            'currency_id' => $this->resolveCurrencyId(data_get($invoice, 'DocumentCurrencyCode.value', $this->company->currency()->code)),
         ];
 
         $vendor->fill($data);
         $vendor->save();
+        
+        $vendor->service()->applyNumber();
 
         if(data_get($invoice, 'AccountingSupplierParty.Party.Contact',false))
         {
@@ -138,6 +266,6 @@ private function resolveCountry(?string $iso_country_code): int
         return Country::query()
                         ->where('iso_3166_2', $iso_country_code)
                         ->orWhere('iso_3166_3', $iso_country_code)
-                        ->first() ?? (int)$this->company->settings->country_id;
+                        ->first()?->id ?? (int)$this->company->settings->country_id;
     }
 }
\ No newline at end of file
diff --git a/app/Utils/Statics.php b/app/Utils/Statics.php
index 79c81b786df..517e15c546c 100644
--- a/app/Utils/Statics.php
+++ b/app/Utils/Statics.php
@@ -124,6 +124,8 @@ public static function company($locale = 'en'): array
 
         $data['bulk_updates'] = [
             'client' => \App\Models\Client::$bulk_update_columns,
+            'expense' => \App\Models\Expense::$bulk_update_columns,
+            'recurring_invoice' => \App\Models\RecurringInvoice::$bulk_update_columns,
         ];
 
         return $data;
diff --git a/database/migrations/2024_10_14_214658_add_routing_id_to_vendors_table.php b/database/migrations/2024_10_14_214658_add_routing_id_to_vendors_table.php
new file mode 100644
index 00000000000..1c26fae848e
--- /dev/null
+++ b/database/migrations/2024_10_14_214658_add_routing_id_to_vendors_table.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('vendors', function (Blueprint $table) {
+            if (!Schema::hasColumn('vendors', 'routing_id')) {
+                $table->string('routing_id')->nullable();
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+    }
+};
diff --git a/tests/Feature/InvoiceEmailTest.php b/tests/Feature/InvoiceEmailTest.php
index 9c1dbd3550e..2b832ba9b8b 100644
--- a/tests/Feature/InvoiceEmailTest.php
+++ b/tests/Feature/InvoiceEmailTest.php
@@ -57,6 +57,27 @@ public function testInvalidEmailParsing()
         $this->assertTrue(strpos($email, '@example.com') !== false);
     }
 
+    public function testEntityValidation()
+    {
+        $data = [
+            "body" => "hey what's up",
+            "entity" => 'blergen',
+            "entity_id" => $this->invoice->hashed_id,
+            "subject" => 'Reminder $number',
+            "template" => "email_template_invoice"
+        ];
+
+        $response = false;
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->postJson('/api/v1/emails', $data);
+
+        $response->assertStatus(422);
+
+    }
+
 
     public function testClientEmailHistory()
     {
diff --git a/tests/Integration/Einvoice/ImportEInvoiceTest.php b/tests/Integration/Einvoice/ImportEInvoiceTest.php
index 465147ff0bf..dc8aa8d0f86 100644
--- a/tests/Integration/Einvoice/ImportEInvoiceTest.php
+++ b/tests/Integration/Einvoice/ImportEInvoiceTest.php
@@ -12,7 +12,10 @@
 namespace Tests\Integration\Einvoice;
 
 use Tests\TestCase;
+use App\Utils\TempFile;
+use Tests\MockAccountData;
 use InvoiceNinja\EInvoice\EInvoice;
+use App\Services\EDocument\Imports\UblEDocument;
 
 
 /**
@@ -20,9 +23,27 @@
  */
 class ImportEInvoiceTest extends TestCase
 {
+    
+use MockAccountData;
+
     protected function setUp(): void
     {
         parent::setUp();
+        
+        $this->makeTestData();
+
+    }
+
+    public function testImportExpenseEinvoice()
+    {
+        $file = file_get_contents(base_path('tests/Integration/Einvoice/samples/peppol.xml'));
+        
+        $file = TempFile::UploadedFileFromRaw($file, 'peppol.xml', 'xml');
+
+        $expense = (new UblEDocument($file, $this->company))->run();
+
+        $this->assertNotNull($expense);
+        
     }
 
     public function testParsingDocument()
@@ -45,57 +66,76 @@ public function testParsingDocument()
         $this->assertInstanceOf(\InvoiceNinja\EInvoice\Models\Peppol\Invoice::class, $invoice);
 
 
-
     }
 
-    // public function testHtmlConversion()
-    // {
+
+    public function testHtmlConversion()
+    {
                 
-    //     // Load the XML source
-    //     $xml = new \DOMDocument();
-    //     $xml->load(base_path('tests/Integration/Einvoice/samples/peppol.xml'));
+        // Load the XML source
+        $xml = new \DOMDocument();
+        $xml->load(base_path('tests/Integration/Einvoice/samples/peppol.xml'));
+
+        // Load XSLT stylesheet
+        $xsl = new \DOMDocument();
+        $xsl->load(base_path('tests/Integration/Einvoice/samples/peppol.xslt'));
+
+        // Configure the transformer
+        $proc = new \XSLTProcessor();
+        $proc->importStyleSheet($xsl); // attach the xsl rules
+
+// $proc->setParameter('', 'mode', 'document');
 
-    //     // Load XSLT stylesheet
-    //     $xsl = new \DOMDocument();
-    //     $xsl->load(base_path('tests/Integration/Einvoice/samples/peppol.xslt'));
 
-    //     // Configure the transformer
-    //     $proc = new \XSLTProcessor();
-    //     $proc->importStyleSheet($xsl); // attach the xsl rules
 
-    //     $transformed = $proc->transformToXML($xml);
+// libxml_use_internal_errors(true);
+// // ... your existing code ...
 
-    //     // determining if output is html document
-    //     $html = $transformed;
+// $transformed = $proc->transformToXML($xml);
+// if ($transformed === false) {
+//     foreach (libxml_get_errors() as $error) {
+//         nlog($error->message);
+//     }
+// } else {
+//     nlog($transformed);
+// }
+// libxml_clear_errors();
 
-    //     // splitting up html document at doctype and doc
-    //     $html_array = explode("\n", $html, 15);
 
-    //     $html_doc = array_pop($html_array);
 
-    //     $html_doctype = implode("\n", $html_array);
+//         nlog($transformed);
 
-    //     // convert XHTML syntax to HTML5
-    //     // <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-    //     // <!DOCTYPE html>
+        // // determining if output is html document
+        // $html = $transformed;
 
+        // // splitting up html document at doctype and doc
+        // $html_array = explode("\n", $html, 15);
 
-    //     $html_doctype = preg_replace("/<!DOCTYPE [^>]+>/", "<!DOCTYPE html>", $html_doctype);
+        // $html_doc = array_pop($html_array);
 
-    //     // <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-    //     // <html lang="en">
+        // $html_doctype = implode("\n", $html_array);
 
+        // // convert XHTML syntax to HTML5
+        // // <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+        // // <!DOCTYPE html>
 
-    //     $html_doctype = preg_replace('/ xmlns=\"http:\/\/www.w3.org\/1999\/xhtml\"| xml:lang="[^\"]*\"/', '', $html_doctype);
 
+        // $html_doctype = preg_replace("/<!DOCTYPE [^>]+>/", "<!DOCTYPE html>", $html_doctype);
 
-    //     // <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    //     // to this --> <meta charset="utf-8" />
+        // // <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+        // // <html lang="en">
 
-    //     $html_doctype = preg_replace('/<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=(.*[a-z0-9-])\" \/>/i', '<meta charset="\1" />', $html_doctype);
 
-    //     $html = $html_doctype . "\n" . $html_doc;
-    //     nlog($html);
+        // $html_doctype = preg_replace('/ xmlns=\"http:\/\/www.w3.org\/1999\/xhtml\"| xml:lang="[^\"]*\"/', '', $html_doctype);
 
-    // }
+
+        // // <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        // // to this --> <meta charset="utf-8" />
+
+        // $html_doctype = preg_replace('/<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=(.*[a-z0-9-])\" \/>/i', '<meta charset="\1" />', $html_doctype);
+
+        // $html = $html_doctype . "\n" . $html_doc;
+        // nlog($html);
+
+    }
 }
\ No newline at end of file
diff --git a/tests/Integration/Einvoice/samples/peppol.xslt b/tests/Integration/Einvoice/samples/peppol.xslt
index a59fcc1404e..1b2ea2557ae 100644
--- a/tests/Integration/Einvoice/samples/peppol.xslt
+++ b/tests/Integration/Einvoice/samples/peppol.xslt
@@ -1,1848 +1,1352 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xsl:stylesheet xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
-                xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
-                xmlns:iso="http://purl.oclc.org/dsdl/schematron"
-                xmlns:saxon="http://saxon.sf.net/"
-                xmlns:schold="http://www.ascc.net/xml/schematron"
-                xmlns:u="utils"
-                xmlns:ubl-creditnote="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2"
-                xmlns:ubl-invoice="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
-                xmlns:xhtml="http://www.w3.org/1999/xhtml"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0"><!--Implementers: please note that overriding process-prolog or process-root is 
-    the preferred method for meta-stylesheets to use where possible. -->
-   <xsl:param name="archiveDirParameter"/>
-   <xsl:param name="archiveNameParameter"/>
-   <xsl:param name="fileNameParameter"/>
-   <xsl:param name="fileDirParameter"/>
-   <xsl:variable name="document-uri">
-      <xsl:value-of select="document-uri(/)"/>
-   </xsl:variable>
-   <!--PHASES-->
-   <!--PROLOG-->
-   <!--XSD TYPES FOR XSLT2-->
-   <!--KEYS AND FUNCTIONS-->
-   <!-- <function xmlns="http://www.w3.org/1999/XSL/Transform"
-             name="u:gln"
-             as="xs:boolean">
-      <param name="val"/>
-      <variable name="length" select="string-length($val) - 1"/>
-      <variable name="digits"
-                select="reverse(for $i in string-to-codepoints(substring($val, 0, $length + 1)) return $i - 48)"/>
-      <variable name="weightedSum"
-                select="sum(for $i in (0 to $length - 1) return $digits[$i + 1] * (1 + ((($i + 1) mod 2) * 2)))"/>
-      <value-of select="(10 - ($weightedSum mod 10)) mod 10 = number(substring($val, $length + 1, 1))"/>
-   </function> -->
-   <!-- <function xmlns="http://www.w3.org/1999/XSL/Transform"
-             name="u:slack"
-             as="xs:boolean">
-      <param name="exp" as="xs:decimal"/>
-      <param name="val" as="xs:decimal"/>
-      <param name="slack" as="xs:decimal"/>
-      <value-of select="xs:decimal($exp + $slack) &gt;= $val and xs:decimal($exp - $slack) &lt;= $val"/>
-   </function> -->
-   <!-- <function xmlns="http://www.w3.org/1999/XSL/Transform"
-             name="u:mod11"
-             as="xs:boolean">
-      <param name="val"/>
-      <variable name="length" select="string-length($val) - 1"/>
-      <variable name="digits"
-                select="reverse(for $i in string-to-codepoints(substring($val, 0, $length + 1)) return $i - 48)"/>
-      <variable name="weightedSum"
-                select="sum(for $i in (0 to $length - 1) return $digits[$i + 1] * (($i mod 6) + 2))"/>
-      <value-of select="number($val) &gt; 0 and (11 - ($weightedSum mod 11)) mod 11 = number(substring($val, $length + 1, 1))"/>
-   </function> -->
-   <!-- <function xmlns="http://www.w3.org/1999/XSL/Transform"
-             name="u:mod97-0208"
-             as="xs:boolean">
-      <param name="val"/>
-      <variable name="checkdigits" select="substring($val,9,2)"/>
-      <variable name="calculated_digits"
-                select="xs:string(97 - (xs:integer(substring($val,1,8)) mod 97))"/>
-      <value-of select="number($checkdigits) = number($calculated_digits)"/>
-   </function> -->
-   <!-- <function xmlns="http://www.w3.org/1999/XSL/Transform"
-             name="u:checkCodiceIPA"
-             as="xs:boolean">
-      <param name="arg" as="xs:string?"/>
-      <variable name="allowed-characters">
-      ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789</variable>
-      <sequence select="if ( (string-length(translate($arg, $allowed-characters, '')) = 0) and (string-length($arg) = 6) ) then true() else false()"/>
-   </function> -->
-   <function xmlns="http://www.w3.org/1999/XSL/Transform"
-             name="u:checkCF"
-             as="xs:boolean">
-      <param name="arg" as="xs:string?"/>
-      <sequence select="   if ( (string-length($arg) = 16) or (string-length($arg) = 11) )      then    (    if ((string-length($arg) = 16))     then    (     if (u:checkCF16($arg))      then     (      true()     )     else     (      false()     )    )    else    (     if(($arg castable as xs:integer)) then true() else false()       )   )   else   (    false()   )   "/>
-   </function>
-   <function xmlns="http://www.w3.org/1999/XSL/Transform"
-             name="u:checkCF16"
-             as="xs:boolean">
-      <param name="arg" as="xs:string?"/>
-      <variable name="allowed-characters">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz</variable>
-      <sequence select="     if (  (string-length(translate(substring($arg,1,6), $allowed-characters, '')) = 0) and         (substring($arg,7,2) castable as xs:integer) and        (string-length(translate(substring($arg,9,1), $allowed-characters, '')) = 0) and        (substring($arg,10,2) castable as xs:integer) and         (substring($arg,12,3) castable as xs:string) and        (substring($arg,15,1) castable as xs:integer) and         (string-length(translate(substring($arg,16,1), $allowed-characters, '')) = 0)      )      then true()     else false()     "/>
-   </function>
-   <function xmlns="http://www.w3.org/1999/XSL/Transform"
-             name="u:checkPIVAseIT"
-             as="xs:boolean">
-      <param name="arg" as="xs:string"/>
-      <variable name="paese" select="substring($arg,1,2)"/>
-      <variable name="codice" select="substring($arg,3)"/>
-      <sequence select="     if ( $paese = 'IT' or $paese = 'it' )    then    (     if ( ( string-length($codice) = 11 ) and ( if (u:checkPIVA($codice)!=0) then false() else true() ))     then     (      true()     )     else     (      false()     )    )    else    (     true()    )      "/>
-   </function>
-   <function xmlns="http://www.w3.org/1999/XSL/Transform"
-             name="u:checkPIVA"
-             as="xs:integer">
-      <param name="arg" as="xs:string?"/>
-      <sequence select="     if (not($arg castable as xs:integer))       then 1      else ( u:addPIVA($arg,xs:integer(0)) mod 10 )"/>
-   </function>
-   <function xmlns="http://www.w3.org/1999/XSL/Transform"
-             name="u:addPIVA"
-             as="xs:integer">
-      <param name="arg" as="xs:string"/>
-      <param name="pari" as="xs:integer"/>
-      <variable name="tappo"
-                select="if (not($arg castable as xs:integer)) then 0 else 1"/>
-      <variable name="mapper"
-                select="if ($tappo = 0) then 0 else                    ( if ($pari = 1)                     then ( xs:integer(substring('0246813579', ( xs:integer(substring($arg,1,1)) +1 ) ,1)) )                     else ( xs:integer(substring($arg,1,1) ) )                   )"/>
-      <sequence select="if ($tappo = 0) then $mapper else ( xs:integer($mapper) + u:addPIVA(substring(xs:string($arg),2), (if($pari=0) then 1 else 0) ) )"/>
-   </function>
-   <function xmlns="http://www.w3.org/1999/XSL/Transform"
-             name="u:abn"
-             as="xs:boolean">
-      <param name="val"/>
-      <value-of select="( ((string-to-codepoints(substring($val,1,1)) - 49) * 10) + ((string-to-codepoints(substring($val,2,1)) - 48) * 1) + ((string-to-codepoints(substring($val,3,1)) - 48) * 3) + ((string-to-codepoints(substring($val,4,1)) - 48) * 5) + ((string-to-codepoints(substring($val,5,1)) - 48) * 7) + ((string-to-codepoints(substring($val,6,1)) - 48) * 9) + ((string-to-codepoints(substring($val,7,1)) - 48) * 11) + ((string-to-codepoints(substring($val,8,1)) - 48) * 13) + ((string-to-codepoints(substring($val,9,1)) - 48) * 15) + ((string-to-codepoints(substring($val,10,1)) - 48) * 17) + ((string-to-codepoints(substring($val,11,1)) - 48) * 19)) mod 89 = 0 "/>
-   </function>
-   <function xmlns="http://www.w3.org/1999/XSL/Transform"
-             name="u:TinVerification"
-             as="xs:boolean">
-      <param name="val" as="xs:string"/>
-      <variable name="digits"
-                select="    for $ch in string-to-codepoints($val)    return codepoints-to-string($ch)"/>
-      <variable name="checksum"
-                select="    (number($digits[8])*2) +    (number($digits[7])*4) +    (number($digits[6])*8) +    (number($digits[5])*16) +    (number($digits[4])*32) +    (number($digits[3])*64) +    (number($digits[2])*128) +    (number($digits[1])*256) "/>
-      <value-of select="($checksum  mod 11) mod 10 = number($digits[9])"/>
-   </function>
-   <function xmlns="http://www.w3.org/1999/XSL/Transform"
-             name="u:checkSEOrgnr"
-             as="xs:boolean">
-      <param name="number" as="xs:string"/>
-      <choose>
-      <!-- Check if input is numeric -->
-         <when test="not(matches($number, '^\d+$'))">
-            <sequence select="false()"/>
-         </when>
-         <otherwise>
-        <!-- verify the check number of the provided identifier according to the Luhn algorithm-->
-            <variable name="mainPart" select="substring($number, 1, 9)"/>
-            <variable name="checkDigit" select="substring($number, 10, 1)"/>
-            <variable name="sum" as="xs:integer">
-               <value-of select="sum(       for $pos in 1 to string-length($mainPart) return         if ($pos mod 2 = 1)         then (number(substring($mainPart, string-length($mainPart) - $pos + 1, 1)) * 2) mod 10 +           (number(substring($mainPart, string-length($mainPart) - $pos + 1, 1)) * 2) idiv 10         else number(substring($mainPart, string-length($mainPart) - $pos + 1, 1))      )"/>
-            </variable>
-            <variable name="calculatedCheckDigit" select="(10 - $sum mod 10) mod 10"/>
-            <sequence select="$calculatedCheckDigit = number($checkDigit)"/>
-         </otherwise>
-      </choose>
-   </function>
-   <!--DEFAULT RULES-->
-   <!--MODE: SCHEMATRON-SELECT-FULL-PATH-->
-   <!--This mode can be used to generate an ugly though full XPath for locators-->
-   <xsl:template match="*" mode="schematron-select-full-path">
-      <xsl:apply-templates select="." mode="schematron-get-full-path"/>
-   </xsl:template>
-   <!--MODE: SCHEMATRON-FULL-PATH-->
-   <!--This mode can be used to generate an ugly though full XPath for locators-->
-   <xsl:template match="*" mode="schematron-get-full-path">
-      <xsl:apply-templates select="parent::*" mode="schematron-get-full-path"/>
-      <xsl:text>/</xsl:text>
-      <xsl:choose>
-         <xsl:when test="namespace-uri()=''">
-            <xsl:value-of select="name()"/>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:text>*:</xsl:text>
-            <xsl:value-of select="local-name()"/>
-            <xsl:text>[namespace-uri()='</xsl:text>
-            <xsl:value-of select="namespace-uri()"/>
-            <xsl:text>']</xsl:text>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:variable name="preceding"
-                    select="count(preceding-sibling::*[local-name()=local-name(current())                                   and namespace-uri() = namespace-uri(current())])"/>
-      <xsl:text>[</xsl:text>
-      <xsl:value-of select="1+ $preceding"/>
-      <xsl:text>]</xsl:text>
-   </xsl:template>
-   <xsl:template match="@*" mode="schematron-get-full-path">
-      <xsl:apply-templates select="parent::*" mode="schematron-get-full-path"/>
-      <xsl:text>/</xsl:text>
-      <xsl:choose>
-         <xsl:when test="namespace-uri()=''">@<xsl:value-of select="name()"/>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:text>@*[local-name()='</xsl:text>
-            <xsl:value-of select="local-name()"/>
-            <xsl:text>' and namespace-uri()='</xsl:text>
-            <xsl:value-of select="namespace-uri()"/>
-            <xsl:text>']</xsl:text>
-         </xsl:otherwise>
-      </xsl:choose>
-   </xsl:template>
-   <!--MODE: SCHEMATRON-FULL-PATH-2-->
-   <!--This mode can be used to generate prefixed XPath for humans-->
-   <xsl:template match="node() | @*" mode="schematron-get-full-path-2">
-      <xsl:for-each select="ancestor-or-self::*">
-         <xsl:text>/</xsl:text>
-         <xsl:value-of select="name(.)"/>
-         <xsl:if test="preceding-sibling::*[name(.)=name(current())]">
-            <xsl:text>[</xsl:text>
-            <xsl:value-of select="count(preceding-sibling::*[name(.)=name(current())])+1"/>
-            <xsl:text>]</xsl:text>
-         </xsl:if>
-      </xsl:for-each>
-      <xsl:if test="not(self::*)">
-         <xsl:text/>/@<xsl:value-of select="name(.)"/>
-      </xsl:if>
-   </xsl:template>
-   <!--MODE: SCHEMATRON-FULL-PATH-3-->
-   <!--This mode can be used to generate prefixed XPath for humans 
-	(Top-level element has index)-->
-   <xsl:template match="node() | @*" mode="schematron-get-full-path-3">
-      <xsl:for-each select="ancestor-or-self::*">
-         <xsl:text>/</xsl:text>
-         <xsl:value-of select="name(.)"/>
-         <xsl:if test="parent::*">
-            <xsl:text>[</xsl:text>
-            <xsl:value-of select="count(preceding-sibling::*[name(.)=name(current())])+1"/>
-            <xsl:text>]</xsl:text>
-         </xsl:if>
-      </xsl:for-each>
-      <xsl:if test="not(self::*)">
-         <xsl:text/>/@<xsl:value-of select="name(.)"/>
-      </xsl:if>
-   </xsl:template>
-   <!--MODE: GENERATE-ID-FROM-PATH -->
-   <xsl:template match="/" mode="generate-id-from-path"/>
-   <xsl:template match="text()" mode="generate-id-from-path">
-      <xsl:apply-templates select="parent::*" mode="generate-id-from-path"/>
-      <xsl:value-of select="concat('.text-', 1+count(preceding-sibling::text()), '-')"/>
-   </xsl:template>
-   <xsl:template match="comment()" mode="generate-id-from-path">
-      <xsl:apply-templates select="parent::*" mode="generate-id-from-path"/>
-      <xsl:value-of select="concat('.comment-', 1+count(preceding-sibling::comment()), '-')"/>
-   </xsl:template>
-   <xsl:template match="processing-instruction()" mode="generate-id-from-path">
-      <xsl:apply-templates select="parent::*" mode="generate-id-from-path"/>
-      <xsl:value-of select="concat('.processing-instruction-', 1+count(preceding-sibling::processing-instruction()), '-')"/>
-   </xsl:template>
-   <xsl:template match="@*" mode="generate-id-from-path">
-      <xsl:apply-templates select="parent::*" mode="generate-id-from-path"/>
-      <xsl:value-of select="concat('.@', name())"/>
-   </xsl:template>
-   <xsl:template match="*" mode="generate-id-from-path" priority="-0.5">
-      <xsl:apply-templates select="parent::*" mode="generate-id-from-path"/>
-      <xsl:text>.</xsl:text>
-      <xsl:value-of select="concat('.',name(),'-',1+count(preceding-sibling::*[name()=name(current())]),'-')"/>
-   </xsl:template>
-   <!--MODE: GENERATE-ID-2 -->
-   <xsl:template match="/" mode="generate-id-2">U</xsl:template>
-   <xsl:template match="*" mode="generate-id-2" priority="2">
-      <xsl:text>U</xsl:text>
-      <xsl:number level="multiple" count="*"/>
-   </xsl:template>
-   <xsl:template match="node()" mode="generate-id-2">
-      <xsl:text>U.</xsl:text>
-      <xsl:number level="multiple" count="*"/>
-      <xsl:text>n</xsl:text>
-      <xsl:number count="node()"/>
-   </xsl:template>
-   <xsl:template match="@*" mode="generate-id-2">
-      <xsl:text>U.</xsl:text>
-      <xsl:number level="multiple" count="*"/>
-      <xsl:text>_</xsl:text>
-      <xsl:value-of select="string-length(local-name(.))"/>
-      <xsl:text>_</xsl:text>
-      <xsl:value-of select="translate(name(),':','.')"/>
-   </xsl:template>
-   <!--Strip characters-->
-   <xsl:template match="text()" priority="-1"/>
-   <!--SCHEMA SETUP-->
-   <xsl:template match="/">
-      <xsl:apply-templates select="/" mode="M24"/>
-      <xsl:apply-templates select="/" mode="M25"/>
-      <xsl:apply-templates select="/" mode="M26"/>
-      <xsl:apply-templates select="/" mode="M27"/>
-      <xsl:apply-templates select="/" mode="M28"/>
-      <xsl:apply-templates select="/" mode="M29"/>
-      <xsl:apply-templates select="/" mode="M30"/>
-      <xsl:apply-templates select="/" mode="M35"/>
-      <xsl:apply-templates select="/" mode="M36"/>
-      <xsl:apply-templates select="/" mode="M37"/>
-      <xsl:apply-templates select="/" mode="M38"/>
-      <xsl:apply-templates select="/" mode="M39"/>
-   </xsl:template>
-   <!--SCHEMATRON PATTERNS-->
-   <xsl:param name="profile"
-              select="       if (/*/cbc:ProfileID and matches(normalize-space(/*/cbc:ProfileID), 'urn:fdc:peppol.eu:2017:poacc:billing:([0-9]{2}):1.0')) then         tokenize(normalize-space(/*/cbc:ProfileID), ':')[7]       else         'Unknown'"/>
-   <xsl:param name="supplierCountry"
-              select="       if (/*/cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)) then         upper-case(normalize-space(/*/cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)))       else         if (/*/cac:TaxRepresentativeParty/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)) then           upper-case(normalize-space(/*/cac:TaxRepresentativeParty/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)))         else           if (/*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode) then             upper-case(normalize-space(/*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode))           else             'XX'"/>
-   <xsl:param name="customerCountry"
-              select="   if (/*/cac:AccountingCustomerParty/cac:Party/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)) then   upper-case(normalize-space(/*/cac:AccountingCustomerParty/cac:Party/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)))   else   if (/*/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode) then   upper-case(normalize-space(/*/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode))   else   'XX'"/>
-   <xsl:param name="documentCurrencyCode" select="/*/cbc:DocumentCurrencyCode"/>
-   <!--PATTERN -->
-   <!--RULE -->
-   <xsl:template match="//*[not(*) and not(normalize-space())]"
-                 priority="1000"
-                 mode="M24">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="false()"/>
-         <xsl:otherwise>Document MUST not contain empty
-        elements.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M24"/>
-   </xsl:template>
-   <xsl:template match="text()" priority="-1" mode="M24"/>
-   <xsl:template match="@*|node()" priority="-2" mode="M24">
-      <xsl:apply-templates select="*" mode="M24"/>
-   </xsl:template>
-   <!--PATTERN -->
-   <!--RULE -->
-   <xsl:template match="ubl-creditnote:CreditNote" priority="1000" mode="M25">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="(count(cac:AdditionalDocumentReference[cbc:DocumentTypeCode='50']) &lt;= 1)"/>
-         <xsl:otherwise>Only one project reference is allowed on document level<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M25"/>
-   </xsl:template>
-   <xsl:template match="text()" priority="-1" mode="M25"/>
-   <xsl:template match="@*|node()" priority="-2" mode="M25">
-      <xsl:apply-templates select="*" mode="M25"/>
-   </xsl:template>
-   <!--PATTERN -->
-   <!--RULE -->
-   <xsl:template match="ubl-creditnote:CreditNote | ubl-invoice:Invoice"
-                 priority="1023"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="cbc:ProfileID"/>
-         <xsl:otherwise>Business process MUST be
-        provided.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="$profile != 'Unknown'"/>
-         <xsl:otherwise>Business process
-        MUST be in the format 'urn:fdc:peppol.eu:2017:poacc:billing:NN:1.0' where NN indicates the
-        process number.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="count(cbc:Note) &lt;= 1"/>
-         <xsl:otherwise>No more than one
-        note is allowed on document level.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="cbc:BuyerReference or cac:OrderReference/cbc:ID"/>
-         <xsl:otherwise>A buyer reference or purchase order reference MUST be provided.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="starts-with(normalize-space(cbc:CustomizationID/text()), 'urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0')"/>
-         <xsl:otherwise>Specification identifier MUST have the value
-        'urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0'.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="count(cac:TaxTotal[cac:TaxSubtotal]) = 1"/>
-         <xsl:otherwise>Only
-        one tax total with tax subtotals MUST be provided.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="count(cac:TaxTotal[not(cac:TaxSubtotal)]) = (if (cbc:TaxCurrencyCode) then 1 else 0)"/>
-         <xsl:otherwise>Only one tax total without tax subtotals MUST be provided when tax currency
-        code is provided.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not(cbc:TaxCurrencyCode) or (cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:TaxCurrencyCode)] &lt;= 0 and cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:DocumentCurrencyCode)] &lt;= 0) or (cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:TaxCurrencyCode)] &gt;= 0 and cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:DocumentCurrencyCode)] &gt;= 0) "/>
-         <xsl:otherwise>Invoice total VAT amount and Invoice total VAT amount in accounting currency
-        MUST have the same operational sign<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:TaxCurrencyCode" priority="1022" mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not(normalize-space(text()) = normalize-space(../cbc:DocumentCurrencyCode/text()))"/>
-         <xsl:otherwise>VAT accounting currency code MUST be different from invoice currency code when
-        provided.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AccountingCustomerParty/cac:Party"
-                 priority="1021"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="cbc:EndpointID"/>
-         <xsl:otherwise>Buyer electronic address
-        MUST be provided<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AccountingSupplierParty/cac:Party"
-                 priority="1020"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="cbc:EndpointID"/>
-         <xsl:otherwise>Seller electronic address
-        MUST be provided<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="ubl-invoice:Invoice/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)] | ubl-invoice:Invoice/cac:InvoiceLine/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)] | ubl-creditnote:CreditNote/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)] | ubl-creditnote:CreditNote/cac:CreditNoteLine/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)]"
-                 priority="1019"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="false()"/>
-         <xsl:otherwise>Allowance/charge base amount MUST
-        be provided when allowance/charge percentage is provided.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="ubl-invoice:Invoice/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount] | ubl-invoice:Invoice/cac:InvoiceLine/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount] | ubl-creditnote:CreditNote/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount] | ubl-creditnote:CreditNote/cac:CreditNoteLine/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount]"
-                 priority="1018"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="false()"/>
-         <xsl:otherwise>Allowance/charge percentage MUST
-        be provided when allowance/charge base amount is provided.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="ubl-invoice:Invoice/cac:AllowanceCharge | ubl-invoice:Invoice/cac:InvoiceLine/cac:AllowanceCharge | ubl-creditnote:CreditNote/cac:AllowanceCharge | ubl-creditnote:CreditNote/cac:CreditNoteLine/cac:AllowanceCharge"
-                 priority="1017"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="           not(cbc:MultiplierFactorNumeric and cbc:BaseAmount) or u:slack(if (cbc:Amount) then             cbc:Amount           else             0, (xs:decimal(cbc:BaseAmount) * xs:decimal(cbc:MultiplierFactorNumeric)) div 100, 0.02)"/>
-         <xsl:otherwise>Allowance/charge amount must equal base amount * percentage/100 if base amount
-        and percentage exists<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="normalize-space(cbc:ChargeIndicator/text()) = 'true' or normalize-space(cbc:ChargeIndicator/text()) = 'false'"/>
-         <xsl:otherwise>Allowance/charge ChargeIndicator value MUST equal 'true' or 'false'<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="         cac:PaymentMeans[some $code in tokenize('49 59', '\s')           satisfies normalize-space(cbc:PaymentMeansCode) = $code]"
-                 priority="1016"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="cac:PaymentMandate/cbc:ID"/>
-         <xsl:otherwise>Mandate
-        reference MUST be provided for direct debit.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:Amount | cbc:BaseAmount | cbc:PriceAmount | cac:TaxTotal[cac:TaxSubtotal]/cbc:TaxAmount | cbc:TaxableAmount | cbc:LineExtensionAmount | cbc:TaxExclusiveAmount | cbc:TaxInclusiveAmount | cbc:AllowanceTotalAmount | cbc:ChargeTotalAmount | cbc:PrepaidAmount | cbc:PayableRoundingAmount | cbc:PayableAmount"
-                 priority="1015"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="@currencyID = $documentCurrencyCode"/>
-         <xsl:otherwise>All
-        currencyID attributes must have the same value as the invoice currency code (BT-5), except
-        for the invoice total VAT amount in accounting currency (BT-111).<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="ubl-invoice:Invoice[cac:InvoicePeriod/cbc:StartDate]/cac:InvoiceLine/cac:InvoicePeriod/cbc:StartDate | ubl-creditnote:CreditNote[cac:InvoicePeriod/cbc:StartDate]/cac:CreditNoteLine/cac:InvoicePeriod/cbc:StartDate"
-                 priority="1014"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="xs:date(text()) &gt;= xs:date(../../../cac:InvoicePeriod/cbc:StartDate)"/>
-         <xsl:otherwise>Start
-        date of line period MUST be within invoice period.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="ubl-invoice:Invoice[cac:InvoicePeriod/cbc:EndDate]/cac:InvoiceLine/cac:InvoicePeriod/cbc:EndDate | ubl-creditnote:CreditNote[cac:InvoicePeriod/cbc:EndDate]/cac:CreditNoteLine/cac:InvoicePeriod/cbc:EndDate"
-                 priority="1013"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="xs:date(text()) &lt;= xs:date(../../../cac:InvoicePeriod/cbc:EndDate)"/>
-         <xsl:otherwise>End
-        date of line period MUST be within invoice period.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:InvoiceLine | cac:CreditNoteLine"
-                 priority="1012"
-                 mode="M26">
-      <xsl:variable name="lineExtensionAmount"
-                    select="           if (cbc:LineExtensionAmount) then             xs:decimal(cbc:LineExtensionAmount)           else             0"/>
-      <xsl:variable name="quantity"
-                    select="           if (/ubl-invoice:Invoice) then             (if (cbc:InvoicedQuantity) then               xs:decimal(cbc:InvoicedQuantity)             else               1)           else             (if (cbc:CreditedQuantity) then               xs:decimal(cbc:CreditedQuantity)             else               1)"/>
-      <xsl:variable name="priceAmount"
-                    select="           if (cac:Price/cbc:PriceAmount) then             xs:decimal(cac:Price/cbc:PriceAmount)           else             0"/>
-      <xsl:variable name="baseQuantity"
-                    select="           if (cac:Price/cbc:BaseQuantity and xs:decimal(cac:Price/cbc:BaseQuantity) != 0) then             xs:decimal(cac:Price/cbc:BaseQuantity)           else             1"/>
-      <xsl:variable name="allowancesTotal"
-                    select="           if (cac:AllowanceCharge[normalize-space(cbc:ChargeIndicator) = 'false']) then             round(sum(cac:AllowanceCharge[normalize-space(cbc:ChargeIndicator) = 'false']/cbc:Amount/xs:decimal(.)) * 10 * 10) div 100           else             0"/>
-      <xsl:variable name="chargesTotal"
-                    select="           if (cac:AllowanceCharge[normalize-space(cbc:ChargeIndicator) = 'true']) then             round(sum(cac:AllowanceCharge[normalize-space(cbc:ChargeIndicator) = 'true']/cbc:Amount/xs:decimal(.)) * 10 * 10) div 100           else             0"/>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="u:slack($lineExtensionAmount, ($quantity * ($priceAmount div $baseQuantity)) + $chargesTotal - $allowancesTotal, 0.02)"/>
-         <xsl:otherwise>Invoice line net amount MUST equal (Invoiced quantity * (Item net price/item
-        price base quantity) + Sum of invoice line charge amount - sum of invoice line allowance
-        amount<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not(cac:Price/cbc:BaseQuantity) or xs:decimal(cac:Price/cbc:BaseQuantity) &gt; 0"/>
-         <xsl:otherwise>Base quantity MUST be a positive number above zero.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="(count(cac:DocumentReference) &lt;= 1)"/>
-         <xsl:otherwise>Only
-        one invoiced object is allowed pr line<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="(not(cac:DocumentReference) or (cac:DocumentReference/cbc:DocumentTypeCode='130'))"/>
-         <xsl:otherwise>Element Document reference can only be used for Invoice line object<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:Price/cac:AllowanceCharge" priority="1011" mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="normalize-space(cbc:ChargeIndicator) = 'false'"/>
-         <xsl:otherwise>Charge on price level is NOT allowed. Only value 'false' allowed.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not(cbc:BaseAmount) or xs:decimal(../cbc:PriceAmount) = xs:decimal(cbc:BaseAmount) - xs:decimal(cbc:Amount)"/>
-         <xsl:otherwise>Item net price MUST equal (Gross price - Allowance amount) when gross price is
-        provided.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:Price/cbc:BaseQuantity[@unitCode]"
-                 priority="1010"
-                 mode="M26">
-      <xsl:variable name="hasQuantity"
-                    select="../../cbc:InvoicedQuantity or ../../cbc:CreditedQuantity"/>
-      <xsl:variable name="quantity"
-                    select="           if (/ubl-invoice:Invoice) then             ../../cbc:InvoicedQuantity           else             ../../cbc:CreditedQuantity"/>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not($hasQuantity) or @unitCode = $quantity/@unitCode"/>
-         <xsl:otherwise>Unit code of price base quantity MUST be same as invoiced quantity.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:EndpointID[@schemeID = '0088'] | cac:PartyIdentification/cbc:ID[@schemeID = '0088'] | cbc:CompanyID[@schemeID = '0088']"
-                 priority="1009"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="matches(normalize-space(), '^[0-9]+$') and u:gln(normalize-space())"/>
-         <xsl:otherwise>GLN
-        must have a valid format according to GS1 rules.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:EndpointID[@schemeID = '0192'] | cac:PartyIdentification/cbc:ID[@schemeID = '0192'] | cbc:CompanyID[@schemeID = '0192']"
-                 priority="1008"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="matches(normalize-space(), '^[0-9]{9}$') and u:mod11(normalize-space())"/>
-         <xsl:otherwise>Norwegian
-        organization number MUST be stated in the correct format.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:EndpointID[@schemeID = '0184'] | cac:PartyIdentification/cbc:ID[@schemeID = '0184'] | cbc:CompanyID[@schemeID = '0184']"
-                 priority="1007"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="(string-length(text()) = 10) and (substring(text(), 1, 2) = 'DK') and (string-length(translate(substring(text(), 3, 8), '1234567890', '')) = 0)"/>
-         <xsl:otherwise>Danish organization number (CVR) MUST be stated in the correct format.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:EndpointID[@schemeID = '0208'] | cac:PartyIdentification/cbc:ID[@schemeID = '0208'] | cbc:CompanyID[@schemeID = '0208']"
-                 priority="1006"
-                 mode="M26">
+<!--
 
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="matches(normalize-space(), '^[0-9]{10}$') and u:mod97-0208(normalize-space())"/>
-         <xsl:otherwise>Belgian enterprise number MUST be stated in the correct format.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:EndpointID[@schemeID = '0201'] | cac:PartyIdentification/cbc:ID[@schemeID = '0201'] | cbc:CompanyID[@schemeID = '0201']"
-                 priority="1005"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="u:checkCodiceIPA(normalize-space())"/>
-         <xsl:otherwise>IPA
-        Code (Codice Univoco Unità Organizzativa) must be stated in the correct format<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:EndpointID[@schemeID = '0210'] | cac:PartyIdentification/cbc:ID[@schemeID = '0210'] | cbc:CompanyID[@schemeID = '0210']"
-                 priority="1004"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="u:checkCF(normalize-space())"/>
-         <xsl:otherwise>Tax Code
-        (Codice Fiscale) must be stated in the correct format<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:EndpointID[@schemeID = '9907']"
-                 priority="1003"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="u:checkCF(normalize-space())"/>
-         <xsl:otherwise>Tax Code
-        (Codice Fiscale) must be stated in the correct format<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:EndpointID[@schemeID = '0211'] | cac:PartyIdentification/cbc:ID[@schemeID = '0211'] | cbc:CompanyID[@schemeID = '0211']"
-                 priority="1002"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="u:checkPIVAseIT(normalize-space())"/>
-         <xsl:otherwise>Italian
-        VAT Code (Partita Iva) must be stated in the correct format<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:EndpointID[@schemeID = '0007'] | cac:PartyIdentification/cbc:ID[@schemeID = '0007'] | cbc:CompanyID[@schemeID = '0007']"
-                 priority="1001"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string-length(normalize-space()) = 10 and string(number(normalize-space())) != 'NaN' and u:checkSEOrgnr(normalize-space())"/>
-         <xsl:otherwise>Swedish organization number MUST be stated in the correct format.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:EndpointID[@schemeID = '0151'] | cac:PartyIdentification/cbc:ID[@schemeID = '0151'] | cbc:CompanyID[@schemeID = '0151']"
-                 priority="1000"
-                 mode="M26">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="matches(normalize-space(), '^[0-9]{11}$') and u:abn(normalize-space())"/>
-         <xsl:otherwise>Australian
-        Business Number (ABN) MUST be stated in the correct format.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <xsl:template match="text()" priority="-1" mode="M26"/>
-   <xsl:template match="@*|node()" priority="-2" mode="M26">
-      <xsl:apply-templates select="*" mode="M26"/>
-   </xsl:template>
-   <!--PATTERN -->
-   <!--RULE -->
-   <xsl:template match="cac:AccountingSupplierParty/cac:Party[$supplierCountry = 'NO']"
-                 priority="1000"
-                 mode="M27">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="normalize-space(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'TAX']/cbc:CompanyID) = 'Foretaksregisteret'"/>
-         <xsl:otherwise>For Norwegian suppliers, most invoice issuers are required to append
-        "Foretaksregisteret" to their
-        invoice. "Dersom selger er aksjeselskap, allmennaksjeselskap eller filial av utenlandsk
-        selskap skal også ordet «Foretaksregisteret» fremgå av salgsdokumentet, jf.
-        foretaksregisterloven § 10-2."<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/substring(cbc:CompanyID, 1, 2)='NO' and matches(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/substring(cbc:CompanyID,3), '^[0-9]{9}MVA$')           and u:mod11(substring(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID, 3, 9)) or not(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/substring(cbc:CompanyID, 1, 2)='NO')"/>
-         <xsl:otherwise>For Norwegian suppliers, a VAT number MUST be the country code prefix NO
-        followed by a valid Norwegian organization number (nine numbers) followed by the letters
-        MVA.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M27"/>
-   </xsl:template>
-   <xsl:template match="text()" priority="-1" mode="M27"/>
-   <xsl:template match="@*|node()" priority="-2" mode="M27">
-      <xsl:apply-templates select="*" mode="M27"/>
-   </xsl:template>
-   <!--PATTERN -->
-   <xsl:variable name="DKSupplierCountry"
-                 select="concat(ubl-creditnote:CreditNote/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode, ubl-invoice:Invoice/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)"/>
-   <xsl:variable name="DKCustomerCountry"
-                 select="concat(ubl-creditnote:CreditNote/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode, ubl-invoice:Invoice/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)"/>
-   <!--RULE -->
-   <xsl:template match="ubl-creditnote:CreditNote[$DKSupplierCountry = 'DK'] | ubl-invoice:Invoice[$DKSupplierCountry = 'DK']"
-                 priority="1004"
-                 mode="M28">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="(normalize-space(cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID/text()) != '')"/>
-         <xsl:otherwise>Danish suppliers MUST provide legal entity (CVR-number)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not(((boolean(cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID))           and (normalize-space(cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID/@schemeID) != '0184'))       )"/>
-         <xsl:otherwise>For Danish Suppliers it is mandatory to specify schemeID as "0184" (DK
-        CVR-number) when PartyLegalEntity/CompanyID is used for AccountingSupplierParty<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not((boolean(/ubl-creditnote:CreditNote) and ($DKCustomerCountry = 'DK'))       and (number(cac:LegalMonetaryTotal/cbc:PayableAmount/text()) &lt; 0)       )"/>
-         <xsl:otherwise>For Danish Suppliers, a Credit note cannot have a negative total
-        (PayableAmount)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M28"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="ubl-creditnote:CreditNote[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']/cac:AccountingSupplierParty/cac:Party/cac:PartyIdentification | ubl-creditnote:CreditNote[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']/cac:AccountingCustomerParty/cac:Party/cac:PartyIdentification | ubl-invoice:Invoice[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']/cac:AccountingSupplierParty/cac:Party/cac:PartyIdentification | ubl-invoice:Invoice[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']/cac:AccountingCustomerParty/cac:Party/cac:PartyIdentification"
-                 priority="1003"
-                 mode="M28">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not((boolean(cbc:ID))        and (normalize-space(cbc:ID/@schemeID) = '')       )"/>
-         <xsl:otherwise>For Danish Suppliers it is mandatory to use schemeID when
-        PartyIdentification/ID is used for AccountingCustomerParty or AccountingSupplierParty<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M28"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="ubl-invoice:Invoice[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']/cac:PaymentMeans"
-                 priority="1002"
-                 mode="M28">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="contains(' 1 10 31 42 48 49 50 58 59 93 97 ', concat(' ', cbc:PaymentMeansCode, ' '))"/>
-         <xsl:otherwise>For Danish suppliers the following Payment means codes are allowed: 1, 10, 31,
-        42, 48, 49, 50, 58, 59, 93 and 97<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not(((cbc:PaymentMeansCode = '31') or (cbc:PaymentMeansCode = '42'))       and not((normalize-space(cac:PayeeFinancialAccount/cbc:ID/text()) != '') and (normalize-space(cac:PayeeFinancialAccount/cac:FinancialInstitutionBranch/cbc:ID/text()) != ''))       )"/>
-         <xsl:otherwise>For Danish suppliers bank account and registration account is mandatory if
-        payment means is 31 or 42<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not((cbc:PaymentMeansCode = '49')       and not((normalize-space(cac:PaymentMandate/cbc:ID/text()) != '')           and (normalize-space(cac:PaymentMandate/cac:PayerFinancialAccount/cbc:ID/text()) != ''))       )"/>
-         <xsl:otherwise>For Danish suppliers PaymentMandate/ID and PayerFinancialAccount/ID are
-        mandatory when payment means is 49<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not((cbc:PaymentMeansCode = '50')       and not(((substring(cbc:PaymentID, 1, 3) = '01#')           or (substring(cbc:PaymentID, 1, 3) = '04#')           or (substring(cbc:PaymentID, 1, 3) = '15#'))         and (string-length(cac:PayeeFinancialAccount/cbc:ID/text()) = 7)         )       )"/>
-         <xsl:otherwise>For Danish Suppliers PaymentID is mandatory and MUST start with 01#, 04# or 15#
-        (kortartkode), and PayeeFinancialAccount/ID (Giro kontonummer) is mandatory and must be 7
-        characters long, when payment means equals 50 (Giro)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not((cbc:PaymentMeansCode = '50')       and ((substring(cbc:PaymentID, 1, 3) = '04#')          or (substring(cbc:PaymentID, 1, 3)  = '15#'))       and not(string-length(cbc:PaymentID) = 19)       )"/>
-         <xsl:otherwise>For Danish Suppliers if the PaymentID is prefixed with 04# or 15# the 16 digits
-        instruction Id must be added to the PaymentID eg. "04#1234567890123456" when Payment means
-        equals 50 (Giro)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not((cbc:PaymentMeansCode = '93')       and not(((substring(cbc:PaymentID, 1, 3) = '71#')           or (substring(cbc:PaymentID, 1, 3) = '73#')           or (substring(cbc:PaymentID, 1, 3) = '75#'))         and (string-length(cac:PayeeFinancialAccount/cbc:ID/text()) = 8)         )       )"/>
-         <xsl:otherwise>For Danish Suppliers the PaymentID is mandatory and MUST start with 71#, 73# or
-        75# (kortartkode) and PayeeFinancialAccount/ID (Kreditornummer) is mandatory and must be
-        exactly 8 characters long, when Payment means equals 93 (FIK)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not((cbc:PaymentMeansCode = '93')       and ((substring(cbc:PaymentID, 1, 3) = '71#')          or (substring(cbc:PaymentID, 1, 3)  = '75#'))       and not((string-length(cbc:PaymentID) = 18)          or (string-length(cbc:PaymentID) = 19))       )"/>
-         <xsl:otherwise>For Danish Suppliers if the PaymentID is prefixed with 71# or 75# the 15-16
-        digits instruction Id must be added to the PaymentID eg. "71#1234567890123456" when payment
-        Method equals 93 (FIK)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M28"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="ubl-creditnote:CreditNote[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']/cac:CreditNoteLine | ubl-invoice:Invoice[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']/cac:InvoiceLine"
-                 priority="1001"
-                 mode="M28">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not((cac:Item/cac:CommodityClassification/cbc:ItemClassificationCode/@listID = 'TST')       and not((cac:Item/cac:CommodityClassification/cbc:ItemClassificationCode/@listVersionID = '19.05.01')           or (cac:Item/cac:CommodityClassification/cbc:ItemClassificationCode/@listVersionID = '19.0501')           )       )"/>
-         <xsl:otherwise>If ItemClassification is provided from Danish suppliers, UNSPSC version
-        19.0501 should be used.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M28"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AllowanceCharge[$DKSupplierCountry = 'DK' and $DKCustomerCountry = 'DK']"
-                 priority="1000"
-                 mode="M28">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="not((cbc:AllowanceChargeReasonCode = 'ZZZ')       and not((string-length(normalize-space(cbc:AllowanceChargeReason/text())) = 4)         and (number(cbc:AllowanceChargeReason) &gt;= 0)         and (number(cbc:AllowanceChargeReason) &lt;= 9999))       )"/>
-         <xsl:otherwise>When specifying non-VAT Taxes for Danish customers, Danish suppliers MUST use
-        the AllowanceChargeReasonCode="ZZZ" and the 4-digit Tax category MUST be specified in
-        AllowanceChargeReason<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M28"/>
-   </xsl:template>
-   <xsl:template match="text()" priority="-1" mode="M28"/>
-   <xsl:template match="@*|node()" priority="-2" mode="M28">
-      <xsl:apply-templates select="*" mode="M28"/>
-   </xsl:template>
-   <!--PATTERN -->
-   <!--RULE -->
-   <xsl:template match="cac:AccountingSupplierParty/cac:Party[$supplierCountry = 'IT']/cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) != 'VAT']"
-                 priority="1001"
-                 mode="M29">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="matches(normalize-space(cbc:CompanyID),'^[A-Z0-9]{11,16}$')"/>
-         <xsl:otherwise>[IT-R-001] BT-32 (Seller tax registration identifier) - For Italian suppliers
-        BT-32 minimum length 11 and maximum length shall be 16. Per i fornitori italiani il BT-32
-        deve avere una lunghezza tra 11 e 16 caratteri<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M29"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AccountingSupplierParty/cac:Party[$supplierCountry = 'IT']"
-                 priority="1000"
-                 mode="M29">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="cac:PostalAddress/cbc:StreetName"/>
-         <xsl:otherwise>[IT-R-002] BT-35
-        (Seller address line 1) - Italian suppliers MUST provide the postal address line 1 - I
-        fornitori italiani devono indicare l'indirizzo postale.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="cac:PostalAddress/cbc:CityName"/>
-         <xsl:otherwise>[IT-R-003] BT-37
-        (Seller city) - Italian suppliers MUST provide the postal address city - I fornitori
-        italiani devono indicare la città di residenza.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="cac:PostalAddress/cbc:PostalZone"/>
-         <xsl:otherwise>"&gt;[IT-R-004] BT-38
-        (Seller post code) - Italian suppliers MUST provide the postal address post code - I
-        fornitori italiani devono indicare il CAP di residenza.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M29"/>
-   </xsl:template>
-   <xsl:template match="text()" priority="-1" mode="M29"/>
-   <xsl:template match="@*|node()" priority="-2" mode="M29">
-      <xsl:apply-templates select="*" mode="M29"/>
-   </xsl:template>
-   <!--PATTERN -->
-   <!--RULE -->
-   <xsl:template match="//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE' and cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2) = 'SE']"
-                 priority="1007"
-                 mode="M30">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string-length(normalize-space(cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/cbc:CompanyID)) = 14"/>
-         <xsl:otherwise>For Swedish suppliers, Swedish VAT-numbers must consist of 14 characters.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string(number(substring(cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/cbc:CompanyID, 3, 12))) != 'NaN'"/>
-         <xsl:otherwise>For Swedish suppliers, the Swedish VAT-numbers must have the trailing 12
-        characters in numeric form<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M30"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="//cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity[../cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE' and cbc:CompanyID]"
-                 priority="1006"
-                 mode="M30">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string(number(cbc:CompanyID)) != 'NaN'"/>
-         <xsl:otherwise>Swedish
-        organisation numbers should be numeric.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string-length(normalize-space(cbc:CompanyID)) = 10"/>
-         <xsl:otherwise>Swedish
-        organisation numbers consist of 10 characters.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="u:checkSEOrgnr(normalize-space(cbc:CompanyID))"/>
-         <xsl:otherwise>The
-        last digit of a Swedish organization number must be valid according to the Luhn algorithm.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M30"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE' and exists(cac:PartyLegalEntity/cbc:CompanyID)]/cac:PartyTaxScheme[normalize-space(upper-case(cac:TaxScheme/cbc:ID)) != 'VAT']/cbc:CompanyID"
-                 priority="1005"
-                 mode="M30">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="normalize-space(upper-case(.)) = 'GODKÄND FÖR F-SKATT'"/>
-         <xsl:otherwise>For Swedish suppliers, when using Seller tax registration identifier, 'Godkänd
-        för F-skatt' must be stated<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M30"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="//cac:TaxCategory[//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE' and cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2) = 'SE'] and cbc:ID = 'S'] | //cac:ClassifiedTaxCategory[//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE' and cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2) = 'SE'] and cbc:ID = 'S']"
-                 priority="1004"
-                 mode="M30">
+            Copyright (C) 2020-2023 OpenPEPPOL AISBL
 
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="number(cbc:Percent) = 25 or number(cbc:Percent) = 12 or number(cbc:Percent) = 6"/>
-         <xsl:otherwise>For Swedish suppliers, only standard VAT rate of 6, 12 or 25 are used<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M30"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="//cac:PaymentMeans[//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE'] and normalize-space(cbc:PaymentMeansCode) = '30' and normalize-space(cac:PayeeFinancialAccount/cac:FinancialInstitutionBranch/cbc:ID) = 'SE:PLUSGIRO']/cac:PayeeFinancialAccount/cbc:ID"
-                 priority="1003"
-                 mode="M30">
+            Licensed under the Apache License, Version 2.0 (the "License");
+            you may not use this file except in compliance with the License.
+            You may obtain a copy of the License at
 
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string(number(normalize-space(.))) != 'NaN'"/>
-         <xsl:otherwise>For
-        Swedish suppliers using Plusgiro, the Account ID must be numeric <xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string-length(normalize-space(.)) &gt;= 2 and string-length(normalize-space(.)) &lt;= 8"/>
-         <xsl:otherwise>For Swedish suppliers using Plusgiro, the Account ID must have 2-8 characters<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M30"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="//cac:PaymentMeans[//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE'] and normalize-space(cbc:PaymentMeansCode) = '30' and normalize-space(cac:PayeeFinancialAccount/cac:FinancialInstitutionBranch/cbc:ID) = 'SE:BANKGIRO']/cac:PayeeFinancialAccount/cbc:ID"
-                 priority="1002"
-                 mode="M30">
+                    http://www.apache.org/licenses/LICENSE-2.0
 
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string(number(normalize-space(.))) != 'NaN'"/>
-         <xsl:otherwise>For
-        Swedish suppliers using Bankgiro, the Account ID must be numeric <xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string-length(normalize-space(.)) = 7 or string-length(normalize-space(.)) = 8"/>
-         <xsl:otherwise>For Swedish suppliers using Bankgiro, the Account ID must have 7-8 characters<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M30"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="//cac:PaymentMeans[//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE'] and (cbc:PaymentMeansCode = normalize-space('50') or cbc:PaymentMeansCode = normalize-space('56'))]"
-                 priority="1001"
-                 mode="M30">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="false()"/>
-         <xsl:otherwise>For Swedish suppliers using Swedish
-        Bankgiro or Plusgiro, the proper way to indicate this is to use Code 30 for PaymentMeans and
-        FinancialInstitutionBranch ID with code SE:BANKGIRO or SE:PLUSGIRO<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M30"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="//cac:PaymentMeans[//cac:AccountingSupplierParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE']  and //cac:AccountingCustomerParty/cac:Party[cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'SE'] and (cbc:PaymentMeansCode = normalize-space('31'))]"
-                 priority="1000"
-                 mode="M30">
+            Unless required by applicable law or agreed to in writing, software
+            distributed under the License is distributed on an "AS IS" BASIS,
+            WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+            See the License for the specific language governing permissions and
+            limitations under the License.
 
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="false()"/>
-         <xsl:otherwise>For domestic transactions between Swedish
-        trading partners, credit transfer should be indicated by PaymentMeansCode="30"<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M30"/>
-   </xsl:template>
-   <xsl:template match="text()" priority="-1" mode="M30"/>
-   <xsl:template match="@*|node()" priority="-2" mode="M30">
-      <xsl:apply-templates select="*" mode="M30"/>
-   </xsl:template>
-   <xsl:param name="isGreekSender"
-              select="($supplierCountry ='GR') or ($supplierCountry ='EL')"/>
-   <xsl:param name="isGreekReceiver"
-              select="($customerCountry ='GR') or ($customerCountry ='EL')"/>
-   <xsl:param name="isGreekSenderandReceiver"
-              select="$isGreekSender and $isGreekReceiver"/>
-   <xsl:param name="accountingSupplierCountry"
-              select="     if (/*/cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)) then     upper-case(normalize-space(/*/cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 1, 2)))     else     if (/*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode) then     upper-case(normalize-space(/*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode))     else     'XX'"/>
-   <!--PATTERN -->
-   <xsl:variable name="dateRegExp"
-                 select="'^(0?[1-9]|[12][0-9]|3[01])[-\\/ ]?(0?[1-9]|1[0-2])[-\\/ ]?(19|20)[0-9]{2}'"/>
-   <xsl:variable name="greekDocumentType"
-                 select="tokenize('1.1 1.6 2.1 2.4 5.1 5.2 ','\s')"/>
-   <xsl:variable name="tokenizedUblIssueDate" select="tokenize(/*/cbc:IssueDate,'-')"/>
-   <!--RULE -->
-   <xsl:template match="/ubl-invoice:Invoice/cbc:ID[$isGreekSender] | /ubl-creditnote:CreditNote/cbc:ID[$isGreekSender]"
-                 priority="1007"
-                 mode="M35">
-      <xsl:variable name="IdSegments" select="tokenize(.,'\|')"/>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="count($IdSegments) = 6"/>
-         <xsl:otherwise> When the Supplier is
-        Greek, the Invoice Id should consist of 6 segments<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string-length(normalize-space($IdSegments[1])) = 9                                   and u:TinVerification($IdSegments[1])                                  and ($IdSegments[1] = /*/cac:AccountingSupplierParty/cac:Party/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 3, 9)                                  or $IdSegments[1] = /*/cac:TaxRepresentativeParty/cac:PartyTaxScheme[cac:TaxScheme/cbc:ID = 'VAT']/substring(cbc:CompanyID, 3, 9) )"/>
-         <xsl:otherwise>When the Supplier is Greek, the Invoice Id first segment must be a valid TIN
-        Number and match either the Supplier's or the Tax Representative's Tin Number<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:variable name="tokenizedIdDate" select="tokenize($IdSegments[2],'/')"/>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string-length(normalize-space($IdSegments[2]))&gt;0                                   and matches($IdSegments[2],$dateRegExp)                                  and ($tokenizedIdDate[1] = $tokenizedUblIssueDate[3]                                     and $tokenizedIdDate[2] = $tokenizedUblIssueDate[2]                                    and $tokenizedIdDate[3] = $tokenizedUblIssueDate[1])"/>
-         <xsl:otherwise>When the Supplier is Greek, the Invoice Id second segment must be a valid Date
-        that matches the invoice Issue Date<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string-length(normalize-space($IdSegments[3]))&gt;0 and string(number($IdSegments[3])) != 'NaN' and xs:integer($IdSegments[3]) &gt;= 0"/>
-         <xsl:otherwise>When Supplier is Greek, the Invoice Id third segment must be a positive integer<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string-length(normalize-space($IdSegments[4]))&gt;0 and (some $c in $greekDocumentType satisfies $IdSegments[4] = $c)"/>
-         <xsl:otherwise>When Supplier is Greek, the Invoice Id in the fourth segment must be a valid
-        greek document type<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string-length($IdSegments[5]) &gt; 0 "/>
-         <xsl:otherwise>When Supplier
-        is Greek, the Invoice Id fifth segment must not be empty<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string-length($IdSegments[6]) &gt; 0 "/>
-         <xsl:otherwise>When Supplier
-        is Greek, the Invoice Id sixth segment must not be empty<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M35"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AccountingSupplierParty[$isGreekSender]/cac:Party"
-                 priority="1006"
-                 mode="M35">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string-length(./cac:PartyName/cbc:Name)&gt;0"/>
-         <xsl:otherwise>Greek
-        Suppliers must provide their full name as they are registered in the Greek Business Registry
-        (G.E.MH.) as a legal entity or in the Tax Registry as a natural person <xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="count(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID)=1 and                             substring(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID,1,2) = 'EL' and                             u:TinVerification(substring(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID,3))"/>
-         <xsl:otherwise>Greek suppliers must provide their Seller Tax Registration Number, prefixed
-        by the country code<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M35"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AccountingSupplierParty[$isGreekSender]/cac:Party/cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID"
-                 priority="1005"
-                 mode="M35">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="substring(.,1,2) = 'EL' and u:TinVerification(substring(.,3))"/>
-         <xsl:otherwise>For the Greek Suppliers, the VAT must start with 'EL' and must be a valid TIN
-        number<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M35"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="/ubl-invoice:Invoice[$isGreekSender and ( /*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'GR')] | /ubl-creditnote:CreditNote[$isGreekSender and ( /*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'GR')]"
-                 priority="1004"
-                 mode="M35">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="count(cac:AdditionalDocumentReference[cbc:DocumentDescription = '##M.AR.K##'])=1"/>
-         <xsl:otherwise> When Supplier is Greek, there must be one MARK Number<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="count(cac:AdditionalDocumentReference[cbc:DocumentDescription = '##INVOICE|URL##'])=1"/>
-         <xsl:otherwise>
-        When Supplier is Greek, there should be one invoice url<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="(count(cac:AdditionalDocumentReference[cbc:DocumentDescription = '##INVOICE|URL##']) = 0 ) or (count(cac:AdditionalDocumentReference[cbc:DocumentDescription = '##INVOICE|URL##']) = 1 )"/>
-         <xsl:otherwise> When Supplier is Greek, there should be no more than one invoice url<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M35"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AdditionalDocumentReference[$isGreekSender and ( /*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode = 'GR') and cbc:DocumentDescription = '##M.AR.K##']/cbc:ID"
-                 priority="1003"
-                 mode="M35">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="matches(.,'^[1-9]([0-9]*)')"/>
-         <xsl:otherwise> When Supplier is
-        Greek, the MARK Number must be a positive integer<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M35"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AdditionalDocumentReference[$isGreekSender and cbc:DocumentDescription = '##INVOICE|URL##']"
-                 priority="1002"
-                 mode="M35">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string-length(normalize-space(cac:Attachment/cac:ExternalReference/cbc:URI))&gt;0"/>
-         <xsl:otherwise>When Supplier is Greek and the INVOICE URL Document reference exists, the
-        External Reference URI should be present<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M35"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AccountingCustomerParty[$isGreekSender]/cac:Party"
-                 priority="1001"
-                 mode="M35">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string-length(./cac:PartyName/cbc:Name)&gt;0"/>
-         <xsl:otherwise>Greek
-        Suppliers must provide the full name of the buyer<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M35"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AccountingSupplierParty/cac:Party[$accountingSupplierCountry='GR' or $accountingSupplierCountry='EL']/cbc:EndpointID"
-                 priority="1000"
-                 mode="M35">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="./@schemeID='9933' and u:TinVerification(.)"/>
-         <xsl:otherwise>Greek
-        suppliers that send an invoice through the PEPPOL network must use a correct TIN number as
-        an electronic address according to PEPPOL Electronic Address Identifier scheme (schemeID
-        9933).<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M35"/>
-   </xsl:template>
-   <xsl:template match="text()" priority="-1" mode="M35"/>
-   <xsl:template match="@*|node()" priority="-2" mode="M35">
-      <xsl:apply-templates select="*" mode="M35"/>
-   </xsl:template>
-   <!--PATTERN -->
-   <!--RULE -->
-   <xsl:template match="cac:AccountingCustomerParty[$isGreekSenderandReceiver]/cac:Party"
-                 priority="1001"
-                 mode="M36">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="count(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID)=1 and                             substring(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID,1,2) = 'EL' and                             u:TinVerification(substring(cac:PartyTaxScheme[normalize-space(cac:TaxScheme/cbc:ID) = 'VAT']/cbc:CompanyID,3))"/>
-         <xsl:otherwise>Greek Suppliers must provide the VAT number of the buyer, if the buyer is Greek <xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M36"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AccountingCustomerParty[$isGreekSenderandReceiver]/cac:Party/cbc:EndpointID"
-                 priority="1000"
-                 mode="M36">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="./@schemeID='9933' and u:TinVerification(.)"/>
-         <xsl:otherwise>Greek
-        Suppliers that send an invoice through the PEPPOL network to a greek buyer must use a
-        correct TIN number as an electronic address according to PEPPOL Electronic Address
-        Identifier scheme (SchemeID 9933)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M36"/>
-   </xsl:template>
-   <xsl:template match="text()" priority="-1" mode="M36"/>
-   <xsl:template match="@*|node()" priority="-2" mode="M36">
-      <xsl:apply-templates select="*" mode="M36"/>
-   </xsl:template>
-   <!--PATTERN -->
-   <xsl:variable name="SupplierCountry"
-                 select="concat(ubl-creditnote:CreditNote/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode, ubl-invoice:Invoice/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)"/>
-   <xsl:variable name="CustomerCountry"
-                 select="concat(ubl-creditnote:CreditNote/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode, ubl-invoice:Invoice/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)"/>
-   <!--RULE -->
-   <xsl:template match="ubl-creditnote:CreditNote[$SupplierCountry = 'IS'] | ubl-invoice:Invoice[$SupplierCountry = 'IS']"
-                 priority="1001"
-                 mode="M37">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="( ( not(contains(normalize-space(cbc:InvoiceTypeCode),' ')) and contains( ' 380 381 ',concat(' ',normalize-space(cbc:InvoiceTypeCode),' ') ) ) ) or ( ( not(contains(normalize-space(cbc:CreditNoteTypeCode),' ')) and contains( ' 380 381 ',concat(' ',normalize-space(cbc:CreditNoteTypeCode),' ') ) ) )"/>
-         <xsl:otherwise>[IS-R-001]-If seller is icelandic then invoice type should be 380 or 381 — Ef
-        seljandi er íslenskur þá ætti gerð reiknings (BT-3) að vera sölureikningur (380) eða
-        kreditreikningur (381).<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="exists(cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID) and cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID/@schemeID = '0196'"/>
-         <xsl:otherwise>[IS-R-002]-If seller is icelandic then it shall contain sellers legal id — Ef
-        seljandi er íslenskur þá skal reikningur innihalda íslenska kennitölu seljanda (BT-30).<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="exists(cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cbc:StreetName) and exists(cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cbc:PostalZone)"/>
-         <xsl:otherwise>[IS-R-003]-If seller is icelandic then it shall contain his address with street
-        name and zip code — Ef seljandi er íslenskur þá skal heimilisfang seljanda innihalda
-        götuheiti og póstnúmer (BT-35 og BT-38).<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="exists(cac:PaymentMeans[cbc:PaymentMeansCode = '9']/cac:PayeeFinancialAccount/cbc:ID)         and string-length(normalize-space(cac:PaymentMeans[cbc:PaymentMeansCode = '9']/cac:PayeeFinancialAccount/cbc:ID)) = 12        or not(exists(cac:PaymentMeans[cbc:PaymentMeansCode = '9']))"/>
-         <xsl:otherwise>[IS-R-006]-If seller is icelandic and payment means code is 9 then a 12 digit
-        account id must exist — Ef seljandi er íslenskur og greiðslumáti (BT-81) er krafa (kóti 9)
-        þá skal koma fram 12 stafa númer (bankanúmer, höfuðbók 66 og reikningsnúmer) (BT-84)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="exists(cac:PaymentMeans[cbc:PaymentMeansCode = '42']/cac:PayeeFinancialAccount/cbc:ID)         and string-length(normalize-space(cac:PaymentMeans[cbc:PaymentMeansCode = '42']/cac:PayeeFinancialAccount/cbc:ID)) = 12        or not(exists(cac:PaymentMeans[cbc:PaymentMeansCode = '42']))"/>
-         <xsl:otherwise>[IS-R-007]-If seller is icelandic and payment means code is 42 then a 12 digit
-        account id must exist — Ef seljandi er íslenskur og greiðslumáti (BT-81) er millifærsla
-        (kóti 42) þá skal koma fram 12 stafa reikningnúmer (BT-84)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="(exists(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']) and string-length(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']/cbc:ID) = 10 and (string(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']/cbc:ID) castable as xs:date)) or not(exists(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']))"/>
-         <xsl:otherwise>[IS-R-008]-If seller is icelandic and invoice contains supporting description
-        EINDAGI then the id form must be YYYY-MM-DD — Ef seljandi er íslenskur þá skal eindagi
-        (BT-122, DocumentDescription = EINDAGI) vera á forminu YYYY-MM-DD.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="(exists(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']) and exists(cbc:DueDate)) or not(exists(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']))"/>
-         <xsl:otherwise>[IS-R-009]-If seller is icelandic and invoice contains supporting description
-        EINDAGI invoice must have due date — Ef seljandi er íslenskur þá skal reikningur sem
-        inniheldur eindaga (BT-122, DocumentDescription = EINDAGI) einnig hafa gjalddaga (BT-9).<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="(exists(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']) and (cbc:DueDate) &lt;= (cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']/cbc:ID)) or not(exists(cac:AdditionalDocumentReference[cbc:DocumentDescription = 'EINDAGI']))"/>
-         <xsl:otherwise>[IS-R-010]-If seller is icelandic and invoice contains supporting description
-        EINDAGI the id date must be same or later than due date — Ef seljandi er íslenskur þá skal
-        eindagi (BT-122, DocumentDescription = EINDAGI) skal vera sami eða síðar en gjalddagi (BT-9)
-        ef eindagi er til staðar.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M37"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="ubl-creditnote:CreditNote[$SupplierCountry = 'IS' and $CustomerCountry = 'IS']/cac:AccountingCustomerParty | ubl-invoice:Invoice[$SupplierCountry = 'IS' and $CustomerCountry = 'IS']/cac:AccountingCustomerParty"
-                 priority="1000"
-                 mode="M37">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="exists(cac:Party/cac:PartyLegalEntity/cbc:CompanyID) and cac:Party/cac:PartyLegalEntity/cbc:CompanyID/@schemeID = '0196'"/>
-         <xsl:otherwise>[IS-R-004]-If seller and buyer are icelandic then the invoice shall contain the
-        buyers icelandic legal identifier — Ef seljandi og kaupandi eru íslenskir þá skal
-        reikningurinn innihalda íslenska kennitölu kaupanda (BT-47).<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="exists(cac:Party/cac:PostalAddress/cbc:StreetName) and exists(cac:Party/cac:PostalAddress/cbc:PostalZone)"/>
-         <xsl:otherwise>[IS-R-005]-If seller and buyer are icelandic then the invoice shall contain the
-        buyers address with street name and zip code — Ef seljandi og kaupandi eru íslenskir þá skal
-        heimilisfang kaupanda innihalda götuheiti og póstnúmer (BT-50 og BT-53)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M37"/>
-   </xsl:template>
-   <xsl:template match="text()" priority="-1" mode="M37"/>
-   <xsl:template match="@*|node()" priority="-2" mode="M37">
-      <xsl:apply-templates select="*" mode="M37"/>
-   </xsl:template>
-   <!--PATTERN -->
-   <xsl:variable name="supplierCountryIsNL"
-                 select="(upper-case(normalize-space(/*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)) = 'NL')"/>
-   <xsl:variable name="customerCountryIsNL"
-                 select="(upper-case(normalize-space(/*/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)) = 'NL')"/>
-   <xsl:variable name="taxRepresentativeCountryIsNL"
-                 select="(upper-case(normalize-space(/*/cac:TaxRepresentativeParty/cac:PostalAddress/cac:Country/cbc:IdentificationCode)) = 'NL')"/>
-   <!--RULE -->
-   <xsl:template match="cbc:CreditNoteTypeCode[$supplierCountryIsNL]"
-                 priority="1008"
-                 mode="M38">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="/*/cac:BillingReference/cac:InvoiceDocumentReference/cbc:ID"/>
-         <xsl:otherwise>[NL-R-001] For suppliers in the Netherlands, if the document is a creditnote,
-        the document MUST contain an invoice reference
-        (cac:BillingReference/cac:InvoiceDocumentReference/cbc:ID)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M38"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AccountingSupplierParty/cac:Party/cac:PostalAddress[$supplierCountryIsNL]"
-                 priority="1007"
-                 mode="M38">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="cbc:StreetName and cbc:CityName and cbc:PostalZone"/>
-         <xsl:otherwise>[NL-R-002]
-        For suppliers in the Netherlands the supplier's address
-        (cac:AccountingSupplierParty/cac:Party/cac:PostalAddress) MUST contain street name
-        (cbc:StreetName), city (cbc:CityName) and post code (cbc:PostalZone)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M38"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID[$supplierCountryIsNL]"
-                 priority="1006"
-                 mode="M38">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="(contains(concat(' ', string-join(@schemeID, ' '), ' '), ' 0106 ') or contains(concat(' ', string-join(@schemeID, ' '), ' '), ' 0190 ')) and (normalize-space(.) != '')"/>
-         <xsl:otherwise>[NL-R-003] For suppliers in the Netherlands, the legal entity identifier MUST
-        be either a KVK or OIN number (schemeID 0106 or 0190)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M38"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AccountingCustomerParty/cac:Party/cac:PostalAddress[$supplierCountryIsNL and $customerCountryIsNL]"
-                 priority="1005"
-                 mode="M38">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="cbc:StreetName and cbc:CityName and cbc:PostalZone"/>
-         <xsl:otherwise>[NL-R-004]
-        For suppliers in the Netherlands, if the customer is in the Netherlands, the customer
-        address (cac:AccountingCustomerParty/cac:Party/cac:PostalAddress) MUST contain the street
-        name (cbc:StreetName), the city (cbc:CityName) and post code (cbc:PostalZone)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M38"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AccountingCustomerParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID[$supplierCountryIsNL and $customerCountryIsNL]"
-                 priority="1004"
-                 mode="M38">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="(contains(concat(' ', string-join(@schemeID, ' '), ' '), ' 0106 ') or contains(concat(' ', string-join(@schemeID, ' '), ' '), ' 0190 ')) and (normalize-space(.) != '')"/>
-         <xsl:otherwise>[NL-R-005] For suppliers in the Netherlands, if the customer is in the
-        Netherlands, the customer's legal entity identifier MUST be either a KVK or OIN number
-        (schemeID 0106 or 0190)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M38"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:TaxRepresentativeParty/cac:PostalAddress[$supplierCountryIsNL and $taxRepresentativeCountryIsNL]"
-                 priority="1003"
-                 mode="M38">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="cbc:StreetName and cbc:CityName and cbc:PostalZone"/>
-         <xsl:otherwise>[NL-R-006]
-        For suppliers in the Netherlands, if the fiscal representative is in the Netherlands, the
-        representative's address (cac:TaxRepresentativeParty/cac:PostalAddress) MUST contain street
-        name (cbc:StreetName), city (cbc:CityName) and post code (cbc:PostalZone)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M38"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:LegalMonetaryTotal[$supplierCountryIsNL]"
-                 priority="1002"
-                 mode="M38">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="(/ubl-invoice:Invoice and xs:decimal(cbc:PayableAmount) &lt;= 0.0) or (/ubl-creditnote:CreditNote and xs:decimal(cbc:PayableAmount) &gt;= 0.0) or (//cac:PaymentMeans)"/>
-         <xsl:otherwise>[NL-R-007] For suppliers in the Netherlands, the supplier MUST provide a means
-        of payment (cac:PaymentMeans) if the payment is from customer to supplier<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M38"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:PaymentMeans[$supplierCountryIsNL]"
-                 priority="1001"
-                 mode="M38">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="normalize-space(cbc:PaymentMeansCode) = '30' or         normalize-space(cbc:PaymentMeansCode) = '48' or         normalize-space(cbc:PaymentMeansCode) = '49' or         normalize-space(cbc:PaymentMeansCode) = '57' or         normalize-space(cbc:PaymentMeansCode) = '58' or         normalize-space(cbc:PaymentMeansCode) = '59'"/>
-         <xsl:otherwise>[NL-R-008] For suppliers in the Netherlands, the payment means code
-        (cac:PaymentMeans/cbc:PaymentMeansCode) MUST be one of 30, 48, 49, 57, 58 or 59<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M38"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:OrderLineReference/cbc:LineID[$supplierCountryIsNL]"
-                 priority="1000"
-                 mode="M38">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="exists(/*/cac:OrderReference/cbc:ID)"/>
-         <xsl:otherwise>[NL-R-009] For
-        suppliers in the Netherlands, if an order line reference (cac:OrderLineReference/cbc:LineID)
-        is used, there must be an order reference on the document level (cac:OrderReference/cbc:ID)<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M38"/>
-   </xsl:template>
-   <xsl:template match="text()" priority="-1" mode="M38"/>
-   <xsl:template match="@*|node()" priority="-2" mode="M38">
-      <xsl:apply-templates select="*" mode="M38"/>
-   </xsl:template>
-   <!--PATTERN -->
-   <xsl:variable name="ISO3166"
-                 select="tokenize('AD AE AF AG AI AL AM AO AQ AR AS AT AU AW AX AZ BA BB BD BE BF BG BH BI BJ BL BM BN BO BQ BR BS BT BV BW BY BZ CA CC CD CF CG CH CI CK CL CM CN CO CR CU CV CW CX CY CZ DE DJ DK DM DO DZ EC EE EG EH ER ES ET FI FJ FK FM FO FR GA GB GD GE GF GG GH GI GL GM GN GP GQ GR GS GT GU GW GY HK HM HN HR HT HU ID IE IL IM IN IO IQ IR IS IT JE JM JO JP KE KG KH KI KM KN KP KR KW KY KZ LA LB LC LI LK LR LS LT LU LV LY MA MC MD ME MF MG MH MK ML MM MN MO MP MQ MR MS MT MU MV MW MX MY MZ NA NC NE NF NG NI NL NO NP NR NU NZ OM PA PE PF PG PH PK PL PM PN PR PS PT PW PY QA RE RO RS RU RW SA SB SC SD SE SG SH SI SJ SK SL SM SN SO SR SS ST SV SX SY SZ TC TD TF TG TH TJ TK TL TM TN TO TR TT TV TW TZ UA UG UM US UY UZ VA VC VE VG VI VN VU WF WS YE YT ZA ZM ZW 1A XI', '\s')"/>
-   <xsl:variable name="ISO4217"
-                 select="tokenize('AED AFN ALL AMD ANG AOA ARS AUD AWG AZN BAM BBD BDT BGN BHD BIF BMD BND BOB BOV BRL BSD BTN BWP BYN BZD CAD CDF CHE CHF CHW CLF CLP CNY COP COU CRC CUC CUP CVE CZK DJF DKK DOP DZD EGP ERN ETB EUR FJD FKP GBP GEL GHS GIP GMD GNF GTQ GYD HKD HNL HRK HTG HUF IDR ILS INR IQD IRR ISK JMD JOD JPY KES KGS KHR KMF KPW KRW KWD KYD KZT LAK LBP LKR LRD LSL LYD MAD MDL MGA MKD MMK MNT MOP MRO MUR MVR MWK MXN MXV MYR MZN NAD NGN NIO NOK NPR NZD OMR PAB PEN PGK PHP PKR PLN PYG QAR RON RSD RUB RWF SAR SBD SCR SDG SEK SGD SHP SLL SOS SRD SSP STN SVC SYP SZL THB TJS TMT TND TOP TRY TTD TWD TZS UAH UGX USD USN UYI UYU UZS VEF VND VUV WST XAF XAG XAU XBA XBB XBC XBD XCD XDR XOF XPD XPF XPT XSU XTS XUA XXX YER ZAR ZMW ZWL', '\s')"/>
-   <xsl:variable name="MIMECODE"
-                 select="tokenize('application/pdf image/png image/jpeg text/csv application/vnd.openxmlformats-officedocument.spreadsheetml.sheet application/vnd.oasis.opendocument.spreadsheet', '\s')"/>
-   <xsl:variable name="UNCL2005" select="tokenize('3 35 432', '\s')"/>
-   <xsl:variable name="UNCL5189"
-                 select="tokenize('41 42 60 62 63 64 65 66 67 68 70 71 88 95 100 102 103 104 105', '\s')"/>
-   <xsl:variable name="UNCL7161"
-                 select="tokenize('AA AAA AAC AAD AAE AAF AAH AAI AAS AAT AAV AAY AAZ ABA ABB ABC ABD ABF ABK ABL ABN ABR ABS ABT ABU ACF ACG ACH ACI ACJ ACK ACL ACM ACS ADC ADE ADJ ADK ADL ADM ADN ADO ADP ADQ ADR ADT ADW ADY ADZ AEA AEB AEC AED AEF AEH AEI AEJ AEK AEL AEM AEN AEO AEP AES AET AEU AEV AEW AEX AEY AEZ AJ AU CA CAB CAD CAE CAF CAI CAJ CAK CAL CAM CAN CAO CAP CAQ CAR CAS CAT CAU CAV CAW CAX CAY CAZ CD CG CS CT DAB DAC DAD DAF DAG DAH DAI DAJ DAK DAL DAM DAN DAO DAP DAQ DL EG EP ER FAA FAB FAC FC FH FI GAA HAA HD HH IAA IAB ID IF IR IS KO L1 LA LAA LAB LF MAE MI ML NAA OA PA PAA PC PL RAB RAC RAD RAF RE RF RH RV SA SAA SAD SAE SAI SG SH SM SU TAB TAC TT TV V1 V2 WH XAA YY ZZZ', '\s')"/>
-   <xsl:variable name="UNCL5305" select="tokenize('AE E S Z G O K L M', '\s')"/>
-   <xsl:variable name="eaid"
-                 select="tokenize('0002 0007 0009 0037 0060 0088 0096 0097 0106 0130 0135 0142 0151 0183 0184 0188 0190 0191 0192 0193 0195 0196 0198 0199 0200 0201 0202 0204 0208 0209 0210 0211 0212 0213 0215 0216 0218 0221 0230 9901 9910 9913 9914 9915 9918 9919 9920 9922 9923 9924 9925 9926 9927 9928 9929 9930 9931 9932 9933 9934 9935 9936 9937 9938 9939 9940 9941 9942 9943 9944 9945 9946 9947 9948 9949 9950 9951 9952 9953 9957 9959', '\s')"/>
-   <!--RULE -->
-   <xsl:template match="cbc:EmbeddedDocumentBinaryObject[@mimeCode]"
-                 priority="1016"
-                 mode="M39">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="           some $code in $MIMECODE             satisfies @mimeCode = $code"/>
-         <xsl:otherwise>Mime code must be according to subset of IANA code list.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AllowanceCharge[cbc:ChargeIndicator = 'false']/cbc:AllowanceChargeReasonCode"
-                 priority="1015"
-                 mode="M39">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="           some $code in $UNCL5189             satisfies normalize-space(text()) = $code"/>
-         <xsl:otherwise>Reason code MUST be according to subset of UNCL 5189 D.16B.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:AllowanceCharge[cbc:ChargeIndicator = 'true']/cbc:AllowanceChargeReasonCode"
-                 priority="1014"
-                 mode="M39">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="           some $code in $UNCL7161             satisfies normalize-space(text()) = $code"/>
-         <xsl:otherwise>Reason code MUST be according to UNCL 7161 D.16B.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:InvoicePeriod/cbc:DescriptionCode"
-                 priority="1013"
-                 mode="M39">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="           some $code in $UNCL2005             satisfies normalize-space(text()) = $code"/>
-         <xsl:otherwise>Invoice period description code must be according to UNCL 2005 D.16B.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:Amount | cbc:BaseAmount | cbc:PriceAmount | cbc:TaxAmount | cbc:TaxableAmount | cbc:LineExtensionAmount | cbc:TaxExclusiveAmount | cbc:TaxInclusiveAmount | cbc:AllowanceTotalAmount | cbc:ChargeTotalAmount | cbc:PrepaidAmount | cbc:PayableRoundingAmount | cbc:PayableAmount"
-                 priority="1012"
-                 mode="M39">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="           some $code in $ISO4217             satisfies @currencyID = $code"/>
-         <xsl:otherwise>Currency code must be according to ISO 4217:2005<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:InvoiceTypeCode" priority="1011" mode="M39">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="           $profile != '01' or (some $code in tokenize('71 80 82 84 102 218 219 331 380 382 383 386 388 393 395 553 575 623 780 817 870 875 876 877', '\s')             satisfies normalize-space(text()) = $code)"/>
-         <xsl:otherwise>Invoice type code MUST be set according to the profile.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:CreditNoteTypeCode" priority="1010" mode="M39">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="           $profile != '01' or (some $code in tokenize('381 396 81 83 532', '\s')             satisfies normalize-space(text()) = $code)"/>
-         <xsl:otherwise>Credit note type code MUST be set according to the profile.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:IssueDate | cbc:DueDate | cbc:TaxPointDate | cbc:StartDate | cbc:EndDate | cbc:ActualDeliveryDate"
-                 priority="1009"
-                 mode="M39">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="string-length(text()) = 10 and (string(.) castable as xs:date)"/>
-         <xsl:otherwise>A date
-        MUST be formatted YYYY-MM-DD.<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cbc:EndpointID[@schemeID]" priority="1008" mode="M39">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="         some $code in $eaid         satisfies @schemeID = $code"/>
-         <xsl:otherwise>Electronic
-        address identifier scheme must be from the codelist "Electronic Address Identifier Scheme"<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-G']"
-                 priority="1007"
-                 mode="M39">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="normalize-space(cbc:ID)='G'"/>
-         <xsl:otherwise>Tax Category
-        G MUST be used when exemption reason code is VATEX-EU-G<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-O']"
-                 priority="1006"
-                 mode="M39">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="normalize-space(cbc:ID)='O'"/>
-         <xsl:otherwise>Tax Category
-        O MUST be used when exemption reason code is VATEX-EU-O<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-IC']"
-                 priority="1005"
-                 mode="M39">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="normalize-space(cbc:ID)='K'"/>
-         <xsl:otherwise>Tax Category
-        K MUST be used when exemption reason code is VATEX-EU-IC<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-AE']"
-                 priority="1004"
-                 mode="M39">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="normalize-space(cbc:ID)='AE'"/>
-         <xsl:otherwise>Tax
-        Category AE MUST be used when exemption reason code is VATEX-EU-AE<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-D']"
-                 priority="1003"
-                 mode="M39">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="normalize-space(cbc:ID)='E'"/>
-         <xsl:otherwise>Tax Category
-        E MUST be used when exemption reason code is VATEX-EU-D<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-F']"
-                 priority="1002"
-                 mode="M39">
-
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="normalize-space(cbc:ID)='E'"/>
-         <xsl:otherwise>Tax Category
-        E MUST be used when exemption reason code is VATEX-EU-F<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-I']"
-                 priority="1001"
-                 mode="M39">
+-->
+<xsl:stylesheet xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:iso="http://purl.oclc.org/dsdl/schematron" xmlns:saxon="http://saxon.sf.net/" xmlns:schold="http://www.ascc.net/xml/schematron" xmlns:u="utils" xmlns:ubl-creditnote="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2" xmlns:ubl-invoice="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<!--Implementers: please note that overriding process-prolog or process-root is 
+    the preferred method for meta-stylesheets to use where possible. -->
 
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="normalize-space(cbc:ID)='E'"/>
-         <xsl:otherwise>Tax Category
-        E MUST be used when exemption reason code is VATEX-EU-I<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <!--RULE -->
-   <xsl:template match="cac:TaxCategory[upper-case(cbc:TaxExemptionReasonCode)='VATEX-EU-J']"
-                 priority="1000"
-                 mode="M39">
+<xsl:param name="archiveDirParameter" />
+  <xsl:param name="archiveNameParameter" />
+  <xsl:param name="fileNameParameter" />
+  <xsl:param name="fileDirParameter" />
+  <xsl:variable name="document-uri">
+    <xsl:value-of select="document-uri(/)" />
+  </xsl:variable>
+
+<!--PHASES-->
+
+
+<!--PROLOG-->
+<xsl:output indent="yes" method="xml" omit-xml-declaration="no" standalone="yes" />
+
+<!--XSD TYPES FOR XSLT2-->
+
+
+<!--KEYS AND FUNCTIONS-->
+<xsl:function as="xs:boolean" name="u:gln">
+		<xsl:param name="val" />
+		<xsl:variable name="length" select="string-length($val) - 1" />
+		<xsl:variable name="digits" select="reverse(for $i in string-to-codepoints(substring($val, 0, $length + 1)) return $i - 48)" />
+		<xsl:variable name="weightedSum" select="sum(for $i in (0 to $length - 1) return $digits[$i + 1] * (1 + ((($i + 1) mod 2) * 2)))" />
+		<xsl:value-of select="(10 - ($weightedSum mod 10)) mod 10 = number(substring($val, $length + 1, 1))" />
+	</xsl:function>
+  <xsl:function as="xs:boolean" name="u:abn">
+		<xsl:param name="val" />
+		<xsl:value-of select="(    ((string-to-codepoints(substring($val,1,1)) - 49) * 10) +    ((string-to-codepoints(substring($val,2,1)) - 48) * 1) +    ((string-to-codepoints(substring($val,3,1)) - 48) * 3) +    ((string-to-codepoints(substring($val,4,1)) - 48) * 5) +    ((string-to-codepoints(substring($val,5,1)) - 48) * 7) +    ((string-to-codepoints(substring($val,6,1)) - 48) * 9) +    ((string-to-codepoints(substring($val,7,1)) - 48) * 11) +    ((string-to-codepoints(substring($val,8,1)) - 48) * 13) +    ((string-to-codepoints(substring($val,9,1)) - 48) * 15) +    ((string-to-codepoints(substring($val,10,1)) - 48) * 17) +    ((string-to-codepoints(substring($val,11,1)) - 48) * 19)) mod 89 = 0     " />
+	</xsl:function>
+  <xsl:function as="xs:boolean" name="u:slack">
+		<xsl:param as="xs:decimal" name="exp" />
+		<xsl:param as="xs:decimal" name="val" />
+		<xsl:param as="xs:decimal" name="slack" />
+		<xsl:value-of select="xs:decimal($exp + $slack) >= $val and xs:decimal($exp - $slack) &lt;= $val" />
+	</xsl:function>
+  <xsl:function as="xs:boolean" name="u:mod11">
+		<xsl:param name="val" />
+		<xsl:variable name="length" select="string-length($val) - 1" />
+		<xsl:variable name="digits" select="reverse(for $i in string-to-codepoints(substring($val, 0, $length + 1)) return $i - 48)" />
+		<xsl:variable name="weightedSum" select="sum(for $i in (0 to $length - 1) return $digits[$i + 1] * (($i mod 6) + 2))" />
+		<xsl:value-of select="number($val) > 0 and (11 - ($weightedSum mod 11)) mod 11 = number(substring($val, $length + 1, 1))" />
+	</xsl:function>
+  <xsl:function as="xs:boolean" name="u:mod97-0208">
+		<xsl:param name="val" />
+		<xsl:variable name="checkdigits" select="substring($val,9,2)" />
+		<xsl:variable name="calculated_digits" select="xs:string(97 - (xs:integer(substring($val,1,8)) mod 97))" />
+		<xsl:value-of select="number($checkdigits) = number($calculated_digits)" />
+	</xsl:function>
+  <xsl:function as="xs:boolean" name="u:checkCodiceIPA">
+		<xsl:param as="xs:string?" name="arg" />
+		<xsl:variable name="allowed-characters">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789</xsl:variable>
+		<xsl:sequence select="if ( (string-length(translate($arg, $allowed-characters, '')) = 0) and (string-length($arg) = 6) ) then true() else false()" />
+	</xsl:function>
+  <xsl:function as="xs:boolean" name="u:checkCF">
+		<xsl:param as="xs:string?" name="arg" />
+		<xsl:sequence select="    if ( (string-length($arg) = 16) or (string-length($arg) = 11) )       then     (    if ((string-length($arg) = 16))     then    (    if (u:checkCF16($arg))     then    (    true()    )    else    (    false()    )    )    else    (    if(($arg castable as xsd:integer)) then true() else false()        )    )    else    (    false()    )    " />
+	</xsl:function>
+  <xsl:function as="xs:boolean" name="u:checkCF16">
+		<xsl:param as="xs:string?" name="arg" />
+		<xsl:variable name="allowed-characters">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz</xsl:variable>
+		<xsl:sequence select="    if (  (string-length(translate(substring($arg,1,6), $allowed-characters, '')) = 0) and      (substring($arg,7,2) castable as xsd:integer) and     (string-length(translate(substring($arg,9,1), $allowed-characters, '')) = 0) and     (substring($arg,10,2) castable as xsd:integer) and      (substring($arg,12,3) castable as xsd:string) and     (substring($arg,15,1) castable as xsd:integer) and      (string-length(translate(substring($arg,16,1), $allowed-characters, '')) = 0)    )     then true()    else false()    " />
+	</xsl:function>
+  <xsl:function as="xs:boolean" name="u:checkPIVAseIT">
+		<xsl:param as="xs:string" name="arg" />
+		<xsl:variable name="paese" select="substring($arg,1,2)" />
+		<xsl:variable name="codice" select="substring($arg,3)" />
+		<xsl:sequence select="        if ( $paese = 'IT' or $paese = 'it' )    then    (    if ( ( string-length($codice) = 11 ) and ( if (u:checkPIVA($codice)!=0) then false() else true() ))    then     (    true()    )    else    (    false()    )    )    else    (    true()    )        " />
+	</xsl:function>
+  <xsl:function as="xs:integer" name="u:checkPIVA">
+		<xsl:param as="xs:string?" name="arg" />
+		<xsl:sequence select="    if (not($arg castable as xsd:integer))     then 1    else ( u:addPIVA($arg,xs:integer(0)) mod 10 )" />
+	</xsl:function>
+  <xsl:function as="xs:integer" name="u:addPIVA">
+		<xsl:param as="xs:string" name="arg" />
+		<xsl:param as="xs:integer" name="pari" />
+		<xsl:variable name="tappo" select="if (not($arg castable as xsd:integer)) then 0 else 1" />
+		<xsl:variable name="mapper" select="if ($tappo = 0) then 0 else     ( if ($pari = 1)     then ( xs:integer(substring('0246813579', ( xs:integer(substring($arg,1,1)) +1 ) ,1)) )     else ( xs:integer(substring($arg,1,1) ) )    )" />
+		<xsl:sequence select="if ($tappo = 0) then $mapper else ( xs:integer($mapper) + u:addPIVA(substring(xs:string($arg),2), (if($pari=0) then 1 else 0) ) )" />
+	</xsl:function>
+  <xsl:function as="xs:boolean" name="u:checkSEOrgnr">
+    <xsl:param as="xs:string" name="number" />
+	<xsl:choose>
+		
+		<xsl:when test="not(matches($number, '^\d+$'))">
+			<xsl:sequence select="false()" />
+		</xsl:when>
+		<xsl:otherwise>
+			
+			<xsl:variable name="mainPart" select="substring($number, 1, 9)" />
+			<xsl:variable name="checkDigit" select="substring($number, 10, 1)" />
+			<xsl:variable as="xs:integer" name="sum">
+			  <xsl:value-of select="sum(       for $pos in 1 to string-length($mainPart) return         if ($pos mod 2 = 1)         then (number(substring($mainPart, string-length($mainPart) - $pos + 1, 1)) * 2) mod 10 +           (number(substring($mainPart, string-length($mainPart) - $pos + 1, 1)) * 2) idiv 10         else number(substring($mainPart, string-length($mainPart) - $pos + 1, 1))      )" />
+			</xsl:variable>
+			<xsl:variable name="calculatedCheckDigit" select="(10 - $sum mod 10) mod 10" />
+			<xsl:sequence select="$calculatedCheckDigit = number($checkDigit)" />
+		</xsl:otherwise>
+	</xsl:choose>
+  </xsl:function>
+
+<!--DEFAULT RULES-->
+
+
+<!--MODE: SCHEMATRON-SELECT-FULL-PATH-->
+<!--This mode can be used to generate an ugly though full XPath for locators-->
+<xsl:template match="*" mode="schematron-select-full-path">
+    <xsl:apply-templates mode="schematron-get-full-path" select="." />
+  </xsl:template>
+
+<!--MODE: SCHEMATRON-FULL-PATH-->
+<!--This mode can be used to generate an ugly though full XPath for locators-->
+<xsl:template match="*" mode="schematron-get-full-path">
+    <xsl:apply-templates mode="schematron-get-full-path" select="parent::*" />
+    <xsl:text>/</xsl:text>
+    <xsl:choose>
+      <xsl:when test="namespace-uri()=''">
+        <xsl:value-of select="name()" />
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>*:</xsl:text>
+        <xsl:value-of select="local-name()" />
+        <xsl:text>[namespace-uri()='</xsl:text>
+        <xsl:value-of select="namespace-uri()" />
+        <xsl:text>']</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:variable name="preceding" select="count(preceding-sibling::*[local-name()=local-name(current())                                   and namespace-uri() = namespace-uri(current())])" />
+    <xsl:text>[</xsl:text>
+    <xsl:value-of select="1+ $preceding" />
+    <xsl:text>]</xsl:text>
+  </xsl:template>
+  <xsl:template match="@*" mode="schematron-get-full-path">
+    <xsl:apply-templates mode="schematron-get-full-path" select="parent::*" />
+    <xsl:text>/</xsl:text>
+    <xsl:choose>
+      <xsl:when test="namespace-uri()=''">@<xsl:value-of select="name()" />
+</xsl:when>
+      <xsl:otherwise>
+        <xsl:text>@*[local-name()='</xsl:text>
+        <xsl:value-of select="local-name()" />
+        <xsl:text>' and namespace-uri()='</xsl:text>
+        <xsl:value-of select="namespace-uri()" />
+        <xsl:text>']</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+<!--MODE: SCHEMATRON-FULL-PATH-2-->
+<!--This mode can be used to generate prefixed XPath for humans-->
+<xsl:template match="node() | @*" mode="schematron-get-full-path-2">
+    <xsl:for-each select="ancestor-or-self::*">
+      <xsl:text>/</xsl:text>
+      <xsl:value-of select="name(.)" />
+      <xsl:if test="preceding-sibling::*[name(.)=name(current())]">
+        <xsl:text>[</xsl:text>
+        <xsl:value-of select="count(preceding-sibling::*[name(.)=name(current())])+1" />
+        <xsl:text>]</xsl:text>
+      </xsl:if>
+    </xsl:for-each>
+    <xsl:if test="not(self::*)">
+      <xsl:text />/@<xsl:value-of select="name(.)" />
+    </xsl:if>
+  </xsl:template>
+<!--MODE: SCHEMATRON-FULL-PATH-3-->
+<!--This mode can be used to generate prefixed XPath for humans 
+	(Top-level element has index)-->
 
-		<!--ASSERT -->
-      <xsl:choose>
-         <xsl:when test="normalize-space(cbc:ID)='E'"/>
-         <xsl:otherwise>Tax Category
-        E MUST be used when exemption reason code is VATEX-EU-J<xsl:value-of select="string('&#xA;')"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-   <xsl:template match="text()" priority="-1" mode="M39"/>
-   <xsl:template match="@*|node()" priority="-2" mode="M39">
-      <xsl:apply-templates select="*" mode="M39"/>
-   </xsl:template>
-</xsl:stylesheet>
+<xsl:template match="node() | @*" mode="schematron-get-full-path-3">
+    <xsl:for-each select="ancestor-or-self::*">
+      <xsl:text>/</xsl:text>
+      <xsl:value-of select="name(.)" />
+      <xsl:if test="parent::*">
+        <xsl:text>[</xsl:text>
+        <xsl:value-of select="count(preceding-sibling::*[name(.)=name(current())])+1" />
+        <xsl:text>]</xsl:text>
+      </xsl:if>
+    </xsl:for-each>
+    <xsl:if test="not(self::*)">
+      <xsl:text />/@<xsl:value-of select="name(.)" />
+    </xsl:if>
+  </xsl:template>
+
+<!--MODE: GENERATE-ID-FROM-PATH -->
+<xsl:template match="/" mode="generate-id-from-path" />
+  <xsl:template match="text()" mode="generate-id-from-path">
+    <xsl:apply-templates mode="generate-id-from-path" select="parent::*" />
+    <xsl:value-of select="concat('.text-', 1+count(preceding-sibling::text()), '-')" />
+  </xsl:template>
+  <xsl:template match="comment()" mode="generate-id-from-path">
+    <xsl:apply-templates mode="generate-id-from-path" select="parent::*" />
+    <xsl:value-of select="concat('.comment-', 1+count(preceding-sibling::comment()), '-')" />
+  </xsl:template>
+  <xsl:template match="processing-instruction()" mode="generate-id-from-path">
+    <xsl:apply-templates mode="generate-id-from-path" select="parent::*" />
+    <xsl:value-of select="concat('.processing-instruction-', 1+count(preceding-sibling::processing-instruction()), '-')" />
+  </xsl:template>
+  <xsl:template match="@*" mode="generate-id-from-path">
+    <xsl:apply-templates mode="generate-id-from-path" select="parent::*" />
+    <xsl:value-of select="concat('.@', name())" />
+  </xsl:template>
+  <xsl:template match="*" mode="generate-id-from-path" priority="-0.5">
+    <xsl:apply-templates mode="generate-id-from-path" select="parent::*" />
+    <xsl:text>.</xsl:text>
+    <xsl:value-of select="concat('.',name(),'-',1+count(preceding-sibling::*[name()=name(current())]),'-')" />
+  </xsl:template>
+
+<!--MODE: GENERATE-ID-2 -->
+<xsl:template match="/" mode="generate-id-2">U</xsl:template>
+  <xsl:template match="*" mode="generate-id-2" priority="2">
+    <xsl:text>U</xsl:text>
+    <xsl:number count="*" level="multiple" />
+  </xsl:template>
+  <xsl:template match="node()" mode="generate-id-2">
+    <xsl:text>U.</xsl:text>
+    <xsl:number count="*" level="multiple" />
+    <xsl:text>n</xsl:text>
+    <xsl:number count="node()" />
+  </xsl:template>
+  <xsl:template match="@*" mode="generate-id-2">
+    <xsl:text>U.</xsl:text>
+    <xsl:number count="*" level="multiple" />
+    <xsl:text>_</xsl:text>
+    <xsl:value-of select="string-length(local-name(.))" />
+    <xsl:text>_</xsl:text>
+    <xsl:value-of select="translate(name(),':','.')" />
+  </xsl:template>
+<!--Strip characters-->  <xsl:template match="text()" priority="-1" />
+
+<!--SCHEMA SETUP-->
+<xsl:template match="/">
+    <svrl:schematron-output schemaVersion="iso" title="Rules for PEPPOL BIS 3.0 Billing adapted to AUNZ specification">
+      <xsl:comment>
+        <xsl:value-of select="$archiveDirParameter" />   
+		 <xsl:value-of select="$archiveNameParameter" />  
+		 <xsl:value-of select="$fileNameParameter" />  
+		 <xsl:value-of select="$fileDirParameter" />
+      </xsl:comment>
+      <svrl:ns-prefix-in-attribute-values prefix="cbc" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" />
+      <svrl:ns-prefix-in-attribute-values prefix="cac" uri="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" />
+      <svrl:ns-prefix-in-attribute-values prefix="ubl-creditnote" uri="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2" />
+      <svrl:ns-prefix-in-attribute-values prefix="ubl-invoice" uri="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" />
+      <svrl:ns-prefix-in-attribute-values prefix="xs" uri="http://www.w3.org/2001/XMLSchema" />
+      <svrl:ns-prefix-in-attribute-values prefix="u" uri="utils" />
+      <svrl:active-pattern>
+        <xsl:attribute name="document">
+          <xsl:value-of select="document-uri(/)" />
+        </xsl:attribute>
+        <xsl:apply-templates />
+      </svrl:active-pattern>
+      <xsl:apply-templates mode="M23" select="/" />
+      <svrl:active-pattern>
+        <xsl:attribute name="document">
+          <xsl:value-of select="document-uri(/)" />
+        </xsl:attribute>
+        <xsl:apply-templates />
+      </svrl:active-pattern>
+      <xsl:apply-templates mode="M24" select="/" />
+      <svrl:active-pattern>
+        <xsl:attribute name="document">
+          <xsl:value-of select="document-uri(/)" />
+        </xsl:attribute>
+        <xsl:apply-templates />
+      </svrl:active-pattern>
+      <xsl:apply-templates mode="M25" select="/" />
+      <svrl:active-pattern>
+        <xsl:attribute name="document">
+          <xsl:value-of select="document-uri(/)" />
+        </xsl:attribute>
+        <xsl:apply-templates />
+      </svrl:active-pattern>
+      <xsl:apply-templates mode="M26" select="/" />
+      <svrl:active-pattern>
+        <xsl:attribute name="document">
+          <xsl:value-of select="document-uri(/)" />
+        </xsl:attribute>
+        <xsl:apply-templates />
+      </svrl:active-pattern>
+      <xsl:apply-templates mode="M27" select="/" />
+      <svrl:active-pattern>
+        <xsl:attribute name="document">
+          <xsl:value-of select="document-uri(/)" />
+        </xsl:attribute>
+        <xsl:apply-templates />
+      </svrl:active-pattern>
+      <xsl:apply-templates mode="M28" select="/" />
+    </svrl:schematron-output>
+  </xsl:template>
+
+<!--SCHEMATRON PATTERNS-->
+<svrl:text>Rules for PEPPOL BIS 3.0 Billing adapted to AUNZ specification</svrl:text>
+  <xsl:param name="profile" select="       if (/*/cbc:ProfileID and matches(normalize-space(/*/cbc:ProfileID), 'urn:fdc:peppol.eu:2017:poacc:billing:([0-9]{2}):1.0')) then         tokenize(normalize-space(/*/cbc:ProfileID), ':')[7]       else         'Unknown'" />
+  <xsl:param name="supplierCountry" select="       if (/*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode) then             upper-case(normalize-space(/*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode))           else             'XX'" />
+  <xsl:param name="buyerCountry" select="   if (/*/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode) then   upper-case(normalize-space(/*/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode))   else   'XX'" />
+  <xsl:param name="documentCurrencyCode" select="/*/cbc:DocumentCurrencyCode" />
+
+<!--PATTERN -->
+
+
+	<!--RULE -->
+<xsl:template match="//*[not(*) and not(normalize-space())]" mode="M23" priority="1000">
+    <svrl:fired-rule context="//*[not(*) and not(normalize-space())]" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="false()" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="false()">
+          <xsl:attribute name="id">PEPPOL-EN16931-R008</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Document MUST not contain empty elements.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M23" select="*" />
+  </xsl:template>
+  <xsl:template match="text()" mode="M23" priority="-1" />
+  <xsl:template match="@*|node()" mode="M23" priority="-2">
+    <xsl:apply-templates mode="M23" select="*" />
+  </xsl:template>
+
+<!--PATTERN -->
+
+
+	<!--RULE -->
+<xsl:template match="ubl-creditnote:CreditNote" mode="M24" priority="1000">
+    <svrl:fired-rule context="ubl-creditnote:CreditNote" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="(count(cac:AdditionalDocumentReference[cbc:DocumentTypeCode='50']) &lt;= 1)" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="(count(cac:AdditionalDocumentReference[cbc:DocumentTypeCode='50']) &lt;= 1)">
+          <xsl:attribute name="id">PEPPOL-EN16931-R080</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Only one project reference is allowed on document level</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M24" select="*" />
+  </xsl:template>
+  <xsl:template match="text()" mode="M24" priority="-1" />
+  <xsl:template match="@*|node()" mode="M24" priority="-2">
+    <xsl:apply-templates mode="M24" select="*" />
+  </xsl:template>
+
+<!--PATTERN -->
+
+
+	<!--RULE -->
+<xsl:template match="ubl-creditnote:CreditNote | ubl-invoice:Invoice" mode="M25" priority="1022">
+    <svrl:fired-rule context="ubl-creditnote:CreditNote | ubl-invoice:Invoice" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="cbc:ProfileID" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="cbc:ProfileID">
+          <xsl:attribute name="id">PEPPOL-EN16931-R001</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Business process MUST be provided.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="$profile != 'Unknown'" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="$profile != 'Unknown'">
+          <xsl:attribute name="id">PEPPOL-EN16931-R007</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Business process MUST be in the format 'urn:fdc:peppol.eu:2017:poacc:billing:NN:1.0' where NN indicates the process number.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="count(cbc:Note) &lt;= 1" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="count(cbc:Note) &lt;= 1">
+          <xsl:attribute name="id">PEPPOL-EN16931-R002</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>No more than one note is allowed on document level.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="cbc:BuyerReference or cac:OrderReference/cbc:ID" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="cbc:BuyerReference or cac:OrderReference/cbc:ID">
+          <xsl:attribute name="id">PEPPOL-EN16931-R003</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>A buyer reference or purchase order reference MUST be provided.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="starts-with(normalize-space(cbc:CustomizationID/text()), 'urn:cen.eu:en16931:2017#conformant#urn:fdc:peppol.eu:2017:poacc:billing:international:aunz:3.0')" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="starts-with(normalize-space(cbc:CustomizationID/text()), 'urn:cen.eu:en16931:2017#conformant#urn:fdc:peppol.eu:2017:poacc:billing:international:aunz:3.0')">
+          <xsl:attribute name="id">PEPPOL-EN16931-R004-AUNZ</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Specification identifier MUST have the value 'urn:cen.eu:en16931:2017#conformant#urn:fdc:peppol.eu:2017:poacc:billing:international:aunz:3.0'.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="count(cac:TaxTotal[cac:TaxSubtotal]) = 1" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="count(cac:TaxTotal[cac:TaxSubtotal]) = 1">
+          <xsl:attribute name="id">PEPPOL-EN16931-R053</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Only one tax total with tax subtotals MUST be provided.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="count(cac:TaxTotal[not(cac:TaxSubtotal)]) = (if (cbc:TaxCurrencyCode) then 1 else 0)" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="count(cac:TaxTotal[not(cac:TaxSubtotal)]) = (if (cbc:TaxCurrencyCode) then 1 else 0)">
+          <xsl:attribute name="id">PEPPOL-EN16931-R054</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Only one tax total without tax subtotals MUST be provided when tax currency code is provided.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="not(cbc:TaxCurrencyCode) or (cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:TaxCurrencyCode)] &lt;= 0 and cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:DocumentCurrencyCode)] &lt;= 0) or (cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:TaxCurrencyCode)] >= 0 and cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:DocumentCurrencyCode)] >= 0) " />
+      <xsl:otherwise>
+        <svrl:failed-assert test="not(cbc:TaxCurrencyCode) or (cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:TaxCurrencyCode)] &lt;= 0 and cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:DocumentCurrencyCode)] &lt;= 0) or (cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:TaxCurrencyCode)] >= 0 and cac:TaxTotal/cbc:TaxAmount[@currencyID=normalize-space(../../cbc:DocumentCurrencyCode)] >= 0)">
+          <xsl:attribute name="id">PEPPOL-EN16931-R055-AUNZ</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Invoice total tax amount and Invoice total tax amount in accounting currency MUST have the same operational sign</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:TaxCurrencyCode" mode="M25" priority="1021">
+    <svrl:fired-rule context="cbc:TaxCurrencyCode" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="not(normalize-space(text()) = normalize-space(../cbc:DocumentCurrencyCode/text()))" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="not(normalize-space(text()) = normalize-space(../cbc:DocumentCurrencyCode/text()))">
+          <xsl:attribute name="id">PEPPOL-EN16931-R005-AUNZ</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Tax accounting currency code MUST be different from invoice currency code when provided.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cac:AccountingCustomerParty/cac:Party" mode="M25" priority="1020">
+    <svrl:fired-rule context="cac:AccountingCustomerParty/cac:Party" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="cbc:EndpointID" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="cbc:EndpointID">
+          <xsl:attribute name="id">PEPPOL-EN16931-R010</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Buyer electronic address MUST be provided</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cac:AccountingSupplierParty/cac:Party" mode="M25" priority="1019">
+    <svrl:fired-rule context="cac:AccountingSupplierParty/cac:Party" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="cbc:EndpointID" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="cbc:EndpointID">
+          <xsl:attribute name="id">PEPPOL-EN16931-R020</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Seller electronic address MUST be provided</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="ubl-invoice:Invoice/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)] | ubl-invoice:Invoice/cac:InvoiceLine/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)] | ubl-creditnote:CreditNote/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)] | ubl-creditnote:CreditNote/cac:CreditNoteLine/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)]" mode="M25" priority="1018">
+    <svrl:fired-rule context="ubl-invoice:Invoice/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)] | ubl-invoice:Invoice/cac:InvoiceLine/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)] | ubl-creditnote:CreditNote/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)] | ubl-creditnote:CreditNote/cac:CreditNoteLine/cac:AllowanceCharge[cbc:MultiplierFactorNumeric and not(cbc:BaseAmount)]" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="false()" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="false()">
+          <xsl:attribute name="id">PEPPOL-EN16931-R041</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Allowance/charge base amount MUST be provided when allowance/charge percentage is provided.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="ubl-invoice:Invoice/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount] | ubl-invoice:Invoice/cac:InvoiceLine/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount] | ubl-creditnote:CreditNote/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount] | ubl-creditnote:CreditNote/cac:CreditNoteLine/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount]" mode="M25" priority="1017">
+    <svrl:fired-rule context="ubl-invoice:Invoice/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount] | ubl-invoice:Invoice/cac:InvoiceLine/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount] | ubl-creditnote:CreditNote/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount] | ubl-creditnote:CreditNote/cac:CreditNoteLine/cac:AllowanceCharge[not(cbc:MultiplierFactorNumeric) and cbc:BaseAmount]" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="false()" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="false()">
+          <xsl:attribute name="id">PEPPOL-EN16931-R042</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Allowance/charge percentage MUST be provided when allowance/charge base amount is provided.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="ubl-invoice:Invoice/cac:AllowanceCharge | ubl-invoice:Invoice/cac:InvoiceLine/cac:AllowanceCharge | ubl-creditnote:CreditNote/cac:AllowanceCharge | ubl-creditnote:CreditNote/cac:CreditNoteLine/cac:AllowanceCharge" mode="M25" priority="1016">
+    <svrl:fired-rule context="ubl-invoice:Invoice/cac:AllowanceCharge | ubl-invoice:Invoice/cac:InvoiceLine/cac:AllowanceCharge | ubl-creditnote:CreditNote/cac:AllowanceCharge | ubl-creditnote:CreditNote/cac:CreditNoteLine/cac:AllowanceCharge" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="           not(cbc:MultiplierFactorNumeric and cbc:BaseAmount) or u:slack(if (cbc:Amount) then             cbc:Amount           else             0, (xs:decimal(cbc:BaseAmount) * xs:decimal(cbc:MultiplierFactorNumeric)) div 100, 0.02)" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="not(cbc:MultiplierFactorNumeric and cbc:BaseAmount) or u:slack(if (cbc:Amount) then cbc:Amount else 0, (xs:decimal(cbc:BaseAmount) * xs:decimal(cbc:MultiplierFactorNumeric)) div 100, 0.02)">
+          <xsl:attribute name="id">PEPPOL-EN16931-R040</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Allowance/charge amount must equal base amount * percentage/100 if base amount and percentage exists</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="normalize-space(cbc:ChargeIndicator/text()) = 'true' or normalize-space(cbc:ChargeIndicator/text()) = 'false'" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="normalize-space(cbc:ChargeIndicator/text()) = 'true' or normalize-space(cbc:ChargeIndicator/text()) = 'false'">
+          <xsl:attribute name="id">PEPPOL-EN16931-R043</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Allowance/charge ChargeIndicator value MUST equal 'true' or 'false'</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:Amount | cbc:BaseAmount | cbc:PriceAmount | cac:TaxTotal[cac:TaxSubtotal]/cbc:TaxAmount | cbc:TaxableAmount | cbc:LineExtensionAmount | cbc:TaxExclusiveAmount | cbc:TaxInclusiveAmount | cbc:AllowanceTotalAmount | cbc:ChargeTotalAmount | cbc:PrepaidAmount | cbc:PayableRoundingAmount | cbc:PayableAmount" mode="M25" priority="1015">
+    <svrl:fired-rule context="cbc:Amount | cbc:BaseAmount | cbc:PriceAmount | cac:TaxTotal[cac:TaxSubtotal]/cbc:TaxAmount | cbc:TaxableAmount | cbc:LineExtensionAmount | cbc:TaxExclusiveAmount | cbc:TaxInclusiveAmount | cbc:AllowanceTotalAmount | cbc:ChargeTotalAmount | cbc:PrepaidAmount | cbc:PayableRoundingAmount | cbc:PayableAmount" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="@currencyID = $documentCurrencyCode" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="@currencyID = $documentCurrencyCode">
+          <xsl:attribute name="id">PEPPOL-EN16931-R051-AUNZ</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>All currencyID attributes must have the same value as the invoice currency code (BT-5), except for the invoice total tax amount in accounting currency (BT-111).</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="ubl-invoice:Invoice[cac:InvoicePeriod/cbc:StartDate]/cac:InvoiceLine/cac:InvoicePeriod/cbc:StartDate | ubl-creditnote:CreditNote[cac:InvoicePeriod/cbc:StartDate]/cac:CreditNoteLine/cac:InvoicePeriod/cbc:StartDate" mode="M25" priority="1014">
+    <svrl:fired-rule context="ubl-invoice:Invoice[cac:InvoicePeriod/cbc:StartDate]/cac:InvoiceLine/cac:InvoicePeriod/cbc:StartDate | ubl-creditnote:CreditNote[cac:InvoicePeriod/cbc:StartDate]/cac:CreditNoteLine/cac:InvoicePeriod/cbc:StartDate" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="xs:date(text()) >= xs:date(../../../cac:InvoicePeriod/cbc:StartDate)" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="xs:date(text()) >= xs:date(../../../cac:InvoicePeriod/cbc:StartDate)">
+          <xsl:attribute name="id">PEPPOL-EN16931-R110</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Start date of line period MUST be within invoice period.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="ubl-invoice:Invoice[cac:InvoicePeriod/cbc:EndDate]/cac:InvoiceLine/cac:InvoicePeriod/cbc:EndDate | ubl-creditnote:CreditNote[cac:InvoicePeriod/cbc:EndDate]/cac:CreditNoteLine/cac:InvoicePeriod/cbc:EndDate" mode="M25" priority="1013">
+    <svrl:fired-rule context="ubl-invoice:Invoice[cac:InvoicePeriod/cbc:EndDate]/cac:InvoiceLine/cac:InvoicePeriod/cbc:EndDate | ubl-creditnote:CreditNote[cac:InvoicePeriod/cbc:EndDate]/cac:CreditNoteLine/cac:InvoicePeriod/cbc:EndDate" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="xs:date(text()) &lt;= xs:date(../../../cac:InvoicePeriod/cbc:EndDate)" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="xs:date(text()) &lt;= xs:date(../../../cac:InvoicePeriod/cbc:EndDate)">
+          <xsl:attribute name="id">PEPPOL-EN16931-R111</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>End date of line period MUST be within invoice period.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cac:InvoiceLine | cac:CreditNoteLine" mode="M25" priority="1012">
+    <svrl:fired-rule context="cac:InvoiceLine | cac:CreditNoteLine" />
+    <xsl:variable name="lineExtensionAmount" select="           if (cbc:LineExtensionAmount) then             xs:decimal(cbc:LineExtensionAmount)           else             0" />
+    <xsl:variable name="quantity" select="           if (/ubl-invoice:Invoice) then             (if (cbc:InvoicedQuantity) then               xs:decimal(cbc:InvoicedQuantity)             else               1)           else             (if (cbc:CreditedQuantity) then               xs:decimal(cbc:CreditedQuantity)             else               1)" />
+    <xsl:variable name="priceAmount" select="           if (cac:Price/cbc:PriceAmount) then             xs:decimal(cac:Price/cbc:PriceAmount)           else             0" />
+    <xsl:variable name="baseQuantity" select="           if (cac:Price/cbc:BaseQuantity and xs:decimal(cac:Price/cbc:BaseQuantity) != 0) then             xs:decimal(cac:Price/cbc:BaseQuantity)           else             1" />
+    <xsl:variable name="allowancesTotal" select="           if (cac:AllowanceCharge[normalize-space(cbc:ChargeIndicator) = 'false']) then             round(sum(cac:AllowanceCharge[normalize-space(cbc:ChargeIndicator) = 'false']/cbc:Amount/xs:decimal(.)) * 10 * 10) div 100           else             0" />
+    <xsl:variable name="chargesTotal" select="           if (cac:AllowanceCharge[normalize-space(cbc:ChargeIndicator) = 'true']) then             round(sum(cac:AllowanceCharge[normalize-space(cbc:ChargeIndicator) = 'true']/cbc:Amount/xs:decimal(.)) * 10 * 10) div 100           else             0" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="u:slack($lineExtensionAmount, ($quantity * ($priceAmount div $baseQuantity)) + $chargesTotal - $allowancesTotal, 0.02)" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="u:slack($lineExtensionAmount, ($quantity * ($priceAmount div $baseQuantity)) + $chargesTotal - $allowancesTotal, 0.02)">
+          <xsl:attribute name="id">PEPPOL-EN16931-R120</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Invoice line net amount MUST equal (Invoiced quantity * (Item net price/item price base quantity) + Sum of invoice line charge amount - sum of invoice line allowance amount</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="not(cac:Price/cbc:BaseQuantity) or xs:decimal(cac:Price/cbc:BaseQuantity) > 0" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="not(cac:Price/cbc:BaseQuantity) or xs:decimal(cac:Price/cbc:BaseQuantity) > 0">
+          <xsl:attribute name="id">PEPPOL-EN16931-R121</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Base quantity MUST be a positive number above zero.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="(count(cac:DocumentReference) &lt;= 1)" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="(count(cac:DocumentReference) &lt;= 1)">
+          <xsl:attribute name="id">PEPPOL-EN16931-R100</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Only one invoiced object is allowed pr line</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="(not(cac:DocumentReference) or (cac:DocumentReference/cbc:DocumentTypeCode='130'))" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="(not(cac:DocumentReference) or (cac:DocumentReference/cbc:DocumentTypeCode='130'))">
+          <xsl:attribute name="id">PEPPOL-EN16931-R101</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Element Document reference can only be used for Invoice line object</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cac:Price/cac:AllowanceCharge" mode="M25" priority="1011">
+    <svrl:fired-rule context="cac:Price/cac:AllowanceCharge" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="normalize-space(cbc:ChargeIndicator) = 'false'" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="normalize-space(cbc:ChargeIndicator) = 'false'">
+          <xsl:attribute name="id">PEPPOL-EN16931-R044</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Charge on price level is NOT allowed. Only value 'false' allowed.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="not(cbc:BaseAmount) or xs:decimal(../cbc:PriceAmount) = xs:decimal(cbc:BaseAmount) - xs:decimal(cbc:Amount)" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="not(cbc:BaseAmount) or xs:decimal(../cbc:PriceAmount) = xs:decimal(cbc:BaseAmount) - xs:decimal(cbc:Amount)">
+          <xsl:attribute name="id">PEPPOL-EN16931-R046</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Item net price MUST equal (Gross price - Allowance amount) when gross price is provided.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cac:Price/cbc:BaseQuantity[@unitCode]" mode="M25" priority="1010">
+    <svrl:fired-rule context="cac:Price/cbc:BaseQuantity[@unitCode]" />
+    <xsl:variable name="hasQuantity" select="../../cbc:InvoicedQuantity or ../../cbc:CreditedQuantity" />
+    <xsl:variable name="quantity" select="           if (/ubl-invoice:Invoice) then             ../../cbc:InvoicedQuantity           else             ../../cbc:CreditedQuantity" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="not($hasQuantity) or @unitCode = $quantity/@unitCode" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="not($hasQuantity) or @unitCode = $quantity/@unitCode">
+          <xsl:attribute name="id">PEPPOL-EN16931-R130</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Unit code of price base quantity MUST be same as invoiced quantity.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:EndpointID[@schemeID = '0088'] | cac:PartyIdentification/cbc:ID[@schemeID = '0088'] | cbc:CompanyID[@schemeID = '0088']" mode="M25" priority="1009">
+    <svrl:fired-rule context="cbc:EndpointID[@schemeID = '0088'] | cac:PartyIdentification/cbc:ID[@schemeID = '0088'] | cbc:CompanyID[@schemeID = '0088']" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="matches(normalize-space(), '^[0-9]+$') and u:gln(normalize-space())" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="matches(normalize-space(), '^[0-9]+$') and u:gln(normalize-space())">
+          <xsl:attribute name="id">PEPPOL-COMMON-R040</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>GLN must have a valid format according to GS1 rules.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:EndpointID[@schemeID = '0192'] | cac:PartyIdentification/cbc:ID[@schemeID = '0192'] | cbc:CompanyID[@schemeID = '0192']" mode="M25" priority="1008">
+    <svrl:fired-rule context="cbc:EndpointID[@schemeID = '0192'] | cac:PartyIdentification/cbc:ID[@schemeID = '0192'] | cbc:CompanyID[@schemeID = '0192']" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="matches(normalize-space(), '^[0-9]{9}$') and u:mod11(normalize-space())" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="matches(normalize-space(), '^[0-9]{9}$') and u:mod11(normalize-space())">
+          <xsl:attribute name="id">PEPPOL-COMMON-R041</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Norwegian organization number MUST be stated in the correct format.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:EndpointID[@schemeID = '0184'] | cac:PartyIdentification/cbc:ID[@schemeID = '0184'] | cbc:CompanyID[@schemeID = '0184']" mode="M25" priority="1007">
+    <svrl:fired-rule context="cbc:EndpointID[@schemeID = '0184'] | cac:PartyIdentification/cbc:ID[@schemeID = '0184'] | cbc:CompanyID[@schemeID = '0184']" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="(string-length(text()) = 10) and (substring(text(), 1, 2) = 'DK') and (string-length(translate(substring(text(), 3, 8), '1234567890', '')) = 0)" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="(string-length(text()) = 10) and (substring(text(), 1, 2) = 'DK') and (string-length(translate(substring(text(), 3, 8), '1234567890', '')) = 0)">
+          <xsl:attribute name="id">PEPPOL-COMMON-R042</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Danish organization number (CVR) MUST be stated in the correct format.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:EndpointID[@schemeID = '0208'] | cac:PartyIdentification/cbc:ID[@schemeID = '0208'] | cbc:CompanyID[@schemeID = '0208']" mode="M25" priority="1006">
+    <svrl:fired-rule context="cbc:EndpointID[@schemeID = '0208'] | cac:PartyIdentification/cbc:ID[@schemeID = '0208'] | cbc:CompanyID[@schemeID = '0208']" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="matches(normalize-space(), '^[0-9]{10}$') and u:mod97-0208(normalize-space())" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="matches(normalize-space(), '^[0-9]{10}$') and u:mod97-0208(normalize-space())">
+          <xsl:attribute name="id">PEPPOL-COMMON-R043</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Belgian enterprise number MUST be stated in the correct format.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:EndpointID[@schemeID = '0201'] | cac:PartyIdentification/cbc:ID[@schemeID = '0201'] | cbc:CompanyID[@schemeID = '0201']" mode="M25" priority="1005">
+    <svrl:fired-rule context="cbc:EndpointID[@schemeID = '0201'] | cac:PartyIdentification/cbc:ID[@schemeID = '0201'] | cbc:CompanyID[@schemeID = '0201']" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="u:checkCodiceIPA(normalize-space())" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="u:checkCodiceIPA(normalize-space())">
+          <xsl:attribute name="id">PEPPOL-COMMON-R044</xsl:attribute>
+          <xsl:attribute name="flag">warning</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>IPA Code (Codice Univoco Unità Organizzativa) must be stated in the correct format</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:EndpointID[@schemeID = '0210'] | cac:PartyIdentification/cbc:ID[@schemeID = '0210'] | cbc:CompanyID[@schemeID = '0210']" mode="M25" priority="1004">
+    <svrl:fired-rule context="cbc:EndpointID[@schemeID = '0210'] | cac:PartyIdentification/cbc:ID[@schemeID = '0210'] | cbc:CompanyID[@schemeID = '0210']" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="u:checkCF(normalize-space())" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="u:checkCF(normalize-space())">
+          <xsl:attribute name="id">PEPPOL-COMMON-R045</xsl:attribute>
+          <xsl:attribute name="flag">warning</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Tax Code (Codice Fiscale) must be stated in the correct format</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:EndpointID[@schemeID = '9907']" mode="M25" priority="1003">
+    <svrl:fired-rule context="cbc:EndpointID[@schemeID = '9907']" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="u:checkCF(normalize-space())" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="u:checkCF(normalize-space())">
+          <xsl:attribute name="id">PEPPOL-COMMON-R046</xsl:attribute>
+          <xsl:attribute name="flag">warning</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Tax Code (Codice Fiscale) must be stated in the correct format</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:EndpointID[@schemeID = '0211'] | cac:PartyIdentification/cbc:ID[@schemeID = '0211'] | cbc:CompanyID[@schemeID = '0211']" mode="M25" priority="1002">
+    <svrl:fired-rule context="cbc:EndpointID[@schemeID = '0211'] | cac:PartyIdentification/cbc:ID[@schemeID = '0211'] | cbc:CompanyID[@schemeID = '0211']" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="u:checkPIVAseIT(normalize-space())" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="u:checkPIVAseIT(normalize-space())">
+          <xsl:attribute name="id">PEPPOL-COMMON-R047</xsl:attribute>
+          <xsl:attribute name="flag">warning</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Italian VAT Code (Partita Iva) must be stated in the correct format</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:EndpointID[@schemeID = '0007'] | cac:PartyIdentification/cbc:ID[@schemeID = '0007'] | cbc:CompanyID[@schemeID = '0007']" mode="M25" priority="1001">
+    <svrl:fired-rule context="cbc:EndpointID[@schemeID = '0007'] | cac:PartyIdentification/cbc:ID[@schemeID = '0007'] | cbc:CompanyID[@schemeID = '0007']" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="string-length(normalize-space()) = 10 and string(number(normalize-space())) != 'NaN' and u:checkSEOrgnr(normalize-space())" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="string-length(normalize-space()) = 10 and string(number(normalize-space())) != 'NaN' and u:checkSEOrgnr(normalize-space())">
+          <xsl:attribute name="id">PEPPOL-COMMON-R049</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Swedish organization number MUST be stated in the correct format.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:EndpointID[@schemeID = '0151'] | cac:PartyIdentification/cbc:ID[@schemeID = '0151'] | cbc:CompanyID[@schemeID = '0151']" mode="M25" priority="1000">
+    <svrl:fired-rule context="cbc:EndpointID[@schemeID = '0151'] | cac:PartyIdentification/cbc:ID[@schemeID = '0151'] | cbc:CompanyID[@schemeID = '0151']" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="matches(normalize-space(), '^[0-9]{11}$') and u:abn(normalize-space())" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="matches(normalize-space(), '^[0-9]{11}$') and u:abn(normalize-space())">
+          <xsl:attribute name="id">PEPPOL-COMMON-R050</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Australian Business Number (ABN) MUST be stated in the correct format.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+  <xsl:template match="text()" mode="M25" priority="-1" />
+  <xsl:template match="@*|node()" mode="M25" priority="-2">
+    <xsl:apply-templates mode="M25" select="*" />
+  </xsl:template>
+
+<!--PATTERN -->
+
+
+	<!--RULE -->
+<xsl:template match="cac:AccountingSupplierParty/cac:Party[$supplierCountry = 'AU']" mode="M26" priority="1001">
+    <svrl:fired-rule context="cac:AccountingSupplierParty/cac:Party[$supplierCountry = 'AU']" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="(string-length(cac:PartyLegalEntity/cbc:CompanyID)>=1 and cac:PartyLegalEntity/cbc:CompanyID/@schemeID = '0151')" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="(string-length(cac:PartyLegalEntity/cbc:CompanyID)>=1 and cac:PartyLegalEntity/cbc:CompanyID/@schemeID = '0151')">
+          <xsl:attribute name="id">AUNZ-R-001</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>[AUNZ-R-001]-An invoice must contain the Seller's ABN if Seller country is Australia</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M26" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cac:AccountingCustomerParty/cac:Party[$buyerCountry = 'AU']" mode="M26" priority="1000">
+    <svrl:fired-rule context="cac:AccountingCustomerParty/cac:Party[$buyerCountry = 'AU']" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="(string-length(cac:PartyLegalEntity/cbc:CompanyID)>=1 and cac:PartyLegalEntity/cbc:CompanyID/@schemeID = '0151')" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="(string-length(cac:PartyLegalEntity/cbc:CompanyID)>=1 and cac:PartyLegalEntity/cbc:CompanyID/@schemeID = '0151')">
+          <xsl:attribute name="id">AUNZ-R-004</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>[AUNZ-R-004]-An invoice must contain the Buyer's ABN if Buyer country is Australia</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M26" select="*" />
+  </xsl:template>
+  <xsl:template match="text()" mode="M26" priority="-1" />
+  <xsl:template match="@*|node()" mode="M26" priority="-2">
+    <xsl:apply-templates mode="M26" select="*" />
+  </xsl:template>
+
+<!--PATTERN -->
+
+
+	<!--RULE -->
+<xsl:template match="cac:AccountingSupplierParty/cac:Party[$supplierCountry = 'NZ']" mode="M27" priority="1001">
+    <svrl:fired-rule context="cac:AccountingSupplierParty/cac:Party[$supplierCountry = 'NZ']" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="(string-length(cac:PartyLegalEntity/cbc:CompanyID)>=1 and cac:PartyLegalEntity/cbc:CompanyID/@schemeID = '0088') " />
+      <xsl:otherwise>
+        <svrl:failed-assert test="(string-length(cac:PartyLegalEntity/cbc:CompanyID)>=1 and cac:PartyLegalEntity/cbc:CompanyID/@schemeID = '0088')">
+          <xsl:attribute name="id">AUNZ-R-002</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>[AUNZ-R-002]-An invoice must contain the Seller's NZBN if Seller country is New Zealand</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M27" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cac:AccountingCustomerParty/cac:Party[$buyerCountry = 'NZ']" mode="M27" priority="1000">
+    <svrl:fired-rule context="cac:AccountingCustomerParty/cac:Party[$buyerCountry = 'NZ']" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="(string-length(cac:PartyLegalEntity/cbc:CompanyID)>=1 and cac:PartyLegalEntity/cbc:CompanyID/@schemeID = '0088')" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="(string-length(cac:PartyLegalEntity/cbc:CompanyID)>=1 and cac:PartyLegalEntity/cbc:CompanyID/@schemeID = '0088')">
+          <xsl:attribute name="id">AUNZ-R-005</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>[AUNZ-R-005]-An invoice must contain the Buyer's NZBN if Buyer country is New Zealand</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M27" select="*" />
+  </xsl:template>
+  <xsl:template match="text()" mode="M27" priority="-1" />
+  <xsl:template match="@*|node()" mode="M27" priority="-2">
+    <xsl:apply-templates mode="M27" select="*" />
+  </xsl:template>
+
+<!--PATTERN -->
+<xsl:variable name="ISO3166" select="tokenize('AD AE AF AG AI AL AM AO AQ AR AS AT AU AW AX AZ BA BB BD BE BF BG BH BI BJ BL BM BN BO BQ BR BS BT BV BW BY BZ CA CC CD CF CG CH CI CK CL CM CN CO CR CU CV CW CX CY CZ DE DJ DK DM DO DZ EC EE EG EH ER ES ET FI FJ FK FM FO FR GA GB GD GE GF GG GH GI GL GM GN GP GQ GR GS GT GU GW GY HK HM HN HR HT HU ID IE IL IM IN IO IQ IR IS IT JE JM JO JP KE KG KH KI KM KN KP KR KW KY KZ LA LB LC LI LK LR LS LT LU LV LY MA MC MD ME MF MG MH MK ML MM MN MO MP MQ MR MS MT MU MV MW MX MY MZ NA NC NE NF NG NI NL NO NP NR NU NZ OM PA PE PF PG PH PK PL PM PN PR PS PT PW PY QA RE RO RS RU RW SA SB SC SD SE SG SH SI SJ SK SL SM SN SO SR SS ST SV SX SY SZ TC TD TF TG TH TJ TK TL TM TN TO TR TT TV TW TZ UA UG UM US UY UZ VA VC VE VG VI VN VU WF WS YE YT ZA ZM ZW 1A XI', '\s')" />
+  <xsl:variable name="ISO4217" select="tokenize('AED AFN ALL AMD ANG AOA ARS AUD AWG AZN BAM BBD BDT BGN BHD BIF BMD BND BOB BOV BRL BSD BTN BWP BYN BZD CAD CDF CHE CHF CHW CLF CLP CNY COP COU CRC CUC CUP CVE CZK DJF DKK DOP DZD EGP ERN ETB EUR FJD FKP GBP GEL GHS GIP GMD GNF GTQ GYD HKD HNL HRK HTG HUF IDR ILS INR IQD IRR ISK JMD JOD JPY KES KGS KHR KMF KPW KRW KWD KYD KZT LAK LBP LKR LRD LSL LYD MAD MDL MGA MKD MMK MNT MOP MRU MUR MVR MWK MXN MXV MYR MZN NAD NGN NIO NOK NPR NZD OMR PAB PEN PGK PHP PKR PLN PYG QAR RON RSD RUB RWF SAR SBD SCR SDG SEK SGD SHP SLL SOS SRD SSP STN SVC SYP SZL THB TJS TMT TND TOP TRY TTD TWD TZS UAH UGX USD USN UYI UYU UZS VEF VND VUV WST XAF XAG XAU XBA XBB XBC XBD XCD XDR XOF XPD XPF XPT XSU XTS XUA XXX YER ZAR ZMW ZWL', '\s')" />
+  <xsl:variable name="MIMECODE" select="tokenize('application/pdf image/png image/jpeg text/csv application/vnd.openxmlformats-officedocument.spreadsheetml.sheet application/vnd.oasis.opendocument.spreadsheet', '\s')" />
+  <xsl:variable name="UNCL2005" select="tokenize('3 35 432', '\s')" />
+  <xsl:variable name="UNCL5189" select="tokenize('41 42 60 62 63 64 65 66 67 68 70 71 88 95 100 102 103 104 105', '\s')" />
+  <xsl:variable name="UNCL7161" select="tokenize('AA AAA AAC AAD AAE AAF AAH AAI AAS AAT AAV AAY AAZ ABA ABB ABC ABD ABF ABK ABL ABN ABR ABS ABT ABU ACF ACG ACH ACI ACJ ACK ACL ACM ACS ADC ADE ADJ ADK ADL ADM ADN ADO ADP ADQ ADR ADT ADW ADY ADZ AEA AEB AEC AED AEF AEH AEI AEJ AEK AEL AEM AEN AEO AEP AES AET AEU AEV AEW AEX AEY AEZ AJ AU CA CAB CAD CAE CAF CAI CAJ CAK CAL CAM CAN CAO CAP CAQ CAR CAS CAT CAU CAV CAW CAX CAY CAZ CD CG CS CT DAB DAC DAD DAF DAG DAH DAI DAJ DAK DAL DAM DAN DAO DAP DAQ DL EG EP ER FAA FAB FAC FC FH FI GAA HAA HD HH IAA IAB ID IF IR IS KO L1 LA LAA LAB LF MAE MI ML NAA OA PA PAA PC PL RAB RAC RAD RAF RE RF RH RV SA SAA SAD SAE SAI SG SH SM SU TAB TAC TT TV V1 V2 WH XAA YY ZZZ', '\s')" />
+  <xsl:variable name="UNCL5305" select="tokenize('AE E S Z G O K L M', '\s')" />
+  <xsl:variable name="eaid" select="tokenize('0002 0007 0009 0037 0060 0088 0096 0097 0106 0130 0135 0142 0151 0183 0184 0188 0190 0191 0192 0193 0195 0196 0198 0199 0200 0201 0202 0204 0208 0209 0210 0211 0212 0213 0215 0216 0218 0221 0230 9901 9910 9913 9914 9915 9918 9919 9920 9922 9923 9924 9925 9926 9927 9928 9929 9930 9931 9932 9933 9934 9935 9936 9937 9938 9939 9940 9941 9942 9943 9944 9945 9946 9947 9948 9949 9950 9951 9952 9953 9957 9959', '\s')" />
+
+	<!--RULE -->
+<xsl:template match="cbc:EmbeddedDocumentBinaryObject[@mimeCode]" mode="M28" priority="1008">
+    <svrl:fired-rule context="cbc:EmbeddedDocumentBinaryObject[@mimeCode]" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="           some $code in $MIMECODE           satisfies @mimeCode = $code" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="some $code in $MIMECODE satisfies @mimeCode = $code">
+          <xsl:attribute name="id">PEPPOL-EN16931-CL001</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Mime code must be according to subset of IANA code list.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M28" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cac:AllowanceCharge[cbc:ChargeIndicator = 'false']/cbc:AllowanceChargeReasonCode" mode="M28" priority="1007">
+    <svrl:fired-rule context="cac:AllowanceCharge[cbc:ChargeIndicator = 'false']/cbc:AllowanceChargeReasonCode" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="           some $code in $UNCL5189             satisfies normalize-space(text()) = $code" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="some $code in $UNCL5189 satisfies normalize-space(text()) = $code">
+          <xsl:attribute name="id">PEPPOL-EN16931-CL002</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Reason code MUST be according to subset of UNCL 5189 D.16B.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M28" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cac:AllowanceCharge[cbc:ChargeIndicator = 'true']/cbc:AllowanceChargeReasonCode" mode="M28" priority="1006">
+    <svrl:fired-rule context="cac:AllowanceCharge[cbc:ChargeIndicator = 'true']/cbc:AllowanceChargeReasonCode" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="           some $code in $UNCL7161             satisfies normalize-space(text()) = $code" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="some $code in $UNCL7161 satisfies normalize-space(text()) = $code">
+          <xsl:attribute name="id">PEPPOL-EN16931-CL003</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Reason code MUST be according to UNCL 7161 D.16B.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M28" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cac:InvoicePeriod/cbc:DescriptionCode" mode="M28" priority="1005">
+    <svrl:fired-rule context="cac:InvoicePeriod/cbc:DescriptionCode" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="           some $code in $UNCL2005             satisfies normalize-space(text()) = $code" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="some $code in $UNCL2005 satisfies normalize-space(text()) = $code">
+          <xsl:attribute name="id">PEPPOL-EN16931-CL006</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Invoice period description code must be according to UNCL 2005 D.16B.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M28" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:Amount | cbc:BaseAmount | cbc:PriceAmount | cbc:TaxAmount | cbc:TaxableAmount | cbc:LineExtensionAmount | cbc:TaxExclusiveAmount | cbc:TaxInclusiveAmount | cbc:AllowanceTotalAmount | cbc:ChargeTotalAmount | cbc:PrepaidAmount | cbc:PayableRoundingAmount | cbc:PayableAmount" mode="M28" priority="1004">
+    <svrl:fired-rule context="cbc:Amount | cbc:BaseAmount | cbc:PriceAmount | cbc:TaxAmount | cbc:TaxableAmount | cbc:LineExtensionAmount | cbc:TaxExclusiveAmount | cbc:TaxInclusiveAmount | cbc:AllowanceTotalAmount | cbc:ChargeTotalAmount | cbc:PrepaidAmount | cbc:PayableRoundingAmount | cbc:PayableAmount" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="           some $code in $ISO4217             satisfies @currencyID = $code" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="some $code in $ISO4217 satisfies @currencyID = $code">
+          <xsl:attribute name="id">PEPPOL-EN16931-CL007</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Currency code must be according to ISO 4217:2005</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M28" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:InvoiceTypeCode" mode="M28" priority="1003">
+    <svrl:fired-rule context="cbc:InvoiceTypeCode" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="     $profile != '01' or (some $code in tokenize('71 80 82 84 102 218 219 331 380 382 383 386 388 393 395 553 575 623 780 817 870 875 876 877', '\s')     satisfies normalize-space(text()) = $code)" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="$profile != '01' or (some $code in tokenize('71 80 82 84 102 218 219 331 380 382 383 386 388 393 395 553 575 623 780 817 870 875 876 877', '\s') satisfies normalize-space(text()) = $code)">
+          <xsl:attribute name="id">PEPPOL-EN16931-P0100</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Invoice type code MUST be set according to the profile.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M28" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:CreditNoteTypeCode" mode="M28" priority="1002">
+    <svrl:fired-rule context="cbc:CreditNoteTypeCode" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="           $profile != '01' or (some $code in tokenize('381 396 81 83 532', '\s')             satisfies normalize-space(text()) = $code)" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="$profile != '01' or (some $code in tokenize('381 396 81 83 532', '\s') satisfies normalize-space(text()) = $code)">
+          <xsl:attribute name="id">PEPPOL-EN16931-P0101</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Credit note type code MUST be set according to the profile.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M28" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:IssueDate | cbc:DueDate | cbc:TaxPointDate | cbc:StartDate | cbc:EndDate | cbc:ActualDeliveryDate" mode="M28" priority="1001">
+    <svrl:fired-rule context="cbc:IssueDate | cbc:DueDate | cbc:TaxPointDate | cbc:StartDate | cbc:EndDate | cbc:ActualDeliveryDate" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="string-length(text()) = 10 and (string(.) castable as xs:date)" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="string-length(text()) = 10 and (string(.) castable as xs:date)">
+          <xsl:attribute name="id">PEPPOL-EN16931-F001</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>A date
+        MUST be formatted YYYY-MM-DD.</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M28" select="*" />
+  </xsl:template>
+
+	<!--RULE -->
+<xsl:template match="cbc:EndpointID[@schemeID]" mode="M28" priority="1000">
+    <svrl:fired-rule context="cbc:EndpointID[@schemeID]" />
+
+		<!--ASSERT -->
+<xsl:choose>
+      <xsl:when test="         some $code in $eaid         satisfies @schemeID = $code" />
+      <xsl:otherwise>
+        <svrl:failed-assert test="some $code in $eaid satisfies @schemeID = $code">
+          <xsl:attribute name="id">PEPPOL-EN16931-CL008</xsl:attribute>
+          <xsl:attribute name="flag">fatal</xsl:attribute>
+          <xsl:attribute name="location">
+            <xsl:apply-templates mode="schematron-select-full-path" select="." />
+          </xsl:attribute>
+          <svrl:text>Electronic address identifier scheme must be from the codelist "Electronic Address Identifier Scheme"</svrl:text>
+        </svrl:failed-assert>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates mode="M28" select="*" />
+  </xsl:template>
+  <xsl:template match="text()" mode="M28" priority="-1" />
+  <xsl:template match="@*|node()" mode="M28" priority="-2">
+    <xsl:apply-templates mode="M28" select="*" />
+  </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file

From 1ec4c1e3f395d9ab4fcd889f8e00c2395e08f98b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Oct 2024 14:57:53 +1100
Subject: [PATCH 24/81] Ubl => PDF

---
 app/Services/EDocument/Imports/Ubl2Pdf.php | 91 ++++++++++++++++++----
 1 file changed, 75 insertions(+), 16 deletions(-)

diff --git a/app/Services/EDocument/Imports/Ubl2Pdf.php b/app/Services/EDocument/Imports/Ubl2Pdf.php
index fe6712226c3..0abd9d2005a 100644
--- a/app/Services/EDocument/Imports/Ubl2Pdf.php
+++ b/app/Services/EDocument/Imports/Ubl2Pdf.php
@@ -39,8 +39,14 @@ public function run()
     {
         $client = $this->clientDetails();
         $supplier = $this->supplierDetails();
-        $invoiceLines = $this->invoiceLines();
+        $invoiceDetails = $this->invoiceDetails();
         $totals = $this->totals();
+
+        nlog($client);
+        nlog($supplier);
+        nlog($invoiceDetails);
+        nlog($totals);
+
     }
 
     private function clientDetails(): array
@@ -68,14 +74,17 @@ private function clientDetails(): array
     private function supplierDetails(): array
     {
         return [
-            'name' => data_get($this->invoice, 'AccountingSupplierParty.Party.PartyName.0.name', ''),
+            'name' => data_get($this->invoice, 'AccountingSupplierParty.Party.PartyName.0.Name', ''),
             'address1' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.StreetName', ''),
             'address2' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.AdditionalStreetName', ''),
             'city' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.CityName', ''),
             'state' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.CountrySubentity', ''),
             'postal_code' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.PostalZone', ''),
             'country_id' => $this->resolveCountry(data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.Country.IdentificationCode.value', '')),
+            'routing_id' => data_get($this->invoice, 'AccountingSupplierParty.Party.EndpointID.value', ''),
+            'id_number' => data_get($this->invoice, 'AccountingSupplierParty.Party.PartyIdentification.0.ID.value', false),
             'vat_number' => data_get($this->invoice, 'AccountingSupplierParty.Party.PartyTaxScheme.0.CompanyID.value', ''),
+            'currency_id' => $this->resolveCurrencyId(data_get($this->invoice, 'DocumentCurrencyCode.value', $this->company->currency()->code)),
             'contacts' => [
                 'first_name' => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Name', ''),
                 'phone' => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Telephone', ''),
@@ -84,31 +93,81 @@ private function supplierDetails(): array
         ];
     }
 
+    private function invoiceDetails(): array
+    {
+        return [
+            'number' => data_get($this->invoice, 'ID.value', ''),
+            'date' => data_get($this->invoice, 'IssueDate', ''),
+            'due_date' => data_get($this->invoice, 'DueDate', ''),
+            // 'type' => data_get($this->invoice, 'InvoiceTypeCode.value', ''),
+            'line_items' => $this->invoiceLines(),
+            'terms' => $this->harvestTerms(),
+            'public_notes' => data_get($this->invoice, 'Note', '')
+        ];
+    }
+    private function harvestTerms(): string
+    {
+
+        $payment_means = [];
+        $payment_means[] = data_get($this->invoice, 'PaymentMeans.0.PaymentMeansCode.name', false);
+        $payment_means[] = data_get($this->invoice, 'PaymentMeans.0.PaymentID.value', false);
+        $payment_means[] = data_get($this->invoice, 'PaymentMeans.0.PayeeFinancialAccount.ID.value', false);
+        $payment_means[] = data_get($this->invoice, 'PaymentMeans.0.PayeeFinancialAccount.Name', false);
+        $payment_means[] = data_get($this->invoice, 'PaymentMeans.0.PayeeFinancialAccount.FinancialInstitutionBranch.ID.value', false);
+        $payment_means[] = data_get($this->invoice, 'PaymentTerms.0.Note', false);
+
+        $private_notes = collect($payment_means)
+                                ->reject(function ($means) {
+                                    return $means === false;
+                                })->implode("\n");
+
+        return $private_notes;
+
+    }
+
     private function invoiceLines(): array
     {
-        $lines = data_get($this->invoice, 'invoiceLine', []);
+        $lines = data_get($this->invoice, 'InvoiceLine', []);
+
         return array_map(function ($line) {
             return [
-                'quantity' => data_get($line, 'InvoicedQuantity',0),
-                'unit_code' => data_get($line, 'InvoicedQuantity.UnitCode',0),
-                'line_extension_amount' => data_get($line, 'LineExtensionAmount',0),
-                'item' => [
-                    'name' => data_get($line, 'Item.Name',''),
-                    'description' => data_get($line, 'Item.Description',''),
-                ],
-                'price' => data_get($line, 'Price.PriceAmount',0),
+                'quantity' => data_get($line, 'InvoicedQuantity.amount', 0),
+                'unit_code' => data_get($line, 'InvoicedQuantity.UnitCode','C62'),
+                'product_key' => data_get($line, 'Item.Name', ''),
+                'notes' =>  data_get($line, 'Item.Description', ''),
+                'cost' => data_get($line, 'Price.PriceAmount.value', 0),
+                'tax_name1' => data_get($line, 'Item.ClassifiedTaxCategory.0.TaxScheme.ID.value', ''),
+                'tax_rate1' => data_get($line, 'Item.ClassifiedTaxCategory.0.Percent', 0),
+                'tax_name2' => data_get($line, 'Item.ClassifiedTaxCategory.1.TaxScheme.ID.value', ''),
+                'tax_rate2' => data_get($line, 'Item.ClassifiedTaxCategory.1.Percent', 0),
+                'tax_name3' => data_get($line, 'Item.ClassifiedTaxCategory.2.TaxScheme.ID.value', ''),
+                'tax_rate3' => data_get($line, 'Item.ClassifiedTaxCategory.2.Percent', 0),
+                'line_extension_amount' => data_get($line, 'LineExtensionAmount.amount', 0),
             ];
         }, $lines);
     }
 
     private function totals(): array
     {
+        $tax_inc = data_get($this->invoice, 'LegalMonetaryTotal.TaxInclusiveAmount.amount', 0);
+        $tax_ex = data_get($this->invoice, 'LegalMonetaryTotal.TaxExclusiveAmount.amount', 0);
+        $tax_amount = data_get($this->invoice, 'TaxTotal.0.TaxAmount', 0);
+
+        $taxes = [];
+
+        foreach(data_get($this->invoice, 'TaxTotal.0.TaxSubtotal', []) as $tax_subtotal)
+        {
+            $taxes[] = [
+                'subtotal' => data_get($tax_subtotal, 'TaxableAmount.amount', 0),
+                'tax_name' => data_get($tax_subtotal, 'TaxCategory.TaxScheme.ID.value', ''),
+                'tax_rate' => data_get($tax_subtotal, 'TaxAmount.amount', 0),
+            ];
+        }
+
         return [
-            'line_extension_amount' => data_get($this->invoice, 'LegalMonetaryTotal.LineExtensionAmount',0),
-            'tax_exclusive_amount' => data_get($this->invoice, 'LegalMonetaryTotal.TaxExclusiveAmount',0),
-            'tax_inclusive_amount' => data_get($this->invoice, 'LegalMonetaryTotal.TaxInclusiveAmount',0),
-            'charge_total_amount' => data_get($this->invoice, 'LegalMonetaryTotal.ChargeTotalAmount',0),
-            'payable_amount' => data_get($this->invoice, 'LegalMonetaryTotal.PayableAmount',0),
+            'subtotal' => data_get($this->invoice, 'LegalMonetaryTotal.LineExtensionAmount.amount', 0),
+            'total' => data_get($this->invoice, 'LegalMonetaryTotal.TaxInclusiveAmount.amount', 0),
+            'taxes' => $taxes,
         ];
     }
 

From fe6613524bdd6ea800b5f9ff5092b5b53493ce8c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Oct 2024 15:30:12 +1100
Subject: [PATCH 25/81] Fixes for tests

---
 app/Services/EDocument/Imports/Ubl2Pdf.php    | 140 ++++++++++--------
 .../Einvoice/ImportEInvoiceTest.php           |  70 ---------
 2 files changed, 80 insertions(+), 130 deletions(-)

diff --git a/app/Services/EDocument/Imports/Ubl2Pdf.php b/app/Services/EDocument/Imports/Ubl2Pdf.php
index 0abd9d2005a..4a430891c7a 100644
--- a/app/Services/EDocument/Imports/Ubl2Pdf.php
+++ b/app/Services/EDocument/Imports/Ubl2Pdf.php
@@ -11,18 +11,20 @@
 
 namespace App\Services\EDocument\Imports;
 
+use App\Utils\Ninja;
 use App\Models\Vendor;
 use App\Models\Company;
 use App\Models\Country;
 use App\Models\Expense;
+use App\Models\Currency;
 use App\Factory\VendorFactory;
 use App\Factory\ExpenseFactory;
 use App\Services\AbstractService;
 use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\App;
 use InvoiceNinja\EInvoice\EInvoice;
 use App\Utils\Traits\SavesDocuments;
 use App\Factory\VendorContactFactory;
-use App\Models\Currency;
 use App\Repositories\ExpenseRepository;
 
 class Ubl2Pdf extends AbstractService
@@ -37,73 +39,91 @@ public function __construct(public \InvoiceNinja\EInvoice\Models\Peppol\Invoice
 
     public function run()
     {
-        $client = $this->clientDetails();
-        $supplier = $this->supplierDetails();
-        $invoiceDetails = $this->invoiceDetails();
-        $totals = $this->totals();
+                
+        App::forgetInstance('translator');
+        $t = app('translator');
+        App::setLocale($this->company->locale());
+        $t->replace(Ninja::transformTranslations($this->company->settings));
+
+        // nlog($client);
+        // nlog($supplier);
+        // nlog($invoiceDetails);
+        // nlog($totals);
+
+        $data = [
+            'client' => $this->clientDetails();
+            'supplier' => $this->supplierDetails();
+            'invoiceDetails' => $this->invoiceDetails();
+            'totals' => $this->totals();
+        ]
+    }
+
+    private function processValues(array $array): array
+    {
+
+        foreach($array as $key => $value)
+        {
+            if(empty($value))
+                unset($array[$key]);
 
-        nlog($client);
-        nlog($supplier);
-        nlog($invoiceDetails);
-        nlog($totals);
+        }
+
+        return $array;
 
     }
 
     private function clientDetails(): array
     {
-        return [
-            'name' => data_get($this->invoice, 'AccountingCustomerParty.Party.PartyName.0.Name',''),
-            'address1' => data_get($this->invoice, 'AccountingCustomerParty.Party.PostalAddress.StreetName',''),
-            'address2' => data_get($this->invoice, 'AccountingCustomerParty.Party.PostalAddress.AdditionalStreetName',''),
-            'city' => data_get($this->invoice, 'AccountingCustomerParty.Party.PostalAddress.CityName',''),
-            'state' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.CountrySubentity',''),
-            'postal_code' => data_get($this->invoice, 'AccountingCustomerParty.Party.PostalAddress.PostalZone',''),
-            'country_id' => data_get($this->invoice, 'AccountingCustomerParty.Party.PostalAddress.Country.IdentificationCode.value',''),
-            'vat_number' => data_get($this->invoice, 'AccountingCustomerParty.Party.PartyTaxScheme.0.CompanyID.value',''),
-            'contacts' => [
-                'first_name' => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Name',''),
-                'phone' => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Telephone',''),
-                'email' => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.ElectronicMail',''),
-            ],
-            'settings' => [
-                'currency_id' => $this->resolveCurrencyId(data_get($this->invoice, 'DocumentCurrencyCode.value', $this->company->currency()->code))
-            ]
-        ];
+        return $this->processValues([
+            ctrans('texts.name') => data_get($this->invoice, 'AccountingCustomerParty.Party.PartyName.0.Name',''),
+            ctrans('texts.address1') => data_get($this->invoice, 'AccountingCustomerParty.Party.PostalAddress.StreetName',''),
+            ctrans('texts.address2') => data_get($this->invoice, 'AccountingCustomerParty.Party.PostalAddress.AdditionalStreetName',''),
+            ctrans('texts.city') => data_get($this->invoice, 'AccountingCustomerParty.Party.PostalAddress.CityName',''),
+            ctrans('texts.state') => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.CountrySubentity',''),
+            ctrans('texts.postal_code') => data_get($this->invoice, 'AccountingCustomerParty.Party.PostalAddress.PostalZone',''),
+            ctrans('texts.country_id') => data_get($this->invoice, 'AccountingCustomerParty.Party.PostalAddress.Country.IdentificationCode.value',''),
+            ctrans('texts.vat_number') => data_get($this->invoice, 'AccountingCustomerParty.Party.PartyTaxScheme.0.CompanyID.value',''),
+            ctrans('texts.contact_name') => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Name',''),
+            ctrans('texts.phone') => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Telephone',''),
+            ctrans('texts.email') => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.ElectronicMail',''),
+        ]);
     }
 
     private function supplierDetails(): array
     {
-        return [
-            'name' => data_get($this->invoice, 'AccountingSupplierParty.Party.PartyName.0.Name', ''),
-            'address1' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.StreetName', ''),
-            'address2' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.AdditionalStreetName', ''),
-            'city' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.CityName', ''),
-            'state' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.CountrySubentity', ''),
-            'postal_code' => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.PostalZone', ''),
-            'country_id' => $this->resolveCountry(data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.Country.IdentificationCode.value', '')),
-            'routing_id' => data_get($this->invoice, 'AccountingSupplierParty.Party.EndpointID.value', ''),
-            'id_number' => data_get($this->invoice, 'AccountingSupplierParty.Party.PartyIdentification.0.ID.value', false),
-            'vat_number' => data_get($this->invoice, 'AccountingSupplierParty.Party.PartyTaxScheme.0.CompanyID.value', ''),
-            'currency_id' => $this->resolveCurrencyId(data_get($this->invoice, 'DocumentCurrencyCode.value', $this->company->currency()->code)),
-            'contacts' => [
-                'first_name' => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Name', ''),
-                'phone' => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Telephone', ''),
-                'email' => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.ElectronicMail', ''),
-            ],
-        ];
+        return $this->processValues([
+            ctrans('texts.name') => data_get($this->invoice, 'AccountingSupplierParty.Party.PartyName.0.Name', ''),
+            ctrans('texts.address1') => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.StreetName', ''),
+            ctrans('texts.address2') => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.AdditionalStreetName', ''),
+            ctrans('texts.city') => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.CityName', ''),
+            ctrans('texts.state') => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.CountrySubentity', ''),
+            ctrans('texts.postal_code') => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.PostalZone', ''),
+            ctrans('texts.country_id') => $this->resolveCountry(data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.Country.IdentificationCode.value', '')),
+            ctrans('texts.routing_id') => data_get($this->invoice, 'AccountingSupplierParty.Party.EndpointID.value', ''),
+            ctrans('texts.id_number') => data_get($this->invoice, 'AccountingSupplierParty.Party.PartyIdentification.0.ID.value', false),
+            ctrans('texts.vat_number') => data_get($this->invoice, 'AccountingSupplierParty.Party.PartyTaxScheme.0.CompanyID.value', ''),
+            ctrans('texts.currency_id') => $this->resolveCurrencyId(data_get($this->invoice, 'DocumentCurrencyCode.value', $this->company->currency()->code)),
+            ctrans('texts.contact_name') => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Name', ''),
+            ctrans('texts.phone') => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Telephone', ''),
+            ctrans('texts.email') => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.ElectronicMail', ''),
+        ]);
     }
 
     private function invoiceDetails(): array
     {
-        return [
-            'number' => data_get($this->invoice, 'ID.value', ''),
-            'date' => data_get($this->invoice, 'IssueDate', ''),
-            'due_date' => data_get($this->invoice, 'DueDate', ''),
-            // 'type' => data_get($this->invoice, 'InvoiceTypeCode.value', ''),
-            'line_items' => $this->invoiceLines(),
-            'terms' => $this->harvestTerms(),
-            'public_notes' => data_get($this->invoice, 'Note', '')
-        ];
+        $data = $this->processValues([
+            'currency' => data_get($this->invoice, 'DocumentCurrencyCode.value', $this->company->currency()->code),
+            'doctype' => data_get($this->invoice, 'InvoiceTypeCode.value', "380"),
+            ctrans('texts.number') => data_get($this->invoice, 'ID.value', ''),
+            ctrans('texts.date') => data_get($this->invoice, 'IssueDate', ''),
+            ctrans('texts.due_date') => data_get($this->invoice, 'DueDate', ''),
+            ctrans('texts.terms') => $this->harvestTerms(),
+            ctrans('texts.public_notes') => data_get($this->invoice, 'Note', '')
+        ]);
+
+        $data['line_items'] = $this->invoiceLines(),
+            
+        return $data;
     }
     private function harvestTerms(): string
     {
@@ -131,18 +151,18 @@ private function invoiceLines(): array
 
         return array_map(function ($line) {
             return [
-                'quantity' => data_get($line, 'InvoicedQuantity.amount', 0),
-                'unit_code' => data_get($line, 'InvoicedQuantity.UnitCode','C62'),
-                'product_key' => data_get($line, 'Item.Name', ''),
-                'notes' =>  data_get($line, 'Item.Description', ''),
-                'cost' => data_get($line, 'Price.PriceAmount.value', 0),
+                ctrans('texts.quantity') => data_get($line, 'InvoicedQuantity.amount', 0),
+                ctrans('texts.unit_code') => data_get($line, 'InvoicedQuantity.UnitCode','C62'),
+                ctrans('texts.product_key') => data_get($line, 'Item.Name', ''),
+                ctrans('texts.notes') =>  data_get($line, 'Item.Description', ''),
+                ctrans('texts.cost') => data_get($line, 'Price.PriceAmount.value', 0),
+                ctrans('texts.line_total') => data_get($line, 'LineExtensionAmount.amount', 0),
                 'tax_name1' => data_get($line, 'Item.ClassifiedTaxCategory.0.TaxScheme.ID.value', ''),
                 'tax_rate1' => data_get($line, 'Item.ClassifiedTaxCategory.0.Percent', 0),
                 'tax_name2' => data_get($line, 'Item.ClassifiedTaxCategory.1.TaxScheme.ID.value', ''),
                 'tax_rate2' => data_get($line, 'Item.ClassifiedTaxCategory.1.Percent', 0),
                 'tax_name3' => data_get($line, 'Item.ClassifiedTaxCategory.2.TaxScheme.ID.value', ''),
                 'tax_rate3' => data_get($line, 'Item.ClassifiedTaxCategory.2.Percent', 0),
-                'line_extension_amount' => data_get($line, 'LineExtensionAmount.amount', 0),
             ];
         }, $lines);
     }
diff --git a/tests/Integration/Einvoice/ImportEInvoiceTest.php b/tests/Integration/Einvoice/ImportEInvoiceTest.php
index dc8aa8d0f86..fc7fd9190cd 100644
--- a/tests/Integration/Einvoice/ImportEInvoiceTest.php
+++ b/tests/Integration/Einvoice/ImportEInvoiceTest.php
@@ -68,74 +68,4 @@ public function testParsingDocument()
 
     }
 
-
-    public function testHtmlConversion()
-    {
-                
-        // Load the XML source
-        $xml = new \DOMDocument();
-        $xml->load(base_path('tests/Integration/Einvoice/samples/peppol.xml'));
-
-        // Load XSLT stylesheet
-        $xsl = new \DOMDocument();
-        $xsl->load(base_path('tests/Integration/Einvoice/samples/peppol.xslt'));
-
-        // Configure the transformer
-        $proc = new \XSLTProcessor();
-        $proc->importStyleSheet($xsl); // attach the xsl rules
-
-// $proc->setParameter('', 'mode', 'document');
-
-
-
-// libxml_use_internal_errors(true);
-// // ... your existing code ...
-
-// $transformed = $proc->transformToXML($xml);
-// if ($transformed === false) {
-//     foreach (libxml_get_errors() as $error) {
-//         nlog($error->message);
-//     }
-// } else {
-//     nlog($transformed);
-// }
-// libxml_clear_errors();
-
-
-
-//         nlog($transformed);
-
-        // // determining if output is html document
-        // $html = $transformed;
-
-        // // splitting up html document at doctype and doc
-        // $html_array = explode("\n", $html, 15);
-
-        // $html_doc = array_pop($html_array);
-
-        // $html_doctype = implode("\n", $html_array);
-
-        // // convert XHTML syntax to HTML5
-        // // <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-        // // <!DOCTYPE html>
-
-
-        // $html_doctype = preg_replace("/<!DOCTYPE [^>]+>/", "<!DOCTYPE html>", $html_doctype);
-
-        // // <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-        // // <html lang="en">
-
-
-        // $html_doctype = preg_replace('/ xmlns=\"http:\/\/www.w3.org\/1999\/xhtml\"| xml:lang="[^\"]*\"/', '', $html_doctype);
-
-
-        // // <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        // // to this --> <meta charset="utf-8" />
-
-        // $html_doctype = preg_replace('/<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=(.*[a-z0-9-])\" \/>/i', '<meta charset="\1" />', $html_doctype);
-
-        // $html = $html_doctype . "\n" . $html_doc;
-        // nlog($html);
-
-    }
 }
\ No newline at end of file

From 8dbd7462ea41579cee831aadd09826614b1b1020 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Oct 2024 18:22:47 +1100
Subject: [PATCH 26/81] Working on UBL2PDF

---
 app/Services/EDocument/Imports/Ubl2Pdf.php | 111 +++++--
 app/Services/Template/TemplateService.php  |  18 +-
 resources/views/templates/ubl/td14.html    | 328 +++++++++++++++++++++
 3 files changed, 433 insertions(+), 24 deletions(-)
 create mode 100644 resources/views/templates/ubl/td14.html

diff --git a/app/Services/EDocument/Imports/Ubl2Pdf.php b/app/Services/EDocument/Imports/Ubl2Pdf.php
index 4a430891c7a..6d1ec012889 100644
--- a/app/Services/EDocument/Imports/Ubl2Pdf.php
+++ b/app/Services/EDocument/Imports/Ubl2Pdf.php
@@ -12,6 +12,7 @@
 namespace App\Services\EDocument\Imports;
 
 use App\Utils\Ninja;
+use App\Utils\Number;
 use App\Models\Vendor;
 use App\Models\Company;
 use App\Models\Country;
@@ -26,6 +27,7 @@
 use App\Utils\Traits\SavesDocuments;
 use App\Factory\VendorContactFactory;
 use App\Repositories\ExpenseRepository;
+use App\Services\Template\TemplateService;
 
 class Ubl2Pdf extends AbstractService
 {
@@ -44,18 +46,57 @@ public function run()
         $t = app('translator');
         App::setLocale($this->company->locale());
         $t->replace(Ninja::transformTranslations($this->company->settings));
-
+        $template = file_get_contents(resource_path('views/templates/ubl/td14.html'));
         // nlog($client);
         // nlog($supplier);
         // nlog($invoiceDetails);
         // nlog($totals);
 
         $data = [
-            'client' => $this->clientDetails();
-            'supplier' => $this->supplierDetails();
-            'invoiceDetails' => $this->invoiceDetails();
-            'totals' => $this->totals();
-        ]
+            'client' => $this->clientDetails(),
+            'supplier' => $this->supplierDetails(),
+            'invoiceDetails' => $this->invoiceDetails(),
+            'totals' => $this->totals(),
+            'metadata' => $this->metadata(),
+            'translations' => $this->getGenericTranslations(),
+            'css' => $this->customCss(),
+        ];
+
+        $ts = new TemplateService();
+        
+        $ts_instance = $ts->setCompany($this->company)
+                    ->setData($data)
+                    ->setRawTemplate($template)
+                    ->parseNinjaBlocks()
+                    ->save();
+
+        nlog($ts_instance->getHtml());
+
+    }
+
+    private function getGenericTranslations(): array
+    {
+        return [
+            'to' => ctrans('texts.to'),
+            'from' => ctrans('texts.from'),
+            'invoice' => ctrans('texts.invoice'),
+            'credit' => ctrans('texts.credit'),
+            'details' => ctrans('texts.details'),
+            'number' => ctrans('texts.number'),
+            'tax' => ctrans('texts.tax'),
+            
+            // 'from' => ctrans('texts.from'),
+            // 'from' => ctrans('texts.from'),
+            // 'from' => ctrans('texts.from'),
+            // 'from' => ctrans('texts.from'),
+            // 'from' => ctrans('texts.from'),
+            // 'from' => ctrans('texts.from'),
+            // 'from' => ctrans('texts.from'),
+            // 'from' => ctrans('texts.from'),
+            // 'from' => ctrans('texts.from'),
+            // 'from' => ctrans('texts.from'),
+            // 'from' => ctrans('texts.from'),
+        ];
     }
 
     private function processValues(array $array): array
@@ -63,9 +104,11 @@ private function processValues(array $array): array
 
         foreach($array as $key => $value)
         {
-            if(empty($value))
+            if($value === null || $value === '')
                 unset($array[$key]);
 
+            if($value instanceof \DateTime)
+                $array[$key] = $value->format($this->company->date_format());
         }
 
         return $array;
@@ -98,33 +141,57 @@ private function supplierDetails(): array
             ctrans('texts.city') => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.CityName', ''),
             ctrans('texts.state') => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.CountrySubentity', ''),
             ctrans('texts.postal_code') => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.PostalZone', ''),
-            ctrans('texts.country_id') => $this->resolveCountry(data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.Country.IdentificationCode.value', '')),
+            ctrans('texts.country_id') => data_get($this->invoice, 'AccountingSupplierParty.Party.PostalAddress.Country.IdentificationCode.value', ''),
             ctrans('texts.routing_id') => data_get($this->invoice, 'AccountingSupplierParty.Party.EndpointID.value', ''),
             ctrans('texts.id_number') => data_get($this->invoice, 'AccountingSupplierParty.Party.PartyIdentification.0.ID.value', false),
             ctrans('texts.vat_number') => data_get($this->invoice, 'AccountingSupplierParty.Party.PartyTaxScheme.0.CompanyID.value', ''),
-            ctrans('texts.currency_id') => $this->resolveCurrencyId(data_get($this->invoice, 'DocumentCurrencyCode.value', $this->company->currency()->code)),
+            // ctrans('texts.currency_id') => $this->resolveCurrencyId(data_get($this->invoice, 'DocumentCurrencyCode.value', $this->company->currency()->code)),
             ctrans('texts.contact_name') => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Name', ''),
             ctrans('texts.phone') => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.Telephone', ''),
             ctrans('texts.email') => data_get($this->invoice, 'AccountingCustomerParty.Party.Contact.ElectronicMail', ''),
         ]);
     }
 
+    private function customCss(): string
+    {
+        $css = '';
+        $css .= ".".str_replace(" ", "", ctrans('texts.product_key'))." { width: 15%;} ";
+        $css .= ".".str_replace(" ", "", ctrans('texts.quantity'))." { width: 8%;} ";
+        $css .= ".".str_replace(" ", "", ctrans('texts.notes'))." { width: 40%; } ";
+        $css .= ".".str_replace(" ", "", ctrans('texts.cost'))." { width:10%;} ";
+        $css .= ".".str_replace(" ", "", ctrans('texts.tax'))." { width:10%;} ";
+        $css .= ".".str_replace(" ", "", ctrans('texts.line_total'))." { width:15%;} ";
+
+        return $css;
+
+    }
+
     private function invoiceDetails(): array
     {
+
         $data = $this->processValues([
-            'currency' => data_get($this->invoice, 'DocumentCurrencyCode.value', $this->company->currency()->code),
-            'doctype' => data_get($this->invoice, 'InvoiceTypeCode.value', "380"),
+            ctrans('texts.currency') => data_get($this->invoice, 'DocumentCurrencyCode.value', $this->company->currency()->code),
+            ctrans('texts.currency_code') => data_get($this->invoice, 'InvoiceTypeCode.value', "380"),
             ctrans('texts.number') => data_get($this->invoice, 'ID.value', ''),
             ctrans('texts.date') => data_get($this->invoice, 'IssueDate', ''),
             ctrans('texts.due_date') => data_get($this->invoice, 'DueDate', ''),
-            ctrans('texts.terms') => $this->harvestTerms(),
-            ctrans('texts.public_notes') => data_get($this->invoice, 'Note', '')
         ]);
 
-        $data['line_items'] = $this->invoiceLines(),
+        $data['line_items'] = $this->invoiceLines();
             
         return $data;
     }
+
+    private function metadata(): array
+    {
+
+        return $this->processValues([
+            'currency' => data_get($this->invoice, 'DocumentCurrencyCode.value', $this->company->currency()->code),
+            ctrans('texts.terms') => $this->harvestTerms(),
+            ctrans('texts.public_notes') => data_get($this->invoice, 'Note', '')
+        ]);
+    }
+
     private function harvestTerms(): string
     {
 
@@ -151,18 +218,18 @@ private function invoiceLines(): array
 
         return array_map(function ($line) {
             return [
-                ctrans('texts.quantity') => data_get($line, 'InvoicedQuantity.amount', 0),
-                ctrans('texts.unit_code') => data_get($line, 'InvoicedQuantity.UnitCode','C62'),
                 ctrans('texts.product_key') => data_get($line, 'Item.Name', ''),
+                // ctrans('texts.ocde') => data_get($line, 'InvoicedQuantity.UnitCode',''),
+                ctrans('texts.quantity') => Number::formatValue(data_get($line, 'InvoicedQuantity.amount', 0), $this->company->currency()),
                 ctrans('texts.notes') =>  data_get($line, 'Item.Description', ''),
-                ctrans('texts.cost') => data_get($line, 'Price.PriceAmount.value', 0),
-                ctrans('texts.line_total') => data_get($line, 'LineExtensionAmount.amount', 0),
+                ctrans('texts.cost') => Number::formatValue(data_get($line, 'Price.PriceAmount.amount', 0), $this->company->currency()),
                 'tax_name1' => data_get($line, 'Item.ClassifiedTaxCategory.0.TaxScheme.ID.value', ''),
                 'tax_rate1' => data_get($line, 'Item.ClassifiedTaxCategory.0.Percent', 0),
                 'tax_name2' => data_get($line, 'Item.ClassifiedTaxCategory.1.TaxScheme.ID.value', ''),
                 'tax_rate2' => data_get($line, 'Item.ClassifiedTaxCategory.1.Percent', 0),
                 'tax_name3' => data_get($line, 'Item.ClassifiedTaxCategory.2.TaxScheme.ID.value', ''),
                 'tax_rate3' => data_get($line, 'Item.ClassifiedTaxCategory.2.Percent', 0),
+                ctrans('texts.line_total') => Number::formatValue(data_get($line, 'LineExtensionAmount.amount', 0), $this->company->currency()),
             ];
         }, $lines);
     }
@@ -178,15 +245,15 @@ private function totals(): array
         foreach(data_get($this->invoice, 'TaxTotal.0.TaxSubtotal', []) as $tax_subtotal)
         {
             $taxes[] = [
-                'subtotal' => data_get($tax_subtotal, 'TaxableAmount.amount', 0),
+                'subtotal' => data_get($tax_subtotal, 'TaxAmount.amount', 0),
                 'tax_name' => data_get($tax_subtotal, 'TaxCategory.TaxScheme.ID.value', ''),
-                'tax_rate' => data_get($tax_subtotal, 'TaxAmount.amount', 0),
+                'tax_rate' => data_get($tax_subtotal, 'TaxCategory.Percent', 0),
             ];
         }
 
         return [
-            'subtotal' => data_get($this->invoice, 'LegalMonetaryTotal.LineExtensionAmount.amount', 0),
-            'total' => data_get($this->invoice, 'LegalMonetaryTotal.TaxInclusiveAmount.amount', 0),
+            ctrans('texts.subtotal') => data_get($this->invoice, 'LegalMonetaryTotal.LineExtensionAmount.amount', 0),
+            ctrans('balance') => data_get($this->invoice, 'LegalMonetaryTotal.TaxInclusiveAmount.amount', 0),
             'taxes' => $taxes,
         ];
     }
diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php
index e23d60ce0ae..e4cf16d5d11 100644
--- a/app/Services/Template/TemplateService.php
+++ b/app/Services/Template/TemplateService.php
@@ -292,7 +292,7 @@ public function processData($data): self
      *
      * @return self
      */
-    private function parseNinjaBlocks(): self
+    public function parseNinjaBlocks(): self
     {
         $replacements = [];
 
@@ -350,6 +350,12 @@ public function setEntity($entity): self
         return $this;
     }
 
+    public function setData(array $data): self
+    {
+        $this->data = $data;
+
+        return $this;
+    }
     /**
      * Parses all variables in the document
      *
@@ -379,7 +385,7 @@ public function parseVariables(): self
      *
      * @return self
      */
-    private function save(): self
+    public function save(): self
     {
         $this->compiled_html = str_replace('%24', '$', $this->document->saveHTML());
 
@@ -409,6 +415,14 @@ public function compose(): self
 
     }
 
+    public function setRawTemplate(string $template):self
+    {
+                
+        @$this->document->loadHTML(mb_convert_encoding($template, 'HTML-ENTITIES', 'UTF-8'));
+
+        return $this;
+
+    }
     /**
      * Inject the template components
      * manually
diff --git a/resources/views/templates/ubl/td14.html b/resources/views/templates/ubl/td14.html
new file mode 100644
index 00000000000..8612c483b30
--- /dev/null
+++ b/resources/views/templates/ubl/td14.html
@@ -0,0 +1,328 @@
+<!DOCTYPE html>
+<!-- UBL to PDF Design - TemplateID #TD14 -->
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <style>
+        @import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap');
+
+        body {
+            font-family: Roboto, Helvetica, sans-serif;
+            font-size: 16px !important;
+        }
+
+        table {
+            margin-top: 1rem;
+            min-width: 100%;
+            table-layout: fixed;
+            overflow-wrap: break-word;
+        }
+
+        .table-header>tr>th {
+            border-bottom: solid 1px #efefef;
+        }
+
+        .table-body>tr>td {
+            border-bottom: solid 1px #efefef;
+        }
+
+        th {
+            text-align: left;
+            padding-left: 6px;
+            padding-right: 6px;
+            padding-top: 6px;
+            padding-bottom: 6px;
+        }
+
+        td {
+            padding-left: 6px;
+            padding-right: 6px;
+            padding-top: 1rem;
+            padding-bottom: 1rem;
+        }
+
+        .item-row {
+            border-bottom: 1px #000 dotted;
+        }
+
+        .totals-row-label {
+            text-align: right;
+            white-space: nowrap;
+        }
+
+        .totals-row-value {
+            text-align: right;
+            white-space: nowrap;
+        }
+
+        .table-totals {
+            display: grid;
+            grid-template-columns: 2fr 1fr;
+        }
+
+        .centered {
+            text-align: center;
+        }
+
+        .doc-title {
+            font-size: 32px;
+        }
+
+        p {
+            margin: 0;
+            padding: 0;
+        }
+
+        span {
+            padding-right: 5px;
+            width: 100%;
+        }
+
+        div .label {
+            text-align: right;
+            padding-right: 10px;
+        }
+
+        div .value {
+            text-align: left;
+            padding-left: 5px;
+        }
+
+        .two-col-grid {
+            display: grid;
+            grid-template-columns: 1fr 2fr;
+        }
+
+        .three-col-grid {
+            display: grid;
+            grid-template-columns: 1fr 1fr 1fr;
+            column-gap: 0.4rem;
+        }
+
+        .client-detail-row {
+            display: grid;
+            grid-template-columns: 1fr 1fr;
+            gap: 10px;
+            margin-bottom: 5px;
+        }
+
+        .client-details {
+            display:flex;
+        }
+
+        .supplier-details {}
+
+        .container {
+            padding-top: 2rem;
+        }
+
+        .bottom-margin {
+            padding-bottom: 2rem;
+        }
+
+        .section-title {
+            font-style: italic;
+            color: #454545;
+            margin-bottom: 0.3rem;
+        }
+
+        .primary-color-highlight {
+            color: #4DA8DA;
+        }
+
+        .secondary-color-highlight {
+            color: 3e3e3e;
+        }
+
+        .order-details {
+            display:flex;
+            white-space: nowrap;
+            line-height: 1.4;
+            font-weight: bold;
+        }
+
+        .align-left {
+            display:flex;
+            text-align: left;
+            line-height: 1.4;
+        }
+
+        dt {
+            margin-right: 7px;
+        }
+
+        dd {
+            margin-left: 3px;
+        }
+    </style>
+
+    <ninja>
+        <style>
+            {{ css }}
+        </style>
+    </ninja>
+</head>
+
+    <ninja>
+<body>
+
+    <table width="100%" cellspacing="0" cellpadding="0" class="" border="0">
+        <tr>
+            <td align="left" class="doc-title">{{ translations.invoice }}</td>
+        </tr>
+    </table>
+
+    <table width="100%" height="100%" cellspacing="0" cellpadding="0" class="" border="0">
+        <tr>
+            <td style="">
+                <div class="three-col-grid">
+
+                    <div class="" style="margin-left:0; margin-right:auto;">
+                        <div class="client-details">
+                            <p class="section-title">{{ translations.to }}:</p>
+                        </div>
+                        <div id="client-details">
+                            {% for key,value in client %}
+                            <div class="two-col-grid">
+                                <dt class="order-details">{{ key }}</dt>
+                                <dd class="align-left">{{ value }}</dd>
+                            </div>
+                            {% endfor %}
+                        </div>
+                    </div>
+
+                    <div class="" style="margin-left:auto; margin-right:auto;">
+                        <div class="supplier-details">
+                            <p class="section-title">{{ translations.from }}:</p>
+                        </div>
+                        <div id="supplier-details">
+                             {% for key,value in supplier %}
+                            <div class="two-col-grid">
+                                <dt class="order-details">{{ key }}</dt>
+                                <dd class="align-left">{{ value }}</dd>
+                            </div>
+                            {% endfor %}
+                        </div>
+                    </div>
+
+
+                    <div style="margin-right:0; margin-left: auto;">
+                        <div class="client-details">
+                            <p class="section-title" style="padding-right:10px;">{{ translations.details }}:</p>
+                        </div>
+                        <div class="two-col-grid">
+                            
+                            {% for key,value in invoiceDetails %}
+                                {% if key != 'line_items' %}
+                                <dt class="order-details">{{ key }}</dt>
+                                <dd class="align-left">{{ value }}</dd>
+                                {% endif %}
+                            {% endfor %}
+                            
+                        </div>
+                    </div>
+
+            </td>
+        </tr>
+    </table>
+    
+    <!-- If you are using this template for other entities such as quotes, you'll want to ensure that you change the variable from invoices => quotes here -->
+    
+        {% if invoiceDetails.line_items is defined and invoiceDetails.line_items is not empty %}
+
+           
+            <table width="100%" cellspacing="0" cellpadding="0" class="">
+                <thead class="table-header">
+                    <tr class="table-header primary-color-highlight">
+            
+                        {% for key,value in invoiceDetails.line_items|first %}
+
+                            {% if key not in ['tax_rate1', 'tax_rate2', 'tax_rate3'] %}
+
+                                {% if key in ['tax_name1', 'tax_name2', 'tax_name3'] %}
+
+                                    {% if value|length > 1 %}
+                                    <th class="{{ translations.tax|replace({'/\\s+/': ''}) }}">{{ translations.tax }}</th>
+                                    {% endif %}
+
+                                {% else %}
+                                    <th class="{{ key|replace({'/\\s+/': ''}) }}">{{ key }}</th>
+                                {% endif %}
+                    
+                            {% endif %}
+
+                        {% endfor %}
+                    
+                    </tr>
+                </thead>
+                <tbody class="table-body">
+                     {% for item in invoiceDetails.line_items %}
+                        <tr class="item-row">
+                   
+                        {% for key,value in item %}
+                            {% if key not in ['tax_name1', 'tax_name2', 'tax_name3'] %}
+                                
+                                {% if key in ['tax_rate1', 'tax_rate2', 'tax_rate3'] %}
+                                    {% if value > 0 %}
+                                    <td class="{{ key|replace({'/\\s+/': ''}) }}">{{ value }}%</td>
+                                    {% endif %}
+                                {% else %}
+                                    <td class="{{ key|replace({'/\\s+/': ''}) }}">{{ value }}</td>
+                                {% endif %}
+
+                            {% endif %}
+                            
+                        {% endfor %}    
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+
+        {% endif %}
+    
+    <table width="100%" cellspacing="0" cellpadding="0" class="" border="0"></table>
+        <tr>
+            <td align="left" class="doc-title" width="50%"></td>
+            <td align="right" width="50%">
+
+                <div class="two-col-grid">
+                {% for key,value in totals.taxes %}
+                        <dt class="order-details">{{ value.tax_name }} {{ value.tax_rate }}%</dt>
+                        <dd class="align-left">{{ value.subtotal|format_currency(metadata.currency) }}</dd>
+                    
+                {% endfor %}
+
+                {% for key,value in totals %}
+                    {% if key != 'taxes' %}
+                        <dt class="order-details">{{ key }}</dt>
+                        <dd class="align-left">{{ value|format_currency(metadata.currency) }}</dd>
+                    {% endif %}
+                {% endfor %}
+
+                </div>
+
+            </td>
+        </tr>
+    </table>
+
+    <table width="100%" cellspacing="0" cellpadding="0" class="">
+        {% for key,value in metadata %}
+
+            {% if key != 'currency' %}
+                <div class="container">
+                    <p class="bottom-margin primary-color-highlight">{{ key }}:</p>
+                
+                    <p>{{ value|nl2br }}</p>
+                </div>
+            {% endif %}
+        {% endfor %}
+    </table>
+
+</body>
+
+</ninja>
+
+</html>
\ No newline at end of file

From 0b146aaa4b53244bbf2bf3b7ed06b660170b1e34 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Oct 2024 18:34:54 +1100
Subject: [PATCH 27/81] Working on UBL2PDF

---
 app/Services/EDocument/Imports/Ubl2Pdf.php |  8 ++++++--
 resources/views/templates/ubl/td14.html    | 20 +++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/Services/EDocument/Imports/Ubl2Pdf.php b/app/Services/EDocument/Imports/Ubl2Pdf.php
index 6d1ec012889..5983c9b4d02 100644
--- a/app/Services/EDocument/Imports/Ubl2Pdf.php
+++ b/app/Services/EDocument/Imports/Ubl2Pdf.php
@@ -252,8 +252,12 @@ private function totals(): array
         }
 
         return [
-            ctrans('texts.subtotal') => data_get($this->invoice, 'LegalMonetaryTotal.LineExtensionAmount.amount', 0),
-            ctrans('balance') => data_get($this->invoice, 'LegalMonetaryTotal.TaxInclusiveAmount.amount', 0),
+            'subtotal' => [
+                ctrans('texts.subtotal') => data_get($this->invoice, 'LegalMonetaryTotal.LineExtensionAmount.amount', 0),
+            ],
+            'balance' => [
+                ctrans('texts.balance_due') => data_get($this->invoice, 'LegalMonetaryTotal.TaxInclusiveAmount.amount', 0),
+            ],
             'taxes' => $taxes,
         ];
     }
diff --git a/resources/views/templates/ubl/td14.html b/resources/views/templates/ubl/td14.html
index 8612c483b30..9d23e48ed2f 100644
--- a/resources/views/templates/ubl/td14.html
+++ b/resources/views/templates/ubl/td14.html
@@ -288,18 +288,20 @@
             <td align="left" class="doc-title" width="50%"></td>
             <td align="right" width="50%">
 
-                <div class="two-col-grid">
+                <div class="two-col-grid" style="float:right;">
+                {% for key,value in totals.subtotal %}
+                <dt class="order-details">{{ key }}</dt>
+                <dd class="align-left">{{ value|format_currency(metadata.currency) }}</dd>
+                {% endfor %}
+
                 {% for key,value in totals.taxes %}
-                        <dt class="order-details">{{ value.tax_name }} {{ value.tax_rate }}%</dt>
-                        <dd class="align-left">{{ value.subtotal|format_currency(metadata.currency) }}</dd>
-                    
+                    <dt class="order-details">{{ value.tax_name }} {{ value.tax_rate }}%</dt>
+                    <dd class="align-left">{{ value.subtotal|format_currency(metadata.currency) }}</dd>
                 {% endfor %}
 
-                {% for key,value in totals %}
-                    {% if key != 'taxes' %}
-                        <dt class="order-details">{{ key }}</dt>
-                        <dd class="align-left">{{ value|format_currency(metadata.currency) }}</dd>
-                    {% endif %}
+                {% for key,value in totals.balance %}
+                    <dt class="order-details">{{ key }}</dt>
+                    <dd class="align-left">{{ value|format_currency(metadata.currency) }}</dd>
                 {% endfor %}
 
                 </div>

From 41ae965fa11c56b60ddc1b731a6873392a421b4f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Oct 2024 21:34:12 +1100
Subject: [PATCH 28/81] Fixes for custom payment methods with one page checkout

---
 app/PaymentDrivers/CustomPaymentDriver.php    | 33 ++++++++++++++----
 app/Services/EDocument/Imports/Ubl2Pdf.php    | 34 +++++++++----------
 .../gateways/custom/payment.blade.php         | 18 ++++------
 3 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/app/PaymentDrivers/CustomPaymentDriver.php b/app/PaymentDrivers/CustomPaymentDriver.php
index 33b30cd539a..d272101c61b 100644
--- a/app/PaymentDrivers/CustomPaymentDriver.php
+++ b/app/PaymentDrivers/CustomPaymentDriver.php
@@ -58,14 +58,9 @@ public function setPaymentMethod($payment_method_id)
         return $this;
     }
 
-    /**
-     * View for displaying custom content of the driver.
-     *
-     * @param array $data
-     * @return mixed
-     */
-    public function processPaymentView($data)
+    public function paymentData(array $data): array
     {
+
         $variables = [];
 
         if (count($this->payment_hash->invoices()) > 0) {
@@ -87,9 +82,33 @@ public function processPaymentView($data)
         $data['gateway'] = $this;
         $data['payment_hash'] = $this->payment_hash->hash;
 
+        return $data;
+
+    }
+
+    /**
+     * View for displaying custom content of the driver.
+     *
+     * @param array $data
+     * @return mixed
+     */
+    public function processPaymentView($data)
+    {
+        $data = $this->paymentData($data);
+
         return render('gateways.custom.payment', $data);
     }
 
+    public function livewirePaymentView(array $data): string
+    {
+        return 'gateways.custom.pay_livewire';
+    }
+
+    public function processPaymentViewData(array $data): array
+    {
+        return $this->paymentData($data); 
+    }
+
     /**
      * Processing method for payment. Should never be reached with this driver.
      *
diff --git a/app/Services/EDocument/Imports/Ubl2Pdf.php b/app/Services/EDocument/Imports/Ubl2Pdf.php
index 5983c9b4d02..160b4c82b0a 100644
--- a/app/Services/EDocument/Imports/Ubl2Pdf.php
+++ b/app/Services/EDocument/Imports/Ubl2Pdf.php
@@ -262,23 +262,23 @@ private function totals(): array
         ];
     }
 
-    private function resolveCountry(?string $iso_country_code): int
-    {
-        return Country::query()
-                        ->where('iso_3166_2', $iso_country_code)
-                        ->orWhere('iso_3166_3', $iso_country_code)
-                        ->first()?->id ?? (int)$this->company->settings->country_id;
-    }
+//     private function resolveCountry(?string $iso_country_code): int
+//     {
+//         return Country::query()
+//                         ->where('iso_3166_2', $iso_country_code)
+//                         ->orWhere('iso_3166_3', $iso_country_code)
+//                         ->first()?->id ?? (int)$this->company->settings->country_id;
+//     }
 
 
-    private function resolveCurrencyId(string $currency_code): int
-    {
+//     private function resolveCurrencyId(string $currency_code): int
+//     {
         
-        /** @var \Illuminate\Support\Collection<\App\Models\Currency> */
-        $currencies = app('currencies');
-
-        return $currencies->first(function (Currency $c) use ($currency_code) {
-            return $c->code === $currency_code;
-        })?->id ?? (int) $this->company->settings->currency_id;
-    }
-}
\ No newline at end of file
+//         /** @var \Illuminate\Support\Collection<\App\Models\Currency> */
+//         $currencies = app('currencies');
+
+//         return $currencies->first(function (Currency $c) use ($currency_code) {
+//             return $c->code === $currency_code;
+//         })?->id ?? (int) $this->company->settings->currency_id;
+//     }
+// }
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/gateways/custom/payment.blade.php b/resources/views/portal/ninja2020/gateways/custom/payment.blade.php
index 42373e59628..9e0e107b261 100644
--- a/resources/views/portal/ninja2020/gateways/custom/payment.blade.php
+++ b/resources/views/portal/ninja2020/gateways/custom/payment.blade.php
@@ -20,17 +20,11 @@
     @endcomponent
 @endsection
 <script>
+function submitResponse(response){        
+    document.querySelector(
+                'input[name="gateway_response"]'
+            ).value = JSON.stringify(response);
 
-    function submitResponse(response){
-        
-        console.log("lets go!");
-        
-        document.querySelector(
-                    'input[name="gateway_response"]'
-                ).value = JSON.stringify(response);
-
-        document.getElementById('server-response').submit();
-            console.log("we did not go!!");
-    }
-
+    document.getElementById('server-response').submit();
+}
 </script>
\ No newline at end of file

From 508ba49bd636fcd8c0fc142c1859234c2489bee8 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Oct 2024 21:34:36 +1100
Subject: [PATCH 29/81] v5.10.37

---
 VERSION.txt      | 2 +-
 config/ninja.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 649253d3487..10f2c974d50 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.10.36
\ No newline at end of file
+5.10.37
\ No newline at end of file
diff --git a/config/ninja.php b/config/ninja.php
index 4303ccafeb9..cddb006af82 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,8 @@
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.10.36'),
-    'app_tag' => env('APP_TAG', '5.10.36'),
+    'app_version' => env('APP_VERSION', '5.10.37'),
+    'app_tag' => env('APP_TAG', '5.10.37'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),

From fd9f7fe74b89ebb3299e0d0ae462adcfc797aa25 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Oct 2024 21:45:10 +1100
Subject: [PATCH 30/81] Add blade file

---
 .../gateways/custom/pay_livewire.blade.php    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 resources/views/portal/ninja2020/gateways/custom/pay_livewire.blade.php

diff --git a/resources/views/portal/ninja2020/gateways/custom/pay_livewire.blade.php b/resources/views/portal/ninja2020/gateways/custom/pay_livewire.blade.php
new file mode 100644
index 00000000000..a4011445580
--- /dev/null
+++ b/resources/views/portal/ninja2020/gateways/custom/pay_livewire.blade.php
@@ -0,0 +1,33 @@
+<div class="rounded-lg border bg-card text-card-foreground shadow-sm overflow-hidden py-5 bg-white sm:gap-4">
+
+ <form action="{{ route('client.payments.response') }}" method="post" id="server-response">
+    @csrf
+    <input type="hidden" name="gateway_response">
+    <input type="hidden" name="payment_hash" value="{{ $payment_hash }}">
+    <input type="hidden" name="company_gateway_id" value="{{ $gateway->getCompanyGatewayId() }}">
+    <input type="hidden" name="payment_method_id" value="{{ $payment_method_id }}">
+    <input type="hidden" name="token">
+</form>
+@component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.payment_type')])
+    {{ $title }}
+@endcomponent
+
+@include('portal.ninja2020.gateways.includes.payment_details')
+
+@component('portal.ninja2020.components.general.card-element-single')
+    {!! nl2br($instructions) !!}
+@endcomponent
+</div>
+@script
+<script>
+    function submitResponse(response){
+                
+        document.querySelector(
+                    'input[name="gateway_response"]'
+                ).value = JSON.stringify(response);
+
+        document.getElementById('server-response').submit();
+     
+    }
+</script>
+@endscript
\ No newline at end of file

From 81ce96bb2626e966c584aac916e97b4145446757 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 15 Oct 2024 21:45:25 +1100
Subject: [PATCH 31/81] v5.10.38

---
 VERSION.txt      | 2 +-
 config/ninja.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 10f2c974d50..e84a0af1537 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.10.37
\ No newline at end of file
+5.10.38
\ No newline at end of file
diff --git a/config/ninja.php b/config/ninja.php
index cddb006af82..2b74c28d070 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,8 @@
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.10.37'),
-    'app_tag' => env('APP_TAG', '5.10.37'),
+    'app_version' => env('APP_VERSION', '5.10.38'),
+    'app_tag' => env('APP_TAG', '5.10.38'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),

From 9c10650eaab4b288d8cf26990206c9c6c67cce0e Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Oct 2024 06:49:15 +1100
Subject: [PATCH 32/81] minor fixes

---
 app/Services/EDocument/Imports/Ubl2Pdf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Services/EDocument/Imports/Ubl2Pdf.php b/app/Services/EDocument/Imports/Ubl2Pdf.php
index 160b4c82b0a..e1c46c3936e 100644
--- a/app/Services/EDocument/Imports/Ubl2Pdf.php
+++ b/app/Services/EDocument/Imports/Ubl2Pdf.php
@@ -281,4 +281,4 @@ private function totals(): array
 //             return $c->code === $currency_code;
 //         })?->id ?? (int) $this->company->settings->currency_id;
 //     }
-// }
\ No newline at end of file
+}

From 5df8a5c7ef1739d34e0d5fcb3b08cb70daefe119 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Oct 2024 08:28:45 +1100
Subject: [PATCH 33/81] Fixes for subdomain validation

---
 app/Http/Controllers/SubdomainController.php       | 11 +++++++++--
 app/Http/Requests/Company/UpdateCompanyRequest.php |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/SubdomainController.php b/app/Http/Controllers/SubdomainController.php
index 345e6ddb9ed..d92130a9ad8 100644
--- a/app/Http/Controllers/SubdomainController.php
+++ b/app/Http/Controllers/SubdomainController.php
@@ -25,13 +25,20 @@ public function __construct()
      */
     public function index()
     {
+
+        $user = auth()->user();
+        $company = $user->company();
+
+        if($company->subdomain == trim(request()->input('subdomain'))){
+            return response()->json(['message' => 'Current subdomain name.'], 200);
+        }
+
         if (!MultiDB::checkDomainAvailable(request()->input('subdomain'))) {
             return response()->json(['message' => ctrans('texts.subdomain_is_not_available')], 401);
         }
 
-
         if (!preg_match('/^[A-Za-z0-9](?:[A-Za-z0-9\-]{0,61}[A-Za-z0-9])?$/', request()->input('subdomain'))) {
-            return response()->json(['message' => ctrans('texts.subdomain_is_not_available')], 401);
+            return response()->json(['message' => "Invalid subdomain format."], 401);
         }
 
 
diff --git a/app/Http/Requests/Company/UpdateCompanyRequest.php b/app/Http/Requests/Company/UpdateCompanyRequest.php
index 3f7300fb9b0..60320cd16ac 100644
--- a/app/Http/Requests/Company/UpdateCompanyRequest.php
+++ b/app/Http/Requests/Company/UpdateCompanyRequest.php
@@ -74,7 +74,7 @@ public function rules()
         }
 
         if (Ninja::isHosted()) {
-            $rules['subdomain'] = ['nullable', 'regex:/^[a-zA-Z0-9.-]+[a-zA-Z0-9]$/', new ValidSubdomain()];
+            $rules['subdomain'] = ['nullable', 'regex:/^[a-zA-Z0-9-]+[a-zA-Z0-9]$/', new ValidSubdomain()];
         }
 
         $rules['expense_mailbox'] = ['sometimes','email', 'nullable', new ValidExpenseMailbox(), Rule::unique('companies')->ignore($this->company->id)];

From 1ee6c9b2ef9f83cacea9682a066fe258630ad6b6 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Oct 2024 08:58:20 +1100
Subject: [PATCH 34/81] Prevent negative invoices from appearing payable

---
 app/Models/Invoice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 38a7e9123d3..704fa8158ea 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -467,7 +467,7 @@ public function getStatusAttribute()
 
     public function isPayable(): bool
     {
-        if($this->is_deleted || $this->status_id == self::STATUS_PAID) {
+        if($this->is_deleted || $this->status_id == self::STATUS_PAID || $this->balance < 0) {
             return false;
         } elseif ($this->status_id == self::STATUS_DRAFT && $this->is_deleted == false) {
             return true;

From 4e80bddb4039a6b1181f20ffcc4b1a7922d8816c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Oct 2024 09:09:33 +1100
Subject: [PATCH 35/81] Optimize client portal

---
 resources/views/portal/ninja2020/invoices/show.blade.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/views/portal/ninja2020/invoices/show.blade.php b/resources/views/portal/ninja2020/invoices/show.blade.php
index f2a4e99b5a5..94b50ab5c30 100644
--- a/resources/views/portal/ninja2020/invoices/show.blade.php
+++ b/resources/views/portal/ninja2020/invoices/show.blade.php
@@ -78,11 +78,14 @@
         <div class="bg-white shadow sm:rounded-lg mb-4">
             <div class="px-4 py-5 sm:p-6">
                 <div class="sm:flex sm:items-start sm:justify-between">
-                    <div>
+                    <div class="flex justify-between items-center w-full">
                         <h3 class="text-lg leading-6 font-medium text-gray-900">
                             {{ ctrans('texts.invoice_number_placeholder', ['invoice' => $invoice->number])}}
                             - {{ \App\Models\Invoice::stringStatus($invoice->status_id) }}
                         </h3>
+                        @if($invoice->status_id == \App\Models\Invoice::STATUS_PAID && $invoice->payments()->exists())
+                        <span class="ml-4"><a class="button-link text-primary" href="{{ route('client.payments.show', $invoice->payments->first()->hashed_id) }}">{{ ctrans('texts.view_payment') }}</a></span>
+                        @endif
                     </div>
                 </div>
             </div>

From c6c8ec78cb416fc80494a005efb900fc5d8cb151 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Oct 2024 10:34:23 +1100
Subject: [PATCH 36/81] minor fixes

---
 .../ClientPortal/InvoiceController.php            |  1 -
 app/Http/Middleware/CheckClientExistence.php      |  1 -
 app/Livewire/Flow2/InvoicePay.php                 | 15 ++++++---------
 app/Livewire/Flow2/PaymentMethod.php              |  4 +---
 app/Livewire/Flow2/ProcessPayment.php             |  2 ++
 app/Livewire/Flow2/RequiredFields.php             |  9 ++++-----
 6 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php
index 1f9555523b9..006ae9e268d 100644
--- a/app/Http/Controllers/ClientPortal/InvoiceController.php
+++ b/app/Http/Controllers/ClientPortal/InvoiceController.php
@@ -91,7 +91,6 @@ public function show(ShowInvoiceRequest $request, Invoice $invoice, ?string $has
 
         return auth()->guard('contact')->user()->client->getSetting('payment_flow') == 'default' ? $this->render('invoices.show', $data) : $this->render('invoices.show_smooth', $data);
 
-        // return $this->render('invoices.show_smooth', $data);
     }
 
     public function showBlob($hash)
diff --git a/app/Http/Middleware/CheckClientExistence.php b/app/Http/Middleware/CheckClientExistence.php
index 34a3666e4fd..33ed398664e 100644
--- a/app/Http/Middleware/CheckClientExistence.php
+++ b/app/Http/Middleware/CheckClientExistence.php
@@ -66,7 +66,6 @@ public function handle(Request $request, Closure $next)
         }
 
         session()->put('multiple_contacts', $multiple_contacts);
-
         session()->put('is_silent', request()->has('silent'));
 
         return $next($request);
diff --git a/app/Livewire/Flow2/InvoicePay.php b/app/Livewire/Flow2/InvoicePay.php
index 811b1683856..10f7af50b2d 100644
--- a/app/Livewire/Flow2/InvoicePay.php
+++ b/app/Livewire/Flow2/InvoicePay.php
@@ -105,15 +105,12 @@ public function handleContext(string $property, $value): self
     #[On('terms-accepted')]
     public function termsAccepted()
     {
-        nlog("Terms accepted");
-        // $this->invite = \App\Models\InvoiceInvitation::withTrashed()->find($this->invitation_id)->withoutRelations();
         $this->terms_accepted = true;
     }
 
     #[On('signature-captured')]
     public function signatureCaptured($base64)
     {
-        nlog("signature captured");
 
         $this->signature_accepted = true;
         $invite = \App\Models\InvoiceInvitation::withTrashed()->find($this->invitation_id);
@@ -141,7 +138,6 @@ public function paymentMethodSelected($company_gateway_id, $gateway_type_id, $am
         $this->setContext('amount', $amount);
         $this->setContext('pre_payment', false);
         $this->setContext('is_recurring', false);
-        $this->setContext('invitation_id', $this->invitation_id);
 
         $this->payment_method_accepted = true;
 
@@ -178,9 +174,7 @@ private function checkRequiredFields(CompanyGateway $company_gateway)
                     empty($contact->client->{$_field})
                     || is_null($contact->client->{$_field}) //@phpstan-ignore-line
                 ) {
-
                     return $this->required_fields = true;
-
                 }
             }
 
@@ -190,7 +184,7 @@ private function checkRequiredFields(CompanyGateway $company_gateway)
                 }
             }
         }
-        
+
         return $this->required_fields = false;
 
     }
@@ -231,17 +225,20 @@ public function componentUniqueId(): string
 
     public function mount()
     {
+        
         $this->resetContext();
 
         MultiDB::setDb($this->db);
 
         // @phpstan-ignore-next-line
         $invite = \App\Models\InvoiceInvitation::with('contact.client', 'company')->withTrashed()->find($this->invitation_id);
+        
         $client = $invite->contact->client;
         $settings = $client->getMergedSettings();
         $this->setContext('contact', $invite->contact); // $this->context['contact'] = $invite->contact;
         $this->setContext('settings', $settings); // $this->context['settings'] = $settings;
         $this->setContext('db', $this->db); // $this->context['db'] = $this->db;
+        $this->setContext('invitation_id', $this->invitation_id);
 
         if(is_array($this->invoices))
             $this->invoices = Invoice::find($this->transformKeys($this->invoices));
@@ -292,9 +289,9 @@ public function render(): \Illuminate\Contracts\View\Factory|\Illuminate\View\Vi
 
     public function exception($e, $stopPropagation) 
     {
-       
+        
+        app('sentry')->captureException($e);
         nlog($e->getMessage());
-
         $stopPropagation();
 
     }
diff --git a/app/Livewire/Flow2/PaymentMethod.php b/app/Livewire/Flow2/PaymentMethod.php
index 780c51023c8..8995c2676dc 100644
--- a/app/Livewire/Flow2/PaymentMethod.php
+++ b/app/Livewire/Flow2/PaymentMethod.php
@@ -78,9 +78,7 @@ public function render(): \Illuminate\Contracts\View\Factory|\Illuminate\View\Vi
 
     public function exception($e, $stopPropagation) 
     {
-       
-        nlog($e->getMessage());
+        app('sentry')->captureException($e);
         $stopPropagation();
-
     }
 }
diff --git a/app/Livewire/Flow2/ProcessPayment.php b/app/Livewire/Flow2/ProcessPayment.php
index 46efada6c02..33737ca4c57 100644
--- a/app/Livewire/Flow2/ProcessPayment.php
+++ b/app/Livewire/Flow2/ProcessPayment.php
@@ -87,6 +87,8 @@ public function render(): \Illuminate\Contracts\View\Factory|string|\Illuminate\
     public function exception($e, $stopPropagation) 
     {
       
+        app('sentry')->captureException($e);
+
         $errors = session()->get('errors', new \Illuminate\Support\ViewErrorBag());
 
         $bag = new \Illuminate\Support\MessageBag();
diff --git a/app/Livewire/Flow2/RequiredFields.php b/app/Livewire/Flow2/RequiredFields.php
index 4f8fa23ba7e..ce21e40c654 100644
--- a/app/Livewire/Flow2/RequiredFields.php
+++ b/app/Livewire/Flow2/RequiredFields.php
@@ -61,12 +61,12 @@ public function mount(): void
 
         $this->fields = $this->getContext()['fields'];
 
+        $contact = auth()->guard('contact')->user();
+
         $this->company_gateway = CompanyGateway::withTrashed()
             ->with('company')
             ->find($this->getContext()['company_gateway_id']);
-
-        $contact = auth()->guard('contact')->user();
-
+        
         $this->client_name = $contact->client->name;
         $this->contact_first_name = $contact->first_name;
         $this->contact_last_name = $contact->last_name;
@@ -138,9 +138,8 @@ public function render(): \Illuminate\Contracts\View\Factory|\Illuminate\View\Vi
     
     public function exception($e, $stopPropagation) 
     {
-       
+        app('sentry')->captureException($e);
         nlog($e->getMessage());
-
         $stopPropagation();
 
     }

From 4e96767dcf062268941989799d4ff0955ba47289 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Oct 2024 11:09:16 +1100
Subject: [PATCH 37/81] Fixes for activities

---
 app/Console/Commands/CreateSingleAccount.php | 20 +++++++++++---------
 app/Http/Controllers/BaseController.php      |  1 +
 app/Models/Company.php                       |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/Console/Commands/CreateSingleAccount.php b/app/Console/Commands/CreateSingleAccount.php
index 444fe2dd778..ec856794828 100644
--- a/app/Console/Commands/CreateSingleAccount.php
+++ b/app/Console/Commands/CreateSingleAccount.php
@@ -385,9 +385,12 @@ private function createSmallAccount()
 
         });
 
-
         $this->countryClients($company, $user);
 
+        $cc = ClientContact::where('company_id', $company->id)->latest()->first();
+        $cc->email = 'user@example.com';
+        $cc->save();
+
         $this->info("finished");
 
     }
@@ -472,13 +475,13 @@ private function createClient($company, $user)
                 'company_id' => $company->id,
             ]);
 
-        ClientContact::factory()->create([
-                    'user_id' => $user->id,
-                    'client_id' => $client->id,
-                    'company_id' => $company->id,
-                    'is_primary' => 1,
-                    'email' => 'user@example.com',
-                ]);
+        // ClientContact::factory()->create([
+        //             'user_id' => $user->id,
+        //             'client_id' => $client->id,
+        //             'company_id' => $company->id,
+        //             'is_primary' => 1,
+        //             'email' => 'user@example.com',
+        //         ]);
 
         ClientContact::factory()->count(rand(1, 2))->create([
                     'user_id' => $user->id,
@@ -490,7 +493,6 @@ private function createClient($company, $user)
 
         $settings = $client->settings;
         $settings->currency_id = "1";
-        //        $settings->use_credits_payment = "always";
 
         $client->settings = $settings;
 
diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 873bab71148..1fea58e0735 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -610,6 +610,7 @@ protected function miniLoadResponse($query)
                     if (! $user->isAdmin()) {
                         $query->where('activities.user_id', $user->id);
                     }
+                    $query->whereColumn('companies.account_id', 'activities.account_id');
                 },
                 'company.bank_integrations' => function ($query) use ($user) {
                     if (! $user->hasPermission('view_bank_transaction')) {
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 3e36b1b65e3..495c9ef8690 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -577,8 +577,8 @@ public function all_activities(): \Illuminate\Database\Eloquent\Relations\HasMan
     }
 
     public function activities(): HasMany
-    {
-        return $this->hasMany(Activity::class)->where('account_id', $this->account_id)->orderBy('id', 'DESC')->take(50);
+    {   
+        return $this->hasMany(Activity::class)->orderBy('id', 'DESC')->take(50);     
     }
 
     /**

From 5980b95ce4b38a583b7bc95bb73332deeaa460b2 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Oct 2024 11:09:41 +1100
Subject: [PATCH 38/81] v5.10.39

---
 VERSION.txt      | 2 +-
 config/ninja.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index e84a0af1537..cc6288ce32b 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.10.38
\ No newline at end of file
+5.10.39
\ No newline at end of file
diff --git a/config/ninja.php b/config/ninja.php
index 2b74c28d070..1c7962a6097 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,8 @@
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.10.38'),
-    'app_tag' => env('APP_TAG', '5.10.38'),
+    'app_version' => env('APP_VERSION', '5.10.39'),
+    'app_tag' => env('APP_TAG', '5.10.39'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),

From 21e8e527a66248acefafbab2547c090c0cdd2323 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Oct 2024 15:54:28 +1100
Subject: [PATCH 39/81] patches for one page checkout

---
 .../ClientPortal/InvoiceController.php        |  2 +-
 app/Livewire/Flow2/InvoicePay.php             |  5 ++-
 app/Livewire/Flow2/ProcessPayment.php         | 26 ++++++++++-----
 .../ClientPortal/LivewireInstantPayment.php   |  4 +--
 .../ninja2020/flow2/invoice-pay.blade.php     |  5 +++
 .../gateways/credit/pay_livewire.blade.php    | 33 +++++++++++++++++++
 6 files changed, 62 insertions(+), 13 deletions(-)
 create mode 100644 resources/views/portal/ninja2020/gateways/credit/pay_livewire.blade.php

diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php
index 006ae9e268d..4e383730a18 100644
--- a/app/Http/Controllers/ClientPortal/InvoiceController.php
+++ b/app/Http/Controllers/ClientPortal/InvoiceController.php
@@ -59,7 +59,7 @@ public function index(ShowInvoicesRequest $request)
     public function show(ShowInvoiceRequest $request, Invoice $invoice, ?string $hash = null)
     {
         set_time_limit(0);
-
+        
         $invitation = $invoice->invitations()->where('client_contact_id', auth()->guard('contact')->user()->id)->first();
 
         // @phpstan-ignore-next-line
diff --git a/app/Livewire/Flow2/InvoicePay.php b/app/Livewire/Flow2/InvoicePay.php
index 10f7af50b2d..2461d2663bd 100644
--- a/app/Livewire/Flow2/InvoicePay.php
+++ b/app/Livewire/Flow2/InvoicePay.php
@@ -242,7 +242,10 @@ public function mount()
 
         if(is_array($this->invoices))
             $this->invoices = Invoice::find($this->transformKeys($this->invoices));
-        
+        elseif ($this->invoices instanceof \Illuminate\Support\Collection) {
+            $this->invoices = Invoice::find($this->invoices->pluck('id'));
+        }
+
         $invoices = $this->invoices->filter(function ($i) {
             $i = $i->service()
                 ->markSent()
diff --git a/app/Livewire/Flow2/ProcessPayment.php b/app/Livewire/Flow2/ProcessPayment.php
index 33737ca4c57..cceb12302bb 100644
--- a/app/Livewire/Flow2/ProcessPayment.php
+++ b/app/Livewire/Flow2/ProcessPayment.php
@@ -58,16 +58,24 @@ public function mount()
             throw new PaymentFailed($responder_data['error'], 400);
         }
 
-        $driver = $company_gateway
-            ->driver($invitation->contact->client) // @phpstan-ignore-line
-            ->setPaymentMethod($data['payment_method_id'])
-            ->setPaymentHash($responder_data['payload']['ph']);
-
-        $this->payment_data_payload = $driver->processPaymentViewData($responder_data['payload']);
         
-        $this->payment_view = $driver->livewirePaymentView(
-            $this->payment_data_payload,
-        );
+        /*** @PATCH */
+        if(isset($responder_data['component']) && $responder_data['component'] == 'CreditPaymentComponent'){
+            $this->payment_view = $responder_data['view'];
+            $this->payment_data_payload = $responder_data['payload'];
+        }
+        else {
+            $driver = $company_gateway
+                ->driver($invitation->contact->client) // @phpstan-ignore-line
+                ->setPaymentMethod($data['payment_method_id'])
+                ->setPaymentHash($responder_data['payload']['ph']);
+
+            $this->payment_data_payload = $driver->processPaymentViewData($responder_data['payload']);
+            
+            $this->payment_view = $driver->livewirePaymentView(
+                $this->payment_data_payload,
+            );
+        }
 
         $this->isLoading = false;
 
diff --git a/app/Services/ClientPortal/LivewireInstantPayment.php b/app/Services/ClientPortal/LivewireInstantPayment.php
index 25c2726f083..a4284e35239 100644
--- a/app/Services/ClientPortal/LivewireInstantPayment.php
+++ b/app/Services/ClientPortal/LivewireInstantPayment.php
@@ -232,8 +232,8 @@ public function run()
         ];
 
         if ($this->is_credit_payment) {
-
-            $this->mergeResponder(['success' => true, 'component' => 'CreditPaymentComponent', 'payload' => $data]);
+            /*** @PATCH */
+            $this->mergeResponder(['success' => true, 'view' => 'gateways.credit.pay_livewire', 'component' => 'CreditPaymentComponent', 'payload' => $data]);
             return $this->getResponder();
         }
 
diff --git a/resources/views/portal/ninja2020/flow2/invoice-pay.blade.php b/resources/views/portal/ninja2020/flow2/invoice-pay.blade.php
index a2febb865db..dd578254e5f 100644
--- a/resources/views/portal/ninja2020/flow2/invoice-pay.blade.php
+++ b/resources/views/portal/ninja2020/flow2/invoice-pay.blade.php
@@ -13,6 +13,11 @@
             </ul>
         </div>
         @endif
+
+        @php
+            session()->forget('errors');
+        @endphp
+
         @livewire($this->component, [], key($this->componentUniqueId()))
     </div>
 </div>
diff --git a/resources/views/portal/ninja2020/gateways/credit/pay_livewire.blade.php b/resources/views/portal/ninja2020/gateways/credit/pay_livewire.blade.php
new file mode 100644
index 00000000000..a1585bf7abb
--- /dev/null
+++ b/resources/views/portal/ninja2020/gateways/credit/pay_livewire.blade.php
@@ -0,0 +1,33 @@
+<div class="rounded-lg border bg-card text-card-foreground shadow-sm overflow-hidden py-5 bg-white sm:gap-4">
+
+    <form action="{{route('client.payments.credit_response')}}" method="post" id="credit-payment">
+    @csrf
+    <input type="hidden" name="payment_hash" value="{{$payment_hash}}">
+    </form>
+        <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+            <dt class="text-sm leading-5 font-medium text-gray-500">
+                {{ ctrans('texts.subtotal') }}
+            </dt>
+            <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                {{ App\Utils\Number::formatMoney($total['invoice_totals'], $client) }}
+            </dd>
+            @if($total['credit_totals'] > 0)
+            <dt class="text-sm leading-5 font-medium text-gray-500">
+                {{ ctrans('texts.credit_amount') }}
+            </dt>
+            <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                {{ App\Utils\Number::formatMoney($total['credit_totals'], $client) }}
+            </dd>                                
+            @endif
+            <dt class="text-sm leading-5 font-medium text-gray-500">
+                {{ ctrans('texts.amount_due') }}
+            </dt>
+            <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                {{ App\Utils\Number::formatMoney($total['amount_with_fee'], $client) }}
+            </dd>
+        </div>
+    <div class="bg-white px-4 py-5 flex justify-end">
+        <button form="credit-payment" class="button button-primary bg-primary inline-flex items-center">Pay with credit</button>
+    </div>
+
+</div>
\ No newline at end of file

From 950b294db53e287302ed516cb93aedad9869c184 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 16 Oct 2024 16:57:37 +1100
Subject: [PATCH 40/81] Cleanup

---
 app/Livewire/Flow2/ProcessPayment.php                | 2 --
 app/Services/ClientPortal/LivewireInstantPayment.php | 1 -
 app/Services/Invoice/AutoBillInvoice.php             | 2 ++
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/Livewire/Flow2/ProcessPayment.php b/app/Livewire/Flow2/ProcessPayment.php
index cceb12302bb..322f3de6dfc 100644
--- a/app/Livewire/Flow2/ProcessPayment.php
+++ b/app/Livewire/Flow2/ProcessPayment.php
@@ -58,8 +58,6 @@ public function mount()
             throw new PaymentFailed($responder_data['error'], 400);
         }
 
-        
-        /*** @PATCH */
         if(isset($responder_data['component']) && $responder_data['component'] == 'CreditPaymentComponent'){
             $this->payment_view = $responder_data['view'];
             $this->payment_data_payload = $responder_data['payload'];
diff --git a/app/Services/ClientPortal/LivewireInstantPayment.php b/app/Services/ClientPortal/LivewireInstantPayment.php
index a4284e35239..80bff126964 100644
--- a/app/Services/ClientPortal/LivewireInstantPayment.php
+++ b/app/Services/ClientPortal/LivewireInstantPayment.php
@@ -232,7 +232,6 @@ public function run()
         ];
 
         if ($this->is_credit_payment) {
-            /*** @PATCH */
             $this->mergeResponder(['success' => true, 'view' => 'gateways.credit.pay_livewire', 'component' => 'CreditPaymentComponent', 'payload' => $data]);
             return $this->getResponder();
         }
diff --git a/app/Services/Invoice/AutoBillInvoice.php b/app/Services/Invoice/AutoBillInvoice.php
index 178e37c4289..3b67ddb7908 100644
--- a/app/Services/Invoice/AutoBillInvoice.php
+++ b/app/Services/Invoice/AutoBillInvoice.php
@@ -347,6 +347,8 @@ public function applyUnappliedPayment(): self
                     $payload = ['client_id' => $this->invoice->client_id, 'invoices' => [['invoice_id' => $this->invoice->id,'amount' => $payment_balance]]];
                     $payment_repo->save($payload, $payment);
 
+                    $this->invoice = $this->invoice->fresh();
+
                 }
             }
 

From aad3c3f9eeeaae0ef99923f9c49489d7ab9a077a Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Oct 2024 08:10:38 +1100
Subject: [PATCH 41/81] Remove subquery

---
 app/Http/Controllers/BaseController.php    | 1 -
 app/Http/Controllers/LicenseController.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 1fea58e0735..873bab71148 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -610,7 +610,6 @@ protected function miniLoadResponse($query)
                     if (! $user->isAdmin()) {
                         $query->where('activities.user_id', $user->id);
                     }
-                    $query->whereColumn('companies.account_id', 'activities.account_id');
                 },
                 'company.bank_integrations' => function ($query) use ($user) {
                     if (! $user->hasPermission('view_bank_transaction')) {
diff --git a/app/Http/Controllers/LicenseController.php b/app/Http/Controllers/LicenseController.php
index f2454aca5e2..079d31c4e96 100644
--- a/app/Http/Controllers/LicenseController.php
+++ b/app/Http/Controllers/LicenseController.php
@@ -85,7 +85,7 @@ public function index()
 
         /* Catch claim license requests */
         if (config('ninja.environment') == 'selfhost' && request()->has('license_key')) {
-            $license_key = request()->input('license_key');
+            $license_key = trim(request()->input('license_key'));
             $product_id = 3;
 
             if(substr($license_key, 0, 3) == 'v5_') {

From 1e7af1f3ffe495daabc3e7309526ed87d51ded03 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Oct 2024 08:11:42 +1100
Subject: [PATCH 42/81] v5.10.40

---
 VERSION.txt      | 2 +-
 config/ninja.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index cc6288ce32b..1684db4d471 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.10.39
\ No newline at end of file
+5.10.40
\ No newline at end of file
diff --git a/config/ninja.php b/config/ninja.php
index 1c7962a6097..6c9fb6ae4af 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,8 @@
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.10.39'),
-    'app_tag' => env('APP_TAG', '5.10.39'),
+    'app_version' => env('APP_VERSION', '5.10.40'),
+    'app_tag' => env('APP_TAG', '5.10.40'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),

From 34524f3ed3bc075ffc60a8a7269320639c0616b7 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Oct 2024 08:46:53 +1100
Subject: [PATCH 43/81] Add expense number

---
 app/Jobs/Util/Import.php                            | 1 +
 app/Services/EDocument/Imports/ZugferdEDocument.php | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index b9b89cc0e70..65033f59ea8 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -1571,6 +1571,7 @@ private function processDocuments(array $data): void
 
 
             } catch(\Exception $e) {
+                nlog($e->getMessage());
                 //do nothing, gracefully :)
             }
         }
diff --git a/app/Services/EDocument/Imports/ZugferdEDocument.php b/app/Services/EDocument/Imports/ZugferdEDocument.php
index bcc40624eef..9863b6900da 100644
--- a/app/Services/EDocument/Imports/ZugferdEDocument.php
+++ b/app/Services/EDocument/Imports/ZugferdEDocument.php
@@ -24,6 +24,7 @@
 use App\Utils\Traits\SavesDocuments;
 use Exception;
 use App\Models\Company;
+use App\Repositories\ExpenseRepository;
 use horstoeko\zugferd\ZugferdDocumentReader;
 use horstoeko\zugferdvisualizer\ZugferdVisualizer;
 use horstoeko\zugferdvisualizer\renderer\ZugferdVisualizerLaravelRenderer;
@@ -90,6 +91,7 @@ public function run(): Expense
                     $this->document->getDocumentTax($categoryCode, $typeCode, $basisAmount, $calculatedAmount, $rateApplicablePercent, $exemptionReason, $exemptionReasonCode, $lineTotalBasisAmount, $allowanceChargeBasisAmount, $taxPointDate, $dueDateTypeCode);
                     $expense->{"tax_amount$counter"} = $calculatedAmount;
                     $expense->{"tax_rate$counter"} = $rateApplicablePercent;
+                    $expense->{"tax_name$counter"} = $typeCode;
                     $counter++;
                 } while ($this->document->nextDocumentTax());
             }
@@ -147,7 +149,10 @@ public function run(): Expense
             nlog("Zugferd: Document already exists");
             $expense->private_notes = $expense->private_notes . ctrans("texts.edocument_import_already_exists", ["date" => time()]);
         }
-        $expense->save();
+
+        $expense_repo = new ExpenseRepository();
+        $expense = $expense_repo->save([],$expense);
+        
         return $expense;
     }
 }

From b90fb4515f27026b07757eb0e9ccb4a05612d9be Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Oct 2024 08:56:21 +1100
Subject: [PATCH 44/81] Fixes for expense imports

---
 app/Jobs/EDocument/ImportEDocument.php              | 3 +--
 app/Services/EDocument/Imports/ParseEDocument.php   | 2 ++
 app/Services/EDocument/Imports/ZugferdEDocument.php | 6 +++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/Jobs/EDocument/ImportEDocument.php b/app/Jobs/EDocument/ImportEDocument.php
index e403caa704e..d1f3ce41a6f 100644
--- a/app/Jobs/EDocument/ImportEDocument.php
+++ b/app/Jobs/EDocument/ImportEDocument.php
@@ -53,7 +53,7 @@ public function handle(): Expense
 
     public function middleware()
     {
-        return [new WithoutOverlapping($this->company->company_key)];
+        return [new WithoutOverlapping($this->company->company_key."_expense_import")];
     }
 
     public function failed($exception = null)
@@ -63,7 +63,6 @@ public function failed($exception = null)
         }
         
         $this->fail($exception); //manually fail - prevents future jobs with the same name from being discarded
-
         config(['queue.failed.driver' => null]);
     }
 }
diff --git a/app/Services/EDocument/Imports/ParseEDocument.php b/app/Services/EDocument/Imports/ParseEDocument.php
index 913e293950b..f48ab1e6972 100644
--- a/app/Services/EDocument/Imports/ParseEDocument.php
+++ b/app/Services/EDocument/Imports/ParseEDocument.php
@@ -60,6 +60,7 @@ public function run(): Expense
                     return (new ZugferdEDocument($this->file, $this->company))->run();
                 } catch (\Throwable $e) {
                     nlog("Zugferd Exception: " . $e->getMessage());
+                    break;
                 }
             case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017"):
             case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:oasis:names:specification:ubl"):
@@ -68,6 +69,7 @@ public function run(): Expense
                 }
                 catch(\Throwable $e){
                     nlog("UBL Import Exception: " . $e->getMessage());
+                    break;
                 }
         }
 
diff --git a/app/Services/EDocument/Imports/ZugferdEDocument.php b/app/Services/EDocument/Imports/ZugferdEDocument.php
index 9863b6900da..b6118b59229 100644
--- a/app/Services/EDocument/Imports/ZugferdEDocument.php
+++ b/app/Services/EDocument/Imports/ZugferdEDocument.php
@@ -25,6 +25,8 @@
 use Exception;
 use App\Models\Company;
 use App\Repositories\ExpenseRepository;
+use App\Repositories\VendorContactRepository;
+use App\Repositories\VendorRepository;
 use horstoeko\zugferd\ZugferdDocumentReader;
 use horstoeko\zugferdvisualizer\ZugferdVisualizer;
 use horstoeko\zugferdvisualizer\renderer\ZugferdVisualizerLaravelRenderer;
@@ -139,7 +141,9 @@ public function run(): Expense
                 if ($country)
                     $vendor->country_id = $country->id;
 
-                $vendor->save();
+                $vendor_repo = new VendorRepository(new VendorContactRepository());
+                $vendor = $vendor_repo->save([], $vendor);
+
                 $expense->vendor_id = $vendor->id;
             }
             $expense->transaction_reference = $documentno;

From 8f386b1dd37c55823928834b5f0096196d9e5d9f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Oct 2024 11:02:46 +1100
Subject: [PATCH 45/81] Minor fixes

---
 app/Jobs/EDocument/ImportEDocument.php |  2 +-
 lang/en/texts.php                      |  6 ++-
 tests/Unit/InvoiceTest.php             | 68 ++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/EDocument/ImportEDocument.php b/app/Jobs/EDocument/ImportEDocument.php
index d1f3ce41a6f..fe6c6149001 100644
--- a/app/Jobs/EDocument/ImportEDocument.php
+++ b/app/Jobs/EDocument/ImportEDocument.php
@@ -53,7 +53,7 @@ public function handle(): Expense
 
     public function middleware()
     {
-        return [new WithoutOverlapping($this->company->company_key."_expense_import")];
+        return [new WithoutOverlapping($this->company->company_key."_expense_import_".$this->file_name)];
     }
 
     public function failed($exception = null)
diff --git a/lang/en/texts.php b/lang/en/texts.php
index 6089824a10e..dc311e2a10a 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5360,7 +5360,11 @@
     'vat_not_registered' => 'Seller not VAT registered',
     'small_company_info' => 'No disclosure of sales tax in accordance with § 19 UStG',
     'log_duration_words' => 'Time log duration in words',
-    'log_duration' => 'Time log duration'
+    'log_duration' => 'Time log duration',
+    'merged_vendors' => 'Successfully merged vendors',
+    'hidden_taxes_warning' => 'Somes taxes are hidden due to current tax settings. :link',
+    'tax3' => 'Third Tax',
+
 );
 
 return $lang;
diff --git a/tests/Unit/InvoiceTest.php b/tests/Unit/InvoiceTest.php
index 28cd6778cdb..87c510f3dcb 100644
--- a/tests/Unit/InvoiceTest.php
+++ b/tests/Unit/InvoiceTest.php
@@ -49,6 +49,74 @@ protected function setUp(): void
         $this->invoice_calc = new InvoiceSum($this->invoice);
     }
 
+    public function testRefundPaidToDateRelation()
+    {
+                
+        $c = \App\Models\Client::factory()->create([
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+        ]);
+
+        $item = InvoiceItemFactory::create();
+        $item->quantity = 1;
+        $item->cost = 10.00;
+        $item->type_id = '1';
+        $item->tax_id = '1';
+        $line_items[] = $item;
+
+        $i = Invoice::factory()->create([
+            'discount' => 0,
+            'tax_name1' => '',
+            'tax_name2' => '',
+            'tax_name3' => '',
+            'tax_rate1' => 0,
+            'tax_rate2' => 0,
+            'tax_rate3' => 0,
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'client_id' => $c->id,
+            'line_items' => $line_items,
+            'status_id' => 1,
+            'uses_inclusive_taxes' => false,
+        ]);
+
+        $invoice_calc = new InvoiceSum($i);
+        $ii = $invoice_calc->build()->getInvoice();
+
+        $ii->service()->markSent()->save();
+
+        $this->assertEquals(10, $ii->balance);
+        $this->assertEquals(2, $ii->status_id);
+        
+        $ii = $ii->service()->markPaid()->save();
+
+        $this->assertEquals(10, $ii->amount);
+        $this->assertEquals(0, $ii->balance);
+        $this->assertEquals(10, $ii->paid_to_date);
+        $this->assertEquals(2, $ii->status_id);
+
+        $p = $ii->payments->first();
+
+        $this->assertEquals(10, $p->amount);
+        $this->assertEquals(10, $p->applied);
+        $this->assertEquals(0, $p->refunded);
+
+        $refund_data['gateway_refund']=false;
+        $refund_data['invoices'][] = [
+            'invoice_id' => $ii->id,
+            'amount' => 10
+        ];
+
+        $p->service()->refundPayment($refund_data);
+
+        $ii = $ii->fresh();
+
+        $this->assertEquals(2, $ii->status_id);
+        $this->assertEquals(10, $ii->balance);
+        $this->assertEquals(0, $ii->paid_to_date);
+
+    }
+
     public function testRappenRounding()
     {
 

From 6786a0cfb13bdc2585afb12d297b0b2f37028400 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Oct 2024 11:35:18 +1100
Subject: [PATCH 46/81] Minor fixes for tests

---
 tests/Unit/InvoiceTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Unit/InvoiceTest.php b/tests/Unit/InvoiceTest.php
index 87c510f3dcb..a99b6258c90 100644
--- a/tests/Unit/InvoiceTest.php
+++ b/tests/Unit/InvoiceTest.php
@@ -83,7 +83,7 @@ public function testRefundPaidToDateRelation()
         $invoice_calc = new InvoiceSum($i);
         $ii = $invoice_calc->build()->getInvoice();
 
-        $ii->service()->markSent()->save();
+        $ii = $ii->service()->markSent()->save();
 
         $this->assertEquals(10, $ii->balance);
         $this->assertEquals(2, $ii->status_id);

From 446773ae7f20194a46151d54d89ed9becbb4eff6 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Oct 2024 11:41:57 +1100
Subject: [PATCH 47/81] Fixes for tests

---
 .../views/portal/ninja2020/gateways/credit/index.blade.php      | 2 +-
 .../portal/ninja2020/gateways/credit/pay_livewire.blade.php     | 2 +-
 tests/Unit/InvoiceTest.php                                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/portal/ninja2020/gateways/credit/index.blade.php b/resources/views/portal/ninja2020/gateways/credit/index.blade.php
index df489d90377..26918276a65 100644
--- a/resources/views/portal/ninja2020/gateways/credit/index.blade.php
+++ b/resources/views/portal/ninja2020/gateways/credit/index.blade.php
@@ -37,7 +37,7 @@
                                 </dd>                                
                                 @endif
                                 <dt class="text-sm leading-5 font-medium text-gray-500">
-                                    {{ ctrans('texts.amount_due') }}
+                                    {{ ctrans('texts.balance') }}
                                 </dt>
                                 <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
                                     {{ App\Utils\Number::formatMoney($total['amount_with_fee'], $client) }}
diff --git a/resources/views/portal/ninja2020/gateways/credit/pay_livewire.blade.php b/resources/views/portal/ninja2020/gateways/credit/pay_livewire.blade.php
index a1585bf7abb..3b677b29866 100644
--- a/resources/views/portal/ninja2020/gateways/credit/pay_livewire.blade.php
+++ b/resources/views/portal/ninja2020/gateways/credit/pay_livewire.blade.php
@@ -20,7 +20,7 @@
             </dd>                                
             @endif
             <dt class="text-sm leading-5 font-medium text-gray-500">
-                {{ ctrans('texts.amount_due') }}
+                {{ ctrans('texts.balance') }}
             </dt>
             <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
                 {{ App\Utils\Number::formatMoney($total['amount_with_fee'], $client) }}
diff --git a/tests/Unit/InvoiceTest.php b/tests/Unit/InvoiceTest.php
index a99b6258c90..077d396c088 100644
--- a/tests/Unit/InvoiceTest.php
+++ b/tests/Unit/InvoiceTest.php
@@ -93,7 +93,7 @@ public function testRefundPaidToDateRelation()
         $this->assertEquals(10, $ii->amount);
         $this->assertEquals(0, $ii->balance);
         $this->assertEquals(10, $ii->paid_to_date);
-        $this->assertEquals(2, $ii->status_id);
+        $this->assertEquals(4, $ii->status_id);
 
         $p = $ii->payments->first();
 

From 9faf5597bd129f1ee6400fc8a8852f98aeb2ecae Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Oct 2024 18:18:25 +1100
Subject: [PATCH 48/81] Working on Payment Means for CII

---
 .../EDocument/Adapters/CII/PaymentMeans.php   | 209 ++++++++++++++++++
 .../EDocument/Adapters/UBL/PaymentMeans.php   | 108 +++++++++
 .../Interfaces/PaymentMeansInterface.php      |  17 ++
 3 files changed, 334 insertions(+)
 create mode 100644 app/Services/EDocument/Adapters/CII/PaymentMeans.php
 create mode 100644 app/Services/EDocument/Adapters/UBL/PaymentMeans.php
 create mode 100644 app/Services/EDocument/Interfaces/PaymentMeansInterface.php

diff --git a/app/Services/EDocument/Adapters/CII/PaymentMeans.php b/app/Services/EDocument/Adapters/CII/PaymentMeans.php
new file mode 100644
index 00000000000..c47c2309e4e
--- /dev/null
+++ b/app/Services/EDocument/Adapters/CII/PaymentMeans.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Services\EDocument\Adapters\CII;
+
+use App\Services\EDocument\Interfaces\PaymentMeansInterface;
+
+class PaymentMeans implements PaymentMeansInterface
+{
+
+    public array $payment_means_codelist = [
+        '1' => 'Instrument not defined',
+        '2' => 'Automated clearing house credit',
+        '3' => 'Automated clearing house debit',
+        '4' => 'ACH demand debit reversal',
+        '5' => 'ACH demand credit reversal',
+        '6' => 'ACH demand credit',
+        '7' => 'ACH demand debit',
+        '8' => 'Hold',
+        '9' => 'National or regional clearing',
+        '10' => 'In cash',
+        '11' => 'ACH savings credit reversal',
+        '12' => 'ACH savings debit reversal',
+        '13' => 'ACH savings credit',
+        '14' => 'ACH savings debit',
+        '15' => 'Bookentry credit',
+        '16' => 'Bookentry debit',
+        '17' => 'ACH demand cash concentration/disbursement (CCD) credit',
+        '18' => 'ACH demand cash concentration/disbursement (CCD) debit',
+        '19' => 'ACH demand corporate trade payment (CTP) credit',
+        '20' => 'Cheque',
+        '21' => 'Banker\'s draft',
+        '22' => 'Certified banker\'s draft',
+        '23' => 'Bank cheque (issued by a banking or similar establishment)',
+        '24' => 'Bill of exchange awaiting acceptance',
+        '25' => 'Certified cheque',
+        '26' => 'Local cheque',
+        '27' => 'ACH demand corporate trade payment (CTP) debit',
+        '28' => 'ACH demand corporate trade exchange (CTX) credit',
+        '29' => 'ACH demand corporate trade exchange (CTX) debit',
+        '30' => 'Credit transfer',
+        '31' => 'Debit transfer',
+        '32' => 'ACH demand cash concentration/disbursement plus (CCD+)',
+        '33' => 'ACH demand cash concentration/disbursement plus (CCD+)',
+        '34' => 'ACH prearranged payment and deposit (PPD)',
+        '35' => 'ACH savings cash concentration/disbursement (CCD) credit',
+        '36' => 'ACH savings cash concentration/disbursement (CCD) debit',
+        '37' => 'ACH savings corporate trade payment (CTP) credit',
+        '38' => 'ACH savings corporate trade payment (CTP) debit',
+        '39' => 'ACH savings corporate trade exchange (CTX) credit',
+        '40' => 'ACH savings corporate trade exchange (CTX) debit',
+        '41' => 'ACH savings cash concentration/disbursement plus (CCD+)',
+        '42' => 'Payment to bank account',
+        '43' => 'ACH savings cash concentration/disbursement plus (CCD+)',
+        '44' => 'Accepted bill of exchange',
+        '45' => 'Referenced home-banking credit transfer',
+        '46' => 'Interbank debit transfer',
+        '47' => 'Home-banking debit transfer',
+        '48' => 'Bank card',
+        '49' => 'Direct debit',
+        '50' => 'Payment by postgiro',
+        '51' => 'FR, norme 6 97-Telereglement CFONB (French Organisation for',
+        '52' => 'Urgent commercial payment',
+        '53' => 'Urgent Treasury Payment',
+        '54' => 'Credit card',
+        '55' => 'Debit card',
+        '56' => 'Bankgiro',
+        '57' => 'Standing agreement',
+        '58' => 'SEPA credit transfer',
+        '59' => 'SEPA direct debit',
+        '60' => 'Promissory note',
+        '61' => 'Promissory note signed by the debtor',
+        '62' => 'Promissory note signed by the debtor and endorsed by a bank',
+        '63' => 'Promissory note signed by the debtor and endorsed by a',
+        '64' => 'Promissory note signed by a bank',
+        '65' => 'Promissory note signed by a bank and endorsed by another',
+        '66' => 'Promissory note signed by a third party',
+        '67' => 'Promissory note signed by a third party and endorsed by a',
+        '68' => 'Online payment service',
+        '69' => 'Transfer Advice',
+        '70' => 'Bill drawn by the creditor on the debtor',
+        '74' => 'Bill drawn by the creditor on a bank',
+        '75' => 'Bill drawn by the creditor, endorsed by another bank',
+        '76' => 'Bill drawn by the creditor on a bank and endorsed by a',
+        '77' => 'Bill drawn by the creditor on a third party',
+        '78' => 'Bill drawn by creditor on third party, accepted and',
+        '91' => 'Not transferable banker\'s draft',
+        '92' => 'Not transferable local cheque',
+        '93' => 'Reference giro',
+        '94' => 'Urgent giro',
+        '95' => 'Free format giro',
+        '96' => 'Requested method for payment was not used',
+        '97' => 'Clearing between partners',
+        'ZZZ' => 'Mutually defined',
+    ];
+
+    public string $typecode = '1';
+
+    public ?string $information = null;
+
+    public ?string $cardType = null;
+
+    public ?string $cardId = null;
+
+    public ?string $cardHolderName = null;
+
+    public ?string $buyerIban = null;
+
+    public ?string $payeeIban = null;
+
+    public ?string $payeeAccountName = null;
+
+    public ?string $payeePropId = null;
+
+    public ?string $payeeBic = null;
+
+    public function __construct(mixed $existing_payment_means = null)
+    {
+        if($existing_payment_means){
+            
+            $properties = get_object_vars($this);
+            foreach ($properties as $property => $value) {
+                if (property_exists($existing_payment_means, $property)) {
+                    $this->$property = $existing_payment_means->$property;
+                }
+            }
+
+        }
+    }
+    //requires an object which looks like this
+    // @param string      $typecode         __BT-81, From BASIC WL__ The expected or used means of payment, expressed as a code. The entries from the UNTDID 4461 code list must be used. A distinction should be made between SEPA and non-SEPA payments as well 
+    // as between credit payments, direct debits, card payments and other means of payment 
+    // In particular, the following codes can be used:
+    //  *                                      10: cash - 
+                                            //    20: check - 
+                                            //    30: transfer - 
+                                            //    42: Payment to bank account - 
+                                            //    48: Card payment - 
+                                            //    49: direct debit - 
+                                            //    57: Standing order - 
+                                            //    58: SEPA Credit Transfer - 
+                                            //    59: SEPA Direct Debit - 
+                                            //    97: Report
+    //  *
+    //  * @param  string|null $information      __BT-82, From EN 16931__ The expected or used means of payment expressed in text form, e.g. cash, bank transfer, direct debit, credit card, etc.
+    //  * @param  string|null $cardType         __BT-, From __ The type of the card
+    //  * @param  string|null $cardId           __BT-84, From BASIC WL__ The primary account number (PAN) to which the card used for payment belongs. In accordance with card payment security standards, an invoice should never contain a full payment card master account number. 
+    //The following specification of the PCI Security Standards Council currently applies: The first 6 and last 4 digits at most are to be displayed
+    //  * @param  string|null $cardHolderName   __BT-, From __ Name of the payment card holder
+    //  * @param  string|null $buyerIban        __BT-91, From BASIC WL__ Direct debit: ID of the account to be debited
+    //  * @param  string|null $payeeIban        __BT-, From __ Transfer: A unique identifier for the financial account held with a payment service provider to which the payment should be made, e.g. Use an IBAN (in the case of a SEPA payment) for a national 
+    //ProprietaryID account number
+    //  * @param  string|null $payeeAccountName __BT-, From __ The name of the payment account held with a payment service provider to which the payment should be made. Information only required if different from the name of the payee / seller
+    //  * @param  string|null $payeePropId      __BT-, From __ National account number (not for SEPA)
+    //  * @param  string|null $payeeBic         __BT-, From __ Seller's banking institution, An identifier for the payment service provider with whom the payment account is managed, such as the BIC or a national bank code, if required. No identification scheme is to be used.
+    //  *
+    public function run()
+    {
+
+
+// ->getTradeSettlementPaymentMeansType($typecode, $information);
+// ->getTradeSettlementFinancialCardType($cardType, $cardId, $cardHolderName);
+
+
+        $TradeSettlementFinancialCardType = new \horstoeko\zugferd\entities\extended\ram\TradeSettlementFinancialCardType();
+        $TradeSettlementFinancialCardType->setCardholderName($this->cardHolderName)
+                                         ->setID(new \horstoeko\zugferd\entities\extended\udt\IDType($this->cardId));
+
+        $DebtorFinancialAccountType = new \horstoeko\zugferd\entities\extended\ram\DebtorFinancialAccountType();
+        $DebtorFinancialAccountType->setIBANID(new \horstoeko\zugferd\entities\extended\udt\IDType($this->buyerIban));
+
+        $CreditorFinancialAccountType = new \horstoeko\zugferd\entities\extended\ram\CreditorFinancialAccountType();
+        $CreditorFinancialAccountType->setAccountName($this->payeeAccountName)
+                                     ->setProprietaryID(new \horstoeko\zugferd\entities\extended\udt\IDType($this->payeePropId))
+                                     ->setIBANID(new \horstoeko\zugferd\entities\extended\udt\IDType($this->payeeIban));
+
+        $CreditorFinancialInstitutionType = new \horstoeko\zugferd\entities\extended\ram\CreditorFinancialInstitutionType();
+        $CreditorFinancialInstitutionType->setBICID(new \horstoeko\zugferd\entities\extended\udt\IDType($this->payeeBic));
+        
+        $TradeSettlementPaymentMeansType = new \horstoeko\zugferd\entities\extended\ram\TradeSettlementPaymentMeansType();
+        $TradeSettlementPaymentMeansType->setTypeCode($this->typecode)->setInformation($this->information);
+        $TradeSettlementPaymentMeansType->setPayeePartyCreditorFinancialAccount($CreditorFinancialAccountType);
+        $TradeSettlementPaymentMeansType->setPayerPartyDebtorFinancialAccount($DebtorFinancialAccountType);
+        $TradeSettlementPaymentMeansType->setApplicableTradeSettlementFinancialCard($TradeSettlementFinancialCardType);
+        $TradeSettlementPaymentMeansType->setPayeeSpecifiedCreditorFinancialInstitution($CreditorFinancialInstitutionType);
+
+        $HeaderTradeSettlementType = new \horstoeko\zugferd\entities\extended\ram\HeaderTradeSettlementType();
+        $HeaderTradeSettlementType->addToSpecifiedTradeSettlementPaymentMeans($TradeSettlementPaymentMeansType);
+
+        $SupplyChainTradeTransactionType = new \horstoeko\zugferd\entities\extended\ram\SupplyChainTradeTransactionType();
+        $SupplyChainTradeTransactionType->setApplicableHeaderTradeSettlement($HeaderTradeSettlementType);
+
+        $cii = new \horstoeko\zugferd\entities\extended\rsm\CrossIndustryInvoice();
+        $cii->setSupplyChainTradeTransaction($SupplyChainTradeTransactionType);
+
+        return $cii;
+
+        // return $this;
+    }
+
+}
diff --git a/app/Services/EDocument/Adapters/UBL/PaymentMeans.php b/app/Services/EDocument/Adapters/UBL/PaymentMeans.php
new file mode 100644
index 00000000000..cd546f25e8f
--- /dev/null
+++ b/app/Services/EDocument/Adapters/UBL/PaymentMeans.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Services\EDocument\Adapters\UBL;
+
+use App\Services\EDocument\Interfaces\PaymentMeansInterface;
+
+class PaymentMeans implements PaymentMeansInterface
+{
+    public array $payment_means_codelist = [
+        '1' => 'Instrument not defined',
+        '2' => 'Automated clearing house credit',
+        '3' => 'Automated clearing house debit',
+        '4' => 'ACH demand debit reversal',
+        '5' => 'ACH demand credit reversal',
+        '6' => 'ACH demand credit',
+        '7' => 'ACH demand debit',
+        '8' => 'Hold',
+        '9' => 'National or regional clearing',
+        '10' => 'In cash',
+        '11' => 'ACH savings credit reversal',
+        '12' => 'ACH savings debit reversal',
+        '13' => 'ACH savings credit',
+        '14' => 'ACH savings debit',
+        '15' => 'Bookentry credit',
+        '16' => 'Bookentry debit',
+        '17' => 'ACH demand cash concentration/disbursement (CCD) credit',
+        '18' => 'ACH demand cash concentration/disbursement (CCD) debit',
+        '19' => 'ACH demand corporate trade payment (CTP) credit',
+        '20' => 'Cheque',
+        '21' => 'Banker\'s draft',
+        '22' => 'Certified banker\'s draft',
+        '23' => 'Bank cheque (issued by a banking or similar establishment)',
+        '24' => 'Bill of exchange awaiting acceptance',
+        '25' => 'Certified cheque',
+        '26' => 'Local cheque',
+        '27' => 'ACH demand corporate trade payment (CTP) debit',
+        '28' => 'ACH demand corporate trade exchange (CTX) credit',
+        '29' => 'ACH demand corporate trade exchange (CTX) debit',
+        '30' => 'Credit transfer',
+        '31' => 'Debit transfer',
+        '32' => 'ACH demand cash concentration/disbursement plus (CCD+)',
+        '33' => 'ACH demand cash concentration/disbursement plus (CCD+)',
+        '34' => 'ACH prearranged payment and deposit (PPD)',
+        '35' => 'ACH savings cash concentration/disbursement (CCD) credit',
+        '36' => 'ACH savings cash concentration/disbursement (CCD) debit',
+        '37' => 'ACH savings corporate trade payment (CTP) credit',
+        '38' => 'ACH savings corporate trade payment (CTP) debit',
+        '39' => 'ACH savings corporate trade exchange (CTX) credit',
+        '40' => 'ACH savings corporate trade exchange (CTX) debit',
+        '41' => 'ACH savings cash concentration/disbursement plus (CCD+)',
+        '42' => 'Payment to bank account',
+        '43' => 'ACH savings cash concentration/disbursement plus (CCD+)',
+        '44' => 'Accepted bill of exchange',
+        '45' => 'Referenced home-banking credit transfer',
+        '46' => 'Interbank debit transfer',
+        '47' => 'Home-banking debit transfer',
+        '48' => 'Bank card',
+        '49' => 'Direct debit',
+        '50' => 'Payment by postgiro',
+        '51' => 'FR, norme 6 97-Telereglement CFONB (French Organisation for',
+        '52' => 'Urgent commercial payment',
+        '53' => 'Urgent Treasury Payment',
+        '54' => 'Credit card',
+        '55' => 'Debit card',
+        '56' => 'Bankgiro',
+        '57' => 'Standing agreement',
+        '58' => 'SEPA credit transfer',
+        '59' => 'SEPA direct debit',
+        '60' => 'Promissory note',
+        '61' => 'Promissory note signed by the debtor',
+        '62' => 'Promissory note signed by the debtor and endorsed by a bank',
+        '63' => 'Promissory note signed by the debtor and endorsed by a',
+        '64' => 'Promissory note signed by a bank',
+        '65' => 'Promissory note signed by a bank and endorsed by another',
+        '66' => 'Promissory note signed by a third party',
+        '67' => 'Promissory note signed by a third party and endorsed by a',
+        '68' => 'Online payment service',
+        '69' => 'Transfer Advice',
+        '70' => 'Bill drawn by the creditor on the debtor',
+        '74' => 'Bill drawn by the creditor on a bank',
+        '75' => 'Bill drawn by the creditor, endorsed by another bank',
+        '76' => 'Bill drawn by the creditor on a bank and endorsed by a',
+        '77' => 'Bill drawn by the creditor on a third party',
+        '78' => 'Bill drawn by creditor on third party, accepted and',
+        '91' => 'Not transferable banker\'s draft',
+        '92' => 'Not transferable local cheque',
+        '93' => 'Reference giro',
+        '94' => 'Urgent giro',
+        '95' => 'Free format giro',
+        '96' => 'Requested method for payment was not used',
+        '97' => 'Clearing between partners',
+        'ZZZ' => 'Mutually defined',
+    ];
+    
+    public function run()
+    {
+    }
+
+}
diff --git a/app/Services/EDocument/Interfaces/PaymentMeansInterface.php b/app/Services/EDocument/Interfaces/PaymentMeansInterface.php
new file mode 100644
index 00000000000..2c5a6ab8380
--- /dev/null
+++ b/app/Services/EDocument/Interfaces/PaymentMeansInterface.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Services\EDocument\Interfaces;
+
+interface PaymentMeansInterface
+{
+    public function run();
+}

From 2e22da26da76e14825a1f9c2a37cc2e9a37451e0 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Oct 2024 21:26:05 +1100
Subject: [PATCH 49/81] zugferd

---
 .../EDocument/Adapters/CII/PaymentMeans.php   | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/Services/EDocument/Adapters/CII/PaymentMeans.php b/app/Services/EDocument/Adapters/CII/PaymentMeans.php
index c47c2309e4e..a4b9a293ac4 100644
--- a/app/Services/EDocument/Adapters/CII/PaymentMeans.php
+++ b/app/Services/EDocument/Adapters/CII/PaymentMeans.php
@@ -198,10 +198,32 @@ public function run()
         $SupplyChainTradeTransactionType = new \horstoeko\zugferd\entities\extended\ram\SupplyChainTradeTransactionType();
         $SupplyChainTradeTransactionType->setApplicableHeaderTradeSettlement($HeaderTradeSettlementType);
 
-        $cii = new \horstoeko\zugferd\entities\extended\rsm\CrossIndustryInvoice();
-        $cii->setSupplyChainTradeTransaction($SupplyChainTradeTransactionType);
+        // $cii = new \horstoeko\zugferd\entities\extended\rsm\CrossIndustryInvoice();
+        // $cii->setSupplyChainTradeTransaction($SupplyChainTradeTransactionType);
 
-        return $cii;
+
+
+        $d = \horstoeko\zugferd\ZugferdDocumentBuilder::CreateNew(\horstoeko\zugferd\ZugferdProfiles::PROFILE_XRECHNUNG_3);
+        // $d->setSupplyChainTradeTransaction($SupplyChainTradeTransactionType);
+
+// nlog($d->getInvoiceObject()->getSupplyChainTradeTransaction());
+$d->getObjectHelper()->tryCall($d->getInvoiceObject()->getSupplyChainTradeTransaction(), "setSupplyChainTradeTransaction", $SupplyChainTradeTransactionType);
+
+
+$documentJsonExporter = new \horstoeko\zugferd\ZugferdDocumentJsonExporter($d);
+
+// echo $documentJsonExporter->toPrettyJsonString();
+// echo "\r\n\r\n";
+
+$jsonObject = $documentJsonExporter->toJsonObject();
+
+return $jsonObject;
+// var_dump($jsonObject);
+
+// echo "\r\n\r\n";
+
+
+        // return $cii;
 
         // return $this;
     }

From f864a83fbaaf42c83187e373b73ed849fa2938e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 17 Oct 2024 17:45:50 +0200
Subject: [PATCH 50/81] payment was updated

---
 app/Events/Payment/PaymentWasUpdated.php | 33 ++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/app/Events/Payment/PaymentWasUpdated.php b/app/Events/Payment/PaymentWasUpdated.php
index e414cfddf02..114c1357d66 100644
--- a/app/Events/Payment/PaymentWasUpdated.php
+++ b/app/Events/Payment/PaymentWasUpdated.php
@@ -13,14 +13,20 @@
 
 use App\Models\Company;
 use App\Models\Payment;
+use App\Transformers\ArraySerializer;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Queue\SerializesModels;
+use League\Fractal\Manager;
+use League\Fractal\Resource\Item;
 
 /**
  * Class PaymentWasUpdated.
  */
-class PaymentWasUpdated
+class PaymentWasUpdated implements ShouldBroadcast
 {
-    use SerializesModels;
+    use SerializesModels, InteractsWithSockets;
 
     /**
      * @var Payment
@@ -43,5 +49,28 @@ public function __construct(Payment $payment, Company $company, array $event_var
         $this->payment = $payment;
         $this->company = $company;
         $this->event_vars = $event_vars;
+
+        $this->dontBroadcastToCurrentUser();
+    }
+
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel("company-{$this->company->company_key}"),
+        ];
+    }
+
+    public function broadcastWith(): array
+    {
+        $manager = new Manager();
+        $manager->setSerializer(new ArraySerializer());
+        $class = sprintf('App\\Transformers\\%sTransformer', class_basename($this->payment));
+
+        $transformer = new $class();
+
+        $resource = new Item($this->payment, $transformer, $this->payment->getEntityType());
+        $data = $manager->createData($resource)->toArray();
+
+        return [...$data, 'x-socket-id' => $this->socket];
     }
 }

From bcf46e66ff878cd6966447621cd486d0af240feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 17 Oct 2024 17:45:57 +0200
Subject: [PATCH 51/81] update translations

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

diff --git a/lang/en/texts.php b/lang/en/texts.php
index 6089824a10e..73c5bcae980 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5360,7 +5360,8 @@
     'vat_not_registered' => 'Seller not VAT registered',
     'small_company_info' => 'No disclosure of sales tax in accordance with § 19 UStG',
     'log_duration_words' => 'Time log duration in words',
-    'log_duration' => 'Time log duration'
+    'log_duration' => 'Time log duration',
+    'payment_status_changed' => 'Please note that the status of your payment has been updated. We recommend refreshing the page to view the most current version.',
 );
 
 return $lang;

From b40cdff4510b25ce5df6958946cdc895c1113afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 17 Oct 2024 17:59:16 +0200
Subject: [PATCH 52/81] support for credit was created

---
 app/Events/Credit/CreditWasCreated.php | 36 +++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/app/Events/Credit/CreditWasCreated.php b/app/Events/Credit/CreditWasCreated.php
index 3139616730b..93a7fbeed17 100644
--- a/app/Events/Credit/CreditWasCreated.php
+++ b/app/Events/Credit/CreditWasCreated.php
@@ -14,10 +14,15 @@
 use App\Models\Company;
 use App\Models\Credit;
 use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
+use League\Fractal\Manager;
+use App\Transformers\ArraySerializer;
+use League\Fractal\Resource\Item;
 
-class CreditWasCreated
+class CreditWasCreated implements ShouldBroadcast
 {
     use Dispatchable;
     use InteractsWithSockets;
@@ -41,5 +46,34 @@ public function __construct(Credit $credit, Company $company, array $event_vars)
         $this->credit = $credit;
         $this->company = $company;
         $this->event_vars = $event_vars;
+
+        $this->dontBroadcastToCurrentUser();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function broadcastOn() 
+    {
+        return [
+            new PrivateChannel("company-{$this->company->company_key}"),
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function broadcastWith(): array
+    {
+        $manager = new Manager();
+        $manager->setSerializer(new ArraySerializer());
+        $class = sprintf('App\\Transformers\\%sTransformer', class_basename($this->credit));
+
+        $transformer = new $class();
+
+        $resource = new Item($this->credit, $transformer, $this->credit->getEntityType());
+        $data = $manager->createData($resource)->toArray();
+
+        return [...$data, 'x-socket-id' => $this->socket];
     }
 }

From caf36a15949b92d2cba43e24ddc1e3067f3f758e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 17 Oct 2024 17:59:21 +0200
Subject: [PATCH 53/81] support for credit was updated

---
 app/Events/Credit/CreditWasUpdated.php | 36 +++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/app/Events/Credit/CreditWasUpdated.php b/app/Events/Credit/CreditWasUpdated.php
index 1cf266f3f22..977220b1d29 100644
--- a/app/Events/Credit/CreditWasUpdated.php
+++ b/app/Events/Credit/CreditWasUpdated.php
@@ -14,10 +14,15 @@
 use App\Models\Company;
 use App\Models\Credit;
 use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
+use League\Fractal\Manager;
+use App\Transformers\ArraySerializer;
+use League\Fractal\Resource\Item;
 
-class CreditWasUpdated
+class CreditWasUpdated implements ShouldBroadcast
 {
     use Dispatchable;
     use InteractsWithSockets;
@@ -41,5 +46,34 @@ public function __construct(Credit $credit, Company $company, array $event_vars)
         $this->credit = $credit;
         $this->company = $company;
         $this->event_vars = $event_vars;
+
+        $this->dontBroadcastToCurrentUser();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function broadcastOn() 
+    {
+        return [
+            new PrivateChannel("company-{$this->company->company_key}"),
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function broadcastWith(): array
+    {
+        $manager = new Manager();
+        $manager->setSerializer(new ArraySerializer());
+        $class = sprintf('App\\Transformers\\%sTransformer', class_basename($this->credit));
+
+        $transformer = new $class();
+
+        $resource = new Item($this->credit, $transformer, $this->credit->getEntityType());
+        $data = $manager->createData($resource)->toArray();
+
+        return [...$data, 'x-socket-id' => $this->socket];
     }
 }

From 7055244b8a9047426e8d204a39f78de21389b1d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 17 Oct 2024 17:59:25 +0200
Subject: [PATCH 54/81] update translations

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

diff --git a/lang/en/texts.php b/lang/en/texts.php
index 73c5bcae980..39576276d08 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5362,6 +5362,7 @@
     'log_duration_words' => 'Time log duration in words',
     'log_duration' => 'Time log duration',
     'payment_status_changed' => 'Please note that the status of your payment has been updated. We recommend refreshing the page to view the most current version.',
+    'credit_status_changed' => 'Please note that the status of your credit has been updated. We recommend refreshing the page to view the most current version.',
 );
 
 return $lang;

From e1ae0c940ebb0c8ac24f3e18bf1bd373a5561ffb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Thu, 17 Oct 2024 18:54:04 +0200
Subject: [PATCH 55/81] support for invoice was viewed

---
 app/Events/Invoice/InvoiceWasViewed.php | 35 +++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/app/Events/Invoice/InvoiceWasViewed.php b/app/Events/Invoice/InvoiceWasViewed.php
index 5aaf0dffdfb..378628bf17d 100644
--- a/app/Events/Invoice/InvoiceWasViewed.php
+++ b/app/Events/Invoice/InvoiceWasViewed.php
@@ -13,15 +13,21 @@
 
 use App\Models\Company;
 use App\Models\InvoiceInvitation;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Queue\SerializesModels;
+use League\Fractal\Manager;
+use App\Transformers\ArraySerializer;
+use League\Fractal\Resource\Item;
 
 /**
  * Class InvoiceWasViewed.
  */
-class InvoiceWasViewed
+class InvoiceWasViewed implements ShouldBroadcast
 {
     use SerializesModels;
-
+    use InteractsWithSockets;
 
     /**
      * Create a new event instance.
@@ -32,5 +38,30 @@ class InvoiceWasViewed
      */
     public function __construct(public InvoiceInvitation $invitation, public Company $company, public array $event_vars)
     {
+        //
+    }
+
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel("company-{$this->company->company_key}"),
+        ];
+    }
+
+    public function broadcastWith(): array
+    {
+        $manager = new Manager();
+        $manager->setSerializer(new ArraySerializer());
+        $class = sprintf('App\\Transformers\\%sTransformer', class_basename($this->invitation->invoice));
+
+        $transformer = new $class();
+
+        $resource = new Item($this->invitation->invoice, $transformer, $this->invitation->invoice->getEntityType());
+
+        $manager->parseIncludes('client');
+
+        $data = $manager->createData($resource)->toArray();
+
+        return $data;
     }
 }

From 04bf207a97f789e4c002074729bcf714f5692075 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 18 Oct 2024 06:53:54 +1100
Subject: [PATCH 56/81] Fixes for smtp_port cast

---
 app/Http/Controllers/SmtpController.php | 2 +-
 app/Jobs/Mail/NinjaMailerJob.php        | 2 +-
 app/Services/Email/Email.php            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/SmtpController.php b/app/Http/Controllers/SmtpController.php
index 3e1f7f6e378..512611e0004 100644
--- a/app/Http/Controllers/SmtpController.php
+++ b/app/Http/Controllers/SmtpController.php
@@ -30,7 +30,7 @@ public function check(CheckSmtpRequest $request)
         $company = $user->company();
 
         $smtp_host = $request->input('smtp_host', $company->smtp_host);
-        $smtp_port = $request->input('smtp_port', $company->smtp_port);
+        $smtp_port = (int)$request->input('smtp_port', $company->smtp_port);
         $smtp_username = $request->input('smtp_username', $company->smtp_username);
         $smtp_password = $request->input('smtp_password', $company->smtp_password);
         $smtp_encryption = $request->input('smtp_encryption', $company->smtp_encryption ?? 'tls');
diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php
index 86dbe7e07ea..2d3561fd4d9 100644
--- a/app/Jobs/Mail/NinjaMailerJob.php
+++ b/app/Jobs/Mail/NinjaMailerJob.php
@@ -417,7 +417,7 @@ private function configureSmtpMailer()
         $company = $this->company;
 
         $smtp_host = $company->smtp_host ?? '';
-        $smtp_port = $company->smtp_port;
+        $smtp_port = (int)$company->smtp_port;
         $smtp_username = $company->smtp_username ?? '';
         $smtp_password = $company->smtp_password ?? '';
         $smtp_encryption = $company->smtp_encryption ?? 'tls';
diff --git a/app/Services/Email/Email.php b/app/Services/Email/Email.php
index 5b477e510f5..5230eba0ae1 100644
--- a/app/Services/Email/Email.php
+++ b/app/Services/Email/Email.php
@@ -622,7 +622,7 @@ private function configureSmtpMailer()
         $company = $this->company;
 
         $smtp_host = $company->smtp_host ?? '';
-        $smtp_port = $company->smtp_port;
+        $smtp_port = (int)$company->smtp_port;
         $smtp_username = $company->smtp_username ?? '';
         $smtp_password = $company->smtp_password ?? '';
         $smtp_encryption = $company->smtp_encryption ?? 'tls';

From 650729caa1322874112e4880a1dd97438e8b968d Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 18 Oct 2024 06:58:43 +1100
Subject: [PATCH 57/81] Fixes for tests

---
 tests/MockUnitData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/MockUnitData.php b/tests/MockUnitData.php
index cd741ea4dd7..dab18fc9ed3 100644
--- a/tests/MockUnitData.php
+++ b/tests/MockUnitData.php
@@ -51,7 +51,7 @@ public function makeTestData()
 
         $this->user = User::factory()->create([
             'account_id' => $this->account->id,
-            'email' => $this->faker->safeEmail(),
+            'email' => $this->faker->unique()->safeEmail(),
         ]);
 
         $this->company = Company::factory()->create([

From 2f4502022bc3a8cc6855dd350e633cc21f4b1638 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 18 Oct 2024 08:54:38 +1100
Subject: [PATCH 58/81] Fixes for parallel tests

---
 app/Models/Expense.php                        |  9 +--
 app/Models/Product.php                        |  4 +-
 app/Models/RecurringInvoice.php               |  9 +--
 app/Repositories/BaseRepository.php           | 11 +--
 app/Services/Payment/DeletePayment.php        | 13 ++-
 app/Services/Template/TemplateService.php     |  2 +-
 lang/en/texts.php                             |  2 +-
 tests/Feature/ClassificationTest.php          |  1 -
 tests/Feature/ExpenseApiTest.php              |  2 +-
 tests/Feature/Export/ExportCsvTest.php        | 81 -------------------
 tests/Feature/PaymentTest.php                 | 58 +++++++++++++
 tests/MockAccountData.php                     |  6 ++
 tests/MockUnitData.php                        |  5 ++
 tests/Unit/EntityTest.php                     | 20 ++++-
 .../GeneratesConvertedQuoteCounterTest.php    | 20 +++--
 tests/Unit/PermissionsTest.php                |  4 +
 tests/Unit/RecurringDateTest.php              |  4 -
 tests/Unit/RecurringExpenseCloneTest.php      |  5 ++
 18 files changed, 136 insertions(+), 120 deletions(-)
 delete mode 100644 tests/Feature/Export/ExportCsvTest.php

diff --git a/app/Models/Expense.php b/app/Models/Expense.php
index dccf548c71e..88107688fe9 100644
--- a/app/Models/Expense.php
+++ b/app/Models/Expense.php
@@ -146,12 +146,9 @@ class Expense extends BaseModel
     ];
 
     public static array $bulk_update_columns = [
-        'tax_rate1',
-        'tax_name1',
-        'tax_rate2',
-        'tax_name2',
-        'tax_rate3',
-        'tax_name3',
+        'tax1',
+        'tax2',
+        'tax3',
         'custom_value1',
         'custom_value2',
         'custom_value3',
diff --git a/app/Models/Product.php b/app/Models/Product.php
index 1a96b690df4..3189e5c2836 100644
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -216,7 +216,7 @@ public function markdownNotes()
         return $converter->convert($this->notes ?? '');
     }
 
-    public static function markdownHelp(string $notes = '')
+    public static function markdownHelp(?string $notes = '')
     {
 
         $converter = new CommonMarkConverter([
@@ -226,7 +226,7 @@ public static function markdownHelp(string $notes = '')
             ],
         ]);
 
-        return $converter->convert($notes);
+        return $converter->convert($notes ?? '');
 
     }
 
diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php
index 07972881e03..32111611747 100644
--- a/app/Models/RecurringInvoice.php
+++ b/app/Models/RecurringInvoice.php
@@ -247,12 +247,9 @@ class RecurringInvoice extends BaseModel
     protected $touches = [];
 
     public static array $bulk_update_columns = [
-        'tax_rate1',
-        'tax_name1',
-        'tax_rate2',
-        'tax_name2',
-        'tax_rate3',
-        'tax_name3',
+        'tax1',
+        'tax2',
+        'tax3',
         'custom_value1',
         'custom_value2',
         'custom_value3',
diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php
index 285a42005e0..6deed887b23 100644
--- a/app/Repositories/BaseRepository.php
+++ b/app/Repositories/BaseRepository.php
@@ -396,23 +396,24 @@ protected function alternativeSave($data, $model)
     public function bulkUpdate(\Illuminate\Database\Eloquent\Builder $model, string $column, mixed $new_value): void
     {
         /** Handle taxes being updated */
-        if(in_array($column, ['tax_name1','tax_name2','tax_name3'])) {
+        if(in_array($column, ['tax1','tax2','tax3'])) {
 
             $parts = explode("||", $new_value);
 
             if (count($parts) !== 2)
                 return;
 
-            $tax_name = trim($parts[0]);
+            $tax_name_column = str_replace("tax", "tax_name", $column);
             $rate = filter_var($parts[1], FILTER_VALIDATE_FLOAT);
-
+            $tax_name = $parts[0];
+            
             if ($rate === false)
                 return;
             
-            $taxrate_column = str_replace("name", "rate", $column);
+            $taxrate_column = str_replace("tax", "tax_rate", $column);
 
             $model->update([
-                $column => $tax_name,
+                $tax_name_column => $tax_name,
                 $taxrate_column => $rate,
             ]);
             return;
diff --git a/app/Services/Payment/DeletePayment.php b/app/Services/Payment/DeletePayment.php
index 74973c0f8a4..ae323ed4e5b 100644
--- a/app/Services/Payment/DeletePayment.php
+++ b/app/Services/Payment/DeletePayment.php
@@ -133,11 +133,16 @@ private function adjustInvoices()
 
         //sometimes the payment is NOT created properly, this catches the payment and prevents the paid to date reducing inappropriately.
         if ($this->update_client_paid_to_date) {
+
+            $reduced_paid_to_date = $this->payment->amount < 0 ? $this->payment->amount * -1 : min(0, ($this->payment->amount - $this->payment->refunded - $this->_paid_to_date_deleted) * -1);
+            
+            // $reduced_paid_to_date = min(0, ($this->payment->amount - $this->payment->refunded - $this->_paid_to_date_deleted) * -1);
+
             $this->payment
-            ->client
-            ->service()
-            ->updatePaidToDate(min(0, ($this->payment->amount - $this->payment->refunded - $this->_paid_to_date_deleted) * -1))
-            ->save();
+                ->client
+                ->service()
+                ->updatePaidToDate($reduced_paid_to_date)
+                ->save();
         }
 
         return $this;
diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php
index e4cf16d5d11..b0ba65e404b 100644
--- a/app/Services/Template/TemplateService.php
+++ b/app/Services/Template/TemplateService.php
@@ -124,7 +124,7 @@ private function init(): self
         $this->twig->addFilter($filter);
 
         $allowedTags = ['if', 'for', 'set', 'filter'];
-        $allowedFilters = ['replace', 'escape', 'e', 'upper', 'lower', 'capitalize', 'filter', 'length', 'merge','format_currency', 'format_number','format_percent_number','map', 'join', 'first', 'date', 'sum', 'number_format','nl2br'];
+        $allowedFilters = ['replace', 'escape', 'e', 'upper', 'lower', 'capitalize', 'filter', 'length', 'merge','format_currency', 'format_number','format_percent_number','map', 'join', 'first', 'date', 'sum', 'number_format','nl2br','striptags'];
         $allowedFunctions = ['range', 'cycle', 'constant', 'date',];
         $allowedProperties = ['type_id'];
         $allowedMethods = ['img','t'];
diff --git a/lang/en/texts.php b/lang/en/texts.php
index dc311e2a10a..c0c9d26e70d 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5364,7 +5364,7 @@
     'merged_vendors' => 'Successfully merged vendors',
     'hidden_taxes_warning' => 'Somes taxes are hidden due to current tax settings. :link',
     'tax3' => 'Third Tax',
-
+    'negative_payment_warning' => 'Are you sure you want to create a negative payment? This cannot be used as a credit or payment.'
 );
 
 return $lang;
diff --git a/tests/Feature/ClassificationTest.php b/tests/Feature/ClassificationTest.php
index 4ed072e9283..ba72be59b8b 100644
--- a/tests/Feature/ClassificationTest.php
+++ b/tests/Feature/ClassificationTest.php
@@ -33,7 +33,6 @@ protected function setUp(): void
 
         $this->makeTestData();
 
-
     }
 
     public function testClientClassification()
diff --git a/tests/Feature/ExpenseApiTest.php b/tests/Feature/ExpenseApiTest.php
index bcad510fbb3..5dc9b3b4615 100644
--- a/tests/Feature/ExpenseApiTest.php
+++ b/tests/Feature/ExpenseApiTest.php
@@ -66,7 +66,7 @@ public function testBulkUpdatesTaxes()
         $data = [
             'action' => 'bulk_update',
             'ids' => $expenses->get()->pluck('hashed_id'),
-            'column' => 'tax_name1',
+            'column' => 'tax1',
             'new_value' => 'GST||10',
         ];
 
diff --git a/tests/Feature/Export/ExportCsvTest.php b/tests/Feature/Export/ExportCsvTest.php
deleted file mode 100644
index 977c2d54ac9..00000000000
--- a/tests/Feature/Export/ExportCsvTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://www.elastic.co/licensing/elastic-license
- */
-
-namespace Tests\Feature\Export;
-
-use App\Models\Invoice;
-use App\Utils\Traits\MakesHash;
-use Illuminate\Routing\Middleware\ThrottleRequests;
-use Illuminate\Support\Facades\Storage;
-use League\Csv\Writer;
-use Tests\MockAccountData;
-use Tests\TestCase;
-
-/**
- * 
- */
-class ExportCsvTest extends TestCase
-{
-    use MakesHash;
-    use MockAccountData;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->withoutMiddleware(
-            ThrottleRequests::class
-        );
-
-        $this->makeTestData();
-
-        $this->withoutExceptionHandling();
-    }
-
-    public function testExportCsv()
-    {
-        $csv = Writer::createFromFileObject(new \SplTempFileObject());
-
-        $header_invoice = Invoice::take(10)->get()->toArray();
-        $header_item = $header_invoice[0]['line_items'][0];
-        unset($header_invoice[0]['line_items']);
-
-        $header_invoice_keys = array_keys($header_invoice[0]);
-        $header_item_keys = array_keys((array) $header_item);
-
-        $header_invoice_values = array_values($header_invoice[0]);
-        $header_item_values = array_values((array) $header_item);
-
-        $merged_values = array_merge($header_invoice_values, (array) $header_item_values);
-        $merged_keys = array_merge($header_invoice_keys, (array) $header_item_keys);
-
-        // nlog(print_r($merged_keys, 1));
-        // nlog(print_r($merged_values, 1));
-
-        foreach ($merged_keys as &$key) {
-            $key = ctrans('texts.'.$key);
-        }
-
-        $csv->insertOne($merged_keys);
-
-        foreach (Invoice::take(10)->get() as $invoice) {
-            foreach ($invoice->line_items as $item) {
-                unset($invoice->line_items);
-
-                $csv->insertOne(array_merge($invoice->toArray(), (array) $item));
-            }
-        }
-
-        // Storage::put('invy.csv', $csv->getContent());
-
-        $this->markTestSkipped();
-    }
-}
diff --git a/tests/Feature/PaymentTest.php b/tests/Feature/PaymentTest.php
index 0b44556b6ae..53ae567072b 100644
--- a/tests/Feature/PaymentTest.php
+++ b/tests/Feature/PaymentTest.php
@@ -62,6 +62,64 @@ protected function setUp(): void
         );
     }
 
+    public function testNegativePaymentPaidToDate()
+    {
+        
+        $c = Client::factory()->create([
+           'user_id' => $this->user->id,
+           'company_id' => $this->company->id,
+       ]);
+
+       $this->assertEquals(0, $c->balance);
+       $this->assertEquals(0, $c->paid_to_date);
+       $this->assertEquals(0, $c->credit_balance);
+       $this->assertEquals(0, $c->payment_balance);
+
+        $data = [
+            'amount' => -500,
+            'client_id' => $c->hashed_id,
+            'invoices' => [
+            ],
+            'credits' => [
+            ],
+            'date' => '2020/12/11',
+        ];
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->postJson('/api/v1/payments/', $data);
+
+        $response->assertStatus(200);
+        
+        $p = $response->json()['data'];
+
+        $payment = Payment::find($this->decodePrimaryKey($p['id']));
+
+        $this->assertEquals(-500, $payment->amount);
+        $this->assertEquals(0, $payment->refunded);
+        $this->assertEquals(0, $payment->applied);
+
+        $c = $c->fresh();
+
+        $this->assertEquals(0, $c->balance);
+        $this->assertEquals(-500, $c->paid_to_date);
+        $this->assertEquals(0, $c->credit_balance);
+        $this->assertEquals(0, $c->payment_balance);
+
+        $p = $payment->service()->deletePayment()->save();
+
+        $c = $c->fresh();
+
+        $this->assertEquals(0, $c->balance);
+        $this->assertEquals(0, $c->paid_to_date);
+        $this->assertEquals(0, $c->credit_balance);
+        $this->assertEquals(0, $c->payment_balance);
+
+
+
+    }
+
     public function testNullPaymentAmounts()    
     {
 
diff --git a/tests/MockAccountData.php b/tests/MockAccountData.php
index 20e55c93393..aad8866a89f 100644
--- a/tests/MockAccountData.php
+++ b/tests/MockAccountData.php
@@ -32,6 +32,7 @@
 use App\Models\Company;
 use App\Models\CompanyGateway;
 use App\Models\CompanyToken;
+use App\Models\Country;
 use App\Models\Credit;
 use App\Models\CreditInvitation;
 use App\Models\Expense;
@@ -203,6 +204,10 @@ public function makeTestData()
     {
         config(['database.default' => config('ninja.db.default')]);
 
+        if(Country::count() == 0){
+            Artisan::call('db:seed', ['--force' => true]);
+        }
+
         $this->faker = \Faker\Factory::create();
         $fake_email = $this->faker->email();
 
@@ -339,6 +344,7 @@ public function makeTestData()
             'user_id' => $user_id,
             'company_id' => $this->company->id,
             'currency_id' => 1,
+            // 'country_id' => 840,
         ]);
 
         $vendor_contact = VendorContact::factory()->create([
diff --git a/tests/MockUnitData.php b/tests/MockUnitData.php
index dab18fc9ed3..6b4575af13d 100644
--- a/tests/MockUnitData.php
+++ b/tests/MockUnitData.php
@@ -45,6 +45,11 @@ trait MockUnitData
 
     public function makeTestData()
     {
+        
+        if (\App\Models\Country::count() == 0) {
+            \Illuminate\Support\Facades\Artisan::call('db:seed', ['--force' => true]);
+        }
+
         $this->faker = \Faker\Factory::create();
 
         $this->account = Account::factory()->create();
diff --git a/tests/Unit/EntityTest.php b/tests/Unit/EntityTest.php
index c6b28fdb1c3..5cebbf190f0 100644
--- a/tests/Unit/EntityTest.php
+++ b/tests/Unit/EntityTest.php
@@ -34,7 +34,7 @@
 class EntityTest extends TestCase
 {
     use MockAccountData;
-    use DatabaseTransactions;
+    // use DatabaseTransactions;
 
     public $invoice;
 
@@ -66,6 +66,8 @@ public function testEntityNameResolution()
         $this->assertEquals('InvoiceInvitation', class_basename($entity_type));
 
         $this->assertEquals('InvoiceInvitation', class_basename($invitation));
+
+        $this->invoice->forceDelete();
     }
 
     public function testDocumentRelationExists()
@@ -84,4 +86,20 @@ public function testDocumentRelationExists()
         $this->assertTrue(method_exists(Task::class, 'documents'));
 
     }
+
+    protected function tearDown(): void
+    {
+        
+            
+        // $this->company->company_users->each(function ($company_user) {
+        //     $company_user->user->forceDelete();
+        //     $company_user->forceDelete();
+        // });
+
+        // // Clean up any resources or reset state if necessary
+        // $this->account->delete();
+
+
+        parent::tearDown();
+    }
 }
diff --git a/tests/Unit/GeneratesConvertedQuoteCounterTest.php b/tests/Unit/GeneratesConvertedQuoteCounterTest.php
index 7930bb774a2..5d172e6d009 100644
--- a/tests/Unit/GeneratesConvertedQuoteCounterTest.php
+++ b/tests/Unit/GeneratesConvertedQuoteCounterTest.php
@@ -11,19 +11,20 @@
 
 namespace Tests\Unit;
 
-use App\Models\Account;
+use Tests\TestCase;
+use App\Models\User;
+use App\Models\Quote;
 use App\Models\Client;
-use App\Models\ClientContact;
+use App\Models\Account;
 use App\Models\Company;
+use App\Models\Country;
 use App\Models\Invoice;
-use App\Models\Quote;
-use App\Models\User;
-use App\Utils\Traits\GeneratesConvertedQuoteCounter;
+use App\Models\ClientContact;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Session;
-use Tests\TestCase;
+use App\Utils\Traits\GeneratesConvertedQuoteCounter;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 /**
  * 
@@ -47,6 +48,11 @@ protected function setUp(): void
         Session::start();
         $this->faker = \Faker\Factory::create();
         Model::reguard();
+
+        if (\App\Models\Country::count() == 0) {
+            \Illuminate\Support\Facades\Artisan::call('db:seed', ['--force' => true]);
+        }
+
     }
 
     public function testCounterExtraction()
diff --git a/tests/Unit/PermissionsTest.php b/tests/Unit/PermissionsTest.php
index bf895156b3c..a04b82ef955 100644
--- a/tests/Unit/PermissionsTest.php
+++ b/tests/Unit/PermissionsTest.php
@@ -40,6 +40,10 @@ class PermissionsTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
+        
+        if (\App\Models\Country::count() == 0) {
+            \Illuminate\Support\Facades\Artisan::call('db:seed', ['--force' => true]);
+        }
 
         $this->faker = \Faker\Factory::create();
 
diff --git a/tests/Unit/RecurringDateTest.php b/tests/Unit/RecurringDateTest.php
index 91bc6fd115d..e68a144f680 100644
--- a/tests/Unit/RecurringDateTest.php
+++ b/tests/Unit/RecurringDateTest.php
@@ -50,10 +50,6 @@ public function testDateOverflowsForEndOfMonth()
 
         $this->assertEquals('2022-02-28', $next_month->format('Y-m-d'));
 
-        // $next_month = $today->addMonthNoOverflow();
-
-        // $this->assertEquals('2022-03-31', $next_month->format('Y-m-d'));
-
     }
 
 }
diff --git a/tests/Unit/RecurringExpenseCloneTest.php b/tests/Unit/RecurringExpenseCloneTest.php
index a16e7957a4f..46fa54be8cc 100644
--- a/tests/Unit/RecurringExpenseCloneTest.php
+++ b/tests/Unit/RecurringExpenseCloneTest.php
@@ -33,6 +33,11 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->faker = \Faker\Factory::create();
+        
+        if (\App\Models\Country::count() == 0) {
+            \Illuminate\Support\Facades\Artisan::call('db:seed', ['--force' => true]);
+        }
+
     }
 
     public function testBadBase64String()

From 244d121365d967f6e2d86bbff51d3057f70cf02c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 18 Oct 2024 09:02:58 +1100
Subject: [PATCH 59/81] Fixes for tests

---
 tests/Feature/Export/ReportCsvGenerationTest.php | 8 ++++----
 tests/Feature/RecurringInvoiceTest.php           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/Feature/Export/ReportCsvGenerationTest.php b/tests/Feature/Export/ReportCsvGenerationTest.php
index 5ddddb55f1e..68fe8ccf364 100644
--- a/tests/Feature/Export/ReportCsvGenerationTest.php
+++ b/tests/Feature/Export/ReportCsvGenerationTest.php
@@ -1628,10 +1628,10 @@ public function testPurchaseOrderCsvGeneration()
 
         $csv = $response->body();
 
-        $this->assertEquals('100', $this->getFirstValueByColumn($csv, 'Purchase Order Amount'));
-        $this->assertEquals('50', $this->getFirstValueByColumn($csv, 'Purchase Order Balance'));
-        $this->assertEquals('10', $this->getFirstValueByColumn($csv, 'Purchase Order Discount'));
-        $this->assertEquals('1234', $this->getFirstValueByColumn($csv, 'Purchase Order Number'));
+        $this->assertEquals('100.00', $this->getFirstValueByColumn($csv, 'Purchase Order Amount'));
+        $this->assertEquals('50.00', $this->getFirstValueByColumn($csv, 'Purchase Order Balance'));
+        $this->assertEquals('10.00', $this->getFirstValueByColumn($csv, 'Purchase Order Discount'));
+        $this->assertEquals('1234.00', $this->getFirstValueByColumn($csv, 'Purchase Order Number'));
         $this->assertEquals('Public', $this->getFirstValueByColumn($csv, 'Purchase Order Public Notes'));
         $this->assertEquals('Private', $this->getFirstValueByColumn($csv, 'Purchase Order Private Notes'));
         $this->assertEquals('Terms', $this->getFirstValueByColumn($csv, 'Purchase Order Terms'));
diff --git a/tests/Feature/RecurringInvoiceTest.php b/tests/Feature/RecurringInvoiceTest.php
index 9571a213b60..5acb5dcc23d 100644
--- a/tests/Feature/RecurringInvoiceTest.php
+++ b/tests/Feature/RecurringInvoiceTest.php
@@ -80,7 +80,7 @@ public function testBulkUpdatesTaxes()
         $data = [
             'action' => 'bulk_update',
             'ids' => $ri->get()->pluck('hashed_id'),
-            'column' => 'tax_name1',
+            'column' => 'tax1',
             'new_value' => 'GST||10',
         ];
 

From 3a7825f3e00b124c595699241276a8b98b1c2d1b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 18 Oct 2024 09:45:46 +1100
Subject: [PATCH 60/81] Update client balance after merge

---
 app/Services/Client/Merge.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Services/Client/Merge.php b/app/Services/Client/Merge.php
index bef1bb521c3..eea1a21ab79 100644
--- a/app/Services/Client/Merge.php
+++ b/app/Services/Client/Merge.php
@@ -71,6 +71,9 @@ public function run()
 
         $this->mergable_client->forceDelete();
 
+        $this->client->credit_balance = $this->client->service()->getCreditBalance();
+        $this->saveQuietly();
+
         return $this->client;
     }
 

From 8764a4e4c0c53765552a55a023eb479519bd65cc Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 18 Oct 2024 10:27:45 +1100
Subject: [PATCH 61/81] minor fixeS

---
 app/Repositories/UserRepository.php | 2 +-
 app/Services/Client/Merge.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php
index d155c133bd3..0d13387fc36 100644
--- a/app/Repositories/UserRepository.php
+++ b/app/Repositories/UserRepository.php
@@ -72,7 +72,7 @@ public function save(array $data, User $user, $unset_company_user = false, $is_m
             $user->confirmation_code = $this->createDbHash($company->db);
         }
 
-        $user->account_id = $account->id;
+        $user->account_id = $account->id;//@todo we should never change the account_id if it is set at this point.
 
         if (strlen($user->password) >= 1) {
             $user->has_password = true;
diff --git a/app/Services/Client/Merge.php b/app/Services/Client/Merge.php
index eea1a21ab79..9ccc065d937 100644
--- a/app/Services/Client/Merge.php
+++ b/app/Services/Client/Merge.php
@@ -72,7 +72,7 @@ public function run()
         $this->mergable_client->forceDelete();
 
         $this->client->credit_balance = $this->client->service()->getCreditBalance();
-        $this->saveQuietly();
+        $this->client->saveQuietly();
 
         return $this->client;
     }

From 95e6ed49de689b37d9beaaab0981e0494bd5eea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Fri, 18 Oct 2024 16:54:16 +0200
Subject: [PATCH 62/81] update translations

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

diff --git a/lang/en/texts.php b/lang/en/texts.php
index 39576276d08..f431a9532e8 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5363,6 +5363,8 @@
     'log_duration' => 'Time log duration',
     'payment_status_changed' => 'Please note that the status of your payment has been updated. We recommend refreshing the page to view the most current version.',
     'credit_status_changed' => 'Please note that the status of your credit has been updated. We recommend refreshing the page to view the most current version.',
+    'credit_updated' => 'Credit Updated',
+    'payment_updated' => 'Payment Updated',
 );
 
 return $lang;

From e1da6c1ead6f3129e137462dd2c86d83b9b9ffd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Fri, 18 Oct 2024 18:32:42 +0200
Subject: [PATCH 63/81] default resource broadcast

---
 ...dcast.php => DefaultResourceBroadcast.php} | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)
 rename app/Utils/Traits/Invoice/Broadcasting/{DefaultInvoiceBroadcast.php => DefaultResourceBroadcast.php} (58%)

diff --git a/app/Utils/Traits/Invoice/Broadcasting/DefaultInvoiceBroadcast.php b/app/Utils/Traits/Invoice/Broadcasting/DefaultResourceBroadcast.php
similarity index 58%
rename from app/Utils/Traits/Invoice/Broadcasting/DefaultInvoiceBroadcast.php
rename to app/Utils/Traits/Invoice/Broadcasting/DefaultResourceBroadcast.php
index ce333637776..50c88371fa3 100644
--- a/app/Utils/Traits/Invoice/Broadcasting/DefaultInvoiceBroadcast.php
+++ b/app/Utils/Traits/Invoice/Broadcasting/DefaultResourceBroadcast.php
@@ -12,12 +12,13 @@
 
 namespace App\Utils\Traits\Invoice\Broadcasting;
 
+use App\Models\BaseModel;
 use App\Transformers\ArraySerializer;
 use Illuminate\Broadcasting\PrivateChannel;
 use League\Fractal\Manager;
 use League\Fractal\Resource\Item;
 
-trait DefaultInvoiceBroadcast
+trait DefaultResourceBroadcast
 {
     public function broadcastOn(): array
     {
@@ -26,17 +27,40 @@ public function broadcastOn(): array
         ];
     }
 
+    public function broadcastModel(): BaseModel
+    {
+        throw new \LogicException('Make sure to pass a model to the broadcastModel method.');
+    }
+
+    public function broadcastManager(Manager $manager): Manager
+    {
+        return $manager;
+    }
+
     public function broadcastWith(): array
     {
+        $entity = $this->broadcastModel();
+
         $manager = new Manager();
+
         $manager->setSerializer(new ArraySerializer());
-        $class = sprintf('App\\Transformers\\%sTransformer', class_basename($this->invoice));
+
+        $class = sprintf('App\\Transformers\\%sTransformer', class_basename($entity));
 
         $transformer = new $class();
 
-        $resource = new Item($this->invoice, $transformer, $this->invoice->getEntityType());
+        $resource = new Item($entity, $transformer, $entity->getEntityType());
+
+        $manager = $this->broadcastManager($manager);
+
         $data = $manager->createData($resource)->toArray();
 
-        return [...$data, 'x-socket-id' => $this->socket];
+        $data = [...$data];
+
+        if (\property_exists($this, 'socket')) {
+            $data['x-socket-id'] = $this->socket;
+        }
+
+        return $data;
     }
 }

From 81971bf195f79960e045d6b78b2088c5e16c7e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Fri, 18 Oct 2024 18:32:50 +0200
Subject: [PATCH 64/81] update credit was created

---
 app/Events/Credit/CreditWasCreated.php | 33 ++++----------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/app/Events/Credit/CreditWasCreated.php b/app/Events/Credit/CreditWasCreated.php
index 93a7fbeed17..0824b4d7d12 100644
--- a/app/Events/Credit/CreditWasCreated.php
+++ b/app/Events/Credit/CreditWasCreated.php
@@ -11,22 +11,21 @@
 
 namespace App\Events\Credit;
 
+use App\Models\BaseModel;
 use App\Models\Company;
 use App\Models\Credit;
+use App\Utils\Traits\Invoice\Broadcasting\DefaultResourceBroadcast;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
-use League\Fractal\Manager;
-use App\Transformers\ArraySerializer;
-use League\Fractal\Resource\Item;
 
 class CreditWasCreated implements ShouldBroadcast
 {
     use Dispatchable;
     use InteractsWithSockets;
     use SerializesModels;
+    use DefaultResourceBroadcast;
 
     public $credit;
 
@@ -50,30 +49,8 @@ public function __construct(Credit $credit, Company $company, array $event_vars)
         $this->dontBroadcastToCurrentUser();
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function broadcastOn() 
-    {
-        return [
-            new PrivateChannel("company-{$this->company->company_key}"),
-        ];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function broadcastWith(): array
+    public function broadcastModel(): BaseModel
     {
-        $manager = new Manager();
-        $manager->setSerializer(new ArraySerializer());
-        $class = sprintf('App\\Transformers\\%sTransformer', class_basename($this->credit));
-
-        $transformer = new $class();
-
-        $resource = new Item($this->credit, $transformer, $this->credit->getEntityType());
-        $data = $manager->createData($resource)->toArray();
-
-        return [...$data, 'x-socket-id' => $this->socket];
+        return $this->credit;
     }
 }

From cbb6afb0ba736542fd2dd75b67e17be582d8a63a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Fri, 18 Oct 2024 18:33:14 +0200
Subject: [PATCH 65/81] update credit was updated

---
 app/Events/Credit/CreditWasUpdated.php | 35 +++++---------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/app/Events/Credit/CreditWasUpdated.php b/app/Events/Credit/CreditWasUpdated.php
index 977220b1d29..0753a6379f6 100644
--- a/app/Events/Credit/CreditWasUpdated.php
+++ b/app/Events/Credit/CreditWasUpdated.php
@@ -11,22 +11,21 @@
 
 namespace App\Events\Credit;
 
+use App\Models\BaseModel;
 use App\Models\Company;
 use App\Models\Credit;
+use App\Utils\Traits\Invoice\Broadcasting\DefaultResourceBroadcast;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
-use League\Fractal\Manager;
-use App\Transformers\ArraySerializer;
-use League\Fractal\Resource\Item;
 
 class CreditWasUpdated implements ShouldBroadcast
 {
     use Dispatchable;
     use InteractsWithSockets;
     use SerializesModels;
+    use DefaultResourceBroadcast;
 
     public $credit;
 
@@ -49,31 +48,9 @@ public function __construct(Credit $credit, Company $company, array $event_vars)
 
         $this->dontBroadcastToCurrentUser();
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function broadcastOn() 
+    
+    public function broadcastModel(): BaseModel
     {
-        return [
-            new PrivateChannel("company-{$this->company->company_key}"),
-        ];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function broadcastWith(): array
-    {
-        $manager = new Manager();
-        $manager->setSerializer(new ArraySerializer());
-        $class = sprintf('App\\Transformers\\%sTransformer', class_basename($this->credit));
-
-        $transformer = new $class();
-
-        $resource = new Item($this->credit, $transformer, $this->credit->getEntityType());
-        $data = $manager->createData($resource)->toArray();
-
-        return [...$data, 'x-socket-id' => $this->socket];
+        return $this->credit;
     }
 }

From 35a1cd2bf8340a9925316d368b1d7d531cd07914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Fri, 18 Oct 2024 18:33:20 +0200
Subject: [PATCH 66/81] update invoice was paid

---
 app/Events/Invoice/InvoiceWasPaid.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Events/Invoice/InvoiceWasPaid.php b/app/Events/Invoice/InvoiceWasPaid.php
index 5bd858aa9bb..1897ca5f7c1 100644
--- a/app/Events/Invoice/InvoiceWasPaid.php
+++ b/app/Events/Invoice/InvoiceWasPaid.php
@@ -12,10 +12,11 @@
 
 namespace App\Events\Invoice;
 
+use App\Models\BaseModel;
 use App\Models\Company;
 use App\Models\Invoice;
 use App\Models\Payment;
-use App\Utils\Traits\Invoice\Broadcasting\DefaultInvoiceBroadcast;
+use App\Utils\Traits\Invoice\Broadcasting\DefaultResourceBroadcast;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Queue\SerializesModels;
@@ -25,7 +26,7 @@
  */
 class InvoiceWasPaid implements ShouldBroadcast
 {
-    use SerializesModels, DefaultInvoiceBroadcast, InteractsWithSockets;
+    use SerializesModels, DefaultResourceBroadcast, InteractsWithSockets;
 
     /**
      * Create a new event instance.
@@ -39,4 +40,9 @@ public function __construct(public Invoice $invoice, public Payment $payment, pu
     {
         $this->dontBroadcastToCurrentUser();
     }
+
+    public function broadcastModel(): BaseModel
+    {
+        return $this->invoice;
+    }
 }

From 439af5aa4254f4f823b088ead06f663200312220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Fri, 18 Oct 2024 18:33:25 +0200
Subject: [PATCH 67/81] update invoice was viewed

---
 app/Events/Invoice/InvoiceWasViewed.php | 26 +++++++------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/app/Events/Invoice/InvoiceWasViewed.php b/app/Events/Invoice/InvoiceWasViewed.php
index 378628bf17d..2ea510516d5 100644
--- a/app/Events/Invoice/InvoiceWasViewed.php
+++ b/app/Events/Invoice/InvoiceWasViewed.php
@@ -11,15 +11,14 @@
 
 namespace App\Events\Invoice;
 
+use App\Models\BaseModel;
 use App\Models\Company;
 use App\Models\InvoiceInvitation;
+use App\Utils\Traits\Invoice\Broadcasting\DefaultResourceBroadcast;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Queue\SerializesModels;
 use League\Fractal\Manager;
-use App\Transformers\ArraySerializer;
-use League\Fractal\Resource\Item;
 
 /**
  * Class InvoiceWasViewed.
@@ -28,6 +27,7 @@ class InvoiceWasViewed implements ShouldBroadcast
 {
     use SerializesModels;
     use InteractsWithSockets;
+    use DefaultResourceBroadcast;
 
     /**
      * Create a new event instance.
@@ -41,27 +41,15 @@ public function __construct(public InvoiceInvitation $invitation, public Company
         //
     }
 
-    public function broadcastOn(): array
+    public function broadcastModel(): BaseModel
     {
-        return [
-            new PrivateChannel("company-{$this->company->company_key}"),
-        ];
+        return $this->invitation->invoice;
     }
 
-    public function broadcastWith(): array
+    public function broadcastManager(Manager $manager): Manager
     {
-        $manager = new Manager();
-        $manager->setSerializer(new ArraySerializer());
-        $class = sprintf('App\\Transformers\\%sTransformer', class_basename($this->invitation->invoice));
-
-        $transformer = new $class();
-
-        $resource = new Item($this->invitation->invoice, $transformer, $this->invitation->invoice->getEntityType());
-
         $manager->parseIncludes('client');
 
-        $data = $manager->createData($resource)->toArray();
-
-        return $data;
+        return $manager;
     }
 }

From 397dd5dee7b81c716b616af889d9088c3a6a4777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Fri, 18 Oct 2024 18:33:30 +0200
Subject: [PATCH 68/81] update payment was updated

---
 app/Events/Payment/PaymentWasUpdated.php | 28 +++++-------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/app/Events/Payment/PaymentWasUpdated.php b/app/Events/Payment/PaymentWasUpdated.php
index 114c1357d66..66dc574059d 100644
--- a/app/Events/Payment/PaymentWasUpdated.php
+++ b/app/Events/Payment/PaymentWasUpdated.php
@@ -11,22 +11,20 @@
 
 namespace App\Events\Payment;
 
+use App\Models\BaseModel;
 use App\Models\Company;
 use App\Models\Payment;
-use App\Transformers\ArraySerializer;
+use App\Utils\Traits\Invoice\Broadcasting\DefaultResourceBroadcast;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Queue\SerializesModels;
-use League\Fractal\Manager;
-use League\Fractal\Resource\Item;
 
 /**
  * Class PaymentWasUpdated.
  */
 class PaymentWasUpdated implements ShouldBroadcast
 {
-    use SerializesModels, InteractsWithSockets;
+    use SerializesModels, InteractsWithSockets, DefaultResourceBroadcast;
 
     /**
      * @var Payment
@@ -53,24 +51,8 @@ public function __construct(Payment $payment, Company $company, array $event_var
         $this->dontBroadcastToCurrentUser();
     }
 
-    public function broadcastOn(): array
+    public function broadcastModel(): BaseModel
     {
-        return [
-            new PrivateChannel("company-{$this->company->company_key}"),
-        ];
-    }
-
-    public function broadcastWith(): array
-    {
-        $manager = new Manager();
-        $manager->setSerializer(new ArraySerializer());
-        $class = sprintf('App\\Transformers\\%sTransformer', class_basename($this->payment));
-
-        $transformer = new $class();
-
-        $resource = new Item($this->payment, $transformer, $this->payment->getEntityType());
-        $data = $manager->createData($resource)->toArray();
-
-        return [...$data, 'x-socket-id' => $this->socket];
+        return $this->payment;
     }
 }

From 5de5c34b1635d6d55979fbb6d7d3b330f76a2b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Fri, 18 Oct 2024 18:52:59 +0200
Subject: [PATCH 69/81] update translations

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

diff --git a/lang/en/texts.php b/lang/en/texts.php
index 6089824a10e..75936e824dd 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5360,7 +5360,8 @@
     'vat_not_registered' => 'Seller not VAT registered',
     'small_company_info' => 'No disclosure of sales tax in accordance with § 19 UStG',
     'log_duration_words' => 'Time log duration in words',
-    'log_duration' => 'Time log duration'
+    'log_duration' => 'Time log duration',
+    'search_placeholder' => 'Find invoices, clients, and more'
 );
 
 return $lang;

From c81bb8e22f4a16bf25d22b062c7b9fbde3d5c182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Fri, 18 Oct 2024 18:53:09 +0200
Subject: [PATCH 70/81] add comma

---
 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 75936e824dd..4948c06c903 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5361,7 +5361,7 @@
     'small_company_info' => 'No disclosure of sales tax in accordance with § 19 UStG',
     'log_duration_words' => 'Time log duration in words',
     'log_duration' => 'Time log duration',
-    'search_placeholder' => 'Find invoices, clients, and more'
+    'search_placeholder' => 'Find invoices, clients, and more',
 );
 
 return $lang;

From 0745dfaa3d17b01760b6c91e7513fb966e717e45 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 19 Oct 2024 09:32:06 +1100
Subject: [PATCH 71/81] Add amount filters for expense

---
 app/Filters/ExpenseFilters.php                |  9 +++
 app/Transformers/ExpenseTransformer.php       | 13 +++++
 .../2024_10_18_211558_updated_currencies.php  | 56 +++++++++++++++++++
 database/seeders/CurrenciesSeeder.php         | 19 +++++++
 lang/en/texts.php                             | 20 ++++++-
 lang/fr_CA/texts.php                          |  3 +-
 lang/nl/texts.php                             |  7 ++-
 lang/vi/texts.php                             |  3 +-
 8 files changed, 124 insertions(+), 6 deletions(-)
 create mode 100644 database/migrations/2024_10_18_211558_updated_currencies.php

diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php
index fa7f71ff7f0..d181cc9e911 100644
--- a/app/Filters/ExpenseFilters.php
+++ b/app/Filters/ExpenseFilters.php
@@ -177,6 +177,15 @@ public function categories(string $categories = ''): Builder
         return $this->builder->whereIn('category_id', $categories_keys);
     }
 
+    public function amount(string $amount = ''): Builder
+    {
+        if (strlen($amount) == 0) {
+            return $this->builder;
+        }
+
+        return $this->builder->where('amount', $amount);
+    }
+
     public function number(string $number = ''): Builder
     {
         if (strlen($number) == 0) {
diff --git a/app/Transformers/ExpenseTransformer.php b/app/Transformers/ExpenseTransformer.php
index e8e130e2ec1..8dae337f1db 100644
--- a/app/Transformers/ExpenseTransformer.php
+++ b/app/Transformers/ExpenseTransformer.php
@@ -16,6 +16,7 @@
 use App\Models\Expense;
 use App\Models\ExpenseCategory;
 use App\Models\Invoice;
+use App\Models\Project;
 use App\Models\Vendor;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -41,6 +42,7 @@ class ExpenseTransformer extends EntityTransformer
         'vendor',
         'category',
         'invoice',
+        'project',
     ];
 
     public function includeDocuments(Expense $expense)
@@ -50,6 +52,17 @@ public function includeDocuments(Expense $expense)
         return $this->includeCollection($expense->documents, $transformer, Document::class);
     }
 
+    public function includeProject(Expense $expense): ?Item
+    {
+        $transformer = new ProjectTransformer($this->serializer);
+
+        if (!$expense->project) {
+            return null;
+        }
+
+        return $this->includeItem($expense->project, $transformer, Project::class);
+    }
+
     public function includeClient(Expense $expense): ?Item
     {
         $transformer = new ClientTransformer($this->serializer);
diff --git a/database/migrations/2024_10_18_211558_updated_currencies.php b/database/migrations/2024_10_18_211558_updated_currencies.php
new file mode 100644
index 00000000000..5c1c5b2aff4
--- /dev/null
+++ b/database/migrations/2024_10_18_211558_updated_currencies.php
@@ -0,0 +1,56 @@
+<?php
+
+use App\Models\Currency;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        
+        Model::unguard();
+
+        $currencies = [
+            ['id' => 124, 'name' => 'Bermudian Dollar', 'code' => 'BMD', 'symbol' => '$', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 125, 'name' => 'Central African CFA Franc', 'code' => 'XAF', 'symbol' => 'Fr', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 126, 'name' => 'Congolese Franc', 'code' => 'CDF', 'symbol' => 'Fr', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 127, 'name' => 'Djiboutian Franc', 'code' => 'DJF', 'symbol' => 'Fr', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 128, 'name' => 'Eritrean Nakfa', 'code' => 'ERN', 'symbol' => 'Nfk', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 129, 'name' => 'Falkland Islands Pound', 'code' => 'FKP', 'symbol' => '£', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 130, 'name' => 'Guinean Franc', 'code' => 'GNF', 'symbol' => 'Fr', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => ''],
+            ['id' => 131, 'name' => 'Iraqi Dinar', 'code' => 'IQD', 'symbol' => 'ع.د', 'precision' => '3', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 132, 'name' => 'Lesotho Loti', 'code' => 'LSL', 'symbol' => 'L', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 133, 'name' => 'Mongolian Tugrik', 'code' => 'MNT', 'symbol' => '₮', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 134, 'name' => 'Seychellois Rupee', 'code' => 'SCR', 'symbol' => '₨', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 135, 'name' => 'Solomon Islands Dollar', 'code' => 'SBD', 'symbol' => '$', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 136, 'name' => 'Somali Shilling', 'code' => 'SOS', 'symbol' => 'Sh', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 137, 'name' => 'South Sudanese Pound', 'code' => 'SSP', 'symbol' => '£', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 138, 'name' => 'Sudanese Pound', 'code' => 'SDG', 'symbol' => '£', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 139, 'name' => 'Tajikistani Somoni', 'code' => 'TJS', 'symbol' => 'ЅM', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 140, 'name' => 'Turkmenistani Manat', 'code' => 'TMT', 'symbol' => 'T', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 141, 'name' => 'Uzbekistani Som', 'code' => 'UZS', 'symbol' => 'so\'m', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+        ];
+
+        foreach ($currencies as $currency) {
+            $record = Currency::where('code', $currency['code'])->first();
+            if (!$record) {
+                Currency::create($currency);
+            }
+        }
+
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        //
+    }
+};
diff --git a/database/seeders/CurrenciesSeeder.php b/database/seeders/CurrenciesSeeder.php
index 34000a4c18b..0edf1d2fd53 100644
--- a/database/seeders/CurrenciesSeeder.php
+++ b/database/seeders/CurrenciesSeeder.php
@@ -146,6 +146,25 @@ public function run()
             ['id' => 121, 'name' => "Lao kip", 'code' => 'LAK', 'symbol' => '₭', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['id' => 122, 'name' => "Bhutan Ngultrum", 'code' => 'BTN', 'symbol' => 'Nu', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['id' => 123, 'name' => "Mauritanian Ouguiya", 'code' => 'MRU', 'symbol' => 'UM', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 124, 'name' => 'Bermudian Dollar', 'code' => 'BMD', 'symbol' => '$', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 125, 'name' => 'Central African CFA Franc', 'code' => 'XAF', 'symbol' => 'Fr', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 126, 'name' => 'Congolese Franc', 'code' => 'CDF', 'symbol' => 'Fr', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 127, 'name' => 'Djiboutian Franc', 'code' => 'DJF', 'symbol' => 'Fr', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 128, 'name' => 'Eritrean Nakfa', 'code' => 'ERN', 'symbol' => 'Nfk', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 129, 'name' => 'Falkland Islands Pound', 'code' => 'FKP', 'symbol' => '£', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 130, 'name' => 'Guinean Franc', 'code' => 'GNF', 'symbol' => 'Fr', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => ''],
+            ['id' => 131, 'name' => 'Iraqi Dinar', 'code' => 'IQD', 'symbol' => 'ع.د', 'precision' => '3', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 132, 'name' => 'Lesotho Loti', 'code' => 'LSL', 'symbol' => 'L', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 133, 'name' => 'Mongolian Tugrik', 'code' => 'MNT', 'symbol' => '₮', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 134, 'name' => 'Seychellois Rupee', 'code' => 'SCR', 'symbol' => '₨', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 135, 'name' => 'Solomon Islands Dollar', 'code' => 'SBD', 'symbol' => '$', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 136, 'name' => 'Somali Shilling', 'code' => 'SOS', 'symbol' => 'Sh', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 137, 'name' => 'South Sudanese Pound', 'code' => 'SSP', 'symbol' => '£', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 138, 'name' => 'Sudanese Pound', 'code' => 'SDG', 'symbol' => '£', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 139, 'name' => 'Tajikistani Somoni', 'code' => 'TJS', 'symbol' => 'ЅM', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 140, 'name' => 'Turkmenistani Manat', 'code' => 'TMT', 'symbol' => 'T', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 141, 'name' => 'Uzbekistani Som', 'code' => 'UZS', 'symbol' => 'so\'m', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+
         ];
 
         foreach ($currencies as $currency) {
diff --git a/lang/en/texts.php b/lang/en/texts.php
index c0c9d26e70d..c2bda30257d 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -5364,7 +5364,25 @@
     'merged_vendors' => 'Successfully merged vendors',
     'hidden_taxes_warning' => 'Somes taxes are hidden due to current tax settings. :link',
     'tax3' => 'Third Tax',
-    'negative_payment_warning' => 'Are you sure you want to create a negative payment? This cannot be used as a credit or payment.'
+    'negative_payment_warning' => 'Are you sure you want to create a negative payment? This cannot be used as a credit or payment.',
+    'currency_Bermudian_Dollar' => 'Bermudian Dollar',
+    'currency_Central_African_CFA_Franc' => 'Central African CFA Franc',
+    'currency_Congolese_Franc' => 'Congolese Franc',
+    'currency_Djiboutian_Franc' => 'Djiboutian Franc',
+    'currency_Eritrean_Nakfa' => 'Eritrean Nakfa',
+    'currency_Falkland_Islands_Pound' => 'Falklan IslandsPound',
+    'currency_Guinean_Franc' => 'Guinean Franc',
+    'currency_Iraqi_Dinar' => 'Iraqi Dinar',
+    'currency_Lesotho_Loti' => 'Lesotho Loti',
+    'currency_Mongolian_Tugrik' => 'Mongolian Tugrik',
+    'currency_Seychellois_Rupee' => 'Seychellois Rupee',
+    'currency_Solomon_Islands_Dollar' => 'Solomon Islands Dollar',
+    'currency_Somali_Shilling' => 'Somali Shilling',
+    'currency_South_Sudanese_Pound' => 'South Sudanese Pound',
+    'currency_Sudanese_Pound' => 'Sudanese Pound',
+    'currency_Tajikistani_Somoni' => 'Tajikistani Somoni',
+    'currency_Turkmenistani_Manat' => 'Turkmenistani Manat',
+    'currency_Uzbekistani_Som' => 'Uzbekistani Som',
 );
 
 return $lang;
diff --git a/lang/fr_CA/texts.php b/lang/fr_CA/texts.php
index 0729cb34b35..945247dc703 100644
--- a/lang/fr_CA/texts.php
+++ b/lang/fr_CA/texts.php
@@ -5357,7 +5357,8 @@
     'updated_records' => 'Enregistrements mis à jour',
     'vat_not_registered' => 'Vendeur non enregistré aux taxes',
     'small_company_info' => 'Aucune déclaration de taxe de vente conformément à l\'article 19 UStG',
-    'log_duration_words' => 'Durée du journal en mots'
+    'log_duration_words' => 'Durée du journal de temps exprimée en mots',
+    'log_duration' => 'Durée du journal de temps'
 );
 
 return $lang;
diff --git a/lang/nl/texts.php b/lang/nl/texts.php
index d6ed5a8a4a8..5f490ab68a7 100644
--- a/lang/nl/texts.php
+++ b/lang/nl/texts.php
@@ -5357,9 +5357,10 @@
     'quick_actions' => 'Snelle acties',
     'end_all_sessions_help' => 'Logt alle gebruikers uit en vereist dat alle actieve gebruikers opnieuw inloggen.',
     'updated_records' => 'Items bijgewerkt',
-    'vat_not_registered' => 'Seller not VAT registered',
-    'small_company_info' => 'No disclosure of sales tax in accordance with § 19 UStG',
-    'log_duration_words' => 'Log duration in words'
+    'vat_not_registered' => 'Verkoper is niet btw-plichtig',
+    'small_company_info' => 'Geen openbaarmaking van omzetbelasting in overeenstemming met § 19 UStG',
+    'log_duration_words' => 'Maximale lengte logboek in woorden',
+    'log_duration' => 'Maximale lengte logboek'
 );
 
 return $lang;
diff --git a/lang/vi/texts.php b/lang/vi/texts.php
index 88220cd7be8..e82274fa8ff 100644
--- a/lang/vi/texts.php
+++ b/lang/vi/texts.php
@@ -5359,7 +5359,8 @@
     'updated_records' => 'Hồ sơ đã cập nhật',
     'vat_not_registered' => 'Người bán không đăng ký VAT',
     'small_company_info' => 'Không tiết lộ thuế bán hàng theo § 19 UStG',
-    'log_duration_words' => 'Thời lượng ghi nhật ký bằng từ'
+    'log_duration_words' => 'Thời gian ghi nhật ký bằng từ',
+    'log_duration' => 'Thời gian ghi nhật ký'
 );
 
 return $lang;

From dc25dbd39adacedda60d367ca0e50453e42c658d Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 19 Oct 2024 10:22:09 +1100
Subject: [PATCH 72/81] Additional logging for license keys

---
 app/Http/Controllers/LicenseController.php   | 14 +++++++++++++-
 app/Http/Middleware/CheckClientExistence.php |  1 -
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/LicenseController.php b/app/Http/Controllers/LicenseController.php
index 079d31c4e96..b4d7686fdde 100644
--- a/app/Http/Controllers/LicenseController.php
+++ b/app/Http/Controllers/LicenseController.php
@@ -83,6 +83,11 @@ public function index()
     {
         $this->checkLicense();
 
+        nlog("License Check::");
+        nlog(config('ninja.environment'));
+        nlog(request()->has('license_key'));
+        nlog(request()->input('license_key','No License Found'));
+
         /* Catch claim license requests */
         if (config('ninja.environment') == 'selfhost' && request()->has('license_key')) {
             $license_key = trim(request()->input('license_key'));
@@ -144,6 +149,8 @@ public function index()
             }
         }
 
+        nlog("No license key or environment not set to selfhost");
+        
         $error = [
             'message' => ctrans('texts.invoice_license_or_environment', ['environment' => config('ninja.environment')]),
             'errors' => new stdClass(),
@@ -156,8 +163,11 @@ public function v5ClaimLicense(string $license_key)
     {
         $this->checkLicense();
 
-        /* Catch claim license requests */
+        /* Catch claim license requests */ 
         if (config('ninja.environment') == 'selfhost') {
+
+            nlog("Claiming v5 license");
+
             $response = Http::get("https://invoicing.co/claim_license", [
                 'license_key' => $license_key,
                 'product_id' => 3,
@@ -189,6 +199,8 @@ public function v5ClaimLicense(string $license_key)
             }
         }
 
+        nlog("Environment not set to selfhost - failing");
+
         $error = [
             'message' => ctrans('texts.invoice_license_or_environment', ['environment' => config('ninja.environment')]),
             'errors' => new stdClass(),
diff --git a/app/Http/Middleware/CheckClientExistence.php b/app/Http/Middleware/CheckClientExistence.php
index 33ed398664e..ded0b517ae0 100644
--- a/app/Http/Middleware/CheckClientExistence.php
+++ b/app/Http/Middleware/CheckClientExistence.php
@@ -35,7 +35,6 @@ public function handle(Request $request, Closure $next)
         auth()->guard('contact')->user()->loadMissing(['company']); // @phpstan-ignore method.notFound
 
         $multiple_contacts = ClientContact::query()
-            // ->with('client.gateway_tokens', 'company')
             ->where('email', auth()->guard('contact')->user()->email)
             ->whereNotNull('email')
             ->where('email', '<>', '')

From 8a2d015b62de2945387e37b4bb49e8f462a3eaa7 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 19 Oct 2024 10:24:27 +1100
Subject: [PATCH 73/81] v5.10.41

---
 VERSION.txt                                | 2 +-
 app/Http/Controllers/LicenseController.php | 8 ++++++--
 config/ninja.php                           | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 1684db4d471..b37f7dad19c 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.10.40
\ No newline at end of file
+5.10.41
\ No newline at end of file
diff --git a/app/Http/Controllers/LicenseController.php b/app/Http/Controllers/LicenseController.php
index b4d7686fdde..07ce6ae3789 100644
--- a/app/Http/Controllers/LicenseController.php
+++ b/app/Http/Controllers/LicenseController.php
@@ -150,7 +150,7 @@ public function index()
         }
 
         nlog("No license key or environment not set to selfhost");
-        
+
         $error = [
             'message' => ctrans('texts.invoice_license_or_environment', ['environment' => config('ninja.environment')]),
             'errors' => new stdClass(),
@@ -173,8 +173,12 @@ public function v5ClaimLicense(string $license_key)
                 'product_id' => 3,
             ]);
 
+            $payload = $response->json();
+
+            nlog("Ninja Server Response");
+            nlog($payload);
+
             if ($response->successful()) {
-                $payload = $response->json();
 
                 $account = auth()->user()->account;
 
diff --git a/config/ninja.php b/config/ninja.php
index 6c9fb6ae4af..d2c15217a73 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,8 @@
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.10.40'),
-    'app_tag' => env('APP_TAG', '5.10.40'),
+    'app_version' => env('APP_VERSION', '5.10.41'),
+    'app_tag' => env('APP_TAG', '5.10.41'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),

From 4e869810743ec03ba21e91fb423bd6b051348f94 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 19 Oct 2024 10:49:40 +1100
Subject: [PATCH 74/81] fixes for tests

---
 .../Export/ReportCsvGenerationTest.php        | 61 ++++++++++---------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/tests/Feature/Export/ReportCsvGenerationTest.php b/tests/Feature/Export/ReportCsvGenerationTest.php
index 68fe8ccf364..928bbec227d 100644
--- a/tests/Feature/Export/ReportCsvGenerationTest.php
+++ b/tests/Feature/Export/ReportCsvGenerationTest.php
@@ -191,6 +191,7 @@ protected function setUp(): void
      */
     private function buildData()
     {
+        /** @var \App\Models\Account $account */
         $this->account = Account::factory()->create([
             'hosted_client_count' => 1000,
             'hosted_company_count' => 1000,
@@ -314,7 +315,7 @@ public function testForcedInsertionOfMandatoryColumns()
         $report_keys = ['invoice.number','invoice.amount'];
         $array = array_merge($report_keys, array_diff($forced, $report_keys));
 
-        $this->assertEquals('client.name', $array[2]);
+        $this->assertEquals('client.name', $array[2]); //@phpstan-ignore-line
 
     }
 
@@ -1631,7 +1632,7 @@ public function testPurchaseOrderCsvGeneration()
         $this->assertEquals('100.00', $this->getFirstValueByColumn($csv, 'Purchase Order Amount'));
         $this->assertEquals('50.00', $this->getFirstValueByColumn($csv, 'Purchase Order Balance'));
         $this->assertEquals('10.00', $this->getFirstValueByColumn($csv, 'Purchase Order Discount'));
-        $this->assertEquals('1234.00', $this->getFirstValueByColumn($csv, 'Purchase Order Number'));
+        $this->assertEquals('1234', $this->getFirstValueByColumn($csv, 'Purchase Order Number'));
         $this->assertEquals('Public', $this->getFirstValueByColumn($csv, 'Purchase Order Public Notes'));
         $this->assertEquals('Private', $this->getFirstValueByColumn($csv, 'Purchase Order Private Notes'));
         $this->assertEquals('Terms', $this->getFirstValueByColumn($csv, 'Purchase Order Terms'));
@@ -1762,8 +1763,8 @@ public function testQuoteCustomColumnsCsvGeneration()
 
 
         $this->assertEquals('bob', $this->getFirstValueByColumn($csv, 'Client Name'));
-        $this->assertEquals('1234', $this->getFirstValueByColumn($csv, 'Quote Number'));
-        $this->assertEquals('100', $this->getFirstValueByColumn($csv, 'Quote Amount'));
+        $this->assertEquals(floatval(1234), $this->getFirstValueByColumn($csv, 'Quote Number'));
+        $this->assertEquals(floatval(100), $this->getFirstValueByColumn($csv, 'Quote Amount'));
 
 
         $data = [
@@ -1935,9 +1936,9 @@ public function testCreditCsvGeneration()
         $csv = $response->body();
 
 
-        $this->assertEquals('100', $this->getFirstValueByColumn($csv, 'Credit Amount'));
-        $this->assertEquals('50', $this->getFirstValueByColumn($csv, 'Credit Balance'));
-        $this->assertEquals('10', $this->getFirstValueByColumn($csv, 'Credit Discount'));
+        $this->assertEquals(floatval(100), $this->getFirstValueByColumn($csv, 'Credit Amount'));
+        $this->assertEquals(floatval(50), $this->getFirstValueByColumn($csv, 'Credit Balance'));
+        $this->assertEquals(floatval(10), $this->getFirstValueByColumn($csv, 'Credit Discount'));
         $this->assertEquals('1234', $this->getFirstValueByColumn($csv, 'Credit PO Number'));
         $this->assertEquals('Public', $this->getFirstValueByColumn($csv, 'Credit Public Notes'));
         $this->assertEquals('Private', $this->getFirstValueByColumn($csv, 'Credit Private Notes'));
@@ -2029,9 +2030,9 @@ public function testInvoiceCsvGeneration()
         $csv = $response->body();
 
 
-        $this->assertEquals('100', $this->getFirstValueByColumn($csv, 'Invoice Amount'));
-        $this->assertEquals('50', $this->getFirstValueByColumn($csv, 'Invoice Balance'));
-        $this->assertEquals('10', $this->getFirstValueByColumn($csv, 'Invoice Discount'));
+        $this->assertEquals(floatval(100), $this->getFirstValueByColumn($csv, 'Invoice Amount'));
+        $this->assertEquals(floatval(50), $this->getFirstValueByColumn($csv, 'Invoice Balance'));
+        $this->assertEquals(floatval(10), $this->getFirstValueByColumn($csv, 'Invoice Discount'));
         $this->assertEquals('1234', $this->getFirstValueByColumn($csv, 'Invoice PO Number'));
         $this->assertEquals('Public', $this->getFirstValueByColumn($csv, 'Invoice Public Notes'));
         $this->assertEquals('Private', $this->getFirstValueByColumn($csv, 'Invoice Private Notes'));
@@ -2039,18 +2040,18 @@ public function testInvoiceCsvGeneration()
         $this->assertEquals('2020-01-01', $this->getFirstValueByColumn($csv, 'Invoice Date'));
         $this->assertEquals('2021-01-02', $this->getFirstValueByColumn($csv, 'Invoice Due Date'));
         $this->assertEquals('2021-01-03', $this->getFirstValueByColumn($csv, 'Invoice Partial Due Date'));
-        $this->assertEquals('10', $this->getFirstValueByColumn($csv, 'Invoice Partial/Deposit'));
+        $this->assertEquals(floatval(10), $this->getFirstValueByColumn($csv, 'Invoice Partial/Deposit'));
         $this->assertEquals('Custom 1', $this->getFirstValueByColumn($csv, 'Invoice Custom Value 1'));
         $this->assertEquals('Custom 2', $this->getFirstValueByColumn($csv, 'Invoice Custom Value 2'));
         $this->assertEquals('Custom 3', $this->getFirstValueByColumn($csv, 'Invoice Custom Value 3'));
         $this->assertEquals('Custom 4', $this->getFirstValueByColumn($csv, 'Invoice Custom Value 4'));
         $this->assertEquals('Footer', $this->getFirstValueByColumn($csv, 'Invoice Footer'));
         $this->assertEquals('Tax 1', $this->getFirstValueByColumn($csv, 'Invoice Tax Name 1'));
-        $this->assertEquals('10', $this->getFirstValueByColumn($csv, 'Invoice Tax Rate 1'));
+        $this->assertEquals(floatval(10), $this->getFirstValueByColumn($csv, 'Invoice Tax Rate 1'));
         $this->assertEquals('Tax 2', $this->getFirstValueByColumn($csv, 'Invoice Tax Name 2'));
-        $this->assertEquals('20', $this->getFirstValueByColumn($csv, 'Invoice Tax Rate 2'));
+        $this->assertEquals(floatval(20), $this->getFirstValueByColumn($csv, 'Invoice Tax Rate 2'));
         $this->assertEquals('Tax 3', $this->getFirstValueByColumn($csv, 'Invoice Tax Name 3'));
-        $this->assertEquals('30', $this->getFirstValueByColumn($csv, 'Invoice Tax Rate 3'));
+        $this->assertEquals(floatval(30), $this->getFirstValueByColumn($csv, 'Invoice Tax Rate 3'));
         $this->assertEquals('Sent', $this->getFirstValueByColumn($csv, 'Invoice Status'));
 
     }
@@ -2111,9 +2112,9 @@ public function testRecurringInvoiceCsvGeneration()
         $csv = $response->body();
 
 
-        $this->assertEquals('100', $this->getFirstValueByColumn($csv, 'Recurring Invoice Amount'));
-        $this->assertEquals('50', $this->getFirstValueByColumn($csv, 'Recurring Invoice Balance'));
-        $this->assertEquals('10', $this->getFirstValueByColumn($csv, 'Recurring Invoice Discount'));
+        $this->assertEquals(floatval(100), $this->getFirstValueByColumn($csv, 'Recurring Invoice Amount'));
+        $this->assertEquals(floatval(50), $this->getFirstValueByColumn($csv, 'Recurring Invoice Balance'));
+        $this->assertEquals(floatval(10), $this->getFirstValueByColumn($csv, 'Recurring Invoice Discount'));
         $this->assertEquals('1234', $this->getFirstValueByColumn($csv, 'Recurring Invoice PO Number'));
         $this->assertEquals('Public', $this->getFirstValueByColumn($csv, 'Recurring Invoice Public Notes'));
         $this->assertEquals('Private', $this->getFirstValueByColumn($csv, 'Recurring Invoice Private Notes'));
@@ -2121,18 +2122,18 @@ public function testRecurringInvoiceCsvGeneration()
         $this->assertEquals('2020-01-01', $this->getFirstValueByColumn($csv, 'Recurring Invoice Date'));
         $this->assertEquals('2021-01-02', $this->getFirstValueByColumn($csv, 'Recurring Invoice Due Date'));
         $this->assertEquals('2021-01-03', $this->getFirstValueByColumn($csv, 'Recurring Invoice Partial Due Date'));
-        $this->assertEquals('10', $this->getFirstValueByColumn($csv, 'Recurring Invoice Partial/Deposit'));
+        $this->assertEquals(floatval(10), $this->getFirstValueByColumn($csv, 'Recurring Invoice Partial/Deposit'));
         $this->assertEquals('Custom 1', $this->getFirstValueByColumn($csv, 'Recurring Invoice Custom Value 1'));
         $this->assertEquals('Custom 2', $this->getFirstValueByColumn($csv, 'Recurring Invoice Custom Value 2'));
         $this->assertEquals('Custom 3', $this->getFirstValueByColumn($csv, 'Recurring Invoice Custom Value 3'));
         $this->assertEquals('Custom 4', $this->getFirstValueByColumn($csv, 'Recurring Invoice Custom Value 4'));
         $this->assertEquals('Footer', $this->getFirstValueByColumn($csv, 'Recurring Invoice Footer'));
         $this->assertEquals('Tax 1', $this->getFirstValueByColumn($csv, 'Recurring Invoice Tax Name 1'));
-        $this->assertEquals('10', $this->getFirstValueByColumn($csv, 'Recurring Invoice Tax Rate 1'));
+        $this->assertEquals(floatval(10), $this->getFirstValueByColumn($csv, 'Recurring Invoice Tax Rate 1'));
         $this->assertEquals('Tax 2', $this->getFirstValueByColumn($csv, 'Recurring Invoice Tax Name 2'));
-        $this->assertEquals('20', $this->getFirstValueByColumn($csv, 'Recurring Invoice Tax Rate 2'));
+        $this->assertEquals(floatval(20), $this->getFirstValueByColumn($csv, 'Recurring Invoice Tax Rate 2'));
         $this->assertEquals('Tax 3', $this->getFirstValueByColumn($csv, 'Recurring Invoice Tax Name 3'));
-        $this->assertEquals('30', $this->getFirstValueByColumn($csv, 'Recurring Invoice Tax Rate 3'));
+        $this->assertEquals(floatval(30), $this->getFirstValueByColumn($csv, 'Recurring Invoice Tax Rate 3'));
         $this->assertEquals('Daily', $this->getFirstValueByColumn($csv, 'Recurring Invoice How Often'));
 
     }
@@ -2193,9 +2194,9 @@ public function testQuoteCsvGeneration()
 
         $csv = $response->body();
 
-        $this->assertEquals('100', $this->getFirstValueByColumn($csv, 'Quote Amount'));
-        $this->assertEquals('50', $this->getFirstValueByColumn($csv, 'Quote Balance'));
-        $this->assertEquals('10', $this->getFirstValueByColumn($csv, 'Quote Discount'));
+        $this->assertEquals(floatval(100), $this->getFirstValueByColumn($csv, 'Quote Amount'));
+        $this->assertEquals(floatval(50), $this->getFirstValueByColumn($csv, 'Quote Balance'));
+        $this->assertEquals(floatval(10), $this->getFirstValueByColumn($csv, 'Quote Discount'));
         $this->assertEquals('1234', $this->getFirstValueByColumn($csv, 'Quote PO Number'));
         $this->assertEquals('Public', $this->getFirstValueByColumn($csv, 'Quote Public Notes'));
         $this->assertEquals('Private', $this->getFirstValueByColumn($csv, 'Quote Private Notes'));
@@ -2203,18 +2204,18 @@ public function testQuoteCsvGeneration()
         $this->assertEquals('2020-01-01', $this->getFirstValueByColumn($csv, 'Quote Date'));
         $this->assertEquals('2020-01-01', $this->getFirstValueByColumn($csv, 'Quote Valid Until'));
         $this->assertEquals('2021-01-03', $this->getFirstValueByColumn($csv, 'Quote Partial Due Date'));
-        $this->assertEquals('10', $this->getFirstValueByColumn($csv, 'Quote Partial/Deposit'));
+        $this->assertEquals(floatval(10), $this->getFirstValueByColumn($csv, 'Quote Partial/Deposit'));
         $this->assertEquals('Custom 1', $this->getFirstValueByColumn($csv, 'Quote Custom Value 1'));
         $this->assertEquals('Custom 2', $this->getFirstValueByColumn($csv, 'Quote Custom Value 2'));
         $this->assertEquals('Custom 3', $this->getFirstValueByColumn($csv, 'Quote Custom Value 3'));
         $this->assertEquals('Custom 4', $this->getFirstValueByColumn($csv, 'Quote Custom Value 4'));
         $this->assertEquals('Footer', $this->getFirstValueByColumn($csv, 'Quote Footer'));
         $this->assertEquals('Tax 1', $this->getFirstValueByColumn($csv, 'Quote Tax Name 1'));
-        $this->assertEquals('10', $this->getFirstValueByColumn($csv, 'Quote Tax Rate 1'));
+        $this->assertEquals(floatval(10), $this->getFirstValueByColumn($csv, 'Quote Tax Rate 1'));
         $this->assertEquals('Tax 2', $this->getFirstValueByColumn($csv, 'Quote Tax Name 2'));
-        $this->assertEquals('20', $this->getFirstValueByColumn($csv, 'Quote Tax Rate 2'));
+        $this->assertEquals(floatval(20), $this->getFirstValueByColumn($csv, 'Quote Tax Rate 2'));
         $this->assertEquals('Tax 3', $this->getFirstValueByColumn($csv, 'Quote Tax Name 3'));
-        $this->assertEquals('30', $this->getFirstValueByColumn($csv, 'Quote Tax Rate 3'));
+        $this->assertEquals(floatval(30), $this->getFirstValueByColumn($csv, 'Quote Tax Rate 3'));
         $this->assertEquals('Expired', $this->getFirstValueByColumn($csv, 'Quote Status'));
 
     }
@@ -2247,7 +2248,7 @@ public function testExpenseCsvGeneration()
         $response = $this->poll($hash);
         $csv = $response->body();
 
-        $this->assertEquals('100', $this->getFirstValueByColumn($csv, 'Expense Amount'));
+        $this->assertEquals(floatval(100), $this->getFirstValueByColumn($csv, 'Expense Amount'));
         $this->assertEquals('Public', $this->getFirstValueByColumn($csv, 'Expense Public Notes'));
         $this->assertEquals('Private', $this->getFirstValueByColumn($csv, 'Expense Private Notes'));
         $this->assertEquals($this->user->present()->name(), $this->getFirstValueByColumn($csv, 'Expense User'));
@@ -2312,7 +2313,7 @@ public function testExpenseCustomColumnsCsvGeneration()
 
         $this->assertEquals('bob', $this->getFirstValueByColumn($csv, 'Client Name'));
         $this->assertEquals('Vendor 1', $this->getFirstValueByColumn($csv, 'Vendor Name'));
-        $this->assertEquals('100', $this->getFirstValueByColumn($csv, 'Expense Amount'));
+        $this->assertEquals(floatval(100), $this->getFirstValueByColumn($csv, 'Expense Amount'));
         $this->assertEquals('USD', $this->getFirstValueByColumn($csv, 'Expense Currency'));
 
     }

From e3729525db8f30ba28d4f5268d3855fe7b177e57 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 19 Oct 2024 13:43:22 +1100
Subject: [PATCH 75/81] Cross account checks

---
 app/Repositories/UserRepository.php           |  5 ++
 .../EDocument/Imports/ZugferdEDocument.php    |  2 +-
 tests/Feature/UserTest.php                    | 58 +++++++++++++++----
 3 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php
index 0d13387fc36..709062525be 100644
--- a/app/Repositories/UserRepository.php
+++ b/app/Repositories/UserRepository.php
@@ -72,6 +72,11 @@ public function save(array $data, User $user, $unset_company_user = false, $is_m
             $user->confirmation_code = $this->createDbHash($company->db);
         }
 
+        //@18-10-2024 - ensure no cross account linkage.
+        if(is_numeric($user->account_id) && $user->account_id != $account->id){
+            throw new \Illuminate\Auth\Access\AuthorizationException("Illegal operation encountered for {$user->hashed_id}",401);
+        }
+
         $user->account_id = $account->id;//@todo we should never change the account_id if it is set at this point.
 
         if (strlen($user->password) >= 1) {
diff --git a/app/Services/EDocument/Imports/ZugferdEDocument.php b/app/Services/EDocument/Imports/ZugferdEDocument.php
index b6118b59229..ea34076eca8 100644
--- a/app/Services/EDocument/Imports/ZugferdEDocument.php
+++ b/app/Services/EDocument/Imports/ZugferdEDocument.php
@@ -150,7 +150,7 @@ public function run(): Expense
         } else {
             // The document exists as an expense
             // Handle accordingly
-            nlog("Zugferd: Document already exists");
+            nlog("Zugferd: Document already exists {$expense->hashed_id}");
             $expense->private_notes = $expense->private_notes . ctrans("texts.edocument_import_already_exists", ["date" => time()]);
         }
 
diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index 1733a2d08ea..1186baca23c 100644
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -19,6 +19,7 @@
 use App\Models\CompanyToken;
 use App\Models\CompanyUser;
 use App\Models\User;
+use App\Repositories\UserRepository;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Routing\Middleware\ThrottleRequests;
@@ -44,20 +45,17 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        // Session::start();
-
         $this->faker = \Faker\Factory::create();
 
-        $this->makeTestData();
-
-        // Model::reguard();
-
-        // $this->withoutExceptionHandling();
-
         $this->withoutMiddleware(
             ThrottleRequests::class,
             PasswordProtection::class
         );
+
+        $this->makeTestData();
+
+        // $this->withoutExceptionHandling();
+
     }
 
     private function mockAccount()
@@ -72,7 +70,7 @@ private function mockAccount()
         $account->save();
 
         $user = User::factory()->create([
-            'account_id' => $this->account->id,
+            'account_id' => $account->id,
             'confirmation_code' => 'xyz123',
             'email' => $this->faker->unique()->safeEmail(),
             'password' => \Illuminate\Support\Facades\Hash::make('ALongAndBriliantPassword'),
@@ -87,7 +85,6 @@ private function mockAccount()
             'settings' => $settings,
         ]);
 
-
         $cu = CompanyUserFactory::create($user->id, $company->id, $account->id);
         $cu->is_owner = true;
         $cu->is_admin = true;
@@ -109,9 +106,48 @@ private function mockAccount()
 
     }
 
+    // public function testCrossAccountFunctionality()
+    // {
+    //     $ct = $this->mockAccount();
+
+    //     $u= $ct->user;
+
+    //     auth()->login($u, true);
+
+    //     $account = Account::factory()->create([
+    //             'hosted_client_count' => 1000,
+    //             'hosted_company_count' => 1000,
+    //         ]);
+
+    //     $account->num_users = 3;
+    //     $account->save();
+
+    //     $user = User::factory()->create([
+    //         'account_id' => $this->account->id,
+    //         'confirmation_code' => 'xyz123',
+    //         'email' => $this->faker->unique()->safeEmail(),
+    //         'password' => \Illuminate\Support\Facades\Hash::make('ALongAndBriliantPassword'),
+    //     ]);
+
+
+    //     $user_repo = new UserRepository();
+
+
+    //     // try{
+    //         $x = $user_repo->save(['first_name' => 'bobby'], $user);
+    //     // }
+    //     // catch(\Exception $e){
+
+    //         // $this->assertEquals(401, $e->getCode());
+    //     // }
+
+    //     nlog($x);
+
+
+    // }
+
     public function testValidEmailUpdate()
     {
-        
         $company_token = $this->mockAccount();
         $user = $company_token->user;
         $user->load('company_user');

From 7e9dde9513093e20db99b4872513af3616ec1687 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 20 Oct 2024 08:14:05 +1100
Subject: [PATCH 76/81] Fixes for credit sent events

---
 app/Http/Controllers/CreditController.php | 2 --
 app/Services/Credit/CreditService.php     | 4 ++--
 app/Services/Credit/TriggeredActions.php  | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php
index 11abfd50a3a..e1862e4e6d9 100644
--- a/app/Http/Controllers/CreditController.php
+++ b/app/Http/Controllers/CreditController.php
@@ -644,8 +644,6 @@ private function performAction(Credit $credit, $action, $bulk = false)
                     EmailEntity::dispatch($invitation, $credit->company, 'credit');
                 });
 
-                // $credit->sendEvent(Webhook::EVENT_SENT_CREDIT, "client");
-
                 if (! $bulk) {
                     return response()->json(['message' => 'email sent'], 200);
                 }
diff --git a/app/Services/Credit/CreditService.php b/app/Services/Credit/CreditService.php
index 8f16c58e5aa..68c09f91501 100644
--- a/app/Services/Credit/CreditService.php
+++ b/app/Services/Credit/CreditService.php
@@ -152,9 +152,9 @@ public function markPaid()
         return $this;
     }
 
-    public function markSent()
+    public function markSent($fire_event = false)
     {
-        $this->credit = (new MarkSent($this->credit->client, $this->credit))->run();
+        $this->credit = (new MarkSent($this->credit->client, $this->credit))->run($fire_event);
 
         return $this;
     }
diff --git a/app/Services/Credit/TriggeredActions.php b/app/Services/Credit/TriggeredActions.php
index 04ce784ad52..c2d8e400199 100644
--- a/app/Services/Credit/TriggeredActions.php
+++ b/app/Services/Credit/TriggeredActions.php
@@ -43,7 +43,7 @@ public function run()
         }
 
         if ($this->request->has('mark_sent') && $this->request->input('mark_sent') == 'true') {
-            $this->credit = $this->credit->service()->markSent()->save();
+            $this->credit = $this->credit->service()->markSent(true)->save();
         }
 
         if ($this->request->has('save_default_footer') && $this->request->input('save_default_footer') == 'true') {

From 3fc81bae8b6946e0de7ec1c731e4396e961bf395 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 21 Oct 2024 11:21:12 +1100
Subject: [PATCH 77/81] Updates for checks

---
 app/Console/Commands/TypeCheck.php        | 14 ++++-
 app/Services/Pdf/PdfService.php           |  1 +
 app/Services/Template/TemplateService.php | 66 +++++++++++++++++------
 3 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/app/Console/Commands/TypeCheck.php b/app/Console/Commands/TypeCheck.php
index 009a38244ca..fdb7bb7971e 100644
--- a/app/Console/Commands/TypeCheck.php
+++ b/app/Console/Commands/TypeCheck.php
@@ -11,15 +11,18 @@
 
 namespace App\Console\Commands;
 
-use App\Libraries\MultiDB;
 use App\Models\Client;
 use App\Models\Company;
-use App\Utils\Traits\ClientGroupSettingsSaver;
+use App\Models\Invoice;
+use App\Libraries\MultiDB;
 use Illuminate\Console\Command;
+use App\Utils\Traits\CleanLineItems;
+use App\Utils\Traits\ClientGroupSettingsSaver;
 
 class TypeCheck extends Command
 {
     use ClientGroupSettingsSaver;
+    use CleanLineItems;
 
     /**
      * The name and signature of the console command.
@@ -126,6 +129,13 @@ private function checkAll()
             $this->logMessage("Checking company {$company->id}");
             $company->saveSettings($company->settings, $company);
         });
+
+        Invoice::query()->cursor()->each(function ($invoice){
+            $this->logMessage("Checking invoice {$invoice->id}");
+            $invoice->line_items = $this->cleanItems($invoice->line_items);
+            $invoice->saveQuietly();
+        });
+
     }
 
     private function logMessage($str)
diff --git a/app/Services/Pdf/PdfService.php b/app/Services/Pdf/PdfService.php
index 85d115e8a47..bdb94a78d8d 100644
--- a/app/Services/Pdf/PdfService.php
+++ b/app/Services/Pdf/PdfService.php
@@ -88,6 +88,7 @@ public function boot(): self
      */
     public function getPdf()
     {
+
         try {
             $pdf = $this->resolvePdfEngine($this->getHtml());
 
diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php
index b0ba65e404b..cb02859bb28 100644
--- a/app/Services/Template/TemplateService.php
+++ b/app/Services/Template/TemplateService.php
@@ -11,39 +11,41 @@
 
 namespace App\Services\Template;
 
+use App\Models\Task;
+use App\Models\User;
+use App\Models\Quote;
+use App\Utils\Number;
+use Twig\Error\Error;
 use App\Models\Client;
-use App\Models\Company;
 use App\Models\Credit;
 use App\Models\Design;
+use App\Models\Vendor;
+use App\Models\Company;
 use App\Models\Invoice;
 use App\Models\Payment;
 use App\Models\Project;
+use App\Utils\HtmlEngine;
+use Twig\Error\LoaderError;
+use Twig\Error\SyntaxError;
+use Twig\Error\RuntimeError;
 use App\Models\PurchaseOrder;
-use App\Models\Quote;
+use App\Utils\Traits\MakesHash;
+use App\Utils\VendorHtmlEngine;
+use Twig\Sandbox\SecurityError;
 use App\Models\RecurringInvoice;
-use App\Models\Task;
-use App\Models\User;
-use App\Models\Vendor;
-use App\Utils\HostedPDF\NinjaPdf;
-use App\Utils\HtmlEngine;
-use App\Utils\Number;
 use App\Utils\PaymentHtmlEngine;
 use App\Utils\Traits\MakesDates;
+use App\Utils\HostedPDF\NinjaPdf;
 use App\Utils\Traits\Pdf\PdfMaker;
-use App\Utils\VendorHtmlEngine;
-use League\CommonMark\CommonMarkConverter;
-use Twig\Error\Error;
-use Twig\Error\LoaderError;
-use Twig\Error\RuntimeError;
-use Twig\Error\SyntaxError;
 use Twig\Extra\Intl\IntlExtension;
-use Twig\Sandbox\SecurityError;
+use League\CommonMark\CommonMarkConverter;
 
 class TemplateService
 {
     use MakesDates;
     use PdfMaker;
-
+    use MakesHash;
+    
     private \DomDocument $document;
 
     public \Twig\Environment $twig;
@@ -626,7 +628,8 @@ public function padLineItems(array $items, Vendor | Client $client_or_vendor): a
             $item->gross_line_total = Number::formatMoney($item->gross_line_total_raw, $client_or_vendor);
             $item->tax_amount = Number::formatMoney($item->tax_amount_raw, $client_or_vendor);
             $item->product_cost = Number::formatMoney($item->product_cost_raw, $client_or_vendor);
-
+            $item->task = strlen($item->task_id ?? '') > 1 ? $this->processInvoiceTask($item->task_id) : [];
+            
             return (array)$item;
 
         })->toArray();
@@ -943,6 +946,35 @@ private function getClient($entity): array
             'locale' => substr($entity->client->locale(), 0, 2),
             ] : [];
     }
+
+    private function processInvoiceTask(string $task_id): array
+    {
+        $task = Task::where('company_id', $this->company->id)
+                    ->where('id', $this->decodePrimaryKey($task_id))
+                    ->first();
+    
+        return $task ? [
+            'number' => (string) $task->number ?: '',
+            'description' => (string) $task->description ?: '',
+            'duration' => $task->calcDuration() ?: 0,
+            'rate' => Number::formatMoney($task->rate ?? 0, $task->client ?? $task->company),
+            'rate_raw' => $task->rate ?? 0,
+            'created_at' => $this->translateDate($task->created_at, $task->client ? $task->client->date_format() : $task->company->date_format(), $task->client ? $task->client->locale() : $task->company->locale()),
+            'updated_at' => $this->translateDate($task->updated_at, $task->client ? $task->client->date_format() : $task->company->date_format(), $task->client ? $task->client->locale() : $task->company->locale()),
+            'date' => $task->calculated_start_date ? $this->translateDate($task->calculated_start_date, $task->client ? $task->client->date_format() : $task->company->date_format(), $task->client ? $task->client->locale() : $task->company->locale()) : '',
+            'project' => $task->project ? $this->transformProject($task->project, true) : [],
+            'time_log' => $task->processLogsExpandedNotation(),
+            'custom_value1' => $task->custom_value1 ?: '',
+            'custom_value2' => $task->custom_value2 ?: '',
+            'custom_value3' => $task->custom_value3 ?: '',
+            'custom_value4' => $task->custom_value4 ?: '',
+            'status' => $task->status ? $task->status->name : '',
+            'user' => $this->userInfo($task->user),
+            'assigned_user' => $task->assigned_user ? $this->userInfo($task->assigned_user) : [],
+        ] : [];
+    }
+
+
     /**
      * @todo refactor
      *

From bb12d0248b8f4c0a2953624448695871c17d9cb2 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 21 Oct 2024 13:29:59 +1100
Subject: [PATCH 78/81] Fixes for incrementing auto bill

---
 .../EDocument/Adapters/CII/PaymentMeans.php   | 28 -------------------
 app/Services/Invoice/AutoBillInvoice.php      | 15 ++++++++--
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/app/Services/EDocument/Adapters/CII/PaymentMeans.php b/app/Services/EDocument/Adapters/CII/PaymentMeans.php
index a4b9a293ac4..dee5d993f31 100644
--- a/app/Services/EDocument/Adapters/CII/PaymentMeans.php
+++ b/app/Services/EDocument/Adapters/CII/PaymentMeans.php
@@ -198,34 +198,6 @@ public function run()
         $SupplyChainTradeTransactionType = new \horstoeko\zugferd\entities\extended\ram\SupplyChainTradeTransactionType();
         $SupplyChainTradeTransactionType->setApplicableHeaderTradeSettlement($HeaderTradeSettlementType);
 
-        // $cii = new \horstoeko\zugferd\entities\extended\rsm\CrossIndustryInvoice();
-        // $cii->setSupplyChainTradeTransaction($SupplyChainTradeTransactionType);
-
-
-
-        $d = \horstoeko\zugferd\ZugferdDocumentBuilder::CreateNew(\horstoeko\zugferd\ZugferdProfiles::PROFILE_XRECHNUNG_3);
-        // $d->setSupplyChainTradeTransaction($SupplyChainTradeTransactionType);
-
-// nlog($d->getInvoiceObject()->getSupplyChainTradeTransaction());
-$d->getObjectHelper()->tryCall($d->getInvoiceObject()->getSupplyChainTradeTransaction(), "setSupplyChainTradeTransaction", $SupplyChainTradeTransactionType);
-
-
-$documentJsonExporter = new \horstoeko\zugferd\ZugferdDocumentJsonExporter($d);
-
-// echo $documentJsonExporter->toPrettyJsonString();
-// echo "\r\n\r\n";
-
-$jsonObject = $documentJsonExporter->toJsonObject();
-
-return $jsonObject;
-// var_dump($jsonObject);
-
-// echo "\r\n\r\n";
-
-
-        // return $cii;
-
-        // return $this;
     }
 
 }
diff --git a/app/Services/Invoice/AutoBillInvoice.php b/app/Services/Invoice/AutoBillInvoice.php
index 3b67ddb7908..8612bed1a70 100644
--- a/app/Services/Invoice/AutoBillInvoice.php
+++ b/app/Services/Invoice/AutoBillInvoice.php
@@ -174,8 +174,19 @@ public function run()
         $this->invoice->auto_bill_tries += 1;
 
         if ($this->invoice->auto_bill_tries == 3) {
-            $this->invoice->auto_bill_enabled = false;
-            $this->invoice->auto_bill_tries = 0; //reset the counter here in case auto billing is turned on again in the future.
+
+            \App\Models\Invoice::where('id', $this->invoice->id)->update([
+                'auto_bill_enabled' => false,
+                'auto_bill_tries' => 0
+            ]);
+
+        }
+        else {
+            
+            \App\Models\Invoice::where('id', $this->invoice->id)->update([
+                'auto_bill_tries' => $this->invoice->auto_bill_tries
+            ]);
+
         }
 
         if ($payment) {

From de0420462aa559f06e2458ad1ff53783bdbb76c0 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 21 Oct 2024 15:03:34 +1100
Subject: [PATCH 79/81] system log modifications for payment hash

---
 app/PaymentDrivers/Braintree/ACH.php            | 2 +-
 app/PaymentDrivers/Braintree/CreditCard.php     | 2 +-
 app/PaymentDrivers/Braintree/PayPal.php         | 2 +-
 app/PaymentDrivers/CBAPowerBoard/CreditCard.php | 6 +++---
 app/PaymentDrivers/CustomPaymentDriver.php      | 2 +-
 app/PaymentDrivers/Mollie/CreditCard.php        | 4 ++--
 app/PaymentDrivers/PayFast/CreditCard.php       | 2 +-
 app/PaymentDrivers/PayTrace/CreditCard.php      | 2 +-
 app/PaymentDrivers/Stripe/ApplePay.php          | 2 +-
 app/PaymentDrivers/Stripe/BACS.php              | 2 +-
 app/PaymentDrivers/Stripe/BrowserPay.php        | 2 +-
 app/PaymentDrivers/Stripe/CreditCard.php        | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/PaymentDrivers/Braintree/ACH.php b/app/PaymentDrivers/Braintree/ACH.php
index 7948e794a80..0be982993a0 100644
--- a/app/PaymentDrivers/Braintree/ACH.php
+++ b/app/PaymentDrivers/Braintree/ACH.php
@@ -150,7 +150,7 @@ public function paymentResponse(PaymentResponseRequest $request)
         ]);
 
         if ($result->success) {
-            $this->braintree->logSuccessfulGatewayResponse(['response' => $request->server_response, 'data' => $this->braintree->payment_hash], SystemLog::TYPE_BRAINTREE);
+            $this->braintree->logSuccessfulGatewayResponse(['response' => $request->server_response, 'data' => $this->braintree->payment_hash->data], SystemLog::TYPE_BRAINTREE);
 
             return $this->processSuccessfulPayment($result);
         }
diff --git a/app/PaymentDrivers/Braintree/CreditCard.php b/app/PaymentDrivers/Braintree/CreditCard.php
index f18a9fa42dd..c6ac4deaaf0 100644
--- a/app/PaymentDrivers/Braintree/CreditCard.php
+++ b/app/PaymentDrivers/Braintree/CreditCard.php
@@ -145,7 +145,7 @@ public function paymentResponse(PaymentResponseRequest $request)
         }
 
         if ($result->success) {
-            $this->braintree->logSuccessfulGatewayResponse(['response' => $request->server_response, 'data' => $this->braintree->payment_hash], SystemLog::TYPE_BRAINTREE);
+            $this->braintree->logSuccessfulGatewayResponse(['response' => $request->server_response, 'data' => $this->braintree->payment_hash->data], SystemLog::TYPE_BRAINTREE);
 
             if ($request->store_card && is_null($request->token)) {
                 $payment_method = $this->braintree->gateway->paymentMethod()->find($token);
diff --git a/app/PaymentDrivers/Braintree/PayPal.php b/app/PaymentDrivers/Braintree/PayPal.php
index 7e7cf5d6d9e..87bf40339cd 100644
--- a/app/PaymentDrivers/Braintree/PayPal.php
+++ b/app/PaymentDrivers/Braintree/PayPal.php
@@ -83,7 +83,7 @@ public function paymentResponse(PaymentResponseRequest $request)
 
         if ($result->success) {
             $this->braintree->logSuccessfulGatewayResponse(
-                ['response' => $request->server_response, 'data' => $this->braintree->payment_hash],
+                ['response' => $request->server_response, 'data' => $this->braintree->payment_hash->data],
                 SystemLog::TYPE_BRAINTREE
             );
 
diff --git a/app/PaymentDrivers/CBAPowerBoard/CreditCard.php b/app/PaymentDrivers/CBAPowerBoard/CreditCard.php
index 8b31479679f..0f14a710641 100644
--- a/app/PaymentDrivers/CBAPowerBoard/CreditCard.php
+++ b/app/PaymentDrivers/CBAPowerBoard/CreditCard.php
@@ -120,7 +120,7 @@ public function authorizeResponse($request)
 
             if ($charge->status == 'complete') {
 
-                $this->powerboard->logSuccessfulGatewayResponse(['response' => $charge, 'data' => $this->powerboard->payment_hash], SystemLog::TYPE_POWERBOARD);
+                $this->powerboard->logSuccessfulGatewayResponse(['response' => $charge, 'data' => $this->powerboard->payment_hash->data], SystemLog::TYPE_POWERBOARD);
                 
                 $vt = $charge->customer->payment_source->vault_token;
 
@@ -291,7 +291,7 @@ public function tokenBilling($cgt, $client_present = false)
 
         nlog($charge);
 
-        $this->powerboard->logSuccessfulGatewayResponse(['response' => $charge, 'data' => $this->powerboard->payment_hash], SystemLog::TYPE_POWERBOARD);
+        $this->powerboard->logSuccessfulGatewayResponse(['response' => $charge, 'data' => $this->powerboard->payment_hash->data], SystemLog::TYPE_POWERBOARD);
 
         return $this->processSuccessfulPayment($charge);
     }
@@ -389,7 +389,7 @@ public function paymentResponse(PaymentResponseRequest $request)
             nlog($charge);
 
             if ($charge->status == 'complete') {
-                $this->powerboard->logSuccessfulGatewayResponse(['response' => $charge, 'data' => $this->powerboard->payment_hash], SystemLog::TYPE_POWERBOARD);
+                $this->powerboard->logSuccessfulGatewayResponse(['response' => $charge, 'data' => $this->powerboard->payment_hash->data], SystemLog::TYPE_POWERBOARD);
                 
                 $vt = $charge->customer->payment_source->vault_token;
 
diff --git a/app/PaymentDrivers/CustomPaymentDriver.php b/app/PaymentDrivers/CustomPaymentDriver.php
index d272101c61b..b399c52aed0 100644
--- a/app/PaymentDrivers/CustomPaymentDriver.php
+++ b/app/PaymentDrivers/CustomPaymentDriver.php
@@ -136,7 +136,7 @@ public function processPaymentResponse($request)
             $gateway_response = json_decode($request->gateway_response);
 
             if ($gateway_response->status == 'COMPLETED') {
-                $this->logSuccessfulGatewayResponse(['response' => json_decode($request->gateway_response), 'data' => $payment_hash], SystemLog::TYPE_CUSTOM);
+                $this->logSuccessfulGatewayResponse(['response' => json_decode($request->gateway_response), 'data' => $payment_hash->data], SystemLog::TYPE_CUSTOM);
 
                 $data = [
                     'payment_method' => '',
diff --git a/app/PaymentDrivers/Mollie/CreditCard.php b/app/PaymentDrivers/Mollie/CreditCard.php
index 6e712c8f84b..3ba25ee2ff9 100644
--- a/app/PaymentDrivers/Mollie/CreditCard.php
+++ b/app/PaymentDrivers/Mollie/CreditCard.php
@@ -84,7 +84,7 @@ public function paymentResponse(PaymentResponseRequest $request)
 
                 if ($payment->status === 'paid') {
                     $this->mollie->logSuccessfulGatewayResponse(
-                        ['response' => $payment, 'data' => $this->mollie->payment_hash],
+                        ['response' => $payment, 'data' => $this->mollie->payment_hash->data],
                         SystemLog::TYPE_MOLLIE
                     );
 
@@ -149,7 +149,7 @@ public function paymentResponse(PaymentResponseRequest $request)
 
             if ($payment->status === 'paid') {
                 $this->mollie->logSuccessfulGatewayResponse(
-                    ['response' => $payment, 'data' => $this->mollie->payment_hash],
+                    ['response' => $payment, 'data' => $this->mollie->payment_hash->data],
                     SystemLog::TYPE_MOLLIE
                 );
 
diff --git a/app/PaymentDrivers/PayFast/CreditCard.php b/app/PaymentDrivers/PayFast/CreditCard.php
index 7b5e2380a05..c03130a091a 100644
--- a/app/PaymentDrivers/PayFast/CreditCard.php
+++ b/app/PaymentDrivers/PayFast/CreditCard.php
@@ -208,7 +208,7 @@ public function paymentResponse(Request $request)
         $this->payfast->payment_hash->save();
 
         if ($response_array['payment_status'] == 'COMPLETE') {
-            $this->payfast->logSuccessfulGatewayResponse(['response' => $response_array, 'data' => $this->payfast->payment_hash], SystemLog::TYPE_PAYFAST);
+            $this->payfast->logSuccessfulGatewayResponse(['response' => $response_array, 'data' => $this->payfast->payment_hash->data], SystemLog::TYPE_PAYFAST);
 
             return $this->processSuccessfulPayment($response_array);
         } else {
diff --git a/app/PaymentDrivers/PayTrace/CreditCard.php b/app/PaymentDrivers/PayTrace/CreditCard.php
index 970994d3c32..a11cc1a1030 100644
--- a/app/PaymentDrivers/PayTrace/CreditCard.php
+++ b/app/PaymentDrivers/PayTrace/CreditCard.php
@@ -187,7 +187,7 @@ public function processTokenPayment($token, $request)
         $response = $this->paytrace->gatewayRequest('/v1/transactions/sale/by_customer', $data);
 
         if ($response->success ?? false) {
-            $this->paytrace->logSuccessfulGatewayResponse(['response' => $response, 'data' => $this->paytrace->payment_hash], SystemLog::TYPE_PAYTRACE);
+            $this->paytrace->logSuccessfulGatewayResponse(['response' => $response, 'data' => $this->paytrace->payment_hash->data], SystemLog::TYPE_PAYTRACE);
 
             return $this->processSuccessfulPayment($response);
         }
diff --git a/app/PaymentDrivers/Stripe/ApplePay.php b/app/PaymentDrivers/Stripe/ApplePay.php
index fa642933165..cd21b04f8b1 100644
--- a/app/PaymentDrivers/Stripe/ApplePay.php
+++ b/app/PaymentDrivers/Stripe/ApplePay.php
@@ -76,7 +76,7 @@ public function paymentResponse(PaymentResponseRequest $request)
         $response_handler = new CreditCard($this->stripe_driver);
 
         if ($server_response->status == 'succeeded') {
-            $this->stripe_driver->logSuccessfulGatewayResponse(['response' => json_decode($request->gateway_response), 'data' => $this->stripe_driver->payment_hash], SystemLog::TYPE_STRIPE);
+            $this->stripe_driver->logSuccessfulGatewayResponse(['response' => json_decode($request->gateway_response), 'data' => $this->stripe_driver->payment_hash->data], SystemLog::TYPE_STRIPE);
 
             return $response_handler->processSuccessfulPayment();
         }
diff --git a/app/PaymentDrivers/Stripe/BACS.php b/app/PaymentDrivers/Stripe/BACS.php
index a028a311a4a..9b1e6f1a51b 100644
--- a/app/PaymentDrivers/Stripe/BACS.php
+++ b/app/PaymentDrivers/Stripe/BACS.php
@@ -106,7 +106,7 @@ public function paymentResponse(PaymentResponseRequest $request)
         $this->stripe->payment_hash->save();
 
         if ($state['payment_intent']->status == 'processing') {
-            $this->stripe->logSuccessfulGatewayResponse(['response' => $state['payment_intent'], 'data' => $this->stripe->payment_hash], SystemLog::TYPE_STRIPE);
+            $this->stripe->logSuccessfulGatewayResponse(['response' => $state['payment_intent'], 'data' => $this->stripe->payment_hash->data], SystemLog::TYPE_STRIPE);
 
             return $this->processSuccessfulPayment($state['payment_intent']);
         }
diff --git a/app/PaymentDrivers/Stripe/BrowserPay.php b/app/PaymentDrivers/Stripe/BrowserPay.php
index 126afec809c..1468da2131c 100644
--- a/app/PaymentDrivers/Stripe/BrowserPay.php
+++ b/app/PaymentDrivers/Stripe/BrowserPay.php
@@ -136,7 +136,7 @@ protected function processSuccessfulPayment()
         $gateway_response = $this->stripe->payment_hash->data->gateway_response;
         $payment_intent = $this->stripe->payment_hash->data->payment_intent;
 
-        $this->stripe->logSuccessfulGatewayResponse(['response' => $gateway_response, 'data' => $this->stripe->payment_hash], SystemLog::TYPE_STRIPE);
+        $this->stripe->logSuccessfulGatewayResponse(['response' => $gateway_response, 'data' => $this->stripe->payment_hash->data], SystemLog::TYPE_STRIPE);
 
         $payment_method = $this->stripe->getStripePaymentMethod($gateway_response->payment_method);
 
diff --git a/app/PaymentDrivers/Stripe/CreditCard.php b/app/PaymentDrivers/Stripe/CreditCard.php
index bfaa366f6cc..d4c1ed0f8d1 100644
--- a/app/PaymentDrivers/Stripe/CreditCard.php
+++ b/app/PaymentDrivers/Stripe/CreditCard.php
@@ -118,7 +118,7 @@ public function paymentResponse(PaymentResponseRequest $request)
         $server_response = $this->stripe->payment_hash->data->server_response;
 
         if ($server_response->status == 'succeeded') {
-            $this->stripe->logSuccessfulGatewayResponse(['response' => json_decode($request->gateway_response), 'data' => $this->stripe->payment_hash], SystemLog::TYPE_STRIPE);
+            $this->stripe->logSuccessfulGatewayResponse(['response' => json_decode($request->gateway_response), 'data' => $this->stripe->payment_hash->data], SystemLog::TYPE_STRIPE);
 
             return $this->processSuccessfulPayment();
         }

From aaaa0318314209ed1c7a9a81166940906dbcba62 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 21 Oct 2024 17:16:26 +1100
Subject: [PATCH 80/81] Fixes for delete payment when invoice has been
 cancelled

---
 app/Services/Payment/DeletePayment.php |  26 +++-
 tests/Unit/InvoiceTest.php             | 171 +++++++++++++++++++++++++
 2 files changed, 196 insertions(+), 1 deletion(-)

diff --git a/app/Services/Payment/DeletePayment.php b/app/Services/Payment/DeletePayment.php
index ae323ed4e5b..938853c00a0 100644
--- a/app/Services/Payment/DeletePayment.php
+++ b/app/Services/Payment/DeletePayment.php
@@ -94,7 +94,31 @@ private function adjustInvoices()
 
                 nlog("net deletable amount - refunded = {$net_deletable}");
 
-                if (! $paymentable_invoice->is_deleted) {
+                if($paymentable_invoice->status_id == Invoice::STATUS_CANCELLED){
+                    
+                    $is_trashed = false;
+
+                    if($paymentable_invoice->trashed()){
+                        $is_trashed = true;
+                        $paymentable_invoice->restore();
+                    }
+
+                    $paymentable_invoice->service()
+                                        ->updatePaidToDate($net_deletable * -1)
+                                        ->save();
+                    
+                    $this->payment
+                         ->client
+                         ->service()
+                         ->updatePaidToDate($net_deletable * -1)
+                         ->save();
+
+                    if($is_trashed){
+                        $paymentable_invoice->delete();
+                    }
+
+                }
+                elseif (! $paymentable_invoice->is_deleted) {
                     $paymentable_invoice->restore();
 
                     $paymentable_invoice->service()
diff --git a/tests/Unit/InvoiceTest.php b/tests/Unit/InvoiceTest.php
index 077d396c088..8e66595d853 100644
--- a/tests/Unit/InvoiceTest.php
+++ b/tests/Unit/InvoiceTest.php
@@ -17,6 +17,8 @@
 use App\Helpers\Invoice\InvoiceSum;
 use App\Helpers\Invoice\InvoiceSumInclusive;
 use App\Models\Invoice;
+use App\Models\Payment;
+use App\Repositories\InvoiceRepository;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\MockAccountData;
 use Tests\TestCase;
@@ -49,6 +51,175 @@ protected function setUp(): void
         $this->invoice_calc = new InvoiceSum($this->invoice);
     }
 
+    public function testDeletingCancelledAndTrashedInvoicePayment()
+    {
+        
+        $c = \App\Models\Client::factory()->create([
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+        ]);
+
+        $item = InvoiceItemFactory::create();
+        $item->quantity = 1;
+        $item->cost = 10.00;
+        $item->type_id = '1';
+        $item->tax_id = '1';
+        $line_items[] = $item;
+
+        $i = Invoice::factory()->create([
+            'discount' => 0,
+            'tax_name1' => '',
+            'tax_name2' => '',
+            'tax_name3' => '',
+            'tax_rate1' => 0,
+            'tax_rate2' => 0,
+            'tax_rate3' => 0,
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'client_id' => $c->id,
+            'line_items' => $line_items,
+            'status_id' => 1,
+            'uses_inclusive_taxes' => false,
+        ]);
+
+        $invoice_calc = new InvoiceSum($i);
+        $ii = $invoice_calc->build()->getInvoice();
+
+        $ii = $ii->service()->markSent()->save();
+
+        $this->assertEquals(10, $ii->balance);
+        $this->assertEquals(2, $ii->status_id);
+
+        $data = [
+            'client_id' => $c->hashed_id,
+            'invoices' => [
+                [
+                    'invoice_id' => $i->hashed_id,
+                    'amount' => 5,
+                ],
+            ],
+        ];
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->postJson('/api/v1/payments/', $data);
+
+        $response->assertStatus(200);
+
+        $payment_data = $response->json();
+
+        $payment_hashed_id = $payment_data['data']['id'];
+
+        $ii = $ii->fresh();
+
+        $this->assertEquals(5, $ii->balance);
+        $this->assertEquals(5, $ii->paid_to_date);
+        $this->assertEquals(3, $ii->status_id);
+
+        $ii->service()->handleCancellation()->save();
+
+        $this->assertEquals(0, $ii->balance);
+        $this->assertEquals(5, $ii->paid_to_date);
+        $this->assertEquals(5, $ii->status_id);
+
+        $repo = new InvoiceRepository();
+        $repo->archive($ii);
+
+        $payment = Payment::find($this->decodePrimaryKey($payment_hashed_id));
+        $payment->service()->deletePayment(false)->save();
+
+        $ii = $ii->fresh();
+        
+        $this->assertEquals(0, $ii->balance);
+        $this->assertEquals(0, $ii->paid_to_date);
+        $this->assertEquals(5, $ii->status_id);
+
+    }
+
+    public function testDeletingCancelledInvoicePayment()
+    {
+        
+        $c = \App\Models\Client::factory()->create([
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+        ]);
+
+        $item = InvoiceItemFactory::create();
+        $item->quantity = 1;
+        $item->cost = 10.00;
+        $item->type_id = '1';
+        $item->tax_id = '1';
+        $line_items[] = $item;
+
+        $i = Invoice::factory()->create([
+            'discount' => 0,
+            'tax_name1' => '',
+            'tax_name2' => '',
+            'tax_name3' => '',
+            'tax_rate1' => 0,
+            'tax_rate2' => 0,
+            'tax_rate3' => 0,
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'client_id' => $c->id,
+            'line_items' => $line_items,
+            'status_id' => 1,
+            'uses_inclusive_taxes' => false,
+        ]);
+
+        $invoice_calc = new InvoiceSum($i);
+        $ii = $invoice_calc->build()->getInvoice();
+
+        $ii = $ii->service()->markSent()->save();
+
+        $this->assertEquals(10, $ii->balance);
+        $this->assertEquals(2, $ii->status_id);
+
+        $data = [
+            'client_id' => $c->hashed_id,
+            'invoices' => [
+                [
+                    'invoice_id' => $i->hashed_id,
+                    'amount' => 5,
+                ],
+            ],
+        ];
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->postJson('/api/v1/payments/', $data);
+
+        $response->assertStatus(200);
+
+        $payment_data = $response->json();
+
+        $payment_hashed_id = $payment_data['data']['id'];
+
+        $ii = $ii->fresh();
+
+        $this->assertEquals(5, $ii->balance);
+        $this->assertEquals(5, $ii->paid_to_date);
+        $this->assertEquals(3, $ii->status_id);
+
+        $ii->service()->handleCancellation()->save();
+
+        $this->assertEquals(0, $ii->balance);
+        $this->assertEquals(5, $ii->paid_to_date);
+        $this->assertEquals(5, $ii->status_id);
+
+        $payment = Payment::find($this->decodePrimaryKey($payment_hashed_id));
+        $payment->service()->deletePayment(false)->save();
+
+        $ii = $ii->fresh();
+        
+        $this->assertEquals(0, $ii->balance);
+        $this->assertEquals(0, $ii->paid_to_date);
+        $this->assertEquals(5, $ii->status_id);
+
+    }
+
     public function testRefundPaidToDateRelation()
     {
                 

From 592192a376df836769c37098775f73dbf4204f30 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 21 Oct 2024 17:29:50 +1100
Subject: [PATCH 81/81] v5.10.42

---
 VERSION.txt                               | 2 +-
 app/Http/Controllers/ImportController.php | 5 ++++-
 config/ninja.php                          | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index b37f7dad19c..02a68e85db5 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.10.41
\ No newline at end of file
+5.10.42
\ No newline at end of file
diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
index ebaa8cb8b00..10b680bcd75 100644
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@@ -285,7 +285,10 @@ private function convertData(array $data): array
             'WINDOWS-1251', // CP1251
             'UTF-16',
             'UTF-32',
-            'ASCII'
+            'ASCII',
+            'WINDOWS-1254', // Turkish, which sometimes includes Georgian
+            'WINDOWS-1256', // Arabic, which sometimes includes Georgian
+            'ISO-8859-10',
         ];
 
         foreach ($data as $key => $value) {
diff --git a/config/ninja.php b/config/ninja.php
index d2c15217a73..e6bc59a3ffa 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,8 @@
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.10.41'),
-    'app_tag' => env('APP_TAG', '5.10.41'),
+    'app_version' => env('APP_VERSION', '5.10.42'),
+    'app_tag' => env('APP_TAG', '5.10.42'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),