From fdfe75e0f8777b4c2bb81af19fd0e31fe59bf29b Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Thu, 2 Jul 2020 08:04:18 +0000
Subject: #4.2.5 - Feature: Gutenberg Block zur Produktanzeige - Bugfix:
 Bestellen ohne Kundenverwaltung führt nicht mehr zum Fehler (Bug durch 4.2.4)
 - Bugfix: Lieferschein: Warnungen entfernt - Bugfix: Lieferschein: Vorschau
 beachtet nun wieder die Produktauswahl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7753 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_deliverynote/deliverynote_pdf.phtml |   3 +-
 .../mod_micropayment_paywindow/gfx/bank2pay.png    | Bin 0 -> 7310 bytes
 .../mod_micropayment_paywindow/gfx/call2pay.png    | Bin 0 -> 7265 bytes
 views/mods/mod_micropayment_paywindow/gfx/chip.png | Bin 0 -> 5996 bytes
 .../mod_micropayment_paywindow/gfx/creditcard.png  | Bin 0 -> 8798 bytes
 .../mod_micropayment_paywindow/gfx/directdebit.png | Bin 0 -> 7554 bytes
 .../mod_micropayment_paywindow/gfx/handypay.png    | Bin 0 -> 7874 bytes
 .../mod_micropayment_paywindow/gfx/logo_100x25.png | Bin 0 -> 2888 bytes
 .../mod_micropayment_paywindow/gfx/prepayment.png  | Bin 0 -> 8602 bytes
 .../mod_micropayment_paywindow/order_done.phtml    | 139 +++++++++++++++++++++
 .../mod_micropayment_paywindow/settings_edit.phtml |  36 ++++++
 11 files changed, 176 insertions(+), 2 deletions(-)
 create mode 100644 views/mods/mod_micropayment_paywindow/gfx/bank2pay.png
 create mode 100644 views/mods/mod_micropayment_paywindow/gfx/call2pay.png
 create mode 100644 views/mods/mod_micropayment_paywindow/gfx/chip.png
 create mode 100644 views/mods/mod_micropayment_paywindow/gfx/creditcard.png
 create mode 100644 views/mods/mod_micropayment_paywindow/gfx/directdebit.png
 create mode 100644 views/mods/mod_micropayment_paywindow/gfx/handypay.png
 create mode 100644 views/mods/mod_micropayment_paywindow/gfx/logo_100x25.png
 create mode 100644 views/mods/mod_micropayment_paywindow/gfx/prepayment.png
 create mode 100644 views/mods/mod_micropayment_paywindow/order_done.phtml
 create mode 100644 views/mods/mod_micropayment_paywindow/settings_edit.phtml

(limited to 'views/mods')

diff --git a/views/mods/mod_deliverynote/deliverynote_pdf.phtml b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
index 8fda0d2..ed038c0 100644
--- a/views/mods/mod_deliverynote/deliverynote_pdf.phtml
+++ b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
@@ -390,8 +390,7 @@
 	
 		$pdf->Output($this->callMod('wpsg_mod_deliverynote', 'getFilePath', array($this->view['order']['id'])).$this->view['filename'], 'F');
 	
-		if ($this->view['output'] === true) $pdf->Output($filename, 'I');
+		if (wpsg_isTrue($this->view['output'])) $pdf->Output($filename, 'I');
 			
 	}
 	
-?>
\ No newline at end of file
diff --git a/views/mods/mod_micropayment_paywindow/gfx/bank2pay.png b/views/mods/mod_micropayment_paywindow/gfx/bank2pay.png
new file mode 100644
index 0000000..097f834
Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/bank2pay.png differ
diff --git a/views/mods/mod_micropayment_paywindow/gfx/call2pay.png b/views/mods/mod_micropayment_paywindow/gfx/call2pay.png
new file mode 100644
index 0000000..7e2ba85
Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/call2pay.png differ
diff --git a/views/mods/mod_micropayment_paywindow/gfx/chip.png b/views/mods/mod_micropayment_paywindow/gfx/chip.png
new file mode 100644
index 0000000..38e656f
Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/chip.png differ
diff --git a/views/mods/mod_micropayment_paywindow/gfx/creditcard.png b/views/mods/mod_micropayment_paywindow/gfx/creditcard.png
new file mode 100644
index 0000000..5ebac0c
Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/creditcard.png differ
diff --git a/views/mods/mod_micropayment_paywindow/gfx/directdebit.png b/views/mods/mod_micropayment_paywindow/gfx/directdebit.png
new file mode 100644
index 0000000..9951453
Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/directdebit.png differ
diff --git a/views/mods/mod_micropayment_paywindow/gfx/handypay.png b/views/mods/mod_micropayment_paywindow/gfx/handypay.png
new file mode 100644
index 0000000..8dcd83f
Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/handypay.png differ
diff --git a/views/mods/mod_micropayment_paywindow/gfx/logo_100x25.png b/views/mods/mod_micropayment_paywindow/gfx/logo_100x25.png
new file mode 100644
index 0000000..2e06ab9
Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/logo_100x25.png differ
diff --git a/views/mods/mod_micropayment_paywindow/gfx/prepayment.png b/views/mods/mod_micropayment_paywindow/gfx/prepayment.png
new file mode 100644
index 0000000..2668837
Binary files /dev/null and b/views/mods/mod_micropayment_paywindow/gfx/prepayment.png differ
diff --git a/views/mods/mod_micropayment_paywindow/order_done.phtml b/views/mods/mod_micropayment_paywindow/order_done.phtml
new file mode 100644
index 0000000..89381ae
--- /dev/null
+++ b/views/mods/mod_micropayment_paywindow/order_done.phtml
@@ -0,0 +1,139 @@
+<?php
+
+	/**
+	 * Template welches den Zahlungsdienstleister nach Bestellabschluss einbindet
+	 */
+
+	$view = $this->view['wpsg_mod_micropayment_paywindow'];
+
+?>
+
+<div class="wpsg_mod_micropayment_paywindow_order_done">
+
+    <p>
+        <?php echo __('Klicken Sie auf folgendes Banner um Ihre Bestellung zu bezahlen.', 'wpsg'); ?>
+    </p>
+
+    <br />
+
+    <a href="<?php echo $view['url']; ?>" title="<?php echo __('Hier Ihre Bestellung bezahlen.', 'wpsg'); ?>">
+        <img src="<?php echo $view['logo']; ?>" alt="<?php echo $view['title']; ?>" />
+    </a>
+
+</div>
+
+<?php /* if (wpsg_isSizedString($this->view['wpsg_mod_micropayment']['payLink'])) { ?>
+<?php echo __('Klicken Sie auf das folgende Logo um ihre Bestellung zu bezahlen.', 'wpsg'); ?>
+<br /><br />
+
+<a href="<?php echo $this->view['wpsg_mod_micropayment']['payLink']; ?>"><img src="<?php echo $this->view['wpsg_mod_micropayment']['logo']; ?>" alt="<?php echo $this->view['wpsg_mod_micropayment']['title']; ?>" /></a>
+
+	<?php if ($this->get_option('wpsg_mod_micropayment_paystart') == '1') { ?>
+	<script type="text/javascript">
+	 
+		jQuery(document).ready(function() { 
+			window.setTimeout(function() {
+	    	location.href = "<?php echo $this->view['wpsg_mod_micropayment']['payLink']; ?>";
+			}, 1000);
+		} );
+		
+	</script>
+	<?php } ?>
+
+<?php } else { ?>
+
+<p><?php echo __('Bitte geben Sie ihre Kreditkarteninformationen (Kartennummer, Gültigkeitsdatum und Prüfnummer) in folgende Felder ein. Die Daten werden an Micropayment übermittelt und nicht durch uns gespeichert oder ausgewertet.', 'wpsg'); ?></p>
+
+<form method="post" id="wpsg_mod_micropayment_creditcard">
+
+	<div class="micropayment_card">
+		<div class="front card">
+			<div class="chip"></div>
+			<div class="number"><input placeholder="<?php echo __('Kreditkartennummer', 'wpsg'); ?>" type="text" name="number" /></div>
+			<div class="bankname"><?php echo __('Kreditkarte - Vorderseite', 'wpsg'); ?></div>
+			<div class="name"><?php echo __('Max Mustermann', 'wpsg'); ?></div>
+			<div class="validthrough"><?php echo __('Gültig bis', 'wpsg'); ?>:</div>
+			<div class="valid">
+				<select name="expiryMonth">
+					<?php for ($i = 1; $i <= 12; $i ++) { ?>
+					<option value="<?php echo $i; ?>"><?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>
+					<?php } ?>		
+				</select>
+				<span>/</span>
+				<select name="expiryYear">
+					<?php for ($i = date('Y'); $i <= date('Y') + 10; $i ++) { ?>
+					<option value="<?php echo $i; ?>"><?php echo $i; ?></option>
+					<?php } ?>
+				</select>						
+			</div>			
+		</div>	
+		
+		<div class="back card">
+			<div class="bankname"><?php echo __('Kreditkarte - Rückseite', 'wpsg'); ?></div>
+			<div class="blackmagnetic"></div>
+			<div class="number"><?php echo __('HC600214C', 'wpsg'); ?></div>
+			<div class="signature"><?php echo __('Unterschrift Max Mustermann', 'wpsg'); ?></div>
+			<div class="sign"><input type="text" name="cvc2" value="" placeholder="<?php echo __('Prüfnummer', 'wpsg'); ?>" /></div>
+		</div>
+		
+		<input type="button" id="wpsg_mod_micropayment_pay_button" class="wpsg_button" value="<?php echo __('Zahlung starten', 'wpsg'); ?>" />
+		
+	</div>
+
+</form>
+
+<script type="text/javascript">
+
+	jQuery(document).ready(function() {
+
+		jQuery('#wpsg_mod_micropayment_pay_button').bind('click', function() {
+			
+			var form_data = jQuery('#wpsg_mod_micropayment_creditcard').serialize();
+			
+			jQuery('.micropayment_card input, .micropayment_card select').prop('disabled', true);
+			
+			jQuery.ajax( {
+				url: wpsg_ajax.ajaxurl,
+				data: {
+					action: 'ajax',
+					wpsg_plugin: 'wpsg_mod_micropayment',
+					module_action: 'pay', 
+					form_data: form_data,
+					order_id: <?php echo $this->view['o_id']; ?>
+				},
+				success: function(data) {
+
+					if (data === "1")
+					{
+
+						alert('<?php echo __('Vielen Dank für Ihre Zahlungsreservierung.', 'wpsg'); ?>');
+						location.href = '<?php echo get_permalink($this->get_option('wpsg_mod_micropayment_successPage')); ?>';
+						
+					}
+					else
+					{
+
+						alert(data);
+
+					}
+
+					jQuery('.micropayment_card input, .micropayment_card select').prop('disabled', false);
+						
+				},
+				error: function(rdata, data)
+				{
+					
+					alert("<?php echo __('Unerwarteter Serverfehler!', 'wpsg'); ?>");
+					
+				}
+			} );
+			
+			return false;
+			
+		} );
+		
+	} );
+
+</script>
+
+<?php } */ ?>
\ No newline at end of file
diff --git a/views/mods/mod_micropayment_paywindow/settings_edit.phtml b/views/mods/mod_micropayment_paywindow/settings_edit.phtml
new file mode 100644
index 0000000..3af2e6c
--- /dev/null
+++ b/views/mods/mod_micropayment_paywindow/settings_edit.phtml
@@ -0,0 +1,36 @@
+<?php
+
+	/**
+	 * Template für die Einstellungen für das Micropayment Modul
+	 */
+
+	$view = $this->view['wpsg_mod_micropayment_paywindow'];
+
+?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_paywindow_accesskey', __('AccessKey', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_accesskey'), array('help' => 'wpsg_mod_micropayment_paywindow_accesskey')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_paywindow_projectid', __('Project', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_projectid'), array('help' => 'wpsg_mod_micropayment_paywindow_projectid')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_paywindow_notificationurl', __('Benachrichtigungs-URL', 'wpsg'), $view['notificationurl'], ['readonly' => true]); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_paywindow_paytitle', __('Titel der Zahlung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_paytitle'), ['placeholder' => $view['default_pay_title'], 'hint' => __('Maximal 150 Zeichen', 'wpsg')]); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_paywindow_paytext', __('Titel der Zahlung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_paytext'), ['placeholder' => $view['default_pay_text'], 'hint' => __('Maximal 250 Zeichen', 'wpsg')]); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_paywindow_sandbox', __('Testmodus', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_sandbox')); ?>
+
+<br />
+
+<?php foreach ($view['arPaymentWindow'] as $pw_key => $pw) { ?>
+
+    <?php echo wpsg_drawForm_AdminboxStart($pw['title'], $pw_key); ?>
+
+        <?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_paywindow_'.$pw_key.'_activ', __('Zahlungsart aktiv', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_activ'), []); ?>
+        <?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_paywindow_'.$pw_key.'_title', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_title'), [
+            'help' => 'wpsg_mod_micropayment_paywindow_name',
+            'placeholder' => __($pw['title'], 'wpsg')
+        ]); ?>
+        <?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_paywindow_'.$pw_key.'_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_hint'), array('help' => 'wpsg_mod_micropayment_paywindow_hint')); ?>
+        <?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_paywindow_'.$pw_key.'_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_logo'), array('help' => 'wpsg_mod_micropayment_paywindow_logo')); ?>
+        <?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_paywindow_'.$pw_key.'_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_mod_micropayment_paywindow_gebuehr')); ?>
+        <?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_paywindow_'.$pw_key.'_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_mwst'), array('help' => 'wpsg_mod_micropayment_paywindow_mwst')); ?>
+    <?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_paywindow_'.$pw_key.'_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_mwstland'), array('help' => 'wpsg_mod_micropayment_paywindow_mwstland')); ?>
+
+    <?php echo wpsg_drawForm_AdminboxEnd(); ?>
+
+<?php } ?>
-- 
cgit v1.2.3