Merge pull request #4780 from beganovich/v5-2701-payable-draft-invoices

(v5) (wip) Allow payments of draft invoices

app/Http/Controllers/ClientPortal/InvoiceController.php

@@ -90,7 +90,7 @@ class InvoiceController extends Controller
 
         //filter invoices which are payable
         $invoices = $invoices->filter(function ($invoice) {
-            return $invoice->isPayable() && $invoice->balance > 0;
+            return $invoice->isPayable();
         });
 
         //return early if no invoices.

app/Http/Controllers/ClientPortal/PaymentController.php

@@ -106,7 +106,7 @@ class PaymentController extends Controller
         if ($payable_invoices->count() == 0) {
             return redirect()
                 ->route('client.invoices.index')
-                ->with(['warning' => 'No payable invoices selected.']);
+                ->with(['message' => 'No payable invoices selected.']);
         }
 
         $settings = auth()->user()->client->getMergedSettings();

public/mix-manifest.json

@@ -1,5 +1,5 @@
 {
-    "/js/app.js": "/js/app.js?id=a33a5a58bfc6e2174841",
+    "/js/app.js": "/js/app.js?id=1ee684e58f9f6eb754d5",
     "/css/app.css": "/css/app.css?id=599b11149976e86c83a3",
     "/js/clients/invoices/action-selectors.js": "/js/clients/invoices/action-selectors.js?id=a09bb529b8e1826f13b4",
     "/js/clients/invoices/payment.js": "/js/clients/invoices/payment.js?id=8ce8955ba775ea5f47d1",

resources/js/app.js

@@ -14,20 +14,6 @@ window.axios = require('axios');
  */
 window.valid = require('card-validator');
 
-/**
- * Toggle processing overlay.
- */
-window.processingOverlay = (show) => {
-    if (show) {
-        return document
-            .getElementById('processing-overlay')
-            .classList.remove('hidden');
-    }
-
-    return document
-        .getElementById('processing-overlay')
-        .classList.add('hidden');
-};
 
 /**
  * Remove flashing message div after 3 seconds.
@@ -35,5 +21,5 @@ window.processingOverlay = (show) => {
 document.querySelectorAll('.disposable-alert').forEach((element) => {
     setTimeout(() => {
         element.remove();
-    }, 3000);
+    }, 5000);
 });

resources/lang/en/texts.php

@@ -3383,5 +3383,6 @@ return [
     'create_webhook_failure' => 'Failed to create Webhook',
     'number' => 'Number',
     'payment_message_extended' => 'Thank you for your payment of :amount for :invoice',
+    'online_payments_minimum_note' => 'Note: Online payments are supported only if amount is bigger than $1 or currency equivalent.',
     'payment_token_not_found' => 'Payment token not found, please try again. If an issue still persist, try with another payment method',
 ];

resources/views/portal/ninja2020/invoices/payment.blade.php

@@ -40,7 +40,7 @@
                                                 <a href="#" @click="{ open = false }" data-company-gateway-id="{{ $payment_method['company_gateway_id'] }}" data-gateway-type-id="{{ $payment_method['gateway_type_id'] }}" class="block px-4 py-2 text-sm leading-5 text-gray-700 dropdown-gateway-button hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900" data-cy="payment-method">
                                                     {{ \App\Models\CompanyGateway::find($payment_method['company_gateway_id'])->firstOrFail()->getConfigField('name') }}
                                                 </a>
-                                            @else
+                                            @elseif($total > 0)
                                                 <a href="#" @click="{ open = false }" data-company-gateway-id="{{ $payment_method['company_gateway_id'] }}" data-gateway-type-id="{{ $payment_method['gateway_type_id'] }}" class="block px-4 py-2 text-sm leading-5 text-gray-700 dropdown-gateway-button hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900" data-cy="payment-method">
                                                     {{ $payment_method['label'] }}
                                                 </a>
@@ -151,6 +151,10 @@
                     </div>
                 </div>
                 @endforeach
+
+                @if(intval($total) == 0)
+                    <small>* {{ ctrans('texts.online_payments_minimum_note') }}</small>
+                @endif
             </div>
         </div>
     </div>

resources/views/portal/ninja2020/layout/clean.blade.php

@@ -69,6 +69,12 @@
     @include('portal.ninja2020.components.primary-color')
 
     <body class="antialiased {{ $custom_body_class ?? '' }}">
+        @if(session()->has('message'))
+            <div class="py-1 text-sm text-center text-white bg-primary disposable-alert">
+                {{ session('message') }}
+            </div>
+        @endif
+
         @yield('body')
 
         <script src="https://cdn.jsdelivr.net/npm/cookieconsent@3/build/cookieconsent.min.js" data-cfasync="false"></script>