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

Merge pull request #18957 from OPEN-DSI/v14-fix-takepos-payment-style

Browse Source 
FIX payment style and html5 tags
This commit is contained in:
Laurent Destailleur 2021-10-12 16:45:56 +02:00 committed by GitHub
commit fe3e11a104
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
htdocs/takepos/pay.php
View File

@ -37,9 +37,9 @@ if (!defined('NOREQUIREMENU')) {
if (!defined('NOREQUIREHTML')) { if (!defined('NOREQUIREHTML')) {
define('NOREQUIREHTML', '1'); define('NOREQUIREHTML', '1');
} }
if (!defined('NOREQUIREAJAX')) { //if (!defined('NOREQUIREAJAX')) {
define('NOREQUIREAJAX', '1'); // define('NOREQUIREAJAX', '1');
} //}
require '../main.inc.php'; // Load $user and permissions require '../main.inc.php'; // Load $user and permissions
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@ -258,38 +258,34 @@ if ($conf->global->TAKEPOS_NUMPAD == 0) {
</script> </script>
<div style="position:relative; padding-top: 20px; left:5%; height:150px; width:90%;"> <div style="position:relative; padding-top: 20px; left:5%; height:150px; width:90%;">
<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>
<center><span class="takepospay"><font color="white"><?php echo $langs->trans('TotalTTC'); ?>: </font><span id="totaldisplay" class="colorwhite"><?php echo price($invoice->total_ttc, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span></center>
</div> </div>
<?php if ($remaintopay != $invoice->total_ttc) { ?> <?php if ($remaintopay != $invoice->total_ttc) { ?>
<div class="paymentbordline paymentbordlineremain"> <div class="paymentbordline paymentbordlineremain center">
<center><span class="takepospay"><font color="white"><?php echo $langs->trans('RemainToPay'); ?>: </font><span id="remaintopaydisplay" class="colorwhite"><?php echo price($remaintopay, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span></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> </div>
<?php } ?> <?php } ?>
<div class="paymentbordline paymentbordlinereceived"> <div class="paymentbordline paymentbordlinereceived center">
<center><span class="takepospay"><font color="white"><?php echo $langs->trans("Received"); ?>: </font><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></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>
<div class="paymentbordline paymentbordlinechange"> <div class="paymentbordline paymentbordlinechange center">
<center><span class="takepospay"><font color="white"><?php echo $langs->trans("Change"); ?>: </font><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></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> </div>
<?php <?php
if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) { if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
print '<div class="paymentbordline paddingtop paddingbottom"> require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
<center>'; print '<div class="paymentbordline paddingtop paddingbottom center">';
$filter = ''; $filter = '';
$form = new Form($db); $form = new Form($db);
print '<span class="takepospay"><font color="white">'.$langs->trans("BankAccount").': </font></span>'; print '<span class="takepospay colorwhite">'.$langs->trans("BankAccount").': </span>';
$form->select_comptes(0, 'accountid', 0, $filter, 1, ''); $form->select_comptes(0, 'accountid', 0, $filter, 1, '');
print ajax_combobox('selectaccountid'); print ajax_combobox('selectaccountid');
print '</center> print '</div>';
</div>';
} }
?> ?>
</div> </div>
<div style="position:absolute; left:5%; height:52%; width:90%;"> <div style="position:absolute; left:5%; height:52%; width:90%;">
<?php <?php
$action_buttons = array( $action_buttons = array(