fix: #34

bin/backend/controls/Administration.js

@@ -711,7 +711,7 @@ define('package/quiqqer/customer/bin/backend/controls/Administration', [
             var rowData = this.$Grid.getDataByRow(data.row);
 
             if (data.cell.get('data-index') === 'customerId' || data.cell.get('data-index') === 'regdate') {
-                this.$openCustomer(rowData.customerId);
+                this.$openCustomer(rowData.user_id);
                 return;
             }
 
@@ -720,7 +720,7 @@ define('package/quiqqer/customer/bin/backend/controls/Administration', [
                     data.cell.get('data-index') === 'lastname' ||
                     data.cell.get('data-index') === 'usergroup_display' ||
                     data.cell.get('data-index') === 'email')) {
-                this.$openCustomer(rowData.customerId);
+                this.$openCustomer(rowData.user_id);
                 return;
             }
 
@@ -783,7 +783,7 @@ define('package/quiqqer/customer/bin/backend/controls/Administration', [
                         text  : QUILocale.get(lg, 'administration.contextMenu.user'),
                         events: {
                             onClick: function () {
-                                self.$openCustomer(rowData.customerId);
+                                self.$openCustomer(rowData.user_id);
                             }
                         }
                     })

src/QUI/ERP/Customer/Search.php

@@ -240,6 +240,7 @@ protected function parseListForGrid($data)
                 'id'         => (int)$entry['id'],
                 'customerId' => $entry['customerId'],
                 'status'     => !!$entry['active'],
+                'user_id'    => (int)$entry['user_id'],
                 'username'   => $entry['username'],
                 'firstname'  => $entry['firstname'],
                 'lastname'   => $entry['lastname'],
@@ -489,6 +490,7 @@ protected function getQuery($count = false)
                     SELECT COUNT(users.id) AS count
                     FROM {$table} as users 
                         LEFT JOIN users_address AS ad ON users.id = ad.uid
+                        AND users.address = ad.id
                     {$whereQuery}
                 ",
                 'binds' => $binds
@@ -503,7 +505,8 @@ protected function getQuery($count = false)
                 users.`email` as user_email,
                 users.*, ad.*
                 FROM {$table} as users
-                     LEFT JOIN users_address AS ad ON users.id = ad.uid
+                     LEFT JOIN users_address AS ad ON users.id = ad.uid 
+                     AND users.address = ad.id
                 {$whereQuery}
                 ORDER BY {$order}
                 {$limit}