From e29fe25d8aa6ec7239f7771775cafdfd49cb1707 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Fri, 3 Jul 2020 07:44:43 +0000
Subject: - Bugfix: Problem beim Import von Varianten behoben - Bugfix:
 Deinstallation von Produkten löscht abhängigkeiten (Produktartikelwerte,
 Varianten)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7754 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 .../mod_micropayment_paywindow/gfx/bank2pay.png    | Bin 7310 -> 0 bytes
 .../mod_micropayment_paywindow/gfx/call2pay.png    | Bin 7265 -> 2314 bytes
 views/mods/mod_micropayment_paywindow/gfx/chip.png | Bin 5996 -> 0 bytes
 .../mod_micropayment_paywindow/gfx/creditcard.png  | Bin 8798 -> 2501 bytes
 .../mod_micropayment_paywindow/gfx/directdebit.png | Bin 7554 -> 0 bytes
 .../mod_micropayment_paywindow/gfx/handypay.png    | Bin 7874 -> 2819 bytes
 .../mod_micropayment_paywindow/gfx/prepayment.png  | Bin 8602 -> 0 bytes
 .../mod_micropayment_paywindow/order_done.phtml    | 152 ++++-----------------
 .../mod_micropayment_paywindow/settings_edit.phtml |   6 +-
 9 files changed, 29 insertions(+), 129 deletions(-)
 delete mode 100644 views/mods/mod_micropayment_paywindow/gfx/bank2pay.png
 delete mode 100644 views/mods/mod_micropayment_paywindow/gfx/chip.png
 delete mode 100644 views/mods/mod_micropayment_paywindow/gfx/directdebit.png
 delete mode 100644 views/mods/mod_micropayment_paywindow/gfx/prepayment.png

(limited to 'views/mods/mod_micropayment_paywindow')

diff --git a/views/mods/mod_micropayment_paywindow/gfx/bank2pay.png b/views/mods/mod_micropayment_paywindow/gfx/bank2pay.png
deleted file mode 100644
index 097f834..0000000
Binary files a/views/mods/mod_micropayment_paywindow/gfx/bank2pay.png and /dev/null differ
diff --git a/views/mods/mod_micropayment_paywindow/gfx/call2pay.png b/views/mods/mod_micropayment_paywindow/gfx/call2pay.png
index 7e2ba85..029f62d 100644
Binary files a/views/mods/mod_micropayment_paywindow/gfx/call2pay.png 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
deleted file mode 100644
index 38e656f..0000000
Binary files a/views/mods/mod_micropayment_paywindow/gfx/chip.png and /dev/null differ
diff --git a/views/mods/mod_micropayment_paywindow/gfx/creditcard.png b/views/mods/mod_micropayment_paywindow/gfx/creditcard.png
index 5ebac0c..3e45603 100644
Binary files a/views/mods/mod_micropayment_paywindow/gfx/creditcard.png 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
deleted file mode 100644
index 9951453..0000000
Binary files a/views/mods/mod_micropayment_paywindow/gfx/directdebit.png and /dev/null differ
diff --git a/views/mods/mod_micropayment_paywindow/gfx/handypay.png b/views/mods/mod_micropayment_paywindow/gfx/handypay.png
index 8dcd83f..cd3a71b 100644
Binary files a/views/mods/mod_micropayment_paywindow/gfx/handypay.png and b/views/mods/mod_micropayment_paywindow/gfx/handypay.png differ
diff --git a/views/mods/mod_micropayment_paywindow/gfx/prepayment.png b/views/mods/mod_micropayment_paywindow/gfx/prepayment.png
deleted file mode 100644
index 2668837..0000000
Binary files a/views/mods/mod_micropayment_paywindow/gfx/prepayment.png and /dev/null differ
diff --git a/views/mods/mod_micropayment_paywindow/order_done.phtml b/views/mods/mod_micropayment_paywindow/order_done.phtml
index 89381ae..dd89b77 100644
--- a/views/mods/mod_micropayment_paywindow/order_done.phtml
+++ b/views/mods/mod_micropayment_paywindow/order_done.phtml
@@ -10,130 +10,28 @@
 
 <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
+    <?php if ($view['order_status'] === wpsg_ShopController::STATUS_ZAHLUNGAKZEPTIERT) { ?>
+
+        <p>
+
+            <?php echo wpsg_translate(__('Betrag wurde mit #1# bereits beglichen.', 'wpsg'), $view['title']); ?>
+
+        </p>
+
+    <?php } else { ?>
+
+        <p>
+
+            <?php echo __('Klicken Sie auf folgendes Banner um Ihre Bestellung zu bezahlen.', 'wpsg'); ?>
+
+            <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>
+
+        </p>
+
+    <?php } ?>
+
+</div>
\ 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
index 3af2e6c..edf01d8 100644
--- a/views/mods/mod_micropayment_paywindow/settings_edit.phtml
+++ b/views/mods/mod_micropayment_paywindow/settings_edit.phtml
@@ -9,7 +9,9 @@
 ?>
 <?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_notification_url', __('Benachrichtigungs-URL', 'wpsg'), $view['notification_url'], ['readonly' => true]); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_paywindow_notification_password', __('Benachrichtigungs-Kennwort (notification_password)', 'wpsg'), $view['notification_password'], ['readonly' => true]); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_paywindow_page_error', __('Fehlerseite', 'wpsg'), $view['arPages'], $this->get_option('wpsg_mod_micropayment_paywindow_page_error'), array('help' => 'wpsg_mod_micropayment_paywindow_page_error')); ?>
 <?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')); ?>
@@ -18,7 +20,7 @@
 
 <?php foreach ($view['arPaymentWindow'] as $pw_key => $pw) { ?>
 
-    <?php echo wpsg_drawForm_AdminboxStart($pw['title'], $pw_key); ?>
+    <?php echo wpsg_drawForm_AdminboxStart($pw['title'], $pw_key, ['collapsable' => true, 'collapsed' => (($this->get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_activ') === '1')?false:true)]); ?>
 
         <?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'), [
-- 
cgit v1.2.3