Skip to content
Code-Schnipsel Gruppen Projekte
Commit 4d3fad80 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

Merge branch 'next-3.x' into 'main'

fix(ArticleListUnique): no longer format already formatted totals

See merge request !165
Übergeordnete 55b32750 172ec904
No related branches found
No related tags found
2 Merge Requests!165fix(ArticleListUnique): no longer format already formatted totals,!140Update 'next-4.x' with latest changes from 'main'
Pipeline #13977 mit Warnungen bestanden mit Phase
in 45 Sekunden
......@@ -418,21 +418,23 @@ public function toHTML(
}
// price display
foreach ($vatArray as $key => $vat) {
$vatArray[$key]['sum'] = $Currency->format($vat['sum']);
}
if (is_numeric($this->calculations['sum'])) {
foreach ($vatArray as $key => $vat) {
$vatArray[$key]['sum'] = $Currency->format($vat['sum']);
}
$this->calculations['sum'] = $Currency->format($this->calculations['sum']);
$this->calculations['subSum'] = $Currency->format($this->calculations['subSum']);
$this->calculations['sum'] = $Currency->format($this->calculations['sum']);
$this->calculations['subSum'] = $Currency->format($this->calculations['subSum']);
// Fallback for older unique article lists
if (!isset($this->calculations['grandSubSum'])) {
$this->calculations['grandSubSum'] = $this->calculations['sum'];
}
// Fallback for older unique article lists
if (!isset($this->calculations['grandSubSum'])) {
$this->calculations['grandSubSum'] = $this->calculations['sum'];
}
$this->calculations['grandSubSum'] = $Currency->format($this->calculations['grandSubSum']);
$this->calculations['nettoSum'] = $Currency->format($this->calculations['nettoSum']);
$this->calculations['nettoSubSum'] = $Currency->format($this->calculations['nettoSubSum']);
$this->calculations['grandSubSum'] = $Currency->format($this->calculations['grandSubSum']);
$this->calculations['nettoSum'] = $Currency->format($this->calculations['nettoSum']);
$this->calculations['nettoSubSum'] = $Currency->format($this->calculations['nettoSubSum']);
}
$articles = [];
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren