close #398 Added: Add custom validation type : currency

akaunting · Jun 27, 2018 · 896bc1f · 896bc1f
1 parent e7c7a47
commit 896bc1f
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 9 deletions.
diff --git a/app/Http/Requests/Banking/Account.php b/app/Http/Requests/Banking/Account.php
@@ -26,7 +26,7 @@ public function rules()
         return [
             'name' => 'required|string',
             'number' => 'required|string',
-            'currency_code' => 'required|string',
+            'currency_code' => 'required|string|currency',
             'opening_balance' => 'required',
         ];
     }

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

diff --git a/app/Http/Requests/Expense/BillPayment.php b/app/Http/Requests/Expense/BillPayment.php
@@ -27,7 +27,7 @@ public function rules()
             'account_id' => 'required|integer',
             'paid_at' => 'required|date',
             'amount' => 'required',
-            'currency_code' => 'required|string',
+            '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/Payment.php b/app/Http/Requests/Expense/Payment.php
@@ -27,7 +27,7 @@ public function rules()
             'account_id' => 'required|integer',
             'paid_at' => 'required|date',
             'amount' => 'required',
-            'currency_code' => 'required|string',
+            'currency_code' => 'required|string|currency',
             'currency_rate' => 'required',
             'category_id' => 'required|integer',
             'payment_method' => 'required|string',

diff --git a/app/Http/Requests/Expense/Vendor.php b/app/Http/Requests/Expense/Vendor.php
@@ -42,7 +42,7 @@ public function rules()
         return [
             'name' => 'required|string',
             'email' => $email,
-            'currency_code' => 'required|string',
+            'currency_code' => 'required|string|currency',
         ];
     }
 }
diff --git a/app/Http/Requests/Income/Customer.php b/app/Http/Requests/Income/Customer.php
@@ -47,7 +47,7 @@ public function rules()
         return [
             'name' => 'required|string',
             'email' => $email,
-            'currency_code' => 'required|string',
+            'currency_code' => 'required|string|currency',
             'password' => $required . 'confirmed',
         ];
     }

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

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

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

diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
@@ -2,11 +2,33 @@
 
 namespace App\Http\Requests;
 
+use App\Models\Setting\Currency;
+
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Factory as ValidationFactory;
 
 class Request extends FormRequest
 {
 
+    public function __construct(ValidationFactory $validation)
+    {
+        $validation->extend(
+            'currency',
+            function ($attribute, $currency_code, $parameters) {
+                $currency = false;
+                $currencies = Currency::enabled()->pluck('name', 'code')->toArray();
+
+                if (array_key_exists($currency_code, $currencies)) {
+                    $currency = true;
+                }
+
+                return $currency;
+            },
+            trans('validation.custom.invalid_currency', ['attribute' => $currency_code])
+        );
+
+    }
+
     /**
      * Set the company id to the request.
      *

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