From da174185553651838e93e237954c9cabeccac374 Mon Sep 17 00:00:00 2001 From: jitendra Date: Mon, 4 Apr 2022 15:11:17 +0530 Subject: [PATCH 1/2] Issue #6207 fixed --- packages/Webkul/BookingProduct/src/Type/Booking.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/BookingProduct/src/Type/Booking.php b/packages/Webkul/BookingProduct/src/Type/Booking.php index 4c11c7504..dbc3f687d 100644 --- a/packages/Webkul/BookingProduct/src/Type/Booking.php +++ b/packages/Webkul/BookingProduct/src/Type/Booking.php @@ -225,10 +225,12 @@ class Booking extends Virtual return false; } - if (isset($options1['booking'], $options2['booking']) - && isset($options1['booking']['ticket_id'], $options2['booking']['ticket_id']) - && $options1['booking']['ticket_id'] === $options2['booking']['ticket_id']) { - return true; + if (isset($options1['booking'], $options2['booking'])) { + return $options1['booking'] == $options2['booking']; + } elseif (! isset($options1['booking'])) { + return false; + } elseif (! isset($options2['booking'])) { + return false; } return false; From faa47157579348794fa4e91ac6233eccae323ddc Mon Sep 17 00:00:00 2001 From: jitendra Date: Mon, 4 Apr 2022 16:07:48 +0530 Subject: [PATCH 2/2] Revert changes for #6207 --- packages/Webkul/BookingProduct/src/Type/Booking.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/Webkul/BookingProduct/src/Type/Booking.php b/packages/Webkul/BookingProduct/src/Type/Booking.php index dbc3f687d..4c11c7504 100644 --- a/packages/Webkul/BookingProduct/src/Type/Booking.php +++ b/packages/Webkul/BookingProduct/src/Type/Booking.php @@ -225,12 +225,10 @@ class Booking extends Virtual return false; } - if (isset($options1['booking'], $options2['booking'])) { - return $options1['booking'] == $options2['booking']; - } elseif (! isset($options1['booking'])) { - return false; - } elseif (! isset($options2['booking'])) { - return false; + if (isset($options1['booking'], $options2['booking']) + && isset($options1['booking']['ticket_id'], $options2['booking']['ticket_id']) + && $options1['booking']['ticket_id'] === $options2['booking']['ticket_id']) { + return true; } return false;