summaryrefslogtreecommitdiff
path: root/addons/pos_restaurant/static/src
diff options
context:
space:
mode:
authorNils Hamerlinck <nilshamerlinck@users.noreply.github.com>2016-12-13 18:04:27 +0700
committerMartin Trigaux <mart-e@users.noreply.github.com>2016-12-13 12:04:27 +0100
commit73b18964ea1766b2745897b2e8e5d0ac75d71106 (patch)
tree71bc4e2f4e6eca21f62f2c4cd077fd3ed61f2b1d /addons/pos_restaurant/static/src
parent8d09f86c1f65120d6e8c813f9473cd2f687d51e6 (diff)
[FIX] pos_restaurant: Allow more complex URL schemes for printers
For example: https://abc.def:8080 It is already allowed for the printer in main point_of_sale module. Apply the same schemes in pos_restaurant. Closes #13769
Diffstat (limited to 'addons/pos_restaurant/static/src')
-rw-r--r--addons/pos_restaurant/static/src/js/multiprint.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/addons/pos_restaurant/static/src/js/multiprint.js b/addons/pos_restaurant/static/src/js/multiprint.js
index 6ee225dc0c6..8dc63ea07fc 100644
--- a/addons/pos_restaurant/static/src/js/multiprint.js
+++ b/addons/pos_restaurant/static/src/js/multiprint.js
@@ -54,7 +54,14 @@ models.load_models({
for(var i = 0; i < printers.length; i++){
if(active_printers[printers[i].id]){
- var printer = new Printer(self,{url:'http://'+printers[i].proxy_ip+':8069'});
+ var url = printers[i].proxy_ip;
+ if(url.indexOf('//') < 0){
+ url = 'http://'+url;
+ }
+ if(url.indexOf(':',url.indexOf('//')+2) < 0){
+ url = url+':8069';
+ }
+ var printer = new Printer(self,{url:url});
printer.config = printers[i];
self.printers.push(printer);