- Produktbearbeitung Backend

- Neue Calculation für das Backend

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

4 files changed, 10 insertions, 10 deletions

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>