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

.gitattributes

@@ -3,3 +3,4 @@
 *.scss linguist-vendored
 *.js linguist-vendored
 CHANGELOG.md export-ignore
+

Dockerfile

@@ -6,13 +6,14 @@ RUN apt install -y sendmail libpng-dev
 
 RUN docker-php-ext-install gd
 
-RUN printf 'upload_max_filesize=30M;\npost_max_size=30M;\nmax_execution_time=600;\nmax_input_time=600;\n' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini;
+RUN printf 'upload_max_filesize=300M;\npost_max_size=300M;\nmax_execution_time=600;\nmax_input_time=600;\n' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini;
+RUN echo 'pm.max_children = 100' >> /usr/local/etc/php-fpm.d/zz-docker.conf
 
 COPY database /var/www/database
 
 COPY composer-prod.* /var/www/
 
-RUN composer clearcache && COMPOSER=composer-prod.json composer update --no-scripts
+RUN composer clearcache && COMPOSER=composer-prod.json composer install --no-scripts
 
 COPY . /var/www
 

Jenkinsfile

@@ -8,7 +8,7 @@ pipeline {
   stages {
     stage('build') {
       steps {
-        sh 'docker build  -t registry.willaspace.com/willaspace/$IMAGE_NAME:latest .'
+        sh 'cd /home/administrator/apps/$IMAGE_NAME/;docker build  -t registry.willaspace.com/willaspace/$IMAGE_NAME:latest .'
         sh 'cd /home/administrator/apps/$IMAGE_NAME/;sudo ./BuildDocker'
       }
     }
@@ -16,8 +16,10 @@ pipeline {
     stage('deploy') {
       steps {
         sh 'cd /home/administrator/apps/$IMAGE_NAME/ ; docker-compose up -d'
+        sh 'docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update"'
 	    sh 'docker exec willaengine service cron start'
         sh 'docker exec willaengine php artisan config:cache'
+        sh 'docker exec willaengine php artisan route:cache'
       }
     }
 

app/Console/Kernel.php

@@ -29,6 +29,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('sms:update:status rahyab')->everyTwoHours();
         $schedule->command('domain:update_ssl_expiry_date')->daily(); # update SSL expired_at
         $schedule->command('domain:update_domain_expiry_date')->daily(); # update domain expired_at
+        $schedule->command('make:sitemap')->daily(); # make sitemap
     }
 
     /**

app/Exceptions/Handler.php

@@ -2,10 +2,12 @@
 
 namespace App\Exceptions;
 
-use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Throwable;
+use WM\Core\Exceptions\HasRelationException;
 use WM\Core\Exceptions\ValidationErrorException;
 use WM\Core\Services\Responser;
+use WM\WebBuilder\Exceptions\SiteBannedException;
 
 class Handler extends ExceptionHandler
 {
@@ -31,7 +33,7 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param  \Throwable  $exception
+     * @param \Throwable $exception
      * @return void
      */
     public function report(Throwable $exception)
@@ -46,15 +48,20 @@ class Handler extends ExceptionHandler
     /**
      * Render an exception into an HTTP response.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Throwable  $exception
+     * @param \Illuminate\Http\Request $request
+     * @param \Throwable $exception
      * @return \Illuminate\Http\Response
      */
     public function render($request, Throwable $exception)
     {
         if ($exception instanceof ValidationErrorException) {
             return response()->json(Responser::error($exception->getMessageBody(), $exception->getMessageInfo()), 422);
+        } elseif ($exception instanceof SiteBannedException) {
+            return response()->view('webBuilder::errors.template_disabled', ['error' => 'business banned']);
+        } elseif ($exception instanceof HasRelationException) {
+            return response()->json(Responser::error([$exception->getMessage()]), 422);
         }
+
         return parent::render($request, $exception);
     }
 }

app/Http/Middleware/VerifyCsrfToken.php

@@ -19,6 +19,6 @@ class VerifyCsrfToken extends Middleware
      * @var array
      */
     protected $except = [
-        //
+        '/verify-payment'
     ];
 }

composer.json

@@ -15,11 +15,11 @@
         "laravel/passport": "^10",
         "laravel/tinker": "^2.0",
         "maatwebsite/excel": "^3.1",
-        "nestedset/willaarts": "^5.0.7",
+        "kalnoy/nestedset": "^6.0",
         "sentry/sentry-laravel": "^2.3",
         "spatie/laravel-medialibrary": "^8.0.0",
-        "silber/bouncer": "v1.0.0-rc.10",
         "io-developer/php-whois": "^4.0",
+        "silber/bouncer": "v1.0.0-rc.10",
         "wm/blog": "dev-master",
         "wm/common": "dev-master",
         "wm/core": "dev-master",
@@ -28,11 +28,11 @@
         "wm/product": "dev-master",
         "wm/service": "dev-master",
         "wm/store": "dev-master",
-	    "wm/admin": "dev-master",
-	    "wm/service-store": "dev-master",
-	    "wm/finance": "dev-master",
-	    "wm/warehouse": "dev-master",
+        "wm/finance": "dev-master",
+	"wm/admin": "dev-master",
+        "wm/web-builder": "dev-master",
         "wm/notification": "dev-master",
+        "wm/roll-call": "dev-master",
         "zircote/swagger-php": "^3.0"
     },
     "provide": {
@@ -125,15 +125,15 @@
         },
         {
             "type": "path",
-            "url": "./modules/wm-service-store"
+            "url": "./modules/wm-roll-call"
         },
         {
             "type": "path",
-            "url": "./modules/wm-finance"
+            "url": "./modules/wm-web-builder"
         },
         {
             "type": "path",
-            "url": "./modules/wm-warehouse"
+            "url": "./modules/wm-finance"
         },
         {
             "type": "path",

readme.md

@@ -66,6 +66,6 @@ or generate your own password by https://bcrypt-generator.com/
 
  ## Composer Section:
  1. please install and restart vscode
- 1. add to environment in path in windows
+ 2. add to environment in path in windows
 
  good luck

resources/js/Home/views/Home.vue

@@ -33,7 +33,6 @@
 
 <script>
     import IconTile from '@Global/components/Tiles/Icon-Tile';
-    import SquareIconTile from '@Global/components/Tiles/Square-Icon-Tile';
     import {mapGetters, mapActions} from "vuex";
     import routes from '@Global/utils/common/routes';
     import BigSectionTitle from '@Global/components/Dividers/Section-Title-Big';
@@ -45,7 +44,6 @@
         }),
         components: {
             IconTile,
-            SquareIconTile,
             BigSectionTitle
         },
         computed: {