akaunting 3.0 (the last dance)

app/Http/Requests/Common/Company.php

@@ -21,7 +21,7 @@ class Company extends FormRequest
 
         return [
             'name' => 'required|string',
-            'email' => 'required|email',
+            'email' => 'required|email:rfc,dns',
             'currency' => 'required|string',
             'domain' => 'nullable|string',
             'logo' => $logo,

app/Http/Requests/Common/Contact.php

@@ -14,13 +14,11 @@ class Contact extends FormRequest
     public function rules()
     {
         $email = '';
-        $required = '';
         $logo = 'nullable';
 
         $type = $this->request->get('type', 'customer');
 
-        // @todo must put contact types under a specific array, see category
-        if (empty(config('type.' . $type))) {
+        if (empty(config('type.contact.' . $type))) {
             $type = null;
         }
 
@@ -35,12 +33,8 @@ class Contact extends FormRequest
             $id = null;
         }
 
-        if (($this->request->get('create_user', 'false') === 'true') && empty($this->request->get('user_id'))) {
-            $required = 'required|';
-        }
-
         if (!empty($this->request->get('email'))) {
-            $email .= 'email|unique:contacts,NULL,'
+            $email .= 'email:rfc,dns|unique:contacts,NULL,'
                       . $id . ',id'
                       . ',company_id,' . $company_id
                       . ',type,' . $type
@@ -61,7 +55,6 @@ class Contact extends FormRequest
             'email' => $email,
             'user_id' => 'integer|nullable',
             'currency_code' => 'required|string|currency',
-            'password' => $required . 'confirmed',
             'enabled' => 'integer|boolean',
             'logo' => $logo,
         ];

app/Http/Requests/Common/CustomMail.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Common;
+
+use App\Abstracts\Http\FormRequest;
+
+class CustomMail extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'to'        => 'required|email',
+            'subject'   => 'required|string',
+            'body'      => 'required|string',
+        ];
+    }
+}

app/Http/Requests/Common/Dashboard.php

@@ -15,6 +15,7 @@ class Dashboard extends FormRequest
     {
         return [
             'name' => 'required|string',
+            'users' => 'required|array',
             //'enabled' => 'integer|boolean',
         ];
     }

app/Http/Requests/Common/Item.php

@@ -13,16 +13,25 @@ class Item extends FormRequest
      */
     public function rules()
     {
-        $picture = 'nullable';
+        $picture = $sale_price = $purchase_price = 'nullable';
 
         if ($this->files->get('picture')) {
             $picture = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024 . '|dimensions:max_width=1000,max_height=1000';
         }
 
+        if ($this->request->get('sale_information') == 'true') {
+            $sale_price = 'required';
+        }
+
+        if ($this->request->get('purchase_information') == 'true') {
+            $purchase_price = 'required';
+        }
+
         return [
+            'type' => 'required|string',
             'name' => 'required|string',
-            'sale_price' => 'required|regex:/^(?=.*?[0-9])[0-9.,]+$/',
-            'purchase_price' => 'required|regex:/^(?=.*?[0-9])[0-9.,]+$/',
+            'sale_price' => $sale_price . '|regex:/^(?=.*?[0-9])[0-9.,]+$/',
+            'purchase_price'=> $purchase_price . '|regex:/^(?=.*?[0-9])[0-9.,]+$/',
             'tax_ids' => 'nullable|array',
             'category_id' => 'nullable|integer',
             'enabled' => 'integer|boolean',

app/Http/Requests/Common/Widget.php

@@ -3,6 +3,7 @@
 namespace App\Http\Requests\Common;
 
 use App\Abstracts\Http\FormRequest;
+use Illuminate\Support\Str;
 
 class Widget extends FormRequest
 {
@@ -20,4 +21,11 @@ class Widget extends FormRequest
             'sort' => 'integer',
         ];
     }
+
+    public function messages()
+    {
+        return [
+            'class.required' => trans('validation.required', ['attribute' => Str::lower(trans_choice('general.types', 1))]),
+        ];
+    }
 }