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

Merge pull request #1533 from prashant-webkul/development 

Fixed issue #1532
This commit is contained in:
Jitendra Singh 2019-10-01 10:06:11 +05:30 committed by GitHub
parent de7808240f 109c99f3da
commit b64c7241ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/Webkul/Admin/src/Config/system.php
View File

@ -108,7 +108,7 @@ return [
'channel_based' => true,
]
]
],[
], [
'key' => 'general.content',
'name' => 'admin::app.admin.system.content',
'sort' => 2,
@ -123,6 +123,21 @@ return [
'type' => 'text',
'channel_based' => true,
'locale_based' => true
], [
'name' => 'footer_toggle',
'title' => 'admin::app.admin.system.footer-toggle',
'type' => 'select',
'options' => [
[
'title' => 'True',
'value' => 1
], [
'title' => 'False',
'value' => 0
]
],
'locale_based' => true,
'channel_based' => true,
]
]
], [

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

@ -1155,6 +1155,7 @@ return [
'footer' => 'Footer',
'content' => 'Content',
'footer-content' => 'Footer Text',
'footer-toggle' => 'Toggle footer',
'locale-options' => 'Unit Options',
'weight-unit' => 'Weight Unit',
'design' => 'Design',

21
packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php
View File

@ -90,16 +90,17 @@
{!! view_render_event('bagisto.admin.layout.content.after') !!}
<div class="footer">
<p>
@if (core()->getConfigData('general.content.footer.footer_content'))
{{ core()->getConfigData('general.content.footer.footer_content') }}
@else
{{ trans('admin::app.footer.copy-right') }}
@endif
</p>
</div>
@if (core()->getConfigData('general.content.footer.footer_toggle'))
<div class="footer">
<p style="text-align: center;">
@if (core()->getConfigData('general.content.footer.footer_content'))
{{ core()->getConfigData('general.content.footer.footer_content') }}
@else
{{ trans('admin::app.footer.copy-right') }}
@endif
</p>
</div>
@endif
</div>
</div>

2
packages/Webkul/Customer/src/Models/Customer.php
View File

@ -17,7 +17,7 @@ class Customer extends Authenticatable implements CustomerContract, JWTSubject
protected $table = 'customers';
protected $fillable = ['first_name', 'channel_id', 'last_name', 'gender', 'date_of_birth', 'email', 'phone', 'password', 'customer_group_id', 'subscribed_to_news_letter', 'is_verified', 'token', 'notes', 'status'];
protected $fillable = ['first_name', 'last_name', 'gender', 'date_of_birth', 'email', 'phone', 'password', 'customer_group_id', 'subscribed_to_news_letter', 'is_verified', 'token', 'notes', 'status'];
protected $hidden = ['password', 'remember_token'];

21
packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
View File

@ -70,16 +70,17 @@
{!! view_render_event('bagisto.shop.layout.footer.after') !!}
<div class="footer-bottom">
<p>
@if (core()->getConfigData('general.content.footer.footer_content'))
{{ core()->getConfigData('general.content.footer.footer_content') }}
@else
{{ trans('admin::app.footer.copy-right') }}
@endif
</p>
</div>
@if (core()->getConfigData('general.content.footer.footer_toggle'))
<div class="footer">
<p style="text-align: center;">
@if (core()->getConfigData('general.content.footer.footer_content'))
{{ core()->getConfigData('general.content.footer.footer_content') }}
@else
{{ trans('admin::app.footer.copy-right') }}
@endif
</p>
</div>
@endif
</div>
<script type="text/javascript">