Index: /changelog
===================================================================
--- /changelog	(revision 6722)
+++ /changelog	(revision 6723)
@@ -22,2 +22,5 @@
 - Feature - Bestelldaten in Kopf der Bestellansicht
 - Feature - Kundenkommentar in Bestallansicht
+
+#4.0.1
+- Feature - KundenzusammenfÃŒhrung ÃŒber Kundenverwaltung
Index: /model/wpsg_customer.class.php
===================================================================
--- /model/wpsg_customer.class.php	(revision 6722)
+++ /model/wpsg_customer.class.php	(revision 6723)
@@ -414,4 +414,5 @@
 				FROM
 					`".WPSG_TBL_KU."` AS K
+					    ".$strQueryJOIN."
 				WHERE
 					1
@@ -446,4 +447,6 @@
 			$strQueryJOIN = "";
 			$strQueryHAVING = "";
+            
+            $bJoinAdress = false;            
 
 			$strQuerySELECT .= ",
@@ -462,8 +465,10 @@
 			{
 
+			    $bJoinAdress = true;
+			    
 				$strQueryWHERE .= " 
 					AND (
-						K.`name` LIKE '%".wpsg_q($arFilter['s'])."%' OR
-						K.`vname` LIKE '%".wpsg_q($arFilter['s'])."%' OR
+						CA.`name` LIKE '%".wpsg_q($arFilter['s'])."%' OR
+						CA.`vname` LIKE '%".wpsg_q($arFilter['s'])."%' OR
 						K.`email` LIKE '%".wpsg_q($arFilter['s'])."%' OR
 						K.`id` = '".wpsg_q($arFilter['s'])."' OR
@@ -482,9 +487,16 @@
 			else if (wpsg_isSizedString($arFilter['order'], 'status')) { $strQueryORDER = " order_count "; }
 			else $strQueryORDER = " K.`id` ";
-
+            
 			// Richtung
 			if (wpsg_isSizedString($arFilter['ascdesc'], "DESC")) $strQueryORDER .= " DESC ";
 			else $strQueryORDER .= " ASC ";
-				
+
+            if ($bJoinAdress)
+            {
+                
+                $strQueryJOIN .= " LEFT JOIN `".WPSG_TBL_ADRESS."` AS CA ON (CA.`id` = K.`adress_id`) ";
+                
+            }
+            
 			return array($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER);
 				
Index: /mods/wpsg_mod_kundenverwaltung.class.php
===================================================================
--- /mods/wpsg_mod_kundenverwaltung.class.php	(revision 6722)
+++ /mods/wpsg_mod_kundenverwaltung.class.php	(revision 6723)
@@ -73,5 +73,5 @@
 		public function be_ajax() 
 		{ 
-			
+					    
 			if ($_REQUEST['wpsg_mod_kundenverwaltung_setActiv'] == '1')
 			{
@@ -207,4 +207,50 @@
 			add_action('widgets_init', create_function('', 'return register_widget("wpsg_kundenverwaltung_widget");'));
 			
+            if (is_admin())
+            {
+
+                if (wpsg_isSizedString($_REQUEST['wpsg_do'], 'setAccount') && !wpsg_isSizedArray($_REQUEST['customer']))
+                {
+
+                    $this->shop->addBackendError(__('Bitte mindestens einen Kunden wÃ€hlen.', 'wpsg'));
+                    $this->shop->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Customer');
+                    
+                }
+                else if (wpsg_isSizedString($_REQUEST['wpsg_do'], 'setAccount') && isset($_REQUEST['submit_do']) && !wpsg_isSizedInt($_REQUEST['set_target']))
+                {
+                    
+                    $this->shop->addBackendError(__('Kein Zielkunde ausgewÃ€hlt.', 'wpsg'));
+                    unset($_REQUEST['submit_do']);
+                    
+                }
+                else if (isset($_REQUEST['submit_do']))
+                {
+
+                    // Hier die Kunden zusammenfÃŒhren, damit ich umleiten kann
+                    $nOrder = 0;
+                    
+                    foreach ($_REQUEST['customer'] as $customer_id)
+                    {
+                    
+                        if ($customer_id != $_REQUEST['set_target'])
+                        {
+                            
+                            $oCustomer = wpsg_customer::getInstance($customer_id);
+                            $nOrder += $oCustomer->getOrderCount();
+
+                            $this->db->UpdateQuery(WPSG_TBL_ORDER, array(
+                                'k_id' => wpsg_q($_REQUEST['set_target'])
+                            ), " `k_id` = '".wpsg_q($customer_id)."' ");
+                            
+                        }
+                        
+                    }
+                    
+                    $this->shop->addBackendMessage(wpsg_translate(__('#1# Bestellung(en) dem Kundenkonto zugeordnet.', 'wpsg'), $nOrder));
+                                        
+                }
+                
+            }
+            
 		} // public function load()
 		
@@ -1476,5 +1522,5 @@
 			");
 			
-			if (!wpsg_isSizedArray($arData)) { $this->addBackendError(__('Keine Daten zum Exportieren vorhanden.', 'wpsg')); $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Customer&amp;action=index'); return; }
+			if (!wpsg_isSizedArray($arData)) { $this->shop->addBackendError(__('Keine Daten zum Exportieren vorhanden.', 'wpsg')); $this->redirect(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Customer&amp;action=index'); return; }
 						
 			$mb = new wpsg_mod_basic();
@@ -1879,4 +1925,19 @@
 		} // private function be_saveAction()
 		
+        private function be_index_setAccount()
+        {
+ 
+            if (isset($_REQUEST['submit-button']) || isset($_REQUEST['submit_do']))
+            {
+                
+                $this->shop->view['targetCustomer'] = wpsg_customer::find(array(
+                    's' => $_REQUEST['filter']['s']
+                ));
+            }
+                       
+            $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/index_setAccount.phtml');
+                        
+        }
+        
 		/**
 		 * Ãbersicht ÃŒber die Kunden im Backend
@@ -1884,5 +1945,12 @@
 		private function be_indexAction()
 		{
-			
+			 
+		    if (isset($_REQUEST['wpsg_do']) && $_REQUEST['wpsg_do'] !== '-1')
+            {
+                
+                if ($_REQUEST['wpsg_do'] === 'setAccount') return $this->be_index_setAccount();
+                
+            }
+            
 			$nPerPage = $this->shop->get_option('wpsg_mod_kundenverwaltung_perpage');
 			if ($nPerPage <= 0) $nPerPage = 10;
@@ -1927,183 +1995,5 @@
 
 			$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/index.phtml');
-			
-			  
-			/*
-			// NEU von Shop V3  $strQuery ist unvollstÃ€ndig
-			$strQueryWHERE = "";
-				
-			if (isset($_REQUEST['s']) && $_REQUEST['s'] != '')
-			{
-			
-				$strQueryWHERE .= "
-					AND (
-						IF (CA.`id` > 0, CA.`name`, K.`name`) LIKE '%".wpsg_q($_REQUEST['s'])."%' OR
-						IF (CA.`id` > 0, CA.`vname`, K.`vname`) LIKE '%".wpsg_q($_REQUEST['s'])."%' OR
-						K.`email` LIKE '%".wpsg_q($_REQUEST['s'])."%' OR
-						K.`id` = '".wpsg_q($_REQUEST['s'])."' OR
-						K.`knr` LIKE '%".wpsg_q($_REQUEST['s'])."%'
-					)
-				";
-			
-			}
-			
-			if ($this->shop->hasMod('wpsg_mod_customergroup'))
-			{
-					
-				if (isset($_REQUEST['customergroup']) && $_REQUEST['customergroup'] > 0)
-				{
-						
-					$strQueryWHERE .= " AND `group_id` = '".wpsg_q($_REQUEST['customergroup'])."' ";
-						
-				}
-				else if (isset($_REQUEST['customergroup']) && $_REQUEST['customergroup'] === '0')
-				{
-						
-					$strQueryWHERE .= " AND (`group_id` = 0 OR `group_id` IS NULL) ";
-						
-				}
-			
-			}
-				
-			// Damit "Geisterkunden" aus unvollstÃ€ndigen Bestellungen nicht erscheinen
-			//$strQueryWHERE .= " AND K.`email` != '' ";
-				
-			$nPerPage = $this->shop->get_option('wpsg_mod_kundenverwaltung_perpage');
-			if ($nPerPage <= 0) $nPerPage = 10;
-				
-			if (isset($_REQUEST['seite'])) $seite = $_REQUEST['seite']; else $seite = 1;
-				
-			$this->shop->view['count'] = $this->db->fetchOne("
-				SELECT
-					COUNT(*)
-				FROM
-					(
-						SELECT
-							K.`id`,
-							(SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` != '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count,
-							(SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` = '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count_incomplete
-						FROM
-							`".WPSG_TBL_KU."` AS K
-								LEFT JOIN `".WPSG_TBL_ADRESS."` AS CA ON (CA.`id` = K.`adress_id`)
-						WHERE
-							(
-								IF (CA.`id` > 0, CA.`vname`, K.`vname`) != '' OR
-								IF (CA.`id` > 0, CA.`name`, K.`name`) != '' OR
-								K.`email` != ''
-							)
-							AND K.`deleted` != '1'
-							".$strQueryWHERE."
-					) AS OUTER_TABLE
-			");
-			
-			$this->shop->view['seite'] = $seite;
-			$this->shop->view['pages'] = ceil($this->shop->view['count'] / $nPerPage);
-			if ($this->shop->view['seite'] <= 0 || $this->shop->view['seite'] > $this->shop->view['pages']) $this->shop->view['seite'] = 1;
-			
-			if (isset($_REQUEST['filter']))
-				$this->shop->view['filter'] = $_REQUEST['filter'];
-			else
-				$this->shop->view['filter'] = array();
-					
-				$strQueryORDER = '';
-					
-				if (!isset($this->shop->view['filter']['order']))
-				{
-						
-					$this->shop->view['filter']['order'] = 'nr';
-						
-				}
-					
-				switch ($this->shop->view['filter']['order'])
-				{
-						
-					case 'name': $strQueryORDER .= "`order_name`"; break;
-					case 'adress': $strQueryORDER = "`order_adress`"; break;
-					case 'status': $strQueryORDER = "`order_count`"; break;
-					default: $strQueryORDER = " `order_nr` "; break;
-						
-				}
-						
-				if (!isset($this->shop->view['filter']['ascdesc']))
-				{
-						
-					$this->shop->view['filter']['ascdesc'] = 'DESC';
-						
-				}
-					
-				if (wpsg_isSizedString($this->shop->get_option('wpsg_order_knr'), '1')) $strQueryORDERNR = " `knr` AS `order_nr` ";
-				else $strQueryORDERNR = " CAST(`knr` AS UNSIGNED) AS `order_nr` ";
-		
-				// Das HAVING ist so "kompliziert" weil ich erreichen wollte das Kunden die gÃ€nzlich keine Bestellungen haben dennoch angezeigt werden
-				// Kunden die aber nur unvollstÃ€ndige Bestellungen haben aber nicht
-				$strQuery = "
-				SELECT
-					K.*,
-					IF (CA.`id` > 0, CA.`title`, K.`title`) AS `title`,
-					IF (CA.`id` > 0, CA.`name`, K.`name`) AS `name`,
-					IF (CA.`id` > 0, CA.`vname`, K.`vname`) AS `vname`,
-					IF (CA.`id` > 0, CA.`firma`, K.`firma`) AS `firma`,
-					IF (CA.`id` > 0, CA.`fax`, K.`fax`) AS `fax`,
-					IF (CA.`id` > 0, CA.`strasse`, K.`strasse`) AS `strasse`,
-					IF (CA.`id` > 0, CA.`nr`, '') AS `nr`,
-					IF (CA.`id` > 0, CA.`plz`, K.`plz`) AS `plz`,
-					IF (CA.`id` > 0, CA.`ort`, K.`ort`) AS `ort`,
-					IF (CA.`id` > 0, CA.`land`, K.`land`) AS `land`,
-					IF (CA.`id` > 0, CA.`tel`, K.`tel`) AS `tel`,
-					IF (CA.`id` > 0, CAL.`kuerzel`, L.`kuerzel`) AS land_kuerzel,
-					IF (CA.`id` > 0, CONCAT(CA.`firma`, ' ', CA.`strasse`, ' ', CA.`plz`, ' ', CA.`ort`), CONCAT(K.`firma`, ' ', K.`strasse`, ' ', K.`plz`, ' ', K.`ort`)) AS `order_adress`,
-					IF (CA.`id` > 0, CONCAT(CA.`vname`, ' ', CA.`name`), CONCAT(K.`vname`, ' ', K.`name`)) AS `order_name`,
-					".$strQueryORDERNR.",
-					(SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` != '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count,
-					(SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` = '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count_incomplete,
-					(SELECT SUM(`price_gesamt`) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` IN (100, 110)) as order_umsatz
-				FROM
-					`".WPSG_TBL_KU."` AS K
-						LEFT JOIN `".WPSG_TBL_ADRESS."` AS CA ON (CA.`id` = K.`adress_id`)
-						LEFT JOIN `".WPSG_TBL_LAND."` AS CAL ON (CAL.`id` = CA.`land`)
-						LEFT JOIN `".WPSG_TBL_LAND."` AS L ON (K.`land` = L.`id`)
-				WHERE
-					(
-						IF (CA.`id` > 0, CA.`vname`, K.`vname`) != '' OR
-						IF (CA.`id` > 0, CA.`name`, K.`name`) != '' OR
-						K.`email` != ''
-					)
-					AND K.`deleted` != '1'
-					".$strQueryWHERE."
-				ORDER BY
-					".$strQueryORDER." ".wpsg_q($this->shop->view['filter']['ascdesc']).", K.`id` DESC
-				LIMIT
-					".(($this->shop->view['seite'] - 1) * $nPerPage).", ".$nPerPage."
-			";
-			
-				$this->shop->view['data'] = $this->db->fetchAssoc($strQuery);
-		
-				// Kundengruppen laden
-				if ($this->shop->hasMod('wpsg_mod_customergroup'))
-				{
-							
-					$this->shop->view['arCustomergroup'] = $this->db->fetchAssocField("
-					SELECT
-						KG.`id`, CONCAT(KG.`name`, ' (ID:', KG.`id`, ')') AS `name`
-					FROM
-						`".WPSG_TBL_KG."` AS KG
-					ORDER BY
-						KG.`name` ASC
-				", "id", "name");
-			
-				}
-			
-				foreach ($this->shop->view['data'] as $k => $customer_db)
-				{
-		
-					$this->shop->view['data'][$k]['oCustomer'] = new wpsg_customer();
-					$this->shop->view['data'][$k]['oCustomer']->load($customer_db['id']);
-					$this->shop->view['data'][$k]['order_umsatz'] = $this->shop->view['data'][$k]['oCustomer']->getOrderAmount(array(100, 110));
-		
-				}
-					
-				$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/index.phtml');
-				*/
-			
+			 			
 		} // private function be_indexAction()
 				
Index: /views/css/admin.css
===================================================================
--- /views/css/admin.css	(revision 6722)
+++ /views/css/admin.css	(revision 6723)
@@ -83,4 +83,6 @@
 #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 */
Index: /views/mods/mod_kundenverwaltung/index.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/index.phtml	(revision 6722)
+++ /views/mods/mod_kundenverwaltung/index.phtml	(revision 6723)
@@ -109,76 +109,94 @@
     </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>
@@ -190,5 +208,12 @@
     <?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)
 	{
 
Index: /views/mods/mod_kundenverwaltung/index_setAccount.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/index_setAccount.phtml	(revision 6723)
+++ /views/mods/mod_kundenverwaltung/index_setAccount.phtml	(revision 6723)
@@ -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>
+    
