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

Merge branch 'master' into duplicate_order_issue

This commit is contained in:
devansh bawari 2021-03-11 13:08:10 +05:30
parent 8ed3597ce2 22397d1b2d
commit bd4ae3bb36
8 changed files with 191 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php
View File

@ -15,7 +15,7 @@ class CustomerReviewDataGrid extends DataGrid
{
$queryBuilder = DB::table('product_reviews as pr')
->leftjoin('product_flat as pf', 'pr.product_id', '=', 'pf.product_id')
->select('pr.id as product_review_id', 'pr.title', 'pr.comment', 'pf.name as product_name', 'pr.status as product_review_status')
->select('pr.id as product_review_id', 'pr.title', 'pr.comment', 'pf.name as product_name', 'pr.status as product_review_status', 'pr.rating')
->where('channel', core()->getCurrentChannelCode())
->where('locale', app()->getLocale());
@ -55,6 +55,15 @@ class CustomerReviewDataGrid extends DataGrid
'filterable' => true,
]);
$this->addColumn([
'index' => 'rating',
'label' => trans('admin::app.customers.reviews.rating'),
'type' => 'number',
'searchable' => true,
'sortable' => true,
'filterable' => true,
]);
$this->addColumn([
'index' => 'product_name',
'label' => trans('admin::app.datagrid.product-name'),

4
packages/Webkul/Admin/src/Resources/views/export/temp.blade.php
View File

@ -13,6 +13,10 @@
@foreach ($records as $record)
<tr>
@foreach($record as $column => $value)
@php
$value = preg_replace('/[^A-Za-z0-9@#$%^&*()_!+\-]/', '', $value);
@endphp
<td>{{ $value }} </td>
@endforeach
</tr>

126
packages/Webkul/Core/src/Data/states.json
View File

@ -3974,5 +3974,131 @@
"code":"WB",
"default_name":"West Bengal",
"country_id":106
},
{
"id":569,
"country_code":"PY",
"code":"PY-16",
"default_name":"Alto Paraguay",
"country_id":176
},
{
"id":570,
"country_code":"PY",
"code":"PY-10",
"default_name":"Alto Paran\u00e1",
"country_id":176
},
{
"id":571,
"country_code":"PY",
"code":"PY-13",
"default_name":"Amambay",
"country_id":176
},
{
"id":572,
"country_code":"PY",
"code":"PY-ASU",
"default_name":"Asunci\u00f3n",
"country_id":176
},
{
"id":573,
"country_code":"PY",
"code":"PY-19",
"default_name":"Boquer\u00f3n",
"country_id":176
},
{
"id":574,
"country_code":"PY",
"code":"PY-5",
"default_name":"Caaguaz\u00fa",
"country_id":176
},
{
"id":575,
"country_code":"PY",
"code":"PY-6",
"default_name":"Caazap\u00e1",
"country_id":176
},
{
"id":576,
"country_code":"PY",
"code":"PY-14",
"default_name":"Canindey\u00fa",
"country_id":176
},
{
"id":577,
"country_code":"PY",
"code":"PY-11",
"default_name":"Central",
"country_id":176
},
{
"id":578,
"country_code":"PY",
"code":"PY-1",
"default_name":"Concepci\u00f3n",
"country_id":176
},
{
"id":579,
"country_code":"PY",
"code":"PY-3",
"default_name":"Cordillera",
"country_id":176
},
{
"id":580,
"country_code":"PY",
"code":"PY-4",
"default_name":"Guair\u00e1",
"country_id":176
},
{
"id":581,
"country_code":"PY",
"code":"PY-7",
"default_name":"Itap\u00faa",
"country_id":176
},
{
"id":582,
"country_code":"PY",
"code":"PY-8",
"default_name":"Misiones",
"country_id":176
},
{
"id":583,
"country_code":"PY",
"code":"PY-9",
"default_name":"Paraguar\u00ed",
"country_id":176
},
{
"id":584,
"country_code":"PY",
"code":"PY-15",
"default_name":"Presidente Hayes",
"country_id":176
},
{
"id":585,
"country_code":"PY",
"code":"PY-2",
"default_name":"San Pedro",
"country_id":176
},
{
"id":586,
"country_code":"PY",
"code":"PY-12",
"default_name":"\u00d1eembuc\u00fa",
"country_id":176
}
]

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js 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=7f7a5e0de640a40550e1",
"/js/velocity.js": "/js/velocity.js?id=f4dcc51b765ad0cf788d",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=0625cac8a65cc7c4a9e2"
}

4
packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
View File

@ -240,7 +240,7 @@ class ConfigurationController extends Controller
*/
private function createMetaData($locale, $channel)
{
\DB::table('velocity_meta_data')->insert([
$this->velocityMetaDataRepository->create([
'locale' => $locale,
'channel' => $channel,
'header_content_count' => '5',
@ -252,4 +252,4 @@ class ConfigurationController extends Controller
'product_policy' => '<div class="row col-12 remove-padding-margin"><div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-van-ship fs40"></i></div> <div class="right"><span class="font-setting fs20">Free Shipping on Order $20 or More</span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">Product Replace &amp; Return Available </span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">Product Exchange and EMI Available </span></div></div></div></div></div>',
]);
}
}
}

82
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/image-magnifier.vue
View File

@ -1,50 +1,60 @@
<template>
<div class="video-container" v-if="currentType == 'video'">
<video :key="activeImageVideoURL" width="100%" controls>
<source :src="activeImageVideoURL" type="video/mp4">
</video>
</div>
<div class="image-container" v-else>
<div class="magnifier">
<img :src="activeImageVideoURL" :data-zoom-image="activeImageVideoURL"
:class="[!isMobile() ? 'main-product-image' : 'vc-small-product-image']">
<div class="outer-assets-container">
<div class="video-container" v-if="currentType == 'video'">
<video :key="activeImageVideoURL" width="100%" controls>
<source :src="activeImageVideoURL" type="video/mp4">
</video>
</div>
<div class="image-container" v-else>
<div class="magnifier">
<img :src="activeImageVideoURL" :data-zoom-image="activeImageVideoURL"
:class="[!isMobile() ? 'main-product-image' : 'vc-small-product-image']">
</div>
</div>
</div>
</template>
<style lang="scss">
.image-container {
.magnifier {
> img {
max-width: 100%;
min-height: 530px;
max-height: 530px;
.outer-assets-container {
height: 420px;
.image-container {
.magnifier {
> img {
max-width: 100%;
max-height: 420px;
}
}
}
@media only screen and (max-width: 992px) {
.image-container {
margin: 0 auto;
.magnifier {
> img {
width: 100%;
max-height: 300px;
}
}
}
}
.video-container {
top: 50%;
position: relative;
min-height: 420px;
max-height: 420px;
video {
transform: translateY(-50%);
}
}
}
@media only screen and (max-width: 992px) {
.image-container {
margin: 0 auto;
.magnifier {
> img {
height: 100%;
min-height: unset;
max-height: unset;
}
}
}
}
.video-container {
min-height: 530px;
max-height: 530px;
video {
top: 50%;
position: relative;
transform: translateY(-50%);
.outer-assets-container {
height: 300px;
}
}
</style>

3
packages/Webkul/Velocity/src/Resources/views/shop/home/slider.blade.php
View File

@ -28,8 +28,7 @@
<a @if($slider['slider_path']) href="{{ $slider['slider_path'] }}" @endif>
<img
class="col-12 no-padding banner-icon"
src="{{ url()->to('/') . '/storage/' . $slider['path'] }}"
alt="" width="1298" height="450" />
src="{{ url()->to('/') . '/storage/' . $slider['path'] }}" />
<div class="show-content" v-html="'{{ $textContent }}'">
</div>