diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index b541cdd6bad..e383d386ecc 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -119,7 +119,7 @@ button.calcbutton2 {
width: calc(25% - 2px);
height: calc(25% - 2px);
font-weight: bold;
- font-size: 8pt;
+ font-size: 10pt;
margin: 1px;
}
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index 613b78d5578..7ad3e88d2b5 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -77,6 +77,14 @@ $arrayofjs = array();
top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
$langs->loadLangs(array('main', 'bills', 'cashdesk'));
+
+if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+ $htmlReductionPercent = '';
+ $htmlReductionAmount = '';
+} else {
+ $htmlReductionPercent = $langs->trans('ReductionShort') . '
%';
+ $htmlReductionAmount = $langs->trans('ReductionShort') . '
' . $langs->trans('Amount');
+}
?>
@@ -87,6 +95,9 @@ $langs->loadLangs(array('main', 'bills', 'cashdesk'));
var reductionTotal = '';
var editAction = '';
var editNumber = '';
+ var htmlBtnOK = 'OK';
+ var htmlReductionPercent = '';
+ var htmlReductionAmount = '';
/**
* Reset values
@@ -98,8 +109,8 @@ $langs->loadLangs(array('main', 'bills', 'cashdesk'));
editAction = '';
editNumber = '';
jQuery('#reduction_total').val(reductionTotal);
- jQuery("#reduction_type_percent").html('');
- jQuery('#reduction_type_amount').html('');
+ jQuery("#reduction_type_percent").html(htmlReductionPercent);
+ jQuery('#reduction_type_amount').html(htmlReductionAmount);
}
/**
@@ -128,14 +139,14 @@ $langs->loadLangs(array('main', 'bills', 'cashdesk'));
}
if (editAction === 'p'){
- jQuery('#reduction_type_percent').html('OK');
- jQuery('#reduction_type_amount').html('');
+ jQuery('#reduction_type_percent').html(htmlBtnOK);
+ jQuery('#reduction_type_amount').html(htmlReductionAmount);
} else if (editAction === 'a'){
- jQuery('#reduction_type_amount').html('OK');
- jQuery("#reduction_type_percent").html('');
+ jQuery('#reduction_type_amount').html(htmlBtnOK);
+ jQuery("#reduction_type_percent").html(htmlReductionPercent);
} else {
- jQuery('#reduction_type_percent').html('');
- jQuery('#reduction_type_amount').html('');
+ jQuery('#reduction_type_percent').html(htmlReductionPercent);
+ jQuery('#reduction_type_amount').html(htmlReductionAmount);
}
}
@@ -202,11 +213,11 @@ $langs->loadLangs(array('main', 'bills', 'cashdesk'));
print '';
print '';
print '';
-print '';
+print '';
print '';
print '';
print '';
-print '';
+print '';
print '';
print '';
print '';