Bump version to 1.17.1

Feature: is_mandatory Flag für Kostenpositionstypen
- Neue Spalte wp_kgvvm_cost_entries.is_mandatory (TINYINT, default 1) - Kostenposten können jetzt als 'verpflichtend' oder 'manuell/optional' gekennzeichnet werden - Validator: sanitize_cost_entry() und validate_cost_entry() aktualisiert - CostRepository.save(): is_mandatory wird gespeichert - Admin: Checkbox 'Verpflichtende Position' in der Kostenposten-Form hinzugefügt - Datenbank: ALTER TABLE durchgeführt für existierende Instanzen
2026-04-17 17:02:23 +02:00 · 2026-04-17 17:02:13 +02:00 · 2026-04-17 16:55:29 +02:00 · 2026-04-17 16:55:09 +02:00 · 2026-04-17 13:37:27 +02:00 · 2026-04-17 13:36:51 +02:00
8 changed files with 543 additions and 9 deletions
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Contributors: ronnygrobel
 Tags: verein, mitgliederverwaltung, parzellen, zaehler, abrechnung
 Requires at least: 6.0
 Tested up to: 6.8
-Stable tag: 1.16.2
+Stable tag: 1.17.1
 Requires PHP: 7.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -43,6 +43,15 @@ Ja, insbesondere fuer Kleingartenvereine und deren Verwaltungsprozesse.

 == Changelog ==

+= 1.17.1 =
+Feat: is_mandatory Flag für Kostenpositionstypen - Kostenposten können jetzt als "verpflichtend" oder "manuell/optional" gekennzeichnet werden. Checkbox in der Kostenposten-Bearbeitung.
+
+= 1.17.0 =
+Parzellenspezifische Kostenpositionenzuweisung: Kostenposten können jetzt einzelnen Parzellen zugeordnet werden (z.B. Versicherung nur für bestimmte Parzellen). Editor auf der Jahresabrechnung Parzelle Seite mit übersichtlicher Liste und Hinzufügen/Entfernen-Funktionen. Zuordnungen werden in einer separaten Tabelle gespeichert und sind vollständig in Export/Import integriert.
+
+= 1.16.3 =
+* Datensicherung erweitert: Export und Import umfassen jetzt zusätzlich die zugehörigen WordPress-Mitgliederkonten inklusive Metadaten.
+
 = 1.16.2 =
 * Neue Datensicherungsfunktion unter Einstellungen: Export und Import aller kgvvm-Tabellen als JSON.
 * Import mit Sicherheitsprüfung und vollständigem Überschreiben der vorhandenen Plugin-Daten.
--- a/includes/Admin/Admin.php
+++ b/includes/Admin/Admin.php
@@ -249,6 +249,9 @@ class Admin {
 			case 'import_plugin_data':
 				$this->import_plugin_data();
 				break;
+			case 'toggle_parcel_cost_assignment':
+				$this->toggle_parcel_cost_assignment();
+				break;
 		}
 	}

@@ -313,6 +316,7 @@ class Admin {
 					$this->redirect_with_notice( 'kgvvm-costs', 'error', __( 'Der gewünschte Kostenposten wurde nicht gefunden.', KGVVM_TEXT_DOMAIN ), array( 'year' => $year ) );
 				}
 				$year = (int) $cost->entry_year;
+				$this->costs->delete_assignments_for_entry( $id );
 				$this->costs->delete( $id );
 				$this->redirect_with_notice( 'kgvvm-costs', 'success', __( 'Kostenposten wurde gelöscht.', KGVVM_TEXT_DOMAIN ), array( 'year' => $year ) );
 				break;
@@ -835,6 +839,34 @@ class Admin {
 		$this->redirect_with_notice( 'kgvvm-costs', 'success', __( 'Kostenposten wurde gespeichert.', KGVVM_TEXT_DOMAIN ), array( 'year' => $data['entry_year'] ) );
 	}

+	/**
+	 * Add or remove a cost entry assignment for a specific parcel.
+	 *
+	 * @return void
+	 */
+	private function toggle_parcel_cost_assignment() {
+		$this->require_cap( 'manage_kleingarten' );
+		check_admin_referer( 'kgvvm_toggle_parcel_cost' );
+
+		$parcel_id     = absint( isset( $_POST['parcel_id'] ) ? $_POST['parcel_id'] : 0 );
+		$cost_entry_id = absint( isset( $_POST['cost_entry_id'] ) ? $_POST['cost_entry_id'] : 0 );
+		$mode          = isset( $_POST['assignment_mode'] ) ? sanitize_key( wp_unslash( $_POST['assignment_mode'] ) ) : '';
+		$year          = absint( isset( $_POST['year'] ) ? $_POST['year'] : 0 );
+
+		if ( $parcel_id < 1 || $cost_entry_id < 1 || ! in_array( $mode, array( 'add', 'remove' ), true ) ) {
+			$this->redirect_with_notice( 'kgvvm-costs', 'error', __( 'Ungültige Anfrage.', KGVVM_TEXT_DOMAIN ), array( 'view' => 'statement', 'statement_type' => 'parcel', 'subject_id' => $parcel_id, 'year' => $year ) );
+		}
+
+		if ( 'add' === $mode ) {
+			$this->costs->assign_to_parcel( $parcel_id, $cost_entry_id );
+		} else {
+			$this->costs->unassign_from_parcel( $parcel_id, $cost_entry_id );
+		}
+
+		wp_safe_redirect( $this->admin_url( 'kgvvm-costs', array( 'view' => 'statement', 'statement_type' => 'parcel', 'subject_id' => $parcel_id, 'year' => $year ) ) );
+		exit;
+	}
+
 	/**
 	 * Render dashboard.
 	 *
@@ -1341,6 +1373,16 @@ class Admin {
 									<p class='kgvvm-help'><?php echo esc_html__( 'Betrag je ausgewählter Einheit, also pro Parzelle oder pro Mitglied.', KGVVM_TEXT_DOMAIN ); ?></p>
 								</td>
 							</tr>
+							<tr>
+								<th scope='row'><?php echo esc_html__( 'Position', KGVVM_TEXT_DOMAIN ); ?></th>
+								<td>
+									<label>
+										<input type='checkbox' name='is_mandatory' value='1' <?php checked( $cost ? (bool) $cost->is_mandatory : true, true ); ?> />
+										<?php echo esc_html__( 'Verpflichtende Position', KGVVM_TEXT_DOMAIN ); ?>
+									</label>
+									<p class='kgvvm-help'><?php echo esc_html__( 'Wenn aktiviert: Diese Position wird automatisch in allen Abrechnungen berechnet. Wenn deaktiviert: Diese Position wird als manuelle/optionale Position behandelt.', KGVVM_TEXT_DOMAIN ); ?></p>
+								</td>
+							</tr>
 							<tr>
 								<th scope='row'><label for='kgvvm-cost-note'><?php echo esc_html__( 'Bemerkung', KGVVM_TEXT_DOMAIN ); ?></label></th>
 								<td><textarea name='note' id='kgvvm-cost-note' rows='4' class='large-text'><?php echo esc_textarea( $cost ? $cost->note : '' ); ?></textarea></td>
@@ -1673,7 +1715,25 @@ class Admin {
 		$fixed_items = array();
 		$fixed_total = 0.0;

+		// Load parcel-specific cost assignments so that entries with explicit
+		// assignments are only charged to the assigned parcels.
+		$entries_with_assignments = ( 'parcel' === $statement_type )
+			? $this->costs->get_entry_ids_with_assignments( $year )
+			: array();
+		$parcel_assigned_ids      = ( 'parcel' === $statement_type )
+			? $this->costs->get_assigned_entry_ids( $subject_id )
+			: array();
+
 		foreach ( $cost_entries as $entry ) {
+			$entry_id          = (int) $entry->id;
+			$has_assignments   = in_array( $entry_id, $entries_with_assignments, true );
+
+			// For parcel statements: if this entry has any parcel restrictions,
+			// skip it unless this specific parcel is assigned.
+			if ( 'parcel' === $statement_type && $has_assignments && ! in_array( $entry_id, $parcel_assigned_ids, true ) ) {
+				continue;
+			}
+
 			$distribution_type = $this->get_cost_distribution_type( $entry );
 			$unit_amount       = $this->get_cost_unit_amount( $entry, count( $active_parcels ), count( $active_members ) );
 			$subject_units     = 'member' === $distribution_type ? $subject_member_count : $subject_parcel_count;
@@ -1714,6 +1774,18 @@ class Admin {
 			return;
 		}
 		?>
+		<style>
+		@media screen {
+			.kgvvm-statement-layout { display: flex; gap: 24px; align-items: flex-start; }
+			.kgvvm-statement-main   { flex: 1 1 0; min-width: 0; }
+			.kgvvm-statement-sidebar { flex: 0 0 300px; width: 300px; }
+		}
+		@media print { .kgvvm-statement-sidebar { display: none !important; } }
+		.kgvvm-cost-assignment-list { list-style: none; margin: 0; padding: 0; }
+		.kgvvm-cost-assignment-list li { display: flex; align-items: center; justify-content: space-between; padding: 6px 0; border-bottom: 1px solid #f0f0f0; gap: 8px; }
+		.kgvvm-cost-assignment-list li:last-child { border-bottom: none; }
+		.kgvvm-cost-assignment-list .kgvvm-entry-name { flex: 1; }
+		</style>
 		<div class='wrap kgvvm-print-page'>
 			<h1><?php echo esc_html( $subject_label ); ?></h1>
 			<div class='kgvvm-print-actions'>
@@ -1722,6 +1794,9 @@ class Admin {
 				<a href='<?php echo esc_url( $this->admin_url( 'kgvvm-costs', array( 'year' => $year ) ) ); ?>' class='button-secondary'><?php echo esc_html__( 'Zurück', KGVVM_TEXT_DOMAIN ); ?></a>
 			</div>

+			<div class='kgvvm-statement-layout'>
+			<div class='kgvvm-statement-main'>
+
 			<?php if ( ! empty( $settings['pdf_club_name'] ) || ! empty( $settings['pdf_logo_url'] ) || ! empty( $settings['pdf_contact_block'] ) || ! empty( $settings['pdf_intro_text'] ) ) : ?>
 				<div class='kgvvm-card'>
 					<table style='width:100%; border-collapse:collapse;'>
@@ -1819,6 +1894,72 @@ class Admin {
 					<p><?php echo wp_kses_post( nl2br( esc_html( $settings['pdf_footer_text'] ) ) ); ?></p>
 				</div>
 			<?php endif; ?>
+
+			</div><!-- .kgvvm-statement-main -->
+
+			<?php if ( 'parcel' === $statement_type ) : ?>
+			<div class='kgvvm-statement-sidebar'>
+				<div class='kgvvm-card'>
+					<h3 style='margin-top:0;'><?php echo esc_html__( 'Kostenpositionen', KGVVM_TEXT_DOMAIN ); ?></h3>
+					<p class='description'><?php echo esc_html__( 'Hier legen Sie fest, welche Positionen dieser Parzelle berechnet werden. Positionen ohne Einschränkung gelten für alle Parzellen.', KGVVM_TEXT_DOMAIN ); ?></p>
+
+					<?php if ( empty( $cost_entries ) ) : ?>
+						<p><?php echo esc_html__( 'Für dieses Jahr sind keine Kostenposten hinterlegt.', KGVVM_TEXT_DOMAIN ); ?></p>
+					<?php else : ?>
+						<ul class='kgvvm-cost-assignment-list'>
+							<?php foreach ( $cost_entries as $entry ) :
+								$entry_id    = (int) $entry->id;
+								$is_assigned = in_array( $entry_id, $parcel_assigned_ids, true );
+								$has_any     = in_array( $entry_id, $entries_with_assignments, true );
+							?>
+							<li>
+								<span class='kgvvm-entry-name'>
+									<?php if ( $is_assigned ) : ?>
+										<span style='color:#007017;' title='<?php esc_attr_e( 'Diese Parzelle ist zugeordnet', KGVVM_TEXT_DOMAIN ); ?>'>&#10003;</span>
+									<?php elseif ( $has_any ) : ?>
+										<span style='color:#b32d2e;' title='<?php esc_attr_e( 'Diese Parzelle ist nicht zugeordnet', KGVVM_TEXT_DOMAIN ); ?>'>&#10007;</span>
+									<?php else : ?>
+										<span style='color:#999;' title='<?php esc_attr_e( 'Gilt für alle Parzellen', KGVVM_TEXT_DOMAIN ); ?>'>&#8212;</span>
+									<?php endif; ?>
+									<?php echo esc_html( $entry->name ); ?>
+								</span>
+								<?php if ( $is_assigned ) : ?>
+									<form method='post' action='<?php echo esc_url( admin_url( 'admin.php' ) ); ?>' style='display:inline;'>
+										<?php wp_nonce_field( 'kgvvm_toggle_parcel_cost' ); ?>
+										<input type='hidden' name='kgvvm_action' value='toggle_parcel_cost_assignment' />
+										<input type='hidden' name='parcel_id' value='<?php echo esc_attr( $subject_id ); ?>' />
+										<input type='hidden' name='cost_entry_id' value='<?php echo esc_attr( $entry_id ); ?>' />
+										<input type='hidden' name='assignment_mode' value='remove' />
+										<input type='hidden' name='year' value='<?php echo esc_attr( $year ); ?>' />
+										<input type='hidden' name='page' value='kgvvm-costs' />
+										<button type='submit' class='button button-small'><?php echo esc_html__( 'Entfernen', KGVVM_TEXT_DOMAIN ); ?></button>
+									</form>
+								<?php else : ?>
+									<form method='post' action='<?php echo esc_url( admin_url( 'admin.php' ) ); ?>' style='display:inline;'>
+										<?php wp_nonce_field( 'kgvvm_toggle_parcel_cost' ); ?>
+										<input type='hidden' name='kgvvm_action' value='toggle_parcel_cost_assignment' />
+										<input type='hidden' name='parcel_id' value='<?php echo esc_attr( $subject_id ); ?>' />
+										<input type='hidden' name='cost_entry_id' value='<?php echo esc_attr( $entry_id ); ?>' />
+										<input type='hidden' name='assignment_mode' value='add' />
+										<input type='hidden' name='year' value='<?php echo esc_attr( $year ); ?>' />
+										<input type='hidden' name='page' value='kgvvm-costs' />
+										<button type='submit' class='button button-small button-primary'><?php echo esc_html__( 'Hinzufügen', KGVVM_TEXT_DOMAIN ); ?></button>
+									</form>
+								<?php endif; ?>
+							</li>
+							<?php endforeach; ?>
+						</ul>
+						<p class='description' style='margin-top:12px; font-size:11px;'>
+							<span style='color:#007017;'>&#10003;</span> <?php echo esc_html__( 'zugeordnet', KGVVM_TEXT_DOMAIN ); ?> &nbsp;
+							<span style='color:#b32d2e;'>&#10007;</span> <?php echo esc_html__( 'nicht zugeordnet', KGVVM_TEXT_DOMAIN ); ?> &nbsp;
+							<span style='color:#999;'>&#8212;</span> <?php echo esc_html__( 'alle Parzellen', KGVVM_TEXT_DOMAIN ); ?>
+						</p>
+					<?php endif; ?>
+				</div>
+			</div>
+			<?php endif; ?>
+
+			</div><!-- .kgvvm-statement-layout -->
 		</div>
 		<?php
 	}
@@ -3398,7 +3539,7 @@ class Admin {
 			<div class='kgvvm-grid'>
 				<div class='kgvvm-card'>
 					<h3><?php echo esc_html__( 'Export', KGVVM_TEXT_DOMAIN ); ?></h3>
-					<p><?php echo esc_html__( 'Exportiert alle Plugin-Tabellen (Sparten, Parzellen, Zähler, Verbrauch, Kosten, Arbeitsstunden usw.) als JSON-Datei.', KGVVM_TEXT_DOMAIN ); ?></p>
+					<p><?php echo esc_html__( 'Exportiert alle Plugin-Tabellen (Sparten, Parzellen, Zähler, Verbrauch, Kosten, Arbeitsstunden usw.) sowie die zugehörigen WordPress-Mitgliederkonten als JSON-Datei.', KGVVM_TEXT_DOMAIN ); ?></p>
 					<a href='<?php echo esc_url( wp_nonce_url( $this->admin_url( 'kgvvm-settings', array( 'kgvvm_action' => 'export_plugin_data' ) ), 'kgvvm_export_plugin_data' ) ); ?>'
 					   class='button button-secondary'>
 						<?php echo esc_html__( 'JSON-Export herunterladen', KGVVM_TEXT_DOMAIN ); ?>
--- a/includes/DataTransfer.php
+++ b/includes/DataTransfer.php
@@ -33,6 +33,7 @@ class DataTransfer {
 		'cost_years',
 		'cost_rates',
 		'cost_entries',
+		'parcel_cost_assignments',
 		'work_jobs',
 		'work_year_config',
 		'work_logs',
@@ -57,9 +58,12 @@ class DataTransfer {
 			'plugin'    => 'kgv-verein-manager',
 			'version'   => KGVVM_VERSION,
 			'exported'  => gmdate( 'Y-m-d\TH:i:s\Z' ),
+			'members'   => array(),
 			'tables'    => array(),
 		);

+		$payload['members'] = $this->export_members();
+
 		foreach ( self::$table_keys as $key ) {
 			$table = Schema::table( $key );
 			if ( '' === $table ) {
@@ -73,6 +77,83 @@ class DataTransfer {
 		return $payload;
 	}

+	/**
+	 * Export all member user accounts relevant to the plugin.
+	 *
+	 * @return array
+	 */
+	private function export_members() {
+		$ids = $this->collect_member_user_ids();
+
+		if ( empty( $ids ) ) {
+			return array(
+				'ids'      => array(),
+				'users'    => array(),
+				'usermeta' => array(),
+			);
+		}
+
+		$placeholders = implode( ', ', array_fill( 0, count( $ids ), '%d' ) );
+
+		$users_sql = "SELECT ID, user_login, user_pass, user_nicename, user_email, user_url, user_registered, user_activation_key, user_status, display_name
+			FROM {$this->wpdb->users}
+			WHERE ID IN ({$placeholders})
+			ORDER BY ID ASC";
+
+		$meta_sql = "SELECT user_id, meta_key, meta_value
+			FROM {$this->wpdb->usermeta}
+			WHERE user_id IN ({$placeholders})
+			ORDER BY user_id ASC, umeta_id ASC";
+
+		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+		$users = $this->wpdb->get_results( $this->wpdb->prepare( $users_sql, $ids ), ARRAY_A );
+		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+		$meta = $this->wpdb->get_results( $this->wpdb->prepare( $meta_sql, $ids ), ARRAY_A );
+
+		return array(
+			'ids'      => $ids,
+			'users'    => is_array( $users ) ? $users : array(),
+			'usermeta' => is_array( $meta ) ? $meta : array(),
+		);
+	}
+
+	/**
+	 * Collect all user IDs relevant for member data export.
+	 *
+	 * @return int[]
+	 */
+	private function collect_member_user_ids() {
+		$ids = array();
+
+		$member_query = new \WP_User_Query(
+			array(
+				'role'    => Roles::MEMBER_ROLE,
+				'fields'  => 'ID',
+				'number'  => 2000,
+				'orderby' => 'ID',
+				'order'   => 'ASC',
+			)
+		);
+		$ids = array_merge( $ids, (array) $member_query->get_results() );
+
+		$parcel_members_table = Schema::table( 'parcel_members' );
+		if ( '' !== $parcel_members_table ) {
+			// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared,WordPress.DB.DirectDatabaseQuery.DirectQuery
+			$ids = array_merge( $ids, (array) $this->wpdb->get_col( "SELECT DISTINCT user_id FROM {$parcel_members_table}" ) );
+		}
+
+		$work_log_members_table = Schema::table( 'work_log_members' );
+		if ( '' !== $work_log_members_table ) {
+			// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared,WordPress.DB.DirectDatabaseQuery.DirectQuery
+			$ids = array_merge( $ids, (array) $this->wpdb->get_col( "SELECT DISTINCT user_id FROM {$work_log_members_table}" ) );
+		}
+
+		$ids = array_values( array_unique( array_filter( array_map( 'absint', $ids ) ) ) );
+		sort( $ids, SORT_NUMERIC );
+
+		return $ids;
+	}
+
 	/**
 	 * Send the export as a JSON file download and exit.
 	 *
@@ -124,6 +205,18 @@ class DataTransfer {
 		$this->wpdb->query( 'SET FOREIGN_KEY_CHECKS = 0' ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery
 		$this->wpdb->query( 'START TRANSACTION' ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery

+		if ( ! empty( $payload['members'] ) && is_array( $payload['members'] ) ) {
+			$member_result = $this->import_members( $payload['members'] );
+			if ( ! empty( $member_result['errors'] ) ) {
+				$result['errors'] = array_merge( $result['errors'], $member_result['errors'] );
+				$this->wpdb->query( 'ROLLBACK' ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery
+				$this->wpdb->query( 'SET FOREIGN_KEY_CHECKS = 1' ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery
+				return $result;
+			}
+			$result['imported']['wp_members']     = isset( $member_result['users'] ) ? (int) $member_result['users'] : 0;
+			$result['imported']['wp_member_meta'] = isset( $member_result['meta'] ) ? (int) $member_result['meta'] : 0;
+		}
+
 		// Truncate in reverse dependency order.
 		foreach ( array_reverse( self::$table_keys ) as $key ) {
 			if ( ! isset( $payload['tables'][ $key ] ) ) {
@@ -192,4 +285,129 @@ class DataTransfer {

 		return $result;
 	}
+
+	/**
+	 * Import member user accounts and their usermeta.
+	 *
+	 * @param array $members Member payload from export.
+	 * @return array
+	 */
+	private function import_members( array $members ) {
+		$result = array(
+			'users'  => 0,
+			'meta'   => 0,
+			'errors' => array(),
+		);
+
+		$users = isset( $members['users'] ) && is_array( $members['users'] ) ? $members['users'] : array();
+		$meta  = isset( $members['usermeta'] ) && is_array( $members['usermeta'] ) ? $members['usermeta'] : array();
+
+		if ( empty( $users ) ) {
+			return $result;
+		}
+
+		$imported_user_ids = array();
+
+		foreach ( $users as $row ) {
+			if ( ! is_array( $row ) ) {
+				continue;
+			}
+
+			$user_id = isset( $row['ID'] ) ? absint( $row['ID'] ) : 0;
+			$login   = isset( $row['user_login'] ) ? sanitize_user( (string) $row['user_login'], true ) : '';
+			$email   = isset( $row['user_email'] ) ? sanitize_email( (string) $row['user_email'] ) : '';
+
+			if ( $user_id < 1 || '' === $login || '' === $email ) {
+				continue;
+			}
+
+			$data = array(
+				'user_login'          => $login,
+				'user_pass'           => isset( $row['user_pass'] ) ? (string) $row['user_pass'] : '',
+				'user_nicename'       => isset( $row['user_nicename'] ) ? sanitize_title( (string) $row['user_nicename'] ) : sanitize_title( $login ),
+				'user_email'          => $email,
+				'user_url'            => isset( $row['user_url'] ) ? esc_url_raw( (string) $row['user_url'] ) : '',
+				'user_registered'     => isset( $row['user_registered'] ) ? (string) $row['user_registered'] : current_time( 'mysql', true ),
+				'user_activation_key' => isset( $row['user_activation_key'] ) ? (string) $row['user_activation_key'] : '',
+				'user_status'         => isset( $row['user_status'] ) ? (int) $row['user_status'] : 0,
+				'display_name'        => isset( $row['display_name'] ) ? sanitize_text_field( (string) $row['display_name'] ) : $login,
+			);
+
+			$exists = (int) $this->wpdb->get_var( $this->wpdb->prepare( "SELECT COUNT(*) FROM {$this->wpdb->users} WHERE ID = %d", $user_id ) ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+
+			if ( $exists > 0 ) {
+				$updated = $this->wpdb->update( $this->wpdb->users, $data, array( 'ID' => $user_id ) );
+				if ( false === $updated ) {
+					$result['errors'][] = sprintf(
+						/* translators: %d: user id */
+						__( 'Mitglied mit ID %d konnte nicht aktualisiert werden.', KGVVM_TEXT_DOMAIN ),
+						$user_id
+					);
+					continue;
+				}
+			} else {
+				$insert_data       = $data;
+				$insert_data['ID'] = $user_id;
+				$inserted          = $this->wpdb->insert( $this->wpdb->users, $insert_data );
+				if ( false === $inserted ) {
+					$result['errors'][] = sprintf(
+						/* translators: 1: user id 2: DB error */
+						__( 'Mitglied mit ID %1$d konnte nicht angelegt werden: %2$s', KGVVM_TEXT_DOMAIN ),
+						$user_id,
+						(string) $this->wpdb->last_error
+					);
+					continue;
+				}
+			}
+
+			$imported_user_ids[] = $user_id;
+			$result['users']++;
+		}
+
+		$imported_user_ids = array_values( array_unique( array_filter( array_map( 'absint', $imported_user_ids ) ) ) );
+
+		if ( empty( $imported_user_ids ) || empty( $meta ) ) {
+			return $result;
+		}
+
+		$placeholders = implode( ', ', array_fill( 0, count( $imported_user_ids ), '%d' ) );
+		$delete_sql   = "DELETE FROM {$this->wpdb->usermeta} WHERE user_id IN ({$placeholders})";
+		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+		$this->wpdb->query( $this->wpdb->prepare( $delete_sql, $imported_user_ids ) );
+
+		$allowed_ids = array_flip( $imported_user_ids );
+
+		foreach ( $meta as $row ) {
+			if ( ! is_array( $row ) ) {
+				continue;
+			}
+
+			$user_id = isset( $row['user_id'] ) ? absint( $row['user_id'] ) : 0;
+			if ( $user_id < 1 || ! isset( $allowed_ids[ $user_id ] ) ) {
+				continue;
+			}
+
+			$meta_key = isset( $row['meta_key'] ) ? (string) $row['meta_key'] : '';
+			if ( '' === $meta_key ) {
+				continue;
+			}
+
+			$meta_value = isset( $row['meta_value'] ) ? maybe_serialize( maybe_unserialize( $row['meta_value'] ) ) : '';
+
+			$inserted = $this->wpdb->insert(
+				$this->wpdb->usermeta,
+				array(
+					'user_id'    => $user_id,
+					'meta_key'   => $meta_key,
+					'meta_value' => $meta_value,
+				)
+			);
+
+			if ( false !== $inserted ) {
+				$result['meta']++;
+			}
+		}
+
+		return $result;
+	}
 }
--- a/includes/Repositories/CostRepository.php
+++ b/includes/Repositories/CostRepository.php
@@ -93,11 +93,12 @@ class CostRepository extends AbstractRepository {
 			'distribution_type' => isset( $data['distribution_type'] ) ? $data['distribution_type'] : 'parcel',
 			'unit_amount'       => isset( $data['unit_amount'] ) ? (float) $data['unit_amount'] : 0,
 			'total_cost'        => (float) $data['total_cost'],
+			'is_mandatory'      => isset( $data['is_mandatory'] ) ? (int) (bool) $data['is_mandatory'] : 1,
 			'note'              => $data['note'],
 			'updated_at'        => $this->now(),
 		);

-		$formats = array( '%d', '%s', '%s', '%f', '%f', '%s', '%s' );
+		$formats = array( '%d', '%s', '%s', '%f', '%f', '%d', '%s', '%s' );

 		$this->ensure_year( $payload['entry_year'] );

@@ -107,7 +108,7 @@ class CostRepository extends AbstractRepository {
 		}

 		$payload['created_at'] = $this->now();
-		$this->wpdb->insert( $this->table, $payload, array( '%d', '%s', '%s', '%f', '%f', '%s', '%s', '%s' ) );
+		$this->wpdb->insert( $this->table, $payload, array( '%d', '%s', '%s', '%f', '%f', '%d', '%s', '%s', '%s' ) );

 		return $this->wpdb->insert_id;
 	}
@@ -310,4 +311,146 @@ class CostRepository extends AbstractRepository {

 		return (float) $total;
 	}
+
+	// -------------------------------------------------------------------------
+	// Parcel cost assignments
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Get the parcel cost assignments table name.
+	 *
+	 * @return string
+	 */
+	private function assignment_table() {
+		return Schema::table( 'parcel_cost_assignments' );
+	}
+
+	/**
+	 * Get cost entry IDs assigned to a specific parcel.
+	 *
+	 * @param int $parcel_id Parcel ID.
+	 * @return int[]
+	 */
+	public function get_assigned_entry_ids( $parcel_id ) {
+		$parcel_id = absint( $parcel_id );
+		$table     = $this->assignment_table();
+
+		if ( $parcel_id < 1 || '' === $table ) {
+			return array();
+		}
+
+		$ids = $this->wpdb->get_col( $this->wpdb->prepare( "SELECT cost_entry_id FROM {$table} WHERE parcel_id = %d", $parcel_id ) ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+
+		return array_map( 'intval', (array) $ids );
+	}
+
+	/**
+	 * Get all cost entry IDs that have at least one parcel assignment.
+	 *
+	 * @param int $year Optional – filter by entry year (0 = all years).
+	 * @return int[]
+	 */
+	public function get_entry_ids_with_assignments( $year = 0 ) {
+		$table = $this->assignment_table();
+
+		if ( '' === $table ) {
+			return array();
+		}
+
+		$year = absint( $year );
+
+		if ( $year > 0 ) {
+			$ids = $this->wpdb->get_col( $this->wpdb->prepare( // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+				"SELECT DISTINCT a.cost_entry_id FROM {$table} a
+				 INNER JOIN {$this->table} e ON e.id = a.cost_entry_id
+				 WHERE e.entry_year = %d",
+				$year
+			) );
+		} else {
+			$ids = $this->wpdb->get_col( "SELECT DISTINCT cost_entry_id FROM {$table}" ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared,WordPress.DB.DirectDatabaseQuery.DirectQuery
+		}
+
+		return array_map( 'intval', (array) $ids );
+	}
+
+	/**
+	 * Assign a cost entry to a parcel.
+	 *
+	 * @param int $parcel_id     Parcel ID.
+	 * @param int $cost_entry_id Cost entry ID.
+	 * @return bool
+	 */
+	public function assign_to_parcel( $parcel_id, $cost_entry_id ) {
+		$parcel_id     = absint( $parcel_id );
+		$cost_entry_id = absint( $cost_entry_id );
+		$table         = $this->assignment_table();
+
+		if ( $parcel_id < 1 || $cost_entry_id < 1 || '' === $table ) {
+			return false;
+		}
+
+		$exists = (int) $this->wpdb->get_var( $this->wpdb->prepare( // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+			"SELECT COUNT(*) FROM {$table} WHERE parcel_id = %d AND cost_entry_id = %d",
+			$parcel_id,
+			$cost_entry_id
+		) );
+
+		if ( $exists > 0 ) {
+			return true;
+		}
+
+		$result = $this->wpdb->insert(
+			$table,
+			array(
+				'parcel_id'     => $parcel_id,
+				'cost_entry_id' => $cost_entry_id,
+				'created_at'    => $this->now(),
+			),
+			array( '%d', '%d', '%s' )
+		);
+
+		return false !== $result;
+	}
+
+	/**
+	 * Remove a cost entry assignment from a parcel.
+	 *
+	 * @param int $parcel_id     Parcel ID.
+	 * @param int $cost_entry_id Cost entry ID.
+	 * @return bool
+	 */
+	public function unassign_from_parcel( $parcel_id, $cost_entry_id ) {
+		$parcel_id     = absint( $parcel_id );
+		$cost_entry_id = absint( $cost_entry_id );
+		$table         = $this->assignment_table();
+
+		if ( $parcel_id < 1 || $cost_entry_id < 1 || '' === $table ) {
+			return false;
+		}
+
+		$result = $this->wpdb->delete(
+			$table,
+			array(
+				'parcel_id'     => $parcel_id,
+				'cost_entry_id' => $cost_entry_id,
+			),
+			array( '%d', '%d' )
+		);
+
+		return false !== $result;
+	}
+
+	/**
+	 * Remove all parcel assignments for a cost entry (e.g. when the entry is deleted).
+	 *
+	 * @param int $cost_entry_id Cost entry ID.
+	 * @return void
+	 */
+	public function delete_assignments_for_entry( $cost_entry_id ) {
+		$table = $this->assignment_table();
+
+		if ( '' !== $table && absint( $cost_entry_id ) > 0 ) {
+			$this->wpdb->delete( $table, array( 'cost_entry_id' => absint( $cost_entry_id ) ), array( '%d' ) );
+		}
+	}
 }
--- a/includes/Schema.php
+++ b/includes/Schema.php
@@ -38,6 +38,7 @@ class Schema {
 			'work_year_config'  => $wpdb->prefix . 'kgvvm_work_year_config',
 'work_logs'              => $wpdb->prefix . 'kgvvm_work_logs',
 			'work_log_members'       => $wpdb->prefix . 'kgvvm_work_log_members',
+			'parcel_cost_assignments' => $wpdb->prefix . 'kgvvm_parcel_cost_assignments',
 		);

 		return isset( $map[ $key ] ) ? $map[ $key ] : '';
@@ -200,6 +201,7 @@ class Schema {
 			distribution_type VARCHAR(20) NOT NULL DEFAULT 'parcel',
 			unit_amount DECIMAL(12,2) NULL,
 			total_cost DECIMAL(12,2) NOT NULL DEFAULT 0.00,
+			is_mandatory TINYINT(1) NOT NULL DEFAULT 1,
 			note TEXT NULL,
 			created_at DATETIME NOT NULL,
 			updated_at DATETIME NOT NULL,
@@ -254,6 +256,14 @@ class Schema {
 			KEY log_id (log_id)
 		) {$charset_collate};";

+		$sql[] = "CREATE TABLE " . self::table( 'parcel_cost_assignments' ) . " (
+			parcel_id BIGINT UNSIGNED NOT NULL,
+			cost_entry_id BIGINT UNSIGNED NOT NULL,
+			created_at DATETIME NOT NULL,
+			PRIMARY KEY  (parcel_id, cost_entry_id),
+			KEY cost_entry_id (cost_entry_id)
+		) {$charset_collate};";
+
 		foreach ( $sql as $statement ) {
 			dbDelta( $statement );
 		}
@@ -283,6 +293,7 @@ class Schema {
 			self::table( 'work_year_config' ),
 			self::table( 'work_logs' ),
 			self::table( 'work_log_members' ),
+			self::table( 'parcel_cost_assignments' ),
 		);

 		foreach ( $tables as $table ) {
@@ -301,6 +312,7 @@ class Schema {
 		global $wpdb;

 		$tables = array(
+			self::table( 'parcel_cost_assignments' ),
 			self::table( 'work_log_members' ),
 			self::table( 'work_logs' ),
 			self::table( 'work_year_config' ),
--- a/includes/Validator.php
+++ b/includes/Validator.php
@@ -259,6 +259,7 @@ class Validator {
 		$unit_amount       = isset( $data['unit_amount'] ) ? str_replace( ',', '.', wp_unslash( $data['unit_amount'] ) ) : '';
 		$entry_year        = $this->sanitize_cost_year( $data );
 		$distribution_type = sanitize_key( wp_unslash( isset( $data['distribution_type'] ) ? $data['distribution_type'] : 'parcel' ) );
+		$is_mandatory       = isset( $data['is_mandatory'] ) ? (bool) $data['is_mandatory'] : true;

 		return array(
 			'entry_year'        => $entry_year,
@@ -266,6 +267,7 @@ class Validator {
 			'distribution_type' => $distribution_type,
 			'unit_amount'       => '' === trim( (string) $unit_amount ) ? '' : (float) $unit_amount,
 			'total_cost'        => 0.0,
+			'is_mandatory'      => $is_mandatory,
 			'note'              => sanitize_textarea_field( wp_unslash( isset( $data['note'] ) ? $data['note'] : '' ) ),
 		);
 	}
--- a/kgv-verein-manager.php
+++ b/kgv-verein-manager.php
@@ -4,7 +4,7 @@
 * Plugin Name: KGV Vereinsverwaltung
 * Plugin URI: https://apex-project.de/
 * Description: Verwaltung von Sparten, Parzellen, Mitgliedern, Pächtern sowie Wasser- und Stromzählern für Kleingartenvereine.
- * Version: 1.16.2
+ * Version: 1.17.1
 * Author: Ronny Grobel
 * Author URI: https://apex-project.de/
 * License: GPL v2 or later
@@ -31,7 +31,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }

-define( 'KGVVM_VERSION', '1.16.2' );
+define( 'KGVVM_VERSION', '1.17.1' );
 define( 'KGVVM_PLUGIN_FILE', __FILE__ );
 define( 'KGVVM_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'KGVVM_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: ronnygrobel
 Tags: verein, mitgliederverwaltung, parzellen, zaehler, abrechnung
 Requires at least: 6.0
 Tested up to: 6.8
-Stable tag: 1.16.2
+Stable tag: 1.17.1
 Requires PHP: 7.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -41,6 +41,15 @@ Ja, insbesondere fuer Kleingartenvereine und deren Verwaltungsprozesse.

 == Changelog ==

+= 1.17.1 =
+Feat: is_mandatory Flag für Kostenpositionstypen - Kostenposten können jetzt als "verpflichtend" oder "manuell/optional" gekennzeichnet werden. Checkbox in der Kostenposten-Bearbeitung.
+
+= 1.17.0 =
+Parzellenspezifische Kostenpositionenzuweisung: Kostenposten können jetzt einzelnen Parzellen zugeordnet werden (z.B. Versicherung nur für bestimmte Parzellen). Editor auf der Jahresabrechnung Parzelle Seite mit übersichtlicher Liste und Hinzufügen/Entfernen-Funktionen. Zuordnungen werden in einer separaten Tabelle gespeichert und sind vollständig in Export/Import integriert.
+
+= 1.16.3 =
+* Datensicherung erweitert: Export und Import umfassen jetzt zusätzlich die zugehörigen WordPress-Mitgliederkonten inklusive Metadaten.
+
 = 1.16.2 =
 * Neue Datensicherungsfunktion unter Einstellungen: Export und Import aller kgvvm-Tabellen als JSON.
 * Import mit Sicherheitsprüfung und vollständigem Überschreiben der vorhandenen Plugin-Daten.
Author	SHA1	Message	Date
Ronny Grobel	62a25726e8	Bump version to 1.17.1	2026-04-17 17:02:23 +02:00
Ronny Grobel	1e739cfd3f	Feature: is_mandatory Flag für Kostenpositionstypen - Neue Spalte wp_kgvvm_cost_entries.is_mandatory (TINYINT, default 1) - Kostenposten können jetzt als 'verpflichtend' oder 'manuell/optional' gekennzeichnet werden - Validator: sanitize_cost_entry() und validate_cost_entry() aktualisiert - CostRepository.save(): is_mandatory wird gespeichert - Admin: Checkbox 'Verpflichtende Position' in der Kostenposten-Form hinzugefügt - Datenbank: ALTER TABLE durchgeführt für existierende Instanzen	2026-04-17 17:02:13 +02:00
Ronny Grobel	6602a56a1c	Bump version to 1.17.0	2026-04-17 16:55:29 +02:00
Ronny Grobel	1a6b1199cd	Feature: Parzellenspezifische Kostenpositionsenzuweisung - Neue Tabelle wp_kgvvm_parcel_cost_assignments für 1:N Zuordnungen - CostRepository erweitert: get_assigned_entry_ids(), get_entry_ids_with_assignments(), assign_to_parcel(), unassign_from_parcel(), delete_assignments_for_entry() - Admin: Neue POST-Action toggle_parcel_cost_assignment() mit Nonce-Sicherung - Jahresabrechnung Parzelle: Rechte Seitenleiste zeigt alle Kostenpositions mit Zuordnungsstatus (✓ zugeordnet, ✗ nicht zugeordnet, – alle Parzellen) - Berechnung: Kostenposten mit Beschränkung werden nur berechnet wenn Parzelle zugeordnet ist - DataTransfer.php: parcel_cost_assignments in table_keys integriert für Export/Import - DELETE-Handler bereinigt Zuordnungen beim Löschen einer Kostenposition	2026-04-17 16:55:09 +02:00
Ronny Grobel	a1e6c52eaf	Bump version to 1.16.3	2026-04-17 13:37:27 +02:00
Ronny Grobel	f1571d3c0e	Include member accounts in data export/import	2026-04-17 13:36:51 +02:00