From 753c1978e84e829538f5c0b4f2f45267fcaf8341 Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Fri, 18 Nov 2016 06:58:34 +0000
Subject: Shop V4 Anpassungen Backend (Gutschein, Rabatt, Zahlungsart)

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5922 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 .../mod_creditcard/order_view_afterpayment.phtml   | 14 +++++
 views/mods/mod_crefopay/settings_edit.phtml        | 12 +---
 views/mods/mod_paypalapi/settings_edit.phtml       | 41 ++++++-------
 views/mods/mod_targo/order_done.phtml              | 69 ++++++++++++++++------
 views/mods/mod_targo/settings_edit.phtml           |  5 ++
 5 files changed, 92 insertions(+), 49 deletions(-)
 create mode 100644 views/mods/mod_creditcard/order_view_afterpayment.phtml

(limited to 'views/mods')

diff --git a/views/mods/mod_creditcard/order_view_afterpayment.phtml b/views/mods/mod_creditcard/order_view_afterpayment.phtml
new file mode 100644
index 0000000..5670764
--- /dev/null
+++ b/views/mods/mod_creditcard/order_view_afterpayment.phtml
@@ -0,0 +1,14 @@
+<?php
+
+	/**
+	 * Das Template wird in der Bestellansicht eingebunden und zeigt die Kreditkartendaten des Kunden an, die er während der Bestellung angegeben hat
+	 */
+
+?>
+<br />
+<?php echo wpsg_drawForm_Input('', __('Typ der Kreditkarte', 'wpsg'), $this->view['wpsg_mod_creditcard']['typ'], array('text' => true, 'clear_after' => true, 'readonly' => true)); ?>
+<?php echo wpsg_drawForm_Input('', __('Inhaber der Kreditkarte', 'wpsg'), $this->view['wpsg_mod_creditcard']['inhaber'], array('text' => true, 'clear_after' => true, 'readonly' => true)); ?>
+<?php echo wpsg_drawForm_Input('', __('Kreditkarten-Nummer', 'wpsg'), $this->view['wpsg_mod_creditcard']['knr'], array('text' => true, 'clear_after' => true, 'readonly' => true)); ?>
+<?php echo wpsg_drawForm_Input('', __('Prüfziffer', 'wpsg'), $this->view['wpsg_mod_creditcard']['pruefz'], array('text' => true, 'clear_after' => true, 'readonly' => true)); ?>
+<?php echo wpsg_drawForm_Input('', __('Gültig bis', 'wpsg'), $this->view['wpsg_mod_creditcard']['gueltigm'].'/'.$this->view['wpsg_mod_creditcard']['gueltigj'], array('text' => true, 'clear_after' => true, 'readonly' => true)); ?>
+
diff --git a/views/mods/mod_crefopay/settings_edit.phtml b/views/mods/mod_crefopay/settings_edit.phtml
index 39bc4a2..3d0f8ba 100644
--- a/views/mods/mod_crefopay/settings_edit.phtml
+++ b/views/mods/mod_crefopay/settings_edit.phtml
@@ -23,15 +23,9 @@
 
 <?php echo wpsg_drawForm_Input('wpsg_mod_crefopay_frameheight', __('Höhe des IFrames in px', 'wpsg'), $this->get_option('wpsg_mod_crefopay_frameheight'), array('help' => 'wpsg_mod_crefopay_frameheight')); ?>
 
-<div class="wpsg_form_field ">
-	<div class="wpsg_form_left">
-		<label for=""><?php echo __('MNS Statuswechsel', 'wpsg'); ?>:</label>
-	</div>
-	<div class="wpsg_form_right">
-		<a href="#" class="wpsg_mod_crefopay_switchstatemapping" onclick="return wpsg_mod_crefopay_mnsstatemapping();"><?php echo __('Bearbeiten', 'wpsg'); ?></a>						
-	</div>
-	<div class="wpsg_clear"></div>
-</div>
+<?php echo wpsg_drawForm_Link('wpsg_mod_crefopay_link', __('MNS Statuswechsel', 'wpsg'), 
+		__('Bearbeiten', 'wpsg'), array('class' => 'wpsg_mod_crefopay_switchstatemapping')); ?>
+
 <div class="wpsg_mod_crefopay_mnsstatemapping">
 	<?php foreach ($this->view['transactionMapping'] as $crefopay_status => $wpsg_status) { ?>
 	<?php echo wpsg_drawForm_Select('wpsg_mod_crefopay_statemapping_'.$crefopay_status, __($wpsg_status[1], 'wpsg'), wpsg_array_merge(array('-1' => __('Kein Wechsel', 'wpsg')), $this->arStatus), $this->get_option('wpsg_mod_crefopay_statemapping_'.$crefopay_status)); ?>	
diff --git a/views/mods/mod_paypalapi/settings_edit.phtml b/views/mods/mod_paypalapi/settings_edit.phtml
index 24a0cf0..9eface5 100644
--- a/views/mods/mod_paypalapi/settings_edit.phtml
+++ b/views/mods/mod_paypalapi/settings_edit.phtml
@@ -40,19 +40,14 @@
 
 <br />
 
-<div class="wpsg_form_field ">
-	<div class="wpsg_form_left">
-		<label for=""><?php echo __('Stornierung bei Statuswechsel', 'wpsg'); ?>:</label>
-	</div>
-	<div class="wpsg_form_right">
-		<a href="#" class="wpsg_mod_paypalapi_stornostate"><?php echo __('Bearbeiten', 'wpsg'); ?></a>
-	</div>
-	<div class="wpsg_clear"></div>
-</div>
+<?php echo wpsg_drawForm_Link('wpsg_mod_paypalapi_link', __('Stornierung bei Statuswechsel', 'wpsg'), 
+		__('Bearbeiten', 'wpsg'), array('help' => 'wpsg_mod_paypalapi_link', 'class' => 'wpsg_mod_paypalapi_stornostate')); ?>
+
+
 <div class="wpsg_mod_paypalapi_stornostate_layer" style="display:none;">
 	
 	<?php foreach ($this->arStatus as $status_id => $status_label) { $arStornoStatus = (array)$this->get_option('wpsg_mod_paypalapi_stornostate'); ?>
-	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_stornostate['.$status_id.']', __($status_label, 'wpsg'), $arStornoStatus[$status_id], array('labelright' => true)); ?>	
+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_stornostate['.$status_id.']', __($status_label, 'wpsg'), wpsg_getInt($arStornoStatus[$status_id]), array('labelright' => true)); ?>	
 	<?php } ?> 
 	
 	<br />
@@ -130,19 +125,19 @@
 		jQuery('#wpsg_mod_paypalapi_plus_aktiv').bind('change', function() {
 
 			if (jQuery(this).is(':checked'))
--            {
--                
--                jQuery('.wpsg_mod_paypalapi_plus_aktiv').show();
--                jQuery('.wpsg_mod_paypalapi_plus_inaktiv').hide();
--                
--            }
--			else 
--            {
--             
--                jQuery('.wpsg_mod_paypalapi_plus_aktiv').hide();
--                jQuery('.wpsg_mod_paypalapi_plus_inaktiv').show();
--                
--            }
+            {
+                
+                jQuery('.wpsg_mod_paypalapi_plus_aktiv').show();
+                jQuery('.wpsg_mod_paypalapi_plus_inaktiv').hide();
+                
+            }
+			else 
+            {
+             
+                jQuery('.wpsg_mod_paypalapi_plus_aktiv').hide();
+                jQuery('.wpsg_mod_paypalapi_plus_inaktiv').show();
+                
+            }
 			
 		} ).change();
 		
diff --git a/views/mods/mod_targo/order_done.phtml b/views/mods/mod_targo/order_done.phtml
index 67bcc27..c0b3faf 100644
--- a/views/mods/mod_targo/order_done.phtml
+++ b/views/mods/mod_targo/order_done.phtml
@@ -14,15 +14,21 @@
 	}
 ?>
 
-<p><?php echo __('Um den Betrag mit Targo zu bezahlen klicken Sie bitte auf folgendes Logo.', 'wpsg'); ?></p> 
+<p><?php echo __('Um den Betrag mit einer Finanzierung bei der TARGOBANK zu bezahlen, klicken Sie bitte auf folgendes Logo.', 'wpsg'); ?></p> 
 <p>
+<!--
 	<a title="<?php echo __('Mit Targo bezahlen', 'wpsg'); ?>" href="<?php echo $url; ?>">
-		<img src="<?php echo $this->getRessourceURL('gfx/targologo.png'); ?>" align="left" alt="<?php echo __('Mit Targo bezahlen', 'wpsg'); ?>" style="margin-right:7px;">
+		<img src="<?php echo $this->getRessourceURL('gfx/targologo.png'); ?>" align="left" alt="<?php echo __('Finanzierung bei Targo beantragen.', 'wpsg'); ?>" style="margin-right:7px;">
 	 
 	</a>
+-->
 </p>
 
-<form hidden class="wpsg_productform" id="wpsg_produktform" method="post" action="<?php echo $url ?>">
+<form class="wpsg_productform" id="wpsg_produktform" method="post" action="<?php echo $url ?>">
+
+<input type="image" name="image" src="<?php echo $this->getRessourceURL('gfx/targologo.png'); ?>" alt="<?php echo __('Finanzierung bei Targo beantragen.', 'wpsg'); ?>" style="margin-right:7px;">
+
+<div style="display:none;">
 <?php $o_id = $this->view['o_id'];
 	  $k_id = $this->view['k_id'];
 	  $oOrder = wpsg_order::getInstance($o_id);
@@ -45,10 +51,14 @@
 	  $street = $oOrder-> getInvoiceStreetClear(true);
 	  $nr = $oOrder-> getInvoiceStreetNr();
 	  
-	   
 ?>
 <?php ?>
-<?php ?>
+<?php 
+function toIso($string) {
+	return mb_convert_encoding($string, "ISO-8859-1");
+}
+
+?>
 
 <br /><br />
 <b>Obligatorische Daten für Targobank</b><br />
@@ -61,26 +71,50 @@
 
 
 <b>Optionale Daten für Targobank</b><br />
-<input type="text" id="dealerShopURL" name="dealerShopURL" value="" placeholder="dealerShopURL"><br />
-<input type="text" id="dealerAbortURL" name="dealerAbortURL" value="" placeholder="dealerAbortURL"><br />
+<input type="text" id="dealerShopURL" name="dealerShopURL" value="<?php echo $this->get_option('wpsg_mod_targo_dealerShopURL');?>" placeholder="dealerShopURL"><br />
+<input type="text" id="dealerAbortURL" name="dealerAbortURL" value="<?php echo $this->get_option('wpsg_mod_targo_dealerAbortURL');?>" placeholder="dealerAbortURL"><br />
 <input type="text" id="hash" name="hash" value="" placeholder="hash">(hashkey)<br />
 <input type="text" id="" name="" value="" placeholder=""><br />
 
 
 <b>Adressdaten aus Kundendaten</b><br />
-<input type="text" id="surname" name="surname" value="<?php echo $oCustomer->getName();?>" placeholder="surname"><br />
-<input type="text" id="firstname" name="firstname" value="<?php echo $oCustomer->getFirstname();?>" placeholder="firstname"><br />
-<input type="text" id="street" name="street" value="<?php echo $oOrder->getInvoiceStreetClear(true);?>" placeholder="street"><br />
-<input type="text" id="streetnumber" name="streetnumber" value="<?php echo $oOrder->getInvoiceStreetNr();?>" placeholder="streetnumber"><br />
-<input type="text" id="zip" name="zip" value="<?php echo $oCustomer->getZip();?>" placeholder="zip"><br />
-<input type="text" id="city" name="city" value="<?php echo $oCustomer->getCity();?>" placeholder="city"><br />
+<?php
+$titel = $oCustomer->getTitle();
+$isotitel = '';
+if (($titel == "Herr") || ($titel == "Frau")) $isotitel = toIso($titel);
+?>
+<input type="text" id="surname" name="gender" value="<?php echo $isotitel;?>" placeholder="titel"><br />
+<input type="text" id="surname" name="surname" value="<?php echo toIso($oCustomer->getName());?>" placeholder="surname"><br />
+<input type="text" id="firstname" name="firstname" value="<?php echo toIso($oCustomer->getFirstname());?>" placeholder="firstname"><br />
+<input type="text" id="street" name="street" value="<?php echo toIso($oOrder->getInvoiceStreetClear(true));?>" placeholder="street"><br />
+<input type="text" id="streetnumber" name="streetnumber" value="<?php echo toIso($oOrder->getInvoiceStreetNr());?>" placeholder="streetnumber"><br />
+<input type="text" id="zip" name="zip" value="<?php echo toIso($oCustomer->getZip());?>" placeholder="zip"><br />
+<input type="text" id="city" name="city" value="<?php echo toIso($oCustomer->getCity());?>" placeholder="city"><br />
 <input type="text" id="telnocode" name="telnocode" value="" placeholder="vorwahl"><br />
-<input type="text" id="telno" name="telno" value="<?php echo $oCustomer->getPhone();?>" placeholder="telno"><br />
-<input type="text" id="birthday" name="birthday" value="<?php echo $oCustomer->getBirthdate("Y-m-d");?>" placeholder="birthday"><br />
-<input type="text" id="email" name="email" value="<?php echo $oCustomer->getEMail();?>"  placeholder="email"><br />
+<input type="text" id="telno" name="telno" value="<?php echo toIso($oCustomer->getPhone());?>" placeholder="telno"><br />
+<input type="text" id="birthday" name="birthday" value="<?php 
+	
+	$dt = $oCustomer->getBirthdate("Y-m-d");
+	
+	if ($oCustomer->geb == '0000-00-00' || strtotime($dt) === false)
+	{
+		
+		echo '';
+		
+	}
+	else
+	{
+		
+		echo $oCustomer->getBirthdate("Y-m-d");
+		
+	}
+
+?>" placeholder="birthday"><br />
+<input type="text" id="email" name="email" value="<?php echo toIso($oCustomer->getEMail());?>"  placeholder="email"><br />
 
 <input type="submit" id="submit" name="submit" value="submit" >
 
+</div>
 </form>
 
 
@@ -89,7 +123,8 @@
  
 	jQuery(document).ready(function() { 
 		window.setTimeout(function() {
-			location.href = "<?php echo $url;?>";
+			//location.href = "<?php echo $url;?>";
+			jQuery('#submit').trigger("click");
 		}, 1000);
 	} );
 	
diff --git a/views/mods/mod_targo/settings_edit.phtml b/views/mods/mod_targo/settings_edit.phtml
index 412850b..c1e915e 100644
--- a/views/mods/mod_targo/settings_edit.phtml
+++ b/views/mods/mod_targo/settings_edit.phtml
@@ -31,6 +31,11 @@
 
 <br />
 
+<?php echo wpsg_drawForm_Input('wpsg_mod_targo_dealerShopURL', __('Targo-Dealer-Shop-URL', 'wpsg'), $this->get_option('wpsg_mod_targo_dealerShopURL'), array('help' => 'wpsg_mod_targo_dealerShopURL')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_targo_dealerAbortURL', __('Targo-Dealer-Abort-URL', 'wpsg'), $this->get_option('wpsg_mod_targo_dealerAbortURL'), array('help' => 'wpsg_mod_targo_dealerAbortURL')); ?>
+
+<br />
+
 <?php echo wpsg_drawForm_Input('wpsg_mod_targo_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_targo_gebuehr'), true), array('help' => 'wpsg_shippay_gebuehr', 'unit' => $this->get_option('wpsg_currency').' / %')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_targo_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_targo_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_targo_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_targo_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>
-- 
cgit v1.2.3