Bestellungen OK, Versand- und Zahlungsarten teilweise,

wspg_editable geändert in wpsg_editable

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5934 0d5edaf7-2b12-4e95-93f4-047927463d4b

2 files changed, 24 insertions, 15 deletions

diff --git a/views/mods/mod_rechnungen/foottext_list.phtml b/views/mods/mod_rechnungen/foottext_list.phtml
index 44ba902..90dea61 100644
--- a/views/mods/mod_rechnungen/foottext_list.phtml
+++ b/views/mods/mod_rechnungen/foottext_list.phtml
@@ -28,7 +28,7 @@
 

 				jQuery(document).ready(function() {

  

-					jQuery('#wpsg_foottext_0_<?php echo $key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_rechnungen&do=inlinedit&noheader=1', {

+					jQuery('#wpsg_foottext_0_<?php echo $key; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_rechnungen&do=inlinedit&noheader=1', {

 						submitdata: { 

 				    		field: '0',

 				    		field_id: '<?php echo $key; ?>'

@@ -39,7 +39,7 @@
 				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'

 					});	

 	

-					jQuery('#wpsg_foottext_1_<?php echo $key; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_rechnungen&do=inlinedit&noheader=1', {

+					jQuery('#wpsg_foottext_1_<?php echo $key; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_rechnungen&do=inlinedit&noheader=1', {

 						submitdata: { 

 				    		field: '1',

 				    		field_id: '<?php echo $key; ?>'

diff --git a/views/mods/mod_rechnungen/rechnung_pdf.phtml b/views/mods/mod_rechnungen/rechnung_pdf.phtml
index 31fe336..25cbfdb 100644
--- a/views/mods/mod_rechnungen/rechnung_pdf.phtml
+++ b/views/mods/mod_rechnungen/rechnung_pdf.phtml
@@ -18,7 +18,7 @@
 	$adress_left 				= 25;	

 	$adress_top					= 55;

 	

-	// Positionierund des Rechnungskopfes

+	// Positionierung des Rechnungskopfes

 	$rdata_left					= 25;

 	$rdata_top					= 90;

 	

@@ -47,31 +47,31 @@
 			

 			$pdf->AddPage();

 			

-			if (file_exists($shop->callMod('wpsg_mod_rechnungen', getFilePath, array(''))."wpsg_rechnungen_bp.pdf"))

+			if (file_exists($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.pdf"))

 			{

 				

-				$pagecount = $pdf->setSourceFile($shop->callMod('wpsg_mod_rechnungen', getFilePath, array(''))."wpsg_rechnungen_bp.pdf"); 

+				$pagecount = $pdf->setSourceFile($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.pdf"); 

 				$tplidx = $pdf->importPage(1, '/MediaBox'); 

 				$pdf->useTemplate($tplidx, 0, 0, 210); 

 				

 			}

-			if (file_exists($shop->callMod('wpsg_mod_rechnungen', getFilePath, array(''))."wpsg_rechnungen_bp.jpg"))

+			if (file_exists($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.jpg"))

 			{

-				$pdf->image($shop->callMod('wpsg_mod_rechnungen', getFilePath, array(''))."wpsg_rechnungen_bp.jpg", 0, 0, 210, 297, 'jpg');

+				$pdf->image($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_bp.jpg", 0, 0, 210, 297, 'jpg');

 			}

 			

 			

-			if (file_exists($shop->callMod('wpsg_mod_rechnungen', getFilePath, array(''))."wpsg_rechnungen_logo.jpg"))

+			if (file_exists($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_logo.jpg"))

 			{

 	

-				list($width, $height, $type, $attr) = getimagesize($shop->callMod('wpsg_mod_rechnungen', getFilePath, array(''))."wpsg_rechnungen_logo.jpg");

+				list($width, $height, $type, $attr) = getimagesize($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_logo.jpg");

 				

 				//wpsg_debug($width.":".$height);

 				

 				$wPix = (25.4 * $width) / 96;

 				$hPix = (25.4 * $height) / 96;  

 				

-				$pdf->image($shop->callMod('wpsg_mod_rechnungen', getFilePath, array(''))."wpsg_rechnungen_logo.jpg", 210 - $wPix, 0, $wPix, $hPix);

+				$pdf->image($shop->callMod('wpsg_mod_rechnungen', 'getFilePath', array(''))."wpsg_rechnungen_logo.jpg", 210 - $wPix, 0, $wPix, $hPix);

 				

 			}

 			

@@ -79,13 +79,13 @@
 			$pdf->SetFont('Arial', '', 6);

 			$pdf->Text($absender_left, $absender_top, $shop->replaceUniversalPlatzhalter(__($shop->get_option("wpsg_rechnungen_adresszeile"), 'wpsg'), $shop->view['data']['id']));	

 			

-			if ($shop->view['kunde']['kuerzel'] != "") $shop->view['kunde']['kuerzel'] = $shop->view['kunde']['kuerzel'].'-';

+			if (wpsg_getStr($shop->view['kunde']['kuerzel']) != "") $shop->view['kunde']['kuerzel'] = $shop->view['kunde']['kuerzel'].'-';

 			

 			// Adresse des Kunden

 			$pdf->SetFont('Arial', '', 12);			

 			$pdf->Text($adress_left, $adress_top, $shop->view['kunde']['firma']);

 			$pdf->Text($adress_left, $adress_top + 5, $shop->view['kunde']['vname'].' '.$shop->view['kunde']['name']);

-			$pdf->Text($adress_left, $adress_top + 10, $shop->view['kunde']['strasse'].' '.$shop->view['kunde']['hausnr']);

+			$pdf->Text($adress_left, $adress_top + 10, $shop->view['kunde']['strasse'].' '.wpsg_getStr($shop->view['kunde']['hausnr']));

 			$pdf->Text($adress_left, $adress_top + 15, $shop->view['kunde']['plz'].' '.$shop->view['kunde']['ort']);

 			$pdf->Text($adress_left, $adress_top + 20, strtoupper($shop->view['oOrder']->getInvoiceCountryName()));			

 			

@@ -285,7 +285,16 @@
 		$pdf->setXY($prod_left + 112, $prod_top + $offset);

 		$pdf->Cell(15, 8, $p['menge'], 0, 0, 'C');

 						

-		$preis = $p['preis'];

+		if (wpsg_ShopController::get_option('wpsg_preisangaben') == WPSG_NETTO)

+		{

+			$preis = $p['preis_netto'];

+			

+			//TODO

+		}

+		else

+		{

+			$preis = $p['preis_brutto'];

+		}

 		

 		$pdf->setXY($prod_left + 127, $prod_top + $offset);

 		$pdf->Cell(25, 8, wpsg_ff($preis, $this->get_option('wpsg_currency')), 0, 0, 'R');

@@ -404,7 +413,7 @@
 	} // produkte

  

 	// Gutschein

-	if (isset($this->view['basket']['gs']))

+	if ((isset($this->view['basket']['gs'])) && ($this->view['basket']['gs_value'] > 0))

 	{

 		

 		$pdf->SetFont('Arial', '', 9);

@@ -639,7 +648,7 @@
 	}

 		 	 

 	// Gebühr

-	if (wpsg_tf($this->view['storno_fee']) > 0)

+	if (wpsg_tf(wpsg_getStr($this->view['storno_fee'])) > 0)

 	{

 		

 		$pdf->SetFont('Arial', '', 9);