Behebe "Alle" Option verfügbar für CB Manager

src/Exception/RestrictionInvalidException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace CommonsBooking\Exception;
+
+class RestrictionInvalidException extends \Exception
+{
+	public function __construct( $message  ) {
+		parent::__construct( __('Invalid restriction settings: ','commonsbooking') . $message . __( ' Restriction is saved as draft.', 'commonsbooking' ) );
+	}
+}

src/Helper/Wordpress.php

@@ -193,16 +193,16 @@ public static function getRelatedPostsIdsForRestriction($postId): array {
 		$relatedPostIds = [ $postId ];
 
 		// Item and related timeframes
-		if($itemId = $restriction->getItemId()) {
-			$timeframes = \CommonsBooking\Repository\Timeframe::get([], [$itemId]);
-			$relatedPostIds[] = $itemId;
+		if($itemIds = $restriction->getItemIds()) {
+			$timeframes = \CommonsBooking\Repository\Timeframe::get([], $itemIds);
+			$relatedPostIds = array_merge($relatedPostIds,$itemIds);
 			$relatedPostIds = array_merge($relatedPostIds, Wordpress::getPostIdArray($timeframes));
 		}
 
 		// Location and related timeframes
-		if($locationId = $restriction->getLocationId()) {
-			$timeframes = \CommonsBooking\Repository\Timeframe::get([$locationId]);
-			$relatedPostIds[] = $locationId;
+		if($locationIds = $restriction->getLocationIds()) {
+			$timeframes = \CommonsBooking\Repository\Timeframe::get($locationIds);
+			$relatedPostIds = array_merge($relatedPostIds,$locationIds);
 			$relatedPostIds = array_merge($relatedPostIds, Wordpress::getPostIdArray($timeframes));
 		}
 

src/Model/Item.php

@@ -69,6 +69,8 @@ public function getAdmins() {
 	 * Returns all applicable restrictions for this item.
 	 *
 	 * This function is not used anywhere yet.
+	 * WARNING: This function is partially broken, the \CommonsBooking\Repository\Restriction::get
+	 * will only return restrictions that apply to all items, when the $locations or $items parameter is left empty.
 	 * @return array
 	 * @throws Exception
 	 */

src/Model/Location.php

@@ -246,6 +246,9 @@ public function getAdmins() {
 	/**
 	 * Will get the currently applicable restrictions for the location.
 	 *
+	 * This function is not used anywhere yet.
+	 * WARNING: This function is partially broken, the \CommonsBooking\Repository\Restriction::get
+	 * will only return restrictions that apply to all items, when the $locations or $items parameter is left empty.
 	 * @return Restriction[]
 	 * @throws \Exception
 	 */

src/Model/Restriction.php

@@ -3,9 +3,11 @@
 
 namespace CommonsBooking\Model;
 
+use CommonsBooking\Exception\RestrictionInvalidException;
 use CommonsBooking\Helper\Wordpress;
 use CommonsBooking\Helper\Helper;
 use CommonsBooking\Messages\RestrictionMessage;
+use CommonsBooking\Wordpress\CustomPostType\CustomPostType;
 use DateTime;
 
 /**
@@ -20,6 +22,7 @@
  */
 class Restriction extends CustomPost {
 
+	public const ERROR_TYPE = 'restrictionValidationFailed';
 	/**
 	 * Referred to in the frontend as "total breakdown".
 	 * This means, that the item is not available for booking and that all corresponding bookings will be cancelled.
@@ -235,50 +238,68 @@ public function getEndDateDateTime(): DateTime {
 
 	/**
 	 * Returns item name for the item that is restricted.
+	 *
+	 * @deprecated: This is not used anywhere in the code. Besides, the function is broken since it does not consider the case where multiple items are selected.
      *
 	 * @return string
 	 */
 	public function getItemName(): string {
 		$itemName = esc_html__( 'Not set', 'commonsbooking' );
-		if ( $this->getItemId() ) {
-			$item     = get_post( $this->getItemId() );
+		if ( $this->getItemIds() ) {
+			$item     = get_post( $this->getItemIds() );
 			$itemName = $item->post_title;
 		}
 
 		return $itemName;
 	}
 
 	/**
-	 * Returns itemId for the item that is restricted.
+	 * Gets all of the itemIDs that this restriction applies to.
      *
-	 * @return mixed
+	 * @return int[]
 	 */
-	public function getItemId() {
-		return $this->getMeta( self::META_ITEM_ID );
+	public function getItemIds(): array {
+		$metaField = $this->getMeta( self::META_ITEM_ID );
+		if ( is_numeric( $metaField ) ) {
+			return [ $metaField ];
+		} elseif ( $metaField == CustomPostType::SELECTION_ALL_POSTS ) {
+			return Wordpress::getPostIdArray( \CommonsBooking\Repository\Item::get());
+		} else {
+			return [];
+		}
 	}
 
 	/**
 	 * Returns location name for the location that the restricted item is in.
+	 *
+	 * DEPRECATED: This is not used anywhere in the code. Besides, the function is broken since it does not consider the case where multiple locations are selected.
      *
 	 * @return string
 	 */
 	public function getLocationName(): string {
 		$locationName = esc_html__( 'Not set', 'commonsbooking' );
-		if ( $this->getLocationId() ) {
-			$location     = get_post( $this->getLocationId() );
+		if ( $this->getLocationIds() ) {
+			$location     = get_post( $this->getLocationIds() );
 			$locationName = $location->post_title;
 		}
 
 		return $locationName;
 	}
 
 	/**
-	 * Returns location id for the location that the restricted item is in.
+	 * Gets all of the locationIDs that this restriction applies to.
      *
 	 * @return mixed
 	 */
-	public function getLocationId() {
-		return $this->getMeta( self::META_LOCATION_ID );
+	public function getLocationIds() {
+		$metaField = $this->getMeta( self::META_LOCATION_ID );
+		if ( is_numeric( $metaField ) ) {
+			return [ $metaField ];
+		} elseif ( $metaField == CustomPostType::SELECTION_ALL_POSTS ) {
+			return Wordpress::getPostIdArray( \CommonsBooking\Repository\Location::get());
+		} else {
+			return [];
+		}
 	}
 
 	/**
@@ -310,6 +331,36 @@ public function apply() {
 		}
 	}
 
+	/**
+	 * Returns true if restriction is valid.
+	 * This is used to check if the restriction is valid before it will be published.
+	 * Will throw an exception containing the error message if the restriction is not valid. The error message is expanded in the exception class.
+	 * @return true
+	 * @throws RestrictionInvalidException
+	 */
+	public function isValid(): bool {
+		if ($this->getItemIds() == [] ) {
+			throw new RestrictionInvalidException( __( 'No item selected.', 'commonsbooking' ) );
+		}
+
+		if ($this->getLocationIds() == [] ) {
+			throw new RestrictionInvalidException( __( 'No location selected.', 'commonsbooking' ) );
+		}
+
+		if ( $this->getStartDate() > $this->getEndDate() ) {
+			throw new RestrictionInvalidException( __( 'Start date is after end date.', 'commonsbooking' ) );
+		}
+
+		if (
+			( $this->getMeta(self::META_ITEM_ID) === CustomPostType::SELECTION_ALL_POSTS || $this->getMeta(self::META_LOCATION_ID) === CustomPostType::SELECTION_ALL_POSTS )
+			&& ! commonsbooking_isCurrentUserAdmin()
+		) {
+			throw new RestrictionInvalidException( __( 'Only admins are allowed to create a restriction for all items / locations.', 'commonsbooking' ) );
+		}
+
+		return true;
+	}
+
 	/**
 	 * Returns restriction type.
 	 * We currently have two types: hint and repair.

src/Plugin.php

@@ -429,6 +429,7 @@ public static function registerLocationTaxonomy() {
 	public static function renderError() {
 		$errorTypes = [
 			Model\Timeframe::ERROR_TYPE,
+			Model\Restriction::ERROR_TYPE,
 			BookingCode::ERROR_TYPE,
 			OptionsTab::ERROR_TYPE,
             Model\Booking::ERROR_TYPE,

src/Repository/Booking.php

@@ -209,21 +209,22 @@ function ( $post ) {
 	}
 
 	/**
+	 * Will return all bookings that are in a specific timerange.
+	 *
 	 * @param $startDate int
 	 * @param $endDate int
-	 * @param $locationId
-	 * @param $itemId
-	 * @param array         $customArgs
-	 * @param array         $postStatus
+	 * @param array $locationIds
+	 * @param array $itemIds
+	 * @param array $customArgs
+	 * @param array $postStatus
 	 *
 	 * @return \CommonsBooking\Model\Booking[]
-	 * @throws Exception
 	 */
 	public static function getByTimerange(
 		int $startDate,
 		int $endDate,
-		$locationId,
-		$itemId,
+		$locationIds = [],
+		$itemIds = [],
 		array $customArgs = [],
 		array $postStatus = [ 'confirmed', 'unconfirmed' ]
 	): ?array {
@@ -254,19 +255,19 @@ public static function getByTimerange(
 			'nopaging'    => true,
 		);
 
-		if ( $locationId ) {
+		if ( $locationIds !== [] ) {
 			$args['meta_query'][] = array(
-				'key'     => 'location-id',
-				'value'   => $locationId,
-				'compare' => '=',
+				'key'     => \CommonsBooking\Model\Booking::META_LOCATION_ID,
+				'value'   => $locationIds,
+				'compare' => 'IN',
 			);
 		}
 
-		if ( $itemId ) {
+		if ( $locationIds !== [] ) {
 			$args['meta_query'][] = array(
-				'key'     => 'item-id',
-				'value'   => $itemId,
-				'compare' => '=',
+				'key'     => \CommonsBooking\Model\Booking::META_ITEM_ID,
+				'value'   => $itemIds,
+				'compare' => 'IN',
 			);
 		}
 
@@ -427,8 +428,8 @@ public static function getByRestriction( \CommonsBooking\Model\Restriction $rest
 		return self::getByTimerange(
 			$restriction->getStartDate(),
 			$restriction->getEndDate(),
-			$restriction->getLocationId(),
-			$restriction->getItemId(),
+			$restriction->getLocationIds(),
+			$restriction->getItemIds(),
 			[],
 			[ 'confirmed' ]
 		);

src/Repository/Restriction.php

@@ -6,12 +6,27 @@
 
 use CommonsBooking\Helper\Wordpress;
 use CommonsBooking\Plugin;
+use CommonsBooking\Wordpress\CustomPostType\CustomPostType;
 use Exception;
 
 class Restriction extends PostRepository {
 
 	/**
 	 * Returns active restrictions.
+	 *
+	 * If both $locations and $items are empty, all restrictions will be returned.
+	 *
+	 * WARNING: When setting either $locations or $items, the query will be filtered by both.
+	 *          Meaning, that if $locations is not empty, but $items is, only restrictions that apply to all items will be returned.
+	 *          So, if a restriction is created that applies to the location but only to one item, it will not be returned if you just query for the location.
+	 *
+	 * @param array $locations Array of location ids
+	 * @param array $items Array of item ids
+	 * @param string|null $date
+	 * @param bool $returnAsModel
+	 * @param null $minTimestamp
+	 * @param array $postStatus
+	 *
 	 * @return \CommonsBooking\Model\Restriction[]
 	 * @throws Exception
 	 */
@@ -195,46 +210,25 @@ private static function getActiveQuery(): string {
 	 */
 	private static function filterPosts( array $posts, array $locations, array $items ): array {
 		return array_filter( $posts, function ( $post ) use ( $locations, $items ) {
-			// Check if restriction is in relation to item and/or location
-			$location                      = intval( get_post_meta( $post->ID, \CommonsBooking\Model\Restriction::META_LOCATION_ID, true ) );
-			$restrictionHasLocation        = $location !== 0;
-			$restrictedLocationInLocations = $restrictionHasLocation && in_array( $location, $locations );
-
-			$item                  = intval( get_post_meta( $post->ID, \CommonsBooking\Model\Restriction::META_ITEM_ID, true ) );
-			$restrictionHasItem    = $item !== 0;
-			$restrictedItemInItems = $restrictionHasItem && in_array( $item, $items );
-
-			// No item or location for restriction set
-			$noLocationNoItem = ( ! $restrictionHasLocation && ! $restrictionHasItem );
-
-			// No location, item matching
-			$noLocationItemMatches = (
-				! $restrictionHasLocation &&
-				$restrictionHasItem &&
-				$restrictedItemInItems
-			);
-
-			// No item, location matching
-			$noItemLocationMatches = (
-				! $restrictionHasItem &&
-				$restrictionHasLocation &&
-				$restrictedLocationInLocations
-			);
-
-			// Item and location matching
-			$itemAndLocationMatches = (
-				$restrictionHasLocation &&
-				$restrictedLocationInLocations &&
-				$restrictionHasItem &&
-				$restrictedItemInItems
-			);
-
-			return
-				$noLocationNoItem ||
-				$noLocationItemMatches ||
-				$noItemLocationMatches ||
-				$itemAndLocationMatches;
-		} );
+			$item      = intval( get_post_meta( $post->ID, \CommonsBooking\Model\Restriction::META_ITEM_ID, true ) );
+			$location  = intval( get_post_meta( $post->ID, \CommonsBooking\Model\Restriction::META_LOCATION_ID, true ) );
+
+			//check, if the restriction has been set to apply to all items or all locations.
+			$appliedForAllItems     = get_post_meta( $post->ID, \CommonsBooking\Model\Restriction::META_ITEM_ID, true ) === CustomPostType::SELECTION_ALL_POSTS;
+			$appliedForAllLocations = get_post_meta( $post->ID, \CommonsBooking\Model\Restriction::META_LOCATION_ID, true ) === CustomPostType::SELECTION_ALL_POSTS;
+
+			if ( $appliedForAllItems && $appliedForAllLocations ) {
+				return true;
+			} elseif ( $appliedForAllLocations && in_array( $item, $items ) ) {
+				return true;
+			} elseif ( $appliedForAllItems && in_array( $location, $locations ) ) {
+				return true;
+			} elseif ( in_array( $item, $items ) && in_array( $location, $locations ) ) {
+				return true;
+			} else {
+				return false;
+			}
+		});
 	}
 
 	/**