From 329af02a0a49abfb20e44faae6b3cca688eeff7b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 11 May 2018 14:36:40 +0630 Subject: [PATCH 01/38] add cable .yml --- config/cable.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 config/cable.yml diff --git a/config/cable.yml b/config/cable.yml new file mode 100755 index 00000000..a383c5af --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,7 @@ +redis: &redis + adapter: redis + url: redis://localhost:6379/1 + +production: *redis +development: *redis +test: *redis \ No newline at end of file From 8dc789e546600689a8c859134b38d586b8f370f9 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 11 May 2018 16:06:32 +0630 Subject: [PATCH 02/38] update void in room tab --- app/views/origami/rooms/show.html.erb | 95 ++++++++++++++++++++++----- 1 file changed, 80 insertions(+), 15 deletions(-) diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 359df149..9ee77b99 100755 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -457,7 +457,7 @@ Void <% else %> + + + <% end %> + @@ -585,7 +597,7 @@
- +
diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb index 006763eb..8d4c0840 100755 --- a/app/views/origami/shifts/show.html.erb +++ b/app/views/origami/shifts/show.html.erb @@ -31,7 +31,7 @@
- <% if @bank_integration == '1' %> + <% if @bank_integration == '1' && @cashier_type!="ordering" %> <% end %>
@@ -73,10 +73,12 @@ }); $('#back').on('click',function(){ - if(cashier_type!='quick_service'){ + if(cashier_type=='cashier'){ window.location.href = '/origami'; - }else{ + }else if(cashier_type=='quick_service'){ window.location.href = '/origami/quick_service'; + }else{ + window.location.href = '/origami/order_reservation'; } }); From d77d774a6fe4d3b2b9d5636a0eddf06c572bf9aa Mon Sep 17 00:00:00 2001 From: phyusin Date: Sat, 12 May 2018 12:25:11 +0630 Subject: [PATCH 09/38] check token --- app/models/my_aes_crypt.rb | 3 ++- config/shops.json | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/models/my_aes_crypt.rb b/app/models/my_aes_crypt.rb index 8f3cde09..2b414214 100644 --- a/app/models/my_aes_crypt.rb +++ b/app/models/my_aes_crypt.rb @@ -64,7 +64,8 @@ class MyAesCrypt shop_json["data"].each do |j| if j["lookup"] == from # add [0...44] for production cloud for remove \n - if(j["value"]["key"] == token) + if(j["value"]["key"].gsub(/\s+/, "") == token) + puts token return true end end diff --git a/config/shops.json b/config/shops.json index 65755243..4037179b 100644 --- a/config/shops.json +++ b/config/shops.json @@ -13,6 +13,20 @@ "key": "634W2ioj6QA88vafKamHBRu5aKX/BLIPdTWuuXGFBsA=\n", "iv": "QqpO/h7o60dYTbNETRbZ4g==\n" } + }, + { + "lookup": "order-111.pos-myanmar.test", + "value": { + "key": "7NA6WkE58MZ56w6CUPEyUN5ZlWzuidRDkc2ao6LeHTs=\n", + "iv": "B94kSYIdH6ff8s1ltQzB1Q==\n" + } + }, + { + "lookup": "aungcafe-212.pos-myanmar.test", + "value": { + "key": "DvPxzB6QjHNnfuxBz6rdOuSn0/5TkckwCu3jNv0geHY=\n", + "iv": "pJ5k8JKbfti70KQoLZCm/Q==\n" + } } ] } From 577ceb73cd1642f4c78abf9370d6854acdaf0970 Mon Sep 17 00:00:00 2001 From: phyusin Date: Sat, 12 May 2018 12:28:59 +0630 Subject: [PATCH 10/38] check shop code --- app/views/origami/order_reservation/index.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb index c51692fb..d3b3d141 100644 --- a/app/views/origami/order_reservation/index.html.erb +++ b/app/views/origami/order_reservation/index.html.erb @@ -30,7 +30,7 @@
-