From 8e30745d2d58cd1078df00d1f587de27f4588033 Mon Sep 17 00:00:00 2001 From: hartmut Date: Thu, 27 Oct 2016 12:48:23 +0000 Subject: Abgleich V3 und V4 git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5873 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/customerpreset.phtml | 43 ++++++++++ views/gfx/targologo.png | Bin 0 -> 9955 bytes .../mod_addressvalidation/addressvalidation.js | 82 +++++++++++++++++++ .../mods/mod_addressvalidation/settings_edit.phtml | 12 +++ views/mods/mod_creditcard/settings_edit.phtml | 2 +- views/mods/mod_targo/order_done.phtml | 91 +++++++++++++++++++++ views/mods/mod_targo/order_view_afterpayment.phtml | 27 ++++++ views/mods/mod_targo/settings_edit.phtml | 55 +++++++++++++ 8 files changed, 311 insertions(+), 1 deletion(-) create mode 100644 views/admin/customerpreset.phtml create mode 100644 views/gfx/targologo.png create mode 100644 views/mods/mod_addressvalidation/addressvalidation.js create mode 100644 views/mods/mod_addressvalidation/settings_edit.phtml create mode 100644 views/mods/mod_targo/order_done.phtml create mode 100644 views/mods/mod_targo/order_view_afterpayment.phtml create mode 100644 views/mods/mod_targo/settings_edit.phtml diff --git a/views/admin/customerpreset.phtml b/views/admin/customerpreset.phtml new file mode 100644 index 0000000..128c2ac --- /dev/null +++ b/views/admin/customerpreset.phtml @@ -0,0 +1,43 @@ + +
+ +
+
+
+
+ + + +
+ +
+ +
+ + view['arShipping'], $this->get_option('wpsg_customerpreset_shipping'), array('help' => 'wpsg_customerpreset_shipping')); ?> + view['arPayment'], $this->get_option('wpsg_customerpreset_payment'), array('help' => 'wpsg_customerpreset_payment')); ?> + view['arLander'], $this->get_option('wpsg_defaultland'), array('help' => 'wpsg_defaultland', 'hint' => + 'nohspc_'.wpsg_translate(__('Die Länder können in der Länderverwaltung definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=laender') + )); ?> + view['arTitle'], $this->get_option('wpsg_customerpreset_title'), array( 'help' => 'wpsg_customerpreset_title', + 'hint' => 'nohspc_'.wpsg_translate(__('Die Auswahl kann in den Kundendaten definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten'), + 'noIndex' => true + )); ?> + +
+ + + +
+ +
\ No newline at end of file diff --git a/views/gfx/targologo.png b/views/gfx/targologo.png new file mode 100644 index 0000000..fa22bda Binary files /dev/null and b/views/gfx/targologo.png differ diff --git a/views/mods/mod_addressvalidation/addressvalidation.js b/views/mods/mod_addressvalidation/addressvalidation.js new file mode 100644 index 0000000..b74aa5b --- /dev/null +++ b/views/mods/mod_addressvalidation/addressvalidation.js @@ -0,0 +1,82 @@ +/** + * Globale Funktionen zur Adressvalidation + */ + +function validateAddressBind(data) { + jQuery(data.PLZ).on("input", function () { + validateAddress(data); + }); + jQuery(data.Ort).on("input", function () { + validateAddress(data); + }); + jQuery(data.Strasse).on("input", function () { + validateAddress(data); + }); + jQuery(data.Land).on("input", function () { + validateAddress(data); + }); +} + +// Adress-Validation +function validateAddress(data) { + var + plz, + ort, + strasse, + astr1, + land = 'de', + rw; + plz = jQuery(data.PLZ).val(); + ort = jQuery(data.Ort).val(); + strasse = jQuery(data.Strasse).val(); + nr = jQuery(data.Nr).val(); + if (nr !== undefined) { + strasse = strasse + ' ' + nr; + } + land = jQuery(data.Land + ' option:selected').val(); + land = jQuery(data.Land + ' option:selected').attr('data-land'); + + astr1 = localStorage.getItem(data.StorageKey); + if ((plz.length > 3) && (ort.length > 3) && (strasse.length > 3) && + (astr1 != (strasse + plz + ort + land))) + { + + astr1 = strasse + plz + ort + land; + localStorage.setItem(data.StorageKey, astr1); + jQuery.ajax({ + url: 'http://api.address-validator.net/api/verify', + type: 'POST', + data: { StreetAddress: strasse, + City: ort, + PostalCode: plz, + //State: State, + CountryCode: land, + //Locale: land, + APIKey: data.Key}, + dataType: 'json', + success: function (json) { + // check API result + if (typeof(json.status) != "undefined") { + status = json.status; + formattedaddress = json.formattedaddress; + if (json.status === 'VALID') { + + + } else if ((json.status === 'INVALID') || (json.status === 'SUSPECT')) { + + alert(data.MsgTeil1 + '-Validation fehlerhaft. Bitte Straße, Hausnummer, PLZ, Ort und Land überprüfen.'); + + } else { + + alert('Adress-Validation Serverproblem: ' + json.status); + + } + } + + } + }); + + } + +} + diff --git a/views/mods/mod_addressvalidation/settings_edit.phtml b/views/mods/mod_addressvalidation/settings_edit.phtml new file mode 100644 index 0000000..db047cc --- /dev/null +++ b/views/mods/mod_addressvalidation/settings_edit.phtml @@ -0,0 +1,12 @@ + +get_option('wpsg_mod_addressvalidation_apikey'), array('help' => 'wpsg_mod_addressvalidation_apikey')); ?> + + + + \ No newline at end of file diff --git a/views/mods/mod_creditcard/settings_edit.phtml b/views/mods/mod_creditcard/settings_edit.phtml index d8ec516..3d034f9 100644 --- a/views/mods/mod_creditcard/settings_edit.phtml +++ b/views/mods/mod_creditcard/settings_edit.phtml @@ -14,4 +14,4 @@ get_option('wpsg_mod_creditcard_mwst')); ?> get_option('wpsg_mod_creditcard_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?> get_option('wpsg_mod_creditcard_iban'), array('help' => 'wpsg_mod_creditcard_iban')); ?> -get_option('wpsg_mod_creditcard_schluessel'), array('help' => 'wpsg_shippay_name')); ?> +get_option('wpsg_mod_creditcard_schluessel'), array('help' => 'wpsg_mod_creditcard_schluessel')); ?> diff --git a/views/mods/mod_targo/order_done.phtml b/views/mods/mod_targo/order_done.phtml new file mode 100644 index 0000000..d5dbde6 --- /dev/null +++ b/views/mods/mod_targo/order_done.phtml @@ -0,0 +1,91 @@ +get_option('wpsg_mod_targo_url'); +?> + +

+

+ + <?php echo __('Mit Targo bezahlen', 'wpsg'); ?> + + +

+ + + + +get_option('wpsg_mod_targo_autostart') == '1') { ?> + + \ No newline at end of file diff --git a/views/mods/mod_targo/order_view_afterpayment.phtml b/views/mods/mod_targo/order_view_afterpayment.phtml new file mode 100644 index 0000000..147de14 --- /dev/null +++ b/views/mods/mod_targo/order_view_afterpayment.phtml @@ -0,0 +1,27 @@ + + +view['oOrder']->getMeta('wpsg_mod_paypal_paymentid'))) { ?> + +
+
+ +
+
+

view['oOrder']->getMeta('wpsg_mod_paypal_paymentid'), $this->view['oOrder']->getMeta('wpsg_mod_paypal_paymentstate')); ?>

+
+
+
+ + + +view['oOrder']->getMeta('wpsg_mod_paypal_saleid'))) { ?> + + view['oOrder']->getMeta('wpsg_mod_paypal_saleid'), array('text' => true)); ?> + + diff --git a/views/mods/mod_targo/settings_edit.phtml b/views/mods/mod_targo/settings_edit.phtml new file mode 100644 index 0000000..091a5f5 --- /dev/null +++ b/views/mods/mod_targo/settings_edit.phtml @@ -0,0 +1,55 @@ + + +get_option('wpsg_mod_targo_bezeichnung'), array('help' => 'wpsg_shippay_name')); ?> +get_option('wpsg_mod_targo_hint'), array('help' => 'wpsg_shippay_hint')); ?> + +get_option('wpsg_mod_targo_aktiv'), array('help' => 'wpsg_mod_targo_activ')); ?> +get_option('wpsg_mod_targo_autostart'), array('help' => 'wpsg_mod_targo_autostart')); ?> +get_option('wpsg_mod_targo_summe_min'), array('help' => 'wpsg_mod_targo_summe_min')); ?> +get_option('wpsg_mod_targo_summe_max'), array('help' => 'wpsg_mod_targo_summe_max')); ?> +get_option('wpsg_mod_targo_laufzeit_min'), array('help' => 'wpsg_mod_targo_laufzeit_min')); ?> +get_option('wpsg_mod_targo_laufzeit_max'), array('help' => 'wpsg_mod_targo_laufzeit_max')); ?> +get_option('wpsg_mod_targo_rate_min'), array('help' => 'wpsg_mod_targo_rate_min')); ?> +get_option('wpsg_mod_targo_url'), array('help' => 'wpsg_mod_targo_url')); ?> +get_option('wpsg_mod_targo_koop_id'), array('help' => 'wpsg_mod_targo_koop_id')); ?> +get_option('wpsg_mod_targo_dealerid'), array('help' => 'wpsg_mod_targo_dealerid')); ?> +get_option('wpsg_mod_targo_hashkey'), array('help' => 'wpsg_mod_targo_hashkey')); ?> + + true, 'noDoubleDot' => true, 'help' => 'wpsg_mod_targo_createwebhook')); ?> +get_option('wpsg_mod_targo_gebuehr'), true), array('help' => 'wpsg_shippay_gebuehr', 'unit' => $this->get_option('wpsg_currency').' / %')); ?> +get_option('wpsg_mod_targo_mwst'), array('help' => 'wpsg_shippay_mwst')); ?> +get_option('wpsg_mod_targo_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?> + +view['pages'], $this->get_option('wpsg_mod_targo_success'), array('help' => 'wpsg_mod_targo_success')); ?> +view['pages'], $this->get_option('wpsg_mod_targo_error'), array('help' => 'wpsg_mod_targo_error')); ?> + +
+ +
+ +
+ + + + +
-- cgit v1.2.3