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

Merge pull request #4789 from rahulshukla-webkul/development 

Issue #2715 fixed
This commit is contained in:
Jitendra Singh 2021-04-09 15:28:52 +05:30 committed by GitHub
parent 34f6cfa6da ef3ee7494c
commit a2b9099b60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,8 @@ return [
'day' => 'يوم',
'status' => 'الحالة',
'open' => 'افتح',
'close' => 'غلق'
'close' => 'غلق',
'time-error' => 'The to time must be greater than the from time.'
]
]
],

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

@ -63,7 +63,8 @@ return [
'day' => 'Day',
'status' => 'Status',
'open' => 'Open',
'close' => 'Close'
'close' => 'Close',
'time-error' => 'The to time must be greater than the from time.'
]
]
],

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

@ -63,7 +63,8 @@ return [
'day' => 'Día',
'status' => 'Estado',
'open' => 'Abierto',
'close' => 'Cerrado'
'close' => 'Cerrado',
'time-error' => 'The to time must be greater than the from time.'
]
]
],

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

@ -63,7 +63,8 @@ return [
'day' => 'روز',
'status' => 'وضعیت',
'open' => 'باز کن',
'close' => 'بستن'
'close' => 'بستن',
'time-error' => 'The to time must be greater than the from time.'
]
]
],

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

@ -63,7 +63,8 @@ return [
'day' => 'Giorno',
'status' => 'Stato',
'open' => 'Aperto',
'close' => 'Chiuso'
'close' => 'Chiuso',
'time-error' => 'The to time must be greater than the from time.'
]
]
],

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

@ -63,7 +63,8 @@ return [
'day' => 'Dag',
'status' => 'Toestand',
'open' => 'Open',
'close' => 'Dichtbij'
'close' => 'Dichtbij',
'time-error' => 'The to time must be greater than the from time.'
]
]
],

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

@ -63,7 +63,8 @@ return [
'day' => 'Dia',
'status' => 'Status',
'open' => 'Aberto',
'close' => 'Fechar'
'close' => 'Fechar',
'time-error' => 'The to time must be greater than the from time.'
]
]
],

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

@ -27,7 +27,7 @@
</div>
<div class="slot-list table" v-else>
<accordian
<accordian
v-for="(day, dayIndex) in week_days"
:key="dayIndex"
:title="day"
@ -47,7 +47,7 @@
<th class="actions"></th>
</tr>
</thead>
<tbody v-if="slots['different_for_week'][dayIndex] && slots['different_for_week'][dayIndex].length">
<slot-item
v-for="(slot, slotIndex) in slots['different_for_week'][dayIndex]"
@ -85,7 +85,7 @@
<td>
<div class="control-group date" :class="[errors.has(controlName + '[to]') ? 'has-error' : '']">
<time-component>
<input type="text" v-validate="'required'" :name="controlName + '[to]'" v-model="slotItem.to" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.to') }}&quot;">
<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>
<span class="control-error" v-if="errors.has(controlName + '[to]')">
@ -192,4 +192,20 @@
},
}
});
const time_validator = {
getMessage: (field) => {
return "{{ __('bookingproduct::app.admin.catalog.products.time-error') }}"
},
validate: (value, min) => {
if (Array.isArray(value) || value === null || value === undefined || value === '') {
return false;
}
return value > min;
}
};
VeeValidate.Validator.extend('time_min', time_validator);
</script>