Skip to content
Code-Schnipsel Gruppen Projekte

fix(ArticleListUnique): no longer format already formatted totals

Zusammengeführt Henning Leutz schlägt vor, next-3.x in main zu mergen.
1 Datei
+ 14
12
Änderungen vergleichen
  • Nebeneinander
  • In der Reihe
@@ -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 = [];