Merge pull request #231 from jitendra-webkul/master

Issue #230 fixed
krayin · Sep 17, 2021 · 492e6eb · 492e6eb
2 parents 72d380a + 7c66a7f
commit 492e6eb
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 7 deletions.
diff --git a/config/flare.php b/config/flare.php
@@ -34,17 +34,29 @@
         'grouping_type' => null,
         'report_logs' => true,
         'maximum_number_of_collected_logs' => 200,
+        'censor_request_body_fields' => ['password'],
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Reporting Log statements
     |--------------------------------------------------------------------------
     |
-    | If this setting is `false` log statements won't be send as events to Flare,
+    | If this setting is `false` log statements won't be sent as events to Flare,
     | no matter which error level you specified in the Flare log channel.
     |
     */
 
     'send_logs_as_events' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Censor request body fields
+    |--------------------------------------------------------------------------
+    |
+    | These fields will be censored from your request when sent to Flare. 
+    |
+    */
+
+    'censor_request_body_fields' => ['password'],
 ];
diff --git a/config/ignition.php b/config/ignition.php
@@ -9,8 +9,9 @@
     |
     | Choose your preferred editor to use when clicking any edit button.
     |
-    | Supported: "phpstorm", "vscode", "vscode-insiders",
-    |            "sublime", "atom", "nova"
+    | Supported: "phpstorm", "vscode", "vscode-insiders", "textmate", "emacs",
+    |            "sublime", "atom", "nova", "macvim", "idea", "netbeans",
+    |            "xdebug"
     |
     */
 

diff --git a/docker/7.4/Dockerfile b/docker/7.4/Dockerfile
@@ -29,13 +29,14 @@ RUN apt-get update \
        php7.4-msgpack php7.4-igbinary php7.4-ldap \
        php7.4-redis \
     && php -r "readfile('http://getcomposer.org/installer');" | php -- --install-dir=/usr/bin/ --filename=composer \
-    && curl -sL https://deb.nodesource.com/setup_15.x | bash - \
+    && curl -sL https://deb.nodesource.com/setup_16.x | bash - \
     && apt-get install -y nodejs \
     && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
     && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
     && apt-get update \
     && apt-get install -y yarn \
     && apt-get install -y mysql-client \
+    && apt-get install -y postgresql-client \
     && apt-get -y autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

diff --git a/docker/8.0/Dockerfile b/docker/8.0/Dockerfile
@@ -29,17 +29,23 @@ RUN apt-get update \
        php8.0-msgpack php8.0-igbinary php8.0-ldap \
        php8.0-redis \
     && php -r "readfile('http://getcomposer.org/installer');" | php -- --install-dir=/usr/bin/ --filename=composer \
-    && curl -sL https://deb.nodesource.com/setup_15.x | bash - \
+    && curl -sL https://deb.nodesource.com/setup_16.x | bash - \
     && apt-get install -y nodejs \
     && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
     && echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
     && apt-get update \
     && apt-get install -y yarn \
     && apt-get install -y mysql-client \
+    && apt-get install -y postgresql-client \
     && apt-get -y autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+RUN pecl channel-update https://pecl.php.net/channel.xml \
+    && pecl install swoole \
+    && pecl clear-cache \
+    && rm -rf /tmp/* /var/tmp/*
+
 RUN setcap "cap_net_bind_service=+ep" /usr/bin/php8.0
 
 RUN groupadd --force -g $WWWGROUP sail

diff --git a/docker/8.0/php.ini b/docker/8.0/php.ini
@@ -2,3 +2,6 @@
 post_max_size = 100M
 upload_max_filesize = 100M
 variables_order = EGPCS
+
+# Extensions...
+extension=swoole.so
diff --git a/packages/Webkul/Core/src/Config/concord.php b/packages/Webkul/Core/src/Config/concord.php
@@ -8,12 +8,14 @@
         \Webkul\Contact\Providers\ModuleServiceProvider::class,
         \Webkul\Core\Providers\ModuleServiceProvider::class,
         \Webkul\Email\Providers\ModuleServiceProvider::class,
+        \Webkul\EmailTemplate\Providers\ModuleServiceProvider::class,
         \Webkul\Lead\Providers\ModuleServiceProvider::class,
         \Webkul\Product\Providers\ModuleServiceProvider::class,
         \Webkul\Quote\Providers\ModuleServiceProvider::class,
         \Webkul\Tag\Providers\ModuleServiceProvider::class,
         \Webkul\UI\Providers\ModuleServiceProvider::class,
         \Webkul\User\Providers\ModuleServiceProvider::class,
+        \Webkul\Workflow\Providers\ModuleServiceProvider::class,
     ],
     'register_route_models' => true
 ];
diff --git a/packages/Webkul/Core/src/Console/Commands/Install.php b/packages/Webkul/Core/src/Console/Commands/Install.php
@@ -55,7 +55,7 @@ public function handle()
 
         // running `php artisan vendor:publish --all`
         $this->warn('Step: Publishing assets and configurations...');
-        $result = $this->call('vendor:publish', ['--all']);
+        $result = $this->call('vendor:publish', ['--all' => true, '--force' => true]);
         $this->info($result);
 
         // running `php artisan storage:link`
@@ -118,7 +118,7 @@ protected function createEnvFile()
             $input_admin_path = $this->ask('Please Enter the Admin URL : ');
             $this->envUpdate('APP_ADMIN_PATH=', $input_admin_path ?: $default_admin_path);
 
-            $locale = $this->choice('Please select the default locale or press enter to continue', ['ar', 'en', 'fa', 'nl', 'pt_BR'], 1);
+            $locale = $this->choice('Please select the default available locale or press enter to continue', ['en'], 0);
             $this->envUpdate('APP_LOCALE=', $locale);
 
             $TimeZones = timezone_identifiers_list();