Merge branch 'master' into datagrid-plus-changes
This commit is contained in:
Devansh
commit
07ded4cd3e
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"/css/default-booking.css": "/css/default-booking.css?id=76de1f2b8e064c1e9043",
|
||||
"/css/velocity-booking.css": "/css/velocity-booking.css?id=847aebb5031ed219528e",
|
||||
"/js/admin-booking.js": "/js/admin-booking.js?id=550f81bdc01469b71c46",
|
||||
"/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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
@import "icons";
|
||||
|
||||
.booking-information {
|
||||
margin-bottom: 15px;
|
||||
|
||||
.booking-info-row {
|
||||
padding-left: 32px;
|
||||
margin-bottom: 20px;
|
||||
|
|
@ -110,6 +108,10 @@
|
|||
.radio {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.control-error {
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
|
||||
.control-group-container {
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ return [
|
|||
|
||||
'shop' => [
|
||||
'products' => [
|
||||
'booking-information' => 'Booking Information',
|
||||
'location' => 'موقعك',
|
||||
'contact' => 'مكالمة',
|
||||
'email' => 'البريد الإلكتروني',
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ return [
|
|||
|
||||
'shop' => [
|
||||
'products' => [
|
||||
'booking-information' => 'Booking Information',
|
||||
'location' => 'Location',
|
||||
'contact' => 'Contact',
|
||||
'email' => 'Email',
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ return [
|
|||
|
||||
'shop' => [
|
||||
'products' => [
|
||||
'booking-information' => 'Booking Information',
|
||||
'location' => 'Ubicación',
|
||||
'contact' => 'Contacto',
|
||||
'email' => 'Correo Electrónico',
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ return [
|
|||
|
||||
'shop' => [
|
||||
'products' => [
|
||||
'booking-information' => 'Booking Information',
|
||||
'location' => 'مکان',
|
||||
'contact' => 'مخاطب',
|
||||
'email' => 'پست الکترونیک',
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ return [
|
|||
|
||||
'shop' => [
|
||||
'products' => [
|
||||
'booking-information' => 'Booking Information',
|
||||
'location' => 'स्थान',
|
||||
'contact' => 'संपर्क करें',
|
||||
'email' => 'ईमेल',
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ return [
|
|||
|
||||
'shop' => [
|
||||
'products' => [
|
||||
'booking-information' => 'Booking Information',
|
||||
'location' => 'Location',
|
||||
'contact' => 'Contatto',
|
||||
'email' => 'Email',
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ return [
|
|||
|
||||
'shop' => [
|
||||
'products' => [
|
||||
'booking-information' => 'Booking Information',
|
||||
'location' => 'Plaats',
|
||||
'contact' => 'Contact',
|
||||
'email' => 'Email',
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ return [
|
|||
|
||||
'shop' => [
|
||||
'products' => [
|
||||
'booking-information' => 'Booking Information',
|
||||
'location' => 'Localização',
|
||||
'contact' => 'Contato',
|
||||
'email' => 'O email',
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ return [
|
|||
|
||||
'shop' => [
|
||||
'products' => [
|
||||
'booking-information' => 'Booking Information',
|
||||
'location' => 'Konum',
|
||||
'contact' => 'İletişim',
|
||||
'email' => 'Email',
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ return [
|
|||
|
||||
'shop' => [
|
||||
'products' => [
|
||||
'booking-information' => 'Booking Information',
|
||||
'location' => '位置',
|
||||
'contact' => '联系',
|
||||
'email' => '电子邮件',
|
||||
|
|
|
|||
|
|
@ -6,7 +6,18 @@
|
|||
<link rel="stylesheet" href="{{ bagisto_asset('css/velocity-booking.css') }}">
|
||||
@endpush
|
||||
|
||||
<booking-information></booking-information>
|
||||
<accordian :title="'{{ __('bookingproduct::app.shop.products.booking-information') }}'" :active="true">
|
||||
<div slot="header">
|
||||
<h3 class="no-margin display-inbl">
|
||||
{{ __('bookingproduct::app.shop.products.booking-information') }}
|
||||
</h3>
|
||||
<i class="rango-arrow"></i>
|
||||
</div>
|
||||
|
||||
<div slot="body">
|
||||
<booking-information></booking-information>
|
||||
</div>
|
||||
</accordian>
|
||||
|
||||
@push('scripts')
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
<div v-if="renting_type == 'daily_hourly'">
|
||||
<div class="form-group">
|
||||
<label>{{ __('bookingproduct::app.shop.products.choose-rent-option') }}</label>
|
||||
<label class="label-style">{{ __('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>{{ __('bookingproduct::app.shop.products.select-slot') }}</label>
|
||||
<label class="label-style">{{ __('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>{{ __('bookingproduct::app.shop.products.select-rent-time') }}</label>
|
||||
<label class="label-style">{{ __('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>{{ __('bookingproduct::app.shop.products.select-date') }}</label>
|
||||
<label class="label-style">{{ __('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' : '']">
|
||||
|
|
|
|||
|
|
@ -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 class="label-style">{{ $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' : '']">
|
||||
|
|
|
|||
|
|
@ -58,6 +58,6 @@
|
|||
])
|
||||
|
||||
<div class="form-group">
|
||||
<label>{{ __('bookingproduct::app.shop.products.special-notes') }}</label>
|
||||
<label class="label-style">{{ __('bookingproduct::app.shop.products.special-notes') }}</label>
|
||||
<textarea name="booking[note]" class="form-style" style="width: 100%"/>
|
||||
</div>
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=ba3c7cada62de152fd8f",
|
||||
"/js/velocity-core.js": "/js/velocity-core.js?id=73cc7c3501570ebe9151",
|
||||
"/js/velocity.js": "/js/velocity.js?id=f655ac65cbd1aa549cba",
|
||||
"/js/manifest.js": "/js/manifest.js?id=e069a8f952a02ea0f290",
|
||||
"/js/components.js": "/js/components.js?id=13ebf112e40292178d23",
|
||||
"/css/velocity.css": "/css/velocity.css?id=7290c10f17cb95070a07",
|
||||
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3f",
|
||||
"/images/icon-calendar.svg": "/images/icon-calendar.svg?id=870d0f733a5837742276",
|
||||
"/images/icon-camera.svg": "/images/icon-camera.svg?id=b2fd2f9e17e1ccee96e2",
|
||||
"/images/icon-crossed.svg": "/images/icon-crossed.svg?id=c72c3c1ef790bd4fd993",
|
||||
"/images/icon-eye.svg": "/images/icon-eye.svg?id=9345f20b862e21aa30c6",
|
||||
"/images/icon-search.svg": "/images/icon-search.svg?id=a5f38a895551b8a015b2"
|
||||
"/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=ba3c7cada62de152fd8fce211d0b1b70",
|
||||
"/js/velocity-core.js": "/js/velocity-core.js?id=73cc7c3501570ebe9151c72d954bd97d",
|
||||
"/js/velocity.js": "/js/velocity.js?id=f655ac65cbd1aa549cba57f77b9a4344",
|
||||
"/js/manifest.js": "/js/manifest.js?id=e069a8f952a02ea0f290bcca8fab930e",
|
||||
"/js/components.js": "/js/components.js?id=13ebf112e40292178d2386143e9d75cd",
|
||||
"/css/velocity.css": "/css/velocity.css?id=f0b348e63aeb729dfa6f16132f3a877a",
|
||||
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
|
||||
"/images/icon-calendar.svg": "/images/icon-calendar.svg?id=870d0f733a58377422766f3152e15486",
|
||||
"/images/icon-camera.svg": "/images/icon-camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",
|
||||
"/images/icon-crossed.svg": "/images/icon-crossed.svg?id=c72c3c1ef790bd4fd99376bd4ba7bd5b",
|
||||
"/images/icon-eye.svg": "/images/icon-eye.svg?id=9345f20b862e21aa30c675df49d56fd5",
|
||||
"/images/icon-search.svg": "/images/icon-search.svg?id=a5f38a895551b8a015b24952561263f1"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -455,6 +455,10 @@ body {
|
|||
content: '\E907';
|
||||
}
|
||||
|
||||
.rango-arrow-left::before {
|
||||
content: '\E908';
|
||||
}
|
||||
|
||||
.styled-select {
|
||||
+ .select-icon-container {
|
||||
.select-icon {
|
||||
|
|
@ -518,6 +522,26 @@ body {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.full-content-wrapper .container-fluid .row.carousel-products-header {
|
||||
padding-right: 15px !important;
|
||||
padding-left: 75px !important;
|
||||
}
|
||||
|
||||
.carousel-products {
|
||||
.VueCarousel-wrapper {
|
||||
direction: ltr;
|
||||
}
|
||||
|
||||
.VueCarousel-slide {
|
||||
direction: ltr;
|
||||
}
|
||||
|
||||
.VueCarousel-navigation {
|
||||
left: 12px;
|
||||
right: unset;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue