[FIX] point_of_sale : Prevent a traceback when adding a global discount on an empty pos, allow use of a numeric pad dot (.) in payment screen.
This commit is contained in:
@@ -1510,7 +1510,8 @@ var PaymentScreenWidget = ScreenWidget.extend({
|
||||
self.validate_order();
|
||||
} else if ( event.keyCode === 190 || // Dot
|
||||
event.keyCode === 110 || // Decimal point (numpad)
|
||||
event.keyCode === 188 ) { // Comma
|
||||
event.keyCode === 188 || // Comma
|
||||
event.keyCode === 46 ) { // Numpad dot
|
||||
key = '.';
|
||||
} else if (event.keyCode >= 48 && event.keyCode <= 57) { // Numbers
|
||||
key = '' + (event.keyCode - 48);
|
||||
|
||||
@@ -23,13 +23,13 @@ var DiscountButton = screens.ActionButtonWidget.extend({
|
||||
|
||||
// Remove existing discounts
|
||||
var i = 0;
|
||||
do {
|
||||
while ( i < lines.length ) {
|
||||
if (lines[i].get_product() === product) {
|
||||
order.remove_orderline(lines[i]);
|
||||
} else {
|
||||
i++;
|
||||
}
|
||||
} while ( i < lines.length );
|
||||
}
|
||||
|
||||
// Add discount
|
||||
var discount = - pc / 100.0 * order.get_total_with_tax();
|
||||
|
||||
Reference in New Issue
Block a user