Merge branch 'dev' of https://git.willaspace.com/WillaEngine-Project/WillaEngine into dev

app/Exceptions/Handler.php

@@ -4,6 +4,8 @@ namespace App\Exceptions;
 
 use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use WM\Core\Exceptions\ValidationErrorException;
+use WM\Core\Services\Responser;
 
 class Handler extends ExceptionHandler
 {
@@ -46,6 +48,9 @@ class Handler extends ExceptionHandler
      */
     public function render($request, Throwable $exception)
     {
+        if ($exception instanceof ValidationErrorException) {
+            return response()->json(Responser::error($exception->getMessageBody(), $exception->getMessageInfo()), 422);
+        }
         return parent::render($request, $exception);
     }
 }

composer.json

@@ -24,6 +24,7 @@
         "wm/portfolio": "dev-master",
         "wm/product": "dev-master",
         "wm/service": "dev-master",
+        "wm/store": "dev-dev",
         "zircote/swagger-php": "^3.0"
     },
     "provide": {
@@ -103,7 +104,10 @@
         {
             "type": "path",
             "url": "./modules/wm-service"
+        },
+        {
+            "type": "path",
+            "url": "./modules/wm-store"
         }
-
     ]
 }

package.json

@@ -34,6 +34,7 @@
         "izitoast": "^1.4.0",
         "jalali-moment": "^3.3.3",
         "loadash": "^1.0.0",
+        "moment": "^2.29.1",
         "object-to-formdata": "^2.1.2",
         "postcss-loader": "^3.0.0",
         "prismjs": "^1.21.0",
@@ -67,7 +68,7 @@
         "deepmerge": "^4.0.0",
         "fibers": "^4.0.1",
         "jquery": "^3.5.1",
-        "laravel-mix": "^4.0.15",
+        "laravel-mix": "^5.0.9",
         "material-design-icons-iconfont": "^4.0.3",
         "node-sass": "^4.14.1",
         "popper.js": "^2.0.0-next.4",