From 28cc7d5e52a8dd8fa17a74d3de67f798674af2a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Mon, 6 Apr 2020 23:23:05 +0200
Subject: [PATCH] Client portal improvements: (#3595)

-  Hide Create Payment Method if no gateways exist
- Payment Screen, add $amount
- Fix breadcrumbs
---
 .../ClientPortal/PaymentMethodController.php  |   3 +-
 .../CreatePaymentMethodRequest.php            |  30 ++++++++++++++++++
 public/images/invoiceninja-white-logo.png     | Bin 0 -> 6944 bytes
 resources/lang/en/texts.php                   |   1 +
 .../general/sidebar/desktop.blade.php         |   2 +-
 .../general/sidebar/mobile.blade.php          |   2 +-
 .../gateways/stripe/credit_card.blade.php     |   2 +-
 .../ninja2020/invoices/payment.blade.php      |   8 +++++
 .../ninja2020/payment_methods/index.blade.php |   4 ++-
 routes/breadcrumbs.php                        |   8 ++++-
 10 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 app/Http/Requests/ClientPortal/CreatePaymentMethodRequest.php
 create mode 100644 public/images/invoiceninja-white-logo.png

diff --git a/app/Http/Controllers/ClientPortal/PaymentMethodController.php b/app/Http/Controllers/ClientPortal/PaymentMethodController.php
index 3432732b98a6..8503afd95d86 100644
--- a/app/Http/Controllers/ClientPortal/PaymentMethodController.php
+++ b/app/Http/Controllers/ClientPortal/PaymentMethodController.php
@@ -13,6 +13,7 @@ namespace App\Http\Controllers\ClientPortal;
 
 use App\Events\Payment\Methods\MethodDeleted;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\ClientPortal\CreatePaymentMethodRequest;
 use App\Models\ClientGatewayToken;
 use App\Utils\Traits\MakesDates;
 use Illuminate\Http\Request;
@@ -45,7 +46,7 @@ class PaymentMethodController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function create()
+    public function create(CreatePaymentMethodRequest $request)
     {
         $gateway = auth()->user()->client->getCreditCardGateway();
 
diff --git a/app/Http/Requests/ClientPortal/CreatePaymentMethodRequest.php b/app/Http/Requests/ClientPortal/CreatePaymentMethodRequest.php
new file mode 100644
index 000000000000..8af355a95f79
--- /dev/null
+++ b/app/Http/Requests/ClientPortal/CreatePaymentMethodRequest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests\ClientPortal;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class CreatePaymentMethodRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return auth()->user()->client->getCreditCardGateway() ? true : false;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/public/images/invoiceninja-white-logo.png b/public/images/invoiceninja-white-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..5add6d9ccb591e0293dbc74b49144980fd89ffdc
GIT binary patch
literal 6944
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

literal 0
HcmV?d00001

diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index f3097930291e..e2762695157a 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -3194,4 +3194,5 @@ return [
 
     'open_in_new_tab' => 'Open in new tab',
     'complete_your_payment' => 'Complete payment',
+    'authorize_for_future_use' => 'Authorize payment method for future use',
 ];
diff --git a/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php b/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php
index ef6183732bd4..3ed585d916e0 100644
--- a/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php
+++ b/resources/views/portal/ninja2020/components/general/sidebar/desktop.blade.php
@@ -3,7 +3,7 @@
         <div class="flex items-center h-16 flex-shrink-0 px-4 bg-blue-900">
             <a href="{{ route('client.dashboard') }}">
                 <img class="h-6 w-auto"
-                     src="{!! $settings->company_logo ?: 'https://www.invoiceninja.com/wp-content/themes/invoice-ninja/images/logo.png' !!}"
+                     src="{!! $settings->company_logo ?: asset('images/invoiceninja-white-logo.png') !!}"
                      alt="{{ config('app.name') }}"/>
             </a>
         </div>
diff --git a/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php b/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php
index fde52895ca43..0a03a200023a 100644
--- a/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php
+++ b/resources/views/portal/ninja2020/components/general/sidebar/mobile.blade.php
@@ -15,7 +15,7 @@
         </div>
         <div class="flex-shrink-0 flex items-center px-4">
             <img class="h-6 w-auto"
-                 src="{!! $settings->company_logo ?: 'https://www.invoiceninja.com/wp-content/themes/invoice-ninja/images/logo.png' !!}"
+                 src="{!! $settings->company_logo ?: asset('images/invoiceninja-white-logo.png') !!}"
                  alt="{{ config('app.name') }}"/>
         </div>
         <div class="mt-5 flex-1 h-0 overflow-y-auto">
diff --git a/resources/views/portal/ninja2020/gateways/stripe/credit_card.blade.php b/resources/views/portal/ninja2020/gateways/stripe/credit_card.blade.php
index dbed364d4b72..13495b23a4c2 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/credit_card.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/credit_card.blade.php
@@ -7,7 +7,7 @@
 @endpush
 
 @section('header')
-    Insert breadcrumbs..
+    {{ Breadcrumbs::render('invoices.pay_now') }}
 @endsection
 
 @section('body')
diff --git a/resources/views/portal/ninja2020/invoices/payment.blade.php b/resources/views/portal/ninja2020/invoices/payment.blade.php
index db6ab3729a58..f9255f2bee24 100644
--- a/resources/views/portal/ninja2020/invoices/payment.blade.php
+++ b/resources/views/portal/ninja2020/invoices/payment.blade.php
@@ -99,6 +99,14 @@
                                         @endif
                                     </dd>
                                 </div>
+                                <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.amount') }}
+                                    </dt>
+                                    <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{ App\Utils\Number::formatMoney($invoice->amount, $invoice->client) }}
+                                    </dd>
+                                </div>
                             </dl>
                         </div>
                     </div>
diff --git a/resources/views/portal/ninja2020/payment_methods/index.blade.php b/resources/views/portal/ninja2020/payment_methods/index.blade.php
index e91c932a2232..f3654984b5ae 100644
--- a/resources/views/portal/ninja2020/payment_methods/index.blade.php
+++ b/resources/views/portal/ninja2020/payment_methods/index.blade.php
@@ -21,7 +21,9 @@
                     <div class="inline-flex rounded-md shadow-sm">
                         <input type="hidden" name="hashed_ids">
                         <input type="hidden" name="action" value="payment">
-                        <a href="{{ route('client.payment_methods.create') }}" class="button button-primary">@lang('texts.add_payment_method')</a>
+                        @if(auth()->user()->client->getCreditCardGateway())
+                            <a href="{{ route('client.payment_methods.create') }}" class="button button-primary">@lang('texts.add_payment_method')</a>
+                        @endif
                     </div>
                 </div>
             </div>
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 8b22d20c290c..10435ff2799d 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -89,6 +89,12 @@ Breadcrumbs::for('credits.show', function ($trail, $credit) {
     $trail->push(sprintf('%s: %s', ctrans('texts.credits'), $credit->hashed_id), route('client.credits.index', $credit->hashed_id));
 });
 
+// Invoices > Payment
+Breadcrumbs::for('invoices.pay_now', function ($trail) {
+    $trail->parent('invoices');
+    $trail->push(ctrans('texts.pay_now'));
+});
+
 // Dashboard > Client
 Breadcrumbs::for('clients', function ($trail) {
     $trail->parent('dashboard');
@@ -107,4 +113,4 @@ Breadcrumbs::for('clients.edit', function ($trail, $client) {
 
 Breadcrumbs::for('clients.create', function ($trail) {
     $trail->parent('clients');
-});
+});
\ No newline at end of file