diff --git a/app/Http/Requests/Banking/Account.php b/app/Http/Requests/Banking/Account.php index bbc16d74b..25e0f532f 100644 --- a/app/Http/Requests/Banking/Account.php +++ b/app/Http/Requests/Banking/Account.php @@ -28,6 +28,7 @@ class Account extends Request 'number' => 'required|string', 'currency_code' => 'required|string|currency', 'opening_balance' => 'required', + 'enabled' => 'integer|boolean', ]; } } diff --git a/app/Http/Requests/Common/Item.php b/app/Http/Requests/Common/Item.php index e6832a083..3b2f4a564 100644 --- a/app/Http/Requests/Common/Item.php +++ b/app/Http/Requests/Common/Item.php @@ -39,9 +39,9 @@ class Item extends Request 'sale_price' => 'required', 'purchase_price' => 'required', 'quantity' => 'required|integer', - 'tax_id' => 'integer', - 'category_id' => 'integer', - 'enabled' => 'integer', + 'tax_id' => 'nullable|integer', + 'category_id' => 'nullable|integer', + 'enabled' => 'integer|boolean', 'picture' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024, ]; } diff --git a/app/Http/Requests/Expense/Payment.php b/app/Http/Requests/Expense/Payment.php index cd7e3027a..e14198d30 100644 --- a/app/Http/Requests/Expense/Payment.php +++ b/app/Http/Requests/Expense/Payment.php @@ -29,7 +29,7 @@ class Payment extends Request 'amount' => 'required', 'currency_code' => 'required|string|currency', 'currency_rate' => 'required', - 'vendor_id' => 'integer', + 'vendor_id' => 'nullable|integer', 'category_id' => 'required|integer', 'payment_method' => 'required|string', 'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024, diff --git a/app/Http/Requests/Expense/Vendor.php b/app/Http/Requests/Expense/Vendor.php index fd7a5295e..9b4d1ea0d 100644 --- a/app/Http/Requests/Expense/Vendor.php +++ b/app/Http/Requests/Expense/Vendor.php @@ -40,11 +40,11 @@ class Vendor extends Request } return [ - 'user_id' => 'integer', + 'user_id' => 'nullable|integer', 'name' => 'required|string', 'email' => $email, 'currency_code' => 'required|string|currency', - 'enabled' => 'integer', + 'enabled' => 'integer|boolean', ]; } } diff --git a/app/Http/Requests/Income/Customer.php b/app/Http/Requests/Income/Customer.php index 2b8d19bc5..f57b4ab04 100644 --- a/app/Http/Requests/Income/Customer.php +++ b/app/Http/Requests/Income/Customer.php @@ -45,12 +45,12 @@ class Customer extends Request } return [ - 'user_id' => 'integer', + 'user_id' => 'nullable|integer', 'name' => 'required|string', 'email' => $email, 'currency_code' => 'required|string|currency', 'password' => $required . 'confirmed', - 'enabled' => 'integer', + 'enabled' => 'integer|boolean', ]; } } diff --git a/app/Http/Requests/Income/Revenue.php b/app/Http/Requests/Income/Revenue.php index 6f1f5fac6..f6cb5666f 100644 --- a/app/Http/Requests/Income/Revenue.php +++ b/app/Http/Requests/Income/Revenue.php @@ -29,7 +29,7 @@ class Revenue extends Request 'amount' => 'required', 'currency_code' => 'required|string|currency', 'currency_rate' => 'required', - 'customer_id' => 'integer', + 'customer_id' => 'nullable|integer', 'category_id' => 'required|integer', 'payment_method' => 'required|string', 'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024, diff --git a/app/Http/Requests/Setting/Currency.php b/app/Http/Requests/Setting/Currency.php index 28bb37f35..3d9f9e62a 100644 --- a/app/Http/Requests/Setting/Currency.php +++ b/app/Http/Requests/Setting/Currency.php @@ -37,8 +37,9 @@ class Currency extends Request 'name' => 'required|string', 'code' => 'required|string|unique:currencies,NULL,' . $id . ',id,company_id,' . $company_id . ',deleted_at,NULL', 'rate' => 'required', - 'enabled' => 'boolean', + 'enabled' => 'integer|boolean', 'default_currency' => 'boolean', + 'symbol_first' => 'nullable|boolean', ]; } }