From 6f5379425cbb8ac4e3e95be7c9496b6d508b95ba Mon Sep 17 00:00:00 2001 From: hartmut Date: Fri, 9 Dec 2016 14:52:48 +0000 Subject: Backend, Statistic und Korrektur E_NOTICE git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5945 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/form/emailconf.phtml | 2 +- views/admin/konfiguration.phtml | 4 +- .../mods/mod_deliverynote/order_view_content.phtml | 16 +- views/mods/mod_deliverynote/settings_edit.phtml | 4 +- views/mods/mod_downloadplus/settings_edit.phtml | 6 +- views/mods/mod_ordervars/order_view_sidebar.phtml | 4 +- views/mods/mod_ordervars/ov_list.phtml | 2 +- views/mods/mod_packagetracking/settings_edit.phtml | 2 +- .../mod_packagetracking/settings_edit_list.phtml | 6 +- .../wpsg_mod_versandarten_listrow.phtml | 2 +- views/mods/mod_productvariants/admin_show.phtml | 2 +- views/mods/mod_productvars/order_view_row.phtml | 4 +- views/mods/mod_productvars/pv_list.phtml | 4 +- views/mods/mod_productvars/settings_edit.phtml | 2 +- views/mods/mod_produktattribute/list.phtml | 2 +- views/mods/mod_rechnungen/foottext_list.phtml | 2 +- views/mods/mod_rechnungen/settings_edit.phtml | 6 +- views/mods/mod_scaleprice/scaleList.phtml | 4 +- views/mods/mod_statistics/chartturnover/all.phtml | 5 +- views/mods/mod_statistics/chartturnover/day.phtml | 54 ++-- .../mods/mod_statistics/chartturnover/month.phtml | 8 +- .../mod_statistics/chartturnover/quarter.phtml | 6 +- views/mods/mod_statistics/chartturnover/week.phtml | 7 +- views/mods/mod_statistics/chartturnover/year.phtml | 5 +- .../mod_statistics/chartturnoverperhour/all.phtml | 3 +- views/mods/mod_statistics/simplefilter.phtml | 2 +- views/mods/mod_statistics/statistics.phtml | 4 +- views/mods/mod_targo/order_done.phtml | 305 ++++++++++++--------- views/mods/mod_trustedshops/widget_form.phtml | 4 +- views/mods/mod_userpayment/list.phtml | 2 +- views/mods/mod_versandarten/list.phtml | 33 +-- views/mods/mod_videodownload/settings_edit.phtml | 4 +- views/mods/mod_voucherproduct/settings_edit.phtml | 6 +- views/mods/mod_wirecard/settings_edit.phtml | 2 +- 34 files changed, 276 insertions(+), 248 deletions(-) (limited to 'views') diff --git a/views/admin/form/emailconf.phtml b/views/admin/form/emailconf.phtml index 6c13bfa..1bacc79 100644 --- a/views/admin/form/emailconf.phtml +++ b/views/admin/form/emailconf.phtml @@ -17,7 +17,7 @@
: get_option('wpsg_'.$this->view['field_key'].'_attachfile')))?$this->get_option('wpsg_'.$this->view['field_key'].'_attachfile'):__('keiner', 'wpsg')); ?> - get_option('wpsg_kundenmail_attachfile')))?'':''); ?> + get_option('wpsg_kundenmail_attachfile')))?'':''); ?>

diff --git a/views/admin/konfiguration.phtml b/views/admin/konfiguration.phtml index 1331419..30e49c8 100644 --- a/views/admin/konfiguration.phtml +++ b/views/admin/konfiguration.phtml @@ -83,14 +83,14 @@

Bitte klicken Sie auf ", "wpsg").''.__("Aktualisieren", "wpsg").' ('.__("Produkte etc. werden dabei nicht gelöscht.", "wpsg"); ?>)

- +
  - + diff --git a/views/mods/mod_deliverynote/order_view_content.phtml b/views/mods/mod_deliverynote/order_view_content.phtml index 0811d5c..8634dbd 100644 --- a/views/mods/mod_deliverynote/order_view_content.phtml +++ b/views/mods/mod_deliverynote/order_view_content.phtml @@ -5,11 +5,8 @@ */ ?> -
-

-
- -

+ +
view['wpsg_mod_deliverynote']['arDeliverynotes'])) { ?> @@ -27,12 +24,12 @@ view['wpsg_mod_deliverynote']['arNoDeliveredProducts'])) { ?> -
- +
+
-
+
-
+ + +get_option('wpsg_mod_targo_url_use') == 0) + { + $url = $this->get_option('wpsg_mod_targo_url_live'); + } + else + { + $url = $this->get_option('wpsg_mod_targo_url_test'); + } + +?> + +

+

+ +

+ + + + + +
+view['o_id']; + $k_id = $this->view['k_id']; + $oOrder = wpsg_order::getInstance($o_id); + $brutto = $oOrder->getAmount(WPSG_BRUTTO); + $brutto = wpsg_round($brutto, 2); + /** @var wpsg_customer */ + $oCustomer = wpsg_customer::getInstance($k_id); + /* + $geb1 = $oCustomer->getBirthdate("Y-m-d"); + $geb2 = $oCustomer->getBirthdate(); + $geb3 = $oCustomer->data["geb"]; + $geb4 = wpsg_date("Y-m-d", strtotime($geb3)); + $geb5 = strtotime($geb3); + $geb6 = strtotime("0000-00-00"); + $geb6 = strtotime("1901-12-13"); + $geb6 = strtotime("1901-12-14"); + */ + $dl = $this->view['targoLink']; + + $street = $oOrder-> getInvoiceStreetClear(true); + $nr = $oOrder-> getInvoiceStreetNr(); + +?> + +getTitle(); +} +else +{ + $titel = $oCustomer->title; +} +$isotitel = ''; +if (($titel == "Herr") || ($titel == "Frau")) $isotitel = toIso($titel); + +$dt = $oCustomer->getBirthdate("Y-m-d"); + +if ($oCustomer->geb == '0000-00-00' || strtotime($dt) === false) +{ + + $bd = ''; + +} +else +{ + + $bd = $oCustomer->getBirthdate("Y-m-d"); + +} + + +function toIso($string) { + //return mb_convert_encoding($string, "ISO-8859-1"); + return utf8_decode(utf8_encode($string)); +} + +$hash = ''; +$key = '123456'; +$key = $this->get_option('wpsg_mod_targo_hashkey'); +//$param = "amount=5000&koop_id=testidkk89&dealerText=https%3A%2F%2Fwww.targobank.de&documentno=&". +// "dealerShopURL=&dealerAbortURL=&dealerID=123456&birthday=1970-12-31"; + +$arr = Array("koop_id" => $this->get_option('wpsg_mod_targo_koop_id'), + "SessionID" => session_id(), + "amount" => $brutto, + "dealerID" => $this->get_option('wpsg_mod_targo_dealerid'), + "dealerText" => ($this->view['targoLink']), + "documentno" => $this->view['o_id'], + "gender" => $isotitel, + "surname" => toIso($oCustomer->getName()), + "firstname" => toIso($oCustomer->getFirstname()), + "street" => toIso($oOrder->getInvoiceStreetClear(true)), + "streetnumber" => toIso($oOrder->getInvoiceStreetNr()), + "zip" => toIso($oCustomer->getZip()), + "city" => toIso($oCustomer->getCity()), + "telnocode" => '', + "telno" => toIso($oCustomer->getPhone()), + "birthday" => $bd, + "email" => toIso($oCustomer->getEMail()), + "dealerShopURL" => ($this->get_option('wpsg_mod_targo_dealerShopURL')), + "dealerAbortURL" => ($this->get_option('wpsg_mod_targo_dealerAbortURL')) +); + +$param = http_build_query($arr); + + +$hash = hash_hmac( 'sha256', $param, $key); // HMAC-SHA256 + +// Test +//$hash = "85ef6ddce9bbebffa250d6f8183f3f727af5f9fda879b73aa0685eb2d9386e70"; + +?> + +

+Obligatorische Daten für Targobank
+
+
+
+
+
+
+ + + + +Adressdaten aus Kundendaten
+
+
+
+
+
+
+
+
+
+
+
+ +Optionale Daten für Targobank
+
+
+(hashkey)
+ + + + +
+
+ + +get_option('wpsg_mod_targo_autostart') == '1') { ?> + \ No newline at end of file diff --git a/views/mods/mod_trustedshops/widget_form.phtml b/views/mods/mod_trustedshops/widget_form.phtml index 1688553..8b9ccf5 100644 --- a/views/mods/mod_trustedshops/widget_form.phtml +++ b/views/mods/mod_trustedshops/widget_form.phtml @@ -8,11 +8,11 @@
diff --git a/views/mods/mod_userpayment/list.phtml b/views/mods/mod_userpayment/list.phtml index 2ef1fb2..8d00e48 100644 --- a/views/mods/mod_userpayment/list.phtml +++ b/views/mods/mod_userpayment/list.phtml @@ -64,7 +64,7 @@ zv_id: '' }, submit: '', - data: '', + data: , type: 'select', placeholder: '', indicator: '', diff --git a/views/mods/mod_versandarten/list.phtml b/views/mods/mod_versandarten/list.phtml index 6aeb712..98b80ea 100644 --- a/views/mods/mod_versandarten/list.phtml +++ b/views/mods/mod_versandarten/list.phtml @@ -64,7 +64,7 @@ va_id: '' }, submit : '', - data : 'view['arTypen']); ?>', + data : view['arTypen']); ?>, type : 'select', placeholder: '', indicator: '', @@ -77,7 +77,7 @@ va_id: '' }, submit: '', - data : '', + data : , type : 'select', placeholder: '', indicator: '', @@ -95,25 +95,13 @@ va_id: '' }, submit: '', - data: '', + data: , type: 'select', placeholder: '', indicator: '', tooltip: '' }); - jQuery('#va2__mwst').wpsg_editable('wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', { - submitdata: { - field: 'mwst_key', - va_id: '' - }, - submit: '', - data: '{"value":0,"text":"anteilig"},{"value":"a","text":"A"}', - type: 'select', - placeholder: '', - indicator: '', - tooltip: '' - }); jQuery('#va__aktiv').bind('change', function() { @@ -243,21 +231,6 @@ - - : - - - - - - - callMods('wpsg_mod_versandarten_listrow', array(&$va)); ?> view['data'])) { ?> diff --git a/views/mods/mod_videodownload/settings_edit.phtml b/views/mods/mod_videodownload/settings_edit.phtml index 2e3e448..2dcd9c8 100644 --- a/views/mods/mod_videodownload/settings_edit.phtml +++ b/views/mods/mod_videodownload/settings_edit.phtml @@ -55,7 +55,7 @@

get_option('wpsg_lastCron') > 0)?wpsg_formatTimestamp($this->get_option('wpsg_lastCron')):__('Noch nicht ausgeführt', 'wpsg')); ?>

- +
@@ -127,7 +127,7 @@ - + diff --git a/views/mods/mod_voucherproduct/settings_edit.phtml b/views/mods/mod_voucherproduct/settings_edit.phtml index 351909e..e4153f6 100644 --- a/views/mods/mod_voucherproduct/settings_edit.phtml +++ b/views/mods/mod_voucherproduct/settings_edit.phtml @@ -33,7 +33,7 @@ - +
@@ -46,7 +46,7 @@

hier konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#gutscheinproductmail'); ?> -

+

@@ -120,7 +120,7 @@ - + diff --git a/views/mods/mod_wirecard/settings_edit.phtml b/views/mods/mod_wirecard/settings_edit.phtml index 76714f0..bc8cf77 100644 --- a/views/mods/mod_wirecard/settings_edit.phtml +++ b/views/mods/mod_wirecard/settings_edit.phtml @@ -26,7 +26,7 @@ - +
-- cgit v1.2.3