From d21e027db32856aa952fc596e0a28c86c03c04fd Mon Sep 17 00:00:00 2001 From: rahulshukla-home Date: Fri, 17 Apr 2020 17:53:23 +0530 Subject: [PATCH] Issue #2721 --- packages/Webkul/BookingProduct/src/Type/Booking.php | 5 +++++ packages/Webkul/Shop/src/Resources/lang/ar/app.php | 7 +++++-- packages/Webkul/Shop/src/Resources/lang/en/app.php | 5 ++++- packages/Webkul/Shop/src/Resources/lang/es/app.php | 3 +++ packages/Webkul/Shop/src/Resources/lang/fa/app.php | 3 +++ packages/Webkul/Shop/src/Resources/lang/nl/app.php | 5 ++++- packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php | 5 ++++- 7 files changed, 28 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/BookingProduct/src/Type/Booking.php b/packages/Webkul/BookingProduct/src/Type/Booking.php index de6b83b40..293f65aa0 100644 --- a/packages/Webkul/BookingProduct/src/Type/Booking.php +++ b/packages/Webkul/BookingProduct/src/Type/Booking.php @@ -12,6 +12,7 @@ use Webkul\Product\Helpers\ProductImage; use Webkul\BookingProduct\Repositories\BookingProductRepository; use Webkul\BookingProduct\Helpers\Booking as BookingHelper; use Webkul\Product\Type\Virtual; +use Carbon\Carbon; class Booking extends Virtual { @@ -168,6 +169,10 @@ class Booking extends Virtual $bookingProduct = $this->getBookingProduct($data['product_id']); if ($bookingProduct->type == 'event') { + if (Carbon::now() > $bookingProduct->available_from && Carbon::now() > $bookingProduct->available_to) { + return trans('shop::app.checkout.cart.event.expired'); + } + $filtered = Arr::where($data['booking']['qty'], function ($qty, $key) { return $qty != 0; }); diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php index 7192698cf..13a90fe68 100644 --- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php @@ -411,7 +411,7 @@ return [ 'your-customization' => 'التخصيص الخاص بك', 'total-amount' => 'المبلغ الإجمالي', 'none' => 'لا شيء', - 'available' => 'Available' + 'available' => 'Available', ], // 'reviews' => [ @@ -461,7 +461,10 @@ return [ 'cart-subtotal' => 'المجموع الفرعي للمشتريات', 'cart-remove-action' => 'هل تريد حقا أن تسمح هذا ؟', 'partial-cart-update' => 'تم تحديث بعض المنتجات.', - 'link-missing' => '' + 'link-missing' => '', + 'event' => [ + 'expired' => 'This event has been expired.' + ] ], 'onepage' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 46ce68b3f..80f4cba6f 100755 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -461,7 +461,10 @@ return [ 'cart-subtotal' => 'Cart Subtotal', 'cart-remove-action' => 'Do you really want to do this ?', 'partial-cart-update' => 'Only some of the product(s) were updated', - 'link-missing' => '' + 'link-missing' => '', + 'event' => [ + 'expired' => 'This event has been expired.' + ] ], 'onepage' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php index e4899db68..bb3704a86 100644 --- a/packages/Webkul/Shop/src/Resources/lang/es/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php @@ -429,6 +429,9 @@ return [ 'cart-subtotal' => 'Total parcial', 'cart-remove-action' => '¿Realmente quieres hacer esto?', 'partial-cart-update' => 'Solo algunos de los productos se han actualizado', + 'event' => [ + 'expired' => 'This event has been expired.' + ] ], 'onepage' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/fa/app.php b/packages/Webkul/Shop/src/Resources/lang/fa/app.php index 7a6a2bff5..aad3162f3 100644 --- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php @@ -462,6 +462,9 @@ return [ 'cart-subtotal' => 'سبد فرعی', 'cart-remove-action' => 'آیا واقعاً می خواهید این کار را انجام دهید؟', 'partial-cart-update' => 'فقط برخی از محصولات (های) به روز شده اند', + 'event' => [ + 'expired' => 'This event has been expired.' + ] ], 'onepage' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php index 976438315..f3f76dcad 100644 --- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php @@ -466,7 +466,10 @@ return [ 'cart-subtotal' => 'Subtotaal', 'cart-remove-action' => 'Wil je dit echt doen?', 'partial-cart-update' => 'Slechts enkele van de producten zijn bijgewerkt', - 'link-missing' => '' + 'link-missing' => '', + 'event' => [ + 'expired' => 'This event has been expired.' + ] ], 'onepage' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php index bae07c541..1f4329f3b 100755 --- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php @@ -451,7 +451,10 @@ return [ 'cart-subtotal' => 'Subtotal do carrinho', 'cart-remove-action' => 'Você realmente quer fazer isso ?', 'partial-cart-update' => 'Only some of the product(s) were updated', - 'link-missing' => '' + 'link-missing' => '', + 'event' => [ + 'expired' => 'This event has been expired.' + ] ], 'onepage' => [