TPS/elektronika_bagisto
TPS
/
elektronika_bagisto
6
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #7167 from prabhatkumaroc082/fix-booking-date-ui 

Issue Fixed #6991
This commit is contained in:
Jitendra Singh 2022-12-14 19:29:34 +05:30 committed by GitHub
parent 09d23d6ecf ad8d19ddee
commit a089506f08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 61 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=d3346c1482b250471721",
"/css/admin.css": "/css/admin.css?id=295abc30d293848c6226"
"/js/admin.js": "/js/admin.js?id=412c628fd7f979cc1d9e",
"/css/admin.css": "/css/admin.css?id=aedd6e010506162cdca4"
}

16
packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss vendored
View File

@ -487,20 +487,8 @@ body {
.ticket-list {
.control-group {
&.date {
&::after {
left: unset;
right: 10px;
top: 34px;
}
}
&.has-error {
&.date {
&::after {
top: 47px !important;
}
}
.cross-icon {
display: none;
}
@media only screen and (max-width: 425px) {

15
packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php
View File

@ -13,22 +13,7 @@
padding-left: 0px !important;
}
.slot-list table tbody tr td .control-group label{
display: none;
}
@media only screen and (max-width: 540px){
.slot-list table thead{
display: none;
}
.slot-list table tbody tr td{
display: block;
}
.slot-list table tbody tr td .control-group label{
display: block;
}
.table .control-group.date:after, .table .control-group.datetime:after {
left: 100%;

79
packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking/event.blade.php
View File

@ -23,6 +23,30 @@
<div class="ticket-list table">
<div class="table-responsive">
<table>
<thead>
<th>
{{ __('bookingproduct::app.admin.catalog.products.name') }}
</th>
<th>
{{ __('bookingproduct::app.admin.catalog.products.price') }}
</th>
<th>
{{ __('bookingproduct::app.admin.catalog.products.quantity') }}
</th>
<th>
{{ __('bookingproduct::app.admin.catalog.products.special-price') }}
</th>
<th>
{{ __('bookingproduct::app.admin.catalog.products.special-price-from') }}
</th>
<th>
{{ __('bookingproduct::app.admin.catalog.products.special-price-to') }}
</th>
<th>
{{ __('bookingproduct::app.admin.catalog.products.description') }}
</th>
<th></th>
</thead>
<tbody>
<ticket-item
v-for="(ticket, index) in tickets"
@ -45,37 +69,46 @@
<tr>
<td>
<div class="control-group" :class="[errors.has(controlName + '[{{$locale}}][name]') ? 'has-error' : '']">
<label class="ticket-label required">{{ __('bookingproduct::app.admin.catalog.products.name') }}</label>
<input type="text" v-validate="'required'" :name="controlName + '[{{$locale}}][name]'" v-model="ticketItem.name" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.name') }}&quot;">
<span class="control-error" v-if="errors.has(controlName + '[{{$locale}}][name]')">
@{{ errors.first(controlName + '[{!!$locale!!}][name]') }}
</span>
</div>
<div class="control-group" :class="[errors.has(controlName + '[special_price]') ? 'has-error' : '']">
<label class="ticket-label">{{ __('bookingproduct::app.admin.catalog.products.special-price') }}</label>
<input type="text" v-validate="{decimal: true, min_value:0, ...(ticketItem.price ? {max_value: ticketItem.price} : {})}" :name="controlName + '[special_price]'" v-model="ticketItem.special_price" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.price') }}&quot;">
<span class="control-error" v-if="errors.has(controlName + '[special_price]')">
@{{ errors.first(controlName + '[special_price]') }}
</span>
</div>
</td>
<td>
<div class="control-group" :class="[errors.has(controlName + '[price]') ? 'has-error' : '']">
<label class="ticket-label required">{{ __('bookingproduct::app.admin.catalog.products.price') }}</label>
<input type="text" v-validate="'required|decimal|min_value:0'" :name="controlName + '[price]'" v-model="ticketItem.price" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.price') }}&quot;">
<input type="text" v-validate="'required|decimal|min_value:0'" :name="controlName + '[price]'" v-model="ticketItem.price" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.price') }}&quot;">
<span class="control-error" v-if="errors.has(controlName + '[price]')">
@{{ errors.first(controlName + '[price]') }}
</span>
<span class="control-error" v-if="errors.has(controlName + '[price]')">
@{{ errors.first(controlName + '[price]') }}
</span>
</div>
</td>
<td>
<div class="control-group" :class="[errors.has(controlName + '[qty]') ? 'has-error' : '']">
<input type="text" v-validate="'required|min_value:0'" :name="controlName + '[qty]'" v-model="ticketItem.qty" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.qty') }}&quot;">
<span class="control-error" v-if="errors.has(controlName + '[qty]')">
@{{ errors.first(controlName + '[qty]') }}
</span>
</div>
</td>
<td>
<div class="control-group" :class="[errors.has(controlName + '[special_price]') ? 'has-error' : '']">
<input type="text" v-validate="{decimal: true, min_value:0, ...(ticketItem.price ? {max_value: ticketItem.price} : {})}" :name="controlName + '[special_price]'" v-model="ticketItem.special_price" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.price') }}&quot;">
<span class="control-error" v-if="errors.has(controlName + '[special_price]')">
@{{ errors.first(controlName + '[special_price]') }}
</span>
</div>
</td>
<td>
<div class="control-group date" :class="[errors.has(controlName + '[special_price_from]') ? 'has-error' : '']">
<label class="ticket-label">{{ __('bookingproduct::app.admin.catalog.products.special-price-from') }}</label>
<datetime>
<input type="text" v-validate="'date_format:yyyy-MM-dd HH:mm:ss|after:{{\Carbon\Carbon::yesterday()->format('Y-m-d 23:59:59')}}'" :name="controlName + '[special_price_from]'" v-model="ticketItem.special_price_from" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.special-price-from') }}&quot;" ref="special_price_from" style="width:100%"/>
</datetime>
@ -85,18 +118,7 @@
</td>
<td>
<div class="control-group" :class="[errors.has(controlName + '[qty]') ? 'has-error' : '']">
<label class="ticket-label">{{ __('bookingproduct::app.admin.catalog.products.quantity') }}</label>
<input type="text" v-validate="'required|min_value:0'" :name="controlName + '[qty]'" v-model="ticketItem.qty" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.qty') }}&quot;">
<span class="control-error" v-if="errors.has(controlName + '[qty]')">
@{{ errors.first(controlName + '[qty]') }}
</span>
</div>
<div class="control-group date" :class="[errors.has(controlName + '[special_price_to]') ? 'has-error' : '']">
<label class="ticket-label">{{ __('bookingproduct::app.admin.catalog.products.special-price-to') }}</label>
<datetime>
<input type="text" v-validate="'date_format:yyyy-MM-dd HH:mm:ss|after:special_price_from'" :name="controlName + '[special_price_to]'" v-model="ticketItem.special_price_to" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.special-price-to') }}&quot;" ref="special_price_to" style="width:100%"/>
</datetime>
@ -107,7 +129,6 @@
<td>
<div class="control-group" :class="[errors.has(controlName + '[{{$locale}}][description]') ? 'has-error' : '']">
<label class="ticket-label required">{{ __('bookingproduct::app.admin.catalog.products.description') }}</label>
<textarea type="text" v-validate="'required'" :name="controlName + '[{{$locale}}][description]'" v-model="ticketItem.description" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.description') }}&quot;"></textarea>
<span class="control-error" v-if="errors.has(controlName + '[{{$locale}}][description]')">

4
packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking/slots.blade.php
View File

@ -72,8 +72,6 @@
<tr>
<td>
<div class="control-group date" :class="[errors.has(controlName + '[from]') ? 'has-error' : '']">
<label>{{ __('bookingproduct::app.admin.catalog.products.from') }}</label>
<time-component>
<input type="text" v-validate="'required'" :name="controlName + '[from]'" v-model="slotItem.from" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.from') }}&quot;">
@ -88,8 +86,6 @@
<td>
<div class="control-group date" :class="[errors.has(controlName + '[to]') ? 'has-error' : '']">
<label>{{ __('bookingproduct::app.admin.catalog.products.to') }}</label>
<time-component>
<input type="text" v-validate="{required: true, time_min: slotItem.from }" :name="controlName + '[to]'" v-model="slotItem.to" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.to') }}&quot;">
</time-component>

3
packages/Webkul/Ui/publishable/assets/css/ui.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Ui/publishable/assets/js/ui.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=513d92adf99b7451f0e9",
"/css/ui.css": "/css/ui.css?id=421de196338df64bfdec"
"/js/ui.js": "/js/ui.js?id=4a56b6771d0da5d93d77",
"/css/ui.css": "/css/ui.css?id=55f7c20eb647641c1d73"
}

9
packages/Webkul/Ui/src/Resources/assets/sass/app.scss vendored
View File

@ -622,7 +622,7 @@ h5 {
padding: 10px;
border-bottom: solid 1px #d3d3d3;
color: $font-color;
vertical-align: inherit;
vertical-align: top;
&.actions {
.action {
@ -1384,13 +1384,6 @@ modal {
.control {
width: 100%;
}
&.date,
&.datetime {
.control {
padding-left: 40px;
}
}
}
}