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

Issue #2672 fixed

This commit is contained in:
Jitendra Singh 2020-03-17 12:25:04 +05:30
parent 96ab5e390e
commit bf5ad13dac
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,7 @@ class RentalSlot extends Booking
$from = Carbon::createFromTimeString($item->additional['booking']['date_from'] . " 00:00:00");
$to = Carbon::createFromTimeString($item->additional['booking']['date_to'] . " 24:00:00");
$price += $item->product->getTypeInstance()->getFinalPrice() + $bookingProduct->rental_slot->daily_price * $to->diffInDays($from);
$price += $bookingProduct->rental_slot->daily_price * $to->diffInDays($from);
} else {
$from = Carbon::createFromTimestamp($item->additional['booking']['slot']['from']);
$to = Carbon::createFromTimestamp($item->additional['booking']['slot']['to']);

2
packages/Webkul/Checkout/src/Cart.php
View File

@ -1039,7 +1039,7 @@ class Cart
}
}
if (!$found) {
if (! $found) {
$this->wishlistRepository->create([
'channel_id' => $cart->channel_id,
'customer_id' => $this->getCurrentCustomer()->user()->id,

9
packages/Webkul/Shop/src/Http/Controllers/CartController.php
View File

@ -70,6 +70,7 @@ class CartController extends Controller
if ($this->onWarningAddingToCart($result)) {
session()->flash('warning', $result['warning']);
return redirect()->back();
}
@ -82,6 +83,7 @@ class CartController extends Controller
if (request()->get('is_buy_now')) {
Event::dispatch('shop.item.buy-now', $id);
return redirect()->route('shop.checkout.onepage.index');
}
}
@ -205,10 +207,11 @@ class CartController extends Controller
/**
* Returns true, if result of adding product to cart is an array and contains a key "warning"
*
* @param array $result
* @return bool
* @param array $result
* @return boolean
*/
private function onWarningAddingToCart($result): bool {
private function onWarningAddingToCart($result): bool
{
return is_array($result) && isset($result['warning']);
}
}