From d96c8bd048856da4c4b0c7fd5dbb3cde10fd6cee Mon Sep 17 00:00:00 2001
From: Joshua Dwire <joshua@joshuadwire.com>
Date: Wed, 14 Sep 2016 14:31:44 -0400
Subject: [PATCH] Make min and max inclusive; remove .99 from max

---
 app/Ninja/Datatables/AccountGatewayDatatable.php | 13 ++++---------
 app/Ninja/PaymentDrivers/BasePaymentDriver.php   |  4 +---
 resources/views/accounts/payments.blade.php      |  6 ------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/app/Ninja/Datatables/AccountGatewayDatatable.php b/app/Ninja/Datatables/AccountGatewayDatatable.php
index 2116265c1061..f4f56c251168 100644
--- a/app/Ninja/Datatables/AccountGatewayDatatable.php
+++ b/app/Ninja/Datatables/AccountGatewayDatatable.php
@@ -72,20 +72,15 @@ class AccountGatewayDatatable extends EntityDatatable
                             $html .= $gatewayType->name . ' &mdash; ';
                         }
 
-                        // Decide how many nines to add to the end of the max.
-                        $currency = Utils::getFromCache(Session::get(SESSION_CURRENCY, DEFAULT_CURRENCY), 'currencies');
-                        $limit_max_adjustment = $currency->precision ? floatval('.' . str_repeat('9',
-                                $currency->precision)) : 0;
-
                         if ($accountGatewaySettings && $accountGatewaySettings->min_limit !== null && $accountGatewaySettings->max_limit !== null) {
-                            $html .= Utils::formatMoney($accountGatewaySettings->min_limit) . ' - ' . Utils::formatMoney($accountGatewaySettings->max_limit + $limit_max_adjustment);
+                            $html .= Utils::formatMoney($accountGatewaySettings->min_limit) . ' - ' . Utils::formatMoney($accountGatewaySettings->max_limit);
                         } elseif ($accountGatewaySettings && $accountGatewaySettings->min_limit !== null) {
                             $html .= trans('texts.min_limit',
                                 array('min' => Utils::formatMoney($accountGatewaySettings->min_limit))
                             );
                         } elseif ($accountGatewaySettings && $accountGatewaySettings->max_limit !== null) {
                             $html .= trans('texts.max_limit',
-                                array('max' => Utils::formatMoney($accountGatewaySettings->max_limit + $limit_max_adjustment))
+                                array('max' => Utils::formatMoney($accountGatewaySettings->max_limit))
                             );
                         } else {
                             $html .= trans('texts.no_limit');
@@ -155,8 +150,8 @@ class AccountGatewayDatatable extends EntityDatatable
                 function () use ($gatewayType) {
                     $accountGatewaySettings = AccountGatewaySettings::scope()->where('account_gateway_settings.gateway_type_id',
                         '=', $gatewayType->id)->first();
-                    $min = $accountGatewaySettings && $accountGatewaySettings->min_limit != null ? $accountGatewaySettings->min_limit : 'null';
-                    $max = $accountGatewaySettings && $accountGatewaySettings->max_limit != null ? $accountGatewaySettings->max_limit : 'null';
+                    $min = $accountGatewaySettings && $accountGatewaySettings->min_limit !== null ? $accountGatewaySettings->min_limit : 'null';
+                    $max = $accountGatewaySettings && $accountGatewaySettings->max_limit !== null ? $accountGatewaySettings->max_limit : 'null';
 
                     return "javascript:showLimitsModal('{$gatewayType->name}',{$gatewayType->id},$min,$max)";
                 },
diff --git a/app/Ninja/PaymentDrivers/BasePaymentDriver.php b/app/Ninja/PaymentDrivers/BasePaymentDriver.php
index 022c934eb206..e19046120e8a 100644
--- a/app/Ninja/PaymentDrivers/BasePaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/BasePaymentDriver.php
@@ -826,9 +826,7 @@ class BasePaymentDriver
                 return false;
             }
 
-            if ($accountGatewaySettings->max_limit !== null &&  $invoice->balance >= $accountGatewaySettings->max_limit + 1) {
-                // The max is limit_max + 0.99, so we add 1 to max_limit
-                // Then, if the balance is greater than or equal to that value, it's over the max.
+            if ($accountGatewaySettings->max_limit !== null &&  $invoice->balance > $accountGatewaySettings->max_limit) {
                 return false;
             }
         }
diff --git a/resources/views/accounts/payments.blade.php b/resources/views/accounts/payments.blade.php
index 512a01c6bfa3..9f40f9229d44 100644
--- a/resources/views/accounts/payments.blade.php
+++ b/resources/views/accounts/payments.blade.php
@@ -85,9 +85,6 @@
                                     <span class="input-group-addon">{{ $currency->symbol }}</span>
                                     <input type="number" class="form-control" min="0" id="payment-limit-min"
                                            name="limit_min">
-                                    @if ($currency->precision)
-                                        <span class="input-group-addon">{{ $currency->decimal_separator }}{{ str_repeat( '0', $currency->precision) }}</span>
-                                    @endif
                                 </div>
                                 <label><input type="checkbox" id="payment-limit-min-enable"
                                               name="limit_min_enable"> {{ trans('texts.enable_min') }}</label>
@@ -101,9 +98,6 @@
                                     <span class="input-group-addon">{{ $currency->symbol }}</span>
                                     <input type="number" class="form-control" min="0" id="payment-limit-max"
                                            name="limit_max">
-                                    @if ($currency->precision)
-                                        <span class="input-group-addon">{{ $currency->decimal_separator }}{{ str_repeat( '9', $currency->precision) }}</span>
-                                    @endif
                                 </div>
                                 <label><input type="checkbox" id="payment-limit-max-enable"
                                               name="limit_max_enable"> {{ trans('texts.enable_max') }}</label>