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

Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1

This commit is contained in:
Shubham Mehrotra 2020-03-30 21:09:59 +05:30
parent 0005241794 88ce2bd320
commit 2bd1458990
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php
View File

@ -165,11 +165,11 @@ class RentalSlot extends Booking
$requestedToDate = Carbon::createFromTimeString($cartItem['additional']['booking']['date_to'] . " 23:59:59");
$availableFrom = ! $bookingProduct->available_every_week && $bookingProduct->available_from
? Carbon::createFromTimeString($bookingProduct->available_from)
? Carbon::createFromTimeString($bookingProduct->available_from->format('Y-m-d') . ' 00:00:00')
: Carbon::createFromTimeString($currentTime->format('Y-m-d 00:00:00'));
$availableTo = ! $bookingProduct->available_every_week && $bookingProduct->available_from
? Carbon::createFromTimeString($bookingProduct->available_to)
? Carbon::createFromTimeString($bookingProduct->available_to->format('Y-m-d') . ' 23:59:59')
: Carbon::createFromTimeString('2080-01-01 00:00:00');
if ($requestedFromDate < $availableFrom

2
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/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=8238d4a34ce254a81437",
"/css/ui.css": "/css/ui.css?id=78f86756674b5f637c8b"
"/css/ui.css": "/css/ui.css?id=8c35163268c09336c2bc"
}

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

@ -645,8 +645,10 @@ h5 {
display: inline-block;
vertical-align: middle;
margin-left: -34px;
margin-top: 2px;
pointer-events: none;
left: 70%;
position: absolute;
top: 35px;
}
}