From 8352f0594f5c6da5a1a7ca58b2ea490807768336 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Fri, 5 May 2023 11:06:39 +0000
Subject: - Feature: Produktkombinationen für Varianten - Feature:
 Productcodemanagement - Feature: Positionsnummer für Produktgruppen -
 Feature: Markierung wenn Produktgruppe aktiven Rabatt hat in
 Produktgruppenübersicht
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8280 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/order/product_table.phtml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'views/order')

diff --git a/views/order/product_table.phtml b/views/order/product_table.phtml
index 39ef05d..3fc4499 100644
--- a/views/order/product_table.phtml
+++ b/views/order/product_table.phtml
@@ -49,7 +49,12 @@
 	<tbody>
 
 		<tr><td colspan="<?php echo $this->view['colspan'] + 1; ?>" style="line-height:2px; height:2px; background-color:#999999; padding:0px;"></td></tr>
-		<?php $i = 0; foreach ($arCalculation['product'] as $p) { $i ++; $product_price = $p[$display.'_single']; ?>
+		<?php $i = 0; foreach ($arCalculation['product'] as $p) { $i ++; $product_price = $p[$display.'_single'];
+			
+			$oProduct = wpsg_product::getInstance(intval($p['product_id']));
+			if (($p['product_key']??'') !== '') $oProduct->setProductKey($p['product_key']);
+			
+			?>
 			<tr class="wpsg_<?php echo (($i % 2 == 0)?'odd':'even'); ?>">
 				<td colspan="<?php echo $this->view['colspan'] + 1; ?>">
 					
@@ -62,7 +67,7 @@
 						echo wp_nonce_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$p['product_id'], 'wpsg-product-edit-'.wpsg_getInt($p['product_id']));						
 						                
 					?>" title="<?php echo __('Zum Produkt', 'wpsg'); ?>">
-						<?php echo wpsg_hspc($this->getProductName($p['product_id'])); ?>
+						<?php echo wpsg_hspc($oProduct->getProductName(false)); ?>
 					</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']; ?>);"><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']; ?>);"><span class="glyphicon glyphicon-trash"></span></a>
-- 
cgit v1.2.3