From 0271bef3d4c28fae86f299b3441f6ca90a49d46d Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Sun, 17 Jul 2016 14:26:40 +0000 Subject: - Export in neues Layout integriert git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5683 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/css/admin.css | 7 + views/js/editable.js | 2 + views/mods/mod_bankalignment/order_ajax.phtml | 4 +- .../mods/mod_bankalignment/product_index_tab.phtml | 21 + .../produkt_index_aftersearch.phtml | 29 -- .../mod_bankalignment/produkt_index_head.phtml | 11 - views/mods/mod_export/product_index_tab.phtml | 37 ++ .../mod_export/produkt_index_aftersearch.phtml | 65 --- views/mods/mod_export/produkt_index_head.phtml | 13 - views/mods/mod_export/profil.phtml | 214 ++++---- views/mods/mod_export/profillist.phtml | 12 +- views/mods/mod_export/settings_edit.phtml | 17 +- views/order/_index.phtml | 566 --------------------- views/order/index.phtml | 376 ++++++++------ views/produkt/index.phtml | 2 +- 15 files changed, 400 insertions(+), 976 deletions(-) create mode 100644 views/mods/mod_bankalignment/product_index_tab.phtml delete mode 100644 views/mods/mod_bankalignment/produkt_index_aftersearch.phtml delete mode 100644 views/mods/mod_bankalignment/produkt_index_head.phtml create mode 100644 views/mods/mod_export/product_index_tab.phtml delete mode 100644 views/mods/mod_export/produkt_index_aftersearch.phtml delete mode 100644 views/mods/mod_export/produkt_index_head.phtml delete mode 100644 views/order/_index.phtml diff --git a/views/css/admin.css b/views/css/admin.css index 299c42b..e54f906 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -9,6 +9,7 @@ #wpsg-bs nav.navbar .glyphicon { margin-right:10px; } #wpsg-bs .wpsg-filter { border-top:1px solid #E0E0E0; padding-top: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; } #wpsg-bs .content { width:100%; box-sizing:border-box; padding-right:20px; } #wpsg-bs .form-group { margin-bottom:5px; margin-top:5px; } @@ -32,6 +33,8 @@ #wpsg-bs .list-group-head a { color:#FFFFFF; } #wpsg-bs .modal-dialog { width:70%; } #wpsg-bs .table-bordered thead { background-color:#FFFFFF; } +#wpsg-bs .table-body-striped > tbody:nth-of-type(odd) { background-color:#f9f9f9; } +#wpsg-bs .checkbox input { margin-top:1px; } /* Allgemeine Klassen */ .wpsg_grey { color:#999999; } @@ -124,6 +127,7 @@ .wpsg_order .col_nr .glyphicon { margin-top:5px; font-size:1.2em; margin-right:5px; text-decoration:none; } .wpsg_order .col_nr .glyphicon.shippingadress { color:red; } .wpsg_order .col_nr .glyphicon.admincomment { color:red; } +.wpsg_order .wpsg-order-tab { padding-top:15px; padding-bottom:15px; } /* Modulverwaltung */ .wpsg_admin_submenu .list-group-item.modul_akt { color:#3c763d; font-weight:bold; } @@ -181,4 +185,7 @@ .wpsg_mod_productvariants_dialog_noDialog .modal-body { padding:1rem 0px; } .wpsg_mod_productvariants_dialog_noDialog .modal-footer { padding:1rem 0px; } +/* Modul Exportprofile */ +#wpsg_profil_list { padding:10px; border:1px solid #DDDDDD; } + #beschreibung_ifr { height:500px; } \ No newline at end of file diff --git a/views/js/editable.js b/views/js/editable.js index 636804e..bc0be99 100644 --- a/views/js/editable.js +++ b/views/js/editable.js @@ -54,6 +54,8 @@ }; } + + if (typeof options.callback == "function") opt.success = options.callback; jQuery(this).editable(opt); diff --git a/views/mods/mod_bankalignment/order_ajax.phtml b/views/mods/mod_bankalignment/order_ajax.phtml index bf8bc4b..d0fa44a 100644 --- a/views/mods/mod_bankalignment/order_ajax.phtml +++ b/views/mods/mod_bankalignment/order_ajax.phtml @@ -3,9 +3,7 @@ /** * Template für die Zuweisung der Bestellungen zu Datensätzen aus der CSV Datei */ - - //wpsg_debug($this->view); - + ?>

diff --git a/views/mods/mod_bankalignment/product_index_tab.phtml b/views/mods/mod_bankalignment/product_index_tab.phtml new file mode 100644 index 0000000..0469fb2 --- /dev/null +++ b/views/mods/mod_bankalignment/product_index_tab.phtml @@ -0,0 +1,21 @@ + + + +
+ + + +
+ +
+ +
+ +
+ diff --git a/views/mods/mod_bankalignment/produkt_index_aftersearch.phtml b/views/mods/mod_bankalignment/produkt_index_aftersearch.phtml deleted file mode 100644 index 8f0d09a..0000000 --- a/views/mods/mod_bankalignment/produkt_index_aftersearch.phtml +++ /dev/null @@ -1,29 +0,0 @@ - -
-
-
-

-
- -

-
- -
- - - -
- - - -
- -
-
-
\ No newline at end of file diff --git a/views/mods/mod_bankalignment/produkt_index_head.phtml b/views/mods/mod_bankalignment/produkt_index_head.phtml deleted file mode 100644 index 92cbcf5..0000000 --- a/views/mods/mod_bankalignment/produkt_index_head.phtml +++ /dev/null @@ -1,11 +0,0 @@ - - \ No newline at end of file diff --git a/views/mods/mod_export/product_index_tab.phtml b/views/mods/mod_export/product_index_tab.phtml new file mode 100644 index 0000000..88672dc --- /dev/null +++ b/views/mods/mod_export/product_index_tab.phtml @@ -0,0 +1,37 @@ + +
+ +
+ view['wpsg_mod_export']['arProfile'] as $p) { ?> +
+
+
+ +
+ +
+ + + + + +
+ + diff --git a/views/mods/mod_export/produkt_index_aftersearch.phtml b/views/mods/mod_export/produkt_index_aftersearch.phtml deleted file mode 100644 index 73ce3cc..0000000 --- a/views/mods/mod_export/produkt_index_aftersearch.phtml +++ /dev/null @@ -1,65 +0,0 @@ - - - -
-
-

-
- -

-
- view['wpsg_mod_export']['arProfile'] as $p) { ?> - - -

- -
-
-
\ No newline at end of file diff --git a/views/mods/mod_export/produkt_index_head.phtml b/views/mods/mod_export/produkt_index_head.phtml deleted file mode 100644 index 23f3759..0000000 --- a/views/mods/mod_export/produkt_index_head.phtml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/views/mods/mod_export/profil.phtml b/views/mods/mod_export/profil.phtml index 96ca6fc..0d525b1 100644 --- a/views/mods/mod_export/profil.phtml +++ b/views/mods/mod_export/profil.phtml @@ -159,109 +159,117 @@

- - - - - - - - view['profil']['data']['fields'] as $f_key => $f) { $i ++; ?> - - - - - - - - - - - - - +
view['fields'] as $fieldgroup) - { - - foreach ($fieldgroup['fields'] as $field_key => $field) - { - - if ($field_key == $f['value']) - { - echo $field; - } - - } - - } - - ?>view['arFormats'][$f['format']]; ?> - -
- - -
+ + + + + + + + + + view['profil']['data']['fields'] as $f_key => $f) { $i ++; ?> + + + + + + + + + + + + + + + +
view['fields'] as $fieldgroup) + { + + foreach ($fieldgroup['fields'] as $field_key => $field) + { + + if ($field_key == $f['value']) + { + echo $field; + } + + } + + } + + ?>
view['arFormats'][$f['format']]; ?>
 + +
+ + +
-
-
-
-
- - -
-
-
- callMod('wpsg_mod_export', 'profilList'); ?> -
-
-
\ No newline at end of file + +

+ +
callMod('wpsg_mod_export', 'profilList'); ?>
\ No newline at end of file diff --git a/views/order/_index.phtml b/views/order/_index.phtml deleted file mode 100644 index 6ca0ad0..0000000 --- a/views/order/_index.phtml +++ /dev/null @@ -1,566 +0,0 @@ - - - -
-

-

- -

- - - - 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 ac3efe8..7130de6 100644 --- a/views/order/index.phtml +++ b/views/order/index.phtml @@ -15,15 +15,27 @@ -
+ + view['tabs'] as $tab_positions) { ?> + $tab) { ?> + + + + +
@@ -115,181 +127,174 @@ writeBackendMessage(); ?> - callMods('produkt_index_head'); ?> - callMods('produkt_index_aftersearch'); ?> -
view['arData']) && sizeof($this->view['arData']) > 0) { ?> - - - - - - - - - - - - - - - - - view['arData'] as $oOrder) { ?> - - - + + + + + + +
- - - - - - getNr(); ?> cdate), false); ?>
- -
- " href="wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=id; ?>"> - | - " href="wp-admin/admin.php?page=wpsg-Order&action=storno&noheader=1&edit_id=id; ?>"> - | - -
+ + + + + + + + + + + + + + + view['arData'] as $oOrder) { ?> + + + + ?> + 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']); ?> - - + + + - - - - - - - - -
+ + + + + + getNr(); ?> cdate), false); ?>
+ +
+ " href="wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=id; ?>"> + | + " href="wp-admin/admin.php?page=wpsg-Order&action=storno&noheader=1&edit_id=id; ?>"> + | + +
- admincomment) != "") { ?> - admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign admincomment" href="#"> - + admincomment) != "") { ?> + admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign admincomment" href="#"> + - comment) != "") { ?> - comment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign customercomment" href="#"> - + comment) != "") { ?> + comment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign customercomment" href="#"> + - hasShippingAdress()) { ?> - " onclick="return false;" class="glyphicon glyphicon-map-marker shippingadress" href="#"> - + hasShippingAdress()) { ?> + " onclick="return false;" class="glyphicon glyphicon-map-marker shippingadress" href="#"> + - hasMod('wpsg_mod_abo')) { ?> - callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id)) === 1) { ?> - callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($oOrder->id)) ?> - callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id)) === 2) { ?> - hasMod('wpsg_mod_abo')) { ?> + callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id)) === 1) { ?> + callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($oOrder->id)) ?> + callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id)) === 2) { ?> + callMod('wpsg_mod_abo', 'getOriginOrder', array($oOrder->id)); - $origin_order_data = $this->cache->loadOrder($origin_order_id); + $origin_order_id = $this->callMod('wpsg_mod_abo', 'getOriginOrder', array($oOrder->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']); ?> - - 		- getCustomer()->firma; if (wpsg_isSizedString($firma)) { ?> -
- - getInvoiceTitle(); ?> getCustomer()->vname; ?> getCustomer()->name; ?> + + + 		+ getCustomer()->firma; if (wpsg_isSizedString($firma)) { ?> +
+ + getInvoiceTitle(); ?> getCustomer()->vname; ?> getCustomer()->name; ?> +
+ getCustomer()->strasse; ?>
+ getCustomer()->plz.' '.$oOrder->getCustomer()->ort); ?> getCustomer()->getCountryKuerzel(); ?> + + 		+ + + getPaymentID() == 4000 && $this->hasMod('wpsg_mod_crefopay')) { ?> + callMod('wpsg_mod_crefopay', 'getOrderPaymentName', array($oOrder->id))); ?> + + getPaymentLabel(); ?> + + + getPaymentAmount() > 0) { ?> +  - getPaymentAmount(), $this->get_option('wpsg_currency')); ?> + + + + + getShippingLabel(); ?> + + getShippingAmount() > 0) { ?> +  - getShippingAmount(), $this->get_option('wpsg_currency')); ?> + + + hasShippingAdress()) { ?>
- getCustomer()->strasse; ?>
- getCustomer()->plz.' '.$oOrder->getCustomer()->ort); ?> getCustomer()->getCountryKuerzel(); ?> - - 		- - - getPaymentID() == 4000 && $this->hasMod('wpsg_mod_crefopay')) { ?> - callMod('wpsg_mod_crefopay', 'getOrderPaymentName', array($oOrder->id))); ?> - - getPaymentLabel(); ?> - - - getPaymentAmount() > 0) { ?> -  - getPaymentAmount(), $this->get_option('wpsg_currency')); ?> - - - - - getShippingLabel(); ?> - - getShippingAmount() > 0) { ?> -  - getShippingAmount(), $this->get_option('wpsg_currency')); ?> - - - hasShippingAdress()) { ?> -
- getShippingTitle(); ?>getShippingFirstName(); ?> getShippingName(); ?>
- - getShippingStreet(); ?> - getShippingZip(); ?> getShippingCity(); ?> getShippingCountryKuerzel(); ?>
- - - 		- - getOrderProducts() as $oOrderProduct) { ?> - #3# für je #4#', 'wpsg'), - $oOrderProduct->getCount(), - WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$oOrderProduct->getProductId(), - $oOrderProduct->getProduct()->getProductName(), - wpsg_ff($oOrderProduct->getAmount(), $this->get_option('wpsg_currency')) - ); ?>
- - - 		- getAmount(), $this->get_option('wpsg_currency')); ?> - - getStateLabel(); ?> -
- -
- - - - - -
- - view['pages'] > 1) { ?> - - - -
- - callMod('wpsg_mod_export', 'produkt_index_foot'); ?> - - + getShippingTitle(); ?>getShippingFirstName(); ?> getShippingName(); ?>
+ + getShippingStreet(); ?> + getShippingZip(); ?> getShippingCity(); ?> getShippingCountryKuerzel(); ?>
+ + + 		+ + getOrderProducts() as $oOrderProduct) { ?> + #3# für je #4#', 'wpsg'), + $oOrderProduct->getCount(), + WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$oOrderProduct->getProductId(), + $oOrderProduct->getProduct()->getProductName(), + wpsg_ff($oOrderProduct->getAmount(), $this->get_option('wpsg_currency')) + ); ?>
+ + + 		+ getAmount(), $this->get_option('wpsg_currency')); ?> + + getStateLabel(); ?> +
+ +
+ + + + + +
+ + view['pages'] > 1) { ?> + + + +
+ + callMod('wpsg_mod_export', 'produkt_index_foot'); ?>

@@ -334,4 +339,43 @@ } // function goPage(page) + jQuery(document).ready(function() { + + jQuery('.wpsg-order-tab-a').bind('click', function() { + + jQuery('.wpsg-order-tab-a').removeClass('active'); + jQuery(this).addClass('active'); + + if (jQuery('.' + jQuery(this).attr("id")).length <= 0) + { + + jQuery('.wpsg-order-tab').slideUp(250); + + } + else + { + + if (jQuery('.wpsg-order-tab:visible').length > 0) + { + + jQuery('.wpsg-order-tab').hide(0); + jQuery('.' + jQuery(this).attr("id")).show(0); + + } + else + { + + jQuery('.wpsg-order-tab').hide(0); + jQuery('.' + jQuery(this).attr("id")).slideDown(250); + + } + + } + + return false; + + } ); + + } ); + /* \ No newline at end of file diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml index 953f358..9e0b34f 100644 --- a/views/produkt/index.phtml +++ b/views/produkt/index.phtml @@ -23,7 +23,7 @@ view['data'])) { ?> - +
-- cgit v1.2.3