diff --git a/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php b/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php index f6ed38ee4..e876811be 100644 --- a/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php +++ b/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php @@ -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']); diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 9ba4f1a03..811ef3145 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -1039,7 +1039,7 @@ class Cart } } - if (!$found) { + if (! $found) { $this->wishlistRepository->create([ 'channel_id' => $cart->channel_id, 'customer_id' => $this->getCurrentCustomer()->user()->id, diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index 0eac79a26..74b3253b9 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -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']); } }