close #464 Fixed: 0 Money payment in invoice and bill;

Transfer, Bill, Bill Payment, Bill Total, Payment, Invoice, Invoice Payment, Invoice Total, Revenue.
akaunting · Aug 30, 2018 · eb50237 · eb50237
1 parent fc0048c
commit eb50237
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 17 deletions.
diff --git a/app/Http/Requests/Banking/Transfer.php b/app/Http/Requests/Banking/Transfer.php
@@ -26,7 +26,7 @@ public function rules()
         return [
             'from_account_id' => 'required|integer',
             'to_account_id' => 'required|integer',
-            'amount' => 'required',
+            'amount' => 'required|amount',
             'transferred_at' => 'required|date',
             'payment_method' => 'required|string',
         ];

diff --git a/app/Http/Requests/Expense/Bill.php b/app/Http/Requests/Expense/Bill.php
@@ -39,7 +39,7 @@ public function rules()
             'bill_status_code' => 'required|string',
             'billed_at' => 'required|date',
             'due_at' => 'required|date',
-            'amount' => 'required',
+            'amount' => 'required|amount',
             'currency_code' => 'required|string|currency',
             'currency_rate' => 'required',
             'vendor_id' => 'required|integer',

diff --git a/app/Http/Requests/Expense/BillPayment.php b/app/Http/Requests/Expense/BillPayment.php
@@ -27,7 +27,7 @@ public function rules()
         return [
             'account_id' => 'required|integer',
             'paid_at' => 'required|date',
-            'amount' => 'required',
+            'amount' => 'required|amount',
             'currency_code' => 'required|string|currency',
             'payment_method' => 'required|string',
             'attachment' => 'mimes:' . setting('general.file_types', 'pdf,jpeg,jpg,png'),

diff --git a/app/Http/Requests/Expense/BillTotal.php b/app/Http/Requests/Expense/BillTotal.php
@@ -26,7 +26,7 @@ public function rules()
         return [
             'bill_id' => 'required|integer',
             'name' => 'required|string',
-            'amount' => 'required',
+            'amount' => 'required|amount',
             'sort_order' => 'required|integer',
         ];
     }

diff --git a/app/Http/Requests/Expense/Payment.php b/app/Http/Requests/Expense/Payment.php
@@ -27,7 +27,7 @@ public function rules()
         return [
             'account_id' => 'required|integer',
             'paid_at' => 'required|date',
-            'amount' => 'required',
+            'amount' => 'required|amount',
             'currency_code' => 'required|string|currency',
             'currency_rate' => 'required',
             'vendor_id' => 'nullable|integer',

diff --git a/app/Http/Requests/Income/Invoice.php b/app/Http/Requests/Income/Invoice.php
@@ -39,7 +39,7 @@ public function rules()
             'invoice_status_code' => 'required|string',
             'invoiced_at' => 'required|date',
             'due_at' => 'required|date',
-            'amount' => 'required',
+            'amount' => 'required|amount',
             'currency_code' => 'required|string|currency',
             'currency_rate' => 'required',
             'customer_id' => 'required|integer',

diff --git a/app/Http/Requests/Income/InvoicePayment.php b/app/Http/Requests/Income/InvoicePayment.php
@@ -27,7 +27,7 @@ public function rules()
         return [
             'account_id' => 'required|integer',
             'paid_at' => 'required|date',
-            'amount' => 'required',
+            'amount' => 'required|amount',
             'currency_code' => 'required|string|currency',
             'payment_method' => 'required|string',
             'attachment' => 'mimes:jpeg,jpg,png,pdf',

diff --git a/app/Http/Requests/Income/InvoiceTotal.php b/app/Http/Requests/Income/InvoiceTotal.php
@@ -26,7 +26,7 @@ public function rules()
         return [
             'invoice_id' => 'required|integer',
             'name' => 'required|string',
-            'amount' => 'required',
+            'amount' => 'required|amount',
             'sort_order' => 'required|integer',
         ];
     }

diff --git a/app/Http/Requests/Income/Revenue.php b/app/Http/Requests/Income/Revenue.php
@@ -27,7 +27,7 @@ public function rules()
         return [
             'account_id' => 'required|integer',
             'paid_at' => 'required|date',
-            'amount' => 'required',
+            'amount' => 'required|amount',
             'currency_code' => 'required|string|currency',
             'currency_rate' => 'required',
             'customer_id' => 'nullable|integer',

diff --git a/app/Providers/ValidationServiceProvider.php b/app/Providers/ValidationServiceProvider.php
@@ -18,20 +18,36 @@ public function boot()
         $currency_code = null;
 
         Validator::extend('currency', function ($attribute, $value, $parameters, $validator) use(&$currency_code) {
-                $status = false;
+            $status = false;
 
-                $currencies = Currency::enabled()->pluck('name', 'code')->toArray();
+            $currencies = Currency::enabled()->pluck('name', 'code')->toArray();
 
-                if (array_key_exists($value, $currencies)) {
-                    $status = true;
-                }
+            if (array_key_exists($value, $currencies)) {
+                $status = true;
+            }
 
-                $currency_code = $value;
+            $currency_code = $value;
 
-                return $status;
-            },
+            return $status;
+        },
             trans('validation.custom.invalid_currency', ['attribute' => $currency_code])
         );
+
+        $amount = null;
+
+        Validator::extend('amount', function ($attribute, $value, $parameters, $validator) use (&$amount) {
+            $status = false;
+
+            if ($value > 0) {
+                $status = true;
+            }
+
+            $amount = $value;
+
+            return $status;
+        },
+            trans('validation.custom.invalid_amount', ['attribute' => $amount])
+        );
     }
 
     /**

diff --git a/resources/lang/en-GB/validation.php b/resources/lang/en-GB/validation.php
@@ -102,6 +102,7 @@
             'rule-name' => 'custom-message',
         ],
         'invalid_currency' => 'The :attribute code is invalid.',
+        'invalid_amount'   => 'The amount :attribute is invalid.',
     ],
 
     /*