From 7141460e4adf63b9b9514f0ee5beef2cd978cbda Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Sat, 10 Sep 2016 16:59:33 +0000 Subject: -To Mac git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5751 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/css/admin.css | 3 +- views/gfx/no_gravatar.png | Bin 0 -> 809 bytes views/mods/mod_customergroup/addedit.phtml | 203 ++++----------- views/mods/mod_customergroup/index.phtml | 347 +++++++++++--------------- views/mods/mod_export/order_index_tab.phtml | 35 +++ views/mods/mod_export/product_index_tab.phtml | 37 --- views/mods/mod_kundenverwaltung/index.phtml | 22 +- views/mods/mod_productgroups/index.phtml | 190 ++++++++++---- views/order/index.phtml | 45 ++-- 9 files changed, 395 insertions(+), 487 deletions(-) create mode 100644 views/gfx/no_gravatar.png create mode 100644 views/mods/mod_export/order_index_tab.phtml delete mode 100644 views/mods/mod_export/product_index_tab.phtml diff --git a/views/css/admin.css b/views/css/admin.css index b98f494..0f0a380 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -7,7 +7,8 @@ #wpsg-bs nav.navbar li { margin-bottom:0px; } #wpsg-bs nav.navbar .active { margin-right:2px; } #wpsg-bs nav.navbar .glyphicon { margin-right:10px; } -#wpsg-bs .wpsg-filter { border-top:1px solid #E0E0E0; padding-top:15px; } +#wpsg-bs .wpsg-filter-tab, +#wpsg-bs .wpsg-filter { border-top:1px solid #E0E0E0; padding:15px; } #wpsg-bs .pagination_wrap { text-align:right; padding-right:20px; } #wpsg-bs .pagination_wrap_bottom { padding-right:0px; } #wpsg-bs .pagination { margin-top:0px; margin-bottom:10px; } diff --git a/views/gfx/no_gravatar.png b/views/gfx/no_gravatar.png new file mode 100644 index 0000000..63675c0 Binary files /dev/null and b/views/gfx/no_gravatar.png differ diff --git a/views/mods/mod_customergroup/addedit.phtml b/views/mods/mod_customergroup/addedit.phtml index d3a2019..dc6bc68 100644 --- a/views/mods/mod_customergroup/addedit.phtml +++ b/views/mods/mod_customergroup/addedit.phtml @@ -5,159 +5,56 @@ */ ?> -
-

- -

- view['mode'] == 'edit') { ?> - - - - -

-
- - writeBackendMessage(); ?> - -
- - view['mode'] == 'edit') { ?> - - - -
- -
- -
- - callMods('customergroup_edit', array(&$this->view['data'])); ?> - -
- +
+ + + +
+ + writeBackendMessage(); ?> + +
+ +
+ + + view['mode'] == 'edit') { ?> + + + + callMods('customergroup_edit', array(&$this->view['data'])); ?> + + view['data']->name); ?> + __('Standard', 'wpsg'), + WPSG_BRUTTO => __('Brutto (inkl. Steuer)', 'wpsg'), + WPSG_NETTO => __('Netto (zzgl. Steuer)', 'wpsg') + ), @$this->view['data']->calculation); ?> + + + + + + +
+ +
+ +
\ No newline at end of file diff --git a/views/mods/mod_customergroup/index.phtml b/views/mods/mod_customergroup/index.phtml index 8542227..6503a76 100644 --- a/views/mods/mod_customergroup/index.phtml +++ b/views/mods/mod_customergroup/index.phtml @@ -5,213 +5,150 @@ */ ?> -
- -

- -

- - -

- - writeBackendMessage(); ?> - -
- - view['data']) > 0) { ?> -

- - - -

- - -
- - view['data']) > 0) { ?> -
view['count']); ?> -
- - « - ‹ - view['pages']; ?> - › - » - -
- - - -
+ +
+ + + + view['pages'] > 1) { ?> + + + +
+ + writeBackendMessage(); ?> + +
+ + view['arData']) && sizeof($this->view['arData']) > 0) { ?> + + + + + + + + + + + view['arData'] as $oCustomerGroup) { ?> + + + + + + + +
+ name); ?> +
+ " href="wp-admin/admin.php?page=wpsg-Customergroup&action=edit&edit_id=id; ?>"> + | + " href="wp-admin/admin.php?page=wpsg-Customer&customergroup=id; ?>"> + | + ')) return false;" title="" href="wp-admin/admin.php?page=wpsg-Customergroup&action=del&edit_id=id; ?>&noheader=1"> +
+ 		+ calculation == WPSG_BRUTTO) { ?> + + calculation == WPSG_NETTO) { ?> + + + + + + customercount); ?> +
+ + view['pages'] > 1) { ?> + + + + +

+ + +
+ +
+ + \ No newline at end of file diff --git a/views/mods/mod_export/order_index_tab.phtml b/views/mods/mod_export/order_index_tab.phtml new file mode 100644 index 0000000..870b23f --- /dev/null +++ b/views/mods/mod_export/order_index_tab.phtml @@ -0,0 +1,35 @@ + +
+ +
+
+ + view['wpsg_mod_export']['arProfile'] as $p) { ?> + $p['id'])); ?> + + +
+ +
+
+ + + +
+ + diff --git a/views/mods/mod_export/product_index_tab.phtml b/views/mods/mod_export/product_index_tab.phtml deleted file mode 100644 index 88672dc..0000000 --- a/views/mods/mod_export/product_index_tab.phtml +++ /dev/null @@ -1,37 +0,0 @@ - -
- -
- view['wpsg_mod_export']['arProfile'] as $p) { ?> -
-
-
- -
- -
- - - - - -
- - diff --git a/views/mods/mod_kundenverwaltung/index.phtml b/views/mods/mod_kundenverwaltung/index.phtml index 706ca72..3494ddb 100644 --- a/views/mods/mod_kundenverwaltung/index.phtml +++ b/views/mods/mod_kundenverwaltung/index.phtml @@ -33,12 +33,12 @@
- + - - + + - + view['arFilter']['s'])); ?>
@@ -77,7 +77,7 @@ - + @@ -87,9 +87,11 @@ + + - " href="wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=id; ?>" class="row-title">getLabel(); ?> + " href="wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=id; ?>" class="row-title">GetNr().' '.$c->getLabel()); ?> getEMail()) > 0) { ?> getEMail(); ?> @@ -143,17 +145,17 @@
-view['search']); ?> + \ No newline at end of file diff --git a/views/order/index.phtml b/views/order/index.phtml index 7130de6..c932ec3 100644 --- a/views/order/index.phtml +++ b/views/order/index.phtml @@ -16,14 +16,14 @@ @@ -31,7 +31,7 @@ view['tabs'] as $tab_positions) { ?> $tab) { ?> - + @@ -40,12 +40,13 @@
- - - + + + view['arFilter']['s'])); ?> - __('Alle', 'wpsg')), $this->arStatus), $this->view['arFilter']['status']); ?> + view['arFilter']['k_id'])); ?> + __('Alle', 'wpsg')), $this->arStatus), @$this->view['arFilter']['status']); ?>
@@ -89,7 +90,7 @@
true)); ?> -

+
@@ -305,7 +306,7 @@