From 8d3c609f7b39b9db6ba853062310ee84e5cec252 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Sun, 10 Jul 2016 18:00:34 +0000 Subject: - Bestellübersicht erneuert - Bestellobjekt erweitert, damit besser gefiltert werden kann MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5674 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/form/text.phtml | 5 + views/css/admin.css | 30 ++- views/js/admin.js | 17 +- views/mods/mod_rechnungen/rechnung_pdf.phtml | 2 +- views/order/index.phtml | 317 +++++++++++++++++++++------ views/order/view.phtml | 2 +- views/produkt/index.phtml | 131 ++--------- 7 files changed, 318 insertions(+), 186 deletions(-) diff --git a/views/admin/form/text.phtml b/views/admin/form/text.phtml index cde674a..49591f9 100644 --- a/views/admin/form/text.phtml +++ b/views/admin/form/text.phtml @@ -4,7 +4,12 @@
+ + view['field_config']['noP'])) { ?> + view['field_value']; ?> +

view['field_value']; ?>

+ view['field_config']['help'])) { ?> diff --git a/views/css/admin.css b/views/css/admin.css index 69b814d..299c42b 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -31,6 +31,20 @@ #wpsg-bs .wpsg_admin_submenu .list-group-item.active { color:#FFFFFF; } #wpsg-bs .list-group-head a { color:#FFFFFF; } #wpsg-bs .modal-dialog { width:70%; } +#wpsg-bs .table-bordered thead { background-color:#FFFFFF; } + +/* Allgemeine Klassen */ +.wpsg_grey { color:#999999; } + +/* Tabellensortierung */ +.wpsg-table-order .wpsg_order { position:relative; } +.wpsg-table-order .wpsg_order:after { content:"\e150"; position:absolute; font-size:1em; font-weight:normal; bottom:8px; right:8px; display:block; font-family:'Glyphicons Halflings'; opacity:0.2; color:#337AB7; } +.wpsg-table-order .wpsg_order:hover { cursor:pointer; } +.wpsg-table-order .wpsg_order:hover:after { content:"\e155"; opacity:0.8; } +.wpsg-table-order .wpsg_order.wpsg_order_asc:after { content:"\e155"; opacity:1; } +.wpsg-table-order .wpsg_order.wpsg_order_desc:after { content:"\e156"; opacity:1; } +.wpsg-table-order .wpsg_order.wpsg_order_asc:hover:after { content:"\e156"; } +.wpsg-table-order .wpsg_order.wpsg_order_desc:hover:after { content:"\e155"; } /* Inline Edit */ #wpsg-bs .editableform > .control-group > div { padding-left:15px; padding-right:15px; } @@ -102,12 +116,16 @@ .wpsg_admin_submenu input[type="submit"], .wpsg_admin_submenu input[type="button"] { width:100%; margin-bottom:10px !important; } /* 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_order .wpsg_status_link_wrap { min-height:50px; float:left; display:inline-block; } +.wpsg_order .col_checkbox { width:20px; } +.wpsg_order .col_checkbox input { margin-top:-2px; } +.wpsg_order .col_nr { width:200px; } +.wpsg_order .col_nr .actions a { font-size:0.9em; } +.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; } + +/* 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/js/admin.js b/views/js/admin.js index a8b254d..c7e9276 100644 --- a/views/js/admin.js +++ b/views/js/admin.js @@ -148,7 +148,22 @@ function wpsg_in_array(needle, haystack) } jQuery(document).ready(function() { - + + // Sortierung + jQuery('th.wpsg_order').bind('click', function() { + + var direction = "ASC"; + if (jQuery(this).hasClass('wpsg_order_asc') && jQuery('#wpsg_order').val() == jQuery(this).attr("data-order")) direction = "DESC"; + + jQuery('#wpsg_ascdesc').val(direction); + jQuery('#wpsg_order').val(jQuery(this).attr("data-order")); + + jQuery('#filter_form').submit(); + + return false; + + } ); + // Hilfe Tooltips jQuery('*[data-wpsg-tip]').bind('click', function() { diff --git a/views/mods/mod_rechnungen/rechnung_pdf.phtml b/views/mods/mod_rechnungen/rechnung_pdf.phtml index c9bbf15..768895d 100644 --- a/views/mods/mod_rechnungen/rechnung_pdf.phtml +++ b/views/mods/mod_rechnungen/rechnung_pdf.phtml @@ -449,7 +449,7 @@ $pdf->Cell(10, 8, $pnr.'.', 1, 0, 'C'); $pnr ++; $pdf->setXY($prod_left + 10, $prod_top + $offset); - $pdf->Cell( ((sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), 8, wpsg_translate(__('Versandkosten "#1#"', 'wpsg'), $this->view['oOrder']->getShippingTypName()), 1, 0, 'L'); + $pdf->Cell( ((sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1')?87:102), 8, wpsg_translate(__('Versandkosten "#1#"', 'wpsg'), $this->view['oOrder']->getShippingLabel()), 1, 0, 'L'); if (sizeof($this->view['basket']['mwst']) >= 1 || $this->get_option('wpsg_showMwstAlways') == '1') { diff --git a/views/order/index.phtml b/views/order/index.phtml index 19a8928..ac3efe8 100644 --- a/views/order/index.phtml +++ b/views/order/index.phtml @@ -19,42 +19,65 @@
    - - view['data'])) { ?> - - +
-
+
- - - - -
-
-
- -
-
- arStatus, wpsg_getStr($_REQUEST['s'])); ?> -
-
-
- -
-
-
-
-
- -
-
-
+ + + + + view['arFilter']['s'])); ?> + __('Alle', 'wpsg')), $this->arStatus), $this->view['arFilter']['status']); ?> + + +
+
+ +
+
+ +
+
+ true)); ?> + + +
+
+ +
+
+ +
+
+ true)); ?> + +

@@ -62,37 +85,211 @@
- view['pages'] > 1) { ?> -
+
-
+ view['pages'] > 1) { ?> +
+ writeBackendMessage(); ?> + callMods('produkt_index_head'); ?> + callMods('produkt_index_aftersearch'); ?> +
- view['data']) && sizeof($this->view['data']) > 0) { ?> + 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; ?>"> + | + +
+ + admincomment) != "") { ?> + admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign admincomment" href="#"> + + + comment) != "") { ?> + comment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign customercomment" 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) { ?> + 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()->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'); ?> + +

@@ -102,45 +299,39 @@ \ No newline at end of file diff --git a/views/order/view.phtml b/views/order/view.phtml index 856e2ac..b96f42b 100644 --- a/views/order/view.phtml +++ b/views/order/view.phtml @@ -261,7 +261,7 @@

- view['oOrder']->getShippingTypName()); ?> + view['oOrder']->getShippingLabel()); ?> view['basket']['sum']['preis_shipping']) && $this->view['basket']['sum']['preis_shipping'] > 0) { ?> (view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?>) diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml index 67ab128..953f358 100644 --- a/views/produkt/index.phtml +++ b/views/produkt/index.phtml @@ -33,14 +33,15 @@

- + + callMod('wpsg_mod_productgroups', 'produkt_index_filter'); ?> - +
@@ -68,52 +69,26 @@
view['data']) && sizeof($this->view['data']) > 0) { ?> - +
hasMod('wpsg_mod_produktbilder')) { ?> - - + + + hasMod('wpsg_mod_productgroups')) { ?> - + + hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?> - + - - + + + + @@ -188,53 +163,6 @@ - - - hasMod('wpsg_mod_produktbilder')) { ?> - - - - - hasMod('wpsg_mod_productgroups')) { ?> - - - hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?> - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -247,8 +175,9 @@ \ No newline at end of file -- cgit v1.2.3