merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'issue-4242' of https://github.com/devansh-webkul/bagisto into issue-4242 

Merged
This commit is contained in:
devansh bawari 2020-11-24 12:38:05 +05:30
parent c70a324f40 b6c9dc1b98
commit 937db83b3e
16 changed files with 54 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Admin/src/Resources/lang/ar/app.php
View File

@ -811,7 +811,9 @@ return [
'seo-title' => 'عنوان Meta',
'seo-description' => 'وصف Meta',
'seo-keywords' => 'الكلمات الدالة Meta',
'maintenance-mode' => 'Maintenance Mode',
'maintenance-mode-text' => 'Message',
'allowed-ips' => 'Allowed IPs'
],
'sliders' => [

3
packages/Webkul/Admin/src/Resources/lang/de/app.php
View File

@ -810,6 +810,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' =>
[

1
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -812,6 +812,7 @@ return [
'seo-description' => 'Meta description',
'seo-keywords' => 'Meta keywords',
'maintenance-mode' => 'Maintenance Mode',
'maintenance-mode-text' => 'Message',
'allowed-ips' => 'Allowed IPs'
],

4
packages/Webkul/Admin/src/Resources/lang/es/app.php
View File

@ -804,7 +804,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' => [

4
packages/Webkul/Admin/src/Resources/lang/fa/app.php
View File

@ -809,7 +809,9 @@ return [
'seo-title' => 'عنوان Meta',
'seo-description' => 'شرح Meta',
'seo-keywords' => 'کلید واژه ها Meta',
'maintenance-mode' => 'Maintenance Mode',
'maintenance-mode-text' => 'Message',
'allowed-ips' => 'Allowed IPs'
],
'sliders' => [

4
packages/Webkul/Admin/src/Resources/lang/it/app.php
View File

@ -813,7 +813,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' => [

4
packages/Webkul/Admin/src/Resources/lang/nl/app.php
View File

@ -810,7 +810,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' => [

4
packages/Webkul/Admin/src/Resources/lang/pl/app.php
View File

@ -811,7 +811,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' => [

4
packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
View File

@ -810,7 +810,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' => [

4
packages/Webkul/Admin/src/Resources/lang/tr/app.php
View File

@ -802,7 +802,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' => [

2
packages/Webkul/Admin/src/Resources/views/errors/503.blade.php
View File

@ -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>

10
packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
View File

@ -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>

7
packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
View File

@ -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>

12
packages/Webkul/Core/src/Database/Migrations/2020_11_20_105353_add_columns_in_channels_table.php
View File

@ -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');
});
}
}

1
packages/Webkul/Core/src/Models/Channel.php
View File

@ -23,6 +23,7 @@ class Channel extends Model implements ChannelContract
'root_category_id',
'home_seo',
'is_maintenance_on',
'maintenance_mode_text',
'allowed_ips'
];

2
packages/Webkul/Shop/src/Resources/views/errors/503.blade.php
View File

@ -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>