|
@@ -63,14 +63,13 @@ function ep_pos_screens(instance,module)
|
|
var decimals=currentOrder.foreign_currency.decimals;
|
|
var decimals=currentOrder.foreign_currency.decimals;
|
|
|
|
|
|
if (self.pos.config.display_conversion)
|
|
if (self.pos.config.display_conversion)
|
|
- // '1 '+self.pos.currency.name+' = '+
|
|
|
|
- self.$('#conversion_rate').html('Cambio de ' + name + ' = ' + rate_silent + ' ');
|
|
|
|
-
|
|
|
|
|
|
+ self.$('#conversion_rate').html('1 '+self.pos.currency.name+' = '+
|
|
|
|
+ rate_silent + ' ' + name);
|
|
|
|
|
|
- self.$('#currency_value_label').html('Total en '+ name + ':');
|
|
|
|
- self.$('#foreign_input_label').html('Pagado en '+ name + ':');
|
|
|
|
|
|
+ self.$('#currency_value_label').html('Total in '+name + ':');
|
|
|
|
+ self.$('#foreign_input_label').html('Paid in '+name + ':');
|
|
self.$('#currency_value').html(self.format_foreign(currentOrder.currency_total,currentOrder.foreign_currency));
|
|
self.$('#currency_value').html(self.format_foreign(currentOrder.currency_total,currentOrder.foreign_currency));
|
|
- self.$('#foreign_change_label').html('Cambio en ' + name + ':');
|
|
|
|
|
|
+ self.$('#foreign_change_label').html('Change in ' + name + ':');
|
|
self.$('#foreign_change_value').html(self.format_foreign(0,currentOrder.foreign_currency));
|
|
self.$('#foreign_change_value').html(self.format_foreign(0,currentOrder.foreign_currency));
|
|
},
|
|
},
|
|
|
|
|
|
@@ -133,9 +132,9 @@ function ep_pos_screens(instance,module)
|
|
self.$('#curr_input').trigger('keyup');
|
|
self.$('#curr_input').trigger('keyup');
|
|
}
|
|
}
|
|
var foreign_decimals=currentOrder.foreign_currency.decimals;
|
|
var foreign_decimals=currentOrder.foreign_currency.decimals;
|
|
|
|
+
|
|
var foreign_currency_rate=currentOrder.foreign_currency.rate_silent;
|
|
var foreign_currency_rate=currentOrder.foreign_currency.rate_silent;
|
|
- // Modificacion
|
|
|
|
- currentOrder.currency_total=round_di(currentOrder.getTotalTaxIncluded()/foreign_currency_rate,foreign_decimals).toFixed(foreign_decimals);
|
|
|
|
|
|
+ currentOrder.currency_total=round_di(currentOrder.getTotalTaxIncluded()*foreign_currency_rate,foreign_decimals).toFixed(foreign_decimals);
|
|
|
|
|
|
self.set_foreign_values();
|
|
self.set_foreign_values();
|
|
if (currentOrder.currency_paid==0)
|
|
if (currentOrder.currency_paid==0)
|
|
@@ -155,7 +154,7 @@ function ep_pos_screens(instance,module)
|
|
});
|
|
});
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
- converted_value=round_di(this.value*currentOrder.foreign_currency.rate_silent,self.pos.currency.decimals).toFixed(self.pos.currency.decimals);
|
|
|
|
|
|
+ converted_value=round_di(this.value/currentOrder.foreign_currency.rate_silent,self.pos.currency.decimals).toFixed(self.pos.currency.decimals);
|
|
line.set_amount(converted_value);
|
|
line.set_amount(converted_value);
|
|
self.$('.paymentline.selected input').val(converted_value);
|
|
self.$('.paymentline.selected input').val(converted_value);
|
|
|
|
|
|
@@ -172,7 +171,7 @@ function ep_pos_screens(instance,module)
|
|
|
|
|
|
var foreign_currency_rate=currentOrder.foreign_currency.rate_silent;
|
|
var foreign_currency_rate=currentOrder.foreign_currency.rate_silent;
|
|
|
|
|
|
- currentOrder.currency_total=round_di(currentOrder.getTotalTaxIncluded()/foreign_currency_rate,foreign_decimals).toFixed(foreign_decimals);
|
|
|
|
|
|
+ currentOrder.currency_total=round_di(currentOrder.getTotalTaxIncluded()*foreign_currency_rate,foreign_decimals).toFixed(foreign_decimals);
|
|
self.$('#curr_input').val(0);
|
|
self.$('#curr_input').val(0);
|
|
|
|
|
|
var line = currentOrder.selected_paymentline;
|
|
var line = currentOrder.selected_paymentline;
|
|
@@ -236,9 +235,8 @@ function ep_pos_screens(instance,module)
|
|
|
|
|
|
var fc=currentOrder.foreign_currency;
|
|
var fc=currentOrder.foreign_currency;
|
|
var rate=fc.rate_silent;
|
|
var rate=fc.rate_silent;
|
|
- var decimals=fc.decimals;
|
|
|
|
- // Modificacion
|
|
|
|
- var converted_value=round_di(change/rate,decimals).toFixed(decimals);
|
|
|
|
|
|
+ var decimals=fc.decimals
|
|
|
|
+ var converted_value=round_di(change*rate,decimals).toFixed(decimals);
|
|
|
|
|
|
currentOrder.currency_change=converted_value;
|
|
currentOrder.currency_change=converted_value;
|
|
self.$('#foreign_change_value').html(self.format_foreign(converted_value,fc));
|
|
self.$('#foreign_change_value').html(self.format_foreign(converted_value,fc));
|