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

Merge branch 'master' of https://github.com/bagisto/bagisto

This commit is contained in:
prateek srivastava 2020-10-27 02:31:37 +05:30
parent d0804f16b2 9b24f3b1c7
commit fac92b1ef7
13 changed files with 85 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/css/admin.css 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=b022291aa1cad7dfcc84",
"/css/admin.css": "/css/admin.css?id=8f4fcca5914f5370ddda"
"/css/admin.css": "/css/admin.css?id=f2b20e4283a639808ef6"
}

4
packages/Webkul/Admin/src/Resources/assets/sass/partials/_rtl.scss vendored
View File

@ -174,6 +174,10 @@
float: left;
}
.multiselect {
text-align: unset;
}
.pagination .page-item .icon {
transform: rotate(180deg);
}

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

@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="csrf-token" content="{{ csrf_token() }}">
@if ($favicon = core()->getConfigData('general.design.admin_logo.favicon'))
@if ($favicon = core()->getConfigData('general.design.admin_logo.favicon', core()->getCurrentChannelCode()))
<link rel="icon" sizes="16x16" href="{{ \Illuminate\Support\Facades\Storage::url($favicon) }}" />
@else
<link rel="icon" sizes="16x16" href="{{ asset('vendor/webkul/ui/assets/images/favicon.ico') }}" />

8
packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking/event.blade.php
View File

@ -55,9 +55,13 @@
</span>
</div>
<div class="control-group">
<div class="control-group" :class="[errors.has(controlName + '[special_price]') ? 'has-error' : '']">
<label class="ticket-label">{{ __('bookingproduct::app.admin.catalog.products.special-price') }}</label>
<input type="text" :name="controlName + '[special_price]'" v-model="ticketItem.special_price" class="control">
<input type="text" v-validate="{decimal: true, min_value:0, ...(ticketItem.price ? {max_value: ticketItem.price} : {})}" :name="controlName + '[special_price]'" v-model="ticketItem.special_price" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.price') }}&quot;">
<span class="control-error" v-if="errors.has(controlName + '[special_price]')">
@{{ errors.first(controlName + '[special_price]') }}
</span>
</div>
</td>

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

@ -16,6 +16,7 @@ class ChannelTableSeeder extends Seeder
'code' => 'default',
'name' => 'Default',
'theme' => 'velocity',
'hostname' => config('app.url'),
'root_category_id' => 1,
'home_page_content' => '<p>@include("shop::home.slider") @include("shop::home.featured-products") @include("shop::home.new-products")</p>
<div class="banner-container">
@ -44,4 +45,4 @@ class ChannelTableSeeder extends Seeder
'inventory_source_id' => 1,
]);
}
}
}

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=c4dfdb6d0482241432f9",
"/css/shop.css": "/css/shop.css?id=11adc18bed8ace91c828"
"/css/shop.css": "/css/shop.css?id=45a1e46876af32f30871"
}

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

@ -251,6 +251,28 @@ input {
.special-price {
color: $disc-price;
}
/*
To Do: Start adjusting if equal height needed in default theme as well.
*/
.price-from {
.bundle-regular-price {
color: $font-light;
text-decoration: line-through;
margin-right: 10px;
}
.bundle-special-price {
color: $disc-price;
}
.bundle-to {
display: block;
font-weight: 500;
margin-top: 1px;
margin-bottom: 1px;
}
}
}
//horizontal rule

2
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=497d255676e26e428e3c",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=40d4466ccaba8ba4a23d"
"/css/velocity.css": "/css/velocity.css?id=f3471c09369c572c9a1b"
}

21
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -2335,6 +2335,27 @@
.recetly-viewed-products-wrapper {
padding: 2px;
.price-from {
.bundle-regular-price {
display: none;
}
.bundle-special-price {
font-size: 15px !important;
font-weight: 600;
}
.bundle-to {
text-align: center;
font-size: 15px !important;
font-weight: 500;
margin-top: 1px;
margin-bottom: 1px;
margin: 0 2px;
display: unset;
}
}
}
.category-page-wrapper {

25
packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss vendored
View File

@ -166,8 +166,29 @@
}
.product-price {
.sticker {
display: none;
height: unset;
.price-from {
.bundle-regular-price {
font-size: 20px !important;
font-weight: 500;
margin-right: 10px;
text-decoration: line-through;
}
.bundle-special-price {
font-size: 20px !important;
font-weight: 600;
}
.bundle-to {
text-align: unset;
font-size: 20px !important;
font-weight: 500;
margin-top: 1px;
margin-bottom: 1px;
display: block;
}
}
}