From 877575fc7cda4cca6b6ed74c9f086905522598ff Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Sun, 3 Jul 2016 12:17:06 +0000 Subject: - commit to mac git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5637 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/css/admin.css | 8 +- .../mods/mod_fuellmenge/produkt_edit_sidebar.phtml | 4 +- .../produkt_addedit_sidebar.phtml | 8 +- .../produkt_addedit_content.phtml | 6 +- views/order/_index.phtml | 566 +++++++++++++++++ views/order/index.phtml | 674 ++++----------------- views/produkt/addedit.phtml | 2 +- views/produkt/index.phtml | 94 +-- 8 files changed, 756 insertions(+), 606 deletions(-) create mode 100644 views/order/_index.phtml (limited to 'views') diff --git a/views/css/admin.css b/views/css/admin.css index 87fd104..69b814d 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -101,7 +101,13 @@ .wpsg_pic_col { width:50px; } .wpsg_admin_submenu input[type="submit"], .wpsg_admin_submenu input[type="button"] { width:100%; margin-bottom:10px !important; } -/* Modulverwaltung */ +/* Bestellverwaltung */ +.wpsg_order .wpsg_status_link_wrap ul li { list-style:none; float:left; } +.wpsg_order .wpsg_status_link_wrap ul li:after { content:" | "; width:15px; text-align:center; display:inline-block; } +.wpsg_order .wpsg_status_link_wrap ul li:last-child:after { content:""; width:auto; } +.wpsg_order .wpsg-filter { max-width:800px; margin-left:0px; } + + /* Modulverwaltung */ .wpsg_admin_submenu .list-group-item.modul_akt { color:#3c763d; font-weight:bold; } .wpsg_admin_submenu .list-group-item.modul_akt .glyphicon { position:absolute; right:5px; top:5px; color:#3c763d; } .wpsg_admin_submenu .list-group-item.active { color:#dff0d8; } diff --git a/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml b/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml index c3ab7ac..25d9f2b 100644 --- a/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml +++ b/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml @@ -12,8 +12,8 @@
- view['data']['arFeinheiten'], $this->view['data']['feinheit']); ?> - view['data']['fmenge'])); ?> + view['data']['arFeinheiten'], wpsg_getStr($this->view['data']['feinheit'])); ?> + view['data']['fmenge']))); ?> get_option('wpsg_mod_fuellmenge_einheit'), array('help' => 'wpsg_mod_fuellmenge_einheit')); ?> get_option('wpsg_mod_fuellmenge_bezug'), array('help' => 'wpsg_mod_fuellmenge_bezug')); ?> diff --git a/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml b/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml index 78fc497..3a790b8 100644 --- a/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml +++ b/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml @@ -13,16 +13,14 @@
- view['wpsg_mod_productgroups']['data']) <= 0) { ?> + view['wpsg_mod_productgroups']['data'])) { ?>

- view['wpsg_mod_productgroups']['data'], $this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?> + view['wpsg_mod_productgroups']['data'], @$this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?> view['wpsg_mod_productgroups']['sticky_von']); ?> view['wpsg_mod_productgroups']['sticky_bis']); ?> - -

- +
diff --git a/views/mods/mod_produktbilder/produkt_addedit_content.phtml b/views/mods/mod_produktbilder/produkt_addedit_content.phtml index 6304863..08ddb26 100644 --- a/views/mods/mod_produktbilder/produkt_addedit_content.phtml +++ b/views/mods/mod_produktbilder/produkt_addedit_content.phtml @@ -137,10 +137,8 @@ /* ]]> */ - - - -

+

+ view['data']['id'])) { ?>
diff --git a/views/order/_index.phtml b/views/order/_index.phtml new file mode 100644 index 0000000..6ca0ad0 --- /dev/null +++ b/views/order/_index.phtml @@ -0,0 +1,566 @@ + + + +
+

+

+ +

+ + + + writeBackendMessage(); ?> + +
+ + + + + view['filter']['k_id']) && $this->view['filter']['k_id'] > 0) { ?> + + + + view['filter']['k_id']) && $this->view['filter']['k_id'] > 0) { ?> +
    +
  • view['kunde']['vname'].' '.$this->view['kunde']['name']); ?>
    • +
    • +
+
+ +
    + view['arStatus'] as $status_id => $count) { ?> + 0) { ?> +
  • + view['filter']['status']))) { ?> + arStatus[$status_id]; ?> () | + + arStatus[$status_id]; ?> () | + +
    • + + +
  • + view['filter']['status'] == -1) { ?> + (view['count']; ?>) + + (view['countAll']; ?>) + +
    • +
+ +

+ + + +

+ +
+ +
+ +
+ + + + callMods('produkt_index_head'); ?> + +
+ view) ?> +
view['count']); ?> +
+ + « + ‹ + view['pages']; ?> + › + » + +
+ + + +
+ +
+ +
+
+

+
+ +

+
+ + __('Alle', 'wpsg')); + foreach ($this->view['arStatus'] as $status_id => $v) { $arStatus[$status_id] = $this->arStatus[$status_id]; } + + ?> + + view['filter']['search']); ?> + view['filter']['status'], array('id' => 'filter_status')); ?> +
+
+ +
+
+ + +
+
+
+ hasMod('wpsg_mod_rechnungen')) { ?> +
+
+ +
+
+ + +
+
+ + +
+ +
+ " /> + +
+
+
+ + + + + + + + +
+ + callMods('produkt_index_aftersearch'); ?> + + view['data']) && sizeof($this->view['data']) > 0) { ?> +
+ + + + + + + + + + + + + + + hasMod('wpsg_mod_abo')) { ?> + + + + + + + view['data'] as $o) { ?> + + + + + + + + + hasMod('wpsg_mod_abo')) { ?> + + + + + + + + + + + + + + + + hasMod('wpsg_mod_abo')) { ?> + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + getCurrentLanguage()) { $arLang = $this->getStoreLanguages(); $lang = $arLang[$o['language']]; ?> + <?php echo wpsg_translate(__('Bestellung wurde in der Sprache #1# durchgeführt.', 'wpsg'), $lang['name']); ?> + +
+ + + + + + + " onclick="return false;" href=""> + + + +
+ " href="wp-admin/admin.php?page=wpsg-Order&action=view&edit_id="> + | + " href="wp-admin/admin.php?page=wpsg-Order&action=storno&noheader=1&edit_id="> + | + +
+ 		+ +
+ +
+ +
+ + + 		+ + + hasMod('wpsg_mod_crefopay')) { ?> + callMod('wpsg_mod_crefopay', 'getOrderPaymentName', array($o['id']))); ?> + + arPayment[$o['type_payment']]['name']), 'wpsg'); ?> + + + 0) { ?> +
get_option('wpsg_currency')); ?> + + 		+ getShippingTypName()); ?> + 0) { ?> +
get_option('wpsg_currency')); ?> + + 		+ + #3# für je #4#', 'wpsg'), $p['menge'], WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$this->getProduktID($p['id']), $p['name'], wpsg_ff($p['preis'], $this->get_option('wpsg_currency'))); ?>
+ + 		+ get_option('wpsg_currency')); ?> + + callMod('wpsg_mod_abo', 'isAboOrder', array($o['id'])) === 1) { ?> + callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($o['id'])) ?> + callMod('wpsg_mod_abo', 'isAboOrder', array($o['id'])) === 2) { ?> + callMod('wpsg_mod_abo', 'getOriginOrder', array($o['id'])); + $origin_order_data = $this->cache->loadOrder($origin_order_id); + + ?> + callMod('wpsg_mod_abo', 'getOrderAboExpiration', array( + $origin_order_data['id'] + )) ?>
+ #2#', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$origin_order_id, $origin_order_data['onr']); ?> + + 		+ arStatus[$o['status']]); ?> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + +
+ +
view['count']); ?> +
+ + « + ‹ + view['pages']; ?> + › + » + +
+ + + +
+
+
+ + callMod('wpsg_mod_export', 'produkt_index_foot'); ?> + +
+ +

+

+ + +
\ No newline at end of file diff --git a/views/order/index.phtml b/views/order/index.phtml index e62011f..19a8928 100644 --- a/views/order/index.phtml +++ b/views/order/index.phtml @@ -3,562 +3,144 @@ /** * Template für die Übersicht der Bestellungen */ - //wpsg_debug($this->view); + ?> -
-

-

- -

- - + // Nur Richtung ändern + if (wpsg_ascdesc == 'asc') jQuery('#wpsg_ascdesc').val('desc'); + else jQuery('#wpsg_ascdesc').val('asc'); - writeBackendMessage(); ?> - -
- - - - - view['filter']['k_id']) && $this->view['filter']['k_id'] > 0) { ?> - - - - view['filter']['k_id']) && $this->view['filter']['k_id'] > 0) { ?> -
    -
  • view['kunde']['vname'].' '.$this->view['kunde']['name']); ?>
    • -
    • -
-
- -
    - view['arStatus'] as $status_id => $count) { ?> - 0) { ?> -
  • - view['filter']['status']))) { ?> - arStatus[$status_id]; ?> () | - - arStatus[$status_id]; ?> () | - -
    • - - -
  • - view['filter']['status'] == -1) { ?> - (view['count']; ?>) - - (view['countAll']; ?>) - -
    • -
- -

- - - -

- -
- -
- -
- - - - callMods('produkt_index_head'); ?> - -
- view) ?> -
view['count']); ?> -
- - « - ‹ - view['pages']; ?> - › - » - -
- - - -
- -
- -
-
-

-
- -

-
- - __('Alle', 'wpsg')); - foreach ($this->view['arStatus'] as $status_id => $v) { $arStatus[$status_id] = $this->arStatus[$status_id]; } - - ?> - - view['filter']['search']); ?> - view['filter']['status'], array('id' => 'filter_status')); ?> -
-
- -
-
- - -
-
-
- hasMod('wpsg_mod_rechnungen')) { ?> -
-
- -
-
- - -
-
- - -
- -
- " /> - -
-
-
- - - - - - - - -
- - callMods('produkt_index_aftersearch'); ?> - - view['data']) && sizeof($this->view['data']) > 0) { ?> -
- - - - - - - - - - - - - - - hasMod('wpsg_mod_abo')) { ?> - - - - - - - view['data'] as $o) { ?> - - - - - - - - - hasMod('wpsg_mod_abo')) { ?> - - - - - - - - - - - - - - - - hasMod('wpsg_mod_abo')) { ?> - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - getCurrentLanguage()) { $arLang = $this->getStoreLanguages(); $lang = $arLang[$o['language']]; ?> - <?php echo wpsg_translate(__('Bestellung wurde in der Sprache #1# durchgeführt.', 'wpsg'), $lang['name']); ?> - -
- - - - - - - " onclick="return false;" href=""> - - - -
- " href="wp-admin/admin.php?page=wpsg-Order&action=view&edit_id="> - | - " href="wp-admin/admin.php?page=wpsg-Order&action=storno&noheader=1&edit_id="> - | - -
- 		- -
- -
- -
- - - 		- - - hasMod('wpsg_mod_crefopay')) { ?> - callMod('wpsg_mod_crefopay', 'getOrderPaymentName', array($o['id']))); ?> - - arPayment[$o['type_payment']]['name']), 'wpsg'); ?> - - - 0) { ?> -
get_option('wpsg_currency')); ?> - - 		- getShippingTypName()); ?> - 0) { ?> -
get_option('wpsg_currency')); ?> - - 		- - #3# für je #4#', 'wpsg'), $p['menge'], WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$this->getProduktID($p['id']), $p['name'], wpsg_ff($p['preis'], $this->get_option('wpsg_currency'))); ?>
- - 		- get_option('wpsg_currency')); ?> - - callMod('wpsg_mod_abo', 'isAboOrder', array($o['id'])) === 1) { ?> - callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($o['id'])) ?> - callMod('wpsg_mod_abo', 'isAboOrder', array($o['id'])) === 2) { ?> - callMod('wpsg_mod_abo', 'getOriginOrder', array($o['id'])); - $origin_order_data = $this->cache->loadOrder($origin_order_id); - - ?> - callMod('wpsg_mod_abo', 'getOrderAboExpiration', array( - $origin_order_data['id'] - )) ?>
- #2#', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&action=view&edit_id='.$origin_order_id, $origin_order_data['onr']); ?> - - 		- arStatus[$o['status']]); ?> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- - -
- -
view['count']); ?> -
- - « - ‹ - view['pages']; ?> - › - » - -
- - - -
-
-
- - callMod('wpsg_mod_export', 'produkt_index_foot'); ?> - -
- -

-

- - -
\ No newline at end of file + jQuery('#wpsg_order').val(order); + jQuery('#wpsg_ascdesc').val('asc'); + + } + + jQuery('#seite').val(1); + jQuery('#filter_form').submit(); + + return false; + + } // function wpsg_setOrder(order) + +/* \ No newline at end of file diff --git a/views/produkt/addedit.phtml b/views/produkt/addedit.phtml index 900d013..22c4495 100644 --- a/views/produkt/addedit.phtml +++ b/views/produkt/addedit.phtml @@ -44,7 +44,7 @@
- 0) { ?> + diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml index 2a8d6af..67ab128 100644 --- a/views/produkt/index.phtml +++ b/views/produkt/index.phtml @@ -6,51 +6,6 @@ ?> - -
\ No newline at end of file +
+ + \ No newline at end of file -- cgit v1.2.3