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

Merge pull request #6215 from jitendra-webkul/master 

Issue #6202 fixed
This commit is contained in:
Jitendra Singh 2022-04-01 21:30:46 +05:30 committed by GitHub
parent a55081ace5 6bbf6fc883
commit dbf7475222
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -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"
}

6
packages/Webkul/BookingProduct/src/Resources/assets/sass/velocity.scss vendored
View File

@ -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 {

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

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

1
packages/Webkul/BookingProduct/src/Resources/lang/en/app.php
View File

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

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

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

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

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

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

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

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

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

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

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

1
packages/Webkul/BookingProduct/src/Resources/lang/pt_BR/app.php
View File

@ -82,6 +82,7 @@ return [
'shop' => [
'products' => [
'booking-information' => 'Booking Information',
'location' => 'Localização',
'contact' => 'Contato',
'email' => 'O email',

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

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

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

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

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

@ -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')

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>{{ __('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' : '']">

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>{{ $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' : '']">

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>{{ __('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>