From d1473a81a574e685a6e5b8b304d1706b47e08d26 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Mon, 13 Nov 2017 16:33:50 +0000 Subject: - Feature - Kundenzusammenführung über Kundenverwaltung MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6723 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/css/admin.css | 2 + views/mods/mod_kundenverwaltung/index.phtml | 163 ++++++++++-------- .../mod_kundenverwaltung/index_setAccount.phtml | 183 +++++++++++++++++++++ 3 files changed, 279 insertions(+), 69 deletions(-) create mode 100644 views/mods/mod_kundenverwaltung/index_setAccount.phtml 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 @@ +
+ render(WPSG_PATH_VIEW.'/admin/pager.phtml'); ?>
-
- - view['arData']) && sizeof($this->view['arData']) > 0) { ?> - - - - - - - - - - - - view['arData'] as $c) { ?> - - - - - - - - -
- - - - - " href="wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=id; ?>" class="row-title">GetNr().' '.$c->getLabel()); ?> - getEMail()) > 0) { ?> - getEMail(); ?> - -
- " href="wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=id; ?>"> - | - ')) return false;" title="" href="wp-admin/admin.php?page=wpsg-Customer&action=del&edit_id=id; ?>&noheader=1"> - | - - | - -
- 		- getCompany()) > 0)?$c->getCompany().'
':''); ?> - getStreet(); ?>
- getZip().' '.$c->getCity()); ?> - plz.' '.$c->ort.' '.$c->land_kuerzel; */?>
- 		- getOrderCount()); ?>
- getOrderAmount(), $this->get_option('wpsg_currency'))); ?> - getOrderCount() > 0) { ?> -
- - -
- -
- render(WPSG_PATH_VIEW.'/admin/pager.phtml'); ?> -
- - - - - - - - - -
+
+
+ + view['arData']) && sizeof($this->view['arData']) > 0) { ?> + + + + + + + + + + + + view['arData'] as $c) { ?> + + + + + + + + +
+ +
+ + + + + + + " href="wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=id; ?>" class="row-title">GetNr().' '.$c->getLabel()); ?> + getEMail()) > 0) { ?> + getEMail(); ?> + +
+ " href="wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=id; ?>"> + | + ')) return false;" title="" href="wp-admin/admin.php?page=wpsg-Customer&action=del&edit_id=id; ?>&noheader=1"> + | + + | + +
+ 		+ getCompany()) > 0)?$c->getCompany().'
':''); ?> + getStreet(); ?>
+ getZip().' '.$c->getCity()); ?> + plz.' '.$c->ort.' '.$c->land_kuerzel; */?>
+ 		+ getOrderCount()); ?>
+ getOrderAmount(), $this->get_option('wpsg_currency'))); ?> + getOrderCount() > 0) { ?> +
+ + +
+ +
+
+ + +
+
+ +
+ render(WPSG_PATH_VIEW.'/admin/pager.phtml'); ?> +
+ + + + + + + + + +
+
@@ -189,7 +207,14 @@ jQuery('th[data-order="view['arFilter']['order']; ?>"]').addClass('wpsg_order_view['arFilter']['ascdesc']); ?>'); - 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 == view['arFilter']['page']; ?> || page > 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 @@ + + +
+
+ +
+ + + +
+ + + +
+ +
+ +
+
+ +
+ +
+ + + + view['targetCustomer'])) { ?> + +

+ +

+ + + + + + + + + + + + + + view['targetCustomer'] as $c) { ?> + + + + + + + + +
+ + + + + + " href="wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=id; ?>" class="row-title">GetNr().' '.$c->getLabel()); ?> + getEMail()) > 0) { ?> + getEMail(); ?> + + + passwort_saltmd5; if (!wpsg_isSizedString($passwort_saltmd5)) { ?> + + + + + getCompany()) > 0)?$c->getCompany().'
':''); ?> + getStreet(); ?>
+ getZip().' '.$c->getCity()); ?>
+ 		+ getOrderCount()); ?>
+ getOrderAmount(), $this->get_option('wpsg_currency'))); ?> + getOrderCount() > 0) { ?> +
+ + +
+ +
+ + + + + +
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + + " href="wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=id; ?>" class="row-title">GetNr().' '.$c->getLabel()); ?> + getEMail()) > 0) { ?> + getEMail(); ?> + + + getCompany()) > 0)?$c->getCompany().'
':''); ?> + getStreet(); ?>
+ getZip().' '.$c->getCity()); ?>
+ 		+ getOrderCount()); ?>
+ getOrderAmount(), $this->get_option('wpsg_currency'))); ?> + getOrderCount() > 0) { ?> +
+ + +
+ +
+ +
+ +
+
+ +
+ + + +
+ +
+ \ No newline at end of file -- cgit v1.2.3