merge with master

config/application.rb

@@ -1,6 +1,8 @@
 require_relative 'boot'
 
+require 'csv'
 require 'rails/all'
+# require 'iconv'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -19,5 +21,7 @@ module SXRestaurants
     config.active_record.time_zone_aware_types = [:datetime, :time]
     config.active_job.queue_adapter = :sidekiq
     config.time_zone = 'Asia/Rangoon'
+    
+
   end
 end

config/initializers/mime_types.rb

@@ -3,3 +3,4 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 Mime::Type.register 'application/vnd.ms-excel', :xls
+Mime::Type.register "application/xlsx", :xlsx

config/locales/en.yml

@@ -72,6 +72,8 @@ en:
   payment: "Payment"
   backend: "Backend"
   date_time: "DateTime"
+  dine_in_order: "Dine In Order"
+  quick_service: "Quick Service"
 
   views:
     btn:
@@ -120,6 +122,8 @@ en:
       mpu: "MPU"
       jcb: "JCB"
       visa: "VISA"
+      master: "MASTER"
+      alipay: "Alipay"
       credit: "CREDIT"
       other_payment: "Other Payment"
       percentage: "PERCENTAGE"
@@ -410,6 +414,7 @@ en:
         redeem_sales: "Redeem Sales"
         cash_sales: "Cash Sales"
         credit_sales: "Credit Sales"
+        alipay_sales: "Alipay Sales"
         foc_sales: "FOC Sales"
         foc_item: "Item FOC"
         net_amount: "Net Amount"
@@ -449,6 +454,12 @@ en:
         gateway_url: "Gateway url"
         additional_parameter: "Additional parameter"
         lookup: "Lookup"
+        product_sale_report: "Product Sale"
+        dining: "Dining"
+        child: "Child"
+        adult: "Adult"
+        foreigner: "Foreigner"
+        local: "Local"
         
         code_txt: "code "
         charge_txt: "charge"

config/locales/mm.yml

@@ -65,8 +65,10 @@ mm:
   sale_audits: "အရောင်းပြင်ဆင်ခြင်းများ"
   bottom: "အရောင်းအနဲဆုံး"
   payment: "ငွေပေးချေမှု"
-  backend: "Backend"
-  date_time: "DateTime"
+  backend: "နောက်ကွယ်"
+  date_time: "ရက်စွဲအချိန်"
+  dine_in_order: "Dine In Order"
+  quick_service: "Quick Service"
   
   views:
     btn:       
@@ -115,6 +117,8 @@ mm:
       mpu: "MPU"
       jcb: "JCB"
       visa: "VISA"
+      master: "MASTER"
+      alipay: "Alipay"
       credit: "အကြွေး"
       other_payment: "အခြားငွေပေးဆောင်မှုများ"
       percentage: "ရာခိုင်နှုန်း"
@@ -402,6 +406,7 @@ mm:
         master_sales: "Master ရောင်းရငွေ"
         visa_sales: "Visa ရောင်းရငွေ"
         jcb_sales: "JCB ရောင်းရငွေ"
+        alipay_sales: "Alipay ရောင်းရငွေ"
         redeem_sales: "ဆုကြေးပြန်သုံးငွေနှင့် ရောင်းရငွေ"
         cash_sales: "ငွေသား ရောင်းရငွေ"
         credit_sales: "အကြွေး ရောင်းရငွေ"
@@ -444,6 +449,12 @@ mm:
         additional_parameter: "ထပ်ဖြည့်အကြောင်းအရာ"
         survey: "ခြုံငုံလေ့လာခြင်း"
         lookup: "သတ်မှတ်ချက်များ"
+        product_sale_report: "ကုန်ပစ္စည်းရောင်းရမှုအစီရင်ခံစာ"
+        dining: "ဆိုင်စား"
+        child: "ကလေး"
+        adult: "လူကြီး"
+        foreigner: "နိုင်ငံခြားသား"
+        local: "နိုင်ငံသား"
         
         code_txt: "ကုတ်ဒ် "
         charge_txt: "ကောက်ခံသည်"

config/routes.rb

@@ -55,6 +55,7 @@ scope "(:locale)", locale: /en|mm/ do
       post "bill" => "bill#create"
     end
     get 'view_orders' => "orders#view_orders"
+    post "update_order_item" => "orders#update"
 
     #Current active bookings
     resources :bookings, only: [:index, :show, :create, :update]
@@ -83,7 +84,8 @@ scope "(:locale)", locale: /en|mm/ do
   end
 
   #--------- Cashier ------------#
-  namespace :origami do
+  namespace :origami do    
+
     get "dashboard" => "dashboard#index" 
 
     get "quick_service" => "quick_service#index"
@@ -95,9 +97,6 @@ scope "(:locale)", locale: /en|mm/ do
     get "quick_service/modify_order/:sale_id" => "quick_service#modify_order"
     post 'quick_service/update_modify_order' => "quick_service#update_modify_order", :defaults => { :format => 'json' }
     
-    resources :second_display
-
-    post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
 
     resources :cash_ins, only: [:new, :create]
     resources :cash_outs, only: [:new, :create]
@@ -140,7 +139,7 @@ scope "(:locale)", locale: /en|mm/ do
     # Discount
     get "/:id/:type/discount" => "discounts#index"
     post "/:id/discount" => "discounts#create"
-    get "/:id/remove_all_discount" => "discounts#remove_all_discount"
+    get "/:id/:type/remove_all_discount" => "discounts#remove_all_discount"
     post "/:id/remove_discount_items" => "discounts#remove_discount_items"
 
     # Discount for Member
@@ -152,7 +151,7 @@ scope "(:locale)", locale: /en|mm/ do
     #---------Shift ---------------#
     resources :shifts, only: [:index, :new, :create, :edit]
     post 'close_shift' => 'shifts#update_shift'
-    get 'shift/close' => 'shifts#show'
+    get 'shift/:type/close' => 'shifts#show'
     get 'shift/sale_summary' => 'shifts#sale_summary'
     #shift - index (open/close shift landing page)
     #shift - show (sales summary display)
@@ -170,7 +169,7 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/payment' => 'payments#show'
     post 'sale/:sale_id/:type/payment/print' => 'payments#print' #route for print receipt
 
-    post 'payment/foc' => 'payments#foc', :defaults => {:format => 'json'}
+    post 'payment/:type/foc' => 'payments#foc', :defaults => {:format => 'json'}
     post 'payment/cash' => 'payments#create'
     post 'payment/mpu' => "mpu#create"
     post 'payment/jcb' => "jcb#create"
@@ -181,6 +180,8 @@ scope "(:locale)", locale: /en|mm/ do
     post 'payment/credit' => 'credit_payments#create'
     post 'payment/voucher' => 'voucher_payments#create'
     post 'payment/paymal' => 'paymal#create'
+    post 'payment/alipay' => 'alipay#create'
+    post 'payment/junctionpay' => 'junctionpay#create'
 
     get 'sale/:sale_id/:type/payment/credit_payment' => "credit_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment' => "others_payments#index"
@@ -192,9 +193,13 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/payment/others_payment/UNIONPAY' => "unionpay#index"
     get 'sale/:sale_id/:type/payment/others_payment/Redeem' => "redeem_payments#index"
     get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index"
+    get 'sale/:sale_id/:type/payment/others_payment/JunctionPay' => "junction_pay#index"
+    get 'sale/:sale_id/:type/payment/others_payment/Alipay' => "alipay#index"
 
     #---------Void --------------#
-    post 'sale/:sale_id/void' => 'void#overall_void'
+    post 'sale/:sale_id/:type/void' => 'void#overall_void'
+
+    post 'sale/:sale_id/:type/waste_and_spoilage' => "waste_spoile#waste_and_spoilage"
 
     #---------Multiple Invoices --------------#
     get 'table/:table_id/table_invoices' => "table_invoices#index", :as => "table_invoice_index"
@@ -240,12 +245,16 @@ scope "(:locale)", locale: /en|mm/ do
     post "bank_integration/sale_trans", to: "bank_integration#sale_trans", as:"sale_trans"
 
     #split bill
-    get '/table/:dining_id/split_bills' => 'split_bill#index'
-    get '/room/:dining_id/split_bills' => 'split_bill#index'
+    get '/table/:dining_id/:type/split_bills' => 'split_bill#index'
+    get '/room/:dining_id/:type/split_bills' => 'split_bill#index'
     post '/split_bills', to: 'split_bill#create', as:"order_item_split_bills"
 
     post '/split_bills/equal_person', to: 'split_bill#update_sale'
 
+    resources :second_display #second display routes
+
+    post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
+
   end
 
   #--------- Waiter/Ordering Station ------------#
@@ -296,7 +305,9 @@ scope "(:locale)", locale: /en|mm/ do
     resources :employees
     #menu
     resources :menus do
-      #menu_categories
+      collection do
+        post :import
+      end
       resources :menu_categories, only: [:new, :create, :edit, :delete]
     end
 
@@ -382,6 +393,7 @@ scope "(:locale)", locale: /en|mm/ do
     resources :credit_notes
     resources :bookings
     resources :shift_sales
+    resources :surveys
 
     get "/sales/:sale_id/manual_complete_sale" => "manual_sales#manual_complete_sale", :as => "manual_complete_sale"
     get "/sales/:sale_id/void" => "manual_sales#void", :as => "void"
@@ -396,6 +408,7 @@ scope "(:locale)", locale: /en|mm/ do
     resources :shiftsale, :only => [:index, :show]
     resources :credit_payment, :only => [:index, :show]
     resources :void_sale, :only => [:index, :show]
+    resources :waste_and_spoilage, :only => [:index, :show]
     resources :commission, :only => [:index, :show]
     resources :stock_check, :only => [:index, :show]
     resources :payment_method
@@ -433,6 +446,9 @@ scope "(:locale)", locale: /en|mm/ do
 
   #----------- Print Setup --------#
   resources :print_settings
+
+  get '/get_printer_options/:printer_name' => 'print_settings#get_printer_options'
+
   resources :commissioners
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end

config/secrets.yml

@@ -24,8 +24,8 @@ test:
 # instead read values from the environment.
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
-  sx_provision_url: connect.smartsales.dev/api #192.168.1.147:3002/api
-  server_mode: cloud
+  sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
+  server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
 

config/sidekiq.yml

@@ -8,7 +8,7 @@
 
 ---
 :concurrency: 25
-:pidfile: ./tmp/pids/sidekiq.pid
+:pidfile: ./tmp/sidekiq.pid
 :logfile: ./log/sidekiq.log
 :queues:
   - default