From 1e38ebcd51a5c704a9d6672eb176d963f421a243 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 18 May 2018 11:15:25 +0630
Subject: [PATCH 1/3] update cable

---
 app/assets/javascripts/cable.js              |  6 ++++++
 app/assets/javascripts/channels/order.js     |  2 --
 app/channels/application_cable/connection.rb | 20 ++++++++++++++++++++
 config/initializers/action_controller.rb     | 10 +++++-----
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js
index 55bfd46b..033f521b 100755
--- a/app/assets/javascripts/cable.js
+++ b/app/assets/javascripts/cable.js
@@ -9,6 +9,12 @@
 (function() {
   this.App || (this.App = {});
 
+  // var hostname = location.hostname;
+  // var port = location.port;
+  // var host = hostname + ":" + port + "/cable"
+  // console.log(host);
+  // App.cable = ActionCable.createConsumer();
+  // console.log(App.cable);
   App.cable = ActionCable.createConsumer();
 
 }).call(this);
diff --git a/app/assets/javascripts/channels/order.js b/app/assets/javascripts/channels/order.js
index 9598ed6f..26c7897e 100755
--- a/app/assets/javascripts/channels/order.js
+++ b/app/assets/javascripts/channels/order.js
@@ -1,6 +1,4 @@
 App.order = App.cable.subscriptions.create('OrderChannel', {
-//	App.messages = App.cable.subscriptions.create('MessagesChannel', {  
-
   connected: function() {},
 
   disconnected: function() {},
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
index 4efdb70d..14561a4e 100755
--- a/app/channels/application_cable/connection.rb
+++ b/app/channels/application_cable/connection.rb
@@ -1,7 +1,27 @@
 module ApplicationCable
   class Connection < ActionCable::Connection::Base
+  	identified_by :current_subdomain
   	def connect
+      if ENV["server_mode"] == "cloud"
+    		self.current_subdomain = verified_subdomain
+      end
   		logger.add_tags "SX-ActionCable"
   	end
+
+  	private 
+  	def verified_subdomain            
+      from = request.subdomain.downcase  + "." + request.domain.downcase    
+      file_path = "config/shops.json"
+      shop_data = File.read(file_path)
+
+      shop_json = JSON.parse(shop_data) 
+      shop_json["data"].each do |j|
+        if j["lookup"] == from      
+          verified_subdomain = from
+        else
+          reject_unauthorized_connection
+        end
+      end        
+    end 	
   end
 end
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index e0eb7455..b84bca54 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end    
   end
 

From 9c26e63110494e1b8a8418f3e1b9ba6c06e26b35 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 18 May 2018 11:57:20 +0630
Subject: [PATCH 2/3] update menu asc with name

---
 app/assets/javascripts/addorder.js | 12 ++++++------
 app/models/menu_category.rb        |  2 +-
 app/models/menu_item.rb            |  2 +-
 app/models/order.rb                |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 8b9c4e01..611ffb17 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -58,8 +58,8 @@ $(function() {
 
             row = '<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
                      +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
-                      +'<div class="col-md-9">'+ product[field].name +'</div>'
-                      +"<div class='col-md-3 menu_item_box' data-item-code='"
+                      +'<div class="col-md-10">'+ product[field].name +'</div>'
+                      +"<div class='col-md-2 menu_item_box' data-item-code='"
                     + product[field].item_code +"' data-instance = '"
                     +JSON.stringify(item_attributes)+"' data-id = '"
                     +JSON.stringify(item_attributes)+"' data-item = '"
@@ -67,7 +67,7 @@ $(function() {
                     +JSON.stringify(product[field].options)+"'data-opt = '"
                     +JSON.stringify(product[field].options)+"' data-item-sets = '"
                     +JSON.stringify(item_attributes)+"' data-image='"+image_path+"' data-toggle='modal' data-target='.sx_item_detailModal'>"
-                      +"<i class='fa fa-bars material-icons'>"
+                      +"<i class='fa fa-bars material-icons m-l--10'>"
                       +'view_list</i>'
                       +'</div>'
                      +'</div>'
@@ -1430,8 +1430,8 @@ $(function() {
 
                 row = '<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
                          +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">'
-                          +'<div class="col-md-9">'+ menu_items[field].name +'</div>'
-                          +"<div class='col-md-3 "+menu_item_box+"' data-item-code='"
+                          +'<div class="col-md-10 " style="padding-left:10px !important;">'+ menu_items[field].name +'</div>'
+                          +"<div class='col-md-2 "+menu_item_box+"' data-item-code='"
                         + menu_items[field].code +"' data-instance = '"
                         +JSON.stringify(menu_items[field].instances)+"' data-id = '"
                         +JSON.stringify(menu_items[field].attributes)+"' data-item = '"
@@ -1439,7 +1439,7 @@ $(function() {
                         +JSON.stringify(menu_items[field].options)+"'data-opt = '"
                         +JSON.stringify(menu_items[field].options)+"' data-item-sets = '"
                         +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' >"
-                          +"<i class='fa "+fa_plus+" '>"
+                          +"<i class='m-l--10 fa "+fa_plus+" '>"
                           +add+ '</i>'
                           +'</div>'
                          +'</div>'
diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb
index 218bacb8..21d95770 100755
--- a/app/models/menu_category.rb
+++ b/app/models/menu_category.rb
@@ -9,7 +9,7 @@ class MenuCategory < ApplicationRecord
   validates_presence_of :code, :name, :menu, :order_by
   validates_uniqueness_of :code
 
-  default_scope { order('order_by asc') }
+  default_scope { order('name asc') }
   scope :active, -> {where("is_available = 1")}
 
   def self.destroyCategory(menu_category)
diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
index 03e90011..e184cd51 100755
--- a/app/models/menu_item.rb
+++ b/app/models/menu_item.rb
@@ -16,7 +16,7 @@ class MenuItem < ApplicationRecord
   validates_presence_of :item_code, :name, :type, :min_qty,:account_id
   validates_uniqueness_of :item_code
   
-  default_scope { order('item_code asc') }
+  default_scope { order('name asc') }
 
   scope :simple_menu_item, -> { where(type: 'SimpleMenuItem') }
   scope :set_menu_item, -> { where(type: 'SetMenuItem') }
diff --git a/app/models/order.rb b/app/models/order.rb
index 66ac883f..8a0e52b3 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -71,9 +71,9 @@ class Order < ApplicationRecord
       BookingOrder.create({:booking_id => booking.booking_id, :order => self})
 
       #Send order to queue one it done!
-      # if self.source != "quick_service"
+      if self.source != "quick_service"
         process_order_queue
-      # end      
+      end      
 
       #send order to broadcast job
       send_order_broadcast(booking)

From 0b7834ff29582558291876ab0d24b2dea7305376 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 18 May 2018 12:25:47 +0630
Subject: [PATCH 3/3] update pay process order

---
 app/models/order_queue_station.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index 1541828c..70b28c1f 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -116,6 +116,7 @@ class OrderQueueStation < ApplicationRecord
     order = Order.find(order_id)
     order_items = order.order_items
 
+    Order.pay_process_order_queue(order_id,table_id)
     if table_id.to_i > 0
       # get dining    
       dining = DiningFacility.find(table_id)