reply Back
@@ -182,6 +199,10 @@ $(document).ready(function(){
var sale_id = $(this).attr("data-id");
window.location.href = '/origami/quick_service/pending_order/' + sale_id;
})
+ $(".completed").on('click',function(){
+ var sale_id = $(this).attr("data-id");
+ window.location.href = '/origami/quick_service/completed_sale/' + sale_id;
+ })
$('#pay').on('click', function () {
var sale_id = $('#sale_id').val();
window.location.href = '/origami/sale/' + sale_id + "/quick_service/payment";
diff --git a/app/views/origami/unionpay/index.html.erb b/app/views/origami/unionpay/index.html.erb
index 250f97d1..73b7001c 100755
--- a/app/views/origami/unionpay/index.html.erb
+++ b/app/views/origami/unionpay/index.html.erb
@@ -202,7 +202,6 @@
var receipt_no = "<%= @receipt_no %>";
$("#reference_no_Err").html("");
- if(reference_no.length > 0){
if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
$(this).off("click");
//start member discount 5% by pay card
@@ -250,8 +249,5 @@
swal ( "Oops" , "Enter Amount!" , "error" );
}
}
- }else{
- $("#reference_no_Err").html("can't be blank");
- }
})
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index 52d14c4b..a03a886b 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -201,9 +201,8 @@
var receipt_no = "<%= @receipt_no %>";
console.log(amount);
console.log($("#validamount").attr("value"));
- $("#reference_no_Err").html("");
- if(reference_no.length > 0){
- if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
+ $("#reference_no_Err").html("");
+ if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
$(this).off("click");
//start member discount 5% by pay card
// var sub_total = $('#sub-total').text();
@@ -244,14 +243,11 @@
});
}
}else{
- if (amount>0) {
- swal ( "Oops" , "Paid Amount is over!" , "error" );
- }else{
- swal ( "Oops" , "Enter Amount!" , "error" );
- }
+ if (amount>0) {
+ swal ( "Oops" , "Paid Amount is over!" , "error" );
+ }else{
+ swal ( "Oops" , "Enter Amount!" , "error" );
}
- }else{
- $("#reference_no_Err").html("can't be blank");
}
});
diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb
index ae1f90c1..e07da111 100755
--- a/app/views/print_settings/_form.html.erb
+++ b/app/views/print_settings/_form.html.erb
@@ -16,7 +16,7 @@
<% if(@server_mode != 'cloud') %>
<%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
<% else %>
- <%= f.input :printer_name, :as => :select, :collection => [] %>
+ <%= f.input :printer_name %>
<% end %>
<%= f.input :brand_name %>
<%= f.input :printer_type %>
diff --git a/app/views/reports/order_reservation/_shift_sale_report_filter.html.erb b/app/views/reports/order_reservation/_shift_sale_report_filter.html.erb
new file mode 100755
index 00000000..a1db6824
--- /dev/null
+++ b/app/views/reports/order_reservation/_shift_sale_report_filter.html.erb
@@ -0,0 +1,128 @@
+
+ <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+ <% if period_type != false %>
+
+
+ <%= t("views.right_panel.detail.select_period") %>
+
+ <%= t("views.right_panel.detail.select_period") %>
+ Today
+ Yesterday
+ This week
+ Last week
+ Last 7 days
+ This month
+ Last month
+ Last 30 days
+ This year
+ Last year
+
+
+ <% if defined? payments %>
+
+ <%= t("views.right_panel.detail.select_payments") %>
+ <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>
+
+ <% end %>
+
+
+ <%= t("views.right_panel.detail.from") %>
+
+
+ <%= t("views.right_panel.detail.to") %>
+
+
+ <%= t("views.right_panel.detail.all_shift") %>
+
+
+
+
+
+
+ <% end %>
+
+ <% end %>
+
+
+
diff --git a/app/views/reports/order_reservation/index.html.erb b/app/views/reports/order_reservation/index.html.erb
new file mode 100755
index 00000000..567b056b
--- /dev/null
+++ b/app/views/reports/order_reservation/index.html.erb
@@ -0,0 +1,248 @@
+
+
+
+
+
+ <%= render :partial=>'shift_sale_report_filter',
+ :locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_receipt_no_index_path} %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%>
+
+ <% if @shift_from %>
+
+ <% if @shift_data.employee %>
+ <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
+ <% end %>
+ <%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
+
+ <% end %>
+
+
+ <%= t("views.right_panel.detail.receipt_no") %>
+ <%= t :cashier %> <%= t("views.right_panel.detail.name") %>
+ <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %>
+ <%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %>
+ <% @tax_profiles.each do |tax| %>
+ <%= tax.name %>
+ <% end %>
+
+ <%= t("views.right_panel.detail.grand_total") %>
+ <%= t("views.right_panel.detail.rnd_adj_sh") %>
+ <%= t("views.right_panel.detail.grand_total") %> +
+
+
+
+ <% if @print_settings.precision.to_i > 0
+ precision = @print_settings.precision
+ else
+ precision = 0
+ end
+ #check delimiter
+ if @print_settings.delimiter
+ delimiter = ","
+ else
+ delimiter = ""
+ end
+
+ puts precision
+ puts "predelidm"
+ puts delimiter %>
+
+ <% grand_total = 0 %>
+ <% old_grand_total = 0 %>
+ <% total_tax = 0 %>
+ <% guest_count = 0 %>
+ <% total_sum = 0 %>
+ <% discount_amt = 0 %>
+ <% other_amt = 0 %>
+ <% total_nett = 0 %>
+ <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %>
+ <%if @sale_data %>
+ <% @sale_data.each do |result| %>
+
+ <% grand_total = grand_total.to_f + result.grand_total.to_f %>
+ <% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %>
+ <% total_tax += result.total_tax.to_f %>
+ <% total_sum += result.total_amount.to_f %>
+ <% discount_amt += result.total_discount.to_f %>
+ <% rounding_adj += result.rounding_adjustment.to_f %>
+
+
+
+ <%= result.receipt_no rescue '-' %>
+ <%= result.cashier_name rescue '-' %>
+ <%= number_with_precision(result.total_amount, precision: precision.to_i ,delimiter: delimiter) %>
+ <%= number_with_precision(result.total_discount, precision: precision.to_i ,delimiter: delimiter) %>
+ <%if result.customer.customer_type == "Takeaway"%>
+ <%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
+ <%end%>
+ <% result.sale_taxes.each do |tax| %>
+ <%= number_with_precision(tax.tax_payable_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+ <%end%>
+
+ <%= number_with_precision(result.grand_total, precision: precision.to_i ,delimiter: delimiter) %>
+ <%= result.rounding_adjustment.to_f rescue '-' %>
+ <%= number_with_precision(result.grand_total_after_rounding(), precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+
+
+ <% end %>
+
+
+ <%= number_with_precision(total_sum, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> <%= number_with_precision(discount_amt, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> <%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> <%= number_with_precision(grand_total.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> <%= rounding_adj.to_f rescue '-' %> <%= number_with_precision(grand_total.to_f.round + rounding_adj, precision: precision.to_i ,delimiter: delimiter) %>
+
+
+ <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %>
+ <%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %>
+
+ <% @tax_profiles.each do |tax| %>
+ <%= tax.name %>
+ <% end %>
+ <%= t("views.right_panel.detail.grand_total") %>
+ <%= t("views.right_panel.detail.rnd_adj_sh") %>
+ <%= t("views.right_panel.detail.grand_total") %> +
+
+ <%end%>
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/reports/order_reservation/index.xls.erb b/app/views/reports/order_reservation/index.xls.erb
new file mode 100755
index 00000000..c8521b0d
--- /dev/null
+++ b/app/views/reports/order_reservation/index.xls.erb
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+ <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%>
+
+ <% if @shift_from %>
+
+ <% if @shift_data.employee %>
+ <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
+ <% end %>
+ <%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
+
+ <% end %>
+
+
+ <%= t("views.right_panel.detail.receipt_no") %>
+ <%= t :cashier %> <%= t("views.right_panel.detail.name") %>
+ <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %>
+ <%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %>
+ <% @tax_profiles.each do |tax| %>
+ <%= tax.name %>
+ <% end %>
+
+ <%= t("views.right_panel.detail.grand_total") %>
+ <%= t("views.right_panel.detail.rnd_adj_sh") %>
+ <%= t("views.right_panel.detail.grand_total") %> +
+
+
+
+ <% grand_total = 0 %>
+ <% old_grand_total = 0 %>
+ <% total_tax = 0 %>
+ <% guest_count = 0 %>
+ <% total_sum = 0 %>
+ <% discount_amt = 0 %>
+ <% other_amt = 0 %>
+ <% total_nett = 0 %>
+ <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %>
+ <%if @sale_data %>
+ <% @sale_data.each do |result| %>
+
+ <% grand_total = grand_total.to_f + result.grand_total.to_f %>
+ <% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %>
+ <% total_tax += result.total_tax.to_f %>
+ <% total_sum += result.total_amount.to_f %>
+ <% discount_amt += result.total_discount.to_f %>
+ <% rounding_adj += result.rounding_adjustment.to_f %>
+
+
+
+ <%= result.receipt_no rescue '-' %>
+ <%= result.cashier_name rescue '-' %>
+ <%= result.total_amount rescue '-' %>
+ <%= result.total_discount rescue '-' %>
+ <%if result.customer.customer_type == "Takeaway"%>
+ 0.0
+ <%end%>
+ <% result.sale_taxes.each do |tax| %>
+ <%= tax.tax_payable_amount rescue '-' %>
+ <%end%>
+
+ <%= result.grand_total %>
+ <%= result.rounding_adjustment.to_f rescue '-' %>
+ <%= result.grand_total_after_rounding() rescue '-'%>
+
+
+ <% end %>
+
+
+ <%= total_sum rescue '-'%> <%= discount_amt rescue '-'%> <%= tax.st_amount.round(2) %> <%= grand_total.to_f.round(2) rescue '-'%> <%= rounding_adj rescue '-'%> <%= grand_total.to_f.round + rounding_adj %>
+
+
+ <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %>
+ <%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %>
+
+ <% @tax_profiles.each do |tax| %>
+ <%= tax.name %>
+ <% end %>
+ <%= t("views.right_panel.detail.grand_total") %>
+ <%= t("views.right_panel.detail.rnd_adj_sh") %>
+ <%= t("views.right_panel.detail.grand_total") %> +
+
+ <%end%>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 30b78fd9..9f082e52 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -100,6 +100,7 @@ scope "(:locale)", locale: /en|mm/ do
get "quick_service/pending_order" => "pending_order#index"
get "quick_service/pending_order/:sale_id" => "pending_order#show"
+ get "quick_service/completed_sale/:sale_id" => "pending_order#completed_sale"
get "quick_service/modify_order/:id/:sale_id" => "quick_service#modify_order"
get "quick_service/modify_order/:sale_id" => "quick_service#modify_order"
@@ -436,6 +437,7 @@ scope "(:locale)", locale: /en|mm/ do
resources :stock_check, :only => [:index, :show]
resources :payment_method
resources :product_sale, :only => [:index, :show]
+ resources :order_reservation, :only => [:index, :show]
get "saleitem/get_shift_by_date", to: "saleitem#show", as: "get_shift_by_sale_item"
get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
diff --git a/config/schedule.rb b/config/schedule.rb
index 4b3f6a3b..8f151e3d 100755
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -12,4 +12,16 @@ end
every 1.minutes do
runner "DiningFacility.checkin_time"
+end
+
+every 3.minutes do
+ runner "OrderReservation.check_new_order"
+end
+
+every 5.minutes do
+ runner "OrderReservation.check_order_send_to_kitchen"
+end
+
+every 5.minutes do
+ runner "OrderReservation.check_order_ready_to_delivery"
end
\ No newline at end of file
diff --git a/config/secrets.yml b/config/secrets.yml
index 218234f1..2768d134 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,7 +12,7 @@
development:
secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61
- sx_provision_url: https://connect.pos-myanmar.com/bensai/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api
+ sx_provision_url: connect.pos-myanmar.com/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api
server_mode: application
cipher_type: AES-256-CBC
sx_key: Wh@t1$C2L
@@ -24,7 +24,7 @@ test:
# instead read values from the environment.
production:
secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22
- sx_provision_url: https://connect.pos-myanmar.com/api #192.168.1.147:3002/api
+ sx_provision_url: connect.pos-myanmar.com/api #192.168.1.147:3002/api
server_mode: application
cipher_type: AES-256-CBC
sx_key: Wh@t1$C2L
diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb
index 740ce6f1..b96b92ca 100644
--- a/db/migrate/20180406080240_create_order_reservations.rb
+++ b/db/migrate/20180406080240_create_order_reservations.rb
@@ -13,9 +13,11 @@ class CreateOrderReservations < ActiveRecord::Migration[5.1]
t.string :payment_type
t.string :payment_status
t.string :payment_ref
+ t.json :taxes
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 :convenience_charge, :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
diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake
index cd4fec49..6e556c52 100755
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -20,6 +20,9 @@ namespace :clear do
SeedGenerator.where("id > 1").update(:current => 0, :next => 0)
Receipt.delete_all
ReceiptDetail.delete_all
+ OrderReservation.delete_all
+ OrderReservationItem.delete_all
+ Delivery.delete_all
puts "Clear Data Done."
end
diff --git a/public/menus/Main Menu.xlsx b/public/menus/Main Menu.xlsx
deleted file mode 100644
index 2987ce89..00000000
Binary files a/public/menus/Main Menu.xlsx and /dev/null differ
diff --git a/public/menus/Shwe Myittar.xlsx b/public/menus/Shwe Myittar.xlsx
deleted file mode 100644
index 5cd9d6b9..00000000
Binary files a/public/menus/Shwe Myittar.xlsx and /dev/null differ