Support updating card on file

app/Http/Controllers/OnlinePaymentController.php

@@ -75,7 +75,7 @@ class OnlinePaymentController extends BaseController
             ]);
         }
 
-        if (! $invitation->invoice->canBePaid()) {
+        if (! $invitation->invoice->canBePaid() && ! request()->update) {
             return redirect()->to('view/' . $invitation->invitation_key);
         }
 
@@ -120,14 +120,16 @@ class OnlinePaymentController extends BaseController
         $gatewayTypeId = Session::get($invitation->id . 'gateway_type');
         $paymentDriver = $invitation->account->paymentDriver($invitation, $gatewayTypeId);
 
-        if (! $invitation->invoice->canBePaid()) {
+        if (! $invitation->invoice->canBePaid() && ! request()->update) {
             return redirect()->to('view/' . $invitation->invitation_key);
         }
 
         try {
             $paymentDriver->completeOnsitePurchase($request->all());
 
-            if ($paymentDriver->isTwoStep()) {
+            if (request()->update) {
+                return redirect('/client/dashboard')->withMessage(trans('texts.updated_payment_details'));
+            } elseif ($paymentDriver->isTwoStep()) {
                 Session::flash('warning', trans('texts.bank_account_verification_next_steps'));
             } else {
                 Session::flash('message', trans('texts.applied_payment'));

app/Models/Client.php

@@ -559,6 +559,15 @@ class Client extends EntityModel
     {
         return $this->payment_terms == -1 ? 0 : $this->payment_terms;
     }
+
+    public function firstInvitationKey()
+    {
+        if ($invoice = $this->invoices->first()) {
+            if ($invitation = $invoice->invitations->first()) {
+                return $invitation->invitation_key;
+            }
+        }
+    }
 }
 
 Client::creating(function ($client) {

app/Ninja/PaymentDrivers/BasePaymentDriver.php

@@ -157,6 +157,11 @@ class BasePaymentDriver
             return redirect()->to('view/' . $this->invitation->invitation_key);
         }
 
+        $url = 'payment/' . $this->invitation->invitation_key;
+        if (request()->update) {
+            $url .= '?update=true';
+        }
+
         $data = [
             'details' => ! empty($input['details']) ? json_decode($input['details']) : false,
             'accountGateway' => $this->accountGateway,
@@ -164,7 +169,7 @@ class BasePaymentDriver
             'gateway' => $gateway,
             'showAddress' => $this->accountGateway->show_address,
             'showBreadcrumbs' => false,
-            'url' => 'payment/' . $this->invitation->invitation_key,
+            'url' => $url,
             'amount' => $this->invoice()->getRequestedAmount(),
             'invoiceNumber' => $this->invoice()->invoice_number,
             'client' => $this->client(),
@@ -293,7 +298,7 @@ class BasePaymentDriver
             }
         }
 
-        if ($this->isTwoStep()) {
+        if ($this->isTwoStep() || request()->update) {
             return;
         }
 

resources/lang/en/texts.php

@@ -2269,6 +2269,9 @@ $LANG = array(
     'select_label' => 'Select Label',
     'label' => 'Label',
     'service' => 'Service',
+    'update_payment_details' => 'Update payment details',
+    'updated_payment_details' => 'Successfully updated payment details',
+    'update_credit_card' => 'Update Credit Card',
 
 );
 

resources/views/payments/braintree/paypal.blade.php

@@ -29,7 +29,7 @@
 
     <center>
         @if(isset($amount))
-            {!! Button::success(strtoupper(trans('texts.pay_now') . ' - ' . $account->formatMoney($amount, $client, CURRENCY_DECORATOR_CODE)  ))
+            {!! Button::success(request()->update ? strtoupper(trans('texts.submit')) : strtoupper(trans('texts.pay_now') . ' - ' . $account->formatMoney($amount, $client, CURRENCY_DECORATOR_CODE)  ))
                             ->submit()
                             ->large() !!}
         @else

resources/views/payments/credit_card.blade.php

@@ -316,11 +316,12 @@
     <p>&nbsp;</p>
     <center>
         @if (isset($invitation))
-            {!! Button::normal(strtoupper(trans('texts.cancel')))->large()->asLinkTo($invitation->getLink()) !!}
+            {!! Button::normal(strtoupper(trans('texts.cancel')))->large()->asLinkTo(HTMLUtils::previousUrl('/credits')) !!}
             &nbsp;&nbsp;
         @endif
+
         @if (isset($amount))
-            {!! Button::success(strtoupper(trans('texts.pay_now') . ' - ' . $account->formatMoney($amount, $client, CURRENCY_DECORATOR_CODE)  ))
+            {!! Button::success(request()->update ? strtoupper(trans('texts.submit')) : strtoupper(trans('texts.pay_now') . ' - ' . $account->formatMoney($amount, $client, CURRENCY_DECORATOR_CODE)  ))
                             ->submit()
                             ->large() !!}
         @else

resources/views/payments/payment_method.blade.php

@@ -15,7 +15,11 @@
                         <header>
                             @if ($client && isset($invoiceNumber))
                                 <h2>{{ $client->getDisplayName() }}</h2>
+                                @if (request()->update)
+                                    <h3>{{ trans('texts.update_payment_details') }}</h3>
+                                @else
                                     <h3>{{ trans('texts.invoice') . ' ' . $invoiceNumber }}<span>|&nbsp; {{ trans('texts.amount_due') }}: <em>{{ $account->formatMoney($amount, $client, CURRENCY_DECORATOR_CODE) }}</em></span></h3>
+                                @endif
                             @elseif ($paymentTitle)
                                 <h2>{{ $paymentTitle }}
                                     @if(isset($paymentSubtitle))

resources/views/payments/paymentmethods_list.blade.php

@@ -77,9 +77,18 @@
     </script>
 @endif
 
-@if(!empty($paymentMethods) && count($paymentMethods))
+@if ($invitationKey = $client->firstInvitationKey())
-    <h3>{{ trans('texts.payment_methods') }}</h3>
+    <h3>
+        {{ trans('texts.payment_methods') }}
+        @if ($account->getGatewayByType(GATEWAY_TYPE_CREDIT_CARD)
+            && $account->getGatewayByType(GATEWAY_TYPE_TOKEN)
+            && $account->token_billing_type_id != TOKEN_BILLING_DISABLED)
+            &nbsp;&nbsp;
+            {!! Button::success(strtoupper(trans('texts.update_credit_card')))->asLinkTo(URL::to("/payment/$invitationKey/credit_card?update=true")) !!}
+        @endif
+    </h3>
 
+    @if(!empty($paymentMethods) && count($paymentMethods))
         @foreach ($paymentMethods as $paymentMethod)
         <div class="payment_method">
                     <span class="payment_method_img_container">
@@ -123,7 +132,7 @@
         </div>
         @endforeach
     @endif
-
+@endif
 
 <center>
     @if (false && $account->getGatewayByType(GATEWAY_TYPE_CREDIT_CARD) && $account->getGatewayByType(GATEWAY_TYPE_TOKEN))

resources/views/payments/stripe/bank_transfer.blade.php

@@ -240,7 +240,7 @@
                         ->large() !!}
 
         @if ($accountGateway->getPlaidEnabled() && !empty($amount))
-            {!! Button::success(strtoupper(trans('texts.pay_now') . ' - ' . $account->formatMoney($amount, $client, CURRENCY_DECORATOR_CODE)  ))
+            {!! Button::success(request()->update ? strtoupper(trans('texts.submit')) : strtoupper(trans('texts.pay_now') . ' - ' . $account->formatMoney($amount, $client, CURRENCY_DECORATOR_CODE)  ))
                         ->submit()
                         ->withAttributes(['style'=>'display:none', 'id'=>'pay_now_button'])
                         ->large() !!}

resources/views/payments/wepay/bank_transfer.blade.php

@@ -33,7 +33,7 @@
         {!! Button::normal(strtoupper(trans('texts.cancel')))->large()->asLinkTo($invitation->getLink()) !!}
           
         @if(isset($amount) && empty($paymentMethodPending))
-            {!! Button::success(strtoupper(trans('texts.pay_now') . ' - ' . $account->formatMoney($amount, $client, CURRENCY_DECORATOR_CODE)  ))
+            {!! Button::success(request()->update ? strtoupper(trans('texts.submit')) : strtoupper(trans('texts.pay_now') . ' - ' . $account->formatMoney($amount, $client, CURRENCY_DECORATOR_CODE)  ))
                             ->submit()
                             ->large() !!}
         @else