implemented option to configre counting of overbooked non bookable days

.gitignore

@@ -9,6 +9,7 @@ node_modules
 .phpunit.*
 assets/packaged
 src/Wordpress/.DS_Store
+tests/cypress/screenshots
 /vendor
 /build
 src/.DS_Store

Gruntfile.js

@@ -123,7 +123,10 @@ module.exports = function (grunt) {
 				],
 				tasks: [
 					'uglify:dev', 'babel'
-				]
+				],
+                options: {
+                    livereload: true
+                }
 			}
 		}
 	});

assets/admin/js/admin.js

@@ -1,3 +1,62 @@
+(function($) {
+    "use strict";
+    $(function() {
+        const hideFieldset = function(set) {
+            $.each(set, function() {
+                $(this).parents(".cmb-row").hide();
+            });
+        };
+        const showFieldset = function(set) {
+            $.each(set, function() {
+                $(this).parents(".cmb-row").show();
+            });
+        };
+        const useGlobalSettings = $("#_cb_use_global_settings");
+        const allowLockDaysCheckbox = $("#_cb_allow_lockdays_in_range");
+        const countLockedDaysCheckbox = $("#_cb_count_lockdays_in_range");
+        const countAmountLockedDays = $("#_cb_count_lockdays_maximum");
+        const handleCountLockedDays = function() {
+            if (countLockedDaysCheckbox.prop("checked")) {
+                showFieldset(countAmountLockedDays);
+            } else {
+                hideFieldset(countAmountLockedDays);
+            }
+        };
+        handleCountLockedDays();
+        countLockedDaysCheckbox.change(function() {
+            handleCountLockedDays();
+        });
+        const handleAllowLockDays = function() {
+            if (allowLockDaysCheckbox.prop("checked")) {
+                showFieldset(countLockedDaysCheckbox);
+                handleCountLockedDays();
+            } else {
+                hideFieldset(countLockedDaysCheckbox);
+                hideFieldset(countAmountLockedDays);
+            }
+        };
+        handleAllowLockDays();
+        allowLockDaysCheckbox.change(function() {
+            handleAllowLockDays();
+        });
+        const handleUseGlobalSettings = function() {
+            if (useGlobalSettings.prop("checked")) {
+                hideFieldset(allowLockDaysCheckbox);
+                hideFieldset(countLockedDaysCheckbox);
+                hideFieldset(countAmountLockedDays);
+            } else {
+                showFieldset(allowLockDaysCheckbox);
+                showFieldset(countLockedDaysCheckbox);
+                handleCountLockedDays();
+            }
+        };
+        handleUseGlobalSettings();
+        useGlobalSettings.change(function() {
+            handleUseGlobalSettings();
+        });
+    });
+})(jQuery);
+
 (function($) {
     "use strict";
     $(function() {

assets/admin/js/src/location.js

@@ -0,0 +1,75 @@
+(function ($) {
+    'use strict';
+    $(function () {
+
+        /**
+         * Hides set-elements.
+         * @param set
+         */
+        const hideFieldset = function (set) {
+            $.each(set, function () {
+                $(this).parents('.cmb-row').hide();
+            });
+        };
+
+        /**
+         * Show set-elements.
+         * @param set
+         */
+        const showFieldset = function (set) {
+            $.each(set, function () {
+                $(this).parents('.cmb-row').show();
+            });
+        };
+
+        const useGlobalSettings = $('#_cb_use_global_settings');
+        const allowLockDaysCheckbox = $('#_cb_allow_lockdays_in_range');
+        const countLockedDaysCheckbox = $('#_cb_count_lockdays_in_range');
+        const countAmountLockedDays = $('#_cb_count_lockdays_maximum');
+
+        const handleCountLockedDays = function () {
+            if (countLockedDaysCheckbox.prop('checked')) {
+                showFieldset(countAmountLockedDays);
+            } else {
+                hideFieldset(countAmountLockedDays);
+            }
+        };
+        handleCountLockedDays();
+        countLockedDaysCheckbox.change(function () {
+            handleCountLockedDays();
+        });
+
+        const handleAllowLockDays = function () {
+            if (allowLockDaysCheckbox.prop('checked')) {
+                showFieldset(countLockedDaysCheckbox);
+                handleCountLockedDays();
+            } else {
+                hideFieldset(countLockedDaysCheckbox);
+                hideFieldset(countAmountLockedDays);
+            }
+        }
+        handleAllowLockDays();
+        allowLockDaysCheckbox.change(function () {
+            handleAllowLockDays();
+        } );
+
+        //hide settings if global settings are used
+        const handleUseGlobalSettings = function () {
+            if (useGlobalSettings.prop('checked')) {
+                hideFieldset(allowLockDaysCheckbox);
+                hideFieldset(countLockedDaysCheckbox);
+                hideFieldset(countAmountLockedDays);
+            }
+            else {
+                showFieldset(allowLockDaysCheckbox);
+                showFieldset(countLockedDaysCheckbox);
+                handleCountLockedDays();
+            }
+        }
+        handleUseGlobalSettings();
+        useGlobalSettings.change(function () {
+            handleUseGlobalSettings();
+        });
+
+    });
+})(jQuery);

assets/public/js/src/litepicker.js

@@ -221,6 +221,8 @@ document.addEventListener("DOMContentLoaded", function (event) {
                 "scrollToDate": true,
                 "inlineMode": true,
                 "firstDay": 1,
+                "countLockedDays": globalCalendarData['countLockDaysInRange'],
+                "countLockedDaysMax": globalCalendarData['countLockDaysMaxDays'],
                 "lang": globalCalendarData['lang'],
                 "numberOfMonths": numberOfMonths,
                 "numberOfColumns": numberOfColumns,
@@ -298,6 +300,7 @@ document.addEventListener("DOMContentLoaded", function (event) {
                     "days": globalCalendarData['days'],
                     "maxDays": globalCalendarData['maxDays'],
                     "lockDays": globalCalendarData['lockDays'],
+                    "countLockedDays": globalCalendarData['countLockDaysInRange'],
                     "bookedDays": globalCalendarData['bookedDays'],
                     "partiallyBookedDays": globalCalendarData['partiallyBookedDays'],
                     "highlightedDays": globalCalendarData['highlightedDays'],

includes/Admin.php

@@ -156,6 +156,20 @@ function commonsbooking_filter_from_cmb2( $field_args ) {
 	}
 }
 
+/**
+ * Only return default value if we don't have a post ID (in the 'post' query variable)
+ *
+ * @param  bool  $default On/Off (true/false)
+ * @return mixed          Returns true or '', the blank default
+ */
+function cmb2_set_checkbox_default_for_new_post() {
+	return isset( $_GET['post'] )
+		// No default value.
+		? ''
+		// Default to true.
+		: true;
+}
+
 /**
  * Recursive sanitation for text or array
  *

includes/OptionsArray.php

@@ -143,6 +143,12 @@
 						'default'     => __( 'Here you can leave a comment about your booking. This will be sent to the station.', 'commonsbooking' ),
 					),
 				)
+			),
+			'globalLocationSettings' => array(
+				'title'  => __( "Global location settings", 'commonsbooking' ),
+				'desc'   => commonsbooking_sanitizeHTML( __( 'These settings are used for all locations. You can overwrite these settings for each location in the location settings.', 'commonsbooking' ) ),
+				'id'     => 'globalLocationSettings',
+				'fields' => Location::getOverbookingSettingsMetaboxes()
 			)
 		)
 	),

package.json

@@ -18,7 +18,7 @@
 		"grunt": "^1.4.1",
 		"grunt-babel": "^8.0.0",
 		"grunt-cli": "^1.4.3",
-		"grunt-contrib-compass": "^0.8.0",
+		"grunt-contrib-compass": "0.8.0",
 		"grunt-contrib-concat": "^2.0.0",
 		"grunt-contrib-jshint": "^3.1.1",
 		"grunt-contrib-nodeunit": "^5.0.0",

src/Plugin.php

@@ -407,7 +407,12 @@ public static function filterAdminBodyClass( $classes ) {
 	 */
 	public static function registerCustomPostTypes() {
 		foreach ( self::getCustomPostTypes() as $customPostType ) {
-			register_post_type( $customPostType::getPostType(), $customPostType->getArgs() );
+			$cptArgs = $customPostType->getArgs();
+			//make export possible when using WP_DEBUG, this allows us to use the export feature for creating new E2E tests
+			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+				$cptArgs['can_export'] = true;
+			}
+			register_post_type( $customPostType::getPostType(), $cptArgs );
 			$customPostType->initListView();
 			$customPostType->initHooks();
 		}

src/View/Calendar.php

@@ -10,6 +10,7 @@
 use CommonsBooking\Model\Day;
 use CommonsBooking\Model\Week;
 use CommonsBooking\Plugin;
+use CommonsBooking\Settings\Settings;
 use CommonsBooking\Wordpress\CustomPostType\Item;
 use CommonsBooking\Wordpress\CustomPostType\Location;
 use CommonsBooking\Wordpress\CustomPostType\Timeframe;
@@ -486,17 +487,46 @@ public static function prepareJsonResponse(
 				'highlightedDays'         => [],
 				'maxDays'                 => null,
 				'disallowLockDaysInRange' => true,
+				'countLockDaysInRange' => true,
 				'advanceBookingDays'      => $advanceBookingDays,
 			];
 
 			if ( count( $locations ) === 1 ) {
 				// are overbooking allowed in location options?
-				$allowLockedDaysInRange                  = get_post_meta(
-					$locations[0],
-					COMMONSBOOKING_METABOX_PREFIX . 'allow_lockdays_in_range',
-					true
-				);
-				$jsonResponse['disallowLockDaysInRange'] = $allowLockedDaysInRange !== 'on';
+				$useGlobalSettings = get_post_meta( $locations[0], COMMONSBOOKING_METABOX_PREFIX . 'use_global_settings', true ) === 'on';
+				if ( $useGlobalSettings ) {
+					$allowLockedDaysInRange = Settings::getOption('commonsbooking_options_general', COMMONSBOOKING_METABOX_PREFIX . 'allow_lockdays_in_range');
+				}
+				else {
+					$allowLockedDaysInRange                  = get_post_meta(
+						$locations[0],
+						COMMONSBOOKING_METABOX_PREFIX . 'allow_lockdays_in_range',
+						true
+					);
+				}
+				$jsonResponse['disallowLockDaysInRange'] = ! ( $allowLockedDaysInRange === 'on' );
+
+				// should overbooked non bookable days be counted into maxdays selection?
+				if ( $useGlobalSettings ) {
+					$countLockedDaysInRange = Settings::getOption('commonsbooking_options_general', COMMONSBOOKING_METABOX_PREFIX . 'count_lockdays_in_range');
+				}
+				else {
+					$countLockedDaysInRange = get_post_meta(
+						$locations[0],
+						COMMONSBOOKING_METABOX_PREFIX . 'count_lockdays_in_range',
+						true
+					);
+				}
+				$jsonResponse['countLockDaysInRange'] = $countLockedDaysInRange === 'on';
+
+				//if yes, what is the maximum amount of days they should count?
+				if ( $useGlobalSettings ) {
+					$countLockdaysMaximum = Settings::getOption('commonsbooking_options_general', COMMONSBOOKING_METABOX_PREFIX . 'count_lockdays_maximum');
+				}
+				else {
+					$countLockdaysMaximum = get_post_meta( $locations[0], COMMONSBOOKING_METABOX_PREFIX . 'count_lockdays_maximum', true );
+				}
+				$jsonResponse['countLockDaysMaxDays'] = (int) $countLockdaysMaximum;
 			}
 
 			/** @var Week $week */