Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bc89452b5e | |||
| be8e8832f5 | |||
| 95682bb35f | |||
| fca849c1a5 | |||
| 80600be607 |
@@ -3,7 +3,7 @@ Contributors: ronnygrobel
|
|||||||
Tags: verein, mitgliederverwaltung, parzellen, zaehler, abrechnung
|
Tags: verein, mitgliederverwaltung, parzellen, zaehler, abrechnung
|
||||||
Requires at least: 6.0
|
Requires at least: 6.0
|
||||||
Tested up to: 6.8
|
Tested up to: 6.8
|
||||||
Stable tag: 1.17.3
|
Stable tag: 1.17.5
|
||||||
Requires PHP: 7.2
|
Requires PHP: 7.2
|
||||||
License: GPLv2 or later
|
License: GPLv2 or later
|
||||||
License URI: https://www.gnu.org/licenses/gpl-2.0.html
|
License URI: https://www.gnu.org/licenses/gpl-2.0.html
|
||||||
@@ -43,6 +43,12 @@ Ja, insbesondere fuer Kleingartenvereine und deren Verwaltungsprozesse.
|
|||||||
|
|
||||||
== Changelog ==
|
== Changelog ==
|
||||||
|
|
||||||
|
= 1.17.5 =
|
||||||
|
Fix: Spaltenbreiten in Abrechnungstabellen angepasst für bessere Lesbarkeit langer Texte.
|
||||||
|
|
||||||
|
= 1.17.4 =
|
||||||
|
Fix: Checkbox "Verpflichtende Position" bei Kostenposten wird jetzt korrekt gespeichert wenn sie deaktiviert ist.
|
||||||
|
|
||||||
= 1.17.3 =
|
= 1.17.3 =
|
||||||
Verbesserung: Kostenübersicht zeigt jetzt direkt pro Kostenposten den Status Verpflichtend oder Manuell in einer eigenen Spalte an.
|
Verbesserung: Kostenübersicht zeigt jetzt direkt pro Kostenposten den Status Verpflichtend oder Manuell in einer eigenen Spalte an.
|
||||||
|
|
||||||
|
|||||||
@@ -1377,6 +1377,7 @@ class Admin {
|
|||||||
<th scope='row'><?php echo esc_html__( 'Position', KGVVM_TEXT_DOMAIN ); ?></th>
|
<th scope='row'><?php echo esc_html__( 'Position', KGVVM_TEXT_DOMAIN ); ?></th>
|
||||||
<td>
|
<td>
|
||||||
<label>
|
<label>
|
||||||
|
<input type='hidden' name='is_mandatory' value='0' />
|
||||||
<input type='checkbox' name='is_mandatory' value='1' <?php checked( $cost ? (bool) $cost->is_mandatory : true, true ); ?> />
|
<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 ); ?>
|
<?php echo esc_html__( 'Verpflichtende Position', KGVVM_TEXT_DOMAIN ); ?>
|
||||||
</label>
|
</label>
|
||||||
@@ -1872,8 +1873,7 @@ class Admin {
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th><?php echo esc_html__( 'Kostenposten', KGVVM_TEXT_DOMAIN ); ?></th>
|
<th><?php echo esc_html__( 'Kostenposten', KGVVM_TEXT_DOMAIN ); ?></th>
|
||||||
<th><?php echo esc_html__( 'Gesamtkosten', KGVVM_TEXT_DOMAIN ); ?></th>
|
<th style='width:140px; white-space:nowrap;'><?php echo esc_html__( 'Anteil', KGVVM_TEXT_DOMAIN ); ?></th>
|
||||||
<th><?php echo esc_html__( 'Anteil', KGVVM_TEXT_DOMAIN ); ?></th>
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -1884,8 +1884,7 @@ class Admin {
|
|||||||
<br /><span class="kgvvm-help"><?php echo esc_html( sprintf( __( '%1$s × %2$s zu je %3$s', KGVVM_TEXT_DOMAIN ), $item['distribution_label'], number_format_i18n( (int) $item['units'], 0 ), $this->format_currency( $item['unit_amount'] ) ) ); ?></span>
|
<br /><span class="kgvvm-help"><?php echo esc_html( sprintf( __( '%1$s × %2$s zu je %3$s', KGVVM_TEXT_DOMAIN ), $item['distribution_label'], number_format_i18n( (int) $item['units'], 0 ), $this->format_currency( $item['unit_amount'] ) ) ); ?></span>
|
||||||
<?php echo $item['note'] ? '<br /><span class="kgvvm-help">' . esc_html( $item['note'] ) . '</span>' : ''; ?>
|
<?php echo $item['note'] ? '<br /><span class="kgvvm-help">' . esc_html( $item['note'] ) . '</span>' : ''; ?>
|
||||||
</td>
|
</td>
|
||||||
<td><?php echo esc_html( $this->format_currency( $item['total'] ) ); ?></td>
|
<td style='width:140px; white-space:nowrap; text-align:right;'><?php echo esc_html( $this->format_currency( $item['share'] ) ); ?></td>
|
||||||
<td><?php echo esc_html( $this->format_currency( $item['share'] ) ); ?></td>
|
|
||||||
</tr>
|
</tr>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
</tbody>
|
</tbody>
|
||||||
@@ -2071,24 +2070,24 @@ class Admin {
|
|||||||
<h2><?php echo esc_html__( 'Zusammenfassung', KGVVM_TEXT_DOMAIN ); ?></h2>
|
<h2><?php echo esc_html__( 'Zusammenfassung', KGVVM_TEXT_DOMAIN ); ?></h2>
|
||||||
<table cellpadding="5" cellspacing="0" border="1">
|
<table cellpadding="5" cellspacing="0" border="1">
|
||||||
<tr>
|
<tr>
|
||||||
<th><strong><?php echo esc_html__( 'Position', KGVVM_TEXT_DOMAIN ); ?></strong></th>
|
<th style="width:76%;"><strong><?php echo esc_html__( 'Position', KGVVM_TEXT_DOMAIN ); ?></strong></th>
|
||||||
<th><strong><?php echo esc_html__( 'Betrag', KGVVM_TEXT_DOMAIN ); ?></strong></th>
|
<th style="width:24%; text-align:right; white-space:nowrap;"><strong><?php echo esc_html__( 'Betrag', KGVVM_TEXT_DOMAIN ); ?></strong></th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><?php echo esc_html__( 'Anteilige Grundkosten', KGVVM_TEXT_DOMAIN ); ?></td>
|
<td><?php echo esc_html__( 'Anteilige Grundkosten', KGVVM_TEXT_DOMAIN ); ?></td>
|
||||||
<td><?php echo esc_html( $this->format_currency( $statement['fixed_total'] ) ); ?></td>
|
<td style="text-align:right; white-space:nowrap;"><?php echo esc_html( $this->format_currency( $statement['fixed_total'] ) ); ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><?php echo esc_html__( 'Wasserkosten', KGVVM_TEXT_DOMAIN ); ?></td>
|
<td><?php echo esc_html__( 'Wasserkosten', KGVVM_TEXT_DOMAIN ); ?></td>
|
||||||
<td><?php echo esc_html( $this->format_currency( $statement['water_cost_total'] ) ); ?></td>
|
<td style="text-align:right; white-space:nowrap;"><?php echo esc_html( $this->format_currency( $statement['water_cost_total'] ) ); ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><?php echo esc_html__( 'Stromkosten', KGVVM_TEXT_DOMAIN ); ?></td>
|
<td><?php echo esc_html__( 'Stromkosten', KGVVM_TEXT_DOMAIN ); ?></td>
|
||||||
<td><?php echo esc_html( $this->format_currency( $statement['power_cost_total'] ) ); ?></td>
|
<td style="text-align:right; white-space:nowrap;"><?php echo esc_html( $this->format_currency( $statement['power_cost_total'] ) ); ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><strong><?php echo esc_html__( 'Gesamtbetrag', KGVVM_TEXT_DOMAIN ); ?></strong></td>
|
<td><strong><?php echo esc_html__( 'Gesamtbetrag', KGVVM_TEXT_DOMAIN ); ?></strong></td>
|
||||||
<td><strong><?php echo esc_html( $this->format_currency( $statement['grand_total'] ) ); ?></strong></td>
|
<td style="text-align:right; white-space:nowrap;"><strong><?php echo esc_html( $this->format_currency( $statement['grand_total'] ) ); ?></strong></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
@@ -2098,15 +2097,13 @@ class Admin {
|
|||||||
<?php else : ?>
|
<?php else : ?>
|
||||||
<table cellpadding="5" cellspacing="0" border="1">
|
<table cellpadding="5" cellspacing="0" border="1">
|
||||||
<tr>
|
<tr>
|
||||||
<th><strong><?php echo esc_html__( 'Kostenposten', KGVVM_TEXT_DOMAIN ); ?></strong></th>
|
<th style="width:76%;"><strong><?php echo esc_html__( 'Kostenposten', KGVVM_TEXT_DOMAIN ); ?></strong></th>
|
||||||
<th><strong><?php echo esc_html__( 'Gesamtkosten', KGVVM_TEXT_DOMAIN ); ?></strong></th>
|
<th style="width:24%; text-align:right; white-space:nowrap;"><strong><?php echo esc_html__( 'Anteil', KGVVM_TEXT_DOMAIN ); ?></strong></th>
|
||||||
<th><strong><?php echo esc_html__( 'Anteil', KGVVM_TEXT_DOMAIN ); ?></strong></th>
|
|
||||||
</tr>
|
</tr>
|
||||||
<?php foreach ( $statement['fixed_items'] as $item ) : ?>
|
<?php foreach ( $statement['fixed_items'] as $item ) : ?>
|
||||||
<tr>
|
<tr>
|
||||||
<td><?php echo esc_html( $item['name'] . ' – ' . sprintf( __( '%1$s × %2$s zu je %3$s', KGVVM_TEXT_DOMAIN ), $item['distribution_label'], number_format_i18n( (int) $item['units'], 0 ), $this->format_currency( $item['unit_amount'] ) ) ); ?></td>
|
<td style="width:76%;"><?php echo esc_html( $item['name'] . ' – ' . sprintf( __( '%1$s × %2$s zu je %3$s', KGVVM_TEXT_DOMAIN ), $item['distribution_label'], number_format_i18n( (int) $item['units'], 0 ), $this->format_currency( $item['unit_amount'] ) ) ); ?></td>
|
||||||
<td><?php echo esc_html( $this->format_currency( $item['total'] ) ); ?></td>
|
<td style="width:24%; text-align:right; white-space:nowrap;"><?php echo esc_html( $this->format_currency( $item['share'] ) ); ?></td>
|
||||||
<td><?php echo esc_html( $this->format_currency( $item['share'] ) ); ?></td>
|
|
||||||
</tr>
|
</tr>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
@@ -259,7 +259,7 @@ class Validator {
|
|||||||
$unit_amount = isset( $data['unit_amount'] ) ? str_replace( ',', '.', wp_unslash( $data['unit_amount'] ) ) : '';
|
$unit_amount = isset( $data['unit_amount'] ) ? str_replace( ',', '.', wp_unslash( $data['unit_amount'] ) ) : '';
|
||||||
$entry_year = $this->sanitize_cost_year( $data );
|
$entry_year = $this->sanitize_cost_year( $data );
|
||||||
$distribution_type = sanitize_key( wp_unslash( isset( $data['distribution_type'] ) ? $data['distribution_type'] : 'parcel' ) );
|
$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;
|
$is_mandatory = isset( $data['is_mandatory'] ) && '1' === (string) wp_unslash( $data['is_mandatory'] );
|
||||||
|
|
||||||
return array(
|
return array(
|
||||||
'entry_year' => $entry_year,
|
'entry_year' => $entry_year,
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
* Plugin Name: KGV Vereinsverwaltung
|
* Plugin Name: KGV Vereinsverwaltung
|
||||||
* Plugin URI: https://apex-project.de/
|
* Plugin URI: https://apex-project.de/
|
||||||
* Description: Verwaltung von Sparten, Parzellen, Mitgliedern, Pächtern sowie Wasser- und Stromzählern für Kleingartenvereine.
|
* Description: Verwaltung von Sparten, Parzellen, Mitgliedern, Pächtern sowie Wasser- und Stromzählern für Kleingartenvereine.
|
||||||
* Version: 1.17.3
|
* Version: 1.17.5
|
||||||
* Author: Ronny Grobel
|
* Author: Ronny Grobel
|
||||||
* Author URI: https://apex-project.de/
|
* Author URI: https://apex-project.de/
|
||||||
* License: GPL v2 or later
|
* License: GPL v2 or later
|
||||||
@@ -31,7 +31,7 @@ if ( ! defined( 'ABSPATH' ) ) {
|
|||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
define( 'KGVVM_VERSION', '1.17.3' );
|
define( 'KGVVM_VERSION', '1.17.5' );
|
||||||
define( 'KGVVM_PLUGIN_FILE', __FILE__ );
|
define( 'KGVVM_PLUGIN_FILE', __FILE__ );
|
||||||
define( 'KGVVM_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
|
define( 'KGVVM_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
|
||||||
define( 'KGVVM_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
|
define( 'KGVVM_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ Contributors: ronnygrobel
|
|||||||
Tags: verein, mitgliederverwaltung, parzellen, zaehler, abrechnung
|
Tags: verein, mitgliederverwaltung, parzellen, zaehler, abrechnung
|
||||||
Requires at least: 6.0
|
Requires at least: 6.0
|
||||||
Tested up to: 6.8
|
Tested up to: 6.8
|
||||||
Stable tag: 1.17.3
|
Stable tag: 1.17.5
|
||||||
Requires PHP: 7.2
|
Requires PHP: 7.2
|
||||||
License: GPLv2 or later
|
License: GPLv2 or later
|
||||||
License URI: https://www.gnu.org/licenses/gpl-2.0.html
|
License URI: https://www.gnu.org/licenses/gpl-2.0.html
|
||||||
@@ -41,6 +41,12 @@ Ja, insbesondere fuer Kleingartenvereine und deren Verwaltungsprozesse.
|
|||||||
|
|
||||||
== Changelog ==
|
== Changelog ==
|
||||||
|
|
||||||
|
= 1.17.5 =
|
||||||
|
Fix: Spaltenbreiten in Abrechnungstabellen angepasst für bessere Lesbarkeit langer Texte.
|
||||||
|
|
||||||
|
= 1.17.4 =
|
||||||
|
Fix: Checkbox "Verpflichtende Position" bei Kostenposten wird jetzt korrekt gespeichert wenn sie deaktiviert ist.
|
||||||
|
|
||||||
= 1.17.3 =
|
= 1.17.3 =
|
||||||
Verbesserung: Kostenübersicht zeigt jetzt direkt pro Kostenposten den Status Verpflichtend oder Manuell in einer eigenen Spalte an.
|
Verbesserung: Kostenübersicht zeigt jetzt direkt pro Kostenposten den Status Verpflichtend oder Manuell in einer eigenen Spalte an.
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user