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
This commit is contained in:
@@ -1373,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>
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -201,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,
|
||||
|
||||
@@ -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'] : '' ) ),
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user