From d2440af8de9f09467dc088cb122dec257959c110 Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Wed, 25 Jan 2017 09:52:08 +0000
Subject: Statistik-Produkte und Korrektur
 Kreditkartennummer-Prüfziffernalgorithmus
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6030 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_creditcard/paymenthint.phtml        |   5 +-
 .../mods/mod_statistics/produkt_edit_sidebar.phtml | 136 +++++++++++++++++++++
 views/mods/mod_statistics/settings_edit.phtml      |   2 +
 views/mods/mod_statistics/statisticProduct.phtml   |  46 +++++++
 4 files changed, 188 insertions(+), 1 deletion(-)
 create mode 100644 views/mods/mod_statistics/produkt_edit_sidebar.phtml
 create mode 100644 views/mods/mod_statistics/statisticProduct.phtml

diff --git a/views/mods/mod_creditcard/paymenthint.phtml b/views/mods/mod_creditcard/paymenthint.phtml
index 5ffda92..d9cbbf2 100644
--- a/views/mods/mod_creditcard/paymenthint.phtml
+++ b/views/mods/mod_creditcard/paymenthint.phtml
@@ -138,7 +138,10 @@ jQuery("#wpsg_mod_creditcard_knr").on("input", function () {
 	ai = parseInt(knr.substr(15, 1), 10);
 	if (!(((a1 === "4") && (typ === "VISA")) || ((a1 === "5") && (typ === "MasterCard")))) { bb = false; }
 	for (i = 14; i >= 0; i--) {
-		sum = sum + k * parseInt(knr.substr(i, 1), 10);
+        dig = k * parseInt(knr.substr(i, 1), 10);
+        if (dig > 9) { dig = dig - 9;}
+		sum = sum + dig;
+		//sum = sum + k * parseInt(knr.substr(i, 1), 10);
 		if (k === 2) { k = 1; } else { k = 2; }
 	}
 	sum = sum % 10;
diff --git a/views/mods/mod_statistics/produkt_edit_sidebar.phtml b/views/mods/mod_statistics/produkt_edit_sidebar.phtml
new file mode 100644
index 0000000..517ed62
--- /dev/null
+++ b/views/mods/mod_statistics/produkt_edit_sidebar.phtml
@@ -0,0 +1,136 @@
+<?php
+
+	/**
+	 * Template für die Einstellungen der Statistik innerhalb der Produktverwaltung
+	 */
+
+?>
+<div id="wpsg_voucherproduct" class="panel panel-default">	
+	<div class="panel-heading clearfix">
+		<h3 class="panel-title">
+			<?php echo __('Statistik', 'wpsg'); ?> 
+		</h3>
+	</div>
+	<div class="panel-body">
+		
+		<?php
+		if (isset($_SESSION['filter']['statistik']['st_von']))
+		{
+			$st_von = wpsg_fromDate($_SESSION['filter']['statistik']['st_von'], false);
+			$st_bis = wpsg_fromDate($_SESSION['filter']['statistik']['st_bis'], false);
+		}
+		else
+		{
+			$int = $this->get_option('wpsg_mod_statistics_productinterval');
+		
+			$st_von = Date('d.m.Y', strtotime('-'.$int.' days'));
+			$st_bis = Date('d.m.Y');
+		}
+		?>
+		
+		<label for="st_von">Von</label>
+		<input class="text" type="text" id="st_von" name="st_von" value="<?php $st_von ?>" />
+		<label for="st_bis">bis</label>
+		<input class="text" type="text" id="st_bis" name="st_bis" value="<?php $st_bis ?>" />
+		<input type="button" value="<?php echo __('Aktualisieren', 'wpsg'); ?>" class="button-primary" id="st_refresh" name="st_refresh" />
+		<input type="button" value="<?php echo __('CSV-Export', 'wpsg'); ?>" class="button-primary" id="st_export" name="st_export" />
+	
+	<br /><br />
+	
+		<div id="wpsg_statistic_div">
+			<?php 
+			if ($this->view['odata']['sum'] == 0) {
+				echo __('Keine Daten', 'wpsg');
+			} else {
+			?>
+		        
+		        <?php echo __('Verkaufte Produkte:', 'wpsg');  echo $this->view['odata']['sum'] ?><br /><br />
+		        <table id="wpsg_statistic_table" style="width:100%;">
+		        <thead>
+		        <tr>
+		        <td><?php echo __('Bestell-ID', 'wpsg');?> </td>
+		        <td><?php echo __('Name', 'wpsg');?> </td>
+		        <td><?php echo __('Vorname', 'wpsg');?> </td>
+		        <td><?php echo __('Stück', 'wpsg');?> </td>
+		        <td><?php echo __('e-Mail', 'wpsg');?> </td>
+		        <td><?php echo __('Telefon', 'wpsg');?> </td>
+		        </tr>
+		        </thead>
+		        <tbody id="wpsg_statistic_tbody">
+		
+		        <?php 
+		        unset($this->view['odata']['sum']);
+		        foreach ($this->view['odata'] as $pa) { ?>          
+		        <tr>
+		            <td> <?php echo __($pa['id'], 'wpsg');?></td>
+		            <td> <?php echo __($pa['name'], 'wpsg');?></td>
+		            <td> <?php echo __($pa['vname'], 'wpsg');?></td>
+		            <td> <?php echo __($pa['menge'], 'wpsg');?></td>
+		            <td> <?php echo __($pa['email'], 'wpsg');?></td>
+		            <td> <?php echo __($pa['tel'], 'wpsg');?></td>
+		        </tr>
+		        <?php } ?>
+		
+		        </tbody>
+		        </table>
+			<?php } ?>        
+
+		</div>
+	
+	</div>
+</div>
+
+<script type="text/javascript">
+	jQuery(document).ready(function(){
+
+		jQuery('#st_von').datepicker(jQuery.datepicker.regional['de']);
+		jQuery('#st_bis').datepicker(jQuery.datepicker.regional['de']);
+
+		jQuery('#st_von').val('<?php echo $_REQUEST['von']?>');
+		jQuery('#st_bis').val('<?php echo $_REQUEST['bis']?>');
+
+		jQuery('#st_refresh').bind('click', function(){
+
+			jQuery.ajax( { 
+				url: '<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_statistics', 'aktualisieren'); ?>',
+				data: {
+					'edit_id': <?php echo $_REQUEST['edit_id']?>,
+					'von': jQuery('#st_von').val(),
+					'bis': jQuery('#st_bis').val(),
+				},
+				success: function(data) {
+					jQuery('#wpsg_statistic_table').replaceWith(data);
+						
+				}
+			});
+						
+		});
+
+		jQuery('#st_export').bind('click', function(){
+
+			location.href = '<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_statistics', 'export', array(
+			'edit_id' => $_REQUEST['edit_id']
+		)); ?>&von=' + jQuery('#st_von').val() + '&bis=' + jQuery('#st_bis').val();
+		
+		/*
+		jQuery.ajax( { 
+			url: '<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_statistics', 'export'); ?>',
+			data: {
+				'edit_id': <?php echo $_REQUEST['edit_id']?>,
+				'von': jQuery('#st_von').val(),
+				'bis': jQuery('#st_bis').val(),
+			},
+			success: function(data) {
+				//jQuery('#wpsg_statistic_div').replaceWith(data);
+					
+			}
+		});
+		*/
+
+		});
+
+
+		
+	});
+
+</script>
diff --git a/views/mods/mod_statistics/settings_edit.phtml b/views/mods/mod_statistics/settings_edit.phtml
index 44180d1..ac7f7e9 100644
--- a/views/mods/mod_statistics/settings_edit.phtml
+++ b/views/mods/mod_statistics/settings_edit.phtml
@@ -132,6 +132,8 @@
 			echo wpsg_drawForm_Input('wpsg_mod_statistics_bar_chart_height', __('Balkendiagramm (Höhe in px)', 'wpsg'), $this->get_option('wpsg_mod_statistics_bar_chart_height'), array('help' => 'wpsg_mod_statistics_bar_chart_height'));
 			
 			echo wpsg_drawForm_Input('wpsg_mod_statistics_topproductcount', __('Anzeige Top-Produkte', 'wpsg'), $this->get_option('wpsg_mod_statistics_topproductcount'), array('help' => 'wpsg_mod_statistics_topproductcount'));
+
+			echo wpsg_drawForm_Input('wpsg_mod_statistics_productinterval', __('Intervall-Zeitraum für Produktstatistik', 'wpsg'), $this->get_option('wpsg_mod_statistics_productinterval'), array('help' => 'wpsg_mod_statistics_productinterval'));
 		?>
 			<div class="wpsg_clearer"></div>
 		</div>
diff --git a/views/mods/mod_statistics/statisticProduct.phtml b/views/mods/mod_statistics/statisticProduct.phtml
new file mode 100644
index 0000000..d29f490
--- /dev/null
+++ b/views/mods/mod_statistics/statisticProduct.phtml
@@ -0,0 +1,46 @@
+<?php
+
+	/**
+	 * Template für die Anzeige der Produktstatistik innerhalb der Produktverwaltung
+	 */
+
+?>
+
+	<?php 
+	if ($this->view['odata']['sum'] == 0) {
+		echo __('Keine Daten', 'wpsg');
+	} else {
+	?>
+        
+        <?php echo __('Verkaufte Produkte:', 'wpsg');  echo $this->view['odata']['sum'] ?><br /><br />
+        <table id="wpsg_statistic_table" style="width:100%;">
+        <thead>
+        <tr>
+        <td><?php echo __('Bestell-ID', 'wpsg');?> </td>
+        <td><?php echo __('Name', 'wpsg');?> </td>
+        <td><?php echo __('Vorname', 'wpsg');?> </td>
+        <td><?php echo __('Stück', 'wpsg');?> </td>
+        <td><?php echo __('e-Mail', 'wpsg');?> </td>
+        <td><?php echo __('Telefon', 'wpsg');?> </td>
+        </tr>
+        </thead>
+        <tbody id="wpsg_statistic_tbody">
+
+        <?php echo __($pa['id'], 'wpsg');?>
+
+        <?php 
+        unset($this->view['odata']['sum']);
+        foreach ($this->view['odata'] as $pa) { ?>          
+        <tr>
+            <td> <?php echo __($pa['id'], 'wpsg');?></td>
+            <td> <?php echo __($pa['name'], 'wpsg');?></td>
+            <td> <?php echo __($pa['vname'], 'wpsg');?></td>
+            <td> <?php echo __($pa['menge'], 'wpsg');?></td>
+            <td> <?php echo __($pa['email'], 'wpsg');?></td>
+            <td> <?php echo __($pa['tel'], 'wpsg');?></td>
+        </tr>
+        <?php } ?>
+
+        </tbody>
+        </table>
+	<?php } ?>        
-- 
cgit v1.2.3