TPS/elektronika_bagisto
TPS
/
elektronika_bagisto
6
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #7145 from devansh-webkul/issues/6771 

Fixed URL Issue #6771
This commit is contained in:
Jitendra Singh 2022-11-28 16:55:31 +05:30 committed by GitHub
parent ff6cad1714 7436e5ff01
commit 24e5c76d48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=c523ce7636e9eae3dd05",
"/js/admin.js": "/js/admin.js?id=d3346c1482b250471721",
"/css/admin.css": "/css/admin.css?id=295abc30d293848c6226"
}

2
packages/Webkul/Admin/src/Resources/assets/js/app.js vendored
View File

@ -84,6 +84,8 @@ $(function() {
el: '#app',
data: {
baseUrl: document.querySelector('meta[name="base-url"]').content,
modalIds: {},
isMenuOpen: localStorage.getItem('bagisto-sidebar') == 'true',

8
packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/bundle-items.blade.php
View File

@ -171,7 +171,13 @@
</td>
<td>
@{{ product.product.name }}
<a
:href="`${$root.baseUrl}/${product.product.url_key}`"
v-text="product.product.name"
target="_blank"
>
</a>
<input type="hidden" :name="[inputName + '[product_id]']" :value="product.product.id"/>
</td>

8
packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/grouped-products.blade.php
View File

@ -81,7 +81,13 @@
<script type="text/x-template" id="grouped-product-item-template">
<tr>
<td>
@{{ groupedProduct.associated_product.name }}
<a
:href="`${$root.baseUrl}/${groupedProduct.associated_product.url_key}`"
v-text="groupedProduct.associated_product.name"
target="_blank"
>
</a>
<input type="hidden" :name="[inputName + '[associated_product_id]']" :value="groupedProduct.associated_product.id"/>
</td>

5
packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
View File

@ -7,6 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta name="base-url" content="{{ url()->to('/') }}">
@if ($favicon = core()->getConfigData('general.design.admin_logo.favicon', core()->getCurrentChannelCode()))
<link rel="icon" sizes="16x16" href="{{ \Illuminate\Support\Facades\Storage::url($favicon) }}" />
@ -57,9 +58,9 @@
<script type="text/javascript">
window.flashMessages = [];
if(localStorage.getItem('dark-mode') == 'true'){
if (localStorage.getItem('dark-mode') == 'true') {
document.body.classList.toggle("dark-mode");
}
}
@foreach (['success', 'warning', 'error', 'info'] as $key)
@if ($value = session($key))