Merge branch 'master' of github.com:akaunting/akaunting

app/Http/Controllers/Sales/Customers.php

@@ -320,28 +320,4 @@ class Customers extends Controller
 
         return response()->json($customer);
     }
-
-    public function field(BaseRequest $request)
-    {
-        $html = '';
-
-        if ($request['fields']) {
-            foreach ($request['fields'] as $field) {
-                switch ($field) {
-                    case 'password':
-                        $html .= \Form::passwordGroup('password', trans('auth.password.current'), 'key', [], 'col-md-6 password');
-                        break;
-                    case 'password_confirmation':
-                        $html .= \Form::passwordGroup('password_confirmation', trans('auth.password.current_confirm'), 'key', [], 'col-md-6 password');
-                        break;
-                }
-            }
-        }
-
-        $json = [
-            'html' => $html
-        ];
-
-        return response()->json($json);
-    }
 }

app/Http/Requests/Common/Widget.php

@@ -27,6 +27,7 @@ class Widget extends FormRequest
             'dashboard_id' => 'required|integer',
             'name' => 'required|string',
             'class' => 'required',
+            'sort' => 'integer',
         ];
     }
 }

app/Models/Common/Widget.php

@@ -4,10 +4,11 @@ namespace App\Models\Common;
 
 use App\Abstracts\Model;
 use Bkwld\Cloner\Cloneable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Widget extends Model
 {
-    use Cloneable;
+    use Cloneable, HasFactory;
 
     protected $table = 'widgets';
 
@@ -36,4 +37,14 @@ class Widget extends Model
     {
         return $this->hasManyThrough('App\Models\Auth\User', 'App\Models\Common\Dashboard');
     }
+
+    /**
+     * Create a new factory instance for the model.
+     *
+     * @return \Illuminate\Database\Eloquent\Factories\Factory
+     */
+    protected static function newFactory()
+    {
+        return \Database\Factories\Widget::new();
+    }
 }