- Anonymisieren von Adressen/Kundendaten

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7159 0d5edaf7-2b12-4e95-93f4-047927463d4b

3 files changed, 41 insertions, 43 deletions

diff --git a/views/admin/dataprotection.phtml b/views/admin/dataprotection.phtml
index 1d7a740..2ee9fdd 100644
--- a/views/admin/dataprotection.phtml
+++ b/views/admin/dataprotection.phtml
@@ -46,39 +46,9 @@
         	</div>

   			<div class="panel-body">	

 						

-				<?php /* periodisches Löschen der persönlichen Daten */ ?>

-				<?php echo wpsg_drawForm_Input ('wpsg_customerdatadelete_complete', __('vollständig abgeschlossene Bestellungen', 'wpsg'), $this->get_option('wpsg_customerdatadelete_complete'));?>	

-				<?php echo wpsg_drawForm_Select('wpsg_customerdatadelete_completeeinheit', __('Einheit', 'wpsg'), array('0' => __('Tag(e)', 'wpsg'), '1' => __('Monat(e)', 'wpsg'), '2' => __('Jahr(e)', 'wpsg')), $this->get_option('wpsg_customerdatadelete_completeeinheit')); ?>

-				

-				<br />

-				

-				<?php echo wpsg_drawForm_Input ('wpsg_customerdatadelete_storno', __('stonierte Bestellungen', 'wpsg'), $this->get_option('wpsg_customerdatadelete_storno')); ?>

-				<?php echo wpsg_drawForm_Select('wpsg_customerdatadelete_stornoeinheit', __('Einheit', 'wpsg'), array('0' => __('Tag(e)', 'wpsg'), '1' => __('Monat(e)', 'wpsg'), '2' => __('Jahr(e)', 'wpsg')), $this->get_option('wpsg_customerdatadelete_stornoeinheit')); ?>

-				

-				<br />

-				

-				<?php /* TODO: Abfrage greift nicht */ ?>

-				<?php if ($this->get_option('wpsg_showincompleteorder') == '1') { ?>

-					<?php echo wpsg_drawForm_Input ('wpsg_customerdatadelete_uncomplete', __('unvollständige Bestellungen', 'wpsg'), $this->get_option('wpsg_customerdatadelete_uncomplete')); ?>

-					<?php echo wpsg_drawForm_Select('wpsg_customerdatadelete_uncompleteeinheit', __('Einheit', 'wpsg'), array('0' => __('Tag(e)', 'wpsg'), '1' => __('Monat(e)', 'wpsg'), '2' => __('Jahr(e)', 'wpsg')), $this->get_option('wpsg_customerdatadelete_uncompleteeinheit')); ?>

-				<?php } ?>	

-					

-				<br />	

-					

-				<?php /* Abomodul aktiv */ ?>

-				<?php if ($this->hasMod('wpsg_mod_abo') == '1') { ?>

-					<?php echo wpsg_drawForm_Input ('wpsg_customerdatadelete_abos', __('gekündigte Abos', 'wpsg'), $this->get_option('wpsg_customerdatadelete_abos')); ?>

-					<?php echo wpsg_drawForm_Select('wpsg_customerdatadelete_aboseinheit', __('Einheit', 'wpsg'), array('0' => __('Tag(e)', 'wpsg'), '1' => __('Monat(e)', 'wpsg'), '2' => __('Jahr(e)', 'wpsg')), $this->get_option('wpsg_customerdatadelete_aboseinheit')); ?>

-				<?php } ?>

-	

-				<br />

-				

-				<?php /* Rechnungsmodul aktiv*/ ?>

-				<?php if ($this->hasMod('wpsg_mod_rechnungen') == '1') { ?>

-					<?php echo wpsg_drawForm_Input ('wpsg_customerdatadelete_rechnung', __('Rechnungen geschrieben', 'wpsg'), $this->get_option('wpsg_customerdatadelete_complete')); ?>

-					<?php echo wpsg_drawForm_Select('wpsg_customerdatadelete_rechnungeinheit', __('Einheit', 'wpsg'), array('0' => __('Tag(e)', 'wpsg'), '1' => __('Monat(e)', 'wpsg'), '2' => __('Jahr(e)', 'wpsg')), $this->get_option('wpsg_customerdatadelete_rechnungeinheit')); ?>

-				<?php } ?>

-				

+                <?php echo wpsg_drawForm_Input('wpsg_customerdatadelete', __('Letzte Aktivität älter als', 'wpsg'), $this->get_option('wpsg_customerdatadelete'));?>

+                <?php echo wpsg_drawForm_Select('wpsg_customerdatadelete_unit', __('Einheit', 'wpsg'), array('0' => __('Tag(e)', 'wpsg'), '1' => __('Monat(e)', 'wpsg'), '2' => __('Jahr(e)', 'wpsg')), $this->get_option('wpsg_customerdatadelete_unit')); ?>

+								

 			</div>

 			

 		</div>	

diff --git a/views/mods/mod_kundenverwaltung/edit.phtml b/views/mods/mod_kundenverwaltung/edit.phtml
index 421e2a1..e4a7bab 100644
--- a/views/mods/mod_kundenverwaltung/edit.phtml
+++ b/views/mods/mod_kundenverwaltung/edit.phtml
@@ -83,7 +83,7 @@
                         <?php if ($this->view['pflicht']['ustidnr'] != '2') { ?>

                         	<?php echo wpsg_drawForm_Input('ustidnr', __('UStIdNr.', 'wpsg'), @$this->view['data']['ustidnr']); ?>

                         <?php } ?>

-                        <?php echo wpsg_drawForm_Select('status', __('Status', 'wpsg'), array('inaktiv', 'aktiv'), @$this->view['data']['status'], array()); ?>

+                        <?php echo wpsg_drawForm_Select('status', __('Status', 'wpsg'), ['1' => __('Aktiv', 'wpsg'), '0' => __('Inaktiv', 'wpsg'), '-1' => __('Anonymisiert')], @$this->view['data']['status'], array()); ?>

                         <?php echo wpsg_drawForm_Checkbox('info-mail', __('Mail bei Statusänderung', 'wpsg'), '', array()); ?>

                         <?php echo wpsg_drawForm_Textarea('comment', __('Kundenkommentar', 'wpsg'), @$this->view['data']['comment']); ?>

 					<?php echo wpsg_drawForm_AdminboxEnd(); ?>

@@ -119,7 +119,7 @@
                             </ul>

                         </div>

 					<?php echo wpsg_drawForm_AdminboxEnd(); ?>

-

+                    

 					<?php if (wpsg_isSizedInt($this->view['data']['id'])) { ?>

 					<?php echo wpsg_drawForm_AdminboxStart(__('Information', 'wpsg')) ?>

 

@@ -132,15 +132,39 @@
 						</p>

 						<?php echo wpsg_drawForm_TextEnd(__('Bestellungen', 'wpsg'), array('noP' => true)); ?>

 

-						<?php echo wpsg_drawForm_TextStart(); ?>

-						<p>

-							<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_kundenverwaltung&noheader=1&be_ajax=su&k_id=<?php echo $this->view['data']['id']; ?>"><?php echo __('Kundenlogin simulieren', 'wpsg'); ?></a>

-						</p>

-						<?php echo wpsg_drawForm_TextEnd(__('Kunden Login', 'wpsg'), array('noP' => true)); ?>

+                        <?php if ($this->view['data']['status'] !== '-1') { ?>

+						

+                            <?php echo wpsg_drawForm_TextStart(); ?>

+                            <p>

+                                <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_kundenverwaltung&noheader=1&be_ajax=su&k_id=<?php echo $this->view['data']['id']; ?>"><?php echo __('Kundenlogin simulieren', 'wpsg'); ?></a>

+                            </p>

+                            <?php echo wpsg_drawForm_TextEnd(__('Kunden Login', 'wpsg'), array('noP' => true)); ?>

+                        

+                        <?php } ?>

 

-						<?php echo wpsg_drawForm_TextStart(); ?>

-						<p><?php echo wpsg_formatTimestamp(strtotime($this->view['data']['lastorder'])); ?></p>

-						<?php echo wpsg_drawForm_TextEnd(__('Letzte Bestellung', 'wpsg'), array('noP' => true)); ?>

+                        <?php if (wpsg_isSizedInt($this->view['data']['countOrder'])) { ?>

+						

+                            <?php echo wpsg_drawForm_TextStart(); ?>

+						    <p><?php echo wpsg_formatTimestamp(strtotime($this->view['data']['lastorder'])); ?></p>

+						    <?php echo wpsg_drawForm_TextEnd(__('Letzte Bestellung', 'wpsg'), array('noP' => true)); ?>

+                            

+                        <?php } ?>

+

+                        <?php if (strtotime($this->view['data']['anonymized']) > 0) { ?>

+

+                            <?php echo wpsg_drawForm_TextStart(); ?>

+                            <p><?php echo wpsg_formatTimestamp(strtotime($this->view['data']['anonymized'])); ?></p>

+                            <?php echo wpsg_drawForm_TextEnd(__('Anonymisiert am', 'wpsg'), array('noP' => true)); ?>

+                            

+                        <?php } ?>

+

+                        <?php if (strtotime($this->view['data']['last_login']) > 0) { ?>

+                        

+                            <?php echo wpsg_drawForm_TextStart(); ?>

+                            <p><?php echo wpsg_formatTimestamp(strtotime($this->view['data']['last_login'])); ?></p>

+                            <?php echo wpsg_drawForm_TextEnd(__('Letzte Anmeldung', 'wpsg'), array('noP' => true)); ?>

+                            

+                        <?php } ?>

 

 						<?php if ($this->hasMod('wpsg_mod_statistics')) { ?>

 						<?php echo wpsg_drawForm_TextStart(); ?>

diff --git a/views/mods/mod_kundenverwaltung/index.phtml b/views/mods/mod_kundenverwaltung/index.phtml
index 4123703..37b42c9 100644
--- a/views/mods/mod_kundenverwaltung/index.phtml
+++ b/views/mods/mod_kundenverwaltung/index.phtml
@@ -157,8 +157,12 @@
                                     <span class="del"><a onclick="if (!confirm('<?php echo __("Sind Sie sicher, dass Sie den Kunden löschen wollen?", "wpsg"); ?>')) return false;" title="<?php echo __("Diesen Kunden löschen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=del&edit_id=<?php echo $c->id; ?>&noheader=1"><?php echo __("Löschen", "wpsg"); ?></a></span>

                                     |

                                     <span class="order"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&filter%5Bk_id%5D=<?php echo $c->id; ?>"><?php echo __('Bestellungen einsehen', 'wpsg'); ?></a></span>

+                                    

+                                    <?php if ($c->status !== '-1') { ?>

                                     |

                                     <span class="order"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_kundenverwaltung&noheader=1&be_ajax=su_index&k_id=<?php echo $c->id; ?>"><?php echo __('Kundenlogin simulieren', 'wpsg'); ?></a></span>

+                                    <?php } ?>

+                                    

                                 </div>

                             </td>

                             <td class="col_adress">