Merge branch 'master' into issue-3495
This commit is contained in:
vishal-webkul
GitHub
commit
1ae5ad201f
|
|
@ -108,8 +108,6 @@ class ShipmentController extends Controller
|
|||
}
|
||||
|
||||
$this->validate(request(), [
|
||||
'shipment.carrier_title' => 'required',
|
||||
'shipment.track_number' => 'required',
|
||||
'shipment.source' => 'required',
|
||||
'shipment.items.*.*' => 'required|numeric|min:0',
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -16,22 +16,22 @@ class Order
|
|||
{
|
||||
/**
|
||||
* Send new order Mail to the customer and admin
|
||||
*
|
||||
*
|
||||
* @param \Webkul\Sales\Contracts\Order $order
|
||||
* @return void
|
||||
*/
|
||||
public function sendNewOrderMail($order)
|
||||
{
|
||||
try {
|
||||
/* email to customer */
|
||||
$configKey = 'emails.general.notifications.emails.general.notifications.new-order';
|
||||
|
||||
if (core()->getConfigData($configKey)) {
|
||||
if (core()->getConfigData($configKey))
|
||||
Mail::queue(new NewOrderNotification($order));
|
||||
}
|
||||
|
||||
/* email to admin */
|
||||
$configKey = 'emails.general.notifications.emails.general.notifications.new-admin';
|
||||
|
||||
if (core()->getConfigData($configKey)) {
|
||||
app()->setLocale(env('APP_LOCALE'));
|
||||
Mail::queue(new NewAdminNotification($order));
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
|
|
@ -41,7 +41,7 @@ class Order
|
|||
|
||||
/**
|
||||
* Send new invoice mail to the customer
|
||||
*
|
||||
*
|
||||
* @param \Webkul\Sales\Contracts\Invoice $invoice
|
||||
* @return void
|
||||
*/
|
||||
|
|
@ -64,7 +64,7 @@ class Order
|
|||
|
||||
/**
|
||||
* Send new refund mail to the customer
|
||||
*
|
||||
*
|
||||
* @param \Webkul\Sales\Contracts\Refund $refund
|
||||
* @return void
|
||||
*/
|
||||
|
|
@ -83,7 +83,7 @@ class Order
|
|||
|
||||
/**
|
||||
* Send new shipment mail to the customer
|
||||
*
|
||||
*
|
||||
* @param \Webkul\Sales\Contracts\Shipment $shipment
|
||||
* @return void
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
@stop
|
||||
|
||||
|
||||
@section('content-wrapper')
|
||||
@section('content')
|
||||
|
||||
<div class="content full-page">
|
||||
<div class="content">
|
||||
{!! view_render_event('admin.customer.addresses.create.before') !!}
|
||||
|
||||
<form method="POST" action="{{ route('admin.customer.addresses.store', ['id' => $customer->id]) }}" @submit.prevent="onSubmit">
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
@stop
|
||||
|
||||
|
||||
@section('content-wrapper')
|
||||
@section('content')
|
||||
|
||||
<div class="content full-page">
|
||||
<div class="content">
|
||||
{!! view_render_event('admin.customer.addresses.edit.before', ['address' => $address]) !!}
|
||||
|
||||
<form method="post" action="{{ route('admin.customer.addresses.update', $address->id) }}" @submit.prevent="onSubmit">
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@
|
|||
<div class="page-header">
|
||||
<div class="page-title">
|
||||
<h1>
|
||||
<i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
|
||||
<i class="icon angle-left-icon back-link"
|
||||
onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
|
||||
|
||||
{{ __('admin::app.promotions.cart-rules.add-title') }}
|
||||
</h1>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,8 @@
|
|||
<div class="page-header">
|
||||
<div class="page-title">
|
||||
<h1>
|
||||
<i class="icon angle-left-icon back-link" @click="redirectBack('{{ url('/admin/dashboard') }}')"></i>
|
||||
<i class="icon angle-left-icon back-link"
|
||||
onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
|
||||
|
||||
{{ __('admin::app.promotions.cart-rules.edit-title') }}
|
||||
</h1>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@
|
|||
<div class="page-header">
|
||||
<div class="page-title">
|
||||
<h1>
|
||||
<i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
|
||||
<i class="icon angle-left-icon back-link"
|
||||
onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
|
||||
|
||||
{{ __('admin::app.promotions.catalog-rules.add-title') }}
|
||||
</h1>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@
|
|||
<div class="page-header">
|
||||
<div class="page-title">
|
||||
<h1>
|
||||
<i class="icon angle-left-icon back-link" @click="redirectBack('{{ url('/admin/dashboard') }}')"></i>
|
||||
<i class="icon angle-left-icon back-link"
|
||||
onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
|
||||
|
||||
{{ __('admin::app.promotions.catalog-rules.edit-title') }}
|
||||
</h1>
|
||||
|
|
|
|||
|
|
@ -199,20 +199,14 @@
|
|||
</span>
|
||||
</div>
|
||||
|
||||
<div class="control-group" :class="[errors.has('shipment[carrier_title]') ? 'has-error' : '']" style="margin-top: 40px">
|
||||
<label for="shipment[carrier_title]" class="required">{{ __('admin::app.sales.shipments.carrier-title') }}</label>
|
||||
<input type="text" v-validate="'required'" class="control" id="shipment[carrier_title]" name="shipment[carrier_title]" data-vv-as=""{{ __('admin::app.sales.shipments.carrier-title') }}""/>
|
||||
<span class="control-error" v-if="errors.has('shipment[carrier_title]')">
|
||||
@{{ errors.first('shipment[carrier_title]') }}
|
||||
</span>
|
||||
<div class="control-group" style="margin-top: 40px">
|
||||
<label for="shipment[carrier_title]">{{ __('admin::app.sales.shipments.carrier-title') }}</label>
|
||||
<input type="text" class="control" id="shipment[carrier_title]" name="shipment[carrier_title]"/>
|
||||
</div>
|
||||
|
||||
<div class="control-group" :class="[errors.has('shipment[track_number]') ? 'has-error' : '']">
|
||||
<label for="shipment[track_number]" class="required">{{ __('admin::app.sales.shipments.tracking-number') }}</label>
|
||||
<input type="text" v-validate="'required'" class="control" id="shipment[track_number]" name="shipment[track_number]" data-vv-as=""{{ __('admin::app.sales.shipments.tracking-number') }}""/>
|
||||
<span class="control-error" v-if="errors.has('shipment[track_number]')">
|
||||
@{{ errors.first('shipment[track_number]') }}
|
||||
</span>
|
||||
<div class="control-group">
|
||||
<label for="shipment[track_number]">{{ __('admin::app.sales.shipments.tracking-number') }}</label>
|
||||
<input type="text" class="control" id="shipment[track_number]" name="shipment[track_number]"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ class CoreServiceProvider extends ServiceProvider
|
|||
|
||||
$this->loadViewsFrom(__DIR__ . '/../Resources/views', 'core');
|
||||
|
||||
Event::listen('bagisto.shop.layout.head', static function(ViewRenderEventManager $viewRenderEventManager) {
|
||||
Event::listen('bagisto.shop.layout.body.after', static function(ViewRenderEventManager $viewRenderEventManager) {
|
||||
$viewRenderEventManager->addTemplate('core::blade.tracer.style');
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
}
|
||||
|
||||
$(this).remove();
|
||||
})
|
||||
});
|
||||
|
||||
$('.path-hint').on('mouseover', function(e) {
|
||||
e.stopPropagation();
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ class ProductRepository extends Repository
|
|||
|
||||
$perPage = isset($params['limit']) ? $params['limit'] : current($pages);
|
||||
} else {
|
||||
$perPage = isset($params['limit']) ? $params['limit'] : 9;
|
||||
$perPage = isset($params['limit']) && !empty($params['limit']) ? $params['limit'] : 9;
|
||||
}
|
||||
|
||||
$page = Paginator::resolveCurrentPage('page');
|
||||
|
|
@ -388,7 +388,7 @@ class ProductRepository extends Repository
|
|||
->where('product_flat.channel', $channel)
|
||||
->where('product_flat.locale', $locale)
|
||||
->whereNotNull('product_flat.url_key')
|
||||
->where(function($subQuery) use ($term) {
|
||||
->where(function($subQuery) use ($term) {
|
||||
$queries = explode('_', $term);
|
||||
|
||||
foreach (array_map('trim', $queries) as $value) {
|
||||
|
|
@ -399,7 +399,7 @@ class ProductRepository extends Repository
|
|||
->orderBy('product_id', 'desc');
|
||||
})->paginate(16);
|
||||
}
|
||||
|
||||
|
||||
return $results;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -579,7 +579,7 @@ return [
|
|||
'final-summary' => 'Thanks for showing your interest in our store we will send you tracking number once it shipped',
|
||||
'help' => 'If you need any kind of help please contact us at :support_email',
|
||||
'thanks' => 'Thanks!',
|
||||
|
||||
|
||||
'comment' => [
|
||||
'subject' => 'New comment added to your order',
|
||||
'dear' => 'Dear :customer_name',
|
||||
|
|
@ -618,9 +618,9 @@ return [
|
|||
|
||||
'shipment' => [
|
||||
'heading' => 'Shipment #:shipment_id has been generated for Order #:order_id',
|
||||
'inventory-heading' => 'New shipment #:shipment_id had been generated for Order #:order_id',
|
||||
'inventory-heading' => 'New shipment #:shipment_id has been generated for Order #:order_id',
|
||||
'subject' => 'Shipment for your order #:order_id',
|
||||
'inventory-subject' => 'New shipment had been generated for Order #:order_id',
|
||||
'inventory-subject' => 'New shipment has been generated for Order #:order_id',
|
||||
'summary' => 'Summary of Shipment',
|
||||
'carrier' => 'Carrier',
|
||||
'tracking-number' => 'Tracking Number',
|
||||
|
|
|
|||
|
|
@ -180,6 +180,10 @@
|
|||
} else {
|
||||
this.$set(this, 'products', this.products.filter(product => product.id != productId));
|
||||
}
|
||||
|
||||
window.flashMessages = [{'type': 'alert-success', 'message': response.data.message }];
|
||||
|
||||
this.$root.addFlashMessages();
|
||||
})
|
||||
.catch(error => {
|
||||
console.log("{{ __('velocity::app.error.something_went_wrong') }}");
|
||||
|
|
@ -196,6 +200,10 @@
|
|||
}
|
||||
|
||||
this.setStorageValue('compared_product', updatedItems);
|
||||
|
||||
window.flashMessages = [{'type': 'alert-success', 'message': response.data.message }];
|
||||
|
||||
this.$root.addFlashMessages();
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -46,9 +46,9 @@
|
|||
@if (in_array($category->display_mode, [null, 'products_only', 'products_and_description']))
|
||||
<?php $products = $productRepository->getAll($category->id); ?>
|
||||
|
||||
@if ($products->count())
|
||||
@include ('shop::products.list.toolbar')
|
||||
|
||||
@include ('shop::products.list.toolbar')
|
||||
@if ($products->count())
|
||||
|
||||
@inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,24 +0,0 @@
|
|||
/* flatpickr v4.6.3, @license MIT */
|
||||
|
||||
/*! *****************************************************************************
|
||||
Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
|
||||
this file except in compliance with the License. You may obtain a copy of the
|
||||
License at http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
|
||||
WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
|
||||
MERCHANTABLITY OR NON-INFRINGEMENT.
|
||||
|
||||
See the Apache Version 2.0 License for specific language governing permissions
|
||||
and limitations under the License.
|
||||
***************************************************************************** */
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @author Jerry Bendy <jerry@icewingcc.com>
|
||||
* @licence MIT
|
||||
*
|
||||
*/
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"/js/ui.js": "/js/ui.js?id=e5e928de0a10dc274cd5",
|
||||
"/css/ui.css": "/css/ui.css?id=7a610c96759844d71103"
|
||||
"/js/ui.js": "/js/ui.js?id=3ccd955983e91b6ccc96",
|
||||
"/css/ui.css": "/css/ui.css?id=b5bedc0ff04a145ca18a"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@
|
|||
justify-content: space-between;
|
||||
align-items: center;
|
||||
font-size: 14px;
|
||||
height: 28px;
|
||||
height: 40px;
|
||||
border-radius: 2px;
|
||||
margin-right: 20px;
|
||||
|
||||
|
|
@ -132,7 +132,7 @@
|
|||
align-items: center;
|
||||
background: #E7E7E7;
|
||||
font-size: 14px;
|
||||
height: 28px;
|
||||
height: 40px;
|
||||
color: #000311;
|
||||
letter-spacing: -0.22px;
|
||||
@include border-radius(2px);
|
||||
|
|
|
|||
|
|
@ -35,4 +35,6 @@ return [
|
|||
'items-per-page' => 'Przedmioty na stronę',
|
||||
'value-here' => 'Wartość tutaj',
|
||||
'numeric-value-here' => 'wartość liczbowa tutaj',
|
||||
'submit' => 'Prześlij'
|
||||
'submit' => 'Prześlij'
|
||||
]
|
||||
];
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"/js/velocity.js": "/js/velocity.js?id=ed145773873729794808",
|
||||
"/js/velocity.js": "/js/velocity.js?id=4a39566e232d46c78c1e",
|
||||
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
|
||||
"/css/velocity.css": "/css/velocity.css?id=02ba781fdeb5ad5b10eb"
|
||||
"/css/velocity.css": "/css/velocity.css?id=49c1e646d73ed339dbc3"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
.vc-small-screen {
|
||||
display: none !important;
|
||||
}
|
||||
|
|
@ -30,6 +31,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
@media only screen and (max-width: 992px) {
|
||||
|
||||
}
|
||||
|
|
@ -47,6 +49,36 @@
|
|||
.footer .currency {
|
||||
display: block !important;
|
||||
}
|
||||
|
||||
|
||||
.table {
|
||||
width: 90%;
|
||||
margin-bottom: 1rem;
|
||||
margin-top: 68px;
|
||||
color: #212529;
|
||||
}
|
||||
|
||||
.per-page {
|
||||
position: absolute;
|
||||
margin-top: 66px;
|
||||
margin-right: -1px;
|
||||
margin-left: 17px;
|
||||
width: 151px;
|
||||
}
|
||||
|
||||
.filter-left {
|
||||
position: relative;
|
||||
margin-right: -6px!important;
|
||||
}
|
||||
|
||||
.dropdown-filters {
|
||||
margin-left: 15px;
|
||||
}
|
||||
|
||||
button.btn.btn-sm.btn-primary.apply-filter {
|
||||
margin-top: 10px;
|
||||
margin-left: -158px;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 992px) {
|
||||
|
|
|
|||
|
|
@ -776,7 +776,7 @@ a {
|
|||
}
|
||||
|
||||
.scrollable {
|
||||
max-height: 100vh;
|
||||
max-height: 100%;
|
||||
overflow-y: scroll;
|
||||
scrollbar-width: none;
|
||||
-ms-overflow-style: none;
|
||||
|
|
|
|||
|
|
@ -308,7 +308,7 @@
|
|||
|
||||
searchedItem.forEach(item => {
|
||||
let splitedItem = item.split('=');
|
||||
updatedSearchedCollection[splitedItem[0]] = splitedItem[1];
|
||||
updatedSearchedCollection[splitedItem[0]] = decodeURI(splitedItem[1]);
|
||||
});
|
||||
|
||||
if (updatedSearchedCollection['image-search'] == 1) {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
@section('page-detail-wrapper')
|
||||
@if ($addresses->isEmpty())
|
||||
<a href="{{ route('customer.address.create') }}" class="theme-btn light unset pull-right">
|
||||
<a href="{{ route('customer.address.create') }}" class="theme-btn light unset address-button">
|
||||
{{ __('shop::app.customer.account.address.index.add') }}
|
||||
</a>
|
||||
@endif
|
||||
|
|
@ -80,3 +80,12 @@
|
|||
}
|
||||
</script>
|
||||
@endpush
|
||||
|
||||
@if ($addresses->isEmpty())
|
||||
<style>
|
||||
.address-button {
|
||||
position: absolute;
|
||||
margin-top: 92px;
|
||||
}
|
||||
</style>
|
||||
@endif
|
||||
|
|
|
|||
|
|
@ -149,4 +149,25 @@
|
|||
});
|
||||
})()
|
||||
</script>
|
||||
|
||||
<script>
|
||||
$(document).ready(() => {
|
||||
|
||||
/* waiting for the window to appear */
|
||||
let waitForEl = function(selector, callback) {
|
||||
if (jQuery(selector).length) {
|
||||
callback();
|
||||
} else {
|
||||
setTimeout(function() {waitForEl(selector, callback);}, 100);
|
||||
}
|
||||
};
|
||||
|
||||
/* positioning when .zoomWindow div available */
|
||||
waitForEl('.zoomWindow', function() {
|
||||
if ($('body').hasClass("rtl")) {
|
||||
$('.zoomWindow').css('right', '522px');
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
Loading…
Reference in New Issue