Fix #51: Dezimalkomma in Brutto-Suche wird in Dezimalpunkt umgewandelt
This commit is contained in:
parent
308895419e
commit
7de93f14b8
2 changed files with 7 additions and 2 deletions
|
|
@ -21,7 +21,8 @@ class Beleg
|
||||||
OR (SELECT CAST(SUM(bk2s.betrag_brutto) AS CHAR) FROM bookings bk2s
|
OR (SELECT CAST(SUM(bk2s.betrag_brutto) AS CHAR) FROM bookings bk2s
|
||||||
WHERE bk2s.beleg_id = b.id AND bk2s.is_reversal = 0) LIKE ?)';
|
WHERE bk2s.beleg_id = b.id AND bk2s.is_reversal = 0) LIKE ?)';
|
||||||
$s = '%' . $filter['search'] . '%';
|
$s = '%' . $filter['search'] . '%';
|
||||||
$params = array_merge($params, [$s, $s, $s, $s, $s, $s, $s, $s, $s]);
|
$sBrutto = '%' . str_replace(',', '.', $filter['search']) . '%';
|
||||||
|
$params = array_merge($params, [$s, $s, $s, $s, $s, $s, $s, $s, $sBrutto]);
|
||||||
}
|
}
|
||||||
if (!empty($filter['year'])) {
|
if (!empty($filter['year'])) {
|
||||||
$where[] = '(YEAR(b.beleg_datum) = ? OR b.beleg_datum IS NULL)';
|
$where[] = '(YEAR(b.beleg_datum) = ? OR b.beleg_datum IS NULL)';
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,11 @@ class BelegSucheErweitertTest extends TestCase
|
||||||
// 299 * 1.19 = 355.81
|
// 299 * 1.19 = 355.81
|
||||||
$res = \Steuerkram\Models\Beleg::all(['search' => '355.81'], 1, 50);
|
$res = \Steuerkram\Models\Beleg::all(['search' => '355.81'], 1, 50);
|
||||||
$found = $this->containsBeleg($res['rows'], $belegId);
|
$found = $this->containsBeleg($res['rows'], $belegId);
|
||||||
$this->assert($found, 'Suche nach Bruttobetrag findet den Beleg');
|
$this->assert($found, 'Suche nach Bruttobetrag findet den Beleg (Dezimalpunkt)');
|
||||||
|
|
||||||
|
$res = \Steuerkram\Models\Beleg::all(['search' => '355,81'], 1, 50);
|
||||||
|
$found = $this->containsBeleg($res['rows'], $belegId);
|
||||||
|
$this->assert($found, 'Suche nach Bruttobetrag findet den Beleg (Dezimalkomma)');
|
||||||
|
|
||||||
// ── Bestehende Felder funktionieren noch ──────────────────────────
|
// ── Bestehende Felder funktionieren noch ──────────────────────────
|
||||||
$res = \Steuerkram\Models\Beleg::all(['search' => $belegNr], 1, 50);
|
$res = \Steuerkram\Models\Beleg::all(['search' => $belegNr], 1, 50);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue