From f9fef333ecf11151ed04e3abb4c6a194a995f2a8 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 16 Jan 2017 14:51:43 +0200
Subject: [PATCH] Support refunding manual payment

---
 app/Ninja/Datatables/PaymentDatatable.php   | 4 +---
 app/Services/PaymentService.php             | 3 +++
 resources/views/accounts/tax_rate.blade.php | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Ninja/Datatables/PaymentDatatable.php b/app/Ninja/Datatables/PaymentDatatable.php
index 8af805a4aaed..ac24ed1dd3eb 100644
--- a/app/Ninja/Datatables/PaymentDatatable.php
+++ b/app/Ninja/Datatables/PaymentDatatable.php
@@ -131,9 +131,7 @@ class PaymentDatatable extends EntityDatatable
                 function ($model) {
                     return Auth::user()->can('editByOwner', [ENTITY_PAYMENT, $model->user_id])
                         && $model->payment_status_id >= PAYMENT_STATUS_COMPLETED
-                        && $model->refunded < $model->amount
-                        && $model->transaction_reference
-                        && in_array($model->gateway_id , static::$refundableGateways);
+                        && $model->refunded < $model->amount;
                 }
             ]
         ];
diff --git a/app/Services/PaymentService.php b/app/Services/PaymentService.php
index 687c730413e7..73438c95c7e3 100644
--- a/app/Services/PaymentService.php
+++ b/app/Services/PaymentService.php
@@ -161,6 +161,9 @@ class PaymentService extends BaseService
                         if ($paymentDriver->refundPayment($payment, $amount)) {
                             $successful++;
                         }
+                    } else {
+                        $payment->recordRefund($amount);
+                        $successful++;
                     }
                 }
             }
diff --git a/resources/views/accounts/tax_rate.blade.php b/resources/views/accounts/tax_rate.blade.php
index 57ed0245ae12..f3b8b2eb09c5 100644
--- a/resources/views/accounts/tax_rate.blade.php
+++ b/resources/views/accounts/tax_rate.blade.php
@@ -8,7 +8,8 @@
   {!! Former::open($url)->method($method)
       ->rules([
         'name' => 'required',
-        'rate' => 'required'
+        'rate' => 'required',
+        'is_inclusive' => 'required',
        ])
       ->addClass('warn-on-exit') !!}