From f993b1595433f7032db52d3753bc3dec156bcbcf Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Sun, 11 Sep 2016 11:04:12 +0000 Subject: - Backend vereinheitlicht / Gutscheinoberfläche angefangen Filterfunktionen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5753 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/order/index.phtml | 312 ++++++++++++++++++++++++------------------------ views/order/view.phtml | 2 +- 2 files changed, 159 insertions(+), 155 deletions(-) (limited to 'views/order') diff --git a/views/order/index.phtml b/views/order/index.phtml index c932ec3..6fed352 100644 --- a/views/order/index.phtml +++ b/views/order/index.phtml @@ -132,173 +132,177 @@ view['arData']) && sizeof($this->view['arData']) > 0) { ?> - - - - - - - - - - - - - - - view['arData'] as $oOrder) { ?> - - - + + + + + + + + +
- - - - - - getNr(); ?> cdate), false); ?>
- - + + + + + + + + + + + + + + + view['arData'] as $oOrder) { ?> + + + + + - - - - - - - - - - - - -
+ + - admincomment) != "") { ?> - admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign admincomment" href="#"> - + - comment) != "") { ?> - comment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign customercomment" href="#"> - + getNr(); ?> cdate), false); ?>
- 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) { ?> - admincomment) != "") { ?> + admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign admincomment" href="#"> + - $origin_order_id = $this->callMod('wpsg_mod_abo', 'getOriginOrder', array($oOrder->id)); - $origin_order_data = $this->cache->loadOrder($origin_order_id); + comment) != "") { ?> + comment); ?>" onclick="return false;" class="glyphicon glyphicon-info-sign customercomment" href="#"> + - ?> - 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']); ?> + 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()) { ?> + + getCustomer()->firma; if (wpsg_isSizedString($firma)) { ?> +
+ + getInvoiceTitle(); ?> getCustomer()->vname; ?> getCustomer()->name; ?>
- 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) { ?> - - + 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(); ?> +
+ +
+ + + + - callMod('wpsg_mod_export', 'produkt_index_foot'); ?> +
+ + view['pages'] > 1) { ?> + + + +
+ + callMod('wpsg_mod_export', 'produkt_index_foot'); ?> -

+ + + + + diff --git a/views/order/view.phtml b/views/order/view.phtml index 3275360..9025d12 100644 --- a/views/order/view.phtml +++ b/views/order/view.phtml @@ -14,7 +14,7 @@