From 7141460e4adf63b9b9514f0ee5beef2cd978cbda Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Sat, 10 Sep 2016 16:59:33 +0000
Subject: -To Mac

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5751 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/order/index.phtml | 45 ++++++++++++++++-----------------------------
 1 file changed, 16 insertions(+), 29 deletions(-)

(limited to 'views/order')

diff --git a/views/order/index.phtml b/views/order/index.phtml
index 7130de6..c932ec3 100644
--- a/views/order/index.phtml
+++ b/views/order/index.phtml
@@ -16,14 +16,14 @@
 			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 				<ul class="nav navbar-nav">
 					<li role="presentation" class="wpsg-order-tab-a active"><a href="#" onclick="return false;"><?php echo __("Bestellübersicht", "wpsg"); ?></a></li>
-					<li role="presentation" class="wpsg-order-tab-a" id="wpsg-order-tab-0"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Suche", "wpsg"); ?></a></li>
+					<li role="presentation" class="wpsg_showhide_filter wpsg-order-tab-a <?php echo (($this->view['hasFilter'] === true)?'active':''); ?>" id="wpsg-order-tab-0"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Suche", "wpsg"); ?></a></li>
                     <?php foreach ($this->view['tabs']['left'] as $k => $tab) { ?>
                     <li role="presentation" class="wpsg-order-tab-a" id="wpsg-order-tab-<?php echo $k; ?>"><a href="#" onclick="return false;"><span class="<?php echo $tab['tab_icon']; ?>"></span><?php echo $tab['tab_title']; ?></a></li>
                     <?php } ?>
 				</ul>
 				<ul class="nav navbar-nav navbar-right">
                     <?php foreach ($this->view['tabs']['right'] as $k => $tab) { ?>
-                    <li role="presentation" class="wpsg-order-tab-a" id="wpsg-order-tab-<?php echo $k; ?>"><a href="#" onclick="return false;"><span class="<?php echo $tab['tab_icon']; ?>"></span><?php echo $tab['tab_title']; ?></a></li>
+                    <li role="presentation" class="wpsg-order-tab-mods" id="wpsg-order-tab-<?php echo $k; ?>"><a href="#" onclick="return false;"><span class="<?php echo $tab['tab_icon']; ?>"></span><?php echo $tab['tab_title']; ?></a></li>
                     <?php } ?>
 				</ul>
 			</div>
@@ -31,7 +31,7 @@
 
         <?php foreach ($this->view['tabs'] as $tab_positions) { ?>
         <?php foreach ($tab_positions as $k => $tab) { ?>
-        <div class="wpsg-filter wpsg-order-tab wpsg-order-tab-<?php echo $k ?>" style="display:none;"><?php echo $tab['tab_content']; ?></div>
+        <div class="wpsg-order-tab-mods-content wpsg-filter-tab wpsg-order-tab-<?php echo $k ?>" style="display:none;"><?php echo $tab['tab_content']; ?></div>
         <?php } ?>
         <?php } ?>
 
@@ -40,12 +40,13 @@
 				<div class="col-lg-4">
 					<form method="post" id="filter_form">
 
-						<input id="wpsg_seite" type="hidden" name="seite" value="<?php echo $this->view['arFilter']['page']; ?>" class="current-page" />
-						<input id="wpsg_order" type="hidden" name="filter[order]" value="<?php echo $this->view['arFilter']['order']; ?>" />
-						<input id="wpsg_ascdesc" type="hidden" name="filter[ascdesc]" value="<?php echo $this->view['arFilter']['ascdesc']; ?>" />
+						<input id="wpsg_seite" type="hidden" name="seite" value="<?php echo @$this->view['arFilter']['page']; ?>" class="current-page" />
+						<input id="wpsg_order" type="hidden" name="filter[order]" value="<?php echo @$this->view['arFilter']['order']; ?>" />
+						<input id="wpsg_ascdesc" type="hidden" name="filter[ascdesc]" value="<?php echo @$this->view['arFilter']['ascdesc']; ?>" />
 
 						<?php echo wpsg_drawForm_Input('filter[s]', __('Suchfeld', 'wpsg'), wpsg_getStr($this->view['arFilter']['s'])); ?>
-						<?php echo wpsg_drawForm_Select('filter[status]', __('Bestellstatus', 'wpsg'), wpsg_array_merge(array('-1' => __('Alle', 'wpsg')), $this->arStatus), $this->view['arFilter']['status']); ?>
+                        <?php echo wpsg_drawForm_Input('filter[k_id]', __('Kunde (ID)', 'wpsg'), wpsg_getStr($this->view['arFilter']['k_id'])); ?>
+						<?php echo wpsg_drawForm_Select('filter[status]', __('Bestellstatus', 'wpsg'), wpsg_array_merge(array('-1' => __('Alle', 'wpsg')), $this->arStatus), @$this->view['arFilter']['status']); ?>
 
                         <?php echo wpsg_drawForm_TextStart(); ?>
                         <div class="row">
@@ -89,7 +90,7 @@
                         </div>
                         <?php echo wpsg_drawForm_TextEnd(__('Rechnungsdatum (Monat/Jahr)', 'wpsg'), array('noP' => true)); ?>
 
-    					<br /><?php echo wpsg_drawForm_SubmitButton(__('Bestellungen suchen')); ?><br />
+    					<br /><?php echo wpsg_drawForm_SubmitButton(__('Bestellungen suchen')); ?>
 
 					</form>
 				</div>
@@ -305,7 +306,7 @@
 <script type="text/javascript">/* <![CDATA[ */
 
     <?php if (wpsg_isSizedString($this->view['arFilter']['order']) && wpsg_isSizedString($this->view['arFilter']['ascdesc'])) { ?>
-    jQuery('th[data-order="<?php echo $this->view['arFilter']['order']; ?>"]').addClass('wpsg_order_<?php echo strtolower($this->view['arFilter']['ascdesc']); ?>');
+    jQuery('th[data-order="<?php echo @$this->view['arFilter']['order']; ?>"]').addClass('wpsg_order_<?php echo strtolower(@$this->view['arFilter']['ascdesc']); ?>');
     <?php } ?>
 
     function wpsg_order_checkAll()
@@ -341,34 +342,20 @@
 
     jQuery(document).ready(function() {
 
-        jQuery('.wpsg-order-tab-a').bind('click', function() {
-
-            jQuery('.wpsg-order-tab-a').removeClass('active');
-            jQuery(this).addClass('active');
+        jQuery('.wpsg-order-tab-mods').bind('click', function() {
 
-            if (jQuery('.' + jQuery(this).attr("id")).length <= 0)
+            if (jQuery(this).hasClass('active'))
             {
 
-                jQuery('.wpsg-order-tab').slideUp(250);
+                jQuery(this).removeClass('active');
+                jQuery('.' + jQuery(this).attr("id")).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);
-
-                }
+                jQuery(this).addClass('active');
+                jQuery('.' + jQuery(this).attr("id")).slideDown(250);
 
             }
 
-- 
cgit v1.2.3