From b6dd44ae23fe378b9d857ab38a9f1318d0d6274f Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Fri, 28 Sep 2018 07:05:48 +0000
Subject: - Produktbearbeitung Backend - Neue Calculation für das Backend
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7173 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/css/style.scss                               |   1 -
 views/mods/mod_deliverynote/order_view_row.phtml   |   8 +-
 views/mods/mod_deliverynote/settings_edit.phtml    |   6 +-
 .../mods/mod_downloadprodukte/order_view_row.phtml |   4 +-
 .../mods/mod_productvariants/order_view_row.phtml  |   2 +-
 views/order/add.phtml                              |   9 +
 views/order/backendEdit/addDiscount.phtml          |  33 +
 views/order/backendEdit/addProduct.phtml           |  79 ++
 .../backendEdit/addProduct_product_selected.phtml  |  72 ++
 views/order/backendEdit/editPayShipping.phtml      | 108 +++
 views/order/index.phtml                            |  73 +-
 views/order/product_table.phtml                    | 252 ++++++
 views/order/view.phtml                             |  27 +-
 views/order/view_orderdata.phtml                   | 997 ++++-----------------
 views/warenkorb/basket.phtml                       |   3 +-
 15 files changed, 842 insertions(+), 832 deletions(-)
 create mode 100644 views/order/add.phtml
 create mode 100644 views/order/backendEdit/addDiscount.phtml
 create mode 100644 views/order/backendEdit/addProduct.phtml
 create mode 100644 views/order/backendEdit/addProduct_product_selected.phtml
 create mode 100644 views/order/backendEdit/editPayShipping.phtml
 create mode 100644 views/order/product_table.phtml

(limited to 'views')

diff --git a/views/css/style.scss b/views/css/style.scss
index a0f3854..e69de29 100644
--- a/views/css/style.scss
+++ b/views/css/style.scss
@@ -1 +0,0 @@
-body 
\ No newline at end of file
diff --git a/views/mods/mod_deliverynote/order_view_row.phtml b/views/mods/mod_deliverynote/order_view_row.phtml
index 8f97ae8..dc82b69 100644
--- a/views/mods/mod_deliverynote/order_view_row.phtml
+++ b/views/mods/mod_deliverynote/order_view_row.phtml
@@ -6,10 +6,10 @@
 
 ?>
 <tr class="wpsg_<?php echo (($this->view['wpsg_mod_deliverynote']['i'] == 0)?'odd':'even'); ?>">	
-	<td align="left" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'5':'4'); ?>">
-		<label>		
-			<input checked="checked" type="checkbox" class="wpsg_mod_deliverynote_product" name="wpsg_mod_deliverynote_products[]" value="<?php echo $this->view['wpsg_mod_deliverynote']['product']['product_index']; ?>" />
-			&nbsp;<?php echo __('Auf Lieferschein', 'wpsg'); ?>
+	<td align="left" colspan="<?php echo ((sizeof($this->view['arCalculation']['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'5':'4'); ?>">
+		<label style="font-weight:normal; display:flex; flex-direction:row; margin-bottom:0px;">		
+			<input checked="checked" type="checkbox" class="wpsg_mod_deliverynote_product" name="wpsg_mod_deliverynote_products[]" value="<?php echo $this->view['wpsg_mod_deliverynote']['product']['product_index']; ?>" style="margin:0px; margin-right:5px;" />
+            <span>&nbsp;<?php echo __('Auf Lieferschein', 'wpsg'); ?></span>
 		</label>
 	</td>
 </tr>
\ No newline at end of file
diff --git a/views/mods/mod_deliverynote/settings_edit.phtml b/views/mods/mod_deliverynote/settings_edit.phtml
index 426cfd2..8602340 100644
--- a/views/mods/mod_deliverynote/settings_edit.phtml
+++ b/views/mods/mod_deliverynote/settings_edit.phtml
@@ -142,7 +142,7 @@
 			<br /><br />
 
 			<div class="info">
-				<p style="line-height:none;">
+				<p>
 					<?php echo __('Die Angaben für X (Abstand von Links) und Y (Abstand von Oben) werden in mm eingetragen.', 'wpsg'); ?><br />
 					<?php echo __('Die Farbe wird im Hexadezimalformat angegeben (#FFFFFF für weiß, #000000 für schwarz).', 'wpsg'); ?>
 				</p>
@@ -162,7 +162,7 @@
 			<br /><br />
 
 			<div class="info">
-				<p style="line-height:none;">
+				<p>
 					<?php echo __('Hier können Sie Texte vordefinieren, die sie unter den Lieferschein setzen können.', 'wpsg'); ?>
 				</p>
 			</div>
@@ -228,7 +228,7 @@
 	function wpsg_deliverynote_preview()
 	{
 
-		let url = "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_deliverynote&do=orderAjax&noheader=1&wpsg_deliverynote_preview=1";
+		var url = "<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_deliverynote&do=orderAjax&noheader=1&wpsg_deliverynote_preview=1";
 
 		window.open(url, '_blank');
 
diff --git a/views/mods/mod_downloadprodukte/order_view_row.phtml b/views/mods/mod_downloadprodukte/order_view_row.phtml
index 887bb69..2a25523 100644
--- a/views/mods/mod_downloadprodukte/order_view_row.phtml
+++ b/views/mods/mod_downloadprodukte/order_view_row.phtml
@@ -7,9 +7,9 @@
 ?>
 <tr class="wpsg_<?php echo ((wpsg_getInt($this->view['i']) == 0)?'odd':'even'); ?>">
 	<td ><?php echo __('Downloads', 'wpsg'); ?>:</td>
-	<td align="right" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'4':'3'); ?>">	
+	<td align="right" colspan="<?php echo ((sizeof($this->view['arCalculation']['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'4':'3'); ?>">	
 		 <?php foreach ($this->view['wpsg_mod_downloadprodukte']['arFiles'] as $file) { ?>
-		 <a target="_new" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_downloadprodukte&noheader=1&cmd=download_file&file=<?php echo rawurlencode(basename($file[1])); ?>&edit_id=<?php echo $this->getProduktId($this->view['wpsg_mod_downloadprodukte']['product']['productkey']); ?>"><?php echo basename($file[1]); ?></a>
+		 <a target="_new" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_downloadprodukte&noheader=1&cmd=download_file&file=<?php echo rawurlencode(basename($file[1])); ?>&edit_id=<?php echo $this->getProduktId($this->view['wpsg_mod_downloadprodukte']['product']['product_key']); ?>"><?php echo basename($file[1]); ?></a>
 		 <?php } ?>
 	</td>
 </tr>
\ No newline at end of file
diff --git a/views/mods/mod_productvariants/order_view_row.phtml b/views/mods/mod_productvariants/order_view_row.phtml
index 2ba41ef..8baa495 100644
--- a/views/mods/mod_productvariants/order_view_row.phtml
+++ b/views/mods/mod_productvariants/order_view_row.phtml
@@ -12,7 +12,7 @@
     <td class="wpsg_cell_name">
         <?php echo __('Variante', 'wpsg'); ?>:
     </td>
-    <td class="wpsg_cell_gesamtpreis" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?4:3); ?>">
+    <td class="wpsg_cell_gesamtpreis" colspan="<?php echo ((sizeof($this->view['arCalculation']['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?4:3); ?>">
         <?php echo $this->view['variante']['key']; ?>
     </td>
 </tr>
diff --git a/views/order/add.phtml b/views/order/add.phtml
new file mode 100644
index 0000000..f9410b8
--- /dev/null
+++ b/views/order/add.phtml
@@ -0,0 +1,9 @@
+<?php
+
+    /**
+     * Template für das Anlegen einer Bestellung
+     */
+    
+    
+     
+     
\ No newline at end of file
diff --git a/views/order/backendEdit/addDiscount.phtml b/views/order/backendEdit/addDiscount.phtml
new file mode 100644
index 0000000..68873e7
--- /dev/null
+++ b/views/order/backendEdit/addDiscount.phtml
@@ -0,0 +1,33 @@
+<?php
+    
+    /**
+     * Template für das Bearbeiten eines Rabattes im Backend
+     */
+  
+    namespace wpsg;
+    
+    /** @var wpsg_calculation $oCalculation */
+    $oCalculation = $this->view['oCalculation'];
+    
+    $arTax = $oCalculation->getTaxLabelArray();
+    
+    if ($this->getBackendTaxView() === WPSG_NETTO) $strBN = 'NETTO';
+    else $strBN = 'BRUTTO';
+    
+    $arCalculation = $oCalculation->getCalculationArray();
+    
+?>
+
+<form id="wpsg_be_discount_form">
+
+    <?php echo wpsg_drawForm_Input('be_discount_amount', wpsg_translate(__('Rabattwert in #1# (#2#) oder % ', 'wpsg'), $this->get_option('wpsg_currency'), $strBN), @$arCalculation['discount'][0]['set']); ?>
+    <?php echo wpsg_drawForm_Select('be_discount_tax', __('Steuersatz', 'wpsg'), $arTax, @$arCalculation['discount'][0]['tax_key']); ?>
+
+</form>
+
+<script>
+    
+    jQuery('#wpsg_be_discount_form').on('submit', function() { return false; } );
+    jQuery('#be_discount_amount').focus();
+    
+</script>
diff --git a/views/order/backendEdit/addProduct.phtml b/views/order/backendEdit/addProduct.phtml
new file mode 100644
index 0000000..afd946b
--- /dev/null
+++ b/views/order/backendEdit/addProduct.phtml
@@ -0,0 +1,79 @@
+<?php
+        
+    /**
+     * Template für das hinzufügen von Produkten zur Bestellung
+     */
+         
+?>
+
+<style>
+    
+    #product_search { width:100%; }
+    
+</style>
+
+<form id="wpsg_product_add_form">
+    
+    <div class="autocomplete_wrap">
+        <input type="text" id="product_search" name="product_serch" value="" placeholder="<?php echo __('Produktsuche', 'wpsg'); ?>" />
+    </div>
+    
+    <hr />
+    
+    <div id="wpsg_product_add_target">
+        
+    </div>
+    
+</form>
+
+<script>
+    
+    function wpsg_loadProduct(product_id, order_product_id) {
+
+        jQuery('#wpsg_product_add_target').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+        
+        jQuery.ajax( {
+            url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=addProduct&do=product&noheader=1&edit_id=<?php $_REQUEST['edit_id']; ?>',
+            data: {
+                product_id: product_id,
+                order_product_id: order_product_id
+            },
+            success: function(data) {
+
+                jQuery('#wpsg_product_add_target').html(data);
+
+            }
+        } );
+        
+    } // function wpsg_loadProduct(product_id, order_product_id)
+    
+    jQuery(document).ready(function() {
+
+        jQuery('#wpsg_product_add_form').on('submit', function() { return false; } );
+        
+        jQuery('#product_search').autocomplete( {
+            source: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=addProduct&do=search&noheader=1&edit_id=<?php echo $_REQUEST['edit_id']; ?>',
+            minLength: 2,
+            appendTo: ".autocomplete_wrap",
+            select: function(event, ui) {
+
+                wpsg_loadProduct(ui.item.id, <?php echo ((wpsg_isSizedInt($_REQUEST['order_product_id']))?$_REQUEST['order_product_id']:0); ?>);
+
+                return false;
+
+            }
+        } );
+        
+        <?php if (wpsg_isSizedInt($_REQUEST['order_product_id'])) { ?>
+        
+            wpsg_loadProduct(0, <?php echo $_REQUEST['order_product_id']; ?>);
+        
+        <?php } else { ?>
+            
+            jQuery('#product_search').focus();
+            
+        <?php } ?>
+        
+    } );
+    
+</script>
\ No newline at end of file
diff --git a/views/order/backendEdit/addProduct_product_selected.phtml b/views/order/backendEdit/addProduct_product_selected.phtml
new file mode 100644
index 0000000..ba13724
--- /dev/null
+++ b/views/order/backendEdit/addProduct_product_selected.phtml
@@ -0,0 +1,72 @@
+<?php
+    
+    /**
+     * Template für das hinzufügen eines Produktes wenn das Produkt ausgewählt wurde
+     */
+             
+    /** @var wpsg_product $oProduct */
+    $oProduct = $this->view['oProduct'];
+
+    /** @var wpsg_order_product $oOrderProduct */
+    $oOrderProduct = $this->view['oOrderProduct'];
+        
+?>
+
+<style>
+    
+    .wpsg_product_add { position:relative; min-height:150px; }
+    .wpsg_product_add .image { position:absolute; left:0px; top:10px; }
+    
+</style>
+
+<strong><?php echo $oProduct->getProductName(); ?></strong>
+
+<div class="wpsg_product_add">
+
+    <input type="hidden" name="product_id" value="<?php echo $oProduct->id; ?>" />
+    
+    <?php if ($oOrderProduct !== false) { ?>
+    <input type="hidden" name="order_product_id" value="<?php echo $oOrderProduct->id; ?>" />
+    <?php } ?>
+    
+    <?php
+
+        $attachment_id = $GLOBALS['wpsg_sc']->imagehandler->getAttachmentID($oProduct->id);
+        
+    ?>
+    
+    <?php if (wpsg_isSizedInt($attachment_id)) { ?>
+    <div class="image"><?php echo wp_get_attachment_image($attachment_id, [100, 100]); ?></div>
+    <?php } ?>
+    
+    <?php echo wpsg_drawForm_Input('add_price', __('Produktpreis', 'wpsg').' '.(($this->getBackendTaxView() === WPSG_BRUTTO)?'(BRUTTO)':'(NETTO'), (($oOrderProduct !== false)?$oOrderProduct->getPrice($this->getBackendTaxView()):$oProduct->getPrice($this->getBackendTaxView()))); ?>
+    <?php echo wpsg_drawForm_Input('add_amount', __('Menge', 'wpsg'), (($oOrderProduct !== false)?$oOrderProduct->getCount():'1')); ?>
+    
+    <?php if ($this->callMod('wpsg_mod_productvariants', 'isVariantsProduct', [$oProduct->id])) { $arVariants = $this->callMod('wpsg_mod_productvariants', 'getVariants', [$oProduct->id, true, true, true]); ?> 
+        
+        <?php if (wpsg_isSizedArray($arVariants)) { ?>
+                
+            <br />
+            
+            <?php foreach ($arVariants as $var_id => $var_data) { 
+                
+                    $arVariSelect = [];
+                    foreach ($var_data['arVariation'] as $vari_id => $vari_data) $arVariSelect[$vari_id] = $vari_data['name'];
+                
+                ?>
+            
+                <?php echo wpsg_drawForm_Select('wpsg_vp['.$var_id.']', $var_data['name'], $arVariSelect,''); ?>
+                
+            <?php } ?>
+        
+        <?php } ?>
+        
+    <?php } ?> 
+    
+    <script>
+
+        jQuery('#wpsg_product_dialog .btn-primary').prop('disabled', false);
+        
+    </script>
+
+</div>
\ No newline at end of file
diff --git a/views/order/backendEdit/editPayShipping.phtml b/views/order/backendEdit/editPayShipping.phtml
new file mode 100644
index 0000000..a38ac1c
--- /dev/null
+++ b/views/order/backendEdit/editPayShipping.phtml
@@ -0,0 +1,108 @@
+<?php
+
+    /**
+     * Template für das Bearbeiten der Versand- und Zahlungsart im Backend
+     */
+
+    $arShippingSelect = [];
+    foreach ($this->arShipping as $shipping_id => $shipping_data) {
+        
+        $arShippingSelect[$shipping_id] = $shipping_data['name'];
+        
+        if (wpsg_isSizedDouble($shipping_data['price'])) {
+
+            $arShippingSelect[$shipping_id] .= ' ('.wpsg_ff($shipping_data['price'],$this->get_option('wpsg_currency')).')';
+            
+        }
+        
+    }
+
+    $arPaymentSelect = [];
+    foreach ($this->arPayment as $payment_id => $payment_data) {
+
+        $arPaymentSelect[$payment_id] = $payment_data['name'];
+    
+        if (wpsg_isSizedDouble($payment_data['preis'])) {
+
+            $arPaymentSelect[$payment_id] .= ' ('.wpsg_ff($payment_data['preis'],$this->get_option('wpsg_currency')).')';
+    
+        }
+    
+    }
+    
+    if ($this->getBackendTaxview() === WPSG_BRUTTO) {
+        
+        $price_shipping = wpsg_ff($this->view['data']['price_shipping_brutto'], $this->get_option('wpsg_currency'));
+        $price_payment = wpsg_ff($this->view['data']['price_payment_brutto'], $this->get_option('wpsg_currency'));
+        
+        $price_suffix = ' ('.__('Brutto', 'wpsg').')';
+        
+    } else {
+
+        $price_shipping = wpsg_ff($this->view['data']['price_shipping_brutto'], $this->get_option('wpsg_currency'));
+        $price_payment = wpsg_ff($this->view['data']['price_payment_brutto'], $this->get_option('wpsg_currency'));
+
+        $price_suffix = ' ('.__('Netto', 'wpsg').')';
+        
+    }
+        
+?>
+
+<div id="editPayShipping">
+    
+    <?php echo wpsg_drawForm_Select('edit_shipping_type', __('Versandart', 'wpsg'), $arShippingSelect,$this->view['data']['type_shipping']); ?>
+    <?php echo wpsg_drawForm_Input('edit_shipping_price', __('Kosten', 'wpsg').$price_suffix, $price_shipping);  ?> 
+    
+    <br />
+
+    <?php echo wpsg_drawForm_Select('edit_payment_type', __('Zahlungsart', 'wpsg'), $arPaymentSelect,$this->view['data']['type_payment']); ?>
+    <?php echo wpsg_drawForm_Input('edit_payment_price', __('Kosten', 'wpsg').$price_suffix, $price_payment);  ?>
+
+</div>
+
+<script>
+
+   var arShipping = <?php echo json_encode($this->arShipping); ?>;
+   var arPayment = <?php echo json_encode($this->arPayment); ?>;
+       
+   jQuery('#edit_shipping_type').on('change', function() {
+ 
+       for (var i in arShipping) {
+           
+           if (i == jQuery(this).val()) {
+               
+                var price = parseFloat(jQuery('#edit_shipping_price').val().replace('EUR', '').replace(',', '.'));
+                                
+                if (isNaN(price) || price <= 0) {
+                 
+                    jQuery('#edit_shipping_price').val(wpsg_number_format(arShipping[i].price, 2, ',') + ' <?php echo $this->get_option('wpsg_currency'); ?>');
+                    
+                }
+                
+           }
+           
+       }
+       
+   } ).change();
+
+   jQuery('#edit_payment_type').on('change', function() {
+
+       for (var i in arPayment) {
+
+           if (i == jQuery(this).val()) {
+
+               var price = parseFloat(jQuery('#edit_payment_price').val().replace('EUR', '').replace(',', '.'));
+
+               if (isNaN(price) || price <= 0) {
+
+                   jQuery('#edit_payment_price').val(wpsg_number_format(arPayment[i].preis, 2, ',') + ' <?php echo $this->get_option('wpsg_currency'); ?>');
+
+               }
+
+           }
+
+       }
+
+   } ).change();
+   
+</script>
diff --git a/views/order/index.phtml b/views/order/index.phtml
index aca2971..49c401e 100644
--- a/views/order/index.phtml
+++ b/views/order/index.phtml
@@ -23,6 +23,7 @@
                     <?php foreach ($this->view['tabs']['left'] as $k => $tab) { ?>
                     <li role="presentation" class="wpsg-order-tab-a 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 } ?>
+                    <li role="presentation" class="wpsg-order-tab-a wpsg-order-tab-mods" id="wpsg-order-tab-add"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-plus"></span><?php echo __("Neue Bestellung", "wpsg"); ?></a></li>
 				</ul>
 				<ul class="nav navbar-nav navbar-right">
                     <?php foreach ($this->view['tabs']['right'] as $k => $tab) { ?>
@@ -101,6 +102,70 @@
         <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 } ?>
+        
+        <div class="wpsg-order-tab-add-content wpsg-order-tab-add" style="display:none;">
+
+            <div class="container-fluid form-horizontal">
+                <div class="row">
+                    <div class="col-lg-4">
+                        
+                        <form method="POST" id="add_form" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=add&noheader=1">
+    
+                            <?php echo wp_nonce_field('order-index-add'); ?>
+                            
+                            <br />
+                            
+                            <?php echo wpsg_drawForm_Input('search_customer',__('Kunde (E-Mail oder Kundennummer', 'wpsg'), @$_REQUEST['search_customer']); ?>
+                            
+                            <br />
+                            
+                            <?php $arShippingSelect = []; foreach ($this->arShipping as $shipping_id => $shipping) $arShippingSelect[$shipping_id] = $shipping['name']; ?>
+                            <?php echo wpsg_drawForm_Select('add_shipping', __('Versandart', 'wpsg'), $arShippingSelect, @$_REQUEST['add_shipping']); ?>
+
+                            <?php $arPaymentSelect = []; foreach ($this->arPayment as $payment_id => $payment) $arPaymentSelect[$payment_id] = $payment['name']; ?>
+                            <?php echo wpsg_drawForm_Select('add_payment', __('Zahlungsart', 'wpsg'), $arPaymentSelect, @$_REQUEST['add_payment']); ?>
+                            
+                            <br /><?php echo wpsg_drawForm_SubmitButton(__('Bestellung anlegen')); ?><br />
+                            
+                            <script>
+                                
+                                jQuery(document).ready(function() {
+                                
+                                    jQuery('#search_customer').autocomplete( {
+                                        source: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=autocomplete&noheader=1',
+                                        minLength: 2,
+                                        select: function(event, ui) {
+                                            
+                                            jQuery('#search_customer').val(ui.item.id);
+                                            
+                                            return false;
+                                            
+                                        }
+                                    } );
+                                
+                                    jQuery('#add_form').on('submit', function() {
+                                        
+                                        if (jQuery.trim(jQuery('#search_customer').val()) === '') {                                            
+                                            
+                                            alert('<?php echo __('Bitte einen Kunden angeben.', 'wpsg'); ?>');
+                                            
+                                            return false;
+                                            
+                                        }
+                                        
+                                    } );
+                                    
+                                } );
+                                
+                            </script>
+                            
+                        </form>
+                        
+                    </div>
+                </div>
+            </div>
+            
+        </div>
     
     </nav>
     
@@ -359,15 +424,17 @@
             {
 
                 jQuery(this).removeClass('active');
-                jQuery('.' + jQuery(this).attr("id")).slideUp(250);
-
+                jQuery('.' + jQuery(this).attr("id")).slideUp(250); 
+                
             }
             else
             {
-
+                
                 jQuery(this).addClass('active');
                 jQuery('.' + jQuery(this).attr("id")).slideDown(250);
 
+                if (jQuery(this).attr("id") === 'wpsg-order-tab-add') jQuery('#search_customer').focus(); 
+                    
             }
 
             return false;
diff --git a/views/order/product_table.phtml b/views/order/product_table.phtml
new file mode 100644
index 0000000..a6732f4
--- /dev/null
+++ b/views/order/product_table.phtml
@@ -0,0 +1,252 @@
+<?php
+
+/*
+    $oC = new \wpsg\wpsg_calculation();
+    $oC->setCountry(\wpsg_country::getInstance(1));
+    
+    $oC->addProduct('1', 0, '100', '1','c');
+    //$oC->addProduct('1', 1, '100', '1','b');
+    $oC->setShipping('1', '0', '0');
+    $oC->setPayment('1', '0', 'c_1');
+        
+    $oC->addDiscount('10%','c_1');
+    
+    $ar = $oC->getCalculationArray();
+wpsg_debug($ar);*/
+
+    /**
+     * Template für die Produkttabelle im Backend der Bestellverwaltung
+     */
+    
+    $arCalculation = $this->view['oCalculation']->getCalculationArray($this->getBackendTaxView()); 
+    $arTax = $this->view['oCalculation']->getTaxLabelArray();
+    $arTaxShort = $this->view['oCalculation']->getTaxLabelArray(true);
+    
+    $this->view['colspan'] = 3;
+    if ($this->get_option('wpsg_showMwstAlways') == '1' || sizeof($arCalculation['tax']) > 1) $this->view['colspan'] ++;
+    
+    $this->view['arCalculation'] = $arCalculation;
+    
+?>
+
+<style>
+
+    .wpsg_row_small td { font-size:0.8em; }
+    
+</style>
+
+<table class="wpsg_produkte table">
+    <tr class="wpsg_kopf">
+        <th class="wpsg_cell_name"><?php echo __('Produktname', 'wpsg'); ?></th>
+        <th class="wpsg_cell_preis"><?php echo __('Einzelpreis', 'wpsg'); ?></th>
+        <?php if (sizeof($arCalculation['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+            <th class="wpsg_cell_mwst"><?php echo __("MwSt.", "wpsg"); ?></th>
+        <?php } ?>
+        <th class="wpsg_cell_menge"><?php echo __("Anzahl", "wpsg"); ?></th>
+        <th class="wpsg_cell_gesamtpreis"><?php echo __("Gesamtpreis", "wpsg"); ?></th>
+    </tr>
+    <tr><td colspan="<?php echo $this->view['colspan'] + 1; ?>" style="line-height:2px; height:2px; background-color:#999999; padding:0px;"></td></tr>
+    <?php $i = 0; foreach ($arCalculation['products'] as $p) { $i ++; $product_price = $p['price']; ?>        
+        <tr class="wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?>">
+            <td class="wpsg_cell_name">
+                <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=<?php echo $p['product_id']; ?>" title="<?php echo __('Zum Produkt', 'wpsg'); ?>">
+                    <?php echo wpsg_hspc($this->getProductName($p['product_id'])); ?>
+                </a>
+                <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Produkt bearbeiten', 'wpsg'); ?>" onclick="return WPSG_BE_Product.editProduct(<?php echo $p['order_product_id']; ?>);"><span class="glyphicon glyphicon-pencil"></span></a>
+                <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Produkt löschen', 'wpsg'); ?>" onclick="return WPSG_BE_Product.remvoeProduct(<?php echo $p['order_product_id']; ?>);"><span class="glyphicon glyphicon-trash"></span></a>
+            </td>
+            <td class="wpsg_cell_preis"><?php echo wpsg_ff($product_price); ?> <?php echo $this->get_option('wpsg_currency'); ?></td>
+            <?php if (sizeof($arCalculation['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+                <td class="wpsg_cell_mwst"><?php echo $arTaxShort[$p['tax_key']]; ?></td>
+            <?php } ?>
+            <td class="wpsg_cell_menge"><?php echo wpsg_hspc($p['amount']); ?></td>
+            <td class="wpsg_cell_gesamtpreis"><?php echo wpsg_ff($p['amount'] * $product_price); ?> <?php echo $this->get_option('wpsg_currency'); ?></td>
+        </tr>
+        <?php /* if (wpsg_isSizedArray($p['order_allowedshipping'])) { ?>
+            <tr class="wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?>">
+                <td class="wpsg_cell_name">
+                    <?php echo __('Mögliche Versandarten', 'wpsg'); ?>:
+                </td>
+                <td class="wpsg_cell_gesamtpreis" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?4:3); ?>">
+                    <?php $j = 0; foreach ($p['order_allowedshipping'] as $shipping) { $j ++; ?>
+                        <?php echo $this->getShippingName($shipping); ?><?php if ($j < sizeof($p['order_allowedshipping'])) { ?>, <?php } ?>
+                    <?php } ?>
+                </td>
+            </tr>
+        <?php } */ ?>
+        <?php $this->callMods('order_view_row', array(&$p, $i)); ?>
+        <tr><td colspan="<?php echo $this->view['colspan'] + 1; ?>" style="line-height:2px; height:2px; background-color:#999999; padding:0px;"></td></tr>
+    <?php } ?>
+    <?php /* $gs_id = 0;
+    if ((isset($this->view['basket']['gs'])) && ($this->view['basket']['gs']['value'] > 0)) { ?>
+        <tr class="wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?> wpsg_gutschein">
+            <?php
+            $gs_id = 0;
+            if (array_key_exists('gs_id', $_REQUEST))
+            {
+                $gs_id = wpsg_getInt($_REQUEST['gs_id']);
+            }
+            else
+            {
+                $gs_id = wpsg_getInt($this->view['data']['gs_id']);
+            }
+            $o_id = $_REQUEST['edit_id'];
+            $link1 = '<span id="gsname_'.$gs_id.'" class="editable editable-click" data-original-title="" title="">'.$this->view['basket']['gs']['code'].'</span>';
+            $val = '-'.wpsg_ff($this->view['basket']['sum']['gs']);
+            $link2 = '<span id="gsvalue_'.$gs_id.'" class="editable editable-click" data-original-title="" title="">'.$val.'</span>';
+
+            ?>
+            <td class="wpsg_cell_name"><?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($this->view['basket']['gs']['code'] != '')? '('.$link1.')':'' ?>
+                <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Gutschein löschen', 'wpsg'); ?>" onclick="return wpsg_removeVoucher(<?php echo $gs_id; ?>, <?php echo $o_id; ?>);"><span class="glyphicon glyphicon-trash"></span></a>
+            </td>
+            <td class="wpsg_cell_preis"><?php echo $link2.' '.$this->get_option('wpsg_currency'); ?></td>
+            <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+                <td class="wpsg_cell_mwst"><?php echo __('anteilig', 'wpsg'); ?></td>
+            <?php } ?>
+            <td class="wpsg_cell_menge">1</td>
+            <td class="wpsg_cell_gesamtpreis"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?></td>
+        </tr>
+    <?php } ?>
+    */ ?>
+    <tr class="wpsg_row_summe">
+        <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">
+            
+            <?php if ($this->get_option('wpsg_kleinunternehmer') == '1') { ?>
+                
+                <?php echo wpsg_translate(__('Summe (zzgl. #1#)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').'</a>'); ?>
+           
+            <?php } else { ?>
+                
+                <?php if ($this->get_option('wpsg_preisangaben') == WPSG_NETTO) { ?>
+                    <?php echo wpsg_translate(__('Summe (zzgl. #1#, zzgl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').'</a>'); ?>
+                <?php } else { ?>
+                    <?php echo wpsg_translate(__('Summe (zzgl. #1#, inkl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').'</a>'); ?>
+                <?php } ?>
+                
+            <?php } ?>
+            
+        </td>
+        <td class="wpsg_cell_summe_value wpsg_cell_gesamtpreis">
+            
+            <?php echo wpsg_ff($arCalculation['sum']['product']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
+            
+        </td>
+    </tr>
+    
+    <?php /* Versandkosten */ ?>
+    <?php $price_shipping = $arCalculation['shipping']['price']; ?>
+    <?php if ($price_shipping != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?>
+        <tr class="wpsg_row_shipping">
+            <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_shipping_label">
+                <?php echo __('Versandkosten', 'wpsg'); ?> 
+                <?php echo __('  ('.$this->arShipping[$arCalculation['shipping']['key']]['name'].')', 'wpsg'); ?>
+                <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Versandart ändern', 'wpsg'); ?>"  onclick="return WPSG_BE_Pay_Ship.changeShippingPayment();"><span class="glyphicon glyphicon-pencil"></span></a>
+            </td>
+            <td class="wpsg_cell_shipping_value wpsg_cell_gesamtpreis">
+                <span id="wpsg_cell_shipping_value"><?php echo wpsg_ff($price_shipping); ?> </span>
+                <?php echo $this->get_option('wpsg_currency'); ?>
+            </td>
+        </tr>
+    <?php } ?>
+
+    <?php /* Zahlungskosten */ ?>
+    <?php $price_payment = $arCalculation['payment']['price']; ?>
+    <?php if ($price_payment != 0 || $this->get_option('wpsg_hideemptypayment') != '1') { ?>
+        <tr class="wpsg_row_payment">
+            <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_payment_label">
+                <?php echo __('Zahlungsart', 'wpsg'); ?>
+                <?php echo __('  ('.$this->arPayment[$arCalculation['payment']['key']]['name'].')', 'wpsg'); ?>
+                <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Zahlungsart ändern', 'wpsg'); ?>" onclick="return WPSG_BE_Pay_Ship.changeShippingPayment();"><span class="glyphicon glyphicon-pencil"></span></a>
+            </td>
+            <td class="wpsg_cell_payment_value wpsg_cell_gesamtpreis" >
+                <span id="wpsg_cell_payment_value"><?php echo wpsg_ff($price_payment); ?> </span>
+                <?php echo $this->get_option('wpsg_currency'); ?>
+            </td>
+        </tr>
+    <?php } ?>
+    
+    <?php if ($this->getBackendTaxView() === WPSG_NETTO && $this->get_option('wpsg_kleinunternehmer') != '1') { ?>
+        <?php foreach ($arCalculation['tax'] as $tax) { if ($tax['sum_tax'] > 0) { ?>
+            <tr class="wpsg_row_mwst">
+                <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_mwst_label">
+                    <?php echo wpsg_translate(__('zuzüglich MwSt. (#1#)', 'wpsg'), $arTax[$tax['key']]); ?>
+                </td>
+                <td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis">
+                    <?php echo wpsg_ff($tax['sum_tax']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
+                </td>
+            </tr>
+        <?php } } ?>
+    <?php } ?>
+    
+    <?php /* Rabatte */ ?>
+    <?php if ($arCalculation['sum']['prediscount_netto'] !== $arCalculation['sum']['netto']) { ?>
+        <tr class="wpsg_row_discount">
+            <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_mwst_label">
+                <?php echo __('Gesamtpreis', 'wpsg'); ?>
+                <?php if ($this->getBackendTaxView() === WPSG_BRUTTO) { ?>
+                    <?php echo __('(abzgl. Rabatt, inkl. MwSt.)', 'wpsg'); ?>
+                <?php } else { ?>
+                    <?php echo __('(abzgl. Rabatt, zzgl. MwSt.)', 'wpsg'); ?>
+                <?php } ?>
+            </td>
+            <td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis">
+                <?php echo wpsg_ff($arCalculation['sum']['prediscount_display']); ?> <?php echo $this->get_option('wpsg_currency'); ?>     
+            </td>
+        </tr>
+        <?php foreach ($arCalculation['discount'] as $d) { ?>
+        <tr class="wpsg_row_discount wpsg_row_small">
+            <td colspan="" class="wpsg_cell_mwst_label">
+                <?php echo __('Rabatt', 'wpsg'); ?>
+                <?php if ($this->getBackendTaxView() === WPSG_BRUTTO) { ?>
+                    <?php echo __('(inkl. MwSt.)', 'wpsg'); ?>
+                <?php } else { ?>
+                    <?php echo __('(zzgl. MwSt.)', 'wpsg'); ?>
+                <?php } ?>
+            </td>
+            <td class="wpsg_cell_preis">
+                <?php echo wpsg_ff($d['set'], $this->get_option('wpsg_currency'), true); ?>
+            </td>
+            <?php if (sizeof($arCalculation['tax']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
+                <td class="wpsg_cell_mwst"><?php echo $arTaxShort[$d['tax_key']]; ?></td>
+            <?php } ?>
+            <td></td>
+            <td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis">
+                <?php echo wpsg_ff($arCalculation['sum']['discount_display']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
+            </td>
+        </tr>
+        <?php } ?>
+    <?php } ?>
+    
+    <tr class="wpsg_row_gesamt">
+        <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_gesamt_label">
+            <strong><?php echo __('Gesamtpreis', 'wpsg'); ?></strong> 
+            <?php if ($this->getBackendTaxView() === WPSG_BRUTTO) { ?>
+                <?php echo __('(inkl. MwSt.)', 'wpsg'); ?>
+            <?php } else { ?>
+                <?php echo __('(zzgl. MwSt.)', 'wpsg'); ?>
+            <?php } ?>
+        </td>
+        <td class="wpsg_cell_gesamt_value wpsg_cell_gesamtpreis">
+            <strong><?php echo wpsg_ff($arCalculation['sum']['display']); ?> <?php echo $this->get_option('wpsg_currency'); ?></strong>
+        </td>
+    </tr>
+    
+    <?php if ($this->get_option('wpsg_kleinunternehmer') == '1' || $this->getBackendTaxView() != WPSG_NETTO) { ?>
+        <?php foreach ($arCalculation['tax'] as $tax) { if ($tax['sum_tax'] > 0 && $tax['key'] != '0') { ?>
+            <tr class="wpsg_row_mwst wpsg_row_small">
+                <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_mwst_label">
+                    <?php if ($this->get_option('wpsg_kleinunternehmer') == '1') { ?>
+                        <?php echo $this->get_option('wpsg_kleinunternehmer_text'); ?>
+                    <?php } else { ?>
+                        <?php echo wpsg_translate(__('darin enthaltene MwSt. (#1#)', 'wpsg'), $arTax[$tax['key']]); ?>
+                    <?php } ?>
+                </td>
+                <td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis">
+                    <?php echo wpsg_ff($tax['sum_tax']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
+                </td>
+            </tr>
+        <?php } } ?>
+    <?php } ?>
+</table>
+
+<?php wpsg_debug($arCalculation); ?>
\ No newline at end of file
diff --git a/views/order/view.phtml b/views/order/view.phtml
index c01a0c4..3a3c6d0 100644
--- a/views/order/view.phtml
+++ b/views/order/view.phtml
@@ -50,31 +50,26 @@
             <?php } ?>
         </div>
 
-		<?php if(true) {?>
-        <a href="" id="LinkProduktNeu" onclick="return WPSG_BE_Product.addProduct(<?php echo $_REQUEST['edit_id']; ?>, 0);"><span class="glyphicon glyphicon-plus"></span>
-	 	<?php echo __("Neues Produkt", "wpsg"); ?>
-	 	</a><br />
-	 	<?php } ?>
-
-        <br />
+        <a href="" id="LinkProduktNeu" onclick="return WPSG_BE_Product.addProduct();"><span class="glyphicon glyphicon-plus"></span>
+    	 	<?php echo __("Neues Produkt", "wpsg"); ?>
+	 	</a><div class="wpsg_clear"></div>
+	 
         <?php if ($this->hasMod('wpsg_mod_gutschein')) { ?>
         	<?php if (((array_key_exists('gs', $this->view['basket'])) && ($this->view['basket']['gs']['value'] == 0))) { ?>
 		        <a href="" id="LinkGutscheinNeu" onclick="return wpsg_addVoucher(<?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-plus"></span>
-			 	<?php echo __("Neuer Gutschein", "wpsg"); ?>
-			 	</a><br />
+			 	    <?php echo __("Gutschein bearbeiten", "wpsg"); ?>
+			 	</a><div class="wpsg_clear"></div>
             <?php } ?>
         <?php } ?>
 
 		<div class="wpsg_clear"></div>
         <?php if ($this->hasMod('wpsg_mod_discount')) { ?>
-        	<?php //if (((array_key_exists('preis_rabatt', $this->view['basket']['sum'])) && ($this->view['basket']['sum']['preis_rabatt'] == 0))) { ?>
-		        <a href="" id="LinkRabattNeu" onclick="return wpsg_addDiscount(<?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-plus"></span>
-			 	<?php echo __("Neuer Rabatt", "wpsg"); ?>
-			 	</a><br />
-            <?php //} ?>
+        	<a href="" id="LinkRabattNeu" onclick="return WPSG_BE_Discount.editDiscount(<?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-plus"></span>
+			 	<?php echo __("Rabatt bearbeiten", "wpsg"); ?>
+			</a><div class="wpsg_clear"></div>
         <?php } ?>
 
-		<div class="wpsg_clear"></div>
+		
         <a href="" id="LinkSendMail" onclick="return wpsg_sendMail(<?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-envelope"></span>
 	 	<?php echo __("Bestellbestätigung", "wpsg"); ?><br /><?php echo __("erneut versenden", "wpsg"); ?>
 	 	</a><br />
@@ -129,8 +124,10 @@
 		jQuery.ajax( {
 			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=discountData&do=add&edit_id=' + oid + '&noheader=1',
 			success: function(data) {
+			    
 				jQuery('#wpsg_produkte_table').replaceWith(data);
 				jQuery('#LinkRabattNeu').hide();
+				
 			}
 		} );
 
diff --git a/views/order/view_orderdata.phtml b/views/order/view_orderdata.phtml
index 26ae631..74d8fba 100644
--- a/views/order/view_orderdata.phtml
+++ b/views/order/view_orderdata.phtml
@@ -5,198 +5,13 @@
      * Date: 06.08.2016
      * Time: 13:45
      */
-
+         
 ?>
 <div id="wpsg_produkte_table">
 <?php echo wpsg_drawForm_AdminboxStart(__('Bestelldaten', 'wpsg')); ?>
-    <table class="wpsg_produkte table">
-        <tr class="wpsg_kopf">
-            <th class="wpsg_cell_name"><?php echo __('Produktname', 'wpsg'); ?></th>
-            <th class="wpsg_cell_preis"><?php echo __('Einzelpreis', 'wpsg'); ?></th>
-            <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
-            <th class="wpsg_cell_mwst"><?php echo __("MwSt.", "wpsg"); ?></th>
-            <?php } ?>
-            <th class="wpsg_cell_menge"><?php echo __("Anzahl", "wpsg"); ?></th>
-            <th class="wpsg_cell_gesamtpreis"><?php echo __("Gesamtpreis", "wpsg"); ?></th>
-        </tr>
-        <?php $i = 0; foreach ($this->view['basket']['produkte'] as $produkt_key => $p) { $i ++; ?>
-        <tr class="wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?>">
-            <td class="wpsg_cell_name">
-                <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=<?php echo $this->getProduktID($p['id']); ?>" title="<?php echo __('Zum Produkt', 'wpsg'); ?>">
-                    <?php echo wpsg_hspc($this->getProductName($this->getProduktID($p['id']))); ?>
-                </a>
-            	<a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Produkt bearbeiten', 'wpsg'); ?>" onclick="return WPSG_BE_Product.editProduct(<?php echo $p['order_product_id']; ?>, <?php echo $p['product_id']; ?>, <?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-pencil"></span></a>
-            	<a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Produkt löschen', 'wpsg'); ?>" onclick="return WPSG_BE_Product.removeProduct(<?php echo $p['order_product_id']; ?>, <?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-trash"></span></a>
-            </td>
-            <td class="wpsg_cell_preis"><?php echo wpsg_ff($p['preis']); ?> <?php echo $this->get_option('wpsg_currency'); ?></td>
-            <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
-            <td class="wpsg_cell_mwst"><?php echo wpsg_ff($p['mwst_value']); ?> %</td>
-            <?php } ?>
-            <td class="wpsg_cell_menge"><?php echo wpsg_hspc($p['menge']); ?></td>
-            <td class="wpsg_cell_gesamtpreis"><?php echo wpsg_ff($p['menge'] * $p['preis']); ?> <?php echo $this->get_option('wpsg_currency'); ?></td>
-        </tr>
-        <?php if (wpsg_isSizedArray($p['order_allowedshipping'])) { ?>
-        <tr class="wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?>">
-            <td class="wpsg_cell_name">
-                <?php echo __('Mögliche Versandarten', 'wpsg'); ?>:
-            </td>
-            <td class="wpsg_cell_gesamtpreis" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?4:3); ?>">
-                <?php $j = 0; foreach ($p['order_allowedshipping'] as $shipping) { $j ++; ?>
-                <?php echo $this->getShippingName($shipping); ?><?php if ($j < sizeof($p['order_allowedshipping'])) { ?>, <?php } ?>
-                <?php } ?>
-            </td>
-        </tr>
-        <?php } ?>
-        <?php $this->callMods('order_view_row', array(&$p, $i)); ?>
-        <?php } ?>
-        <?php $gs_id = 0;
-        if ((isset($this->view['basket']['gs'])) && ($this->view['basket']['gs']['value'] > 0)) { ?>
-        <tr class="wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?> wpsg_gutschein">
-        	<?php
-        		$gs_id = 0;
-        		if (array_key_exists('gs_id', $_REQUEST))
-        		{
-        			$gs_id = wpsg_getInt($_REQUEST['gs_id']);
-        		}
-        		else
-        		{
-        			$gs_id = wpsg_getInt($this->view['data']['gs_id']);
-        		}
-        		$o_id = $_REQUEST['edit_id'];
-        		$link1 = '<span id="gsname_'.$gs_id.'" class="editable editable-click" data-original-title="" title="">'.$this->view['basket']['gs']['code'].'</span>';
-        		$val = '-'.wpsg_ff($this->view['basket']['sum']['gs']);
-        		$link2 = '<span id="gsvalue_'.$gs_id.'" class="editable editable-click" data-original-title="" title="">'.$val.'</span>';
-
-        	?>
-            <td class="wpsg_cell_name"><?php echo __('Gutschein', 'wpsg'); ?> <?php echo ($this->view['basket']['gs']['code'] != '')? '('.$link1.')':'' ?>
-            	<a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Gutschein löschen', 'wpsg'); ?>" onclick="return wpsg_removeVoucher(<?php echo $gs_id; ?>, <?php echo $o_id; ?>);"><span class="glyphicon glyphicon-trash"></span></a>
-            </td>
-            <td class="wpsg_cell_preis"><?php echo $link2.' '.$this->get_option('wpsg_currency'); ?></td>
-            <?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
-            <td class="wpsg_cell_mwst"><?php echo __('anteilig', 'wpsg'); ?></td>
-            <?php } ?>
-            <td class="wpsg_cell_menge">1</td>
-            <td class="wpsg_cell_gesamtpreis"><?php echo '-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?></td>
-        </tr>
-        <?php } ?>
-        <?php $prval = 0;
-        if (isset($this->view['basket']['sum']['preis_rabatt']) && $this->view['basket']['sum']['preis_rabatt'] > 0) {
-        	$o_id = $_REQUEST['edit_id'];
-        	$prval = '-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt']);
-        	$link2 = '<span id="discountvalue_'.$o_id.'" class="editable editable-click" data-original-title="" title="">'.$prval.'</span>';
-        ?>
-        <tr class="wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?> wpsg_row_rabatt">
-            <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_rabatt_label">
-                <?php echo __('Abzüglich Rabatt', 'wpsg'); ?>
-                <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Rabatt löschen', 'wpsg'); ?>" onclick="return wpsg_removeDiscount(<?php echo $o_id; ?>);"><span class="glyphicon glyphicon-trash"></span></a>
-            </td>
-            <td class="wpsg_cell_rabatt_value wpsg_cell_gesamtpreis">
-                <?php echo $link2.' '.$this->get_option('wpsg_currency'); ?>
-            </td>
-        </tr>
-        <?php } ?>
-        <tr class="wpsg_row_summe">
-            <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_summe_label">
-                <?php if ($this->get_option('wpsg_kleinunternehmer') == '1') { ?>
-                    <?php echo wpsg_translate(__('Summe (zzgl. #1#)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').'</a>'); ?>
-                <?php } else { ?>
-                    <?php //if ($this->getFrontendTaxview() == WPSG_NETTO)
-                    //if ($this->view['basket']['price_frontend'] == WPSG_NETTO)
-                    if ($this->get_option('wpsg_preisangaben') == WPSG_NETTO)
-                    { ?>
-                    <?php echo wpsg_translate(__('Summe (zzgl. #1#, zzgl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').'</a>'); ?>
-                    <?php } else { ?>
-                    <?php echo wpsg_translate(__('Summe (zzgl. #1#, inkl. MwSt.)', 'wpsg'), '<a href="'.$this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'" target="_blank">'.__('Versandkosten', 'wpsg').'</a>'); ?>
-                    <?php } ?>
-                <?php } ?>
-            </td>
-            <td class="wpsg_cell_summe_value wpsg_cell_gesamtpreis">
-                <?php echo wpsg_ff($this->view['basket']['sum']['preis']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
-            </td>
-        </tr>
-        <?php if ($this->view['basket']['sum']['preis_shipping'] != 0 || $this->get_option('wpsg_hideemptyshipping') != '1') { ?>
-        <tr class="wpsg_row_shipping">
-            <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_shipping_label">
-                <a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>" target="_blank"><?php echo __('Versandkosten', 'wpsg'); ?></a>
-                <?php
-                //$order = $this->view['oOrder'];
-                $o_id = $_REQUEST['edit_id'];
-                $oOrder = wpsg_order::getInstance($o_id);
-                $sid = $oOrder->getShippingID();
-                echo __('  ('.$this->arShipping[$sid]['name'].')', 'wpsg');
-                ?>
-                <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Versandart ändern', 'wpsg'); ?>"
-                   onclick="return WPSG_BE_Pay_Ship.changeShipping('<?php echo $sid; ?>', <?php echo $o_id; ?>);"><span class="glyphicon glyphicon-pencil"></span></a>
-            </td>
-            <td class="wpsg_cell_shipping_value wpsg_cell_gesamtpreis">
-                <span id="wpsg_cell_shipping_value"><?php echo wpsg_ff($this->view['basket']['sum']['preis_shipping']); ?> </span>
-                <?php echo $this->get_option('wpsg_currency'); ?>
-            </td>
-        </tr>
-        <?php } ?>
-        <?php if ($this->view['basket']['sum']['preis_payment'] != 0 || $this->get_option('wpsg_hideemptypayment') != '1') { ?>
-        <tr class="wpsg_row_payment">
-            <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_payment_label">
-                <?php echo __('Zahlungsart', 'wpsg');
-                //$order = $this->view['oOrder'];
-                $oOrder = wpsg_order::getInstance($_REQUEST['edit_id']);
-                $pid = $oOrder->getPaymentID();
-                echo __('  ('.$this->arPayment[$pid]['name'].')', 'wpsg');
-                ?>
-                <!-- <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Zahlungsart löschen', 'wpsg'); ?>" onclick="return WPSG_BE_Pay_Ship.deletePayment('"<?php echo $pid; ?>"'", <?php echo $o_id; ?>);"><span class="glyphicon glyphicon-trash"></span></a> -->
-                <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Zahlungsart ändern', 'wpsg'); ?>"
-                   onclick="return WPSG_BE_Pay_Ship.changePayment('<?php echo $pid; ?>', <?php echo $o_id; ?>);"><span class="glyphicon glyphicon-pencil"></span></a>
-            </td>
-            <td class="wpsg_cell_payment_value wpsg_cell_gesamtpreis" >
-                <span id="wpsg_cell_payment_value"><?php echo wpsg_ff($this->view['basket']['sum']['preis_payment']); ?> </span>
-                <?php echo $this->get_option('wpsg_currency'); ?>
-            </td>
-        </tr>
-        <?php } ?>
-        <?php if ($this->get_option('wpsg_preisangaben') == '1' && $this->get_option('wpsg_kleinunternehmer') != '1') { ?>
-        <?php foreach ($this->view['basket']['mwst'] as $mwst_id => $mwst) { ?>
-        <tr class="wpsg_row_mwst">
-            <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_mwst_label">
-                <?php echo wpsg_translate(__('zuzüglich MwSt. (#1#)', 'wpsg'), $mwst['name']); ?>
-            </td>
-            <td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis">
-                <?php echo wpsg_ff($mwst['sum']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
-            </td>
-        </tr>
-        <?php } ?>
-        <?php } ?>
-        <tr class="wpsg_row_gesamt">
-            <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_gesamt_label">
-                <?php echo __('Gesamtpreis', 'wpsg'); ?>
-            </td>
-            <td class="wpsg_cell_gesamt_value wpsg_cell_gesamtpreis">
-                <strong><?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt']); ?> <?php echo $this->get_option('wpsg_currency'); ?></strong>
-            </td>
-        </tr>
-        <?php if ($this->get_option('wpsg_kleinunternehmer') == '1' || $this->get_option('wpsg_preisangaben') != WPSG_NETTO) { ?>
-        <?php foreach ($this->view['basket']['mwst'] as $mwst_id => $mwst) { ?>
-        <tr class="wpsg_row_mwst">
-            <td colspan="<?php echo $this->view['colspan']; ?>" class="wpsg_cell_mwst_label">
-                <?php if ($this->get_option('wpsg_kleinunternehmer') == '1') { ?>
-                    <?php echo $this->get_option('wpsg_kleinunternehmer_text'); ?>
-                <?php } else { ?>
-                    <?php
-                    //if ($this->view['basket']['price_frontend'] == WPSG_NETTO) {
-                    if ($this->get_option('wpsg_preisangaben') == WPSG_NETTO) {
-                    	echo wpsg_translate(__('zuzüglich MwSt. (#1#)', 'wpsg'), $mwst['name']);
-                    } else {
-                    	echo wpsg_translate(__('darin enthaltene MwSt. (#1#)', 'wpsg'), $mwst['name']); ?>
-                    <?php } ?>
-                <?php } ?>
-            </td>
-            <td class="wpsg_cell_mwst_value wpsg_cell_gesamtpreis">
-                <?php echo wpsg_ff($mwst['sum']); ?> <?php echo $this->get_option('wpsg_currency'); ?>
-            </td>
-        </tr>
-        <?php } ?>
-        <?php } ?>
-    </table>
-
+    <div id="wpsg_product_table_wrap">
+        <?php $this->render(WPSG_PATH_VIEW.'order/product_table.phtml'); ?>
+    </div>
 
 <script type="text/javascript">/* <![CDATA[ */
 
@@ -329,21 +144,21 @@
 	}
 	
     jQuery(document).ready(function() {
-		gs_id = <?php echo $gs_id; ?>;
-		prval = <?php echo $prval; ?>;
+		 
 
-		wpsg_view_orderdata_show();
+		//wpsg_view_orderdata_show();
 
     } );
 
     function wpsg_view_orderdata_show() {
+                
         jQuery('#LinkGutscheinNeu').show();
         jQuery('#LinkRabattNeu').show();
         jQuery('#LinkProduktNeu').show();
         jQuery('#LinkSendMail').show();
 
-		if (gs_id > 0) { jQuery('#LinkGutscheinNeu').hide(); }
-		if (prval != 0) { jQuery('#LinkRabattNeu').hide(); }
+		//if (gs_id > 0) { jQuery('#LinkGutscheinNeu').hide(); }
+		//if (prval != 0) { jQuery('#LinkRabattNeu').hide(); }
     }
 
     function wpsg_view_orderdata_hide() {
@@ -365,517 +180,203 @@
 
 
     var WPSG_BE_Pay_Ship = {
+    		 
+        changeShippingPayment: function (id, oid) {
+
+            jQuery('#wpsg_shipping_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+            jQuery('#wpsg_shipping_dialog').modal( { } ).modal('show');
+                            
+            jQuery.ajax( {
+                url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=editPayShipping&edit_id=<?php echo $_REQUEST['edit_id']; ?>&noheader=1',
+                success: function(data) {
+
+                    jQuery('#wpsg_shipping_dialog .modal-body').html(data);
+
+                }
+            } );
+
+            return false;
+             
+        }, // function changeShipping(id, oid)
+
+        /**
+         * Ändern der Versanddaten im Backend
+         */
+        updateShippingPayment: function() {
+            
+            var data = {
+                submit: '1',
+                shipping_key: jQuery('#edit_shipping_type').val(),
+                shipping_price: jQuery('#edit_shipping_price').val(),
+                payment_key: jQuery('#edit_payment_type').val(),
+                payment_price: jQuery('#edit_payment_price').val()
+            };
+            
+            jQuery('#wpsg_shipping_dialog').modal('hide');
+            
+            jQuery('#wpsg_product_table_wrap').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+            
+            jQuery.ajax( {
+                url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=updateOrder&subaction=editPayShipping&edit_id=<?php echo $_REQUEST['edit_id']; ?>&noheader=1',
+                data: data,
+                success: function(data) {
+                    
+                    jQuery('#wpsg_product_table_wrap').html(data.product_table);
+                    
+                }
+            } );
+            
+            return false; 
+
+        } // function dialogShippingOK()
+  
+    };	// WPSG_BE_Pay_Ship
 
-        	paymentinfos: 0,
-        	shippinginfos: 0,
-        	pidold: 0,
-        	sidold: 0,
-        	preisold: 0.0,
-        	oid: 0,
-
-    		changePayment: function (id, oid) {
-				var
-					i,
-					n;
-    			//jQuery('#wpsg_payment_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
-
-    			jQuery('#wpsg_payment_dialog').modal( { } );
-
-    			this.paymentinfos = <?php  echo json_encode($this->arPayment, JSON_FORCE_OBJECT); ?>;
-    			this.oid = oid;
-    			this.pidold = id;
-
-    	 		jQuery('#zahlungsartid').empty();
-    			jQuery.each(this.paymentinfos, function(i,n) {
-    	    		console.log('element: ', n.name);
-    	    		if (id == n.id) {
-    	    			jQuery('#zahlungsartid').append("<option value=" + n.id + ' "selected"="selected">' + n.name + "</option>");
-    	    		} else {
-    	    			jQuery('#zahlungsartid').append("<option value=" + n.id + ">" + n.name + "</option>");
-    	    		}
-    	    	});
-    			jQuery('#zahlungsartid').val(id);
-
-    			//this.preis = this.paymentinfos[id].preis;
-    			//this.preis = jQuery('#wpsg_cell_payment_value').val();
-    			this.preis = jQuery('#wpsg_cell_payment_value').html();
-    			this.preisold = this.preis;
-    			if (this.preis == false) { this.preis = '0,00'; }
-    			jQuery('#zahlungsartvalue').val(this.preis);
-
-    			return false;
-
-    		}, // function changePayment(id, oid)
-
-    		/**
-    		 * Löschen der Zahlungsdaten im Backend
-    		 */
-    		deletePayment: function(id, oid) {
-    			var
-    				pid,
-    				url1;
-
-    			pid = jQuery('#zahlungsartid').val();
-    			pval = jQuery('#zahlungsartvalue').val();
-    			//alert('delete : ' + pid + ' / ' + pval);
-
-    			url1 = 'wp-admin/admin.php?page=wpsg-Order&subaction=paymentData&do=delete&edit_id=' + this.oid + '&p_id=' + pid + '&noheader=1';
-    			jQuery.ajax( {
-    				url: '<?php echo WPSG_URL_WP; ?>' + url1,
-    				success: function(data) {
-    					//jQuery('#wpsg_payment_dialog').modal('hide');
-    					//jQuery('#wpsg_payment_dialog').hide();
-    					//jQuery('#wpsg_payment_dialog').modal( { } ).modal('hide');
-    					jQuery('#wpsg_produkte_table').replaceWith(data);
-    					wpsg_be_act_orderdata();
-    			    }
-    			} );
-
-    			return false;
-
-    		}, // function deletePayment()
-
-    		/**
-    		 * Ändern der Zahlungsdaten im Backend
-    		 */
-    		dialogPaymentOK: function() {
-    			var
-    				pid,
-    				pval,
-    				url1;
-
-    			pid = jQuery('#zahlungsartid').val();
-    			pval = jQuery('#zahlungsartvalue').val();
-    			//alert('OK neu: ' + this.pidold + ' / ' + pid + ' / ' + pval);
-    			if ((this.pidold == pid) && (this.preisold == pval)) {
-    				jQuery('#wpsg_payment_dialog').modal('hide');
-					//jQuery('#wpsg_payment_dialog').modal('close');
-    				return false;
-    			}
-    			//alert('OK neu: ' + pid + ' / ' + pval);
-
-    			url1 = 'wp-admin/admin.php?page=wpsg-Order&subaction=paymentData&do=change&edit_id=' + this.oid + '&p_id=' + pid + '&p_value=' + pval + '&noheader=1';
-    			jQuery.ajax( {
-    				url: '<?php echo WPSG_URL_WP; ?>' + url1,
-    				data: {
-    					price_frontend: '<?php echo $this->view['basket']['price_frontend']; ?>',
-    					mwst: '<?php reset($this->view['basket']['mwst']); echo key($this->view['basket']['mwst']); ?>',
-    					noMwSt: '<?php echo $this->view['basket']['noMwSt']; ?>' },
-    				success: function(data) {
-    					//jQuery('#wpsg_payment_dialog').modal('hide');
-    					//jQuery('#wpsg_payment_dialog').hide();
-    					//jQuery('#wpsg_payment_dialog').modal( { } ).modal('hide');
-    					jQuery('#wpsg_produkte_table').replaceWith(data);
-    					wpsg_be_act_orderdata();
-    			    }
-    			} );
-
-    			return false;
-
-    		}, // function dialogPaymentOK()
-
-    		/**
-    		 * Ändern der Zahlungsdaten im Backend
-    		 */
-    		dialogPaymentChange: function() {
-    			var
-    				pid,
-    				pval;
-    			pid = jQuery('#zahlungsartid').val();
-    			pval = this.paymentinfos[pid].preis;
-    			jQuery('#zahlungsartvalue').val(pval);
-
-
-    		},	// dialogPaymentChange()
-
-
-    		changeShipping: function (id, oid) {
-				var
-					i,
-					n;
-    			//jQuery('#wpsg_shipping_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
-
-    			jQuery('#wpsg_shipping_dialog').modal( { } );
-
-    			this.shippinginfos = <?php  echo json_encode($this->arShipping, JSON_FORCE_OBJECT); ?>;
-    			this.oid = oid;
-    			this.sidold = id;
-
-    	 		jQuery('#versandartid').empty();
-    			jQuery.each(this.shippinginfos, function(i,n) {
-    	    		console.log('element: ', n.name);
-    	    		if (id == n.id) {
-    	    			jQuery('#versandartid').append("<option value=" + n.id + ' "selected"="selected">' + n.name + "</option>");
-    	    		} else {
-    	    			jQuery('#versandartid').append("<option value=" + n.id + ">" + n.name + "</option>");
-    	    		}
-    	    	});
-    			jQuery('#versandartid').val(id);
-
-    			this.preis = jQuery('#wpsg_cell_shipping_value').html();
-    			this.preisold = this.preis;
-    			if (this.preis == false) { this.preis = '0,00'; }
-    			jQuery('#versandartvalue').val(this.preis);
-
-    			return false;
-
-    		}, // function changeShipping(id, oid)
-
-    		/**
-    		 * Löschen der Versanddaten im Backend
-    		 */
-    		deleteShipping: function(id, oid) {
-    			var
-    				sid,
-    				url1;
-
-    			sid = jQuery('#versandartid').val();
-    			sval = jQuery('#versandartvalue').val();
-    			//alert('delete : ' + sid + ' / ' + sval);
-
-    			url1 = 'wp-admin/admin.php?page=wpsg-Order&subaction=shippingData&do=delete&edit_id=' + this.oid + '&s_id=' + sid + '&noheader=1';
-    			jQuery.ajax( {
-    				url: '<?php echo WPSG_URL_WP; ?>' + url1,
-    				success: function(data) {
-    					//jQuery('#wpsg_payment_dialog').modal('hide');
-    					//jQuery('#wpsg_payment_dialog').hide();
-    					//jQuery('#wpsg_payment_dialog').modal( { } ).modal('hide');
-    					jQuery('#wpsg_produkte_table').replaceWith(data);
-    		    		wpsg_be_act_orderdata();
-    			    }
-    			} );
-
-    			return false;
-
-    		}, // function deleteShipping()
-
-    		/**
-    		 * Ändern der Versanddaten im Backend
-    		 */
-    		dialogShippingOK: function() {
-    			var
-    				sid,
-    				sval,
-    				url1;
-
-    			sid = jQuery('#versandartid').val();
-    			sval = jQuery('#versandartvalue').val();
-    			//alert('OK neu: ' + this.sidold + ' / ' + sid + ' / ' + sval);
-    			if ((this.sidold == sid) && (this.preisold == sval)) {
-    				jQuery('#wpsg_shipping_dialog').modal('hide');
-					//jQuery('#wpsg_shipping_dialog').modal('close');
-    				return false;
-    			}
-    			//alert('OK neu: ' + sid + ' / ' + sval);
-
-    			url1 = 'wp-admin/admin.php?page=wpsg-Order&subaction=shippingData&do=change&edit_id=' + this.oid + '&s_id=' + sid + '&s_value=' + sval + '&noheader=1';
-    			jQuery.ajax( {
-    				url: '<?php echo WPSG_URL_WP; ?>' + url1,
-    				data: {
-    					price_frontend: '<?php echo $this->view['basket']['price_frontend']; ?>',
-    					mwst: '<?php reset($this->view['basket']['mwst']); echo key($this->view['basket']['mwst']); ?>',
-    					noMwSt: '<?php echo $this->view['basket']['noMwSt']; ?>' },
-    				success: function(data) {
-        				//alert(data);
-    					jQuery('#wpsg_produkte_table').replaceWith(data);
-    					wpsg_be_act_orderdata();
-    			    }
-    			} );
-
-    			return false;
-
-    		}, // function dialogShippingOK()
-
-    		/**
-    		 * Ändern der Versanddaten im Backend
-    		 */
-    		dialogShippingChange: function() {
-    			var
-    				sid,
-    				sval;
-    			sid = jQuery('#versandartid').val();
-    			sval = this.shippinginfos[pid].preis;
-    			jQuery('#versandartvalue').val(sval);
-
-
-    		},	// dialogShippingChange()
-
-		changePayment2: function (id, oid) {
-
-			alert('TEST OK neu2');
-
-		} // function changePayment2(id, oid)
+    var WPSG_BE_Product = {
 
-    };	// WPSG_BE_Pay_Ship
-    //WPSG_BE_Pay_Ship.changePayment2(1, 2);
+        addProduct: function() {
+    
+            jQuery('#wpsg_product_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+            jQuery('#wpsg_product_dialog').modal( { } ).modal('show');
+            jQuery('#wpsg_product_dialog .btn-primary').prop('disabled', true);
+            
+            jQuery.ajax( {
+                url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=addProduct&edit_id=<?php echo $_REQUEST['edit_id']; ?>&noheader=1',
+                success: function(data) {
+    
+                    jQuery('#wpsg_product_dialog .modal-body').html(data);
+    
+                }
+            } );
+    
+            return false;
+            
+        },
+        
+        remvoeProduct: function(order_product_id) {
+
+            jQuery('#wpsg_product_table_wrap').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+            
+            jQuery.ajax( {
+                url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=removeProduct&noheader=1&edit_id=<?php echo $_REQUEST['edit_id']; ?>',
+                data: { 
+                    order_product_id: order_product_id
+                },
+                success: function(data) {
+
+                    jQuery('#wpsg_product_table_wrap').html(data.product_table);
+
+                }
+            } );
+            
+            return false;
+            
+        },
+        
+        editProduct: function(order_product_id) {
+
+            jQuery('#wpsg_product_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+            jQuery('#wpsg_product_dialog').modal( { } ).modal('show');
+            jQuery('#wpsg_product_dialog .btn-primary').prop('disabled', true);
+
+            jQuery.ajax( {
+                url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=addProduct&edit_id=<?php echo $_REQUEST['edit_id']; ?>&noheader=1',
+                data: {
+                    order_product_id: order_product_id  
+                },
+                success: function(data) {
+
+                    jQuery('#wpsg_product_dialog .modal-body').html(data);
+
+                }
+            } );
+
+            return false;
+            
+        },
+
+        saveProduct: function() {
+ 
+            jQuery('#wpsg_product_dialog').modal('hide');
+            jQuery('#wpsg_product_table_wrap').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+
+            jQuery.ajax( {
+                url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=addProduct&do=submit&edit_id=<?php echo $_REQUEST['edit_id']; ?>&noheader=1',
+                data: jQuery('#wpsg_product_add_form').serialize(),
+                success: function(data) {
+
+                    jQuery('#wpsg_product_table_wrap').html(data.product_table);
+
+                }
+            } );
+
+            return false;
+
+        }
+        
+    }
+    
+    var WPSG_BE_Discount = {
+        
+        editDiscount: function() {
 
+            jQuery('#wpsg_discount_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+            jQuery('#wpsg_discount_dialog').modal( { } ).modal('show'); 
 
-    var WPSG_BE_Product = {
+            jQuery.ajax( {
+                url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=editDiscount&edit_id=<?php echo $_REQUEST['edit_id']; ?>&noheader=1',                 
+                success: function(data) {
 
-        	pidold: 0,
-        	preisold: 0.0,
-        	o_id: 0,
-        	p_id: 0,
-        	op_id: 0,
-        	modus: 0,
-
-			productinfos : <?php  echo json_encode($this->view['basket']['produkte'], JSON_FORCE_OBJECT); ?>,
-			mwstinfos : <?php  echo json_encode(wpsg_tax_groups(true), JSON_FORCE_OBJECT); ?>,
-			allproductinfos : <?php echo json_encode($this->db->fetchAssoc("SELECT * FROM `".wpsg_q(WPSG_TBL_PRODUCTS)."` WHERE `deleted` != '1' ORDER BY `name`"), JSON_FORCE_OBJECT); ?>,
-			mwst1 : <?php  echo json_encode($this->view['basket']['mwst'], JSON_FORCE_OBJECT); ?>,
-        	noMwSt: '<?php echo $this->view['basket']['noMwSt']; ?>',
-        	mwst2: '<?php reset($this->view['basket']['mwst']); echo key($this->view['basket']['mwst']); ?>',
-
-    	/**
-    	 * Wird aufgerufen wenn ein Produkt gelöscht werden soll
-    	 */
-    	removeProduct: function (op_id, o_id)
-    	{
-
-    		if (!confirm('<?php echo __("Sind Sie sich sicher, dass Sie dieses Produkt löschen möchten?", "wpsg"); ?>')) return false;
-
-    		jQuery('#wpsg_produkte_table').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
-
-    		jQuery.ajax( {
-    			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=productData&do=remove&edit_id=' + o_id + '&op_id=' + op_id + '&noheader=1',
-    			success: function (data) {
-    				jQuery('#wpsg_produkte_table').replaceWith(data);
-    	    		wpsg_be_act_orderdata();
-    			}
-    		} );
-
-    		return false;
-    	},	// function removeProduct
-
-    	/**
-    	 * Wird aufgerufen wenn ein Produkt hinzugefügt werden soll
-    	 */
-    	addProduct: function (o_id, p_id) {
-    		//jQuery('#wpsg_produkte_table').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
-    		this.op_id = 0;
-			this.p_id = p_id;
-			this.o_id = o_id;
-
-    		//alert('TEST');
-    		jQuery('#wpsg_product_dialog').modal( { } );
-
-    		this.modus = 1;		// neues Produkt
-    		jQuery('#wpsg_product_data').hide();
-
-    		jQuery('#productid').empty();
-			jQuery.each(this.allproductinfos, function (i,n) {
-				jQuery('#productid').append("<option value=" + n.id + ">" + n.name + "</option>");
-			});
-			jQuery('#productid').val(p_id);
-
-
-    		return false;
-    	},	// function addProduct
-
-		/**
-		 * Bearbeiten der Produkt-Daten
-		 */
-		editProduct: function (op_id, p_id, o_id)
-		{
-			var
-				i,
-				id,
-				menge,
-				key,
-				mid,
-				n;
-
-			this.modus = 0;		// bearbeiten
-			this.op_id = op_id;
-			this.p_id = p_id;
-			this.o_id = o_id;
-			//jQuery('#wpsg_produkte_table').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
-
-			jQuery('#wpsg_product_dialog').modal( { } );
-    		jQuery('#wpsg_product_data').show();
-
-			this.pidold = p_id;
-
-			jQuery('#productid').empty();
-			jQuery.each(this.allproductinfos, function (i,n) {
-				console.log('element: ', n.name);
-				if (p_id == n.id) {
-					jQuery('#productid').append("<option value=" + n.id + ' "selected"="selected">' + n.name + "</option>");
-					mid = n.mwst_key;
-				} else {
-					jQuery('#productid').append("<option value=" + n.id + ">" + n.name + "</option>");
-				}
-			});
-			jQuery('#productid').val(p_id);
-
-			jQuery('#productmwst').empty();
-			for (key in this.mwstinfos) {
-				if (p_id == key) {
-					jQuery('#productmwst').append("<option value=" + key + ' "selected"="selected">' + this.mwstinfos[key] + "</option>");
-				} else {
-					jQuery('#productmwst').append("<option value=" + key + ">" + this.mwstinfos[key] + "</option>");
-				}
-			}
-			jQuery('#productmwst').val(mid);
-
-			id = this.findIndex(op_id);
-			this.preis = this.productinfos[id].preis;
-
-			this.preisold = this.preis;
-			if (this.preis == false) { this.preis = '0,00'; }
-			jQuery('#productvalue').val(this.preis);
-			menge = this.productinfos[id].menge;
-			jQuery('#productmenge').val(menge);
-
-			return false;
-
-		}, // function editProduct()
-
-    	/**
-		 * Ändern der Produktdaten im Backend
-		 */
-		dialogProductOK: function () {
-			var
-				pid,
-				pval,
-				pme,
-				pmwst,
-				url1;
-
-			pid = jQuery('#productid').val();
-			pval = jQuery('#productvalue').val();
-			pme = jQuery('#productmenge').val();
-			pmwst = jQuery('#productmwst').val();
-			//alert('OK neu: ' + this.pidold + ' / ' + pid + ' / ' + pval);
-			//if ((this.pidold == pid) && (this.preisold == pval)) {
-			if ((pid == null)) {
-				jQuery('#wpsg_product_dialog').modal('hide');
-				return false;
-			}
-			//alert('OK neu: ' + pid + ' / ' + pval);
-
-			if (this.modus == 0) {
-				url1 = 'wp-admin/admin.php?page=wpsg-Order&subaction=productData&do=change&edit_id=' + this.o_id + '&op_id=' + this.op_id + '&p_id=' + pid + '&noheader=1';
-				jQuery.ajax( {
-					url: '<?php echo WPSG_URL_WP; ?>' + url1,
-					data: {
-						p_val: pval,
-						p_me: pme,
-						pidold: this.pidold,
-						mwst: this.mwst1,
-						noMwSt: this.noMwSt,
-						p_mwst: pmwst},
-					success: function(data) {
-						//jQuery('#wpsg_payment_dialog').modal('hide');
-						//jQuery('#wpsg_payment_dialog').hide();
-						//jQuery('#wpsg_payment_dialog').modal( { } ).modal('hide');
-						jQuery('#wpsg_produkte_table').replaceWith(data);
-			    		wpsg_be_act_orderdata();
-				    }
-				} );
-			} else {
-				// Neues Produkt hinzufügen
-	    		jQuery.ajax( {
-	    			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=productData&do=add&edit_id=' + this.o_id + '&p_id=' + pid + '&noheader=1',
-					data: {
-						p_val: pval,
-						p_me: pme,
-						pidold: this.pidold,
-						mwst: this.mwst1,
-						noMwSt: this.noMwSt,
-						p_mwst: pmwst},
-	    			success: function(data) {
-	    				jQuery('#wpsg_produkte_table').replaceWith(data);
-	    	    		wpsg_be_act_orderdata();
-	    				//jQuery('#LinkRabattNeu').hide();
-	    			}
-	    		} );
-			}
-			return false;
-
-		}, // function dialogProduktOK()
-
-		/**
-		 * Ändern des Produktes im Backend
-		 */
-		dialogProductChange: function() {
-			var
-				pid,
-				id,
-				aid,
-				mid,
-				pval;
-			pid = jQuery('#productid').val();
-			aid = this.findAllIndex(pid);
-			if (aid !== false) {
-				pval = this.allproductinfos[aid].name;
-				id = this.findIndex(this.op_id);
-				pval = this.allproductinfos[aid].preis;
-				jQuery('#productvalue').val(pval);
-				jQuery('#productmenge').val(1);
-				pval = this.allproductinfos[aid].mwst_key;
-				jQuery('#productmwst').val(pval);
-
-				jQuery('#productmwst').empty();
-				for (key in this.mwstinfos) {
-					if (pval == key) {
-						jQuery('#productmwst').append("<option value=" + key + ' "selected"="selected">' + this.mwstinfos[key] + "</option>");
-					} else {
-						jQuery('#productmwst').append("<option value=" + key + ">" + this.mwstinfos[key] + "</option>");
-					}
-				}
-				jQuery('#productmwst').val(pval);
-
-				jQuery('#wpsg_product_data').show();
-			}
+                    jQuery('#wpsg_discount_dialog .modal-body').html(data);
 
-		},	// dialogProductChange()
-
-		/**
-		 * Suchen des Indexes in allproductinfos an Hand der id
-		 */
-		findAllIndex: function(id) {
-			var
-				pid,
-				pval;
-			for (key in this.allproductinfos) {
-				if (id == this.allproductinfos[key].id) {
-					return key;
-				}
-			}
-			return false;
-
-		},	// findAllIndex()
-
-		/**
-		 * Suchen des Indexes in productinfos an Hand der order_product_id
-		 */
-		findIndex: function(id) {
-			var
-				pid,
-				pval;
-			for (key in this.productinfos) {
-				if (id == this.productinfos[key].order_product_id) {
-					return key;
-				}
-			}
-			return false;
+                }
+            } );
 
-		},	// findIndex()
+            return false;
+            
+        },
+        
+        saveDiscount: function() {
 
-		changeProduct2: function (id, oid) {
+            jQuery('#wpsg_discount_dialog').modal('hide');
+            jQuery('#wpsg_product_table_wrap').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
 
-			alert('TEST OK neu2');
+            jQuery.ajax( {
+                url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&subaction=editDiscount&do=submit&edit_id=<?php echo $_REQUEST['edit_id']; ?>&noheader=1',
+                data: jQuery('#wpsg_be_discount_form').serialize(),
+                success: function(data) {
 
-		} // function changeProduct2(id, oid)
+                    jQuery('#wpsg_product_table_wrap').html(data.product_table);
 
-    };	// WPSG_BE_Product
-    //WPSG_BE_Product.changeProduct2(1, 2);
+                }
+            } );
 
+            return false;
+            
+        }
+        
+    }
+    
 	/* ]]> */</script>
 
 </div>
 
+<!-- Modaldialog für Rabatt -->
+<div class="modal fade" id="wpsg_discount_dialog" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="myModalLabel"><?php echo __('Rabatt hinzufügen/bearbeiten', 'wpsg'); ?></h4>
+            </div>
+            <div class="modal-body"></div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Abbrechen</button>
+                <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="return WPSG_BE_Discount.saveDiscount();">OK</button>
+            </div>
+        </div>
+    </div>
+</div>
 
 <!-- Modaldialog für Produkte -->
 <div class="modal fade" id="wpsg_product_dialog" tabindex="-1" role="dialog">
@@ -883,63 +384,18 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="myModalLabel"><?php echo __('Produkt', 'wpsg'); ?></h4>
-      </div>
-      <div class="modal-body">
-      	<br />
-      	<?php
-      	$i = 0;
-      	// $this
-      	?>
-        <div class="row">
-          <div class="col-md-3 col-sm-6 control_label"><label for="productid" ><?php echo _("Produkt"); ?></label></div>
-          <div class="col-md-3">
-			<select name="productid" id="productid" onchange="return WPSG_BE_Product.dialogProductChange();" class="form-control input-sm" size="1" class="select">
-				<option value=0>"[unbekannt]"</option>
-			</select>
-		  </div>
-        </div>
-        <div class="clearfix wpsg_clear"></div>
-        <div class="clearfix wpsg_clear"></div>
-
-		<div id="wpsg_product_data">
-	        <div class="row">
-	          <div class="col-md-3 col-sm-6 control_label"><label for="productvalue"><?php echo _("Preis"); ?></label></div>
-	          <div class="col-md-3">
-				<input type="text" name="productvalue" id="productvalue" class="form-control input-sm" size="1" class="select">
-			  </div>
-	        </div>
-	        <div class="clearfix wpsg_clear"></div>
-	        <div class="row">
-	          <div class="col-md-3 col-sm-6 control_label"><label for="productmenge"><?php echo _("Menge"); ?></label></div>
-	          <div class="col-md-3">
-				<input type="text" name="productmenge" id="productmenge" class="form-control input-sm" size="1" class="select">
-			  </div>
-	        </div>
-	        <div class="clearfix wpsg_clear"></div>
-	        <div class="row">
-	          <div class="col-md-3 col-sm-6 control_label"><label for="productid" ><?php echo _("MwSt:"); ?></label></div>
-	          <div class="col-md-3">
-				<select name="productmwst" id="productmwst" class="form-control input-sm" size="1" class="select">
-					<option value=0>"[unbekannt]"</option>
-				</select>
-			  </div>
-	        </div>
-	        <div class="clearfix wpsg_clear"></div>
-
-        </div>
-
+        <h4 class="modal-title" id="myModalLabel"><?php echo __('Produkt hinzufügen/bearbeiten', 'wpsg'); ?></h4>
       </div>
+      <div class="modal-body"></div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Abbrechen</button>
-        <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="return WPSG_BE_Product.dialogProductOK();">OK</button>
+        <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="return WPSG_BE_Product.saveProduct();">OK</button>
       </div>
     </div>
   </div>
 </div>
 
-
-<!-- Modaldialog für Versandart -->
+<!-- Modaldialog für Versandart / Zahlungsart -->
 <div class="modal fade" id="wpsg_shipping_dialog" tabindex="-1" role="dialog">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
@@ -947,73 +403,12 @@
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         <h4 class="modal-title" id="myModalLabel"><?php echo __('Versandart', 'wpsg'); ?></h4>
       </div>
-      <div class="modal-body">
-      	<br />
-        <div class="row">
-          <div class="col-md-3 col-sm-6 control_label"><label for="versandartid" ><?php echo _("Versandart"); ?></label></div>
-          <div class="col-md-3">
-			<select name="versandartid" id="versandartid" onchange="return WPSG_BE_Pay_Ship.dialogShippingChange();" class="form-control input-sm" size="1" class="select">
-				<option value=0>"[unbekannt]"</option>
-			</select>
-		  </div>
-        </div>
-        <div class="clearfix wpsg_clear"></div>
-        <div class="clearfix wpsg_clear"></div>
-        <br />
-        <div class="row">
-          <div class="col-md-3 col-sm-6 control_label"><label for="versandartvalue"><?php echo _("Gebühr/Kosten"); ?></label></div>
-          <div class="col-md-3">
-			<input type="text" name="versandartvalue" id="versandartvalue" class="form-control input-sm" size="1" class="select">
-		  </div>
-        </div>
-        <div class="clearfix wpsg_clear"></div>
-
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Abbrechen</button>
-        <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="return WPSG_BE_Pay_Ship.dialogShippingOK();">OK</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<!-- Modaldialog für Zahlungsart -->
-<div class="modal fade" id="wpsg_payment_dialog" tabindex="-1" role="dialog">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="myModalLabel"><?php echo __('Zahlungsart', 'wpsg'); ?></h4>
-      </div>
-      <div class="modal-body">
-      	<br />
-        <div class="row">
-          <div class="col-md-3 col-sm-6 control_label"><label for="zahlungsartid" ><?php echo _("Zahlungsart"); ?></label></div>
-          <div class="col-md-3">
-			<select name="zahlungsartid" id="zahlungsartid" onchange="return WPSG_BE_Pay_Ship.dialogPaymentChange();" class="form-control input-sm" size="1" class="select">
-				<option value=0>"[unbekannt]"</option>
-			</select>
-		  </div>
-        </div>
-        <div class="clearfix wpsg_clear"></div>
-        <div class="clearfix wpsg_clear"></div>
-        <br />
-        <div class="row">
-          <div class="col-md-3 col-sm-6 control_label"><label for="zahlungsartvalue"><?php echo _("Gebühr/Kosten"); ?></label></div>
-          <div class="col-md-3">
-			<input type="text" name="zahlungsartvalue" id="zahlungsartvalue" class="form-control input-sm" size="1" class="select">
-		  </div>
-        </div>
-        <div class="clearfix wpsg_clear"></div>
-
-      </div>
+      <div class="modal-body"></div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Abbrechen</button>
-        <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="return WPSG_BE_Pay_Ship.dialogPaymentOK();">OK</button>
+        <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="return WPSG_BE_Pay_Ship.updateShippingPayment();">OK</button>
       </div>
     </div>
   </div>
 </div>
 
-<?php echo wpsg_drawForm_AdminboxEnd(); ?>
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
index 66407a6..8e2d194 100644
--- a/views/warenkorb/basket.phtml
+++ b/views/warenkorb/basket.phtml
@@ -111,8 +111,7 @@
 
 					<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>
 					<div class="product_info">
-						
-						<div
+						 
 						<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>
 							<?php echo __("MwSt.", "wpsg"); ?>
 						</div>
-- 
cgit v1.2.3