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/order/index.phtml | 317 ++++++++++++++++++++++++++++++++++++++---------- views/order/view.phtml | 2 +- 2 files changed, 255 insertions(+), 64 deletions(-) (limited to 'views/order') 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 @@
-
+
- - - - -
-
-
- -
-
- 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')); ?>) -- cgit v1.2.3