Subversion Repositories wpShopGermany4

Rev

Rev 8243 | Rev 8280 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8243 Rev 8274
Line 197... Line 197...
197 
	else if (!$bNoTax) $bTaxCol = true;
 197 
	else if (!$bNoTax) $bTaxCol = true;
198 
 
 198 
 
199
199
200 
	if ($bNoTax) {
 200 
	if ($bNoTax) {
201 
 
 201 
 
202 
		$discount_value = $this->view['basket']['arCalculation']['sum']['discount_netto'];
 202 
		$discount_value = abs($this->view['basket']['arCalculation']['sum']['discount_netto']);
203 
		$shipping_cost = $this->view['basket']['arCalculation']['sum']['shipping_netto'];
 203 
		$shipping_cost = $this->view['basket']['arCalculation']['sum']['shipping_netto'];
204 
		$payment_cost = $this->view['basket']['arCalculation']['sum']['payment_netto'];
 204 
		$payment_cost = $this->view['basket']['arCalculation']['sum']['payment_netto'];
205 
 
 205 
 
206 
	} else {
 206 
	} else {
207 
 
 207 
 
208 
		$discount_value = $this->view['basket']['arCalculation']['sum']['discount_brutto'];
 208 
		$discount_value = abs($this->view['basket']['arCalculation']['sum']['discount_brutto']);
209 
		$shipping_cost = $this->view['basket']['arCalculation']['sum']['shipping_brutto'];
 209 
		$shipping_cost = $this->view['basket']['arCalculation']['sum']['shipping_brutto'];
210 
		$payment_cost = $this->view['basket']['arCalculation']['sum']['payment_brutto'];
 210 
		$payment_cost = $this->view['basket']['arCalculation']['sum']['payment_brutto'];
211 
 
 211 
 
212 
	}
 212 
	}
213 
 
 213 
 
Line 449... Line 449...
449
449
450 
		}
 450 
		}
451
451
452 
	} // produkte
 452 
	} // produkte
453
453
454 
	if (wpsg_isSizedArray($this->view['basket']['arCalculation']['voucher'])) {
 454 
	if (wpsg_isSizedArray($this->view['basket']['arCalculation']['voucher']))
- 
 
 455 
	{
455
456
456 
		foreach ($this->view['basket']['arCalculation']['voucher'] as $v) {
 457 
		foreach ($this->view['basket']['arCalculation']['voucher'] as $v) {
457 
 
 458 
 
458 
			$pdf->SetFont('Arial', '', 9);
 459 
			$pdf->SetFont('Arial', '', 9);
459 
			$pdf->setXY($prod_left, $prod_top + $offset);
 460 
			$pdf->setXY($prod_left, $prod_top + $offset);
Line 489... Line 490...
489 
		}
 490 
		}
490
491
491 
	}
 492 
	}
492 
 
 493 
 
493 
	// Versandkosten
 494 
	// Versandkosten
494 
	if ( ($shipping_cost != '') && ($shipping_cost != 0) )
 495 
	if ( ($shipping_cost != '') && ($shipping_cost != 0) )
495 
	{
 496 
	{
496
497
497 
		$pdf->SetFont('Arial', '', 9);
 498 
		$pdf->SetFont('Arial', '', 9);
498 
		$pdf->setXY($prod_left, $prod_top + $offset);
 499 
		$pdf->setXY($prod_left, $prod_top + $offset);
499 
		$pdf->Cell(10, 8, $pnr.'.', 1, 0, 'C'); $pnr ++;
 500 
		$pdf->Cell(10, 8, $pnr.'.', 1, 0, 'C'); $pnr ++;
Line 740... Line 741...
740 
	}
 741 
	}
741
742
742 
	// Rabatt
 743 
	// Rabatt
743 
	if ($discount_value > 0)
 744 
	if ($discount_value > 0)
744 
	{
 745 
	{
745
746 
 
746 
		$offset += 5;
 747 
		$offset += 5;
747 
		$pdf->Text($prod_left + 80, $prod_top + $offset, __("Rabatt", "wpsg"));
 748 
		$pdf->Text($prod_left + 80, $prod_top + $offset, __("Rabatt", "wpsg"));
748 
		$pdf->setXY($prod_left + 140, $prod_top + $offset - 5);
 749 
		$pdf->setXY($prod_left + 140, $prod_top + $offset - 5);
749 
		$pdf->Cell(37, 8, '-'.wpsg_ff($discount_value, $this->get_option('wpsg_currency')), 0, 0, 'R');
 750 
		$pdf->Cell(37, 8, '-'.wpsg_ff($discount_value, $this->get_option('wpsg_currency')), 0, 0, 'R');
750
751