Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2018-03-19 18:41:50 +06:30
parent a9c8eb4e93 8f2aa994b5
commit 25b6458450
35 changed files with 4436 additions and 157 deletions
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -723,7 +723,9 @@
              receipt_no = ($("#receipt_no").html()).trim();
              if((receipt_no!=undefined) && (receipt_no!=""))
                createReceiptNoInFirstBillData(receipt_no,"");
-              
+                            
+              // console.log(result);
+              // code2lab.printBill(result.filepath, result.printer_model, result.printer_url);
              location.reload();
            }
        });