summaryrefslogtreecommitdiff
path: root/addons/pos_restaurant/static/src/js/multiprint.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-06-26 13:13:05 +0200
committerChristophe Simonis <chs@odoo.com>2018-06-26 13:13:05 +0200
commitbda926034a007e92e99aa5a1fbf60f0516617698 (patch)
treec01021b9de72adc9bace6ca1c88e3ee4de36b154 /addons/pos_restaurant/static/src/js/multiprint.js
parent152d42041e7c3d57104d001a826fd2458136a8d6 (diff)
parentc9a01ab30a09e9ac8dffbcaf54fa8391870e4d2a (diff)
[MERGE] forward port branch saas-14 up to c9a01ab30a0
Diffstat (limited to 'addons/pos_restaurant/static/src/js/multiprint.js')
-rw-r--r--addons/pos_restaurant/static/src/js/multiprint.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/addons/pos_restaurant/static/src/js/multiprint.js b/addons/pos_restaurant/static/src/js/multiprint.js
index 65956ffa66d..5270f103c48 100644
--- a/addons/pos_restaurant/static/src/js/multiprint.js
+++ b/addons/pos_restaurant/static/src/js/multiprint.js
@@ -29,8 +29,10 @@ var Printer = core.Class.extend(mixins.PropertiesMixin,{
self.connection.rpc('/hw_proxy/print_xml_receipt',{receipt: r},{timeout: 5000})
.then(function(){
send_printing_job();
- },function(){
+ },function(error, event){
self.receipt_queue.unshift(r);
+ console.log('There was an error while trying to print the order:');
+ console.log(error);
});
}
}
@@ -54,7 +56,7 @@ models.load_models({
for(var i = 0; i < printers.length; i++){
if(active_printers[printers[i].id]){
- var url = printers[i].proxy_ip;
+ var url = printers[i].proxy_ip || '';
if(url.indexOf('//') < 0){
url = 'http://'+url;
}