From f773a5df13c18288cea599c7facf6b471b93584b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 3 Dec 2017 15:16:09 +0200
Subject: [PATCH] Add recurring invoices button to the client portal dashboard

---
 app/Http/Controllers/AccountController.php    |  1 +
 resources/views/accounts/tax_rates.blade.php  | 13 +++++++------
 resources/views/invited/dashboard.blade.php   | 19 +++++++++++++------
 .../payments/paymentmethods_list.blade.php    |  6 ++++--
 resources/views/public_list.blade.php         |  1 +
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 9f1e8ed7787d..003b55e6c0da 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -494,6 +494,7 @@ class AccountController extends BaseController
             'account' => Auth::user()->account,
             'title' => trans('texts.tax_rates'),
             'taxRates' => TaxRate::scope()->whereIsInclusive(false)->get(),
+            'countInvoices' => Invoice::scope()->withTrashed()->count(),
         ];
 
         return View::make('accounts.tax_rates', $data);
diff --git a/resources/views/accounts/tax_rates.blade.php b/resources/views/accounts/tax_rates.blade.php
index b0b1dc1f86b1..d624663997c4 100644
--- a/resources/views/accounts/tax_rates.blade.php
+++ b/resources/views/accounts/tax_rates.blade.php
@@ -35,11 +35,12 @@
         ->label('&nbsp;')
         ->value(1) !!}
 
-    {!! Former::checkbox('inclusive_taxes')
-        ->text(trans('texts.inclusive_taxes_help'))
-        ->label('&nbsp;')
-        ->value(1) !!}
-
+    @if ($account->inclusive_taxes || $countInvoices <= 10)
+        {!! Former::checkbox('inclusive_taxes')
+            ->text(trans('texts.inclusive_taxes_help'))
+            ->label('&nbsp;')
+            ->value(1) !!}
+    @endif
 
     {!! Former::checkbox('include_item_taxes_inline')
         ->text(trans('texts.include_item_taxes_inline'))
@@ -84,7 +85,7 @@
 
   <script type="text/javascript">
     $(function() {
-        @if (App\Models\Invoice::scope()->withTrashed()->count())
+        @if ($countInvoices > 0)
             $('#inclusive_taxes').change(function() {
                 swal("{{ trans('texts.inclusive_taxes_warning') }}");
             })
diff --git a/resources/views/invited/dashboard.blade.php b/resources/views/invited/dashboard.blade.php
index 120e2a65eefa..f44ae8c3602b 100644
--- a/resources/views/invited/dashboard.blade.php
+++ b/resources/views/invited/dashboard.blade.php
@@ -341,13 +341,20 @@
             </div>
         </div>
 
-        @if (!empty($account->getTokenGatewayId()))
-                <div class="row">
-                    <div class="col-xs-12">
-                    @include('payments.paymentmethods_list')
-                </div>
+        <div class="row">
+            <div class="col-xs-12">
+                @if (!empty($account->getTokenGatewayId()))
+                    <div class="pull-left">
+                        @include('payments.paymentmethods_list')
+                    </div>
+                @endif
+                @if ($client->hasRecurringInvoices())
+                    <div class="pull-right">
+                        {!! Button::primary(trans("texts.recurring_invoices"))->asLinkTo(URL::to('/client/invoices/recurring')) !!}
+                    </div>
+                @endif
+            </div>
         </div>
-        @endif
 
         <div class="row" id="account-row">
             <div class="col-md-2 invoices-from">
diff --git a/resources/views/payments/paymentmethods_list.blade.php b/resources/views/payments/paymentmethods_list.blade.php
index 30b998098bbe..a2dd535febca 100644
--- a/resources/views/payments/paymentmethods_list.blade.php
+++ b/resources/views/payments/paymentmethods_list.blade.php
@@ -78,8 +78,10 @@
 @endif
 
 @if ($invitationKey = $client->firstInvitationKey())
-    <h3>
-        {{ trans('texts.payment_methods') }}
+    <h3 style="margin-top:0px;">
+        <span style="padding-top:4px">
+            {{ trans('texts.payment_methods') }}
+        </span>
         @if ($account->getGatewayByType(GATEWAY_TYPE_CREDIT_CARD)
             && $account->getGatewayByType(GATEWAY_TYPE_TOKEN)
             && $account->token_billing_type_id != TOKEN_BILLING_DISABLED)
diff --git a/resources/views/public_list.blade.php b/resources/views/public_list.blade.php
index 970280fb9050..d1a4676f7de4 100644
--- a/resources/views/public_list.blade.php
+++ b/resources/views/public_list.blade.php
@@ -48,6 +48,7 @@
                 {!! Button::primary(trans("texts.recurring_invoices"))->asLinkTo(URL::to('/client/invoices/recurring')) !!}
             </div>
         @endif
+
         <h3>{{ $title }}</h3>
 
 		{!! Datatable::table()