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

Booking package refactored

This commit is contained in:
jitendra 2022-08-09 18:07:35 +05:30
parent 8c61634698
commit dc5404c33d
6 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/Webkul/BookingProduct/src/Helpers/Booking.php
View File

@ -37,7 +37,15 @@ class Booking
/**
* @return array
*/
protected $daysOfWeek = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
protected $daysOfWeek = [
'Sunday',
'Monday',
'Tuesday',
'Wednesday',
'Thursday',
'Friday',
'Saturday',
];
/**
* Create a new helper instance.
@ -222,6 +230,7 @@ class Booking
foreach ($slots as $index => $slot) {
$slots[$index]['from'] = Carbon::createFromTimeString($slot['from'])->format("h:i a");
$slots[$index]['to'] = Carbon::createFromTimeString($slot['to'])->format("h:i a");
}

6
packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php
View File

@ -12,7 +12,7 @@ class DefaultSlot extends Booking
protected $daysOfWeek = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
/**
* Returns slots for a perticular day
* Returns slots for a particular day
*
* @param \Webkul\BookingProduct\Contracts\BookingProduct $bookingProduct
* @param string $date
@ -52,7 +52,7 @@ class DefaultSlot extends Booking
return $bookingProductSlot->booking_type == 'one'
? $this->getOneBookingForManyDaysSlots($bookingProductSlot, $requestedDate)
: $this->getManyBookingsforOneDaySlots($bookingProductSlot, $requestedDate);
: $this->getManyBookingsForOneDaySlots($bookingProductSlot, $requestedDate);
}
/**
@ -98,7 +98,7 @@ class DefaultSlot extends Booking
* @param string $requestedDate
* @return array
*/
public function getManyBookingsforOneDaySlots($bookingProductSlot, $requestedDate)
public function getManyBookingsForOneDaySlots($bookingProductSlot, $requestedDate)
{
$bookingProduct = $bookingProductSlot->booking_product;

12
packages/Webkul/BookingProduct/src/Helpers/EventTicket.php
View File

@ -187,7 +187,15 @@ class EventTicket extends Booking
{
return $ticket->special_price !== null
&& $ticket->special_price > 0.0
&& ($ticket->special_price_from === null || $ticket->special_price_from === '0000-00-00 00:00:00' || $ticket->special_price_from <= Carbon::now())
&& ($ticket->special_price_to === null || $ticket->special_price_to === '0000-00-00 00:00:00' || $ticket->special_price_to > Carbon::now());
&& (
$ticket->special_price_from === null
|| $ticket->special_price_from === '0000-00-00 00:00:00'
|| $ticket->special_price_from <= Carbon::now()
)
&& (
$ticket->special_price_to === null
|| $ticket->special_price_to === '0000-00-00 00:00:00'
|| $ticket->special_price_to > Carbon::now()
);
}
}

10
packages/Webkul/BookingProduct/src/Http/Controllers/Shop/BookingProductController.php
View File

@ -21,11 +21,11 @@ class BookingProductController extends Controller
* Create a new controller instance.
*
* @param \Webkul\BookingProduct\Repositories\BookingProductRepository $bookingProductRepository
* @param \Webkul\BookingProduct\Helpers\DefaultSlot $defaultSlotHelper
* @param \Webkul\BookingProduct\Helpers\AppointmentSlot $appointmentSlotHelper
* @param \Webkul\BookingProduct\Helpers\RentalSlot $rentalSlotHelper
* @param \Webkul\BookingProduct\Helpers\EventTicket $EventTicketHelper
* @param \Webkul\BookingProduct\Helpers\TableSlot $tableSlotHelper
* @param \Webkul\BookingProduct\Helpers\DefaultSlot $defaultSlotHelper
* @param \Webkul\BookingProduct\Helpers\AppointmentSlot $appointmentSlotHelper
* @param \Webkul\BookingProduct\Helpers\RentalSlot $rentalSlotHelper
* @param \Webkul\BookingProduct\Helpers\EventTicket $EventTicketHelper
* @param \Webkul\BookingProduct\Helpers\TableSlot $tableSlotHelper
* @return void
*/
public function __construct(

5
packages/Webkul/BookingProduct/src/Repositories/BookingProductEventTicketRepository.php
View File

@ -19,9 +19,8 @@ class BookingProductEventTicketRepository extends Repository
}
/**
* @param array $data
* @param \Webkul\BookingProduct\Contracts\BookingProduct $bookingProduct
*
* @param array $data
* @param \Webkul\BookingProduct\Contracts\BookingProduct $bookingProduct
* @return void
* @throws \Prettus\Validator\Exceptions\ValidatorException
*/

14
packages/Webkul/BookingProduct/src/Type/Booking.php
View File

@ -40,14 +40,14 @@ class Booking extends Virtual
/**
* Create a new product type instance.
*
* @param \Webkul\Attribute\Repositories\AttributeRepository $attributeRepository
* @param \Webkul\Product\Repositories\ProductRepository $productRepository
* @param \Webkul\Product\Repositories\ProductAttributeValueRepository $attributeValueRepository
* @param \Webkul\Product\Repositories\ProductInventoryRepository $productInventoryRepository
* @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository
* @param \Webkul\Attribute\Repositories\AttributeRepository $attributeRepository
* @param \Webkul\Product\Repositories\ProductRepository $productRepository
* @param \Webkul\Product\Repositories\ProductAttributeValueRepository $attributeValueRepository
* @param \Webkul\Product\Repositories\ProductInventoryRepository $productInventoryRepository
* @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository
* @param \Webkul\BookingProduct\Repositories\BookingProductRepository $bookingProductRepository
* @param \Webkul\BookingProduct\Helpers\BookingHelper $bookingHelper
* @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository
* @param \Webkul\BookingProduct\Helpers\BookingHelper $bookingHelper
* @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository
* @return void
*/
public function __construct(