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

Merge branch 'prateek-latest1' into velocity

This commit is contained in:
shubhammehrotra.symfony@webkul.com 2020-01-20 19:33:22 +05:30
parent 66e8fc1a8c d3ccadb1a2
commit 7ae2fee6e2
12 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
View File

@ -28,7 +28,7 @@
<div class="form-container">
@csrf()
{!! view_render_event('bagisto.admin.settings.locale.edit.before') !!}
{!! view_render_event('bagisto.admin.settings.locale.edit.before', ['locale' => $locale]) !!}
<input name="_method" type="hidden" value="PUT">
@ -60,7 +60,7 @@
</div>
</accordian>
{!! view_render_event('bagisto.admin.settings.locale.edit.after') !!}
{!! view_render_event('bagisto.admin.settings.locale.edit.after', ['locale' => $locale]) !!}
</div>
</div>
</form>

2
packages/Webkul/Core/src/Repositories/SliderRepository.php
View File

@ -55,7 +55,7 @@ class SliderRepository extends Repository
*/
public function save(array $data)
{
Event::fire('core.settings.slider.create.before', $id);
Event::fire('core.settings.slider.create.before', $data);
$channelName = $this->channelRepository->find($data['channel_id'])->name;

7
packages/Webkul/Velocity/publishable/assets/css/velocity-admin.css vendored
View File

@ -24,13 +24,6 @@
font-style: normal;
}
.wk-icon {
font-size: 20px;
font-weight: 400;
text-align: center;
color: #0041ff;
}
[class^="rango-"], [class*=" rango-"] {
/* use !important to prevent issues with browser extensions that change fonts */
font-family: 'Webkul Rango' !important;

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

@ -1463,6 +1463,9 @@
.account-content .sidebar {
height: 100%;
}
.account-content .sidebar .customer-sidebar {
border-right: 1px solid #E5E5E5;
}
@ -12755,6 +12758,7 @@ body {
}
#top #account + .account-modal {
top: 40px;
right: 10px;
z-index: 100;
height: -webkit-max-content;

9
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

@ -1069,7 +1069,8 @@ module.exports = Cancel;
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(12);
module.exports = __webpack_require__(69);
__webpack_require__(69);
module.exports = __webpack_require__(70);
/***/ }),
@ -36779,5 +36780,11 @@ if (false) {
// removed by extract-text-webpack-plugin
/***/ }),
/* 70 */
/***/ (function(module, exports) {
// removed by extract-text-webpack-plugin
/***/ })
/******/ ]);

16
packages/Webkul/Velocity/src/Helpers/AdminHelper.php
View File

@ -22,7 +22,7 @@ class AdminHelper
public function saveLocaleImg($locale)
{
$uploadedImagePath = $this->uploadImage('locale_image.image_0');
$uploadedImagePath = $this->uploadImage($locale, 'locale_image.image_0');
if ($uploadedImagePath) {
$locale->locale_image = $uploadedImagePath;
@ -36,7 +36,7 @@ class AdminHelper
{
$category = $this->categoryRepository->findOrFail($categoryId);
$uploadedImagePath = $this->uploadImage('category_icon_path.image_0');
$uploadedImagePath = $this->uploadImage($category, 'category_icon_path.image_1');
if ($uploadedImagePath) {
$category->category_icon_path = $uploadedImagePath;
@ -46,22 +46,26 @@ class AdminHelper
return $category;
}
public function uploadImage($type)
public function uploadImage($record, $type)
{
$request = request();
$image = '';
$file = $type;
$dir = "velocity/$type";
$dir = 'velocity/' . $type;
if ($request->hasFile($file)) {
Storage::delete($dir . $file);
if ($type == 'locale_image.image_0' && $record->locale_image) {
Storage::delete($record->locale_image);
}
if ($type == 'category_icon_path.image_1' && $record->category_icon_path) {
Storage::delete($record->category_icon_path);
}
$image = $request->file($file)->store($dir);
return $image;
}
return false;
}

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

@ -208,6 +208,7 @@ body {
+ .account-modal {
@extend .modal-dialog;
top: 40px;
right: 10px;
z-index: 100;
height: max-content;

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

@ -666,7 +666,10 @@
.account-content {
.sidebar {
height: 100%;
.customer-sidebar {
border-right: 1px solid $border-general;
}
.customer-sidebar {
.account-details {

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

@ -25,7 +25,7 @@
@if ($favicon = core()->getCurrentChannel()->favicon_url)
<link rel="icon" sizes="16x16" href="{{ $favicon }}" />
@else
<link rel="icon" sizes="16x16" href="{{ bagisto_asset('images/favicon.ico') }}" />
<link rel="icon" sizes="16x16" href="{{ asset('themes/velocity/assets/images/favicon.png') }}" />
@endif
@yield('head')

4
packages/Webkul/Velocity/src/Resources/views/products/list/card.blade.php
View File

@ -1,7 +1,7 @@
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
@inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
@include('shop::UI.product-quick-view')
{{-- @include('shop::UI.product-quick-view') --}}
@php
if (isset($checkmode) && $checkmode && $toolbarHelper->getCurrentMode() == "list") {
@ -72,7 +72,7 @@
src="{{ $productBaseImage['medium_image_url'] }}"
alt="{{ $product->name }}">
<quick-view-btn details="{{ $product }}"></quick-view-btn>
{{-- <quick-view-btn details="{{ $product }}"></quick-view-btn> --}}
</a>
<div class="card-body">

20
packages/Webkul/Velocity/src/Resources/views/products/reviews/create.blade.php
View File

@ -14,13 +14,15 @@
<div class="col-6">
<div class="row customer-rating">
<h2 class="full-width">{{ __('shop::app.reviews.write-review') }}</h2>
<h2 class="full-width">
{{ __('shop::app.reviews.write-review') }}
</h2>
<form
method="POST"
class="review-form"
action="{{ route('shop.reviews.store', $product->product_id ) }}"
@submit.prevent="onSubmit">
@submit.prevent="onSubmit"
action="{{ route('shop.reviews.store', $product->product_id ) }}">
@csrf
@ -29,7 +31,7 @@
{{ __('admin::app.customers.reviews.rating') }}
</label>
<star-ratings ratings="5" size="24" editable="true"></star-ratings>
<span class="control-error" v-if="errors.has('rating')">
<span :class="`control-error ${errors.has('rating') ? '' : 'hide'}`" v-if="errors.has('rating')">
@{{ errors.first('rating') }}
</span>
</div>
@ -45,7 +47,9 @@
v-validate="'required'"
value="{{ old('title') }}" />
<span class="control-error" v-if="errors.has('title')">@{{ errors.first('title') }}</span>
<span :class="`control-error ${errors.has('title') ? '' : 'hide'}`">
@{{ errors.first('title') }}
</span>
</div>
@if (core()->getConfigData('catalog.products.review.guest_review') && ! auth()->guard('customer')->user())
@ -54,7 +58,9 @@
{{ __('shop::app.reviews.name') }}
</label>
<input type="text" class="control" name="name" v-validate="'required'" value="{{ old('name') }}">
<span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
<span :class="`control-error ${errors.has('name') ? '' : 'hide'}`">
@{{ errors.first('name') }}
</span>
</div>
@endif
@ -69,7 +75,7 @@
v-validate="'required'"
value="{{ old('comment') }}">
</textarea>
<span class="control-error" v-if="errors.has('comment')">
<span :class="`control-error ${errors.has('comment') ? '' : 'hide'}`">
@{{ errors.first('comment') }}
</span>
</div>

4
packages/Webkul/Velocity/webpack.mix.js vendored
View File

@ -18,6 +18,10 @@ mix
"js/velocity.js"
)
.sass(
__dirname + '/src/Resources/assets/sass/admin.scss',
__dirname + '/' + publicPath + '/css/velocity-admin.css'
)
.sass(
__dirname + '/src/Resources/assets/sass/app.scss',
__dirname + '/' + publicPath + '/css/velocity.css', {