Merge branch 'r-1902001-01' into foodcourt

2020-05-29 13:32:16 +06:30
parent d037802a43 8bae89eeac
commit 7c2dd165fc
23 changed files with 724 additions and 508 deletions
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -1386,7 +1386,7 @@
            });
          }
        });
-    } 
+    }

  function check_emp_access_code(access_code,type) {
      var url = "/origami/check_emp_access_code/" + access_code ;