Bestellungen OK, Versand- und Zahlungsarten teilweise,

wspg_editable geändert in wpsg_editable

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5934 0d5edaf7-2b12-4e95-93f4-047927463d4b

2 files changed, 595 insertions, 105 deletions

diff --git a/views/order/view.phtml b/views/order/view.phtml
index 8df88e7..55e8386 100644
--- a/views/order/view.phtml
+++ b/views/order/view.phtml
@@ -37,11 +37,15 @@
             <?php } ?>

         </div>

 

+        <a href="" id="LinkProduktNeu" onclick="return WPSG_BE_Product.addProduct(<?php echo $_REQUEST['edit_id']; ?>, 0);"><span class="glyphicon glyphicon-plus"></span>&nbsp;

+	 	<?php echo __("Neues Produkt", "wpsg"); ?>

+	 	</a><br />

+

         <br />

         <?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>&nbsp;

-			 	<?php echo __("Neuer Gutschein.", "wpsg"); ?>

+			 	<?php echo __("Neuer Gutschein", "wpsg"); ?>

 			 	</a><br />

             <?php //} ?>

         <?php } ?>

@@ -49,7 +53,7 @@
         <?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>&nbsp;

-			 	<?php echo __("Neuer Rabatt.", "wpsg"); ?>

+			 	<?php echo __("Neuer Rabatt", "wpsg"); ?>

 			 	</a><br />

             <?php //} ?>

         <?php } ?>

@@ -118,6 +122,7 @@
 

 	} // function wpsg_addVoucher()

 

+	

 

     jQuery(document).ready(function() {

 

diff --git a/views/order/view_orderdata.phtml b/views/order/view_orderdata.phtml
index c031b35..14968dc 100644
--- a/views/order/view_orderdata.phtml
+++ b/views/order/view_orderdata.phtml
@@ -25,6 +25,8 @@
                 <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') { ?>

@@ -99,7 +101,8 @@
                     <?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->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 { ?>

@@ -115,9 +118,19 @@
         <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">

-                <?php echo wpsg_ff($this->view['basket']['sum']['preis_shipping']); ?> <?php echo $this->get_option('wpsg_currency'); ?>

+                <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 } ?>

@@ -130,10 +143,13 @@
                 $pid = $oOrder->getPaymentID();

                 echo __('  ('.$this->arPayment[$pid]['name'].')', 'wpsg');

                 ?>

-                <a href="#" class="wpsg-glyphlink-td" title="<?php echo __('Zahlungsart ändern', 'wpsg'); ?>" onclick="return WPSG_BE_Payment.changePayment(<?php echo $pid; ?>, <?php echo $o_id; ?>);"><span class="glyphicon glyphicon-modal-window"></span></a>

+                <!-- <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">

-                <?php echo wpsg_ff($this->view['basket']['sum']['preis_payment']); ?> <?php echo $this->get_option('wpsg_currency'); ?>

+            <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 } ?>

@@ -157,14 +173,16 @@
                 <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') != '1') { ?>

+        <?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) {

+                    <?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']); ?>

@@ -185,7 +203,7 @@
 <?php if ($this->hasMod('wpsg_mod_gutschein')) { ?>

 	<?php if ((array_key_exists('gs', $this->view['basket'])) && ($this->view['basket']['gs']['value'] > 0)) { ?>

 

-	jQuery('#gsname_<?php echo $gs_id; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=voucherData&do=editname&noheader=1', {

+	jQuery('#gsname_<?php echo $gs_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=voucherData&do=editname&noheader=1', {

 		submitdata: { 

     		field: 'code',

     		gs_id: '<?php echo $gs_id; ?>',

@@ -200,7 +218,7 @@
     	}

 	});

 

-	jQuery('#gsvalue_<?php echo $gs_id; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=voucherData&do=editvalue&noheader=1', {

+	jQuery('#gsvalue_<?php echo $gs_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=voucherData&do=editvalue&noheader=1', {

 		submitdata: { 

     		field: 'value',

     		gs_id: '<?php echo $gs_id; ?>',

@@ -224,7 +242,7 @@
 <?php if ($this->hasMod('wpsg_mod_discount')) { ?>

 	<?php if (isset($this->view['basket']['sum']['preis_rabatt']) && $this->view['basket']['sum']['preis_rabatt'] > 0) { ?>

 

-	jQuery('#discountvalue_<?php echo $o_id; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=discountData&do=editvalue&noheader=1', {

+	jQuery('#discountvalue_<?php echo $o_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=discountData&do=editvalue&noheader=1', {

 		submitdata: { 

     		field: 'value',

     		edit_id: '<?php echo $o_id; ?>',

@@ -307,131 +325,598 @@
     //Modul2.methode();

 

     

-    var WPSG_BE_Payment = {

+    var 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-Admin&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);

+    			    }

+    			} );

+    		

+    			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-Admin&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);

+    			    }

+    			} );

+    		

+    			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-Admin&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);

+    			    }

+    			} );

+    		

+    			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-Admin&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) {

+    					//jQuery('#wpsg_payment_dialog').modal('hide');

+    					//jQuery('#wpsg_payment_dialog').hide();

+    					//jQuery('#wpsg_payment_dialog').modal( { } ).modal('hide');

+    					jQuery('#wpsg_produkte_table').replaceWith(data);

+    			    }

+    			} );

+    		

+    			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) {

 

-    	paymentinfos: 0,

-    	pidold: 0,

-    	oid: 0,

+			alert('TEST OK neu2');

 

-		changePayment: function (id, oid) {

+		} // function changePayment2(id, oid)

+		

+    };	// WPSG_BE_Pay_Ship

+    //WPSG_BE_Pay_Ship.changePayment2(1, 2);

+    

+

+    var WPSG_BE_Product = {

 

-			//alert('TEST OK neu');

+        	pidold: 0,

+        	preisold: 0.0,

+        	o_id: 0,

+        	p_id: 0,

+        	op_id: 0,

+        	modus: 0,

 

-			//jQuery('#wpsg_payment_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');

+			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'"), 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-Admin&subaction=productData&do=remove&edit_id=' + o_id + '&op_id=' + op_id + '&noheader=1',

+    			success: function (data) {

+    				jQuery('#wpsg_produkte_table').replaceWith(data);

+    			}

+    		} );

+    		

+    		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

+

+    	/**

+		 * Ä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);

 			

-			jQuery('#wpsg_payment_dialog').modal( { } )

+			if (this.modus == 0) {

+				url1 = 'wp-admin/admin.php?page=wpsg-Admin&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);

+				    }

+				} );

+			} else {

+				// Neues Produkt hinzufügen

+	    		jQuery.ajax( {

+	    			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&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);

+	    				//jQuery('#LinkRabattNeu').hide();

+	    			}

+	    		} );

+			}

+			return false;

 		

-			/*

-			jQuery.ajax({

-				url: 'admin.php?page=wpsg-Admin&subaction=kundendaten&noheader=1&show=code',

-				data: { 'kv_id': index },

-				success: function(data) { jQuery('#wpsg_payment_dialog .modal-body').html(data); }

-	    	});

-			*/

-			

-			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>');

-	    		}

-	    	});

+		}, // function dialogProduktOK()

+		

+		/**

+		 * 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'); ?>" />');

 	

-			preis = this.paymentinfos[id].preis;

-			if (preis == false) { preis = '0,00'; } 

-			jQuery('#zahlungsartvalue').val(preis);

-	    	

-			return false;

+			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);

 

-		}, // function changePayment(id, oid)

+			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 Zahlungsdaten im Backend

+		 * Ändern des Produktes im Backend

 		 */	                          

-		dialog_OK: function() {

+		dialogProductChange: function() {

 			var

 				pid,

+				id,

+				aid,

 				pval;

-

-			pid = jQuery('#zahlungsartid').val();

-			pval = jQuery('#zahlungsartvalue').val();

-			alert('OK neu: ' + this.pidold + ' / ' + pid + ' / ' + pval);

-			//TODO vergleichen oder nicht

-			if (this.pidold == pid) { 

-				jQuery('#wpsg_payment_dialog').modal('hide');

-				return false;

-			}

-			alert('OK neu: ' + pid + ' / ' + pval);

-			//TODO price_frontend

-			//TODO Frontend-Rabatt/Frontend-Gutschein bei Firmenkunde in Netto oder Brutto in der Datenbank?

-

-			//TODO

-    		//field: 'value',

-    		//gs_id: '<?php echo $gs_id; ?>',

-    		//edit_id: '<?php echo $o_id; ?>',

-        	//noMwSt: '<?php echo $this->view['basket']['noMwSt']; ?>',

-        	//mwst: '<?php reset($this->view['basket']['mwst']); echo key($this->view['basket']['mwst']); ?>',

-        	//price_frontend: '<?php echo $this->view['basket']['price_frontend']; ?>'

-			//data: { name: "John", location: "Boston" }

-			

-			data1: {

-				//price_frontend: '<?php echo $this->view['basket']['price_frontend']; ?>',

-				//noMwSt: '<?php echo $this->view['basket']['noMwSt']; ?>'

+			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);

 			}

-					

-			url1 = 'wp-admin/admin.php?page=wpsg-Admin&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,

-				dataType: 'json',

-				data: {

-					price_frontend: '<?php echo $this->view['basket']['price_frontend']; ?>',

-					noMwSt: '<?php echo $this->view['basket']['noMwSt']; ?>' },

-				method: 'POST',

-				success: function(data) {

-					jQuery('#wpsg_produkte_table').replaceWith(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;

-		

-		}, // function dialog_OK()

 

+		},	// findAllIndex()

+		

 		/**

-		 * Ändern der Zahlungsdaten im Backend

+		 * Suchen des Indexes in productinfos an Hand der order_product_id

 		 */	                          

-		dialog_change: function() {

+		findIndex: function(id) {

 			var

 				pid,

 				pval;

-			pid = jQuery('#zahlungsartid').val();

-			pval = this.paymentinfos[pid].preis;

-			jQuery('#zahlungsartvalue').val(pval);

-

-

-		},	// dialog_change()

+			for (key in this.productinfos) {

+				if (id == this.productinfos[key].order_product_id) {

+					return key; 

+				}

+			}

+			return false;

 

+		},	// findIndex()

 

-		changePayment2: function (id, oid) {

+		changeProduct2: function (id, oid) {

 

 			alert('TEST OK neu2');

 

-		} // function wpsg_changePayment2(id, oid)

+		} // function changeProduct2(id, oid)

 		

-    };	// WPSG_BE_Payment

-    //WPSG_BE_Payment.changePayment2(1, 2);

-    

+    };	// WPSG_BE_Product

+    //WPSG_BE_Product.changeProduct2(1, 2);

     

 	/* ]]> */</script>		

-

     

 </div>

 

+

+<!-- Modaldialog für Produkte -->

+<div class="modal fade" id="wpsg_product_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 __('Produkt', 'wpsg'); ?></h4>

+      </div>

+      <div class="modal-body">

+      	<br />

+        <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>

+        

+      </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>

+      </div>

+    </div>

+  </div>

+</div>

+

+

+<!-- Modaldialog für Versandart -->

+<div class="modal fade" id="wpsg_shipping_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 __('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">

@@ -445,7 +930,7 @@
         <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_Payment.dialog_change();" class="form-control input-sm" size="1" class="select">

+			<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>

@@ -464,7 +949,7 @@
       </div>

       <div class="modal-footer">

         <button type="button" class="btn btn-default" data-dismiss="modal">Abbrechen</button>

-        <button type="button" class="btn btn-primary" onclick="return WPSG_BE_Payment.dialog_OK();">OK</button>

+        <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="return WPSG_BE_Pay_Ship.dialogPaymentOK();">OK</button>

       </div>

     </div>

   </div>