diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/mods/mod_paypalapi/basket_inner_prebutton.phtml | 49 | ||||
| -rw-r--r-- | views/mods/mod_paypalapi/paypalplus.phtml | 6 | ||||
| -rw-r--r-- | views/mods/mod_paypalapi/settings_edit.phtml | 12 | ||||
| -rw-r--r-- | views/warenkorb/basket.phtml | 6 |
4 files changed, 60 insertions, 13 deletions
diff --git a/views/mods/mod_paypalapi/basket_inner_prebutton.phtml b/views/mods/mod_paypalapi/basket_inner_prebutton.phtml index 223eaa3..8c576ba 100644 --- a/views/mods/mod_paypalapi/basket_inner_prebutton.phtml +++ b/views/mods/mod_paypalapi/basket_inner_prebutton.phtml @@ -7,10 +7,45 @@ ?>
<?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_paypalapi_paypalexpress'))) { ?>
-<div class="wpsg_mod_paypalapi_button_wrap">
- <button type="submit" name="wpsg_mod_submit" value="wpsg_mod_paypalapi" class="wpsg_mod_paypalapi_button">
- <img src="<?php echo $this->getRessourceURL('mods/mod_paypalapi/gfx/checkout-logo-small-de.png'); ?>" alt="<?php echo __('Direkt zu PayPal', 'wpsg'); ?>" />
- </button>
- <div class="wpsg_clear"></div>
-</div>
-<?php } ?>
\ No newline at end of file +
+ <div class="wpsg_mod_paypalapi_button_wrap">
+ <button type="submit" name="wpsg_mod_submit" value="wpsg_mod_paypalapi" class="wpsg_mod_paypalapi_button">
+ <img src="<?php echo $this->getRessourceURL('mods/mod_paypalapi/gfx/checkout-logo-small-de.png'); ?>" alt="<?php echo __('Direkt zu PayPal', 'wpsg'); ?>" />
+ </button>
+ <div class="wpsg_clear"></div>
+ </div>
+
+<?php } ?>
+
+<?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_paypalapi_plus_basket'))) { ?>
+
+ <h2><?php echo __('Zahlungsart wählen', 'wpsg'); ?></h2>
+
+ <script src="https://www.paypalobjects.com/webstatic/ppplus/ppplus.min.js" type="text/javascript"></script>
+ <div id="wpsg_ppplus" style="padding-right:0px;"></div>
+
+ <script type="application/javascript">
+
+ /**
+ * Wird vom PayPal PLUS IFrame aufgerufen wenn fertig geladen
+ */
+ function wpsg_mod_paypalapi_load()
+ {
+
+ jQuery('#wpsg_basket_submit').on('click', function(event) {
+
+ PAYPAL.apps.PPP.doCheckout();
+
+ event.stopPropagation();
+
+ return false;
+
+ } );
+
+ }
+
+ <?php $this->render(WPSG_PATH_VIEW.'/mods/mod_paypalapi/paypalplus.phtml'); ?>
+
+ </script>
+
+<?php } ?>
diff --git a/views/mods/mod_paypalapi/paypalplus.phtml b/views/mods/mod_paypalapi/paypalplus.phtml index e275410..d95f1b3 100644 --- a/views/mods/mod_paypalapi/paypalplus.phtml +++ b/views/mods/mod_paypalapi/paypalplus.phtml @@ -7,7 +7,7 @@ // https://www.paypalobjects.com/webstatic/de_DE/downloads/PayPal-PLUS-IntegrationGuide.pdf
?>
-
+
var ppp = PAYPAL.apps.PPP({
"approvalUrl": "<?php echo $this->view['wpsg_mod_paypalapi']['approval_url']; ?>",
"language": "de_DE",
@@ -31,8 +31,8 @@ <?php if ($this->view['wpsg_order_done'] !== true) { ?>
"onLoad": function() { if (typeof wpsg_mod_paypalapi_load == 'function') wpsg_mod_paypalapi_load(); },
"buttonLocation": "outside",
- "disableContinue": "wpsg_checkout2button",
- "enableContinue": "wpsg_checkout2button",
+ "disableContinue": "<?php echo $this->view['wpsg_mod_paypalapi']['disableContinue']; ?>",
+ "enableContinue": "<?php echo $this->view['wpsg_mod_paypalapi']['enableContinue']; ?>",
<?php if (wpsg_isSizedArray($this->view['wpsg_mod_paypalapi']['ThirdPartyPayment'])) { ?>
"thirdPartyPaymentMethods": <?php echo json_encode($this->view['wpsg_mod_paypalapi']['ThirdPartyPayment']); ?>,
<?php } ?>
diff --git a/views/mods/mod_paypalapi/settings_edit.phtml b/views/mods/mod_paypalapi/settings_edit.phtml index a88ba8e..7d6678a 100644 --- a/views/mods/mod_paypalapi/settings_edit.phtml +++ b/views/mods/mod_paypalapi/settings_edit.phtml @@ -58,6 +58,11 @@ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_aktiv', __('PayPal für neue Bestellungen erlauben', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_aktiv'), array('help' => 'wpsg_shippay_activ')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_plus_aktiv', __('PayPal Plus aktivieren', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_plus_aktiv'), array('help' => 'wpsg_mod_paypalapi_plus_aktiv')); ?>
+
+<div class="wpsg_mod_paypalapi_plus_aktiv_layer wpsg_mod_paypalapi_plus_aktiv_layer_1">
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_plus_basket', __('Zahlungsauswahl im Warenkorb', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_plus_basket'), array('help' => 'wpsg_mod_paypalapi_plus_basket')); ?>
+</div>
+
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_paypalexpress', __('PayPal Express aktivieren (Button im Warenkorb)', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_paypalexpress'), array('help' => 'wpsg_mod_paypalapi_paypalexpress')); ?>
<div class="wpsg_mod_paypalapi_plus_aktiv">
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_paypalexpress_forceSSL', __('SSL für ReturnURL erzwingen', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_paypalexpress_forceSSL'), array('help' => 'wpsg_mod_paypalapi_paypalexpress_forceSSL')); ?>
@@ -97,6 +102,13 @@ jQuery(document).ready(function() {
+ jQuery('#wpsg_mod_paypalapi_plus_aktiv').on('change', function() {
+
+ jQuery('.wpsg_mod_paypalapi_plus_aktiv_layer').hide();
+ jQuery('.wpsg_mod_paypalapi_plus_aktiv_layer_' + jQuery(this).val()).show();
+
+ } ).change();
+
jQuery('#wpsg_mod_paypalapi_webhook_log').bind('change', function() {
jQuery('.layer_wpsg_mod_paypalapi_webhook_log').hide();
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml index 8e2d194..da77205 100644 --- a/views/warenkorb/basket.phtml +++ b/views/warenkorb/basket.phtml @@ -355,7 +355,7 @@ <br />
<div class="wpsg_spacer"></div>
-
+
<?php $this->callMods('basket_inner_prebutton', array(&$this->view)); ?>
</div>
@@ -365,7 +365,7 @@ <input type="submit" class="wpsg_button wpsg_refreshbutton" value="<?php echo __('aktualisieren', 'wpsg'); ?>" name="wpsg_basket_refresh" />
<?php if ($this->hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1)) { ?>
<?php } else { ?>
- <input type="submit" class="wpsg_button wpsg_checkoutbutton" value="<?php echo __('zur Kasse', 'wpsg'); ?>" name="wpsg_checkout" />
+ <input type="submit" class="wpsg_button wpsg_checkoutbutton" id="wpsg_basket_submit" value="<?php echo __('zur Kasse', 'wpsg'); ?>" name="wpsg_checkout" />
<br /><br />
@@ -381,7 +381,7 @@ <br />
<?php $this->callMods('basket_after', array(&$this->view)); ?>
-
+
<?php } else { ?>
<p><?php echo __('Keine Produkte im Warenkorb.', 'wpsg'); ?></p>
<?php } ?>
|