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

1 files changed, 46 insertions, 16 deletions

diff --git a/views/mods/mod_versandarten/list.phtml b/views/mods/mod_versandarten/list.phtml
index 73bc700..6aeb712 100644
--- a/views/mods/mod_versandarten/list.phtml
+++ b/views/mods/mod_versandarten/list.phtml
@@ -19,13 +19,13 @@
 		<td class="wpsg_label"><?php echo __('ID', 'wpsg'); ?>:</td>

 		<td class="wpsg_value"><?php echo $va['id']; ?></td>	

 		<td class="wpsg_delcol">

-			<a class="wpsg_icon wpsg_icon_remove" href="#" title="<?php echo __('Versandart löschen', 'wpsg'); ?>" onclick="return wpsg_removeVA(<?php echo $va['id']; ?>);"></a>

+			<a class="wpsg_glyphicon_right glyphicon glyphicon-minus-sign" href="#" title="<?php echo __('Versandart löschen', 'wpsg'); ?>" onclick="return wpsg_removeVA(<?php echo $va['id']; ?>);"></a>

 			<?php foreach ($this->view['arVZ'] as $k=>$vz) { $arVzNamen[$k] = $vz['name']; } ?>

 			<script type="text/javascript">

 

 				jQuery(document).ready(function() {

 

-					jQuery('#va_<?php echo $va['id']; ?>_name').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {

+					jQuery('#va_<?php echo $va['id']; ?>_name').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {

 						submitdata: { 

 				    		field: 'name',

 				    		va_id: '<?php echo $va['id']; ?>'

@@ -36,7 +36,7 @@
 				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'

 					});

 

-					jQuery('#va_<?php echo $va['id']; ?>_kosten').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {

+					jQuery('#va_<?php echo $va['id']; ?>_kosten').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {

 						submitdata: { 

 				    		field: 'kosten',

 				    		va_id: '<?php echo $va['id']; ?>'

@@ -47,7 +47,7 @@
 				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'

 					});

 

-					jQuery('#va_<?php echo $va['id']; ?>_hint').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {

+					jQuery('#va_<?php echo $va['id']; ?>_hint').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {

 						submitdata: { 

 				    		field: 'hint',

 				    		va_id: '<?php echo $va['id']; ?>'

@@ -58,7 +58,7 @@
 				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'

 					});

  					

-					jQuery('#va_<?php echo $va['id']; ?>_typ').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', { 

+					jQuery('#va_<?php echo $va['id']; ?>_typ').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', { 

 						submitdata: {

 							field: 'typ',

 							va_id: '<?php echo $va['id']; ?>'

@@ -71,7 +71,7 @@
 				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'

 					});		

 

-					jQuery('#va_<?php echo $va['id']; ?>_vz').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {

+					jQuery('#va_<?php echo $va['id']; ?>_vz').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {

 						submitdata: {

 							field: 'vz',

 							va_id: '<?php echo $va['id']; ?>'

@@ -89,7 +89,7 @@
 

 					} );		

 

-					jQuery('#va_<?php echo $va['id']; ?>_mwst').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', { 

+					jQuery('#va_<?php echo $va['id']; ?>_mwst').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', { 

 						submitdata: {

 							field: 'mwst_key',

 							va_id: '<?php echo $va['id']; ?>'

@@ -102,6 +102,19 @@
 				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'

 					});	

 

+					jQuery('#va2_<?php echo $va['id']; ?>_mwst').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', { 

+						submitdata: {

+							field: 'mwst_key',

+							va_id: '<?php echo $va['id']; ?>'

+						},

+						submit: '<?php echo __('Speichern', 'wpsg'); ?>',

+						data: '{"value":0,"text":"anteilig"},{"value":"a","text":"A"}',

+						type: 'select',

+						placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',

+						indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',

+				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'

+					});	

+					

 					jQuery('#va_<?php echo $va['id']; ?>_aktiv').bind('change', function() {

 

 						var value = 0;

@@ -129,7 +142,7 @@
 		<td class="wpsg_label"><?php echo __('Bezeichnung', 'wpsg'); ?>:</td>

 		<td class="wpsg_value wpsg_editable" id="va_<?php echo $va['id']; ?>_name"><?php echo wpsg_hspc($va['name']); ?></td>

 		<td class="wpsg_delcol">

-			<a class="wpsg_form_help" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name"></a>

+			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name"></a>

 		</td>

 	</tr>

 	<tr>

@@ -138,21 +151,21 @@
 			<input type="checkbox" value="1" <?php echo (($va['aktiv'] === '1')?'checked="checked"':''); ?> id="va_<?php echo $va['id']; ?>_aktiv" />

 		</td>

 		<td class="wpsg_delcol">

-			<a class="wpsg_form_help" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ"></a>

+			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ"></a>

 		</td> 

 	</tr>

 	<tr>

 		<td class="wpsg_label"><?php echo __('Hinweistext', 'wpsg'); ?>:</td>

 		<td class="wpsg_value wpsg_editable" id="va_<?php echo $va['id']; ?>_hint" ><?php echo wpsg_hspc($va['hint']); ?></td>

 		<td class="wpsg_delcol">

-			<a class="wpsg_form_help" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint"></a>

+			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint"></a>

 		</td>

 	</tr>

 	<tr>

 		<td class="wpsg_label"><?php echo __('Grundlage', 'wpsg'); ?>:</td>

 		<td id="va_<?php echo $va['id']; ?>_typ" class="wpsg_value wpsg_editable"><?php echo wpsg_hspc($this->view['arTypen'][$va['typ']]); ?></td>

 		<td class="wpsg_delcol">

-			<a class="wpsg_form_help" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage"></a>

+			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage"></a>

 		</td>

 	</tr>   

 	<tr>

@@ -165,14 +178,14 @@
 			<?php } ?>

 		</td>

 		<td class="wpsg_delcol">

-			<a class="wpsg_form_help" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone"></a>

+			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone"></a>

 		</td>

 	</tr>

 	<tr>

 		<td class="wpsg_label"><?php echo __('Kostenschlüssel', 'wpsg'); ?>:</td>

 		<td class="wpsg_value wpsg_editable" id="va_<?php echo $va['id']; ?>_kosten"><?php echo wpsg_hspc($va['kosten']); ?></td>

 		<td class="wpsg_delcol">

-			<a class="wpsg_form_help" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_kostenschluessel" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_kostenschluessel"></a>

+			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_kostenschluessel" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_kostenschluessel"></a>

 		</td>

 	</tr>

 	<?php if (wpsg_isSizedArray($this->view['arVZ'][$va['vz']]['arPLZ'])) { ?>

@@ -185,7 +198,7 @@
 

 				jQuery(document).ready(function() {

 	

-					jQuery('#va_<?php echo $va['id']; ?>_plz_<?php echo $index ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {

+					jQuery('#va_<?php echo $va['id']; ?>_plz_<?php echo $index ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {

 						submitdata: { 

 				    		field: 'kosten_plz',

 				    		va_id: '<?php echo $va['id']; ?>',

@@ -217,7 +230,7 @@
 			

 		?></td>

 		<td class="wpsg_delcol">

-			<a class="wpsg_form_help" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>

+			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>

 		</td>

 	</tr> 

 	<tr>

@@ -226,9 +239,26 @@
 			<input onchange="wpsg_saveVAMwSt(this, <?php echo $va['id']; ?>);" <?php echo (($va['mwst_laender'] == '1')?'checked="checked"':''); ?> type="checkbox" value="1" />

 		</td>

 		<td class="wpsg_delcol">

-			<a class="wpsg_form_help" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>

+			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>

 		</td>

 	</tr>

+

+	<tr>

+		<td class="wpsg_label"><?php echo __('Steuersatz', 'wpsg'); ?>:</td>				

+		<td id="va2_<?php echo $va['id']; ?>_mwst" class="wpsg_value wpsg_editable"><?php 

+		

+			$tax_groups = wpsg_tax_groups();

+			//echo wpsg_hspc($tax_groups[$va['mwst_key']]);

+			echo $tax_groups[$va['mwst_key']];

+			

+		?></td>

+		<td class="wpsg_delcol">

+			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>

+		</td>

+	</tr> 

+	

+	

+	

 	<?php $this->callMods('wpsg_mod_versandarten_listrow', array(&$va)); ?>

 	<?php if ($i < sizeof($this->view['data'])) { ?>

 	<tr class="wpsg_spacer"><td colspan="3"><hr /></td></tr>