'
+ );
+ }
// Element to display price
$form[$type . ':' . $price][$type . ':' . $price . ':price'] = array(
@@ -634,18 +659,26 @@ function book_units_per_type_form($form, $form_state, $units_per_type, $start_da
);
// Dropdown to select quantity
- $options = array();
- for ($i = 0; $i <= count($units); $i++) {
- $options[$i] = $i;
- }
- $form[$type . ':' . $price][$type . ':' . $price . ':quantity'] = array(
- '#prefix' => '| ',
- '#title' => t('Units'),
- '#type' => 'select',
- '#options' => $options,
- '#suffix' => ' | ',
- );
-
+ if($unit_count !== 0){
+ $options = array();
+ for ($i = 0; $i <= $unit_count; $i++) {
+ $options[$i] = $i;
+ }
+ $form[$type . ':' . $price][$type . ':' . $price . ':quantity'] = array(
+ '#prefix' => '',
+ '#title' => t('Units'),
+ '#type' => 'select',
+ '#options' => $options,
+ '#suffix' => ' | ',
+ );
+ } else {
+ $form[$type . ':' . $price][$type . ':' . $price . ':quantity'] = array(
+ '#prefix' => '',
+ '#suffix' => ' | ',
+ );
+ }
+
+
if ($index == 0) {
$form[$type . ':' . $price]['submit'] = array(
'#prefix' => '',
@@ -686,17 +719,25 @@ function book_units_per_type_form($form, $form_state, $units_per_type, $start_da
function book_units_per_type_form_validate(&$form, &$form_state) {
+ $minimum = false;
foreach ($form_state['complete form'] as $key => $value) {
if (isset($value['submit'])) {
if (isset($value[$key . ':quantity']) && is_array($value)) {
- if ($value[$key . ':quantity']['#value'] != 0) {
- return;
- }
+ if (isset($value[$key . ':quantity']['#value'])) {
+ if($value[$key . ':quantity']['#value'] != 0) {
+ return;
+ }
+ } else {
+ $minimum = true;
+ }
}
}
}
-
- form_set_error('', t('Please select a unit in order to continue with booking'));
+ if($minimum){
+ form_set_error('', t('No rooms are available for booking'));
+ } else {
+ form_set_error('', t('Please select a unit in order to continue with booking'));
+ }
}
/**
@@ -731,11 +772,10 @@ function book_units_per_type_form_submit(&$form, &$form_state) {
// Let us get the available rooms again and match the order against actual rooms
$date_format = str_replace('-', '/', variable_get('rooms_date_format', 'd-m-Y'));
$agent = new AvailabilityAgent($sd->format($date_format), $ed->format($date_format), $group_size);
- $agent->setValidStates(variable_get('rooms_valid_availability_states', array(ROOMS_AVAILABLE, ROOMS_ON_REQUEST)));
+ $agent->setValidStates(variable_get('rooms_valid_availability_states', array(ROOMS_AVAILABLE, ROOMS_ON_REQUEST, ROOMS_MINIMUM_STAY)));
$units_per_type = $agent->checkAvailability();
-
// We are going to check that this is still true - but let us try and service the order
foreach ($order as $type => $price_serving) {
foreach ($price_serving as $price_level => $unit_order) {
@@ -743,14 +783,17 @@ function book_units_per_type_form_submit(&$form, &$form_state) {
$available_units = $units_per_type[$type][$price_level];
for ($i = 1; $i <= $unit_order['quantity']; $i++) {
$unit = array_pop($available_units);
-
- // Create line item
- $line_item = rooms_create_line_item($unit, $agent);
-
- // Add line item to cart
- if (!empty($line_item)) {
- $line_item = commerce_cart_product_add($user->uid, $line_item, FALSE);
- }
+ if($unit['state'] !== ROOMS_MINIMUM_STAY_NOT_MET){
+ // Create line item
+ $line_item = rooms_create_line_item($unit, $agent);
+
+ // Add line item to cart
+ if (!empty($line_item)) {
+ $line_item = commerce_cart_product_add($user->uid, $line_item, FALSE);
+ }
+ } else {
+ drupal_set_message("Could not adding booking to cart, minimum stay not met.");
+ }
}
}
}
diff --git a/modules/rooms_unit/rooms_unit.info b/modules/rooms_unit/rooms_unit.info
index 8168768..01735f8 100644
--- a/modules/rooms_unit/rooms_unit.info
+++ b/modules/rooms_unit/rooms_unit.info
@@ -21,4 +21,4 @@ files[] = views/rooms_unit_handler_edit_link_field.inc
files[] = views/rooms_unit_handler_unit_operations_field.inc
files[] = views/rooms_unit_handler_unit_type_field.inc
-files[] = test/rooms_unit_test.test
\ No newline at end of file
+files[] = test/rooms_unit_test.test
diff --git a/modules/rooms_unit/rooms_unit.module b/modules/rooms_unit/rooms_unit.module
index 39fd080..b3c551f 100644
--- a/modules/rooms_unit/rooms_unit.module
+++ b/modules/rooms_unit/rooms_unit.module
@@ -14,6 +14,7 @@ define ('ROOMS_NOT_AVAILABLE', 0);
define ('ROOMS_AVAILABLE', 1);
define ('ROOMS_ON_REQUEST', 2);
define ('ROOMS_ANON_BOOKED', 3);
+define ('ROOMS_MINIMUM_STAY', 4);
define ('ROOMS_UNCONFIRMED_BOOKINGS', -1);
diff --git a/rooms_ui.module b/rooms_ui.module
index d234afe..7cded17 100644
--- a/rooms_ui.module
+++ b/rooms_ui.module
@@ -62,6 +62,20 @@ function rooms_booking_settings(){
),
'#default_value' => variable_get('rooms_booking_start_date', 1),
);
+ $form['rooms_booking_settings']['rooms_minimum_stay_length'] = array(
+ '#type' => 'select',
+ '#title' => t('How long is the minimum stay.'),
+ '#options' => array(
+ '1' => t('1 night '),
+ '2' => t('2 nights'),
+ '3' => t('3 nights'),
+ '4' => t('4 nights'),
+ '5' => t('5 nights'),
+ '6' => t('6 nights'),
+ '7' => t('7 nights'),
+ ),
+ '#default_value' => variable_get('rooms_minimum_stay_length', 7),
+ );
return system_settings_form($form);
}
\ No newline at end of file
|