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

4 files changed, 63 insertions, 20 deletions

diff --git a/views/mods/mod_productvariants/admin_edit.phtml b/views/mods/mod_productvariants/admin_edit.phtml
index 4f83d36..9d5eecf 100644
--- a/views/mods/mod_productvariants/admin_edit.phtml
+++ b/views/mods/mod_productvariants/admin_edit.phtml
@@ -29,7 +29,8 @@
         		

 				<?php if ($this->hasMod('wpsg_mod_stock')) { ?>

         		<th class="col_stock"><?php echo __('Lagerbestand', 'wpsg'); $colspan ++; ?></th>

-        		<?php } ?>

+		        <th class="col_stock col_min_stock"><?php echo __('Minimallagerbestand', 'wpsg'); $colspan ++; ?></th>

+		        <?php } ?>

 

 				<?php if ($this->hasMod('wpsg_mod_weight')) { ?>

         		<th class="col_stock"><?php echo __('Gewicht', 'wpsg'); $colspan ++; ?></th>

@@ -46,7 +47,7 @@
 		        <?php } ?>

         		

       		</tr>

-    	</thead>    	

+    	</thead>

     	<?php $i = 0; foreach ($this->view['arVariation'] as $vari) { $i ++; ?>

     	<tbody id="vari_<?php echo $vari['id']; ?>">

     		<tr>    		

@@ -118,7 +119,15 @@
 							}

 						});

 

-						jQuery('#productvariation_weight_<?php echo $vari['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {

+					    jQuery('#productvariation_min_stock_<?php echo $vari['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {

+						    submitdata: {

+							    field: 'vari_min_stock',

+							    product_id: jQuery('#wpsg_mod_productvariants_product_id').val(),

+							    field_id: '<?php echo $vari['id']; ?>'

+						    }

+					    });

+

+					    jQuery('#productvariation_weight_<?php echo $vari['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvariants&subaction=admin_inlineEdit&noheader=1', {

 							submitdata: { 

 					    		field: 'vari_weight',

 					    		product_id: jQuery('#wpsg_mod_productvariants_product_id').val(),

@@ -146,9 +155,10 @@
     			<?php if (wpsg_isSizedInt($this->view['product_id'])) { ?>

     			<td class="col_artnr"><span class="wpsg_editable" id="productvariation_anr_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc($vari['anr']); ?></span></td>    			

     			<td class="col_price"><span class="wpsg_editable" id="productvariation_price_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc(wpsg_ff($vari['price'], $this->get_option('wpsg_currency'))); ?></span></td>

- 

+

 				<?php if ($this->hasMod('wpsg_mod_stock')) { ?>

     			<td class="col_stock"><span class="wpsg_editable" id="productvariation_stock_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc($vari['stock']); ?></span></td>

+    			<td class="col_stock"><span class="wpsg_editable" id="productvariation_min_stock_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc($vari['min_stock']); ?></span></td>

         		<?php } ?>

 

 				<?php if ($this->hasMod('wpsg_mod_weight')) { ?>

diff --git a/views/mods/mod_stock/stockmail.phtml b/views/mods/mod_stock/stockmail.phtml
index d6f2ab8..efb9928 100644
--- a/views/mods/mod_stock/stockmail.phtml
+++ b/views/mods/mod_stock/stockmail.phtml
@@ -8,17 +8,32 @@
 

 ?>

 

-<?php echo __('Hallo Administrator,', 'wpsg'); ?>

-

-<?php echo wpsg_translate(__('Ein Produkt hat das Erreichen des minimalen Lagerbestand am #1# um #2# Uhr gemeldet', 'wpsg'), date('d.m.Y'), date('H:i')); ?>

+<p><?php echo __('Hallo ', 'wpsg').$GLOBALS['stockemail_prodvariant']['admin_name'].','; ?></p>

 

 <?php

-echo ('');

-foreach ((array)$this->basket->arProdukte as $p)

-	$id = $p['id'];

-	echo ('');

-	echo __('Produkt').' : '.$p['id'].'  '.$p['name'];

+	if(isset($GLOBALS['stockemail_prodvariant']) && wpsg_isSizedArray($GLOBALS['stockemail_prodvariant']))

+	{

+

+		echo wpsg_translate(__('Eine Produktvariation hat das Erreichen des minimalen Lagerbestands am #1# um #2# Uhr gemeldet.', 'wpsg'), date('d.m.Y'), date('H:i'));

+		echo ('');

+		echo __("Produkt").': '.$GLOBALS['stockemail_prodvariant']['produkt']['id'].' '.$GLOBALS['stockemail_prodvariant']['produkt']['name'];

+		echo ('');

+		echo __("Produktvariation").': '.$GLOBALS['stockemail_prodvariant']['variant']['id'].' '.$GLOBALS['stockemail_prodvariant']['variant']['name'];

+

+	}

+	else

+	{

+

+		echo wpsg_translate(__('Ein Produkt hat das Erreichen des minimalen Lagerbestand am #1# um #2# Uhr gemeldet.', 'wpsg'), date('d.m.Y'), date('H:i'));

+		echo ('');

+			foreach ((array)$this->basket->arProdukte as $p)

+				$id = $p['id'];

+				echo ('');

+				echo __('Produkt').': '.$p['id'].'  '.$p['name'];

+

+	}

 ?>

+

 <?php echo __('Mit freundlichen Grüßen', 'wpsg'); ?>

 

 <?php echo __($this->get_option('wpsg_shopdata_name'), 'wpsg'); ?> - <?php echo __('Team', 'wpsg'); ?>
\ No newline at end of file
diff --git a/views/mods/mod_stock/stockmail_html.phtml b/views/mods/mod_stock/stockmail_html.phtml
index 9d4a37a..e973fe9 100644
--- a/views/mods/mod_stock/stockmail_html.phtml
+++ b/views/mods/mod_stock/stockmail_html.phtml
@@ -6,18 +6,34 @@
 

 	$this->htmlMail = true;

 

-?>

+	include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml');

 

-<p><?php echo __('Hallo Administrator,', 'wpsg'); ?></p>

+?>

 

-<p><?php echo wpsg_translate(__('Ein Produkt hat das Erreichen des minimalen Lagerbestand am #1# um #2# Uhr gemeldet', 'wpsg'), date('d.m.Y'), date('H:i')); ?></p>

+<p><?php echo __('Hallo ', 'wpsg').$GLOBALS['stockemail_prodvariant']['admin_name'].','; ?></p>

 

 <?php

-echo ('<br />');

-foreach ((array)$this->basket->arProdukte as $p)

-	$id = $p['id'];

-	echo ('<br />');

-	echo __('Produkt').' : '.$p['id'].'  '.$p['name'];

+	if(isset($GLOBALS['stockemail_prodvariant']) && wpsg_isSizedArray($GLOBALS['stockemail_prodvariant']))

+	{

+

+		echo wpsg_translate(__('Eine Produktvariation hat das Erreichen des minimalen Lagerbestands am #1# um #2# Uhr gemeldet.', 'wpsg'), date('d.m.Y'), date('H:i'));

+		echo ('<br />');

+		echo __("Produkt").': '.$GLOBALS['stockemail_prodvariant']['produkt']['id'].' '.$GLOBALS['stockemail_prodvariant']['produkt']['name'];

+		echo ('<br />');

+		echo __("Produktvariation").': '.$GLOBALS['stockemail_prodvariant']['variant']['id'].' '.$GLOBALS['stockemail_prodvariant']['variant']['name'];

+

+	}

+	else

+	{

+

+		echo wpsg_translate(__('Ein Produkt hat das Erreichen des minimalen Lagerbestand am #1# um #2# Uhr gemeldet.', 'wpsg'), date('d.m.Y'), date('H:i'));

+		echo ('<br />');

+		foreach ((array)$this->basket->arProdukte as $p)

+			$id = $p['id'];

+			echo ('<br />');

+			echo __('Produkt').': '.$p['id'].'  '.$p['name'];

+

+	}

 ?>

 

 <p><?php echo __('Mit freundlichen Grüßen', 'wpsg'); ?></p>

diff --git a/views/mods/mod_voucherproduct/gutschein_mail_html.phtml b/views/mods/mod_voucherproduct/gutschein_mail_html.phtml
index 9d4baa5..e48a658 100644
--- a/views/mods/mod_voucherproduct/gutschein_mail_html.phtml
+++ b/views/mods/mod_voucherproduct/gutschein_mail_html.phtml
@@ -4,6 +4,8 @@
 	 * Template für die Mail, der die gekauften Gutscheine versendet (HTML)

 	 */

 

+	include(WPSG_PATH_VIEW . 'mailtemplates/html/logo.phtml');

+

 ?>

 <p><?php echo wpsg_translate(__('Hallo #1# #2#,', 'wpsg'), $this->view['customer']['vname'], $this->view['customer']['name']); ?></p>