@@ -140,7 +143,11 @@
<% elsif @status_sale == 'sale' %>
INVOICE DETAILS | Table <%= @dining.name rescue "" %>
- Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %>
+ <% if !@booking.reserved_by.nil? && %>
+ <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %>
+ <% else %>
+ Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %>
+ <% end %>
<% else %>
ORDER DETAILS | Table <%= @dining.name rescue "" %>
@@ -153,8 +160,7 @@
Receipt No:
<% if @status_sale == 'sale' %>
- <%= @sale_array[0].receipt_no rescue '' %>
-
+ <%= @sale_array[0].receipt_no rescue '' %>
<% end %>
@@ -264,7 +270,7 @@
Sub Total: <%= sub_total %> <%= sub_total %>
<% if @obj_sale != nil && @obj_sale.discount_type == 'member_discount' %>
@@ -291,7 +297,8 @@
Rounding Adj:
- <%= @obj_sale.rounding_adjustment rescue 0 %>
+ <%= @obj_sale.rounding_adjustment
+ %>
Grand Total: <%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %>
+ <% if current_login_employee.role != "waiter" %>
<%= t("views.right_panel.detail.survey") %>
<% if @dining.status != "available" %>
<% if @status_order == 'order' && @status_sale != 'sale' %>
@@ -389,6 +397,7 @@
In Duties
+
Pay
Void
<% end %>
@@ -398,11 +407,52 @@
<% else %>
<%= t("views.btn.check_in") %>
<% end %>
+ <%= @membership.discount%>
+ <%= @obj_sale.customer.membership_id rescue 0%>
+
+
+
+
+
+
+ Cash
+ Credit
+ <% @payment_methods.each do |pay| %>
+
+ <%= pay.payment_method %>
+
+ <%end %>
+
+
+
+
+
+
+
+
<%=@sale_data.receipt_no rescue ' '%>
<% @payment_method_setting.where("is_active = true").each do |payment_method|%>
-
<%= payment_method.payment_method %>
+
<%= payment_method.payment_method %>
<% end %>
@@ -26,6 +27,19 @@
\ No newline at end of file
diff --git a/app/views/reports/commission/index.html.erb b/app/views/reports/commission/index.html.erb
index 2586018d..80cf5727 100755
--- a/app/views/reports/commission/index.html.erb
+++ b/app/views/reports/commission/index.html.erb
@@ -43,6 +43,18 @@
+ <% 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
+ %>
<% total_qty = 0 %>
<% total_price = 0 %>
<% total_amount = 0 %>
@@ -53,9 +65,9 @@
<%= result.sale_item_id rescue '-' %>
<%= result.commissioner.name rescue '-' %>
<%= result.commission.menu_item.name rescue '-' %>
- <%= sprintf "%.2f", result.qty.to_f.to_d rescue '-' %>
- <%= sprintf "%.2f", result.price.to_f.to_d rescue '-' %>
- <%= sprintf "%.2f", result.amount.to_f.to_d rescue '-' %>
+ <%= number_with_precision(result.qty.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+ <%= number_with_precision(result.price.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+ <%= number_with_precision(result.amount.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
<%= result.updated_at.strftime("%e %b %Y %I:%M%p") rescue '-' %>
<% total_qty += result.qty.to_f %>
@@ -65,9 +77,9 @@
<%= sprintf("%.2f", total_qty) rescue '-' %> <%= sprintf("%.2f", total_price) rescue '-' %> <%= sprintf("%.2f", total_amount) rescue '-' %> <%= number_with_precision(total_qty, precision: precision.to_i ,delimiter: delimiter) rescue '-'%> <%= number_with_precision(total_price, precision: precision.to_i ,delimiter: delimiter) rescue '-'%> <%= number_with_precision(total_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-'%>
diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb
index 9037f03b..0619d976 100755
--- a/app/views/reports/credit_payment/index.html.erb
+++ b/app/views/reports/credit_payment/index.html.erb
@@ -23,6 +23,18 @@
+ <% 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
+ %>
<% unless @sale_data.blank? %>
@@ -52,7 +64,7 @@
<%= credit.receipt_no rescue '-' %>
<%= credit.cashier_name rescue '-' %>
<%= credit.sale.customer.name rescue '-' %>
- <%= credit.payment_amount rescue '-' %>
+ <%= number_with_precision(credit.payment_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
<% end %>
@@ -123,7 +135,10 @@
function show_shift_name(period,period_type,from,to,shift_item){
var shift = $('#shift_name');
-
+ if (from == '' && to == '') {
+ from = $("#from").val();
+ to = $("#to").val();
+ }
shift.empty();
var str = '';
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index b8eded4f..76438060 100755
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -44,6 +44,18 @@
<%= 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
+ %>
<% unless @sale_data.empty? %>
@@ -79,37 +91,37 @@
<%= count %>
<%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-' %>
- <%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%>
- (<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)
- <%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%>
+ <%= number_with_precision(sale[:void_amount], precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(sale[:mpu_amount], precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(sale[:master_amount], precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(sale[:visa_amount], precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(sale[:jcb_amount], precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(sale[:paypar_amount], precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision:precision, delimiter: delimiter) rescue '-'%>
+ <%= number_with_precision(sale[:credit_amount], precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(sale[:foc_amount], precision:precision,delimiter:delimiter) rescue '-'%>
+ (<%= number_with_precision(sale[:total_discount], precision:precision,delimiter:delimiter) rescue '-'%>)
+ <%= number_with_precision(sale[:grand_total].to_f + sale[:rounding_adj].to_f , precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(sale[:rounding_adj].to_f, precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(sale[:grand_total], precision:precision,delimiter:delimiter) rescue '-'%>
<% count = count + 1 %>
<% end %>
Total
- <%= number_with_delimiter(sprintf("%.2f",mpu), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",master), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",visa), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",jcb), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",paypar), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%>
- (<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)
- <%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%>
+ <%= number_with_precision(mpu , precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(master, precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(visa, precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(jcb, precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(paypar, precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(cash, precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(credit, precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(foc, precision:precision,delimiter:delimiter) rescue '-'%>
+ (<%= number_with_precision(discount, precision:precision,delimiter:delimiter) rescue '-'%>)
+ <%= number_with_precision(total, precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(rounding_adj, precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(grand_total, precision:precision,delimiter:delimiter) rescue '-'%>
<% total_tax = 0 %>
@@ -118,7 +130,7 @@
<% total_tax += tax.tax_amount.to_f %>
<%= tax.tax_name rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%>
+ <%= number_with_precision(tax.tax_amount, precision:precision,delimiter:delimiter) rescue '-'%>
@@ -126,7 +138,7 @@
<% net = total - total_tax %>
<%= t("views.right_panel.detail.net_amount") %>
- <%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%>
+ <%= number_with_precision(net, precision:precision,delimiter:delimiter) rescue '-'%>
<% end %>
diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb
index 2407e50a..1fef1eab 100755
--- a/app/views/reports/payment_method/index.html.erb
+++ b/app/views/reports/payment_method/index.html.erb
@@ -50,18 +50,30 @@
<%= t("views.right_panel.detail.foc_sales") %>
+ <% 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
+ %>
<% unless @sale_data.empty? %>
<% @sale_data.each do |sale| %>
- <%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%>
- <%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%>
+ <%= number_with_precision(sale[:mpu_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+ <%= number_with_precision(sale[:master_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+ <%= number_with_precision(sale[:visa_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+ <%= number_with_precision(sale[:jcb_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+ <%= number_with_precision(sale[:paypar_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+ <%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+ <%= number_with_precision(sale[:credit_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+ <%= number_with_precision(sale[:foc_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
<% end %>
@@ -108,11 +120,11 @@
<%= payment.payment_method rescue '-' %>
<% if payment.payment_method === 'cash' %>
- <%= payment.payment_amount - payment.change_amount%>
+ <%= number_with_precision(payment.payment_amount - payment.change_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
<%else%>
- <%= payment.payment_amount%>
+ <%= number_with_precision(payment.payment_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
<%end%>
- <%= payment.sale.grand_total rescue '-' %>
+ <%= number_with_precision(payment.sale.grand_total , precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
@@ -120,7 +132,7 @@
<%if total>0%>
Total <%=total%> <%=number_with_precision(total , precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
<%end%>
@@ -189,7 +201,10 @@
var shift = $('#shift_name');
shift.empty();
-
+ if (from == '' && to == '') {
+ from = $("#from").val();
+ to = $("#to").val();
+ }
var str = '';
var param_shift = '';
var param_shift = '<%= params[:shift_name] rescue '-'%>';
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb
index 00622069..9eee6ab9 100755
--- a/app/views/reports/receipt_no/index.html.erb
+++ b/app/views/reports/receipt_no/index.html.erb
@@ -58,6 +58,22 @@
+ <% 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 %>
@@ -81,31 +97,31 @@
<%= result.receipt_no rescue '-' %>
<%= result.cashier_name rescue '-' %>
- <%= result.total_amount rescue '-' %>
- <%= result.total_discount 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"%>
- 0.0
+ <%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
<%end%>
<% result.sale_taxes.each do |tax| %>
- <%= tax.tax_payable_amount rescue '-' %>
+ <%= number_with_precision(tax.tax_payable_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
<%end%>
- <%= result.grand_total %>
- <%= result.rounding_adjustment.to_f rescue '-' %>
- <%= result.grand_total_after_rounding() rescue '-'%>
+ <%= number_with_precision(result.grand_total, precision: precision.to_i ,delimiter: delimiter) %>
+ <%= number_with_precision(result.rounding_adjustment.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+ <%= number_with_precision(result.grand_total_after_rounding(), precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
<% end %>
- <%= total_sum rescue '-'%> <%= discount_amt rescue '-'%> <%= number_with_precision(total_sum, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> <%= number_with_precision(discount_amt, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> <%= tax.st_amount.round(2) %> <%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> <%= grand_total.to_f.round(2) rescue '-'%> <%= rounding_adj rescue '-'%> <%= grand_total.to_f.round + rounding_adj %> <%= number_with_precision(grand_total.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> <%= number_with_precision(rounding_adj, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> <%= number_with_precision(grand_total.to_f.round + rounding_adj, precision: precision.to_i ,delimiter: delimiter) %>
@@ -196,7 +212,10 @@
var str = '';
var param_shift = '';
var param_shift = '<%= params[:shift_name] rescue '-'%>';
-
+ if (from == '' && to == '') {
+ from = $("#from").val();
+ to = $("#to").val();
+ }
url = '<%= reports_get_shift_by_date_path %>';
$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index 7fa72521..4ad30d82 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -45,10 +45,23 @@
+ <% 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
+ %>
<% unless @sale_data.blank? %>
<% acc_arr = Array.new %>
<% cate_arr = Array.new %>
+ <% sub_qty = 0 %>
<% sub_total = 0 %>
<% other_sub_total = 0 %>
<% count = 0 %>
@@ -70,12 +83,12 @@
end %>
<% if sale.status_type == "foc" && sale.grand_total < 0
- total_item_foc += sale.grand_total*(-1)
- end %>
+ total_item_foc += sale.grand_total*(-1)
+ end %>
- <% if sale.status_type == "Discount" && sale.grand_total < 0
- total_item_dis += sale.grand_total*(-1)
- end %>
+ <% if sale.status_type == "Discount" && sale.grand_total < 0
+ total_item_dis += sale.grand_total*(-1)
+ end %>
<% if !acc_arr.include?(sale.account_id) %>
@@ -85,7 +98,7 @@
<% @totalByAccount.each do |account, total| %>
<% if sale.account_id == account %>
- <%= total %>
+ <%= number_with_precision(total, precision:precision,delimiter:delimiter) %>
<% grand_total += total %>
<% end %>
<% end %>
@@ -104,30 +117,37 @@
<%= sale.item_code rescue '-' %>
<%= sale.product_name rescue '-' %>
<%= sale.total_item rescue '-' %>
- <%= sale.unit_price rescue '-' %>
- <%= sale.grand_total rescue '-' %>
+ <%= number_with_precision(sale.unit_price , precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(sale.grand_total , precision:precision,delimiter:delimiter) rescue '-'%>
- <% @menu_cate_count.each do |key,value| %>
- <% if sale.menu_category_id == key %>
+ <% @menu_cate_count.each do |key,value| %>
+ <% if sale.account_id == key %>
<% count = count + 1 %>
<% sub_total += sale.grand_total %>
+ <% #sub_qty += sale.total_item %>
+ <% if sale.status_type != "Discount" && sale.status_type != "foc"
+ sub_qty += sale.total_item
+ end %>
<% if count == value %>
-
+
+ Total <%= sale.account_name %> Qty <%= sub_qty %> <%= t("views.right_panel.detail.sub_total") %>
- <%= sub_total %> <%= number_with_precision(sub_total , precision:precision,delimiter:delimiter)%>
<% sub_total = 0.0%>
+ <% sub_qty = 0 %>
<% count = 0%>
<% end %>
- <% end %>
<% end %>
-
<% end %>
+
+ <% end %>
-
+ <% if @other_charges.present? %>
Other Charges
@@ -144,8 +164,8 @@
<%= other.item_code rescue '-' %>
<%= other.product_name rescue '-' %>
<%= other.total_item rescue '-' %>
- <%= other.unit_price rescue '-' %>
- <%= other.grand_total rescue '-' %>
+ <%= number_with_precision(other.unit_price , precision:precision,delimiter:delimiter) rescue '-'%>
+ <%= number_with_precision(other.grand_total , precision:precision,delimiter:delimiter) rescue '-'%>
@@ -155,38 +175,38 @@
<%= t("views.right_panel.detail.sub_total") %>
- <%= other_sub_total %> <%= number_with_precision(other_sub_total , precision:precision,delimiter:delimiter)%>
-
+ <%end%>
<%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %>
<%= total_qty%> <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %>
- <%= grand_total%> <%= number_with_precision(grand_total , precision:precision,delimiter:delimiter)%>
<% end %>
<%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %>
- <%= total_item_foc %> <%= number_with_precision(total_item_foc , precision:precision,delimiter:delimiter) %>
<%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %>
- <%= total_item_dis %> <%= number_with_precision(total_item_dis , precision:precision,delimiter:delimiter) %>
<%= t("views.right_panel.detail.foc_sales") %>
- <%= @foc_data %> <%= number_with_precision(@foc_data , precision:precision,delimiter:delimiter) %>
<%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %>
- <%= @discount_data %> <%= number_with_precision(@discount_data , precision:precision,delimiter:delimiter) %>
<% @sale_taxes.each do |tax| %>
@@ -202,7 +222,7 @@
Net Amount
- <%= grand_total.to_f - @discount_data.to_f%>
+ <%= number_with_precision(grand_total.to_f - @discount_data.to_f , precision:precision,delimiter:delimiter)%>
- <%= sprintf "%.2f",result[:cash_sales].to_f.to_d rescue '-'%>
- <%= sprintf "%.2f",result[:credit_sales].to_f.to_d rescue '-'%>
+ <%= number_with_precision(result[:cash_sales].to_f, precision:precision,delimiter:delimiter) %>
+ <%= number_with_precision(result[:credit_sales].to_f, precision:precision,delimiter:delimiter) rescue '-'%>
- <%= sprintf "%.2f",result[:other_sales].to_f.to_d rescue '-'%>
+ <%= number_with_precision(result[:other_sales].to_f, precision:precision,delimiter:delimiter) rescue '-'%>
- <%= sprintf "%.2f",result[:foc_sales].to_f.to_d rescue '-'%>
+ <%= number_with_precision(result[:foc_sales].to_f, precision:precision,delimiter:delimiter) rescue '-'%>
- <%= sprintf "%.2f",result[:grand_total].to_f.to_d rescue '-'%>
+ <%= number_with_precision(result[:grand_total].to_f, precision:precision,delimiter:delimiter) rescue '-'%>
<% grand_total = result[:grand_total].to_f %>
@@ -114,15 +126,15 @@
<%= sprintf("%.2f",cash) rescue '-'%> <%= sprintf("%.2f",credit) rescue '-'%> <%= number_with_precision(cash, precision:precision,delimiter:delimiter) rescue '-'%> <%= number_with_precision(credit, precision:precision,delimiter:delimiter) rescue '-'%> <%= sprintf("%.2f",card) rescue '-'%> <%= sprintf("%.2f",foc) rescue '-'%> <%= number_with_precision(card, precision:precision,delimiter:delimiter) rescue '-'%> <%= number_with_precision(foc, precision:precision,delimiter:delimiter) rescue '-'%> <%= sprintf("%.2f",g_total) rescue '-'%> <%= number_with_precision(g_total, precision:precision,delimiter:delimiter) rescue '-'%>
@@ -191,7 +203,10 @@
function show_shift_name(period,period_type,from,to,shift_item){
var shift = $('#shift_name');
-
+ if (from == '' && to == '') {
+ from = $("#from").val();
+ to = $("#to").val();
+ }
shift.empty();
var str = '';
diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb
index 3bc48410..d7b6ee10 100755
--- a/app/views/reports/void_sale/index.html.erb
+++ b/app/views/reports/void_sale/index.html.erb
@@ -52,6 +52,18 @@
+ <% 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
+ %>
<% total_amount = 0.0 %>
<% grand_total = 0.0 %>
<% rounding_adjustment = 0.0 %>
@@ -61,10 +73,10 @@
<%= item.receipt_no rescue '-' %>
<%= item.receipt_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %>
- <%= item.total_amount.to_f rescue '-'%>
- <%= item.grand_total.to_f rescue '-'%>
- <%= item.rounding_adjustment.to_f rescue '-' %>
- <%= item.grand_total.to_f + item.rounding_adjustment.to_f rescue '-'%>
+ <%= number_with_precision(item.total_amount.to_f, precision: precision.to_i ,delimiter: delimiter) %>
+ <%= number_with_precision(item.grand_total.to_f , precision: precision.to_i ,delimiter: delimiter) rescue '-'%>
+ <%= number_with_precision(item.rounding_adjustment.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+ <%= number_with_precision(item.grand_total.to_f + item.rounding_adjustment.to_f , precision: precision.to_i ,delimiter: delimiter) rescue '-'%>
@@ -76,10 +88,10 @@
<% end %>
Total Void Amount :
- <%= total_amount rescue '-' %>
- <%= grand_total rescue '-' %>
- <%= rounding_adjustment rescue '-'%>
- <%= grand_rounding_adjustment rescue '-'%>
+ <%= number_with_precision(total_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+ <%= number_with_precision(grand_total, precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+ <%= number_with_precision(rounding_adjustment, precision: precision.to_i ,delimiter: delimiter) rescue '-'%>
+ <%= number_with_precision(grand_rounding_adjustment, precision: precision.to_i ,delimiter: delimiter) rescue '-'%>
@@ -144,7 +156,10 @@
function show_shift_name(period,period_type,from,to,shift_item){
var shift = $('#shift_name');
-
+ if (from == '' && to == '') {
+ from = $("#from").val();
+ to = $("#to").val();
+ }
shift.empty();
var str = '';
diff --git a/app/views/settings/menu_categories/index.html.erb b/app/views/settings/menu_categories/index.html.erb
index 870c19bc..8d8c044c 100755
--- a/app/views/settings/menu_categories/index.html.erb
+++ b/app/views/settings/menu_categories/index.html.erb
@@ -30,7 +30,7 @@
<%= t("views.right_panel.detail.name") %>
<%= t("views.right_panel.detail.alt_name") %>
<%= t("views.right_panel.detail.is_available") %>
-
<%= t("views.right_panel.detail.order_by") %>
+
<%= t("views.right_panel.detail.parent") %>
<%= t("views.right_panel.detail.actions") %>
@@ -43,7 +43,7 @@
<%= link_to settings_menu_category.name, settings_menu_category_path(settings_menu_category) %>
<%= settings_menu_category.alt_name rescue ''%>
<%= settings_menu_category.is_available rescue false%>
-
<%= settings_menu_category.order_by rescue ''%>
+
<%= settings_menu_category.parent.name rescue ''%>
<%= link_to t("views.btn.edit"), edit_settings_menu_category_path(settings_menu_category),:class => 'btn btn-info btn-sm waves-effect' %>
@@ -51,8 +51,8 @@
<% end %>
+ <%= paginate @settings_menu_categories, param_name: :page, :outer_window => 3 %>
- <%= paginate @settings_menu_categories, param_name: :page, :outer_window => 3 %>
diff --git a/app/views/sym_control/run.html.erb b/app/views/sym_control/run.html.erb
new file mode 100755
index 00000000..8b137891
--- /dev/null
+++ b/app/views/sym_control/run.html.erb
@@ -0,0 +1 @@
+
diff --git a/config/deploy.rb b/config/deploy.rb
new file mode 100644
index 00000000..3020554f
--- /dev/null
+++ b/config/deploy.rb
@@ -0,0 +1,20 @@
+lock "3.10.1"
+
+set :application, "zsai"
+set :repo_url, 'git@bitbucket.org:code2lab/sxrestaurant.git'
+
+set :deploy_user, 'deploy'
+
+set :rbenv_type, :global
+set :rbenv_prefix, "RBENV_ROOT=#{fetch(:rbenv_path)} RBENV_VERSION=#{fetch(:rbenv_ruby)} #{fetch(:rbenv_path)}/bin/rbenv exec"
+
+set :rbenv_map_bins, %w{rake gem bundle ruby rails}
+
+set :keep_releases, 5
+
+set :linked_files, %w{config/database.yml config/secrets.yml config/puma.rb config/sidekiq.yml config/shops.json}
+
+set :linked_dirs, %w{bin log tmp/puma tmp/pids tmp/cache tmp/sockets vendor/bundle public/system pids sockets}
+
+set :tests, []
+set :pty, true
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
new file mode 100644
index 00000000..7fed1a97
--- /dev/null
+++ b/config/deploy/production.rb
@@ -0,0 +1,9 @@
+set :stage, :production
+set :server_name, "svr.sxrestaurant.host"
+
+set :full_app_name, "#{fetch(:application)}_#{fetch(:stage)}"
+server '192.168.1.27', user: 'deploy', roles: %w{web app db}, primary: true
+
+set :deploy_to, "/home/#{fetch(:deploy_user)}/apps/#{fetch(:full_app_name)}"
+set :rbenv_ruby, '2.4.1'
+set :rails_env, :production
diff --git a/config/license.yml b/config/license.yml
index 4a5c6b90..cc470a1d 100644
--- a/config/license.yml
+++ b/config/license.yml
@@ -1,16 +1,15 @@
-iv_key: A30HZdW+iDZA0vM5PAqwgg==
-shop_name: 7DdPBxVo8m1xpa5T2kIcWQ==
-email: yanaung.nyein@code2lab.com
-telephone: 111111
-fax: 111111
-address: bitp
-dbhost: 9+83FZetcbLZi6COG5PbSw==
-dbschema: shztSYIsNmM9nlHkR/4exQ==
-dbusername: LapN+Geriht8yk866FxNiQ==
-dbpassword: QtboWZ4ATE05vvYw6J+Uqw==
-api_token: nGyMizHtoVEFYCjSVEFJuzkxuBJwSsH
-app_token: QUdPwSakcsnuVLdfkXgGHhPMiIOcSSfaVwQyA
-
-plan_sku: 001
-renewable_date: 2018-12-14
-plan_name: Community
+iv_key: TP8dIx4nBGzr+tYyKn5+Xw==
+shop_name: Osaka
+email: wathonaun9@gmail.com
+telephone: 09979204288
+fax: 09979204288
+address: Yangon
+dbhost: nk57NaR38B2eSYyron3Nbw==
+dbschema: 3orxFaTi0uQhatBqZGiitQ==
+dbusername: EtMle9Gr0/PE3NFHHfwo5A==
+dbpassword: 86h61/O38GGo64nekz6oeA==
+api_token: FVAGMnjVdaScfydXMbMvPPRWnkEwCSuxs
+app_token: IoXPdqzbnQWbHsnxLAjMjimnjEJNySOeIo
+plan_sku: PyQJ2sk5NZTudqQ2YIU16A==
+renewable_date: d/Fk1deU/iPbZFDOdyKsjA==
+plan_name: weWOqr1tZ61Av6YKth1lDw==
diff --git a/config/routes.rb b/config/routes.rb
index 4c302b94..9ffeb352 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -12,6 +12,7 @@ scope "(:locale)", locale: /en|mm/ do
#--------- SmartSales Activation ------------#
get 'activate' => 'install#index'
post 'activate' => 'install#activate'
+ get 'run_sym' => 'sym_control#run'
#--------- Login/Authentication ------------#
get 'auth/:emp_id' => 'home#show', as: :emp_login
@@ -244,7 +245,7 @@ scope "(:locale)", locale: /en|mm/ do
post "/:id", to: "edit#update"
# Pass assigned_order_item_id
- get 'print/print/:id', to: "print#print"
+ post 'print/print/:id', to: "print#print"
get 'print/print_order_summary/:id', to: "print#print_order_summary"
get "/get_items/:id" => "home#get_items_by_oqs", :as => "get_order_items_by_oqs"
diff --git a/config/secrets.yml b/config/secrets.yml
index a53c9f76..48ad8e2c 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,12 +12,10 @@
development:
secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61
- sx_provision_url: connect.smartsales.asia/api #provision.zsai.ws/api
- server_mode: cloud
+ sx_provision_url: 192.168.1.49:3002/api #connect.smartsales.asia/api #provision.zsai.ws/api
+ server_mode: application
cipher_type: AES-256-CBC
sx_key: Wh@t1$C2L
- aes_key: <%= ENV['AES_KEY'] %>
- aes_iv: <%= ENV['AES_IV'] %>
test:
secret_key_base: 5c92143fd4a844fdaf8b22aba0cda22ef1fc68f1b26dd3d40656866893718ae5e58625b4c3a5dc86b04c8be0a505ec0ebc0be3bf52249a3d1e0c1334ee591cf0
@@ -30,6 +28,4 @@ production:
server_mode: cloud
cipher_type: AES-256-CBC
sx_key: Wh@t1$C2L
- aes_key: <%= ENV['AES_KEY'] %>
- aes_iv: <%= ENV['AES_IV'] %>
diff --git a/db/seeds.rb b/db/seeds.rb
index 79aab88f..78321b72 100755
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -140,10 +140,11 @@ menu_options = MenuItemOption.create([{option_type: "Oil", name: "Less Oil", val
menu_pkg_options = MenuItemOption.create([{option_type: "Package", name: "Bottle", value: "Bottle"},{option_type: "Package", name: "Can", value: "can"}])
# #Default Menu Category
- # menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Person", alt_name: "Person", order_by: 1, is_available: 1, created_by: "SYSTEM DEFAULT"})
+# menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Person", alt_name: "Person", order_by: 1, is_available: 1, created_by: "SYSTEM DEFAULT"})
# menu_category2 = MenuCategory.create({menu: menu, code:"C005", name: "Beef & Mutton", alt_name: "Beef_and_mutton", order_by: 2,created_by: "SYSTEM DEFAULT"})
# menu_category3 = MenuCategory.create({menu: menu, code:"C006", name: "Pork", alt_name: "Pork", order_by: 3,created_by: "SYSTEM DEFAULT"})
# menu_category4 = MenuCategory.create({menu: menu, code:"C006", name: "Chicken", alt_name: "Chicken", order_by: 1, menu_category_id: menu_category3.id, created_by: "SYSTEM DEFAULT"})
+# menu_category5 = MenuCategory.create({menu: menu, code:"C001", name: "Extra Time", alt_name: "Extra Time", order_by: 1, is_available: 1, created_by: "SYSTEM DEFAULT"})
#
# #Default Menu items
# menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"01001", name: "Single Pot", alt_name: "Single Pot",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
@@ -162,11 +163,21 @@ menu_pkg_options = MenuItemOption.create([{option_type: "Package", name: "Bottle
# menu_item_attribute_adult = MenuItemAttribute.create({attribute_type:"person", name: "Adult", value: "adult"})
# menu_item_attribute_child = MenuItemAttribute.create({attribute_type:"person", name: "Child", value: "child"})
- # menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"P00001", name: "Adult", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['1']", created_by: "System" })
- # menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0001", menu_item: menu_category1_menu_item0, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" })
+# menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"P00001", name: "Adult", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['1']", created_by: "System" })
+# menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0001", menu_item: menu_category1_menu_item0, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" })
+
+# menu_category1_menu_item1 = SimpleMenuItem.create({item_code:"P00002", name: "Child", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['2']", created_by: "System" })
+# menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0002", menu_item: menu_category1_menu_item1, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" })
+
+# menu_item_attribute_30_min = MenuItemAttribute.create({attribute_type:"Extra Time", name: "30 min", value: "30_min"})
+# menu_item_attribute_60_min = MenuItemAttribute.create({attribute_type:"Extra Time", name: "1 hrs", value: "60_min"})
+
+# menu_category1_menu_item2 = SimpleMenuItem.create({item_code:"Ext30", name: "30 minutes", alt_name: "",menu_category: menu_category5 , min_qty: 1, account: extra_time, :item_attributes => "['1']", created_by: "System" })
+# menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"Exti30", menu_item: menu_category1_menu_item2, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" })
+
+# menu_category1_menu_item3 = SimpleMenuItem.create({item_code:"Ext60", name: "1 hour", alt_name: "",menu_category: menu_category5 , min_qty: 1, account: extra_time, :item_attributes => "['2']", created_by: "System" })
+# menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"Exti60", menu_item: menu_category1_menu_item3, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" })
- # menu_category1_menu_item1 = SimpleMenuItem.create({item_code:"P00002", name: "Child", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['2']", created_by: "System" })
- # menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0002", menu_item: menu_category1_menu_item1, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" })
# END
menu_item_attribute_size_small = MenuItemAttribute.create({attribute_type:"size", name: "Small", value: "small"})
 %>){kind=logo}