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

Merge remote-tracking branch 'upstream/master' into datagrid-plus-changes

This commit is contained in:
Devansh 2022-04-04 15:34:38 +05:30
parent 4bde5ca931 23ddd96047
commit 898791ff29
16 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/BookingProduct/publishable/assets/css/admin-booking.css vendored
View File

@ -1 +1 @@
.switch-view-container{margin-left:-5px;margin-right:6px;vertical-align:top;display:inline-block}.switch-view-container .icon-container{height:36px;cursor:pointer;display:inline-block;padding:6px 10px 10px;border:1px solid #c7c7c7}.switch-view-container .icon-container:first-child{left:5px;position:relative;border-radius:3px 0 0 3px}.switch-view-container .icon-container:last-child{border-radius:0 3px 3px 0}.switch-view-container .icon-container.active{cursor:not-allowed;border-color:#0041ff;background-color:#0041ff}.switch-view-container .icon-container .icon{vertical-align:middle;width:22px;height:22px}.vuecal__event{background:#0041ff!important;color:#fff!important;cursor:pointer}.vuecal__event:hover{height:-webkit-max-content!important;height:-moz-max-content!important;height:max-content!important}.rtl .switch-view-container{margin-left:unset}.rtl .switch-view-container .icon-container.active{margin-left:-9px}.calendar-icon{background-image:url(../images/calendar-icon.svg)}.calendar-white-icon{background-image:url(../images/calendar-white-icon.svg)}.table-icon{background-image:url(../images/table-icon.svg)}.table-white-icon{background-image:url(../images/table-white-icon.svg)}
.switch-view-container{margin-left:-5px;margin-right:6px;vertical-align:top;display:inline-block}.switch-view-container .icon-container{height:36px;cursor:pointer;display:inline-block;padding:6px 10px 10px;border:1px solid #c7c7c7}.switch-view-container .icon-container:first-child{left:5px;position:relative;border-radius:3px 0 0 3px}.switch-view-container .icon-container:last-child{border-radius:0 3px 3px 0}.switch-view-container .icon-container.active{cursor:not-allowed;background-color:#0041ff;border:1px solid}.switch-view-container .icon-container .icon{vertical-align:middle;width:22px;height:22px}.vuecal__event{background:#0041ff!important;color:#fff!important;cursor:pointer}.vuecal__event:hover{height:-webkit-max-content!important;height:-moz-max-content!important;height:max-content!important}.rtl .switch-view-container{margin-left:unset}.rtl .switch-view-container .icon-container.active{margin-left:-9px}.calendar-icon{background-image:url(../images/calendar-icon.svg)}.calendar-white-icon{background-image:url(../images/calendar-white-icon.svg)}.table-icon{background-image:url(../images/table-icon.svg)}.table-white-icon{background-image:url(../images/table-white-icon.svg)}

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

@ -2,5 +2,5 @@
"/css/default-booking.css": "/css/default-booking.css?id=76de1f2b8e064c1e9043",
"/css/velocity-booking.css": "/css/velocity-booking.css?id=481d94b621e06671752a",
"/js/admin-booking.js": "/js/admin-booking.js?id=5cc56229ce47cbecd1be",
"/css/admin-booking.css": "/css/admin-booking.css?id=97f40d778fa7f81d69ff"
"/css/admin-booking.css": "/css/admin-booking.css?id=02be5e2fa5a499045cbe"
}

1
packages/Webkul/BookingProduct/src/Resources/assets/sass/admin.scss vendored
View File

@ -25,6 +25,7 @@
cursor: not-allowed;
border-color: #0041ff;
background-color: #0041ff;
border: 1px solid;
}
.icon {

2
packages/Webkul/BookingProduct/src/Resources/lang/ar/app.php
View File

@ -82,7 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'Booking Information',
'booking-information' => 'معلومات عن الخدمة',
'location' => 'موقعك',
'contact' => 'مكالمة',
'email' => 'البريد الإلكتروني',

2
packages/Webkul/BookingProduct/src/Resources/lang/es/app.php
View File

@ -82,7 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'Booking Information',
'booking-information' => 'Información de reserva',
'location' => 'Ubicación',
'contact' => 'Contacto',
'email' => 'Correo Electrónico',

2
packages/Webkul/BookingProduct/src/Resources/lang/fa/app.php
View File

@ -82,7 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'Booking Information',
'booking-information' => 'اطلاعات مربوط به رزرو',
'location' => 'مکان',
'contact' => 'مخاطب',
'email' => 'پست الکترونیک',

2
packages/Webkul/BookingProduct/src/Resources/lang/hi_IN/app.php
View File

@ -82,7 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'Booking Information',
'booking-information' => 'बुकिंग जानकारी',
'location' => 'स्थान',
'contact' => 'संपर्क करें',
'email' => 'ईमेल',

2
packages/Webkul/BookingProduct/src/Resources/lang/it/app.php
View File

@ -82,7 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'Booking Information',
'booking-information' => 'Informazioni sulla prenotazione',
'location' => 'Location',
'contact' => 'Contatto',
'email' => 'Email',

2
packages/Webkul/BookingProduct/src/Resources/lang/nl/app.php
View File

@ -82,7 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'Booking Information',
'booking-information' => 'Boekingsinformatie',
'location' => 'Plaats',
'contact' => 'Contact',
'email' => 'Email',

2
packages/Webkul/BookingProduct/src/Resources/lang/tr/app.php
View File

@ -82,7 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'Booking Information',
'booking-information' => 'Rezervasyon bilgileri',
'location' => 'Konum',
'contact' => 'İletişim',
'email' => 'Email',

2
packages/Webkul/BookingProduct/src/Resources/lang/zh_CN/app.php
View File

@ -82,7 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'Booking Information',
'booking-information' => '预订信息',
'location' => '位置',
'contact' => '联系',
'email' => '电子邮件',

2
packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/slots.blade.php
View File

@ -4,7 +4,7 @@
<script type="text/x-template" id="book-slots-template">
<div class="book-slots">
<label>{{ $title ?? __('bookingproduct::app.shop.products.book-an-appointment') }} :</label>
<label>{{ $title ?? __('bookingproduct::app.shop.products.book-an-appointment') }}</label>
<div class="control-group-container">
<div class="control-group date" :class="[errors.has('booking[date]') ? 'has-error' : '']">

8
packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/rental.blade.php
View File

@ -7,7 +7,7 @@
<div v-if="renting_type == 'daily_hourly'">
<div class="form-group">
<label class="label-style">{{ __('bookingproduct::app.shop.products.choose-rent-option') }}</label>
<label class="label-style required">{{ __('bookingproduct::app.shop.products.choose-rent-option') }}</label>
<span class="radio">
<input type="radio" id="daily-renting-type" name="booking[renting_type]" value="daily" v-model="sub_renting_type">
@ -27,7 +27,7 @@
<div v-if="renting_type != 'daily' && sub_renting_type == 'hourly'">
<div>
<label class="label-style">{{ __('bookingproduct::app.shop.products.select-slot') }}</label>
<label class="label-style required">{{ __('bookingproduct::app.shop.products.select-slot') }}</label>
<div class="control-group-container">
<div class="form-group date" :class="[errors.has('booking[date]') ? 'has-error' : '']">
@ -50,7 +50,7 @@
</div>
<div v-if="slots[selected_slot] && slots[selected_slot]['slots'].length">
<label class="label-style">{{ __('bookingproduct::app.shop.products.select-rent-time') }}</label>
<label class="label-style required">{{ __('bookingproduct::app.shop.products.select-rent-time') }}</label>
<div class="control-group-container">
<div class="form-group slots" :class="[errors.has('booking[slot][from]') ? 'has-error' : '']">
@ -81,7 +81,7 @@
</div>
<div v-else>
<label class="label-style">{{ __('bookingproduct::app.shop.products.select-date') }}</label>
<label class="label-style required">{{ __('bookingproduct::app.shop.products.select-date') }}</label>
<div class="control-group-container">
<div class="form-group date" :class="[errors.has('booking[date_from]') ? 'has-error' : '']">

2
packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/slots.blade.php
View File

@ -4,7 +4,7 @@
<script type="text/x-template" id="book-slots-template">
<div class="book-slots">
<label class="label-style">{{ $title ?? __('bookingproduct::app.shop.products.book-an-appointment') }} :</label>
<label class="label-style required">{{ $title ?? __('bookingproduct::app.shop.products.book-an-appointment') }}</label>
<div class="control-group-container">
<div class="form-group date" :class="[errors.has('booking[date]') ? 'has-error' : '']">

2
packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/table.blade.php
View File

@ -58,6 +58,6 @@
])
<div class="form-group">
<label class="label-style">{{ __('bookingproduct::app.shop.products.special-notes') }}</label>
<label class="label-style required">{{ __('bookingproduct::app.shop.products.special-notes') }}</label>
<textarea name="booking[note]" class="form-style" style="width: 100%"/>
</div>

2
packages/Webkul/Velocity/src/Resources/views/shop/layouts/header/mobile.blade.php
View File

@ -11,7 +11,7 @@
cart-items-count="{{ $cartItemsCount }}"
cart-route="{{ route('shop.checkout.cart.index') }}"
:locale="{{ json_encode(core()->getCurrentLocale()) }}"
:all-locales="{{ json_encode(core()->getCurrentChannel()->locales) }}"
:all-locales="{{ json_encode(core()->getCurrentChannel()->locales()->orderBy('name')->get()) }}"
:currency="{{ json_encode(core()->getCurrentCurrency()) }}"
:all-currencies="{{ json_encode(core()->getCurrentChannel()->currencies) }}"
>