lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX 2 columns for total labels

Browse Source
This commit is contained in:
lvessiller 2021-10-12 15:52:59 +02:00
parent 1788508963
commit ab4da186c5
2 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/takepos/css/pos.css.php
View File

@ -320,11 +320,12 @@ table.postablelines tr td {
div.paymentbordline div.paymentbordline
{ {
background-color: #888; width:calc(50% - 16px);
background-color:#888;
border-radius: 8px; border-radius: 8px;
margin: 4px auto; margin-bottom: 4px;
display: inline-block;
padding: 5px; padding: 5px;
width: calc(50% - 10px);
} }
@media only screen and (max-aspect-ratio: 6/4) { @media only screen and (max-aspect-ratio: 6/4) {

54
htdocs/takepos/pay.php
View File

@ -257,35 +257,33 @@ if ($conf->global->TAKEPOS_NUMPAD == 0) {
} }
</script> </script>
<div style="position:relative; padding-top: 16px; left:5%; min-height: 150px; width:90%;"> <div style="position:relative; padding-top: 20px; left:5%; height:150px; width:90%;">
<div class="center"> <div class="paymentbordline paymentbordlinetotal center">
<div class="paymentbordline paymentbordlinetotal"> <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>
<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> </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>
<div style="position:absolute; left:5%; height:52%; width:90%;"> <div style="position:absolute; left:5%; height:52%; width:90%;">