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

Issue #2630 fixed

This commit is contained in:
Jitendra Singh 2020-03-11 15:36:45 +05:30
parent 6063c113bf
commit ec3be668b6
5 changed files with 287 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

498
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

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

@ -116,7 +116,7 @@
return {
booking: bookingProduct ? bookingProduct : {
booking_type: 'default',
type: 'default',
location: '',

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

@ -110,7 +110,7 @@
data: function() {
return {
tickets: @json($bookingProduct->event_tickets()->get())
tickets: @json($bookingProduct ? $bookingProduct->event_tickets()->get() : [])
}
}
});

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

@ -31,7 +31,7 @@
<div class="control-group" :class="[errors.has('booking[qty]') ? 'has-error' : '']">
<label class="required">{{ __('bookingproduct::app.admin.catalog.products.guest-capacity') }}</label>
<input type="text" v-validate="'required|min_value:1'" name="booking[qty]" value="{{ $bookingProduct->qty }}" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.guest-limit') }}&quot;"/>
<input type="text" v-validate="'required|min_value:1'" name="booking[qty]" v-model="table_booking.qty" class="control" data-vv-as="&quot;{{ __('bookingproduct::app.admin.catalog.products.guest-limit') }}&quot;"/>
<span class="control-error" v-if="errors.has('booking[qty]')">@{{ errors.first('booking[qty]') }}</span>
</div>
@ -98,6 +98,8 @@
data: function() {
return {
table_booking: bookingProduct && bookingProduct.table_slot ? bookingProduct.table_slot : {
qty: {{ $bookingProduct ? $bookingProduct->qty : 0 }},
price_type: 'guest',
guest_limit: 2,

2
packages/Webkul/Tax/src/Providers/TaxServiceProvider.php
View File

@ -22,6 +22,6 @@ class TaxServiceProvider extends ServiceProvider
*/
public function register()
{
// $this->loadFactoriesFrom(__DIR__ . '/../Database/Factories');
$this->loadFactoriesFrom(__DIR__ . '/../Database/Factories');
}
}