diff options
| author | Daniel Schmitzer <noreply@maennchen1.de> | 2020-10-19 13:00:52 +0000 |
|---|---|---|
| committer | Daniel Schmitzer <noreply@maennchen1.de> | 2020-10-19 13:00:52 +0000 |
| commit | ff9d7b7273b5c17449a09cd63d691eba17e2efd2 (patch) | |
| tree | 0dd8b50204d7007076c0aa82ee6c4e3439666475 | |
| parent | ee3ca1819f5b3df048f1d7342094b7f43cfeada7 (diff) | |
- Feature: Erinnerungsmail bei Unvollständigen Bestellungen
- Amazon V2 Commit
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7787 0d5edaf7-2b12-4e95-93f4-047927463d4b
36 files changed, 570 insertions, 50 deletions
diff --git a/views/admin/emailconf.phtml b/views/admin/emailconf.phtml index f9644a6..8aade00 100644 --- a/views/admin/emailconf.phtml +++ b/views/admin/emailconf.phtml @@ -134,6 +134,15 @@ __('Statusänderung (Kunde)', 'wpsg'),
__('Diese Mail bekommt der Kunde bei der Änderung des Bestellstatus.', 'wpsg')); ?>
+ <?php echo wpsg_drawEMailConfig(
+ 'reminder',
+ __('Erinnerung bei Nichtabschluss', 'wpsg'),
+ __('Diese Mail bekommen Kunden die eine Bestellung nicht abgeschlossen haben.', 'wpsg'),
+ false,
+ false,
+ 'mailtemplates/reminder.phtml'
+ ); ?>
+
<?php $this->callMods('admin_emailconf'); ?>
<div class="wpsg_hinweis"><?php echo __('Klicken Sie auf die jeweilige Mail um die Einstellungen angezeigt zu bekommen bzw. zu ändern.', 'wpsg'); ?></div>
diff --git a/views/admin/extended.phtml b/views/admin/extended.phtml index bb46ba1..02427c1 100644 --- a/views/admin/extended.phtml +++ b/views/admin/extended.phtml @@ -50,6 +50,7 @@ <?php echo wpsg_drawForm_Checkbox('wpsg_autolineending', __('MAC Kompatibilität bei Dateiimporten', 'wpsg'), $this->get_option('wpsg_autolineending'), array('help' => 'wpsg_autolineending')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_dontcopymedia', __('Produktbilder nicht kopieren', 'wpsg'), $this->get_option('wpsg_dontcopymedia'), ['help' => 'wpsg_dontcopymedia']); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_switchtolowestshippingafterproductremove', __('Nach dem entfernen eines Produktes auf die günstigste Zahlungsart wechseln', 'wpsg'), $this->get_option('wpsg_switchtolowestshippingafterproductremove'), ['help' => 'wpsg_switchtolowestshippingafterproductremove']); ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_save_order_after_mail', __('Unvollständige Bestellung nach Eingabe einer E-Mail Adresse speichern', 'wpsg'), $this->get_option('wpsg_save_order_after_mail'), ['help' => 'wpsg_save_order_after_mail']); ?>
<?php echo wpsg_drawForm_Select('wpsg_geo_determination', __('Abfrage des Kundenstandortes (EU-Leistungsortregel)', 'wpsg'), $this->view['arGeoMode'], $this->get_option('wpsg_geo_determination'), array('help' => 'wpsg_geo_determination')); ?>
</div>
diff --git a/views/admin/form/emailconf.phtml b/views/admin/form/emailconf.phtml index 98fd45c..c8c0791 100644 --- a/views/admin/form/emailconf.phtml +++ b/views/admin/form/emailconf.phtml @@ -10,7 +10,14 @@ <?php echo wpsg_drawForm_Input('wpsg_'.$this->view['field_key'].'_cc', __('CC', 'wpsg'), $this->get_option('wpsg_'.$this->view['field_key'].'_cc')); ?>
<?php echo wpsg_drawForm_Input('wpsg_'.$this->view['field_key'].'_bcc', __('BCC', 'wpsg'), $this->get_option('wpsg_'.$this->view['field_key'].'_bcc')); ?>
-
+
+ <?php if ($this->view['field_key'] === 'reminder') { ?>
+
+ <?php echo wpsg_drawForm_Input('wpsg_reminder_hours', __('Automatischer Versand nach Bestellerstellung in Stunden', 'wpsg'), $this->get_option('wpsg_reminder_hours')); ?>
+ <?php echo wpsg_drawForm_Input(false, __('CRON URL', 'wpsg'), site_url().'/?wpsg_cron=1', ['readonly' => true]); ?>
+
+ <?php } ?>
+
<div class="form-group form-group-sm">
<label class="col-sm-6 control-label">
@@ -58,7 +65,17 @@ ?>
<br />
- <?php echo __('* Der restliche E-Mailtext kann nur im Mailtemplate verändert werden', 'wpsg'); ?>
+ <?php echo __('* Der restliche E-Mailtext kann nur im Mailtemplate verändert werden', 'wpsg'); ?>
+ <br />
+
+ <?php if (wpsg_isSizedString($this->view['strTemplate'])) { ?>
+
+ <br />
+
+ <strong><?php echo __('Template', 'wpsg'); ?>: </strong><?php echo $this->view['strTemplate']; ?>
+
+ <?php } ?>
+
<?php if (wpsg_isSizedString($notice)) { ?>
<br />
diff --git a/views/admin/wpml.phtml b/views/admin/wpml.phtml index 9ab858e..e1fb45d 100644 --- a/views/admin/wpml.phtml +++ b/views/admin/wpml.phtml @@ -1,7 +1,7 @@ <?php
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 01.06.2017
* Time: 13:53
*/
diff --git a/views/mailtemplates/html/reminder.phtml b/views/mailtemplates/html/reminder.phtml new file mode 100644 index 0000000..25caafd --- /dev/null +++ b/views/mailtemplates/html/reminder.phtml @@ -0,0 +1,38 @@ +<?php
+
+ declare(strict_types=1);
+
+ /**
+ * Template für die Erinnerung bei Kaufabbrüchen (HTML)
+ * User: Daschmi
+ * Date: 19.10.2020
+ * Time: 14:20
+ */
+
+ namespace Wpsg;
+
+ /** @var \wpsg_order $oOrder */
+ $oOrder = $this->view['oOrder'];
+
+ /** @var \wpsg_customer $oCustomer */
+ $oCustomer = $oOrder->getCustomer();
+
+ /** @var \wpsg_ShopController $oShop */
+ $oShop = $this;
+
+?>
+
+<p>Hallo <?php echo ltrim($oCustomer->getTitle().' '.$oCustomer->getFirstname().' '.$oCustomer->getName()); ?>,</p>
+
+<p><?php echo __('Sie hatten folgende Artikel in Ihrem Warenkorb:', 'wpsg'); ?></p>
+
+<ul>
+<?php foreach ($oOrder->getOrderProducts() as $oOrderProduct) { ?>
+ <li><a href="<?php echo $oShop->getProduktLink($oOrderProduct->getProductKey()); ?>"><?php echo $oOrderProduct->getProductName(); ?></a></li>
+<?php } ?>
+</ul>
+
+<p><?php echo __('Gab es technische Schwierigkeiten oder sind Sie sich vielleicht noch nicht ganz sicher?', 'wpsg'); ?></p>
+
+<p><?php echo __('Lassen Sie es uns wissen - wir beraten und helfen gern.', 'wpsg'); ?></p>
+
\ No newline at end of file diff --git a/views/mailtemplates/reminder.phtml b/views/mailtemplates/reminder.phtml new file mode 100644 index 0000000..8870f6a --- /dev/null +++ b/views/mailtemplates/reminder.phtml @@ -0,0 +1,35 @@ +<?php
+
+ declare(strict_types=1);
+
+ /**
+ * Template für die Erinnerung bei Kaufabbrüchen (TXT)
+ * User: Daschmi
+ * Date: 19.10.2020
+ * Time: 14:19
+ */
+
+ namespace Wpsg;
+
+ /** @var \wpsg_order $oOrder */
+ $oOrder = $this->view['oOrder'];
+
+ /** @var \wpsg_customer $oCustomer */
+ $oCustomer = $oOrder->getCustomer();
+
+ /** @var \wpsg_ShopController $oShop */
+ $oShop = $this;
+
+?>Hallo <?php echo ltrim($oCustomer->getTitle().' '.$oCustomer->getFirstname().' '.$oCustomer->getName()); ?>,
+
+<?php echo __('Sie hatten folgende Artikel in Ihrem Warenkorb:', 'wpsg'); ?>
+
+<?php foreach ($oOrder->getOrderProducts() as $oOrderProduct) { ?>
+<?php echo $oOrderProduct->getProductName(); ?> [<?php echo $oShop->getProduktLink($oOrderProduct->getProductKey()); ?>]
+<?php } ?>
+
+
+<?php echo __('Gab es technische Schwierigkeiten oder sind Sie sich vielleicht noch nicht ganz sicher?', 'wpsg'); ?>
+
+<?php echo __('Lassen Sie es uns wissen - wir beraten und helfen gern.', 'wpsg'); ?>
+
\ No newline at end of file diff --git a/views/mods/mod_amazon_v2/basket_inner_prebutton.phtml b/views/mods/mod_amazon_v2/basket_inner_prebutton.phtml new file mode 100644 index 0000000..e65c569 --- /dev/null +++ b/views/mods/mod_amazon_v2/basket_inner_prebutton.phtml @@ -0,0 +1,44 @@ +<?php
+
+ /**
+ * Template für die Integration von "Bezahlen mit Amazon" in den Warenkorb
+ */
+
+ $view = $this->view['wpsg_mod_amazon'];
+
+ // https://amazonpaycheckoutintegrationguide.s3.amazonaws.com/amazon-pay-checkout/introduction.html
+
+?>
+
+<?php if ($this->get_option('wpsg_mod_amazon_v2_login') === '1') { ?>
+
+ <?php $this->render(WPSG_PATH_VIEW.'/mods/mod_amazon_v2/basket_inner_prebutton_widget.phtml'); ?>
+
+<?php } else { ?>
+
+ <script src="https://static-eu.payments-amazon.com/checkout.js"></script>
+
+ <div id="AmazonPayButton_wrap">
+ <div id="AmazonPayButton"></div>
+ </div>
+
+ <script>
+
+ amazon.Pay.renderButton('#AmazonPayButton', {
+ merchantId: '<?php echo $this->get_option('wpsg_mod_amazon_v2_seller_id'); ?>',
+ ledgerCurrency: 'EUR',
+ sandbox: <?php echo (($this->get_option('wpsg_mod_amazon_v2_sandbox') === '1')?'true':'false'); ?>,
+ checkoutLanguage: 'de_DE',
+ productType: 'PayAndShip',
+ placement: 'Cart',
+ buttonColor: 'Gold',
+ createCheckoutSessionConfig: {
+ payloadJSON: '<?php echo $view['payload']; ?>',
+ signature: '<?php echo $view['signature']; ?>',
+ publicKeyId: '<?php echo $this->get_option('wpsg_mod_amazon_v2_public_key_id'); ?>'
+ }
+ });
+
+ </script>
+
+<?php } ?>
diff --git a/views/mods/mod_amazon_v2/basket_inner_prebutton_widget.phtml b/views/mods/mod_amazon_v2/basket_inner_prebutton_widget.phtml new file mode 100644 index 0000000..85359cf --- /dev/null +++ b/views/mods/mod_amazon_v2/basket_inner_prebutton_widget.phtml @@ -0,0 +1,133 @@ +<?php
+
+ /**
+ *
+ */
+
+?>
+
+<script async="async" src="https://static-eu.payments-amazon.com/OffAmazonPayments/de/sandbox/lpa/js/Widgets.js"></script>
+
+<div id="AmazonLoginButton_wrap">
+ <div id="AmazonLoginButton"></div>
+</div>
+
+<div id="addressBookWidgetDiv"></div>
+<div id="walletWidgetDiv"></div>
+
+<input type="text" name="amazon[OrderReference]" id="wpsg_mod_amazon_OrderReference" value="" />
+
+<script>
+
+ window.onAmazonLoginReady = function() {
+
+ amazon.Login.setClientId('<?php echo $this->get_option('wpsg_mod_amazon_v2_store_id'); ?>');
+
+ };
+
+ window.onAmazonPaymentsReady = function() {
+
+ var authRequest;
+
+ OffAmazonPayments.Button('AmazonLoginButton', '<?php echo $this->get_option('wpsg_mod_amazon_v2_seller_id'); ?>', {
+
+ type: 'PwA',
+ color: 'Gold',
+ size: 'small',
+ language: 'de-DE',
+
+ authorization: function() {
+
+ loginOptions = {
+ scope: "profile payments:widget payments:shipping_address payments:billing_address",
+ popup: true
+ };
+
+ authRequest = amazon.Login.authorize (loginOptions, '<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_amazon_v2', 'login', [], true) ?>');
+
+ }
+ });
+
+ <?php if (isset($_SESSION['wpsg_mod_amazon_v2_access_token'])) { ?>
+
+ new OffAmazonPayments.Widgets.AddressBook({
+ sellerId: '<?php echo $this->get_option('wpsg_mod_amazon_v2_seller_id'); ?>',
+ scope: 'profile payments:widget payments:shipping_address payments:billing_address',
+ onOrderReferenceCreate: function(orderReference) {
+
+ var oID = orderReference.getAmazonOrderReferenceId();
+
+ jQuery('#wpsg_mod_amazon_OrderReference').val(oID);
+
+ },
+ onAddressSelect: function(orderReference) {
+ // Replace the following code with the action that you want
+ // to perform after the address is selected. The
+ // amazonOrderReferenceId can be used to retrieve the address
+ // details by calling the GetOrderReferenceDetails operation.
+ },
+ design: {
+ designMode: 'responsive'
+ },
+ onReady: function(orderReference) {
+ // Enter code here you want to be executed
+ // when the AddressBook widget has been rendered.
+ },
+
+ onError: function(error) {
+
+ console.log(error);
+
+ // Your error handling code.
+ // During development you can use the following
+ // code to view error messages:
+ // console.log(error.getErrorCode() + ': ' + error.getErrorMessage());
+ // See "Handling Errors" for more information.
+ }
+ }).bind("addressBookWidgetDiv");
+
+ new OffAmazonPayments.Widgets.Wallet({
+ sellerId: '<?php echo $this->get_option('wpsg_mod_amazon_v2_seller_id'); ?>',
+ onPaymentSelect: function(orderReference) {
+
+ // Replace this code with the action that you want to perform
+ // after the payment method is selected.
+
+ },
+ design: {
+ designMode: 'responsive'
+ },
+ onError: function(error) {
+ alert("Wallet: Es ist folgender Fehler aufgetreten: " + error.getErrorCode() + ' - ' + error.getErrorMessage());
+ }
+ }).bind("walletWidgetDiv");
+
+ <?php } ?>
+
+ }
+
+</script>
+
+<style>
+
+ #addressBookWidgetDiv {
+ min-width: 300px;
+ width: 100%;
+ max-width: 900px;
+ min-height: 228px;
+ height: 240px;
+ max-height: 400px;
+ margin-bottom:2rem;
+ }
+
+ #walletWidgetDiv {
+ min-width: 300px;
+ width: 100%;
+ max-width: 900px;
+ min-height: 228px;
+ height: 240px;
+ max-height: 400px;
+ margin-bottom:2rem;
+ }
+
+</style>
\ No newline at end of file diff --git a/views/mods/mod_amazon_v2/gfx/logo_100x25.png b/views/mods/mod_amazon_v2/gfx/logo_100x25.png Binary files differnew file mode 100644 index 0000000..bb16b5b --- /dev/null +++ b/views/mods/mod_amazon_v2/gfx/logo_100x25.png diff --git a/views/mods/mod_amazon_v2/order_done.phtml b/views/mods/mod_amazon_v2/order_done.phtml new file mode 100644 index 0000000..6af6f00 --- /dev/null +++ b/views/mods/mod_amazon_v2/order_done.phtml @@ -0,0 +1,68 @@ +<?php
+
+ /**
+ * Template, welches bei Bestellungen mit Amazon Pay nach der Bestellung angezeigt wird
+ */
+
+ $view = $this->view['wpsg_mod_amazon_v2'];
+
+ // https://pay.amazon.de/help/JE5KSJW4SFH2UM8
+ // https://developer.amazon.com/de/docs/eu/amazon-pay-onetime/sca-upgrade.html?ld=NSGoogle
+ // https://sellercentral.amazon.com/forums/t/what-is-the-amazonorderreferenceid/286349/2
+
+?>
+
+<?php if ($view['state'] === 'Completed') { ?>
+
+ <p><?php echo __('Bestellung wurde mit Amazon Payment bezahlt.'); ?></p>
+
+<?php } else if ($view['state'] === 'Unpayed') { ?>
+
+ <script src="https://static-eu.payments-amazon.com/checkout.js"></script>
+
+ <div id="AmazonPayButton"></div>
+
+ <script>
+
+ amazon.Pay.renderButton('#AmazonPayButton', {
+ merchantId: '<?php echo $this->get_option('wpsg_mod_amazon_v2_seller_id'); ?>',
+ ledgerCurrency: 'EUR',
+ sandbox: <?php echo (($this->get_option('wpsg_mod_amazon_v2_sandbox') === '1')?'true':'false'); ?>,
+ checkoutLanguage: 'de_DE',
+ productType: 'PayAndShip',
+ placement: 'Cart',
+ buttonColor: 'Gold',
+ createCheckoutSessionConfig: {
+ payloadJSON: '<?php echo $view['payload']; ?>',
+ signature: '<?php echo $view['signature']; ?>',
+ publicKeyId: '<?php echo $this->get_option('wpsg_mod_amazon_v2_public_key_id'); ?>'
+ }
+ });
+
+ </script>
+
+<?php } else if ($view['state'] === 'Open') { ?>
+
+ <p><?php echo __('Zahlen Sie Ihre Bestellung jetzt mit AmazonPay, indem sie auf folgenden Button klicken.', 'wpsg'); ?></p>
+
+ <?php if ($this->get_option('wpsg_mod_paypal_autostart') == '1') { ?>
+
+ <script>
+
+ jQuery(document).ready(function() {
+ window.setTimeout(function() {
+ location.href = "<?php echo $this->view['payURL']; ?>";
+ }, 1000);
+ } );
+
+ </script>
+
+ <?php } else { ?>
+
+ <a href="<?php echo $view['payURL']; ?>" title="<?php echo __('Jetzt mit AmazonPay bezahlen', 'wpsg'); ?>">
+ <img src="<?php echo $this->getRessourceURL('mods/mod_amazon_v2/gfx/logo_100x25.png'); ?>" alt="<?php echo __('Jetzt mit AmazonPay bezahlen', 'wpsg'); ?>" />
+ </a>
+
+ <?php } ?>
+
+<?php } ?>
diff --git a/views/mods/mod_amazon_v2/order_view_afterpayment.phtml b/views/mods/mod_amazon_v2/order_view_afterpayment.phtml new file mode 100644 index 0000000..940bc5c --- /dev/null +++ b/views/mods/mod_amazon_v2/order_view_afterpayment.phtml @@ -0,0 +1,75 @@ +<?php
+
+ /**
+ * Template für die Integration von AmazonPay in die Bestellverwaltung
+ */
+
+ $view = $this->view['wpsg_mod_amazon_v2'];
+
+?>
+
+ <?php if (wpsg_isSizedString($view['referenceID'])) { ?>
+ <?php echo wpsg_drawForm_Input(false, __('Amazon-Referenznummer', 'wpsg'), wpsg_getStr($view['referenceID']), ['readonly' => true]); ?>
+ <?php } ?>
+
+ <?php if (wpsg_isSizedString($view['sesion_id'])) { ?>
+ <?php echo wpsg_drawForm_Input(false, __('Session ID', 'wpsg'), wpsg_getStr($view['sesion_id']), ['readonly' => true]); ?>
+ <?php } ?>
+
+ <?php if (wpsg_isSizedString($view['chargeId'])) { ?>
+ <?php echo wpsg_drawForm_Input(false, __('Charge ID', 'wpsg'), wpsg_getStr($view['chargeId']), ['readonly' => true]); ?>
+ <?php } ?>
+
+ <?php if (wpsg_isSizedString($view['refundId'])) { ?>
+ <?php echo wpsg_drawForm_Input(false, __('Refund ID', 'wpsg'), wpsg_getStr($view['refundId']), ['readonly' => true]); ?>
+ <?php } ?>
+
+ <div class="form-group form-group-text form-group-sm">
+ <label class="col-sm-6 control-label" for=""><?php echo __('Status', 'wpsg'); ?> [<a href="<?php
+
+ echo wpsg_admin_url('Order', 'view', ['action' => 'ajax', 'mod' => 'wpsg_mod_amazon_v2', 'do' => 'update', 'edit_id' => $this->view['oOrder']->getId()], ['noheader' => '1']);
+
+ ?>"><?php echo __('Status Aktualisieren', 'wpsg'); ?></a>]</label>
+ <div class="col-sm-6">
+ <div class="wpsg_field_wrap">
+ <p class="form-control-static">
+
+ <?php echo wpsg_translate(__('#1#', 'wpsg'), $view['state']); ?>
+
+ </p>
+ </div>
+ </div>
+ </div>
+
+ <?php if (wpsg_isSizedString($view['chargeId']) && !wpsg_isSizedString($view['refundId'])) { ?>
+
+ <br />
+
+ <?php echo wpsg_drawForm_TextStart(); ?>
+
+ <a href="<?php echo wpsg_admin_url('Order', 'view', ['action' => 'ajax', 'mod' => 'wpsg_mod_amazon_v2', 'do' => 'refund', 'edit_id' => $this->view['oOrder']->getId()], ['noheader' => '1']); ?>" class="button">
+ <?php echo __('Zurückzahlen', 'wpsg'); ?>
+ </a>
+
+ <?php echo wpsg_drawForm_TextEnd(); ?>
+
+ <?php } else if (wpsg_isSizedString($view['refundId'])) { ?>
+
+ <div class="form-group form-group-text form-group-sm">
+ <label class="col-sm-6 control-label" for=""><?php echo __('Erstattungsstatus', 'wpsg'); ?> [<a href="<?php
+
+ echo wpsg_admin_url('Order', 'view', ['action' => 'ajax', 'mod' => 'wpsg_mod_amazon_v2', 'do' => 'updateRefund', 'edit_id' => $this->view['oOrder']->getId()], ['noheader' => '1']);
+
+ ?>"><?php echo __('Status Aktualisieren', 'wpsg'); ?></a>]</label>
+ <div class="col-sm-6">
+ <div class="wpsg_field_wrap">
+ <p class="form-control-static">
+
+ <?php echo wpsg_translate(__('#1#', 'wpsg'), $view['refundState']); ?>
+
+ </p>
+ </div>
+ </div>
+ </div>
+
+ <?php } ?>
diff --git a/views/mods/mod_amazon_v2/overview_button.phtml b/views/mods/mod_amazon_v2/overview_button.phtml new file mode 100644 index 0000000..8f2c96c --- /dev/null +++ b/views/mods/mod_amazon_v2/overview_button.phtml @@ -0,0 +1,47 @@ +<?php
+
+ /**
+ *
+ */
+
+?>
+
+<script async="async" src="https://static-eu.payments-amazon.com/OffAmazonPayments/de/sandbox/lpa/js/Widgets.js"></script>
+
+<div id="buy-now">JETZT kaufen</div>
+
+<script>
+
+ var sellerId = '<?php echo $this->get_option('wpsg_mod_amazon_v2_seller_id'); ?>';
+ var id = '<?php echo $_SESSION['wpsg_mod_amazon_v2_amazonCheckoutSessionId']; ?>';
+ var buyNowBtn = document.getElementById("buy-now");
+
+ buyNowBtn.addEventListener('click', function () {
+
+ OffAmazonPayments.initConfirmationFlow(sellerId, id, function(confirmationFlow) {
+
+ placeOrder(confirmationFlow);
+
+ });
+
+ });
+
+ function placeOrder(confirmationFlow) {
+
+ jQuery.ajax({
+ url: '<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_amazon_v2', 'placeOrder', [], true) ?>',
+success: function (data) {
+confirmationFlow.success(); // continue Amazon Pay hosted site
+},
+error: function (data) { // called on ajax error and timeout
+confirmationFlow.error(); // abort Amazon Pay initConfirmationFlow
+// you might want to add additional error handling
+},
+timeout: "your timeout value" //specify your timeout value (for example, 3000)
+//If the ajax request takes longer than this timeout (in ms), the error callback
+//will be called
+});
+
+ }
+
+</script>
\ No newline at end of file diff --git a/views/mods/mod_amazon_v2/settings_edit.phtml b/views/mods/mod_amazon_v2/settings_edit.phtml new file mode 100644 index 0000000..16a6dcd --- /dev/null +++ b/views/mods/mod_amazon_v2/settings_edit.phtml @@ -0,0 +1,48 @@ +<?php
+
+ /**
+ * Einstellungen des Moduls "AmazonPay"
+ */
+
+?>
+
+<?php echo wpsg_drawForm_Input('wpsg_mod_amazon_v2_seller_id', __('Händler-ID', 'wpsg'), $this->get_option('wpsg_mod_amazon_v2_seller_id'), array('help' => 'wpsg_mod_amazon_v2_seller_id')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_amazon_v2_store_id', __('Store ID', 'wpsg'), $this->get_option('wpsg_mod_amazon_v2_store_id'), []); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_amazon_v2_public_key_id', __('ID des öffentlichen Schlüsels / Public Key ID', 'wpsg'), $this->get_option('wpsg_mod_amazon_v2_public_key_id'), []); ?>
+<?php echo wpsg_drawForm_Upload('wpsg_mod_amazon_v2_private_key', __('Privater Schlüssel (.pem Datei)', 'wpsg')); ?>
+
+<br />
+
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_amazon_v2_sandbox', __('Sandbox Modus', 'wpsg'), $this->get_option('wpsg_mod_amazon_v2_sandbox'), array('help' => 'wpsg_mod_amazon_v2_sandbox')); ?>
+
+<script>
+
+ jQuery('#wpsg_mod_amazon_v2_login').on('click', function() {
+
+ if (jQuery(this).prop('checked')) {
+
+ jQuery('#wpsg_mod_amazon_v2_login_1').show();
+
+ } else {
+
+ jQuery('#wpsg_mod_amazon_v2_login_1').hide();
+
+ }
+
+ });
+
+</script>
+
+<br />
+
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_amazon_v2_aktiv', __('Zahlungsart für neue Bestellungen aktiv', 'wpsg'), $this->get_option('wpsg_mod_amazon_v2_aktiv')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_amazon_v2_name', __('Name der Zahlungsart', 'wpsg'), $this->get_option('wpsg_mod_amazon_v2_name'), array('help' => 'wpsg_mod_amazon_v2_name')); ?>
+<?php echo wpsg_drawForm_Textarea('wpsg_mod_amazon_v2_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_amazon_v2_hint'), array('help' => 'wpsg_shippay_hint')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_amazon_v2_subject', __('Betreff (Auf Abrechnungen für Verkäufer sichtbar)', 'wpsg'), $this->get_option('wpsg_mod_amazon_v2_subject'), array('help' => 'wpsg_mod_amazon_v2_subject')); ?>
+
+<br />
+
+<?php echo wpsg_drawForm_Input('wpsg_mod_amazon_v2_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_amazon_v2_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_amazon_v2_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_amazon_v2_mwst'), array('help' => 'wpsg_mod_amazon_v2_mwst')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_amazon_v2_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_amazon_v2_mwstland'), array('help' => 'wpsg_mod_amazon_v2_mwstland')); ?>
+
diff --git a/views/mods/mod_export/fields.phtml b/views/mods/mod_export/fields.phtml index 1ded334..38fe41e 100644 --- a/views/mods/mod_export/fields.phtml +++ b/views/mods/mod_export/fields.phtml @@ -1,7 +1,7 @@ <?php
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 03.11.2016
* Time: 14:12
*/
diff --git a/views/mods/mod_gutschein/basket_row_end_coupon.phtml b/views/mods/mod_gutschein/basket_row_end_coupon.phtml index 22a5455..f418f3c 100644 --- a/views/mods/mod_gutschein/basket_row_end_coupon.phtml +++ b/views/mods/mod_gutschein/basket_row_end_coupon.phtml @@ -1,7 +1,7 @@ <?php
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 20.07.2019
* Time: 15:47
*/
diff --git a/views/mods/mod_gutschein/mail_order_end.phtml b/views/mods/mod_gutschein/mail_order_end.phtml index 8289750..61f9c72 100644 --- a/views/mods/mod_gutschein/mail_order_end.phtml +++ b/views/mods/mod_gutschein/mail_order_end.phtml @@ -1,7 +1,7 @@ <?php
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 31.07.2019
* Time: 17:15
*/
diff --git a/views/mods/mod_gutschein/mail_order_end_html.phtml b/views/mods/mod_gutschein/mail_order_end_html.phtml index 6f81e70..2862c73 100644 --- a/views/mods/mod_gutschein/mail_order_end_html.phtml +++ b/views/mods/mod_gutschein/mail_order_end_html.phtml @@ -1,7 +1,7 @@ <?php
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 31.07.2019
* Time: 17:15
*/
diff --git a/views/mods/mod_gutschein/overview_row_end_coupon.phtml b/views/mods/mod_gutschein/overview_row_end_coupon.phtml index f1ec4c4..045776f 100644 --- a/views/mods/mod_gutschein/overview_row_end_coupon.phtml +++ b/views/mods/mod_gutschein/overview_row_end_coupon.phtml @@ -3,7 +3,7 @@ declare(strict_types=1);
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 20.07.2019
* Time: 16:11
*/
diff --git a/views/mods/mod_orderupload/basket_after.phtml b/views/mods/mod_orderupload/basket_after.phtml index a8b4a6e..1a391e4 100644 --- a/views/mods/mod_orderupload/basket_after.phtml +++ b/views/mods/mod_orderupload/basket_after.phtml @@ -1,7 +1,7 @@ <?php
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 02.05.2018
* Time: 10:47
*/
diff --git a/views/mods/mod_orderupload/product_addedit_content.phtml b/views/mods/mod_orderupload/product_addedit_content.phtml index 715c3d3..e79bbb9 100644 --- a/views/mods/mod_orderupload/product_addedit_content.phtml +++ b/views/mods/mod_orderupload/product_addedit_content.phtml @@ -1,7 +1,7 @@ <?php
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 02.05.2018
* Time: 07:25
*/
diff --git a/views/mods/mod_printshop/basket_row.phtml b/views/mods/mod_printshop/basket_row.phtml index c48a14b..ab063c0 100644 --- a/views/mods/mod_printshop/basket_row.phtml +++ b/views/mods/mod_printshop/basket_row.phtml @@ -3,7 +3,7 @@ declare(strict_types=1);
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 13.02.2020
* Time: 06:25
*/
diff --git a/views/mods/mod_printshop/basket_row_before.phtml b/views/mods/mod_printshop/basket_row_before.phtml index 234965e..e8fe82e 100644 --- a/views/mods/mod_printshop/basket_row_before.phtml +++ b/views/mods/mod_printshop/basket_row_before.phtml @@ -3,7 +3,7 @@ declare(strict_types=1);
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 13.02.2020
* Time: 06:25
*/
diff --git a/views/mods/mod_printshop/order_view_row.phtml b/views/mods/mod_printshop/order_view_row.phtml index 233eeb3..c55e340 100644 --- a/views/mods/mod_printshop/order_view_row.phtml +++ b/views/mods/mod_printshop/order_view_row.phtml @@ -3,7 +3,7 @@ declare(strict_types=1);
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 13.02.2020
* Time: 06:25
*/
diff --git a/views/mods/mod_printshop/overview_row.phtml b/views/mods/mod_printshop/overview_row.phtml index 711ee21..8990d82 100644 --- a/views/mods/mod_printshop/overview_row.phtml +++ b/views/mods/mod_printshop/overview_row.phtml @@ -3,7 +3,7 @@ declare(strict_types=1);
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 13.02.2020
* Time: 06:25
*/
diff --git a/views/mods/mod_printshop/overview_row_before.phtml b/views/mods/mod_printshop/overview_row_before.phtml index 234965e..e8fe82e 100644 --- a/views/mods/mod_printshop/overview_row_before.phtml +++ b/views/mods/mod_printshop/overview_row_before.phtml @@ -3,7 +3,7 @@ declare(strict_types=1);
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 13.02.2020
* Time: 06:25
*/
diff --git a/views/mods/mod_printshop/product.phtml b/views/mods/mod_printshop/product.phtml index 628a795..4c1e40f 100644 --- a/views/mods/mod_printshop/product.phtml +++ b/views/mods/mod_printshop/product.phtml @@ -3,7 +3,7 @@ declare(strict_types=1);
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 14.01.2020
* Time: 10:04
*/
diff --git a/views/mods/mod_printshop/produkt_addedit_content.phtml b/views/mods/mod_printshop/produkt_addedit_content.phtml index b54881e..3d8805f 100644 --- a/views/mods/mod_printshop/produkt_addedit_content.phtml +++ b/views/mods/mod_printshop/produkt_addedit_content.phtml @@ -3,7 +3,7 @@ declare(strict_types=1);
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 14.01.2020
* Time: 07:35
*/
diff --git a/views/mods/mod_printshop/settings_edit.phtml b/views/mods/mod_printshop/settings_edit.phtml index eb3229e..5811388 100644 --- a/views/mods/mod_printshop/settings_edit.phtml +++ b/views/mods/mod_printshop/settings_edit.phtml @@ -1,7 +1,7 @@ <?php
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 14.01.2020
* Time: 07:30
*/
diff --git a/views/mods/mod_voucherproduct/product_bottom.phtml b/views/mods/mod_voucherproduct/product_bottom.phtml index aecfd2d..1dce133 100644 --- a/views/mods/mod_voucherproduct/product_bottom.phtml +++ b/views/mods/mod_voucherproduct/product_bottom.phtml @@ -3,7 +3,7 @@ declare(strict_types=1);
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 25.10.2019
* Time: 09:35
*/
diff --git a/views/order/backendEdit/addVoucher.phtml b/views/order/backendEdit/addVoucher.phtml index 497b4c4..1dec8ac 100644 --- a/views/order/backendEdit/addVoucher.phtml +++ b/views/order/backendEdit/addVoucher.phtml @@ -1,7 +1,7 @@ <?php
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 05.10.2018
* Time: 08:24
*/
diff --git a/views/order/index.phtml b/views/order/index.phtml index 23ab703..ee56a66 100644 --- a/views/order/index.phtml +++ b/views/order/index.phtml @@ -83,26 +83,28 @@ </div>
<?php echo wpsg_drawForm_TextEnd(__('Bestelldatum (Monat/Jahr)', 'wpsg'), array('noP' => true)); ?>
- <?php echo wpsg_drawForm_TextStart(); ?>
- <div class="row">
- <div class="col-lg-6">
- <select name="filter[invoicedate_m]" class="form-control input-sm">
- <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
- <?php for ($i = 1; $i <= 12; $i ++) { ?>
- <option <?php echo ((wpsg_getStr($this->view['arFilter']['invoicedate_m']) == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo strftime("%B", mktime(0, 0, 0, $i, 1, 2000)); ?></option>
- <?php } ?>
- </select>
- </div>
- <div class="col-lg-6">
- <select name="filter[invoicedate_y]" class="form-control input-sm">
- <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
- <?php foreach ($this->view['invoicedate_years'] as $y) { ?>
- <option <?php echo ((wpsg_getStr($this->view['arFilter']['invoicedate_y']) == $y)?'selected="selected"':''); ?> value="<?php echo $y; ?>"><?php echo $y; ?></option>
- <?php } ?>
- </select>
- </div>
- </div>
- <?php echo wpsg_drawForm_TextEnd(__('Rechnungsdatum (Monat/Jahr)', 'wpsg'), array('noP' => true)); ?>
+ <?php if ($this->hasMod('wpsg_mod_rechnungen')) { ?>
+ <?php echo wpsg_drawForm_TextStart(); ?>
+ <div class="row">
+ <div class="col-lg-6">
+ <select name="filter[invoicedate_m]" class="form-control input-sm">
+ <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
+ <?php for ($i = 1; $i <= 12; $i ++) { ?>
+ <option <?php echo ((wpsg_getStr($this->view['arFilter']['invoicedate_m']) == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo strftime("%B", mktime(0, 0, 0, $i, 1, 2000)); ?></option>
+ <?php } ?>
+ </select>
+ </div>
+ <div class="col-lg-6">
+ <select name="filter[invoicedate_y]" class="form-control input-sm">
+ <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
+ <?php foreach ($this->view['invoicedate_years'] as $y) { ?>
+ <option <?php echo ((wpsg_getStr($this->view['arFilter']['invoicedate_y']) == $y)?'selected="selected"':''); ?> value="<?php echo $y; ?>"><?php echo $y; ?></option>
+ <?php } ?>
+ </select>
+ </div>
+ </div>
+ <?php echo wpsg_drawForm_TextEnd(__('Rechnungsdatum (Monat/Jahr)', 'wpsg'), array('noP' => true)); ?>
+ <?php } ?>
<br />
@@ -131,15 +133,15 @@ <br />
- <?php echo wpsg_drawForm_Input('search_customer',__('Kunde (E-Mail oder Kundennummer)', 'wpsg'), @$_REQUEST['search_customer']); ?>
+ <?php echo wpsg_drawForm_Input('search_customer',__('Kunde (E-Mail oder Kundennummer)', 'wpsg'), wpsg_getStr($_REQUEST['search_customer'])); ?>
<br />
<?php $arShippingSelect = []; foreach ($this->arShipping as $shipping_id => $shipping) if (!isset($shipping['active']) || $shipping['active'] === '1') $arShippingSelect[$shipping_id] = $shipping['name'].' ('.wpsg_ff(@$shipping['price']).')'; ?>
- <?php echo wpsg_drawForm_Select('add_shipping', __('Versandart', 'wpsg'), $arShippingSelect, @$_REQUEST['add_shipping']); ?>
+ <?php echo wpsg_drawForm_Select('add_shipping', __('Versandart', 'wpsg'), $arShippingSelect, wpsg_getStr($_REQUEST['add_shipping'])); ?>
- <?php $arPaymentSelect = []; foreach ($this->arPayment as $payment_id => $payment) if (!isset($payment['active']) || $payment['active'] === '1') $arPaymentSelect[$payment_id] = $payment['name'].' ('.wpsg_ff(@$payment['price']).')'; ?>
- <?php echo wpsg_drawForm_Select('add_payment', __('Zahlungsart', 'wpsg'), $arPaymentSelect, @$_REQUEST['add_payment']); ?>
+ <?php $arPaymentSelect = []; foreach ($this->arPayment as $payment_id => $payment) if (!isset($payment['active']) || $payment['active'] === '1') $arPaymentSelect[$payment_id] = $payment['name'].' ('.wpsg_ff(wpsg_getStr($payment['price'])).')'; ?>
+ <?php echo wpsg_drawForm_Select('add_payment', __('Zahlungsart', 'wpsg'), $arPaymentSelect, wpsg_getStr($_REQUEST['add_payment'])); ?>
<br /><?php echo wpsg_drawForm_SubmitButton(__('Bestellung anlegen')); ?><br />
diff --git a/views/order/view_customerdata.phtml b/views/order/view_customerdata.phtml index 11c65a2..66d7d76 100644 --- a/views/order/view_customerdata.phtml +++ b/views/order/view_customerdata.phtml @@ -1,7 +1,7 @@ <?php
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 07.08.2016
* Time: 10:40
*/
diff --git a/views/order/view_dev.phtml b/views/order/view_dev.phtml index 13e6315..abf0e60 100644 --- a/views/order/view_dev.phtml +++ b/views/order/view_dev.phtml @@ -1,11 +1,14 @@ <?php
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 07.08.2016
* Time: 10:51
*/
+ /** @var \wpsg_order $oOrder */
+ $oOrder = wpsg_order::getInstance(intval($this->view['data']['id']));
+
?>
<?php echo wpsg_drawForm_AdminboxStart(__('Entwickleroptionen', 'wpsg')); ?>
@@ -28,7 +31,7 @@ </div>
</div>
</div>
-
+
<?php echo wpsg_drawForm_AdminboxEnd(); ?>
<?php echo wpsg_drawForm_AdminboxStart(__('Technische Einstellungen', 'wüsg')); ?>
diff --git a/views/order/view_general.phtml b/views/order/view_general.phtml index 69e06bf..28d3018 100644 --- a/views/order/view_general.phtml +++ b/views/order/view_general.phtml @@ -1,7 +1,7 @@ <?php
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 06.08.2016
* Time: 11:22
*/
diff --git a/views/order/view_orderlog.phtml b/views/order/view_orderlog.phtml index d68ae85..035fed7 100644 --- a/views/order/view_orderlog.phtml +++ b/views/order/view_orderlog.phtml @@ -1,7 +1,7 @@ <?php
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 06.08.2016
* Time: 11:24
*/
diff --git a/views/order/view_shippay.phtml b/views/order/view_shippay.phtml index b562146..95ce5a9 100644 --- a/views/order/view_shippay.phtml +++ b/views/order/view_shippay.phtml @@ -1,7 +1,7 @@ <?php
/**
- * User: Daschmi (daschmi@daschmi.de)
+ * User: Daschmi (https://daschmi.de)
* Date: 07.08.2016
* Time: 10:52
*/
|
