From b4a1a6cc077efcd625b51e05888ee9d6a44e8635 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Mon, 15 Aug 2022 11:44:09 +0000
Subject: - Rechnungen Sammel

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8071 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_rechnungen/multi_invoice_pdf.phtml | 30 ++++++-----------------
 1 file changed, 7 insertions(+), 23 deletions(-)

(limited to 'views')

diff --git a/views/mods/mod_rechnungen/multi_invoice_pdf.phtml b/views/mods/mod_rechnungen/multi_invoice_pdf.phtml
index c1a6c7a..a5b3958 100644
--- a/views/mods/mod_rechnungen/multi_invoice_pdf.phtml
+++ b/views/mods/mod_rechnungen/multi_invoice_pdf.phtml
@@ -191,16 +191,7 @@
     $rhead_count = 1;
     $sum_multi_offset = 0;
     $orders = $this->view['multi_data']['orders']; 
-
-    $sum_topay_brutto = 0;
-    $sum_topay_netto = 0;
-    $sum_productsum_brutto = 0;
-    $sum_productsum_netto = 0;
-    $sum_shipping_brutto = 0;
-    $sum_shipping_netto = 0;
-    $sum_payment_brutto = 0;
-    $sum_payment_netto = 0;
-    	
+     	
 	// moMwSt
 	$bNoTax = false;
 	
@@ -724,7 +715,7 @@
 		$pdf->Text($prod_left, $prod_top + $offset + 10, __("Es ergibt sich folgender Gesamtbetrag", "wpsg").':');
 		$pdf->Text($prod_left + 80, $prod_top + $offset, __("Summe", "wpsg"));
 		$pdf->setXY($prod_left + 140, $prod_top + $offset - 5);
-		$pdf->Cell(37, 8, wpsg_ff($sum_productsum_brutto + $arCalculation['sum']['preis_rabatt'], $this->get_option('wpsg_currency')), 0, 0, 'R');
+		$pdf->Cell(37, 8, wpsg_ff($arCalculation['sum']['brutto'], $this->get_option('wpsg_currency')), 0, 0, 'R');
 		
 		$offset += 5;
 		
@@ -790,9 +781,11 @@
 		$pdf->Cell(37, 8, wpsg_ff($arCalculation['sum']['brutto'], $this->get_option('wpsg_currency')), 0, 0, 'R');
 		$pdf->setFont('Arial', '', '9');
 
-        foreach ($orders as $oCoupons){
+		foreach ($this->view['multi_data']['order_data'] as $order_data) {
+        
+			$arCalculationOrder = $order_data['arCalculation'];
 
-            foreach ($arCalculation['coupon'] as $c) {
+            foreach ($arCalculationOrder['coupon'] as $c) {
                 
                 $offset += 5;
                 $pdf->Text($prod_left + 80, $prod_top + $offset + 10, __('Wertgutschein', 'wpsg').' '.((wpsg_isSizedString($c['code']))?'('.$c['code'].')':''));
@@ -872,12 +865,6 @@
 		
 	$offset += 5;
 		
-	if (!file_exists($this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($data['id'])))) {
-		
-		mkdir($this->callMod('wpsg_mod_rechnungen', 'getFilePath', array($data['id'])), 0777, true);
-		
-	}
-		
 	$filename = $this->view['filename'].".pdf";
 	 
 	if ($this->view['preview']) {
@@ -889,10 +876,7 @@
 		
 	} else {
 		
-		$pdf->Output($this->callMod('wpsg_mod_rechnungen', 'getFilePath', array('multi')).$filename, 'F');
-		
-		// Hier wird der Dateiname an FPD übergeben. Er soll sich aus der Rechnungsnummer ergeben, auch wenn das Dokument über die ID gespeichert ist.
-		if ($this->view['output'] === true) $pdf->Output($this->view['filename_out'], 'I');
+		$pdf->Output($this->view['file_path'], 'F');
 		
 	}
  
\ No newline at end of file
-- 
cgit v1.2.3