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

Merge pull request #13354 from OPEN-DSI/new-takepos-reduction-global-labels

Browse Source 
NEW labels on reduction buttons in cash desk
This commit is contained in:
Laurent Destailleur 2020-03-18 19:28:08 +01:00 committed by GitHub
commit a141f46e91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,7 @@ button.calcbutton2 {
width: calc(25% - 2px); width: calc(25% - 2px);
height: calc(25% - 2px); height: calc(25% - 2px);
font-weight: bold; font-weight: bold;
font-size: 8pt; font-size: 10pt;
margin: 1px; margin: 1px;
} }

31
htdocs/takepos/reduction.php
View File

@ -77,6 +77,14 @@ $arrayofjs = array();
top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss); top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
$langs->loadLangs(array('main', 'bills', 'cashdesk')); $langs->loadLangs(array('main', 'bills', 'cashdesk'));
if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
$htmlReductionPercent = '<span class="fa fa-2x fa-percent"></span>';
$htmlReductionAmount = '<span class="fa fa-2x fa-money"></span>';
} else {
$htmlReductionPercent = $langs->trans('ReductionShort') . '<br>%';
$htmlReductionAmount = $langs->trans('ReductionShort') . '<br>' . $langs->trans('Amount');
}
?> ?>
<link rel="stylesheet" href="css/pos.css.php"> <link rel="stylesheet" href="css/pos.css.php">
</head> </head>
@ -87,6 +95,9 @@ $langs->loadLangs(array('main', 'bills', 'cashdesk'));
var reductionTotal = ''; var reductionTotal = '';
var editAction = ''; var editAction = '';
var editNumber = ''; var editNumber = '';
var htmlBtnOK = '<span style="font-size: 14pt;">OK</span>';
var htmlReductionPercent = '<?php echo dol_escape_js($htmlReductionPercent); ?>';
var htmlReductionAmount = '<?php echo dol_escape_js($htmlReductionAmount); ?>';
/** /**
* Reset values * Reset values
@ -98,8 +109,8 @@ $langs->loadLangs(array('main', 'bills', 'cashdesk'));
editAction = ''; editAction = '';
editNumber = ''; editNumber = '';
jQuery('#reduction_total').val(reductionTotal); jQuery('#reduction_total').val(reductionTotal);
jQuery("#reduction_type_percent").html('<span class="fa fa-2x fa-percent"></span>'); jQuery("#reduction_type_percent").html(htmlReductionPercent);
jQuery('#reduction_type_amount').html('<span class="fa fa-2x fa-money-bill-alt"></span>'); jQuery('#reduction_type_amount').html(htmlReductionAmount);
} }
/** /**
@ -128,14 +139,14 @@ $langs->loadLangs(array('main', 'bills', 'cashdesk'));
} }
if (editAction === 'p'){ if (editAction === 'p'){
jQuery('#reduction_type_percent').html('<span style="font-size: 14pt;">OK</span>'); jQuery('#reduction_type_percent').html(htmlBtnOK);
jQuery('#reduction_type_amount').html('<span class="fa fa-2x fa-money-bill-alt"></span>'); jQuery('#reduction_type_amount').html(htmlReductionAmount);
} else if (editAction === 'a'){ } else if (editAction === 'a'){
jQuery('#reduction_type_amount').html('<span style="font-size: 14pt;">OK</span>'); jQuery('#reduction_type_amount').html(htmlBtnOK);
jQuery("#reduction_type_percent").html('<span class="fa fa-2x fa-percent"></span>'); jQuery("#reduction_type_percent").html(htmlReductionPercent);
} else { } else {
jQuery('#reduction_type_percent').html('<span class="fa fa-2x fa-percent"></span>'); jQuery('#reduction_type_percent').html(htmlReductionPercent);
jQuery('#reduction_type_amount').html('<span class="fa fa-2x fa-money-bill-alt"></span>'); jQuery('#reduction_type_amount').html(htmlReductionAmount);
} }
} }
@ -202,11 +213,11 @@ $langs->loadLangs(array('main', 'bills', 'cashdesk'));
print '<button type="button" class="calcbutton" onclick="AddReduction(7);">7</button>'; print '<button type="button" class="calcbutton" onclick="AddReduction(7);">7</button>';
print '<button type="button" class="calcbutton" onclick="AddReduction(8);">8</button>'; print '<button type="button" class="calcbutton" onclick="AddReduction(8);">8</button>';
print '<button type="button" class="calcbutton" onclick="AddReduction(9);">9</button>'; print '<button type="button" class="calcbutton" onclick="AddReduction(9);">9</button>';
print '<button type="button" class="calcbutton2" id="reduction_type_percent" onclick="Edit(\'p\');"><span class="fa fa-2x fa-percent"></span></button>'; print '<button type="button" class="calcbutton2" id="reduction_type_percent" onclick="Edit(\'p\');">' . $htmlReductionPercent . '</button>';
print '<button type="button" class="calcbutton" onclick="AddReduction(4);">4</button>'; print '<button type="button" class="calcbutton" onclick="AddReduction(4);">4</button>';
print '<button type="button" class="calcbutton" onclick="AddReduction(5);">5</button>'; print '<button type="button" class="calcbutton" onclick="AddReduction(5);">5</button>';
print '<button type="button" class="calcbutton" onclick="AddReduction(6);">6</button>'; print '<button type="button" class="calcbutton" onclick="AddReduction(6);">6</button>';
print '<button type="button" class="calcbutton2" id="reduction_type_amount" onclick="Edit(\'a\');"><span class="fa fa-2x fa-money-bill-alt"></span></button>'; print '<button type="button" class="calcbutton2" id="reduction_type_amount" onclick="Edit(\'a\');">' . $htmlReductionAmount . '</button>';
print '<button type="button" class="calcbutton" onclick="AddReduction(1);">1</button>'; print '<button type="button" class="calcbutton" onclick="AddReduction(1);">1</button>';
print '<button type="button" class="calcbutton" onclick="AddReduction(2);">2</button>'; print '<button type="button" class="calcbutton" onclick="AddReduction(2);">2</button>';
print '<button type="button" class="calcbutton" onclick="AddReduction(3);">3</button>'; print '<button type="button" class="calcbutton" onclick="AddReduction(3);">3</button>';