<%= room.name %>
- <% if !@order_items_count.nil? %>
+
new
<% if @status_sale == 'sale' %>
-
+
Receipt No:
<%= @obj_sale.receipt_no rescue '' %>
+
+ Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>
+
<% else %>
Order No:
@@ -206,17 +209,10 @@
<%= @obj_order.order_id rescue '' %>
- <% end %>
- <% if @status_sale == 'sale' %>
-
- Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>
-
- <% else %>
-
+
Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-'%>
<% end %>
-
@@ -396,10 +392,7 @@
- <% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" || current_login_employee.role == "supervisor" || current_login_employee.role == "cashier" || current_login_employee.role == "waiter" %>
- <% end %>
- <% if current_login_employee.role != "waiter" %>
<% if @room.bookings.length >= 1 %>
<% if @status_order == 'order' && @status_sale != 'sale' %>
@@ -423,14 +416,14 @@
<% if current_login_employee.role != "waiter" %>
+
+
diff --git a/config/routes.rb b/config/routes.rb
index 340dc914..a406fb0c 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -165,6 +165,7 @@ scope "(:locale)", locale: /en|mm/ do
post 'sale/:sale_id/rounding_adj' => 'payments#rounding_adj', :as => "calculate_rouding_adjs"
get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => {:format => 'json'}
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/cash' => 'payments#create'
@@ -198,9 +199,9 @@ scope "(:locale)", locale: /en|mm/ do
#---------Add Customer --------------#
#resources :customers
- get '/:sale_id/:type/customers', to: "customers#add_customer"
+ get '/:sale_id/:type/customers/:page', to: "customers#add_customer"
get '/:customer_id/get_customer' => 'home#get_customer', :as => "show_customer_details"
- post '/:sale_id/:type/update_sale', to: "customers#update_sale_by_customer" # update customer id in sale table
+ post '/:sale_id/:type/customers/update_sale', to: "customers#update_sale_by_customer" # update customer id in sale table
post '/:sale_id/get_customer' => "customers#get_customer"
diff --git a/db/migrate/20170530072247_create_shops.rb b/db/migrate/20170530072247_create_shops.rb
index bd25c970..1c87b505 100755
--- a/db/migrate/20170530072247_create_shops.rb
+++ b/db/migrate/20170530072247_create_shops.rb
@@ -3,6 +3,9 @@ class CreateShops < ActiveRecord::Migration[5.1]
create_table :shops do |t|
t.string :logo
t.string :name, :null => false
+ t.string :shop_code, :null => false
+ t.string :client_name, :null => false
+ t.string :client_code, :null => false
t.string :address, :null => false
t.string :township, :null => false
t.string :city, :null => false
diff --git a/db/migrate/20170628103624_create_print_settings.rb b/db/migrate/20170628103624_create_print_settings.rb
index 329d3a7c..672953fc 100755
--- a/db/migrate/20170628103624_create_print_settings.rb
+++ b/db/migrate/20170628103624_create_print_settings.rb
@@ -6,7 +6,9 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1]
t.string :template
t.string :font, :default => ""
t.string :printer_name, :null => false
- t.string :api_settings
+ t.string :api_settings,
+ t.string :brand_name
+ t.string :type
t.decimal :page_width, :null => false, :default => 210
t.decimal :page_height, :null => false, :default => 1450
t.integer :print_copies, :null => false, :default => 1
diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake
index 17dcde74..43ba291e 100755
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -17,6 +17,7 @@ namespace :clear do
Survey.delete_all
DiningFacility.update_all(status:'available')
CashierTerminal.update_all(is_currently_login: 0)
+ SeedGenerator.where("id > 1").update(:current => 0, :next => 1)
puts "Clear Data Done."
end
end