From b033f59a025890899130de7d80cbb31b70c41bc8 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Fri, 5 Aug 2022 14:23:13 +0000
Subject: - Rabatt/Gutscheine in Teilrechnungen

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8065 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_rechnungen/invoice_pdf.phtml   | 15 +++++++--------
 views/order/backendEdit/editPayShipping.phtml | 10 +++++-----
 views/order/view_orderdata.phtml              | 10 ++++++++++
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml
index ffbba40..9f08aac 100644
--- a/views/mods/mod_rechnungen/invoice_pdf.phtml
+++ b/views/mods/mod_rechnungen/invoice_pdf.phtml
@@ -310,26 +310,25 @@
 		
 		//$height += 3 + 5 + $pdf->getY() - $height_y;
 		//$pdf->Cell((($this->arMwSt == "-1")?102:87), 8, $produkt_text, 0, 0, 'L');
-		
+		 
 		if (sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1') {
 			
 			$pdf->setXY($prod_left + 97, $prod_top + $offset);
 			$pdf->Cell(15, 8, (($this->view['basket']['noMwSt'] == '1')?'0.00 %':wpsg_ff($p['mwst_value'], '%')), 0, 0, 'C');
-			
+
 		}
 		
 		$pdf->setXY($prod_left + 112, $prod_top + $offset);
 		$pdf->Cell(15, 8, $p['menge'], 0, 0, 'C');
 		
-		if (wpsg_ShopController::get_option('wpsg_preisangaben') == WPSG_NETTO)
-		{
+		if (wpsg_ShopController::get_option('wpsg_preisangaben') == WPSG_NETTO) {
+			
 			$preis = $p['preis_netto'];
 			
-			//TODO
-		}
-		else
-		{
+		} else {
+			
 			$preis = $p['preis_brutto'];
+			
 		}
 		
 		$pdf->setXY($prod_left + 127, $prod_top + $offset);
diff --git a/views/order/backendEdit/editPayShipping.phtml b/views/order/backendEdit/editPayShipping.phtml
index 04392cc..06dafc5 100644
--- a/views/order/backendEdit/editPayShipping.phtml
+++ b/views/order/backendEdit/editPayShipping.phtml
@@ -34,15 +34,15 @@
     
     if ($this->getBackendTaxview() === WPSG_BRUTTO) {
         
-    	$price_shipping = wpsg_ff(wpsg_getInt($arCalculation['shipping'][0]['brutto_single']), $this->get_option('wpsg_currency'));
-		$price_payment = wpsg_ff(wpsg_getInt($arCalculation['payment'][0]['brutto_single']), $this->get_option('wpsg_currency'));
+    	$price_shipping = wpsg_ff($arCalculation['shipping'][0]['brutto_calculated_single']??0, $this->get_option('wpsg_currency'));
+		$price_payment = wpsg_ff($arCalculation['payment'][0]['brutto_single_calculated']??0, $this->get_option('wpsg_currency'));
     	         
         $price_suffix = ' ('.__('Brutto', 'wpsg').')';
         
     } else {
 	
-		$price_shipping = wpsg_ff(wpsg_getInt($arCalculation['shipping'][0]['netto_single']), $this->get_option('wpsg_currency'));
-		$price_payment = wpsg_ff(wpsg_getInt($arCalculation['payment'][0]['netto_single']), $this->get_option('wpsg_currency'));
+		$price_shipping = wpsg_ff($arCalculation['shipping'][0]['netto_calculated_single']??0, $this->get_option('wpsg_currency'));
+		$price_payment = wpsg_ff($arCalculation['payment'][0]['netto_calculated_single']??0, $this->get_option('wpsg_currency'));
 
         $price_suffix = ' ('.__('Netto', 'wpsg').')';
         
@@ -51,7 +51,7 @@
 ?>
 
 <div id="editPayShipping">
-    
+    <?php wpsg_debug($price_shipping); ?>
     <?php echo wpsg_drawForm_Select('edit_shipping_type', __('Versandart', 'wpsg'), $arShippingSelect,$this->view['data']['type_shipping']); ?>
     <?php echo wpsg_drawForm_Input('edit_shipping_price', __('Kosten', 'wpsg').$price_suffix, $price_shipping);  ?> 
     
diff --git a/views/order/view_orderdata.phtml b/views/order/view_orderdata.phtml
index d40ce6a..851175f 100644
--- a/views/order/view_orderdata.phtml
+++ b/views/order/view_orderdata.phtml
@@ -8,7 +8,17 @@
          
 ?>
 <div id="wpsg_produkte_table">
+    
+    <?php
 
+        // $oCalculation = new \wpsg\wpsg_calculation();
+        // $oCalculation->fromDB(525);        
+        // $oCalculation->addProduct($_REQUEST['add_price'], $this->shop->getBackendTaxview(), $oProduct->mwst_key, $_REQUEST['add_amount'], $product_key, $product_index, $order_product_id, $eu);        
+        // wpsg_debug($oCalculation->getCalculationArray()['product']);        
+        // die();
+        
+    ?>
+    
 	<?php echo wpsg_drawForm_AdminboxStart(__('Bestelldaten', 'wpsg')); ?>
     
 	<div id="wpsg_product_table_wrap">
-- 
cgit v1.2.3