Projekt

Allgemein

Profil

GX-Bug #59743 » staffelpreise_currency_fix.patch

Moritz Bunjes, 25.10.2018 18:28

Unterschiede anzeigen:

src/includes/classes/product.php (date 1540484528000)
711 711
					if($vpe)
712 712
					{
713 713
						$staffel_data[$i] = array('QUANTITY' => $quantity_output,
714
							'VPE' => trim($xtPrice->xtcFormat($vpe, true, $this->data['products_tax_class_id']) . TXT_PER . xtc_get_vpe_name($this->data['products_vpe'])),
715
							'PRICE' => $xtPrice->xtcFormat($staffel[$i]['price'] - $staffel[$i]['price'] / 100 * $discount, true, $this->data['products_tax_class_id']),
714
							'VPE' => trim($xtPrice->xtcFormat($vpe, true, $this->data['products_tax_class_id'], true) . TXT_PER . xtc_get_vpe_name($this->data['products_vpe'])),
715
							'PRICE' => $xtPrice->xtcFormat($staffel[$i]['price'] - $staffel[$i]['price'] / 100 * $discount, true, $this->data['products_tax_class_id'], true),
716 716
							'UNIT' => $this->data['unit_name']);
717 717
					}
718 718
					else
719 719
					{
720 720
						$staffel_data[$i] = array('QUANTITY' => $quantity_output,
721 721
							'VPE' => $vpe,
722
							'PRICE' => $xtPrice->xtcFormat($staffel[$i]['price'] - $staffel[$i]['price'] / 100 * $discount, true, $this->data['products_tax_class_id']),
722
							'PRICE' => $xtPrice->xtcFormat($staffel[$i]['price'] - $staffel[$i]['price'] / 100 * $discount, true, $this->data['products_tax_class_id'], true),
723 723
							'UNIT' => $this->data['unit_name']);
724 724
					}
725 725
				}
src/includes/classes/xtcPrice.php (date 1540484381000)
839 839
				$t_tax_rate = 0;
840 840
			}
841 841

  
842
			$t_price = $this->xtcAddTax($t_price, $t_tax_rate);
842
			$t_price = $this->xtcAddTax($t_price, $t_tax_rate, !$p_calculate_currency);
843 843
		}
844 844

  
845 845
		if($p_format)
    (1-1/1)