From fd9122e4359db02258da7f6a0460c0fc962e5420 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Thu, 30 Apr 2026 06:47:56 +0000
Subject: - Feature: Exportprofile/Bestellexport - Export von verwendeten
 Steuersätzen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@8516 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_kundenverwaltung/order.phtml             |  4 +++-
 views/mods/mod_orderupload/basket_after.phtml           |  5 ++++-
 .../mods/mod_orderupload/basket_row_upload_target.phtml | 17 ++++++++++++++---
 3 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'views/mods')

diff --git a/views/mods/mod_kundenverwaltung/order.phtml b/views/mods/mod_kundenverwaltung/order.phtml
index d47b4d2..7ddd365 100644
--- a/views/mods/mod_kundenverwaltung/order.phtml
+++ b/views/mods/mod_kundenverwaltung/order.phtml
@@ -53,8 +53,9 @@
 						<th class="col_price"><?php echo __('Preis', 'wpsg'); ?></th>						
 					</tr>				
 					<?php foreach ((array)$order['arProdukte'] as $p) { ?>					
-					<tr>
+						<tr>
 						<td class="col_name">
+							<span><?php echo $p['menge']??0; ?> x </span>
 							<a href="<?php echo $p['url']; ?>"><?php echo $this->getProductName($this->getProduktID($p['id']), true); ?></a>
 							<br /><?php echo __('Artikelnummer', 'wpsg'); ?>: <?php echo $p['anr']; ?>
 							<?php if ($this->hasMod('wpsg_mod_productvariants') && wpsg_isSizedString($p['mod_vp_varkey'])) { $arVarInfo = $this->callMod('wpsg_mod_productvariants', 'getVariantenInfoArray', array($p['mod_vp_varkey'])); ?>
@@ -92,6 +93,7 @@
 							<?php } ?>
 						</td>
 					</tr>
+						<?php \do_action('wpsg_mod_kundenverwaltung_order_after_products', $order, $p); ?>
 					<?php } ?>
 				</table>
 				
diff --git a/views/mods/mod_orderupload/basket_after.phtml b/views/mods/mod_orderupload/basket_after.phtml
index 544cea9..25aed96 100644
--- a/views/mods/mod_orderupload/basket_after.phtml
+++ b/views/mods/mod_orderupload/basket_after.phtml
@@ -5,7 +5,10 @@
      * Date: 02.05.2018
      * Time: 10:47
      */
-    
+
+	// Es muss die ID der Bestellung verfügbar sein.
+	if (intval($_SESSION['wpsg']['order_id']??0) <= 0) $_SESSION['wpsg']['order_id'] = \wpsg\wpsg_calculation::getSessionCalculation()->toDB();
+
 ?>
 
 <script>
diff --git a/views/mods/mod_orderupload/basket_row_upload_target.phtml b/views/mods/mod_orderupload/basket_row_upload_target.phtml
index 5a32de8..d5e1022 100644
--- a/views/mods/mod_orderupload/basket_row_upload_target.phtml
+++ b/views/mods/mod_orderupload/basket_row_upload_target.phtml
@@ -1,4 +1,8 @@
-<?php echo $this->writeFrontendMessage(); ?>
+<?php
+
+	if (!$this->bMessageOut) echo $this->writeFrontendMessage();
+
+?>
 
 <?php if (wpsg_isSizedArray($this->view['wpsg_mod_orderupload']['arFiles'])) { ?>
 
@@ -7,8 +11,15 @@
         <?php foreach ($this->view['wpsg_mod_orderupload']['arFiles'] as $f) { ?>
         
             <li>
-                
-                <a href=""><?php echo basename($f); ?> <span class="size">(<?php echo wpsg_formatSize($f); ?>)</span></a>
+
+                <a href="<?php
+
+							echo wpsg_ShopController::getShop()->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_orderupload', 'downloadProductFile', [
+								'file' => rawurlencode(basename($f)),
+								'product_index' => $this->view['wpsg_mod_orderupload']['product_index']
+							]);
+
+						?>"><?php echo basename($f); ?> <span class="size">(<?php echo wpsg_formatSize($f); ?>)</span></a>
                 
                 <a title="<?php echo __('Upload entfernen.', 'wpsg'); ?>" class="removeLink" onclick="return wpsg_mod_orderupload_removefile('<?php echo rawurlencode(basename($f)); ?>', <?php echo $this->view['wpsg_mod_orderupload']['product_index']; ?>, <?php echo $this->view['wpsg_mod_orderupload']['product_id']; ?>);" href="#">
                     <img src="<?php echo WPSG_URL; ?>views/gfx/bin_x.png" alt="<?php echo __('Löschen', 'wpsg'); ?>" />
-- 
cgit v1.2.3