From b6c9dc1b9817084dd141b72832555a1d87d68e0f Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Mon, 23 Nov 2020 18:32:37 +0530
Subject: [PATCH] Text Message Added

---
 packages/Webkul/Admin/src/Resources/lang/ar/app.php  |  4 +++-
 packages/Webkul/Admin/src/Resources/lang/de/app.php  |  3 +++
 packages/Webkul/Admin/src/Resources/lang/en/app.php  |  1 +
 packages/Webkul/Admin/src/Resources/lang/es/app.php  |  4 +++-
 packages/Webkul/Admin/src/Resources/lang/fa/app.php  |  4 +++-
 packages/Webkul/Admin/src/Resources/lang/it/app.php  |  4 +++-
 packages/Webkul/Admin/src/Resources/lang/nl/app.php  |  4 +++-
 packages/Webkul/Admin/src/Resources/lang/pl/app.php  |  4 +++-
 .../Webkul/Admin/src/Resources/lang/pt_BR/app.php    |  4 +++-
 packages/Webkul/Admin/src/Resources/lang/tr/app.php  |  4 +++-
 .../Admin/src/Resources/views/errors/503.blade.php   |  2 +-
 .../views/settings/channels/create.blade.php         | 10 ++++++++++
 .../Resources/views/settings/channels/edit.blade.php |  7 ++++++-
 ...20_11_20_105353_add_columns_in_channels_table.php | 12 +++++++-----
 packages/Webkul/Core/src/Models/Channel.php          |  1 +
 .../Shop/src/Resources/views/errors/503.blade.php    |  2 +-
 16 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
index 46bd1a47a..69eddb1ff 100644
--- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -805,7 +805,9 @@ return [
             'seo-title' => 'عنوان Meta',
             'seo-description' => 'وصف Meta',
             'seo-keywords' => 'الكلمات الدالة Meta',
-
+            'maintenance-mode' => 'Maintenance Mode',
+            'maintenance-mode-text' => 'Message',
+            'allowed-ips' => 'Allowed IPs'
         ],
 
         'sliders' => [
diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php
index 2d9ae4349..4cb0f61d9 100755
--- a/packages/Webkul/Admin/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php
@@ -804,6 +804,9 @@ return [
             'seo-title'              => 'Meta Titel',
             'seo-description'        => 'Meta-Beschreibung',
             'seo-keywords'           => 'Meta-keywords',
+            'maintenance-mode'       => 'Maintenance Mode',
+            'maintenance-mode-text'  => 'Message',
+            'allowed-ips'            => 'Allowed IPs'
         ],
         'sliders'           =>
         [
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 827849e68..aa1e88653 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -806,6 +806,7 @@ return [
             'seo-description' => 'Meta description',
             'seo-keywords' => 'Meta keywords',
             'maintenance-mode' => 'Maintenance Mode',
+            'maintenance-mode-text' => 'Message',
             'allowed-ips' => 'Allowed IPs'
         ],
 
diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php
index be4dd6c32..a7c70b5df 100644
--- a/packages/Webkul/Admin/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php
@@ -798,7 +798,9 @@ return [
             'seo-title' => 'Meta title',
             'seo-description' => 'Meta description',
             'seo-keywords' => 'Meta keywords',
-
+            'maintenance-mode' => 'Maintenance Mode',
+            'maintenance-mode-text' => 'Message',
+            'allowed-ips' => 'Allowed IPs'
         ],
 
         'sliders' => [
diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
index 7a866f521..aede97ddf 100644
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -803,7 +803,9 @@ return [
             'seo-title' => 'عنوان Meta',
             'seo-description' => 'شرح Meta',
             'seo-keywords' => 'کلید واژه ها Meta',
-
+            'maintenance-mode' => 'Maintenance Mode',
+            'maintenance-mode-text' => 'Message',
+            'allowed-ips' => 'Allowed IPs'
         ],
 
         'sliders' => [
diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php
index 8f46592ab..daa3c9e19 100644
--- a/packages/Webkul/Admin/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php
@@ -807,7 +807,9 @@ return [
             'seo-title' => 'Meta title',
             'seo-description' => 'Meta description',
             'seo-keywords' => 'Meta keywords',
-
+            'maintenance-mode' => 'Maintenance Mode',
+            'maintenance-mode-text' => 'Message',
+            'allowed-ips' => 'Allowed IPs'
         ],
 
         'sliders' => [
diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
index 410cd401a..cf6bd2c82 100644
--- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
@@ -804,7 +804,9 @@ return [
             'seo-title' => 'Meta titel',
             'seo-description' => 'Meta omschrijving',
             'seo-keywords' => 'Meta trefwoorden',
-
+            'maintenance-mode' => 'Maintenance Mode',
+            'maintenance-mode-text' => 'Message',
+            'allowed-ips' => 'Allowed IPs'
         ],
 
         'sliders' => [
diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
index 5d49b77a6..b1c653d07 100644
--- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
@@ -805,7 +805,9 @@ return [
             'seo-title' => 'Meta tytuł',
             'seo-description' => 'Meta opis',
             'seo-keywords' => 'Meta słowa kluczowe',
-
+            'maintenance-mode' => 'Maintenance Mode',
+            'maintenance-mode-text' => 'Message',
+            'allowed-ips' => 'Allowed IPs'
         ],
 
         'sliders' => [
diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
index e7e7ea857..bf89e5139 100755
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@@ -804,7 +804,9 @@ return [
             'seo-title' => 'Meta título',
             'seo-description' => 'Meta Descrição',
             'seo-keywords' => 'Meta palavras-chave',
-
+            'maintenance-mode' => 'Maintenance Mode',
+            'maintenance-mode-text' => 'Message',
+            'allowed-ips' => 'Allowed IPs'
         ],
 
         'sliders' => [
diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
index f33256575..17251bf67 100644
--- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
@@ -796,7 +796,9 @@ return [
             'seo-title' => 'Meta Başlık',
             'seo-description' => 'Meta Açıklama',
             'seo-keywords' => 'Meta Anahtar Kelimeler',
-
+            'maintenance-mode' => 'Maintenance Mode',
+            'maintenance-mode-text' => 'Message',
+            'allowed-ips' => 'Allowed IPs'
         ],
 
         'sliders' => [
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/503.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/503.blade.php
index 8161f623a..ea1cd20ce 100644
--- a/packages/Webkul/Admin/src/Resources/views/errors/503.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/errors/503.blade.php
@@ -20,7 +20,7 @@
                 </div>
 
                 <div class="error-messgae" style="font-size: 24px;color: #5E5E5E">
-                    {{ __('admin::app.error.right-back') }}
+                    {{ core()->getCurrentChannel()->maintenance_mode_text ?: __('admin::app.error.right-back') }}
                 </div>
             </div>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
index 10611a545..83bb134bf 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
@@ -217,6 +217,16 @@
                                     <span class="slider round"></span>
                                 </label>
                             </div>
+
+                            <div class="control-group">
+                                <label for="maintenance-mode-text">{{ __('admin::app.settings.channels.maintenance-mode-text') }}</label>
+                                <input class="control" id="maintenance-mode-text" name="maintenance_mode_text" value=""/>
+                            </div>
+
+                            <div class="control-group">
+                                <label for="allowed-ips">{{ __('admin::app.settings.channels.allowed-ips') }}</label>
+                                <input class="control" id="allowed-ips" name="allowed_ips" value=""/>
+                            </div>
                         </div>
                     </accordian>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
index a0a3ba7de..32e86354f 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
@@ -234,7 +234,12 @@
                             </div>
 
                             <div class="control-group">
-                                <label for="allowed-ips" class="required">{{ __('admin::app.settings.channels.allowed-ips') }}</label>
+                                <label for="maintenance-mode-text">{{ __('admin::app.settings.channels.maintenance-mode-text') }}</label>
+                                <input class="control" id="maintenance-mode-text" name="maintenance_mode_text" value="{{ old('maintenance_mode_text') ?: $channel->maintenance_mode_text }}"/>
+                            </div>
+
+                            <div class="control-group">
+                                <label for="allowed-ips">{{ __('admin::app.settings.channels.allowed-ips') }}</label>
                                 <input class="control" id="allowed-ips" name="allowed_ips" value="{{ old('allowed_ips') ?: $channel->allowed_ips }}"/>
                             </div>
                         </div>
diff --git a/packages/Webkul/Core/src/Database/Migrations/2020_11_20_105353_add_columns_in_channels_table.php b/packages/Webkul/Core/src/Database/Migrations/2020_11_20_105353_add_columns_in_channels_table.php
index 680226cc3..b786e35e6 100644
--- a/packages/Webkul/Core/src/Database/Migrations/2020_11_20_105353_add_columns_in_channels_table.php
+++ b/packages/Webkul/Core/src/Database/Migrations/2020_11_20_105353_add_columns_in_channels_table.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class AddColumnsInChannelsTable extends Migration
 {
@@ -15,7 +15,8 @@ class AddColumnsInChannelsTable extends Migration
     {
         Schema::table('channels', function (Blueprint $table) {
             $table->boolean('is_maintenance_on')->after('footer_content')->default(0);
-            $table->text('allowed_ips')->after('is_maintenance_on')->nullable();
+            $table->text('maintenance_mode_text')->after('is_maintenance_on')->nullable();
+            $table->text('allowed_ips')->after('maintenance_mode_text')->nullable();
         });
     }
 
@@ -27,8 +28,9 @@ class AddColumnsInChannelsTable extends Migration
     public function down()
     {
         Schema::table('channels', function (Blueprint $table) {
-            $table->removeColumn('is_maintenance_on');
-            $table->removeColumn('allowed_ips');
+            $table->dropColumn('is_maintenance_on');
+            $table->dropColumn('maintenance_mode_text');
+            $table->dropColumn('allowed_ips');
         });
     }
 }
diff --git a/packages/Webkul/Core/src/Models/Channel.php b/packages/Webkul/Core/src/Models/Channel.php
index 7e50e5355..21e36e813 100755
--- a/packages/Webkul/Core/src/Models/Channel.php
+++ b/packages/Webkul/Core/src/Models/Channel.php
@@ -23,6 +23,7 @@ class Channel extends Model implements ChannelContract
         'root_category_id',
         'home_seo',
         'is_maintenance_on',
+        'maintenance_mode_text',
         'allowed_ips'
     ];
 
diff --git a/packages/Webkul/Shop/src/Resources/views/errors/503.blade.php b/packages/Webkul/Shop/src/Resources/views/errors/503.blade.php
index 7888c1036..40d93e596 100644
--- a/packages/Webkul/Shop/src/Resources/views/errors/503.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/errors/503.blade.php
@@ -19,7 +19,7 @@
                 </div>
 
                 <div class="error-messgae" style="font-size: 24px;color: #5E5E5E">
-                    {{ __('admin::app.error.right-back') }}
+                    {{ core()->getCurrentChannel()->maintenance_mode_text ?: __('admin::app.error.right-back') }}
                 </div>
             </div>