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

Resolve conflicts

This commit is contained in:
Pranshu Tomar 2020-03-24 18:13:58 +05:30
parent 80508e7a06 ce2c329e63
commit 3d3a2d6036
7 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/Webkul/Core/src/Database/Factories/LocaleFactory.php
View File

@ -5,8 +5,16 @@ use Webkul\Core\Models\Locale;
/** @var \Illuminate\Database\Eloquent\Factory $factory */
$factory->define(Locale::class, function (Faker $faker, array $attributes) {
$languageCode = $faker->languageCode;
$locale = Locale::query()->firstWhere('code', $languageCode);
if ($locale !== null) {
return $locale->id;
}
return [
'code' => $faker->languageCode,
'code' => $languageCode,
'name' => $faker->country,
'direction' => 'ltr',
];

4
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=4dd69b3198dcc2a79bdb",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=9a922df8bb5d1d0134df",
"/css/velocity.css": "/css/velocity.css?id=b4caa4ceb42b46a63645"
"/css/velocity.css": "/css/velocity.css?id=5579eca70d44d33a5d62"
}

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

@ -26,6 +26,7 @@
::-webkit-scrollbar {
width: 3px;
height: 5px;
}
/* Track */
::-webkit-scrollbar-track {

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

@ -2305,15 +2305,17 @@
.compare-products {
// overflow-x: scroll;
// padding-bottom: 30px;
width: 100%;
overflow-x: scroll;
padding-bottom: 20px;
margin-left: 0 !important;
margin-right: 10px !important;
.col,
.col-2 {
max-width: 20%;
min-width: 17%;
padding-left: 0;
word-break: break-word;
td {
padding: 15px;
min-width: 250px;
max-width: 250px;
vertical-align: top;
}
.image-wrapper {

18
packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php
View File

@ -20,7 +20,7 @@
{!! view_render_event('bagisto.shop.customers.account.compare.view.before') !!}
<div class="row compare-products col-12 ml0">
<table class="row compare-products">
<shimmer-component v-if="!isProductListLoaded && !isMobile()"></shimmer-component>
<template v-else-if="isProductListLoaded && products.length > 0">
@ -39,12 +39,12 @@
@endphp
@foreach ($comparableAttributes as $attribute)
<div class="row col-12 pr-0 mt15">
<div class="col-2">
<tr>
<td>
<span class="fs16">{{ $attribute['admin_name'] }}</span>
</div>
</td>
<div class="col" :key="`title-${index}`" v-for="(product, index) in products">
<td :key="`title-${index}`" v-for="(product, index) in products">
@switch ($attribute['code'])
@case('name')
<a :href="`${$root.baseUrl}/${product.url_key}`" class="unset remove-decoration active-hover">
@ -100,22 +100,22 @@
></span>
@break;
@default
<span v-html="product.product['{{ $attribute['code'] }}']" class="fs16"></span>
<span v-html="product.product['{{ $attribute['code'] }}'] ? product.product['{{ $attribute['code'] }}'] : '__'" class="fs16"></span>
@break;
@endswitch
@break
@endswitch
</div>
</div>
</td>
</tr>
@endforeach
</template>
<span v-else-if="isProductListLoaded && products.length == 0">
@{{ __('customer.compare.empty-text') }}
</span>
</div>
</table>
{!! view_render_event('bagisto.shop.customers.account.compare.view.after') !!}
</section>

3
packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
View File

@ -16,7 +16,6 @@
foreach ($images as $key => $image) {
array_push($productImages, $image['medium_image_url']);
}
@endphp
@section('page_title')
@ -73,8 +72,8 @@
@if ($total)
<div class="reviews col-lg-12">
<star-ratings
:ratings="{{ $avgStarRating }}"
push-class="mr5"
:ratings="{{ $avgStarRating }}"
></star-ratings>
<div class="reviews">