Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/controllers/origami/addorders_controller.rb

@@ -184,7 +184,11 @@ puts items_arr.to_json
         
           @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
           # for second display 
+           if ENV["SERVER_MODE"] != 'cloud'
+
             ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale"
+            
+          end
           result = {:status=> @status, :data => @sale }
           render :json => result.to_json
         end

app/controllers/origami/second_display_controller.rb

@@ -13,9 +13,10 @@ class Origami::SecondDisplayController < BaseOrigamiController
    else
      tax_profiles = nil
    end
-   
+    if ENV["SERVER_MODE"] != 'cloud'
       ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status]
     end
+  end
   #Shop Name in Navbor
   helper_method :shop_detail
   def shop_detail

app/models/order.rb

@@ -285,6 +285,7 @@ class Order < ApplicationRecord
 
   #Process order items and send to order queue
   def process_order_queue
+    if ENV["SERVER_MODE"] != 'cloud'
       #Send to background job for processing
       order        = Order.find(self.id) 
       cup_status   = `#{"sudo service cups status"}`
@@ -299,8 +300,8 @@ class Order < ApplicationRecord
             oqs = OrderQueueStation.new
             oqs.process_order(order, self.table_id, self.source)
           end
-        assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
-        ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+          # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
+          # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
         end
       else
         cup_start    = `#{"sudo service cups start"}`
@@ -315,8 +316,8 @@ class Order < ApplicationRecord
               oqs = OrderQueueStation.new
               oqs.process_order(order, self.table_id, self.source)
             end
-          assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
-          ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+            # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
+            # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
           end
         else
           msg = ' Print Error ! Please contact to service'
@@ -328,16 +329,20 @@ class Order < ApplicationRecord
                 oqs = OrderQueueStation.new
                 oqs.process_order(order, self.table_id, self.source)
               end
+              # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
+              # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
+            end
+        end
+      end
       assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
       ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
     end
-      end
-    end
     
   end
 
   #Process order items and send to order queue
   def self.pay_process_order_queue(id,table_id)
+    if ENV["SERVER_MODE"] != 'cloud'
       sidekiq      = Lookup.find_by_lookup_type("sidekiq")
       if !sidekiq.nil?
         OrderQueueProcessorJob.perform_later(id, table_id)
@@ -351,6 +356,7 @@ class Order < ApplicationRecord
         ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
       end
     end
+  end
   
   def check_cup_status(status)
     if status.include? "Active: active (running)" || "Active: active (exited)"   #"Cup Server is already running"

app/views/origami/home/show.html.erb

@@ -786,7 +786,6 @@
 
     $(".choose_payment").on('click', function () {
       $( "#loading_wrapper").show();
-      alert(parseInt(jQuery.inArray("PAYMAL", type)));
 
         var sale_id = $('#sale_id').val();
           // type = $('.payment_method').val();

db/migrate/20180306044939_create_receipts.rb

@@ -5,10 +5,13 @@ class CreateReceipts < ActiveRecord::Migration[5.1]
       t.string  :client_name, :null => false
       t.string  :shop_code, :limit => 16, :null => false
       t.string  :shop_name, :null => false
-      t.integer :receipt_no, :limit => 8, :null => false
+      t.string :receipt_no, :null => false
       t.datetime  :transaction_time, :null => false
       t.datetime  :receipt_open_time, :null => false
       t.datetime  :receipt_close_time, :null => false
+      t.string    :shift_id, :null => false
+      t.datetime  :shift_open_time, :null => false
+      t.datetime  :shift_close_time, :null => false
       t.decimal :gross_sales, :null => false, :default => 0
       t.decimal :discount_amount, :null => false, :default => 0
       t.decimal :sales, :null => false, :default => 0

lib/tasks/clear_data.rake

@@ -18,6 +18,8 @@ namespace :clear do
     DiningFacility.update_all(status:'available')
     CashierTerminal.update_all(is_currently_login: 0)
     SeedGenerator.where("id > 1").update(:current => 0, :next => 0)
+    Receipt.delete_all
+    ReceiptDetail.delete_all
     puts "Clear Data Done."
   end
 

lib/tasks/receipt.rake

@@ -6,15 +6,20 @@ namespace :consolidate do
 
     shop  = Shop.find(1)
     sales.each do |sale|
+      puts sale.to_json
+     shift = ShiftSale.find(sale.shift_sale_id)
       receipt = Receipt.new
-      receipt.client_code         = shop.id
-      receipt.client_name         = shop.id
-      receipt.shop_code           = shop.id
-      receipt.shop_name           = shop.id
+      receipt.client_code         = shop.client_code
+      receipt.client_name         = shop.client_name
+      receipt.shop_code           = shop.shop_code
+      receipt.shop_name           = shop.name
       receipt.receipt_no          = sale.receipt_no
       receipt.transaction_time    = sale.requested_at #requet-at
       receipt.receipt_open_time   = sale.requested_at #before disco/after tax /after/ser_char
       receipt.receipt_close_time  = sale.receipt_close_time
+      receipt.shift_id            = sale.shift_sale_id
+      receipt.shift_open_time     = shift.shift_started_at
+      receipt.shift_close_time    = shift.shift_closed_at
       receipt.gross_sales         = sale.total_amount + sale.total_tax #before disco/after tax /after/ser_char
       receipt.discount_amount     = sale.total_discount + sale.item_discount
       receipt.sales               = sale.grand_total #after disco/after tax /after/ser_char /no roundingadn
@@ -96,10 +101,10 @@ namespace :consolidate do
         if sale_id != sale.sale_id && count !=0 
 
           receipt = ReceiptDetail.new
-          receipt.client_code         = shop.id
-          receipt.client_name         = shop.id
-          receipt.shop_code           = shop.id
-          receipt.shop_name           = shop.id
+          receipt.client_code         = shop.client_code
+          receipt.client_name         = shop.client_name
+          receipt.shop_code           = shop.shop_code
+          receipt.shop_name           = shop.name
           receipt.receipt_no          = @receipt_no
           receipt.receipt_date        = @requested_at #requet-at
           receipt.transaction_date    = @requested_at #before disco/after tax /after/ser_char
@@ -145,10 +150,10 @@ namespace :consolidate do
         
         discount_amount = (sale.status=="Discount") ? sale.price : 0
           receipt = ReceiptDetail.new
-          receipt.client_code         = shop.id
-          receipt.client_name         = shop.id
-          receipt.shop_code           = shop.id
-          receipt.shop_name           = shop.id
+          receipt.client_code         = shop.client_code
+          receipt.client_name         = shop.client_name
+          receipt.shop_code           = shop.shop_code
+          receipt.shop_name           = shop.name
           receipt.receipt_no          = sale.receipt_no
           receipt.receipt_date        = sale.requested_at #requet-at
           receipt.transaction_date    = sale.requested_at #before disco/after tax /after/ser_char
@@ -195,10 +200,10 @@ namespace :consolidate do
     
     if count == sale_count
       receipt = ReceiptDetail.new
-          receipt.client_code         = shop.id
-          receipt.client_name         = shop.id
-          receipt.shop_code           = shop.id
-          receipt.shop_name           = shop.id
+          receipt.client_code         = shop.client_code
+          receipt.client_name         = shop.client_name
+          receipt.shop_code           = shop.shop_code
+          receipt.shop_name           = shop.name
           receipt.receipt_no          = @receipt_no
           receipt.receipt_date        = @requested_at #requet-at
           receipt.transaction_date    = @requested_at #before disco/after tax /after/ser_char