From 0b869ccb89547f066cf7cfaceddb83f5419b396c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 6 Apr 2018 12:00:45 +0630
Subject: [PATCH 1/7] cehck mobile

---
 app/controllers/base_origami_controller.rb | 29 +++++++++++++++-------
 app/controllers/origami/home_controller.rb |  1 -
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index b627ae01..64441590 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -16,8 +16,23 @@ class BaseOrigamiController < ActionController::Base
   end
 
   def check_user
-    if current_user.nil?
-      redirect_to root_path
+    token_status = false
+    authenticate_with_http_token do |token, options|   
+      if token
+        token_status = true
+        session[:webview] = true
+        session[:session_token] = token
+      end
+    end
+
+    if token_status
+      if current_user.nil?
+        redirect_to root_path
+      end
+    else
+      if current_user.nil?
+        redirect_to root_path
+      end
     end
   end
 
@@ -38,13 +53,9 @@ class BaseOrigamiController < ActionController::Base
   #check webview
   def check_mobile
     status = false
-    authenticate_with_http_token do |token, options|   
-      if token
-        session[:webview] = true
-      end
-      session[:session_token] = token
-    end
-    
+    puts "check mobile"
+    puts session[:session_token]
+    puts session[:webview]
     if session[:webview] && request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i
       status = true
     end
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 5ed006a1..79a86ea9 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -7,7 +7,6 @@ class Origami::HomeController < BaseOrigamiController
     if check_mobile
       @webview = true  
     end
-
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))

From 818f441529e41959d2e118fa1a6efbe4f1c23213 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 6 Apr 2018 13:15:32 +0630
Subject: [PATCH 2/7] check mobile

---
 app/controllers/base_origami_controller.rb |  6 +-----
 app/controllers/origami/home_controller.rb | 10 ++--------
 app/views/origami/home/index.html.erb      |  4 ++++
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index 64441590..86fb4ec3 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -25,11 +25,7 @@ class BaseOrigamiController < ActionController::Base
       end
     end
 
-    if token_status
-      if current_user.nil?
-        redirect_to root_path
-      end
-    else
+    if !token_status
       if current_user.nil?
         redirect_to root_path
       end
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 79a86ea9..8e00ef80 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -3,10 +3,7 @@ class Origami::HomeController < BaseOrigamiController
   before_action :set_dining, only: [:show]
 
   def index
-    @webview = false
-    if check_mobile
-      @webview = true  
-    end
+    @webview = check_mobile
     @tables   = Table.all.active.order('status desc')
     @rooms    = Room.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
@@ -18,10 +15,7 @@ class Origami::HomeController < BaseOrigamiController
 
  # origami table detail
   def show
-    @webview = false
-    if check_mobile
-      @webview = true  
-    end
+    @webview = check_mobile
 
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 38f0cc79..5e280697 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -140,7 +140,11 @@
 <script>
 $(document).ready(function(){
   var webview = <%= @webview %>;
+  if(webview){
+    code2lab.checkMobile(webview); //js func: for mobile login
+  }
   showHideNavbar(webview,"index");
+
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;

From 38a5ec2bd40364de1b6bbafaa7ad132d2576db6e Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 6 Apr 2018 14:07:43 +0630
Subject: [PATCH 3/7] update self.print for cloud

---
 app/models/printer/cashier_station_printer.rb | 10 ++-
 app/models/printer/order_queue_printer.rb     | 56 ++++++++++----
 app/models/printer/receipt_printer.rb         | 75 ++++++++++++++-----
 3 files changed, 106 insertions(+), 35 deletions(-)

diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb
index d4817346..63239cdc 100755
--- a/app/models/printer/cashier_station_printer.rb
+++ b/app/models/printer/cashier_station_printer.rb
@@ -8,7 +8,10 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     #Print
     pdf = CashierStationOpening.new
     pdf.render_file "tmp/cashier_station_#{order_id}_closing_#{time}.pdf"
-    self.print("tmp/cashier_station_#{order_id}_closing_#{time}.pdf")
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud" 
+      self.print("tmp/cashier_station_#{order_id}_closing_#{time}.pdf")
+    end
   end
 
   # def print_close_cashier(receipt_no)
@@ -59,7 +62,10 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     end
     pdf.render_file filename
 
-    self.print(filename, cashier_terminal.printer_name)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud" 
+      self.print(filename, cashier_terminal.printer_name)
+    end
   end
   #sqa
 end
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 4a8b1653..62e6f0a7 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -39,14 +39,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       pdf.render_file filename    
 
       if oqs.print_copy
-        self.print(filename, oqs.printer_name)        
+         #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud"
+          self.print(filename, oqs.printer_name)
+        end        
         #For print copy
         # pdf.render_file filename.gsub(".","-copy.")
         # self.print(filename.gsub(".","-copy."), oqs.printer_name)
       else
         print_settings.print_copies = 1
         print_settings.save!
-        self.print(filename, oqs.printer_name)
+         #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud"
+          self.print(filename, oqs.printer_name)
+        end
       end 
     # end   
   end
@@ -96,13 +102,19 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
           end
           # pdf.render_file "tmp/order_item.pdf"
           pdf.render_file filename
-          if oqs.print_copy               
-            self.print(filename, oqs.printer_name)
-            # self.print(filename.gsub(".","-copy."), oqs.printer_name)
+          if oqs.print_copy  
+             #no print in cloud server
+            if ENV["SERVER_MODE"] != "cloud"             
+              self.print(filename, oqs.printer_name)
+              # self.print(filename.gsub(".","-copy."), oqs.printer_name)
+            end
           else
             print_settings.print_copies = 1
             print_settings.save!
-            self.print(filename, oqs.printer_name)
+             #no print in cloud server
+            if ENV["SERVER_MODE"] != "cloud"
+              self.print(filename, oqs.printer_name)
+            end
           end
         #end 
       end
@@ -130,14 +142,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
       pdf.render_file filename
       if oqs.print_copy
-        self.print(filename, oqs.printer_name)        
+        #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud" 
+          self.print(filename, oqs.printer_name)   
+        end     
         #For print copy
         # pdf.render_file filename.gsub(".","-copy.")
         # self.print(filename.gsub(".","-copy."), oqs.printer_name)
       else
         print_settings.print_copies = 1
         print_settings.save!
-        self.print(filename, oqs.printer_name)
+         #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud" 
+          self.print(filename, oqs.printer_name)
+        end
       end
     end
   end
@@ -183,15 +201,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
           pdf.render_file filename               
 
           if oqs.print_copy
-            self.print(filename, oqs.printer_name)
-
+            #no print in cloud server
+            if ENV["SERVER_MODE"] != "cloud" 
+              self.print(filename, oqs.printer_name)
+            end
             #For print copy
             # pdf.render_file filename.gsub(".","-copy.")
             # self.print(filename.gsub(".","-copy."), oqs.printer_name)
           else
             print_settings.print_copies = 1
             print_settings.save!
-            self.print(filename, oqs.printer_name)
+            #no print in cloud server
+            if ENV["SERVER_MODE"] != "cloud" 
+              self.print(filename, oqs.printer_name)
+            end
           end 
         #end
       end
@@ -219,15 +242,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
       pdf.render_file filename
       if oqs.print_copy
-        self.print(filename, oqs.printer_name)
-
+        #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud" 
+          self.print(filename, oqs.printer_name)
+        end
         #For print copy
         # pdf.render_file filename.gsub(".","-copy.")
         # self.print(filename.gsub(".","-copy."), oqs.printer_name)
       else
         print_settings.print_copies = 1
         print_settings.save!
-        self.print(filename, oqs.printer_name)
+         #no print in cloud server
+        if ENV["SERVER_MODE"] != "cloud" 
+          self.print(filename, oqs.printer_name)
+        end
       end
     end
   end
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index a5482b31..1b4e2698 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -24,7 +24,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file "tmp/order_item_queue_#{order_id}_#{order_item_id}" + ".pdf"
-    self.print("tmp/receipt.pdf")
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print("tmp/receipt.pdf")
+    end
   end
 
   def print_receipt_payment_by_card(booking_id)
@@ -52,8 +55,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file filename
-
-    self.print(filename)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print(filename)
+    end
   end
 
   def print_receipt_payment_by_account(sale_id)
@@ -81,8 +86,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file filename
-
-    self.print(filename)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print(filename)
+    end
   end
 
   def print_receipt_payment_by_vochure(sale_id)
@@ -110,8 +117,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file filename
-
-    self.print(filename)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+     self.print(filename)
+    end
   end
 
   def print_receipt_payment_by_giftcard(sale_id)
@@ -139,8 +148,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file filename
-
-    self.print(filename)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print(filename)
+    end
   end
 
   def print_receipt_payment_by_foc(sale_id)
@@ -168,8 +179,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
     end
     pdf.render_file filename
-
-    self.print(filename)
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print(filename)
+    end
   end
 
   #Bill Receipt Print
@@ -205,13 +218,19 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
         filename = directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf"
         pdf.render_file filename
         if printed_status != 'Paid'
-          self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name)
+          #no print in cloud server
+          if ENV["SERVER_MODE"] != "cloud"
+            self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name)
+          end
         end
       else
         filename = directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
         pdf.render_file filename
         if printed_status != 'Paid'
-          self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name)
+          #no print in cloud server
+          if ENV["SERVER_MODE"] != "cloud"
+            self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name)
+          end
         end
       end
 
@@ -225,7 +244,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
    def print_stock_check_result(print_settings,stockcheck, stockcheck_items,checker_name, shop_details)
      pdf = StockResultPdf.new(print_settings,stockcheck, stockcheck_items,checker_name, shop_details)
      pdf.render_file "tmp/print_stock_check_result.pdf"
-     self.print("tmp/print_stock_check_result.pdf")
+     #no print in cloud server
+     if ENV["SERVER_MODE"] != "cloud"
+       self.print("tmp/print_stock_check_result.pdf")
+      end
    end
 
   #Queue No Print
@@ -235,7 +257,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Print
     pdf = QueueNoPdf.new(printer_settings,queue)
     pdf.render_file "tmp/print_queue_no.pdf"
-    self.print("tmp/print_queue_no.pdf")
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print("tmp/print_queue_no.pdf")
+    end
   end
 
   #Bill Receipt Print
@@ -245,7 +270,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Print
     pdf = CrmOrderPdf.new(booking,order_items,setting)
     pdf.render_file "tmp/print_crm_order.pdf"
-    self.print("tmp/print_crm_order.pdf")
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print("tmp/print_crm_order.pdf")
+    end
   end
 
   #Queue No Print
@@ -255,7 +283,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Print
     pdf = CallWaiterPdf.new(printer_settings,table,time,shop_detail)
     pdf.render_file "tmp/print_call_waiter.pdf"
-    self.print("tmp/print_call_waiter.pdf")
+    #no print in cloud server
+    if ENV["SERVER_MODE"] != "cloud"
+      self.print("tmp/print_call_waiter.pdf")
+    end
   end
 
   #print receipt pdf from js
@@ -266,10 +297,16 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     # else
       begin
         if count == 1
-          self.print(filename, printer_name)
+          #no print in cloud server
+          if ENV["SERVER_MODE"] != "cloud"
+            self.print(filename, printer_name)
+          end
         else
           filename = "public/receipts/receipt_bill_#{receipt_no}_#{count}.pdf"
-          self.print(filename, printer_name)
+          #no print in cloud server
+          if ENV["SERVER_MODE"] != "cloud"
+            self.print(filename, printer_name)
+          end
         end
 
         count -= 1

From 973482bdab6fb151bd3d7370ba39b65ea269436e Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 6 Apr 2018 15:14:29 +0630
Subject: [PATCH 4/7] new tables

---
 ...0180406080240_create_order_reservations.rb | 19 +++++++++++++++++++
 ...06080359_create_order_reservation_items.rb | 11 +++++++++++
 .../20180406080436_create_deliveries.rb       |  6 ++++++
 3 files changed, 36 insertions(+)
 create mode 100644 db/migrate/20180406080240_create_order_reservations.rb
 create mode 100644 db/migrate/20180406080359_create_order_reservation_items.rb
 create mode 100644 db/migrate/20180406080436_create_deliveries.rb

diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb
new file mode 100644
index 00000000..443a1ba6
--- /dev/null
+++ b/db/migrate/20180406080240_create_order_reservations.rb
@@ -0,0 +1,19 @@
+class CreateOrderReservations < ActiveRecord::Migration[5.1]
+  def change
+    create_table :order_reservations do |t|
+      t.string  :
+    	t.string 	:order_type, :null => false
+    	t.string 	:customer_id, :null => false
+    	t.string 	:request_date, :null => false
+    	t.string 	:reserved_date, :null => false
+    	t.integer :item_count, :null => false, :default => 0
+    	t.string 	:payment_type, :null => false
+    	t.string 	:payment_status, :null => false
+    	t.string 	:status, :null => false, :default => "new"
+    end
+  end
+
+  def down
+  	drop_table :order_reservations
+  end
+end
diff --git a/db/migrate/20180406080359_create_order_reservation_items.rb b/db/migrate/20180406080359_create_order_reservation_items.rb
new file mode 100644
index 00000000..23531c4d
--- /dev/null
+++ b/db/migrate/20180406080359_create_order_reservation_items.rb
@@ -0,0 +1,11 @@
+class CreateOrderReservationItems < ActiveRecord::Migration[5.1]
+  def change
+    create_table :order_reservation_items do |t|
+    	
+    end
+  end
+
+  def down
+  	drop_table :order_reservation_items
+  end
+end
diff --git a/db/migrate/20180406080436_create_deliveries.rb b/db/migrate/20180406080436_create_deliveries.rb
new file mode 100644
index 00000000..ef50504d
--- /dev/null
+++ b/db/migrate/20180406080436_create_deliveries.rb
@@ -0,0 +1,6 @@
+class CreateDeliveries < ActiveRecord::Migration[5.1]
+  def change
+    create_table :deliveries do |t|
+    end
+  end
+end

From 4ddb83b03561c012917b1c0d2b1472b177128e69 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 6 Apr 2018 15:51:12 +0630
Subject: [PATCH 5/7] add order and reservation table

---
 .../20180406080240_create_order_reservations.rb | 17 ++++++++++-------
 ...0406080359_create_order_reservation_items.rb | 15 ++++++++++++++-
 db/migrate/20180406080436_create_deliveries.rb  | 12 ++++++++++++
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb
index 443a1ba6..04a9b5f6 100644
--- a/db/migrate/20180406080240_create_order_reservations.rb
+++ b/db/migrate/20180406080240_create_order_reservations.rb
@@ -1,15 +1,18 @@
 class CreateOrderReservations < ActiveRecord::Migration[5.1]
   def change
     create_table :order_reservations do |t|
-      t.string  :
-    	t.string 	:order_type, :null => false
-    	t.string 	:customer_id, :null => false
-    	t.string 	:request_date, :null => false
-    	t.string 	:reserved_date, :null => false
+      t.string     :order_reservation_id, :limit => 16, :primary_key => true
+    	t.string 	   :order_reservation_type, :null => false
+    	t.string 	   :customer_id, :null => false
+    	t.datetime 	 :requested_time, :null => false
     	t.integer :item_count, :null => false, :default => 0
-    	t.string 	:payment_type, :null => false
-    	t.string 	:payment_status, :null => false
+      t.integer :total_customer
+    	t.string 	:payment_type
+    	t.string 	:payment_status
+      t.string  :payment_ref
     	t.string 	:status, :null => false, :default => "new"
+      t.string  :order_remark
+      t.string  :reservation_remark
     end
   end
 
diff --git a/db/migrate/20180406080359_create_order_reservation_items.rb b/db/migrate/20180406080359_create_order_reservation_items.rb
index 23531c4d..aaf8383b 100644
--- a/db/migrate/20180406080359_create_order_reservation_items.rb
+++ b/db/migrate/20180406080359_create_order_reservation_items.rb
@@ -1,7 +1,20 @@
 class CreateOrderReservationItems < ActiveRecord::Migration[5.1]
   def change
     create_table :order_reservation_items do |t|
-    	
+    	t.string :order_reservation_items_id, :limit => 16, :primary_key => true
+    	t.string :order_reservation_id, foreign_key: true, :null => false, :limit => 16
+    	t.string :item_status, :null => false, :default => "new"
+		t.string :item_code, :null => false
+		t.string :item_instance_code
+		t.string :item_name, :null => false
+		t.string :alt_name, :null => false
+		t.integer :account_id, :limit => 8, :null => false, :default => 1
+		t.decimal :qty, :precision => 10, :scale => 2, :null => false, :default => 0.00
+		t.decimal :unit_price, :precision => 10, :scale => 2, :null => false, :default => 0.00
+		t.decimal :price, :precision => 10, :scale => 2, :null => false, :default => 0.00
+		t.string :remark
+		t.string :options,
+		t.boolean :taxable, :null => false, :default => true
     end
   end
 
diff --git a/db/migrate/20180406080436_create_deliveries.rb b/db/migrate/20180406080436_create_deliveries.rb
index ef50504d..6b4e6487 100644
--- a/db/migrate/20180406080436_create_deliveries.rb
+++ b/db/migrate/20180406080436_create_deliveries.rb
@@ -1,6 +1,18 @@
 class CreateDeliveries < ActiveRecord::Migration[5.1]
   def change
     create_table :deliveries do |t|
+    	t.string :order_reservation_id, foreign_key: true, :null => false, :limit => 16
+    	t.string :provider, :null => false
+    	t.string :delivery_type, :null => false
+    	t.string :township
+    	t.string :address
+    	t.string :direction_address
+    	t.string :delivery_fee
+    	t.string :remark
     end
   end
+
+  def down
+  	drop_table :deliveries
+  end
 end

From 5acc063f806005700f88f82d9898e4b767c609bb Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 6 Apr 2018 16:44:13 +0630
Subject: [PATCH 6/7] table for doemal

---
 db/migrate/20180406080240_create_order_reservations.rb      | 2 +-
 db/migrate/20180406080359_create_order_reservation_items.rb | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb
index 04a9b5f6..dae5622f 100644
--- a/db/migrate/20180406080240_create_order_reservations.rb
+++ b/db/migrate/20180406080240_create_order_reservations.rb
@@ -1,6 +1,6 @@
 class CreateOrderReservations < ActiveRecord::Migration[5.1]
   def change
-    create_table :order_reservations do |t|
+    create_table :order_reservations, :id => false do  |t|
       t.string     :order_reservation_id, :limit => 16, :primary_key => true
     	t.string 	   :order_reservation_type, :null => false
     	t.string 	   :customer_id, :null => false
diff --git a/db/migrate/20180406080359_create_order_reservation_items.rb b/db/migrate/20180406080359_create_order_reservation_items.rb
index aaf8383b..9d320f77 100644
--- a/db/migrate/20180406080359_create_order_reservation_items.rb
+++ b/db/migrate/20180406080359_create_order_reservation_items.rb
@@ -1,6 +1,6 @@
 class CreateOrderReservationItems < ActiveRecord::Migration[5.1]
   def change
-    create_table :order_reservation_items do |t|
+    create_table :order_reservation_items, :id => false do |t|
     	t.string :order_reservation_items_id, :limit => 16, :primary_key => true
     	t.string :order_reservation_id, foreign_key: true, :null => false, :limit => 16
     	t.string :item_status, :null => false, :default => "new"
@@ -8,12 +8,13 @@ class CreateOrderReservationItems < ActiveRecord::Migration[5.1]
 		t.string :item_instance_code
 		t.string :item_name, :null => false
 		t.string :alt_name, :null => false
+		t.json   :set_menu_items
 		t.integer :account_id, :limit => 8, :null => false, :default => 1
 		t.decimal :qty, :precision => 10, :scale => 2, :null => false, :default => 0.00
 		t.decimal :unit_price, :precision => 10, :scale => 2, :null => false, :default => 0.00
 		t.decimal :price, :precision => 10, :scale => 2, :null => false, :default => 0.00
 		t.string :remark
-		t.string :options,
+		t.string :options
 		t.boolean :taxable, :null => false, :default => true
     end
   end

From eaf33fc7bfdce35ff5e7b252598e76db3203d150 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 6 Apr 2018 17:03:38 +0630
Subject: [PATCH 7/7] add amount in order reservation

---
 db/migrate/20180406080240_create_order_reservations.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb
index dae5622f..7f044ff0 100644
--- a/db/migrate/20180406080240_create_order_reservations.rb
+++ b/db/migrate/20180406080240_create_order_reservations.rb
@@ -10,6 +10,10 @@ class CreateOrderReservations < ActiveRecord::Migration[5.1]
     	t.string 	:payment_type
     	t.string 	:payment_status
       t.string  :payment_ref
+      t.decimal :total_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :total_tax, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :discount_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :grand_total, :precision => 10, :scale => 2, :null => false, :default => 0.00
     	t.string 	:status, :null => false, :default => "new"
       t.string  :order_remark
       t.string  :reservation_remark