From ab4da186c5865e17fd2708cdeb77b4182924632c Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Tue, 12 Oct 2021 15:52:59 +0200
Subject: [PATCH] FIX 2 columns for total labels

---
 htdocs/takepos/css/pos.css.php |  7 +++--
 htdocs/takepos/pay.php         | 54 ++++++++++++++++------------------
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index 395c786b232..e180dc33b3e 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -320,11 +320,12 @@ table.postablelines tr td {
 
 div.paymentbordline
 {
-	background-color: #888;
+	width:calc(50% - 16px);
+	background-color:#888;
 	border-radius: 8px;
-	margin: 4px auto;
+	margin-bottom: 4px;
+	display: inline-block;
 	padding: 5px;
-	width: calc(50% - 10px);
 }
 
 @media only screen and (max-aspect-ratio: 6/4) {
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 66d710c2a52..4bd20f33f4b 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -257,35 +257,33 @@ if ($conf->global->TAKEPOS_NUMPAD == 0) {
 	}
 </script>
 
-<div style="position:relative; padding-top: 16px; left:5%; min-height: 150px; width:90%;">
-	<div class="center">
-		<div class="paymentbordline paymentbordlinetotal">
-			<span class="takepospay colorwhite"><?php echo $langs->trans('TotalTTC'); ?>: <span id="totaldisplay"><?php echo price($invoice->total_ttc, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span>
-		</div>
-		<?php if ($remaintopay != $invoice->total_ttc) { ?>
-		<div class="paymentbordline paymentbordlineremain">
-			<span class="takepospay colorwhite"><?php echo $langs->trans('RemainToPay'); ?>: <span id="remaintopaydisplay"><?php echo price($remaintopay, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span>
-		</div>
-		<?php } ?>
-		<div class="paymentbordline paymentbordlinereceived">
-			<span class="takepospay colorwhite"><?php echo $langs->trans("Received"); ?>: <span class="change1 colorred"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change1" class="change1" value="0"></span>
-		</div>
-		<div class="paymentbordline paymentbordlinechange">
-			<span class="takepospay colorwhite"><?php echo $langs->trans("Change"); ?>: <span class="change2"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change2" class="change2" value="0"></span>
-		</div>
-		<?php
-		if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
-			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			print '<div class="paymentbordline paddingtop paddingbottom">';
-			$filter = '';
-			$form = new Form($db);
-			print '<span class="takepospay"><font color="white">'.$langs->trans("BankAccount").': </font></span>';
-			$form->select_comptes(0, 'accountid', 0, $filter, 1, '');
-			print ajax_combobox('selectaccountid');
-			print '</div>';
-		}
-		?>
+<div style="position:relative; padding-top: 20px; left:5%; height:150px; width:90%;">
+	<div class="paymentbordline paymentbordlinetotal center">
+		<span class="takepospay colorwhite"><?php echo $langs->trans('TotalTTC'); ?>: <span id="totaldisplay" class="colorwhite"><?php echo price($invoice->total_ttc, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span>
 	</div>
+	<?php if ($remaintopay != $invoice->total_ttc) { ?>
+		<div class="paymentbordline paymentbordlineremain center">
+			<span class="takepospay colorwhite"><?php echo $langs->trans('RemainToPay'); ?>: <span id="remaintopaydisplay" class="colorwhite"><?php echo price($remaintopay, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span>
+		</div>
+	<?php } ?>
+	<div class="paymentbordline paymentbordlinereceived center">
+		<span class="takepospay colorwhite"><?php echo $langs->trans("Received"); ?>: <span class="change1 colorred"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change1" class="change1" value="0"></span>
+	</div>
+	<div class="paymentbordline paymentbordlinechange center">
+		<span class="takepospay colorwhite"><?php echo $langs->trans("Change"); ?>: <span class="change2 colorwhite"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change2" class="change2" value="0"></span>
+	</div>
+	<?php
+	if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+		print '<div class="paymentbordline paddingtop paddingbottom center">';
+		$filter = '';
+		$form = new Form($db);
+		print '<span class="takepospay colorwhite">'.$langs->trans("BankAccount").': </span>';
+		$form->select_comptes(0, 'accountid', 0, $filter, 1, '');
+		print ajax_combobox('selectaccountid');
+		print '</div>';
+	}
+	?>
 </div>
 
 <div style="position:absolute; left:5%; height:52%; width:90%;">