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

resolve conflicts and merge master

This commit is contained in:
Deepak Singh Gusain 2022-01-25 10:24:58 +05:30
parent 5b776e4343 858101593b
commit ac6998538f
5 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/layouts/tinymce.blade.php
View File

@ -7,7 +7,7 @@
let config = {
relative_urls : false,
remove_script_host : true,
remove_script_host : false,
document_base_url : '{{ asset('/') }}',
uploadRoute: '{{ route('admin.tinymce.upload') }}',
csrfToken: '{{ csrf_token() }}',

55
packages/Webkul/Core/src/Database/Seeders/ChannelTableSeeder.php
View File

@ -43,11 +43,12 @@ class ChannelTableSeeder extends Seeder
<div class="list-container">
<span class="list-heading">Quick Links</span>
<ul class="list-group">
<li><a href="@php echo route(\'shop.cms.page\', \'about-us\') @endphp">About Us</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'return-policy\') @endphp">Return Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'refund-policy\') @endphp">Refund Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-conditions\') @endphp">Terms and conditions</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-of-use\') @endphp">Terms of Use</a></li><li><a href="@php echo route(\'shop.cms.page\', \'contact-us\') @endphp">Contact Us</a></li>
<li><a href="'.route('shop.cms.page', 'about-us').'">About Us</a></li>
<li><a href="'.route('shop.cms.page', 'return-policy').'">Return Policy</a></li>
<li><a href="'.route('shop.cms.page', 'refund-policy') .'">Refund Policy</a></li>
<li><a href="'.route('shop.cms.page', 'terms-conditions').'">Terms and conditions</a></li>
<li><a href="'.route('shop.cms.page', 'terms-of-use').'">Terms of Use</a></li>
<li><a href="'.route('shop.cms.page', 'contact-us') .'">Contact Us</a></li>
</ul>
</div>
<div class="list-container">
@ -83,11 +84,12 @@ class ChannelTableSeeder extends Seeder
<div class="list-container">
<span class="list-heading">Quick Links</span>
<ul class="list-group">
<li><a href="@php echo route(\'shop.cms.page\', \'about-us\') @endphp">About Us</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'return-policy\') @endphp">Return Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'refund-policy\') @endphp">Refund Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-conditions\') @endphp">Terms and conditions</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-of-use\') @endphp">Terms of Use</a></li><li><a href="@php echo route(\'shop.cms.page\', \'contact-us\') @endphp">Contact Us</a></li>
<li><a href="'.route('shop.cms.page', 'about-us').'">About Us</a></li>
<li><a href="'.route('shop.cms.page', 'return-policy').'">Return Policy</a></li>
<li><a href="'.route('shop.cms.page', 'refund-policy') .'">Refund Policy</a></li>
<li><a href="'.route('shop.cms.page', 'terms-conditions').'">Terms and conditions</a></li>
<li><a href="'.route('shop.cms.page', 'terms-of-use').'">Terms of Use</a></li>
<li><a href="'.route('shop.cms.page', 'contact-us') .'">Contact Us</a></li>
</ul>
</div>
<div class="list-container">
@ -123,11 +125,12 @@ class ChannelTableSeeder extends Seeder
<div class="list-container">
<span class="list-heading">Quick Links</span>
<ul class="list-group">
<li><a href="@php echo route(\'shop.cms.page\', \'about-us\') @endphp">About Us</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'return-policy\') @endphp">Return Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'refund-policy\') @endphp">Refund Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-conditions\') @endphp">Terms and conditions</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-of-use\') @endphp">Terms of Use</a></li><li><a href="@php echo route(\'shop.cms.page\', \'contact-us\') @endphp">Contact Us</a></li>
<li><a href="'.route('shop.cms.page', 'about-us').'">About Us</a></li>
<li><a href="'.route('shop.cms.page', 'return-policy').'">Return Policy</a></li>
<li><a href="'.route('shop.cms.page', 'refund-policy') .'">Refund Policy</a></li>
<li><a href="'.route('shop.cms.page', 'terms-conditions').'">Terms and conditions</a></li>
<li><a href="'.route('shop.cms.page', 'terms-of-use').'">Terms of Use</a></li>
<li><a href="'.route('shop.cms.page', 'contact-us') .'">Contact Us</a></li>
</ul>
</div>
<div class="list-container">
@ -163,11 +166,12 @@ class ChannelTableSeeder extends Seeder
<div class="list-container">
<span class="list-heading">Quick Links</span>
<ul class="list-group">
<li><a href="@php echo route(\'shop.cms.page\', \'about-us\') @endphp">About Us</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'return-policy\') @endphp">Return Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'refund-policy\') @endphp">Refund Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-conditions\') @endphp">Terms and conditions</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-of-use\') @endphp">Terms of Use</a></li><li><a href="@php echo route(\'shop.cms.page\', \'contact-us\') @endphp">Contact Us</a></li>
<li><a href="'.route('shop.cms.page', 'about-us').'">About Us</a></li>
<li><a href="'.route('shop.cms.page', 'return-policy').'">Return Policy</a></li>
<li><a href="'.route('shop.cms.page', 'refund-policy') .'">Refund Policy</a></li>
<li><a href="'.route('shop.cms.page', 'terms-conditions').'">Terms and conditions</a></li>
<li><a href="'.route('shop.cms.page', 'terms-of-use').'">Terms of Use</a></li>
<li><a href="'.route('shop.cms.page', 'contact-us') .'">Contact Us</a></li>
</ul>
</div>
<div class="list-container">
@ -203,11 +207,12 @@ class ChannelTableSeeder extends Seeder
<div class="list-container">
<span class="list-heading">Quick Links</span>
<ul class="list-group">
<li><a href="@php echo route(\'shop.cms.page\', \'about-us\') @endphp">About Us</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'return-policy\') @endphp">Return Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'refund-policy\') @endphp">Refund Policy</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-conditions\') @endphp">Terms and conditions</a></li>
<li><a href="@php echo route(\'shop.cms.page\', \'terms-of-use\') @endphp">Terms of Use</a></li><li><a href="@php echo route(\'shop.cms.page\', \'contact-us\') @endphp">Contact Us</a></li>
<li><a href="'.route('shop.cms.page', 'about-us').'">About Us</a></li>
<li><a href="'.route('shop.cms.page', 'return-policy').'">Return Policy</a></li>
<li><a href="'.route('shop.cms.page', 'refund-policy') .'">Refund Policy</a></li>
<li><a href="'.route('shop.cms.page', 'terms-conditions').'">Terms and conditions</a></li>
<li><a href="'.route('shop.cms.page', 'terms-of-use').'">Terms of Use</a></li>
<li><a href="'.route('shop.cms.page', 'contact-us') .'">Contact Us</a></li>
</ul>
</div>
<div class="list-container">

2
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=9d5b79be5419c0a5c1bc",
"/css/shop.css": "/css/shop.css?id=88c94c3e8f7578081856"
"/css/shop.css": "/css/shop.css?id=7540700482be9e937cf0"
}

1
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

@ -3418,7 +3418,6 @@ section.review {
.product-name,
.product-price {
max-width: 280px;
margin-left: auto;
margin-right: auto;
word-break: break-all;
}