- Feature - Kundenzusammenführung über Kundenverwaltung

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

3 files changed, 279 insertions, 69 deletions

diff --git a/views/css/admin.css b/views/css/admin.css
index 7d4840b..3a42a59 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -82,6 +82,8 @@
 /* Kundenverwaltung -> Kundendaten */

 #wpsg-bs .wpsg_customerfield .tab-content { position:relative; padding-top:1.5rem; }

 #wpsg-bs .wpsg_customervar_row2 td { border-top:0px; }

+.wpsg-table-customer .wpsg_pic_col { text-align:center; }

+.wpsg-table-customer .wpsg_pic_col img { margin-bottom:5px; }

 

 /* Rechtstexte */

 .wpsg_mod_legaltexts_protectedshops_table th { width:58%; text-align:right; font-size:12px; }

diff --git a/views/mods/mod_kundenverwaltung/index.phtml b/views/mods/mod_kundenverwaltung/index.phtml
index 3cb5ed8..a316e2f 100644
--- a/views/mods/mod_kundenverwaltung/index.phtml
+++ b/views/mods/mod_kundenverwaltung/index.phtml
@@ -108,78 +108,96 @@
         

     </nav>

 

+    <div class="wpsg_msg_wrap"><hr class="wp-header-end wpsg-wp-header-end"></div>

+    

     <?php $this->render(WPSG_PATH_VIEW.'/admin/pager.phtml'); ?>

 

 	<div class="wpsg_clear"></div>

 

-	<div class="content">

-

-        <?php if (is_array($this->view['arData']) && sizeof($this->view['arData']) > 0) { ?>

-

-            <table class="table wpsg-table-order table-bordered table-hover table-striped wpsg-table-customer">

-                <thead>

-                    <tr>

-                        <th class="manage-column column-title wpsg_pic_col"></th>

-                        <th class="wpsg_order col_name" data-order="nr"><?php echo __("Nr/Name", 'wpsg'); ?></th>

-                        <th class="wpsg_order col_adress" data-order="adress"><?php echo __("Anschrift", 'wpsg'); ?></th>

-                        <th class="wpsg_order col_status" data-order="status"><?php echo __("Status", 'wpsg'); ?></th>

-                    </tr>

-                </thead>

-                <tbody>

-                    <?php foreach ($this->view['arData'] as $c) { ?>

-                    <tr>

-                        <td class="wpsg_pic_col">

-

-                            <img src="https://www.gravatar.com/avatar/<?php echo md5(strtolower(trim($c->getEMail()))); ?>?s=40&d=mm" alt=""" />

-

-                        </td>

-                        <td class="col_name column-title">

-                            <strong><a title="<?php echo __("Diesen Kunden bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=<?php echo $c->id; ?>" class="row-title"><?php echo trim($c->GetNr().' '.$c->getLabel()); ?></a></strong>

-                            <?php if (strlen($c->getEMail()) > 0) { ?>

-                                <a href="mailto:<?php echo $c->getEMail(); ?>" title="<?php echo __('Dem Kunden eine E-Mail schreiben.', 'wpsg'); ?>"><?php echo $c->getEMail();  ?></a>

-                            <?php } ?>

-                            <div class="row-actions">

-                                <span class="edit"><a title="<?php echo __("Diesen Kunden bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=<?php echo $c->id; ?>"><?php echo __("Bearbeiten", "wpsg"); ?></a></span>

-                                |

-                                <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>

-                                |

-                                <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>

-                            </div>

-                        </td>

-                        <td class="col_adress">

-                            <?php echo ((strlen($c->getCompany()) > 0)?$c->getCompany().'<br />':''); ?>

-                            <?php echo $c->getStreet(); ?><br />

-                            <?php echo trim($c->getZip().' '.$c->getCity()); ?>

-                            <?php /*echo $c->plz.' '.$c->ort.' '.$c->land_kuerzel; */?><br />

-                        </td>

-                        <td class="col_status">

-                            <?php echo wpsg_translate(__('#1# Bestellungen', 'wpsg'), $c->getOrderCount()); ?><br />

-                            <?php echo wpsg_translate(__('Umsatz: #1#', 'wpsg'), wpsg_ff($c->getOrderAmount(), $this->get_option('wpsg_currency'))); ?>

-                            <?php if ($c->getOrderCount() > 0) { ?>

-                            <br />

-                            <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&filter[k_id]=<?php echo $c->id; ?>"><?php echo __('Bestellungen einsehen', 'wpsg'); ?></a>

-                            <?php } ?>

-                        </td>

-                    </tr>

-                    <?php } ?>

-                </tbody>

-            </table>

-

-            <div style="margin-right:-15px;">

-                <?php $this->render(WPSG_PATH_VIEW.'/admin/pager.phtml'); ?>

-            </div>

-

-        <?php } else { ?>

-

-            <?php echo wpsg_drawForm_AdminboxStart(); ?>

-    		<?php echo __('Keine Kunden in der Datenbank.', 'wpsg'); ?>

-            <?php echo wpsg_drawForm_AdminboxEnd(); ?>

-

-        <?php } ?>

-

-    </div>

+    <form method="POST">

+        <div class="content">

+    

+            <?php if (is_array($this->view['arData']) && sizeof($this->view['arData']) > 0) { ?>

+    

+                <table class="table wpsg-table-order table-bordered table-hover table-striped wpsg-table-customer">

+                    <thead>

+                        <tr>

+                            <th class="manage-column column-title wpsg_pic_col">

+                                <input type="checkbox" value="1" id="wpsg_check_all" onclick="return wpsg_customer_checkAll();" name="" />

+                            </th>

+                            <th class="wpsg_order col_name" data-order="nr"><?php echo __("Nr/Name", 'wpsg'); ?></th>

+                            <th class="wpsg_order col_adress" data-order="adress"><?php echo __("Anschrift", 'wpsg'); ?></th>

+                            <th class="wpsg_order col_status" data-order="status"><?php echo __("Status", 'wpsg'); ?></th>

+                        </tr>

+                    </thead>

+                    <tbody>

+                        <?php foreach ($this->view['arData'] as $c) { ?>

+                        <tr>

+                            <td class="wpsg_pic_col">

+    

+                                <img src="https://www.gravatar.com/avatar/<?php echo md5(strtolower(trim($c->getEMail()))); ?>?s=40&d=mm" alt=""" />

+    

+                                <input class="col_set_checkbox" type="checkbox" value="<?php echo $c->id; ?>" name="customer[]" />

+                                

+                            </td>

+                            <td class="col_name column-title">

+                                <strong><a title="<?php echo __("Diesen Kunden bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=<?php echo $c->id; ?>" class="row-title"><?php echo trim($c->GetNr().' '.$c->getLabel()); ?></a></strong>

+                                <?php if (strlen($c->getEMail()) > 0) { ?>

+                                    <a href="mailto:<?php echo $c->getEMail(); ?>" title="<?php echo __('Dem Kunden eine E-Mail schreiben.', 'wpsg'); ?>"><?php echo $c->getEMail();  ?></a>

+                                <?php } ?>

+                                <div class="row-actions">

+                                    <span class="edit"><a title="<?php echo __("Diesen Kunden bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=<?php echo $c->id; ?>"><?php echo __("Bearbeiten", "wpsg"); ?></a></span>

+                                    |

+                                    <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>

+                                    |

+                                    <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>

+                                </div>

+                            </td>

+                            <td class="col_adress">

+                                <?php echo ((strlen($c->getCompany()) > 0)?$c->getCompany().'<br />':''); ?>

+                                <?php echo $c->getStreet(); ?><br />

+                                <?php echo trim($c->getZip().' '.$c->getCity()); ?>

+                                <?php /*echo $c->plz.' '.$c->ort.' '.$c->land_kuerzel; */?><br />

+                            </td>

+                            <td class="col_status">

+                                <?php echo wpsg_translate(__('#1# Bestellungen', 'wpsg'), $c->getOrderCount()); ?><br />

+                                <?php echo wpsg_translate(__('Umsatz: #1#', 'wpsg'), wpsg_ff($c->getOrderAmount(), $this->get_option('wpsg_currency'))); ?>

+                                <?php if ($c->getOrderCount() > 0) { ?>

+                                <br />

+                                <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&filter[k_id]=<?php echo $c->id; ?>"><?php echo __('Bestellungen einsehen', 'wpsg'); ?></a>

+                                <?php } ?>

+                            </td>

+                        </tr>

+                        <?php } ?>

+                    </tbody>

+                </table>

+    

+                <div class="tablenav bottom">

+                    <div class="alignleft actions">

+                        <select name="wpsg_do" id="wpsg_do">

+                            <option value="-1"><?php echo __('Aktion wählen', 'wpsg'); ?></option>

+                            <option value="setAccount"><?php echo __('Kundenkonto zuordnen', 'wpsg'); ?></option> 

+                        </select>

+                        <input type="submit" class="button-secondary" id="doaction" value="<?php echo __('Ausführen', 'wpsg'); ?>" name="wpsg_doaction" />

+                    </div>

+                </div>

+    

+                <div style="margin-right:-15px;">

+                    <?php $this->render(WPSG_PATH_VIEW.'/admin/pager.phtml'); ?>

+                </div>

+    

+            <?php } else { ?>

+    

+                <?php echo wpsg_drawForm_AdminboxStart(); ?>

+                <?php echo __('Keine Kunden in der Datenbank.', 'wpsg'); ?>

+                <?php echo wpsg_drawForm_AdminboxEnd(); ?>

+    

+            <?php } ?>

+    

+        </div>

+    </form>

 

 </div>

 

@@ -189,7 +207,14 @@
     jQuery('th[data-order="<?php echo $this->view['arFilter']['order']; ?>"]').addClass('wpsg_order_<?php echo strtolower($this->view['arFilter']['ascdesc']); ?>');

     <?php } ?>

 

-	function goPage(page)

+    function wpsg_customer_checkAll()

+    {

+

+        jQuery('.col_set_checkbox').each(function() { jQuery(this).prop('checked', !jQuery(this).prop('checked')); } );

+

+    }

+

+    function goPage(page)

 	{

 

 		//if (page <= 0 || page == <?php echo $this->view['arFilter']['page']; ?> || page > <?php echo $this->view['pages']; ?>) return;

diff --git a/views/mods/mod_kundenverwaltung/index_setAccount.phtml b/views/mods/mod_kundenverwaltung/index_setAccount.phtml
new file mode 100644
index 0000000..27a7067
--- /dev/null
+++ b/views/mods/mod_kundenverwaltung/index_setAccount.phtml
@@ -0,0 +1,183 @@
+<?php 

+

+    /*

+     * Template für die Auswahl der Kunden für die Kundenzusammenfassung

+     */

+

+    error_reporting(E_ALL); ini_set("display_errors", "1");

+    

+?>

+

+<div class="wpsg_customer" id="wpsg-bs">

+    <div class="content">

+

+        <form method="POST">

+

+            <input type="hidden" name="wpsg_do" value="setAccount" />

+            

+            <div class="wpsg_customer" id="wpsg-bs">

+            

+                <nav class="navbar navbar-default">

+            

+                    <div class="container-fluid">

+                        <div class="navbar-header">

+                            <a class="navbar-brand" href="#"><?php echo __('wpShopGermany', 'wpsg'); ?></a>

+                        </div>

+                        <div class="collapse navbar-collapse" id="bs-customer-navbar-collapse-1">

+                            <ul class="nav navbar-nav">

+                                <li role="presentation" class=""><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer"><?php echo __("Kundenverwaltung (Übersicht)", "wpsg"); ?></a></li>

+                            </ul>

+                        </div>

+                    </div>

+    

+                    <div class="wpsg-filter wpsg-customer-tab wpsg-customer-tab-0 container-fluid form-horizontal">

+                        <div class="row">

+                            <div class="col-lg-4"> 

+    

+                                <?php echo wpsg_drawForm_Input('filter[s]', __('Suchfeld (Zielkunde)', 'wpsg'), wpsg_getStr($_REQUEST['filter']['s'])); ?>

+                                <?php echo wpsg_drawForm_SubmitButton(__('Kunden suchen')); ?><br />

+

+                            </div>

+                        </div>

+                    </div>

+                    

+                </nav>

+

+                <div class="wpsg_msg_wrap"><hr class="wp-header-end wpsg-wp-header-end"></div>

+                                

+            </div>

+                    

+            <div class="content">

+                <div class="row">

+

+                    <div class="col-lg-6">

+

+                        <fieldset>

+

+                            <legend><?php echo __('Kundenkonto, in das die Kunden überführt werden sollen:', 'wpsg'); ?></legend>

+

+                            <?php if (!wpsg_isSizedArray($this->view['targetCustomer'])) { ?>

+                            

+                                <p>

+                                    <?php echo __('Es konnte kein passender Kunde gefunden werden.', 'wpsg'); ?>

+                                </p>

+                                

+                            <?php } else { ?>

+

+                                <table class="table wpsg-table-order table-bordered table-hover table-striped wpsg-table-customer">

+                                    <thead>

+                                    <tr>

+                                        <th class="manage-column column-title wpsg_pic_col"></th>

+                                        <th class="wpsg_order col_name" data-order="nr"><?php echo __("Nr/Name", 'wpsg'); ?></th>

+                                        <th class="wpsg_order col_adress" data-order="adress"><?php echo __("Anschrift", 'wpsg'); ?></th>

+                                        <th class="wpsg_order col_status" data-order="status"><?php echo __("Status", 'wpsg'); ?></th>

+                                    </tr>

+                                    </thead>

+                                    <tbody>

+                                    <?php foreach ($this->view['targetCustomer'] as $c) { ?>

+                                        <tr>

+                                            <td class="wpsg_pic_col">

+                                                

+                                                <img src="https://www.gravatar.com/avatar/<?php echo md5(strtolower(trim($c->getEMail()))); ?>?s=40&d=mm" alt=""" />                                                

+                                                <input type="radio" name="set_target" value="<?php echo $c->id; ?>" />

+                                                

+                                            </td>

+                                            <td class="col_name column-title">

+                                                <strong><a title="<?php echo __("Diesen Kunden bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=<?php echo $c->id; ?>" class="row-title"><?php echo trim($c->GetNr().' '.$c->getLabel()); ?></a></strong>

+                                                <?php if (strlen($c->getEMail()) > 0) { ?>

+                                                    <a style="margin-bottom:3px; display:block;" href="mailto:<?php echo $c->getEMail(); ?>" title="<?php echo __('Dem Kunden eine E-Mail schreiben.', 'wpsg'); ?>"><?php echo $c->getEMail();  ?></a>

+                                                <?php } ?>

+                                                

+                                                <?php $passwort_saltmd5 = $c->passwort_saltmd5; if (!wpsg_isSizedString($passwort_saltmd5)) { ?>

+                                                <strong class="wpsg_error"><?php echo __('Gastzugang', 'wpsg'); ?></strong>

+                                                <?php } ?>

+                                                

+                                            </td>

+                                            <td class="col_adress">

+                                                <?php echo ((strlen($c->getCompany()) > 0)?$c->getCompany().'<br />':''); ?>

+                                                <?php echo $c->getStreet(); ?><br />

+                                                <?php echo trim($c->getZip().' '.$c->getCity()); ?><br />

+                                            </td>

+                                            <td class="col_status">

+                                                <?php echo wpsg_translate(__('#1# Bestellungen', 'wpsg'), $c->getOrderCount()); ?><br />

+                                                <?php echo wpsg_translate(__('Umsatz: #1#', 'wpsg'), wpsg_ff($c->getOrderAmount(), $this->get_option('wpsg_currency'))); ?>

+                                                <?php if ($c->getOrderCount() > 0) { ?>

+                                                    <br />

+                                                    <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&filter[k_id]=<?php echo $c->id; ?>"><?php echo __('Bestellungen einsehen', 'wpsg'); ?></a>

+                                                <?php } ?>

+                                            </td>

+                                        </tr>

+                                    <?php } ?>

+                                    </tbody>

+                                </table>

+                            

+                                <br />

+                                

+                                <input type="submit" name="submit_do" class="button" value="<?php echo __('Kundenkonten zusammenfügen', 'wpsg'); ?>" />                                       

+                                

+                            <?php } ?>

+

+                        </fieldset>

+

+                    </div>

+                    <div class="col-lg-6">

+

+                        <fieldset>

+

+                            <legend><?php echo __('Gewählte Kunden (Diese werden gelöscht)', 'wpsg'); ?></legend>

+

+                            <table class="table wpsg-table-order table-bordered table-hover table-striped wpsg-table-customer">

+                                <thead>

+                                <tr>

+                                    <th class="manage-column column-title wpsg_pic_col"></th>

+                                    <th class="wpsg_order col_name" data-order="nr"><?php echo __("Nr/Name", 'wpsg'); ?></th>

+                                    <th class="wpsg_order col_adress" data-order="adress"><?php echo __("Anschrift", 'wpsg'); ?></th>

+                                    <th class="wpsg_order col_status" data-order="status"><?php echo __("Status", 'wpsg'); ?></th>

+                                </tr>

+                                </thead>

+                                <tbody>

+                                <?php foreach (@$_REQUEST['customer'] as $customer_id) { $c = wpsg_customer::getInstance($customer_id); ?>

+                                    <tr>

+                                        <td class="wpsg_pic_col">

+                                            <img src="https://www.gravatar.com/avatar/<?php echo md5(strtolower(trim($c->getEMail()))); ?>?s=40&d=mm" alt=""" />

+                                            <input type="hidden" value="<?php echo $c->id; ?>" name="customer[]" />

+                                        </td>

+                                        <td class="col_name column-title">

+                                            <strong><a title="<?php echo __("Diesen Kunden bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=<?php echo $c->id; ?>" class="row-title"><?php echo trim($c->GetNr().' '.$c->getLabel()); ?></a></strong>

+                                            <?php if (strlen($c->getEMail()) > 0) { ?>

+                                                <a href="mailto:<?php echo $c->getEMail(); ?>" title="<?php echo __('Dem Kunden eine E-Mail schreiben.', 'wpsg'); ?>"><?php echo $c->getEMail();  ?></a>

+                                            <?php } ?>

+                                        </td>

+                                        <td class="col_adress">

+                                            <?php echo ((strlen($c->getCompany()) > 0)?$c->getCompany().'<br />':''); ?>

+                                            <?php echo $c->getStreet(); ?><br />

+                                            <?php echo trim($c->getZip().' '.$c->getCity()); ?><br />

+                                        </td>

+                                        <td class="col_status">

+                                            <?php echo wpsg_translate(__('#1# Bestellungen', 'wpsg'), $c->getOrderCount()); ?><br />

+                                            <?php echo wpsg_translate(__('Umsatz: #1#', 'wpsg'), wpsg_ff($c->getOrderAmount(), $this->get_option('wpsg_currency'))); ?>

+                                            <?php if ($c->getOrderCount() > 0) { ?>

+                                                <br />

+                                                <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&filter[k_id]=<?php echo $c->id; ?>"><?php echo __('Bestellungen einsehen', 'wpsg'); ?></a>

+                                            <?php } ?>

+                                        </td>

+                                    </tr>

+                                <?php } ?>

+                                </tbody>

+                            </table>

+

+                        </fieldset>

+

+                    </div>

+

+                </div>

+            </div>                

+                    

+        </form>

+    

+        <?php // wpsg_debug($_REQUEST); ?>

+

+    </div>

+

+</div>

+    
\ No newline at end of file