From 492fc1f382243eba35257fb82e3d2b444715631c Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Thu, 21 Dec 2017 14:43:47 +0000
Subject: Berechnung Versand, MwSt und Preise im BE und FE korrigiert

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6846 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/order/view.phtml              |  2 +-
 views/order/view_customerdata.phtml | 17 +++++++++++++++--
 views/order/view_general.phtml      |  2 +-
 views/order/view_orderdata.phtml    | 35 ++++++++++++++++++++++++++++++++---
 4 files changed, 49 insertions(+), 7 deletions(-)

(limited to 'views')

diff --git a/views/order/view.phtml b/views/order/view.phtml
index ccc1947..c01a0c4 100644
--- a/views/order/view.phtml
+++ b/views/order/view.phtml
@@ -16,7 +16,7 @@
 				<ul class="nav navbar-nav">
 					<li role="presentation" class="<?php echo ((!isset($_REQUEST['action']))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order"><?php echo __("Bestellübersicht", "wpsg"); ?></a></li>
 					<li role="presentation" class="wpsg_showhide_filter active"><a onclick="return false;"><?php echo __("Bestellansicht (Detail)", "wpsg"); ?></a></li>
-					<li role="presentation" class="wpsg_top_extend">
+					<li role="presentation" class="wpsg_top_extend" id="wpsg_be_orderdata">
 
 						<?php echo $this->view['oOrder']->getInvoiceFirstName().' '.$this->view['oOrder']->getInvoiceName().' / '.wpsg_ff($this->view['oOrder']->getAmount($this->getBackendTaxview()), $this->get_option('wpsg_currency')); ?>
 
diff --git a/views/order/view_customerdata.phtml b/views/order/view_customerdata.phtml
index ffeb354..c63825a 100644
--- a/views/order/view_customerdata.phtml
+++ b/views/order/view_customerdata.phtml
@@ -45,7 +45,8 @@
                 <?php if ($this->hasMod('wpsg_mod_shippingadress')) {?>
                 <?php echo wpsg_drawForm_Checkbox('dialog_shipping', __('Auch Lieferanschrift anpassen', 'wpsg'), false, array('help' => 'dialog_shipping')); ?>
                 <?php } ?>
-
+				<input type="hidden" id="dialog_change_land" name="dialog_change_land" />
+				
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo __('Schließen', 'wpsg'); ?></button>
@@ -114,7 +115,8 @@
                 },
                 success: function(data) {
 
-                    location.href = location.href;
+                    //location.href = location.href;
+                    location.reload();
 
                 }
             } );
@@ -123,6 +125,17 @@
 
         }
 
+        jQuery(document).ready(function() {
+
+            jQuery('#dialog_land').bind('change', function() {
+
+				jQuery('#dialog_change_land').val('1');
+				
+            } );
+        	
+        } );
+            
+
     /* ]]> */</script>
 
 <?php echo wpsg_drawForm_AdminboxEnd(); ?>
diff --git a/views/order/view_general.phtml b/views/order/view_general.phtml
index c2ed0c5..8ea1305 100644
--- a/views/order/view_general.phtml
+++ b/views/order/view_general.phtml
@@ -11,7 +11,7 @@
 
     <?php echo wpsg_drawForm_Text(__('Bestellnummer', 'wpsg'), $this->view['oOrder']->getNr().' ['.$this->view['oOrder']->getStateLabel().']'); ?>
     <?php echo wpsg_drawForm_Text(__('Bestelldatum', 'wpsg'), wpsg_formatTimestamp($this->view['oOrder']->cdate)); ?>
-    <?php echo wpsg_drawForm_Text(__('Bestellwert', 'wpsg'), wpsg_ff($this->view['oOrder']->getAmount(), $this->get_option('wpsg_currency'))); ?>
+    <?php echo wpsg_drawForm_Text(__('Bestellwert', 'wpsg'), wpsg_ff($this->view['oOrder']->getAmount(), $this->get_option('wpsg_currency')), 'wpsg_be_orderamount'); ?>
     <?php echo wpsg_drawForm_Text(__('Bestellkommentar (Admin)', 'wpsg'), $this->view['data']['admincomment'], 'wpsg_order_admincomment', array('inlineEdit' => true, 'inlineEdit_type' => 'textarea', 'inlineEdit_url' => WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Order&noheader=1&action=setAdminComment&edit_id='.$this->view['data']['id'])); ?>
 
 <?php echo wpsg_drawForm_AdminboxEnd(); ?>
diff --git a/views/order/view_orderdata.phtml b/views/order/view_orderdata.phtml
index f940104..26ae631 100644
--- a/views/order/view_orderdata.phtml
+++ b/views/order/view_orderdata.phtml
@@ -233,6 +233,7 @@
     	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
     	callback: function(data, config) {
     		jQuery('#wpsg_produkte_table').replaceWith(data);
+    		wpsg_be_act_orderdata();
     	}
 	});
 
@@ -256,6 +257,7 @@
     	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
     	callback: function(data, config) {
     		jQuery('#wpsg_produkte_table').replaceWith(data);
+    		wpsg_be_act_orderdata();
     	}
 	});
 
@@ -277,6 +279,7 @@
 			success: function(data) {
 				jQuery('#wpsg_produkte_table').replaceWith(data);
 				jQuery('#LinkGutscheinNeu').show();
+	    		wpsg_be_act_orderdata();
 			}
 		} );
 
@@ -298,12 +301,33 @@
 			success: function(data) {
 				jQuery('#wpsg_produkte_table').replaceWith(data);
 				jQuery('#LinkRabattNeu').show();
+	    		wpsg_be_act_orderdata();
 			}
 		} );
 
 		return false;
 	}
 
+	function wpsg_be_act_orderdata() {
+
+		var o_id = 0;
+		//alert('wpsg_be_act_orderdata');
+		jQuery.ajax( {
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=orderData&do=actual&edit_id=' + o_id +'&noheader=1',
+			success: function(data) {
+				data = JSON.parse(data);
+				jQuery('#wpsg_be_orderamount').html(data.preis);
+				odata = data.vname + ' ' + data.name + ' / ' + data.preis;
+				jQuery('#wpsg_be_orderdata').html(odata);
+				
+			}
+		} );
+
+
+		return false;
+		
+	}
+	
     jQuery(document).ready(function() {
 		gs_id = <?php echo $gs_id; ?>;
 		prval = <?php echo $prval; ?>;
@@ -403,6 +427,7 @@
     					//jQuery('#wpsg_payment_dialog').hide();
     					//jQuery('#wpsg_payment_dialog').modal( { } ).modal('hide');
     					jQuery('#wpsg_produkte_table').replaceWith(data);
+    					wpsg_be_act_orderdata();
     			    }
     			} );
 
@@ -441,6 +466,7 @@
     					//jQuery('#wpsg_payment_dialog').hide();
     					//jQuery('#wpsg_payment_dialog').modal( { } ).modal('hide');
     					jQuery('#wpsg_produkte_table').replaceWith(data);
+    					wpsg_be_act_orderdata();
     			    }
     			} );
 
@@ -515,6 +541,7 @@
     					//jQuery('#wpsg_payment_dialog').hide();
     					//jQuery('#wpsg_payment_dialog').modal( { } ).modal('hide');
     					jQuery('#wpsg_produkte_table').replaceWith(data);
+    		    		wpsg_be_act_orderdata();
     			    }
     			} );
 
@@ -549,10 +576,9 @@
     					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');
+        				//alert(data);
     					jQuery('#wpsg_produkte_table').replaceWith(data);
+    					wpsg_be_act_orderdata();
     			    }
     			} );
 
@@ -614,6 +640,7 @@
     			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();
     			}
     		} );
 
@@ -743,6 +770,7 @@
 						//jQuery('#wpsg_payment_dialog').hide();
 						//jQuery('#wpsg_payment_dialog').modal( { } ).modal('hide');
 						jQuery('#wpsg_produkte_table').replaceWith(data);
+			    		wpsg_be_act_orderdata();
 				    }
 				} );
 			} else {
@@ -758,6 +786,7 @@
 						p_mwst: pmwst},
 	    			success: function(data) {
 	    				jQuery('#wpsg_produkte_table').replaceWith(data);
+	    	    		wpsg_be_act_orderdata();
 	    				//jQuery('#LinkRabattNeu').hide();
 	    			}
 	    		} );
-- 
cgit v1.2.3