From 4a87ecf539ceb41b3a35e33a4cd371ad5a1b4bc8 Mon Sep 17 00:00:00 2001
From: Tobias Herre <tobias.herre@wikimedia.de>
Date: Tue, 22 Sep 2020 14:01:41 +0000
Subject: [PATCH] Display currency in table rows

---
 ka.php     | 12 ++++++------
 kaform.js  | 15 ++++++++-------
 submit.php |  6 ++++--
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/ka.php b/ka.php
index 9770119..2b9c10e 100644
--- a/ka.php
+++ b/ka.php
@@ -222,12 +222,12 @@ Grund für abweichende kontoinhabende Person"></textarea>
 								<input id="a_amount" type="text" name="amount" placeholder="Betrag*"/> 
 							</div>
 							<div class="is-col">
-<select id="a_currency" name="currency" >
-  <option value="EUR">EUR</option>
-  <option value="USD">USD</option>
-  <option value="CHF">CHF</option>
-  <option value="XBT">XBT</option>
-</select>
+								<select id="a_currency" name="currency" >
+									<option value="EUR">EUR</option>
+									<option value="USD">USD</option>
+									<option value="CHF">CHF</option>
+									<option value="XBT">XBT</option>
+								</select>
 <!--	<input id="a_currency" type="text" name="curreny" placeholder="Waehrung*"/> -->
 							</div>
 							<div class="is-col">
diff --git a/kaform.js b/kaform.js
index 89c7b33..51e684b 100644
--- a/kaform.js
+++ b/kaform.js
@@ -191,9 +191,9 @@ function addTableRow(){
     e += `<td>${a_description}
 		<input type="hidden" name="description[${currentRowId}]" value="${a_description}" /></td>`;
 
-
+	
     // add column for num
-    e += `<td>${a_amount} EUR
+    e += `<td>${a_amount} ${a_currency}
 		<input type="hidden" name="amount[${currentRowId}]" value="${a_amount}" /></td>`;
 
 
@@ -225,10 +225,10 @@ function addTableRow(){
 	</span></td>`;
     
     
-    $node.append(element);
-    element.innerHTML=(e);
-    renumberTableRows();
-    currentRowId++;
+	$node.append(element);
+	element.innerHTML=(e);
+	renumberTableRows();
+	currentRowId++;
 	reset2();
 	disableCurrency();
 	
@@ -385,7 +385,6 @@ function downloadDocument(mail)
 
 
 	document.getElementById('banktype').value=banktype;
-	document.getElementById("theform").submit(); 	
 
 	if (!document.getElementById("agree").checked){
 		document.getElementById("agree").focus();
@@ -394,6 +393,8 @@ function downloadDocument(mail)
 	};
 
 
+	document.getElementById("theform").submit(); 	
+
 	
 }
 
diff --git a/submit.php b/submit.php
index 7b5ca7a..96c447b 100644
--- a/submit.php
+++ b/submit.php
@@ -310,6 +310,8 @@ function mkTable(){
 
 
 	foreach ($_POST['amount'] as $key=>$val){
+		$currency = $_POST['currency'][$key];
+
 		$html .='<tr>';
 		
 		$html .= "<td>$pos</td>";
@@ -336,7 +338,7 @@ function mkTable(){
 		$html .= "Bereits erhaltener Vorschuss:";
 		$html .= '</td>';
 		$html .= '<td align="right">';
-		$html .= sprintf("-%0.2f",$adv)." EUR";
+		$html .= sprintf("-%0.2f",$adv)." $currency";
 		$html .= '</td>';
 		$html .= "</tr>";
 
@@ -347,7 +349,7 @@ function mkTable(){
 	$html .= "<b>Summe:</b>";
 	$html .= '</td>';
 	$html .= '<td align="right">';
-	$html .= "<b>".calcSum()." EUR</b>";
+	$html .= "<b>".calcSum()." $currency</b>";
 	$html .= '</td>';
 	$html .= '</tr>';