From 8a2a84b1e689ea42202707d2a0ba4478bef84fea Mon Sep 17 00:00:00 2001 From: Annika Wolff Date: Tue, 24 Mar 2020 10:58:20 +0100 Subject: [PATCH 1/2] get existing locale or create new one --- .../Core/src/Database/Factories/LocaleFactory.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Core/src/Database/Factories/LocaleFactory.php b/packages/Webkul/Core/src/Database/Factories/LocaleFactory.php index 68fa7b011..f81ec2d7b 100644 --- a/packages/Webkul/Core/src/Database/Factories/LocaleFactory.php +++ b/packages/Webkul/Core/src/Database/Factories/LocaleFactory.php @@ -5,8 +5,16 @@ use Webkul\Core\Models\Locale; /** @var \Illuminate\Database\Eloquent\Factory $factory */ $factory->define(Locale::class, function (Faker $faker, array $attributes) { + + $languageCode = $faker->languageCode; + + $locale = Locale::query()->firstWhere('code', $languageCode); + if ($locale !== null) { + return $locale->id; + } + return [ - 'code' => $faker->languageCode, + 'code' => $languageCode, 'name' => $faker->country, 'direction' => 'ltr', ]; From cf314c964e1c265824eea29b2159fe81b139982a Mon Sep 17 00:00:00 2001 From: Pranshu Tomar Date: Tue, 24 Mar 2020 16:42:57 +0530 Subject: [PATCH 2/2] Fixed undefind variable issue in rental booking helper --- packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php b/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php index 7351eed17..1915bb77a 100644 --- a/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php +++ b/packages/Webkul/BookingProduct/src/Helpers/RentalSlot.php @@ -158,6 +158,8 @@ class RentalSlot extends Booking return $isExpired; } else { + $currentTime = Carbon::now(); + $requestedFromDate = Carbon::createFromTimeString($cartItem['additional']['booking']['date_from'] . " 00:00:00"); $requestedToDate = Carbon::createFromTimeString($cartItem['additional']['booking']['date_to'] . " 23:59:59");