Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 5943) +++ /controller/wpsg_ShopController.class.php (revision 5945) @@ -669,4 +669,5 @@ wp_enqueue_script('jquery-ui-core'); + wp_enqueue_script('jquery-ui-dialog'); wp_enqueue_script('jquery-ui-sortable'); wp_enqueue_script('jquery-ui-datepicker'); //, $this->url(WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/lib/ui/jquery.ui.datepicker.js'), array('jquery', 'jquery-ui-core')); @@ -682,4 +683,5 @@ } + wp_enqueue_style('wp-jquery-ui-dialog'); wp_enqueue_style('jquery-ui-datepicker'); wp_enqueue_style('wpsg-adminstyle', $GLOBALS['wpsg_sc']->getRessourceURL('css/admin.css'), array('wpsg-bscss', 'wpsg-bs-theme-css')); Index: /mods/mod_statistics/wpsg_turnover.class.php =================================================================== --- /mods/mod_statistics/wpsg_turnover.class.php (revision 5943) +++ /mods/mod_statistics/wpsg_turnover.class.php (revision 5945) @@ -373,4 +373,5 @@ $adjustment = 1; + $day = 0; if ($point == '0') @@ -403,5 +404,5 @@ `".WPSG_TBL_ORDER."` WHERE - ".$this->getSqlWhere('validOrder')." AND + ".$this->getSqlWhere('validOrder')." AND `cdate` >= '".date('Y-m-d 00:00:00', $firstDayofWeek)."' AND `cdate` <= '".date('Y-m-d 23:59:59', $lastDayofWeek)."' @@ -411,12 +412,12 @@ year DESC ", "day"); - + $day += $firstDayofWeek; for ($i = 0; $i < 7; $i++) { - if (!isset($arData[0]['records'][date(j, $day)])) - { - $arData[0]['records'][date(j, $day)] = array('orders' => '0', + if (!isset($arData[0]['records'][date('j', $day)])) + { + $arData[0]['records'][date('j', $day)] = array('orders' => '0', 'total' => '0', 'avg_total'=> '0', @@ -427,5 +428,5 @@ } - $arData[0]['records'][date(j, $day)]['label'] = date('d.m.Y', $day); + $arData[0]['records'][date('j', $day)]['label'] = date('d.m.Y', $day); $day += 86400; Index: /mods/wpsg_mod_productvariants.class.php =================================================================== --- /mods/wpsg_mod_productvariants.class.php (revision 5943) +++ /mods/wpsg_mod_productvariants.class.php (revision 5945) @@ -65,10 +65,8 @@ name varchar(255) NOT NULL, shortname varchar(255) NOT NULL, - anr varchar(255) NOT NULL, price double(10,2) NOT NULL, stock int(11) NOT NULL, images text NOT NULL, - deleted int(1) NOT NULL, pos int(11) NOT NULL, @@ -82,7 +80,5 @@ variant_id int(11) NOT NULL, product_id int(11) NOT NULL, - pos int(11) NOT NULL, - PRIMARY KEY (id), KEY product_id (product_id), @@ -91,10 +87,9 @@ dbDelta($sql); - + $sql = "CREATE TABLE ".WPSG_TBL_PRODUCTS_VARIATION." ( id int(11) NOT NULL AUTO_INCREMENT, variation_id int(11) NOT NULL, product_id int(11) NOT NULL, - active int(1) NOT NULL, anr varchar(255) NOT NULL, @@ -102,5 +97,4 @@ stock int(11) NOT NULL, images text NOT NULL, - PRIMARY KEY (id), KEY product_id (product_id), Index: /mods/wpsg_mod_statistics.class.php =================================================================== --- /mods/wpsg_mod_statistics.class.php (revision 5943) +++ /mods/wpsg_mod_statistics.class.php (revision 5945) @@ -34,9 +34,9 @@ parent::__construct(); - + $this->name = __('Statistik', 'wpsg'); $this->group = __('Sonstiges', 'wpsg'); $this->desc = __('Darstellung und Auswertung von Statistiken, Piwik Integration, Eckdaten als Dashboard-Widget', 'wpsg'); - + } @@ -66,5 +66,5 @@ $this->shop->checkDefault('wpsg_mod_statistics_status', implode(',', array(100, 110))); - + /** * Produkttabelle fÃŒr Kundenkarte erweitern @@ -113,5 +113,8 @@ wp_enqueue_style('wpsg_mod_statistics_css_jqplot', WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/lib/jqplot/jquery.jqplot.css'); //$this->dispatch(); - + + //$gurl = WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/lib/jqplot/jquery.jqplot.js'; + //wp_register_script('wpsg_mod_statistics_js_jqplot', $gurl, $arr, null); + //wp_enqueue_script('wpsg_mod_statistics_js_jqplot'); } @@ -119,5 +122,5 @@ } // public wpsg_enqueue_scripts() - + /** * Rechte setzen @@ -144,11 +147,11 @@ public function checkout2_inner_prebutton(&$checkout_view) - { + { if ($this->shop->get_option('wpsg_mod_statistics_piwik_checkout2') == '1') { - + $this->trackTarget($this->shop->get_option('wpsg_mod_statistics_piwik_checkout2_target')); - + } @@ -156,5 +159,5 @@ public function overview_inner_prebutton(&$basket_view) - { + { if ($this->shop->get_option('wpsg_mod_statistics_piwik_overview') == '1') @@ -172,7 +175,7 @@ if ($this->shop->get_option('wpsg_mod_statistics_piwik_done') == '1') { - + $this->trackTarget($this->shop->get_option('wpsg_mod_statistics_piwik_done_target')); - + } @@ -186,5 +189,5 @@ echo 'piwikTracker.addEcommerceItem("'.wpsg_hspc($p['id']).'", "'.wpsg_hspc($p['name']).'", "", '.wpsg_tf($p['preis']).', '.$p['menge'].');'; - + } @@ -230,5 +233,5 @@ if (!$this->usePiwik()) return false; - + $url = $this->shop->get_option('wpsg_mod_statistics_piwik_url'); @@ -418,5 +421,5 @@ } } - + /** * Sammeln von Chartdaten und RÃŒckgabe @@ -505,5 +508,5 @@ ); - + //Statistikarray nach order sortieren $this->shop->view['charts'] = wpsg_array_csort($this->shop->view['charts'], 'order'); @@ -511,5 +514,5 @@ //Default-Statistiken laden wenn keine REQUEST-Parameter fÃŒr id bzw. Type ÃŒbergeben wurden if (!isset($_REQUEST['id'])) - { + { $_REQUEST['id'] = '0'; $temp = $this->shop->view['charts'][$_REQUEST['id']]['type']; @@ -533,5 +536,5 @@ */ - if (($_REQUEST['page'] == 'wpsg-Statistics') && (wpsg_isSizedString($_REQUEST['id']) != 4)) + if (($_REQUEST['page'] == 'wpsg-Statistics') && (wpsg_getStr($_REQUEST['id']) != "4")) { if (is_array($this->shop->view['charts'][$_REQUEST['id']]['type'][$_REQUEST['type']]['js']) && count(wpsg_getStr($this->shop->view['charts'][$_REQUEST['id']]['type'][$_REQUEST['type']])) > 0) @@ -556,5 +559,5 @@ $this->shop->view['filter'] = array(); if (wpsg_isSizedArray($_REQUEST['filter'])) $this->shop->view['filter'] = $_REQUEST['filter']; - + if (!isset($this->shop->view['filter']['standard'])) { $this->shop->view['filter']['standard'] = '0'; } @@ -595,11 +598,10 @@ } */ - if (($_REQUEST['page'] == 'wpsg-Statistics') && (wpsg_isSizedString($_REQUEST['id']) != 4)) + + if (($_REQUEST['page'] == 'wpsg-Statistics')) { - $this->shop->view['chart']['data'] = $objchartClass->$chartFunction($this->shop->view['standardFilter'][$this->shop->view['filter']['standard']]['point'], array('relatedpoint' => $this->shop->view['standardFilter'][wpsg_getStr($this->shop->view['filter']['related'])]['point'], 'order' => wpsg_getStr($this->shop->view['filter']['order']), 'sort' => wpsg_getStr($this->shop->view['filter']['sort']))); - $this->shop->view['chart']['info'] = $this->shop->view['charts'][$_REQUEST['id']]['type'][$_REQUEST['type']]; - } - else - { + //$this->shop->view['chart']['data'] = $objchartClass->$chartFunction($this->shop->view['standardFilter'][$this->shop->view['filter']['standard']]['point'], array('relatedpoint' => $this->shop->view['standardFilter'][wpsg_getStr($this->shop->view['filter']['related'])]['point'], 'order' => wpsg_getStr($this->shop->view['filter']['order']), 'sort' => wpsg_getStr($this->shop->view['filter']['sort']))); + //$this->shop->view['chart']['info'] = $this->shop->view['charts'][$_REQUEST['id']]['type'][$_REQUEST['type']]; + $o = wpsg_getStr($this->shop->view['filter']['order']); $s = wpsg_getStr($this->shop->view['filter']['sort']); @@ -607,5 +609,10 @@ $p = $this->shop->view['standardFilter'][$this->shop->view['filter']['standard']]['point']; $this->shop->view['chart']['data'] = $objchartClass->$chartFunction($p, array('relatedpoint' => $r, 'order' => $o, 'sort' => $s)); - + //$this->shop->view['chart']['info'] = $this->shop->view['charts'][$_REQUEST['id']]['type'][$_REQUEST['type']]; + } + + if (($_REQUEST['page'] == 'wpsg-Statistics') && (wpsg_getStr($_REQUEST['id']) != 4)) + { + $this->shop->view['chart']['info'] = $this->shop->view['charts'][$_REQUEST['id']]['type'][$_REQUEST['type']]; } @@ -648,5 +655,5 @@ public function settings_edit() { - + $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_statistics/settings_edit.phtml'); @@ -692,7 +699,7 @@ $this->shop->update_option('wpsg_mod_statistics_googlekey', $_REQUEST['wpsg_mod_statistics_googlekey']); - - } - + + } + public function get_pagetrackingcode() { @@ -783,5 +790,5 @@ 'wpsg_mod_statistics_piwik_done' ); - + foreach ($arConfPiwik as $c) { if ($this->shop->get_option($c) == '1') { return true; } } Index: /views/admin/form/emailconf.phtml =================================================================== --- /views/admin/form/emailconf.phtml (revision 5943) +++ /views/admin/form/emailconf.phtml (revision 5945) @@ -18,5 +18,5 @@
: 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')))?'':''); ?>

Index: /views/admin/konfiguration.phtml =================================================================== --- /views/admin/konfiguration.phtml (revision 5943) +++ /views/admin/konfiguration.phtml (revision 5945) @@ -84,5 +84,5 @@

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

- +
@@ -91,5 +91,5 @@   - + Index: /views/mods/mod_deliverynote/order_view_content.phtml =================================================================== --- /views/mods/mod_deliverynote/order_view_content.phtml (revision 5943) +++ /views/mods/mod_deliverynote/order_view_content.phtml (revision 5945) @@ -6,9 +6,6 @@ ?> -
-

-
- -

+ +
@@ -28,10 +25,10 @@ view['wpsg_mod_deliverynote']['arNoDeliveredProducts'])) { ?> -
- +
+
-
+
-
+ + + @@ -55,7 +56,70 @@ 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 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"; ?> @@ -71,18 +135,8 @@ -Optionale Daten fÃŒr Targobank
-
-
-(hashkey)
-
Adressdaten aus Kundendaten
-getTitle(); -$isotitel = ''; -if (($titel == "Herr") || ($titel == "Frau")) $isotitel = toIso($titel); -?> -
+


@@ -93,23 +147,12 @@

-geb == '0000-00-00' || strtotime($dt) === false) - { - - echo ''; - - } - else - { - - echo $oCustomer->getBirthdate("Y-m-d"); - - } +
+
-?>" placeholder="birthday">
-
+Optionale Daten fÃŒr Targobank
+
+
+(hashkey)
+ Index: /views/mods/mod_trustedshops/widget_form.phtml =================================================================== --- /views/mods/mod_trustedshops/widget_form.phtml (revision 5943) +++ /views/mods/mod_trustedshops/widget_form.phtml (revision 5945) @@ -9,9 +9,9 @@ Index: /views/mods/mod_userpayment/list.phtml =================================================================== --- /views/mods/mod_userpayment/list.phtml (revision 5943) +++ /views/mods/mod_userpayment/list.phtml (revision 5945) @@ -65,5 +65,5 @@ }, submit: '', - data: '', + data: , type: 'select', placeholder: '', Index: /views/mods/mod_versandarten/list.phtml =================================================================== --- /views/mods/mod_versandarten/list.phtml (revision 5943) +++ /views/mods/mod_versandarten/list.phtml (revision 5945) @@ -65,5 +65,5 @@ }, submit : '', - data : 'view['arTypen']); ?>', + data : view['arTypen']); ?>, type : 'select', placeholder: '', @@ -78,5 +78,5 @@ }, submit: '', - data : '', + data : , type : 'select', placeholder: '', @@ -96,5 +96,5 @@ }, submit: '', - data: '', + data: , type: 'select', placeholder: '', @@ -103,16 +103,4 @@ }); - 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() { @@ -244,19 +232,4 @@ - - : - - - - - - - callMods('wpsg_mod_versandarten_listrow', array(&$va)); ?> Index: /views/mods/mod_videodownload/settings_edit.phtml =================================================================== --- /views/mods/mod_videodownload/settings_edit.phtml (revision 5943) +++ /views/mods/mod_videodownload/settings_edit.phtml (revision 5945) @@ -56,5 +56,5 @@

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

- +
@@ -128,5 +128,5 @@ - + Index: /views/mods/mod_voucherproduct/settings_edit.phtml =================================================================== --- /views/mods/mod_voucherproduct/settings_edit.phtml (revision 5943) +++ /views/mods/mod_voucherproduct/settings_edit.phtml (revision 5945) @@ -34,5 +34,5 @@ - +
@@ -47,5 +47,5 @@

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

+

@@ -121,5 +121,5 @@ - + Index: /views/mods/mod_wirecard/settings_edit.phtml =================================================================== --- /views/mods/mod_wirecard/settings_edit.phtml (revision 5943) +++ /views/mods/mod_wirecard/settings_edit.phtml (revision 5945) @@ -27,5 +27,5 @@ - +