Pull from master

2018-06-07 11:05:19 +06:30
parent fb0e832ea6
commit a5c59640d6
15 changed files with 484 additions and 298 deletions
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -168,4 +168,4 @@ function audioPlayBackground(shop_code,audio){
    audio.play();
  // },10000);
 }
-/* end order reservation function */
+/* end order reservation function */