From 0970b0022e493ed2130c8d744e796a1e77224a68 Mon Sep 17 00:00:00 2001 From: phyusin Date: Thu, 24 May 2018 11:36:35 +0630 Subject: [PATCH 01/14] check shift open or not --- .../order_reserve/order_reservation_controller.rb | 2 +- .../origami/order_reservation_controller.rb | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb index 32e87a20..97c44df9 100644 --- a/app/controllers/api/order_reserve/order_reservation_controller.rb +++ b/app/controllers/api/order_reserve/order_reservation_controller.rb @@ -63,7 +63,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController order_reservation = params order_reservation_id, flag = OrderReservation.addOrderReservationInfo(order_reservation) - if flag #&& ENV["SERVER_MODE"] != 'cloud' + if flag shop = Shop.find_by_id(1) if !shop.shop_code.nil? shop_code = shop.shop_code diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb index a3421fbd..ea760e33 100644 --- a/app/controllers/origami/order_reservation_controller.rb +++ b/app/controllers/origami/order_reservation_controller.rb @@ -48,8 +48,16 @@ class Origami::OrderReservationController < BaseOrigamiController end def send_status - response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],params[:status],params[:waiting_time],params[:min_type],params[:reason]) - + order_reservation = OrderReservation.find_by_transaction_ref(params[:ref_no]) + if !order_reservation.nil? + if !ShiftSale.current_shift.nil? || params[:status] == 'accepted' || (order_reservation.status == 'new' && params[:status] == 'rejected') + response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],params[:status],params[:waiting_time],params[:min_type],params[:reason]) + else + response = { status: false, message: 'No current shift open for this employee!'} + end + else + response = { status: false, message: 'There is no order for '+params[:ref_no]+'!'} + end render :json => response end From 6d6d90050ff623a1ba7b399feb5d035a58c18c63 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 24 May 2018 14:03:49 +0630 Subject: [PATCH 02/14] update commission && report --- .../origami/product_commissions_controller.rb | 72 +++++++++++-------- app/models/product_commission.rb | 5 +- .../load_commissioners.html.erb | 12 +++- app/views/reports/commission/index.html.erb | 2 +- config/pumass.rb | 11 +++ lib/tasks/clear_data.rake | 7 +- 6 files changed, 70 insertions(+), 39 deletions(-) create mode 100755 config/pumass.rb diff --git a/app/controllers/origami/product_commissions_controller.rb b/app/controllers/origami/product_commissions_controller.rb index b452cffe..a9c74b70 100755 --- a/app/controllers/origami/product_commissions_controller.rb +++ b/app/controllers/origami/product_commissions_controller.rb @@ -83,11 +83,12 @@ class Origami::ProductCommissionsController < BaseOrigamiController def set_commissioner_to_sale_item # byebug - deselect = false - sale_item_id = params[:sale_item_id] + deselect = false + type = nil + sale_item_id = params[:sale_item_id] commissioner_id = params[:commissioner_id] - @sale_item = SaleItem.find(sale_item_id) - @menu_item = MenuItem.find_by_item_code(@sale_item.product_code) + @sale_item = SaleItem.find(sale_item_id) + @menu_item = MenuItem.find_by_item_code(@sale_item.product_code) # @commission = Commission.where('product_code = ? AND is_active = ?', @menu_item.item_code, true).take Commission.all.active.each do |com| @@ -98,41 +99,50 @@ class Origami::ProductCommissionsController < BaseOrigamiController end end end - @commissioner = Commissioner.where('id = ? AND is_active = ?', commissioner_id, true).take + @commissioner = Commissioner.where('id = ? AND is_active = ?', commissioner_id, true).take @product_commission = ProductCommission.where('sale_item_id = ?', @sale_item.id).take + if !@commission.nil? && @commissioner.commission_id == @commission.commission_id if !@product_commission.nil? - if @product_commission.commissioner_id == @commissioner.id - @product_commission.destroy - deselect = true - else - @product_commission.commissioner_id = @commissioner.id - deselect = false - end - else - @product_commission = ProductCommission.new - @product_commission.product_code = @menu_item.item_code - @product_commission.product_type = 'menu_item' # use for dummy data ToDo::need to change product type - unless @commission.nil? - @product_commission.commission_id = @commission.id - if @commission.commission_type == 'Percentage' - @product_commission.price = @sale_item.unit_price * (@commission.amount / 100.0) - @product_commission.amount = @product_commission.price * @sale_item.qty - elsif @commission.commission_type == 'Net Amount' - @product_commission.price = @commission.amount - @product_commission.amount = @product_commission.price * @sale_item.qty + if @product_commission.commissioner_id == @commissioner.id + @product_commission.destroy + deselect = true + type = "remove" + # render json: {status: true,deselect:deselect, message: "Remove Success !"} + else + @product_commission.commissioner_id = @commissioner.id + deselect = false end - end - @product_commission.commissioner_id = @commissioner.id - @product_commission.qty = @sale_item.qty - @product_commission.sale_id = @sale_item.sale_id - @product_commission.sale_item_id = @sale_item.sale_item_id + else + @product_commission = ProductCommission.new + @product_commission.product_code = @menu_item.item_code + @product_commission.product_type = 'menu_item' # use for dummy data ToDo::need to change product type + unless @commission.nil? + @product_commission.commission_id = @commission.id + if @commission.commission_type == 'Percentage' + @product_commission.price = @sale_item.unit_price * (@commission.amount / 100.0) + @product_commission.amount = @product_commission.price * @sale_item.qty + elsif @commission.commission_type == 'Net Amount' + @product_commission.price = @commission.amount + @product_commission.amount = @product_commission.price * @sale_item.qty + end + end + @product_commission.commissioner_id = @commissioner.id + @product_commission.qty = @sale_item.qty + @product_commission.sale_id = @sale_item.sale_id + @product_commission.sale_item_id = @sale_item.sale_item_id end if @product_commission.save - render json: {status: true, deselect: deselect} + message = "Success !" + if type == "remove" + message = "Remove Success !" + end + render json: {status: true, deselect:deselect,type:type,message: message} else - render json: {status: false, deselect: deselect} + render json: {status: false, deselect:deselect,type:type,message: "No Commission"} end + else + render json: {status: false, deselect:deselect,type:type,message: "No Commission"} end end diff --git a/app/models/product_commission.rb b/app/models/product_commission.rb index c865c674..9f91673a 100755 --- a/app/models/product_commission.rb +++ b/app/models/product_commission.rb @@ -61,9 +61,10 @@ class ProductCommission < ApplicationRecord end def self.get_transaction(from, to, commissioner) - transaction = all + transaction = ProductCommission.select("product_commissions.*,menu_items.name as porduct_name") + .joins("join menu_items on menu_items.item_code = product_commissions.product_code") if !from.nil? && !to.nil? - transaction = transaction.where('updated_at between ? and ?', from, to) + transaction = transaction.where('product_commissions.updated_at between ? and ?', from, to) end if commissioner != 0 transaction = transaction.where(commissioner_id: commissioner) diff --git a/app/views/origami/product_commissions/load_commissioners.html.erb b/app/views/origami/product_commissions/load_commissioners.html.erb index 6383f1fa..355b4501 100755 --- a/app/views/origami/product_commissions/load_commissioners.html.erb +++ b/app/views/origami/product_commissions/load_commissioners.html.erb @@ -126,7 +126,9 @@ $('.sale_item').on('click', function () { $('#order-items-table tr').siblings().css( "background-color", "white" ); - this.style.backgroundColor = 'lightgray'; + $('#order-items-table tr').siblings().css( "color", "black" ); + this.style.backgroundColor = 'blue'; + this.style.color = 'white'; var sale_item_id = this.getAttribute('data-sale-item'); var ajax_url = "/origami/select_sale_item"; selected_sale_item = sale_item_id; @@ -179,11 +181,17 @@ url: ajax_url, data: param_data, success: function (result) { - console.log(selected_sale_item + "," +commissioner_id); + console.log(result); if(result.deselect == true){ $(commissioner).removeClass("blue").addClass("green"); $("tr[data-sale-item=" + selected_sale_item + "] td.commissioner").text('-'); } + if(result.status == true){ + swal("Information",result.message,"success"); + }else{ + $("tr[data-sale-item=" + selected_sale_item + "] td.commissioner").text('-'); + swal("Opps",result.message,"warning"); + } } }); }; diff --git a/app/views/reports/commission/index.html.erb b/app/views/reports/commission/index.html.erb index 80cf5727..88dc46df 100755 --- a/app/views/reports/commission/index.html.erb +++ b/app/views/reports/commission/index.html.erb @@ -64,7 +64,7 @@ <%= result.sale_id rescue '-' %> <%= result.sale_item_id rescue '-' %> <%= result.commissioner.name rescue '-' %> - <%= result.commission.menu_item.name rescue '-' %> + <%= result.porduct_name 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 '-' %> diff --git a/config/pumass.rb b/config/pumass.rb new file mode 100755 index 00000000..cd3f0829 --- /dev/null +++ b/config/pumass.rb @@ -0,0 +1,11 @@ +application_path="#{File.expand_path("../..", __FILE__)}" +directory application_path +#environment ENV.fetch("RAILS_ENV") { "production" } +environment "production" +pidfile "#{application_path}/tmp/puma/pid" +state_path "#{application_path}/tmp/puma/state" +stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log" +port ENV.fetch("PORT") { 62158 } +workers 2 +preload_app! + diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake index 6e556c52..2f293832 100755 --- a/lib/tasks/clear_data.rake +++ b/lib/tasks/clear_data.rake @@ -15,18 +15,19 @@ namespace :clear do ShiftSale.delete_all PaymentJournal.delete_all Survey.delete_all + ProductCommission.delete_all 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 + # Receipt.delete_all + # ReceiptDetail.delete_all OrderReservation.delete_all OrderReservationItem.delete_all Delivery.delete_all puts "Clear Data Done." end - desc "Clear Menu" + desc "Clear-- Menu" task :menu => :environment do From 76d7b1c6c027e78d8314c75102817e67050c84cd Mon Sep 17 00:00:00 2001 From: phyusin Date: Thu, 24 May 2018 14:58:09 +0630 Subject: [PATCH 03/14] change ui for xls --- app/views/reports/dailysale/index.xls.erb | 297 ++++++++++++---------- 1 file changed, 156 insertions(+), 141 deletions(-) diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb index 0f2767c5..8c9cccb6 100755 --- a/app/views/reports/dailysale/index.xls.erb +++ b/app/views/reports/dailysale/index.xls.erb @@ -1,158 +1,173 @@ - - + + -
-
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - <% unless @sale_data.empty? %> +
+
+
+
+
<%= 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 '-'%>
<%= t("views.right_panel.detail.sr") %><%= t("views.right_panel.detail.date") %><%= t("views.right_panel.detail.void_amount") %><%= t("views.right_panel.detail.mpu_sales") %><%= t("views.right_panel.detail.master_sales") %><%= t("views.right_panel.detail.visa_sales") %><%= t("views.right_panel.detail.jcb_sales") %><%= t("views.right_panel.detail.unionpay_sales") %><%= t("views.right_panel.detail.alipay_sales") %><%= t("views.right_panel.detail.paymal_sales") %><%= t("views.right_panel.detail.dinga_sales") %><%= t("views.right_panel.detail.junctionpay_sales") %><%= t("views.right_panel.detail.redeem_sales") %><%= t("views.right_panel.detail.cash_sales") %><%= t("views.right_panel.detail.credit_sales") %><%= t("views.right_panel.detail.foc_sales") %>(<%= t("views.right_panel.detail.discount") %>)<%= t("views.right_panel.detail.grand_total") %> +
<%= t("views.right_panel.detail.rnd_adj_sh") %>		<%= t("views.right_panel.detail.rnd_adj_sh") %><%= t("views.right_panel.detail.grand_total") %>
+ + + + + + + + + + + + + + + + + + + + + + + + + - - <% void = 0 %> - <% mpu = 0 %> - <% master = 0 %> - <% visa = 0 %> - <% jcb = 0 %> - <% unionpay = 0 %> - <% alipay = 0 %> - <% paymal = 0 %> - <% dinga = 0 %> - <% junctionpay = 0 %> - <% paypar = 0 %> - <% cash = 0 %> - <% credit = 0 %> - <% foc = 0 %> - <% discount = 0 %> - <% total = 0 %> - <% grand_total = 0 %> - <% old_grand_total = 0 %> - <% count = 1 %> <% rounding_adj = 0 %> - <% @sale_data.each do |sale| %> - <% void += sale[:void_amount] %> - <% mpu += sale[:mpu_amount] %> - <% master += sale[:master_amount] %> - <% visa += sale[:visa_amount] %> - <% jcb += sale[:jcb_amount] %> - <% unionpay += sale[:unionpay_amount] %> - <% alipay += sale[:alipay_amount] %> - <% paymal += sale[:paymal_amount] %> - <% dinga += sale[:dinga_amount] %> - <% junctionpay += sale[:junctionpay_amount] %> - <% paypar += sale[:paypar_amount] %> - <% cash += sale[:cash_amount]-sale[:total_change_amount] %> - <% credit += sale[:credit_amount] %> - <% foc += sale[:foc_amount] %> - <% discount += sale[:total_discount] %> - <% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f %> - <% grand_total += sale[:grand_total].to_f %> - <% old_grand_total += sale[:old_grand_total].to_f %> - <% rounding_adj += sale[:rounding_adj].to_f %> - - - - - - - - - - - - - - - - - - - - - - - <% count = count + 1 %> - <% end %> + + + <% 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? %> - - - - - - - - - - - - - - - + + <% void = 0 %> + <% mpu = 0 %> + <% master = 0 %> + <% visa = 0 %> + <% jcb = 0 %> + <% unionpay = 0 %> + <% alipay = 0 %> + <% paymal = 0 %> + <% dinga = 0 %> + <% junctionpay = 0 %> + <% paypar = 0 %> + <% cash = 0 %> + <% credit = 0 %> + <% foc = 0 %> + <% discount = 0 %> + <% total = 0 %> + <% grand_total = 0 %> + <% old_grand_total = 0 %> + <% count = 1 %> <% rounding_adj = 0 %> + <% @sale_data.each do |sale| %> + <% void += sale[:void_amount] %> + <% mpu += sale[:mpu_amount] %> + <% master += sale[:master_amount] %> + <% visa += sale[:visa_amount] %> + <% jcb += sale[:jcb_amount] %> + <% unionpay += sale[:unionpay_amount] %> + <% alipay += sale[:alipay_amount] %> + <% paymal += sale[:paymal_amount] %> + <% dinga += sale[:dinga_amount] %> + <% junctionpay += sale[:junctionpay_amount] %> + <% paypar += sale[:paypar_amount] %> + <% cash += sale[:cash_amount]-sale[:total_change_amount] %> + <% credit += sale[:credit_amount] %> + <% foc += sale[:foc_amount] %> + <% discount += sale[:total_discount] %> + <% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f %> + <% grand_total += sale[:grand_total].to_f %> + <% old_grand_total += sale[:old_grand_total].to_f %> + <% rounding_adj += sale[:rounding_adj].to_f %> + + + + + + + + + + + + + + + + + + + + + - <% total_tax = 0 %> - <% net = 0 %> - <% unless @tax.empty? %> - <% @tax.each do |tax| %> - <% total_tax += tax.tax_amount.to_f %> - - - - - + + <% count = count + 1 %> + <% end %> - <% end %> - <% net = grand_total %> - <% net = net - rounding_adj%> - <% net = net - total_tax %> - - - - - - <% end %> - - <% end %> -
<%= 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 '-'%>
<%= t("views.right_panel.detail.sr") %><%= t("views.right_panel.detail.date") %><%= t("views.right_panel.detail.void_amount") %><%= t("views.right_panel.detail.mpu_sales") %><%= t("views.right_panel.detail.master_sales") %><%= t("views.right_panel.detail.visa_sales") %><%= t("views.right_panel.detail.jcb_sales") %><%= t("views.right_panel.detail.unionpay_sales") %><%= t("views.right_panel.detail.alipay_sales") %><%= t("views.right_panel.detail.paymal_sales") %><%= t("views.right_panel.detail.dinga_sales") %><%= t("views.right_panel.detail.junctionpay_sales") %><%= t("views.right_panel.detail.redeem_sales") %><%= t("views.right_panel.detail.cash_sales") %><%= t("views.right_panel.detail.credit_sales") %><%= t("views.right_panel.detail.foc_sales") %>(<%= t("views.right_panel.detail.discount") %>)<%= t("views.right_panel.detail.grand_total") %><%= t("views.right_panel.detail.rnd_adj_sh") %>
<%= 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[:unionpay_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:alipay_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:paymal_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:dinga_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:junctionpay_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 '-'%>
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 '-'%>
<%= 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[:unionpay_amount]),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:alipay_amount]),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:paymal_amount]),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:dinga_amount]),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:junctionpay_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: 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]),delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f),delimiter => ',') rescue '-'%>
<%= tax.tax_name rescue '-'%><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%> 
<%= t("views.right_panel.detail.net_amount") %><%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%> 
+ + 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",unionpay),delimiter => ',') rescue '-'%> + <%= number_with_delimiter(sprintf("%.2f",alipay),delimiter => ',') rescue '-'%> + <%= number_with_delimiter(sprintf("%.2f",paymal),delimiter => ',') rescue '-'%> + <%= number_with_delimiter(sprintf("%.2f",dinga),delimiter => ',') rescue '-'%> + <%= number_with_delimiter(sprintf("%.2f",junctionpay),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(discount,delimiter => ',') rescue '-'%>) + + <%= number_with_delimiter(sprintf("%.2f",grand_total),delimiter => ',') rescue '-'%> + <%= number_with_delimiter(sprintf("%.2f",rounding_adj),delimiter => ',') rescue '-'%> + + + <% total_tax = 0 %> + <% net = 0 %> + <% unless @tax.empty? %> + <% @tax.each do |tax| + total_tax += tax.tax_amount.to_f %> + + <%= tax.tax_name rescue '-'%> + <%= number_with_delimiter(sprintf("%.2f",tax.tax_amount),delimiter => ',') rescue '-'%> +   + + <% end %> + <% end %> + + <% net = grand_total %> + <% net = net - rounding_adj%> + <% net = net - total_tax %> + + <%= t("views.right_panel.detail.net_amount") %> + <%= number_with_delimiter(sprintf("%.2f",net),delimiter => ',') rescue '-'%> +   + + + <% end %> +
-
\ No newline at end of file From 1c9674fa533ab4f2c2667c115950eea669ec43fc Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 24 May 2018 15:26:12 +0630 Subject: [PATCH 04/14] update processing itemjs --- app/assets/javascripts/settings/processing_items.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/assets/javascripts/settings/processing_items.js b/app/assets/javascripts/settings/processing_items.js index 1dc5e97f..e43aedde 100755 --- a/app/assets/javascripts/settings/processing_items.js +++ b/app/assets/javascripts/settings/processing_items.js @@ -1,7 +1,6 @@ $(document).ready(function() { $(".processitems").click(function(event){ event.preventDefault(); - console.log($(this).data("id")); var item = $(this).data("id"); $(this).toggleClass("opi_selected"); @@ -13,7 +12,6 @@ $(document).ready(function() { console.log($(this).data("id")); var group_id = $(this).data("id"); var selector = "#" + group_id + " li div"; - console.log ($(selector)); $(selector).removeClass("opi_selected"); $(selector).addClass("opi_selected"); @@ -25,7 +23,6 @@ $(document).ready(function() { console.log($(this).data("id")); var group_id = $(this).data("id"); var selector = "#" + group_id + " li div"; - console.log ($(selector)); $(selector).removeClass("opi_selected"); }); @@ -36,7 +33,6 @@ $(document).ready(function() { var items = new Array(); selected_div = $(".opi_selected"); $.each( selected_div, function( key, value ) { - console.log($(value).attr("data-id")); items.push($(value).attr("data-id")); }); From 445f98cf7cba6d370f8a3d4f4cf38a8fe7446151 Mon Sep 17 00:00:00 2001 From: phyusin Date: Thu, 24 May 2018 15:30:44 +0630 Subject: [PATCH 05/14] payment tax UI --- .../origami/payments_controller.rb | 2 +- app/views/origami/payments/show.html.erb | 56 ++++++++++++++++--- 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 045afafb..40d8c573 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -300,7 +300,7 @@ class Origami::PaymentsController < BaseOrigamiController @account_arr =[] accounts.each do |acc| account = TaxProfile.find(acc.id) - @account_arr.push(account) + @account_arr.push(account.name) end rebate = MembershipSetting.find_by_rebate(1) diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index fb4824ec..477cdca6 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -97,15 +97,53 @@ (<%= number_with_precision(@sale_data.total_discount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>) - Tax - (<% @i = 0 - @account_arr.each do |ct| %> - <%=ct.name%> - <% if @account_arr.count != @i+1%> - + <% @i =+1 %> - <%end%> - <%end %>) - + + + Tax + +
+
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+
+ + <%= number_with_precision(@sale_data.total_tax, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%> From a4390361be149834c2f1591a3fe477c6d845ec9f Mon Sep 17 00:00:00 2001 From: phyusin Date: Thu, 24 May 2018 15:31:48 +0630 Subject: [PATCH 06/14] change puma name --- config/pumass.rb | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100755 config/pumass.rb diff --git a/config/pumass.rb b/config/pumass.rb deleted file mode 100755 index cd3f0829..00000000 --- a/config/pumass.rb +++ /dev/null @@ -1,11 +0,0 @@ -application_path="#{File.expand_path("../..", __FILE__)}" -directory application_path -#environment ENV.fetch("RAILS_ENV") { "production" } -environment "production" -pidfile "#{application_path}/tmp/puma/pid" -state_path "#{application_path}/tmp/puma/state" -stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log" -port ENV.fetch("PORT") { 62158 } -workers 2 -preload_app! - From 7649728c4de4ce38128bce9d97729635f22f7ebc Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 24 May 2018 16:29:51 +0630 Subject: [PATCH 07/14] update menu json for sort by name --- app/views/origami/dashboard/_menu.json.jbuilder | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/views/origami/dashboard/_menu.json.jbuilder b/app/views/origami/dashboard/_menu.json.jbuilder index 8d17208c..e5f75639 100644 --- a/app/views/origami/dashboard/_menu.json.jbuilder +++ b/app/views/origami/dashboard/_menu.json.jbuilder @@ -6,11 +6,12 @@ json.valid_time_to menu.valid_time_to.strftime("%H:%M") if (menu.menu_categories) order_by = Lookup.find_by_lookup_type("order_by") - if !order_by.nil? && order_by.value == "name" - categories = MenuCategory.unscoped.where("menu_id ='#{menu.id}'").order("name asc") - else - categories = menu.menu_categories - end + # if !order_by.nil? && order_by.value == "name" + # categories = MenuCategory.unscoped.where("menu_id ='#{menu.id}'").order("name asc") + # else + # categories = menu.menu_categories + # end + categories = menu.menu_categories json.categories categories do |category| menu_category = MenuCategory.find_by_menu_category_id(category.id) From 29814f61f241377585afabcee83de39dfbb0c2a8 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 24 May 2018 18:13:10 +0630 Subject: [PATCH 08/14] update addorder sort name --- app/assets/javascripts/addorder.js | 6 ++++-- app/assets/stylesheets/addorder.scss | 1 + app/views/origami/addorders/detail.html.erb | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 6d9782e3..3fea4c6b 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -1437,7 +1437,8 @@ $(function() { } } - row = '
' + row = '
' + +'
' +'
' +'
'+ menu_items[field].name +'
' +"
' +''+ price +'' +'
' - +'
'; + +'
' + +'
'; ; $('.menu_items_list').append(row); } //end instances in menu-items alest 1 instance diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index 929ffb13..64bbc08f 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -12,6 +12,7 @@ section .content{ } .custom-card { border: 2px solid rgba(0, 0, 0, 0.125) !important; + margin-bottom: 7px !important; } .custom-card-footer{ padding:0.35rem 1.25rem !important; diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 7aeb6342..bbd9cb79 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -101,7 +101,7 @@
-
+
<% @menu.each do |menu| %> <% if !menu.valid_time.nil? %> From b7c66145378ad16b2ebb25596d5e5f7f85a8908b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 25 May 2018 13:14:57 +0630 Subject: [PATCH 09/14] upadte api order create process order --- app/assets/stylesheets/addorder.scss | 18 +++- app/controllers/api/orders_controller.rb | 5 + app/models/order.rb | 125 +++++++++++------------ 3 files changed, 81 insertions(+), 67 deletions(-) diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index 64bbc08f..36ea4e33 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -73,16 +73,26 @@ section .content{ .nav-tabs { background-color: #ccc; } +.nav-tabs li a.active{ + border-bottom:1px solid #54A5AF !important; +} .nav-tabs .nav-link { padding: 0.7286rem 0.2575; border-top-left-radius: 0rem; border-top-right-radius: 0rem; } + +.nav-tabs .nav-link:focus, .nav-tabs .nav-link:hover { + color: #54A5AF #54A5AF #54A5AF; +} +.nav-tabs .nav-link.active:focus, .nav-tabs .nav-link.active:hover { + background-color: #009688; +} .nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link { - background-color: #a1aade; - border-left: 6px solid #111; - color:#54A5AF; - font-weight: bold; + background-color: #fff !important; + border-left: 6px solid #54A5AF !important; + color: #54A5AF !important; + font-weight: bold !important; border-color: #fff #fff #fff #54A5AF; } .sub_category_list{ diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index 49afe833..a25b60ab 100755 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -117,6 +117,11 @@ class Api::OrdersController < Api::ApiController end @status, @booking = @order.generate + if @status && @booking + if params[:order_source] != "quick_service" + Order.process_order_queue(@order.order_id,@order.table_id,@order.source) + end + end # # for parallel order # remoteIP = "" # begin diff --git a/app/models/order.rb b/app/models/order.rb index 9a52942e..d9a50d4a 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -301,13 +301,6 @@ class Order < ApplicationRecord end # end end - - def check_cup_status(status) - if status.include? "Active: active (running)" || "Active: active (exited)" #"Cup Server is already running" - return true - end - return false - end #send order items and send to order queue def send_order_broadcast(booking) @@ -485,68 +478,74 @@ class Order < ApplicationRecord end #Process order items and send to order queue - # def process_order_queue - # print_status = nil - # cup_status = nil + def self.process_order_queue(order_id,table_id,source) + print_status = nil + cup_status = nil - # #Send to background job for processing - # order = Order.find(self.id) - # sidekiq = Lookup.find_by_lookup_type("sidekiq") + #Send to background job for processing + order = Order.find(order_id) + sidekiq = Lookup.find_by_lookup_type("sidekiq") - # if ENV["SERVER_MODE"] != 'cloud' - # cup_status = `#{"sudo service cups status"}` - # print_status = check_cup_status(cup_status) - # end + if ENV["SERVER_MODE"] != 'cloud' + cup_status = `#{"sudo service cups status"}` + print_status = check_cup_status(cup_status) + end - # if print_status - # if !sidekiq.nil? - # OrderQueueProcessorJob.perform_later(self.id, self.table_id) - # else - # if order - # 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 - # else - # if ENV["SERVER_MODE"] != 'cloud' - # cup_start = `#{"sudo service cups start"}` - # cup_status = `#{"sudo service cups status"}` - # print_status = check_cup_status(cup_status) - # end + if print_status + if !sidekiq.nil? + OrderQueueProcessorJob.perform_later(order_id, table_id) + else + if order + oqs = OrderQueueStation.new + oqs.process_order(order, table_id, source) + end + # assign_order = AssignedOrderItem.assigned_order_item_by_job(order_id) + # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order + end + else + if ENV["SERVER_MODE"] != 'cloud' + cup_start = `#{"sudo service cups start"}` + cup_status = `#{"sudo service cups status"}` + print_status = check_cup_status(cup_status) + end - # if print_status - # if !sidekiq.nil? - # OrderQueueProcessorJob.perform_later(self.id, self.table_id) - # else - # if order - # 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 - # else - # if ENV["SERVER_MODE"] != 'cloud' + if print_status + if !sidekiq.nil? + OrderQueueProcessorJob.perform_later(order_id, table_id) + else + if order + oqs = OrderQueueStation.new + oqs.process_order(order, table_id, source) + end + # assign_order = AssignedOrderItem.assigned_order_item_by_job(order_id) + # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order + end + else + if ENV["SERVER_MODE"] != 'cloud' - # msg = ' Print Error ! Please contact to service' - # ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error' - # end - # if !sidekiq.nil? - # OrderQueueProcessorJob.perform_later(self.id, self.table_id) - # else - # if order - # 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 - # end + msg = ' Print Error ! Please contact to service' + ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error' + end + if !sidekiq.nil? + OrderQueueProcessorJob.perform_later(order_id, table_id) + else + if order + oqs = OrderQueueStation.new + oqs.process_order(order, table_id, source) + end + assign_order = AssignedOrderItem.assigned_order_item_by_job(order_id) + ActionCable.server.broadcast "order_queue_station_channel",order: assign_order + end + end + end + end + def self.check_cup_status(status) + if status.include? "Active: active (running)" || "Active: active (exited)" #"Cup Server is already running" + return true + end + return false + end private From 7f6b0e0bdf8451d67fdb5c56b9f0417828d0e7f0 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 25 May 2018 13:16:41 +0630 Subject: [PATCH 10/14] update order api --- app/controllers/api/orders_controller.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index a25b60ab..bed06600 100755 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -118,9 +118,7 @@ class Api::OrdersController < Api::ApiController @status, @booking = @order.generate if @status && @booking - if params[:order_source] != "quick_service" Order.process_order_queue(@order.order_id,@order.table_id,@order.source) - end end # # for parallel order # remoteIP = "" From 49453a22c0aac4f2c0b0c64f9186de0f296b571c Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 25 May 2018 13:26:55 +0630 Subject: [PATCH 11/14] change tax profile overide --- app/assets/stylesheets/origami.scss | 5 + .../origami/payments_controller.rb | 24 ++- app/models/ability.rb | 3 + app/models/order.rb | 8 +- app/models/sale.rb | 136 ++++++--------- app/views/origami/payments/show.html.erb | 157 ++++++++++++------ config/routes.rb | 2 + 7 files changed, 199 insertions(+), 136 deletions(-) diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 855ee984..7ce4e1ed 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -462,4 +462,9 @@ iframe { /* section class for webview */ .section-margin { margin-top: -50px; +} + +.tax-btn-box { + width: 230px; + height: 80px; } \ No newline at end of file diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 40d8c573..313cc10c 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -96,6 +96,8 @@ class Origami::PaymentsController < BaseOrigamiController cash = params[:cash] sale_id = params[:sale_id] member_info = nil + type = params[:type] + tax_type = params[:tax_type] if(Sale.exists?(sale_id)) saleObj = Sale.find(sale_id) @@ -298,11 +300,18 @@ class Origami::PaymentsController < BaseOrigamiController # accounts = @customer.tax_profiles accounts = TaxProfile.where("group_type = ?",@cashier_type).order("order_by ASC") @account_arr =[] + @tax_arr =[] accounts.each do |acc| account = TaxProfile.find(acc.id) - @account_arr.push(account.name) + # @account_arr.push(account) + @tax_arr.push(account.name) + end + sale_taxes = SaleTax.where("sale_id = ?", saleObj.sale_id) + if !sale_taxes.empty? + sale_taxes.each do |sale_tax| + @account_arr.push(sale_tax) + end end - rebate = MembershipSetting.find_by_rebate(1) # get member information if @customer.membership_id != nil && rebate @@ -571,4 +580,15 @@ class Origami::PaymentsController < BaseOrigamiController render :json => result.to_json # render :json => {status: true} end + + #changable tax for sale + def change_tax + sale_id = params[:sale_id] + order_source = params[:cashier_type] + tax_type = params[:tax_type] + sale = Sale.find(sale_id) + sale.compute_by_sale_items(sale.sale_id, sale.sale_items, sale.total_discount,nil,order_source,tax_type) + + render json: JSON.generate({:status => true}) + end end \ No newline at end of file diff --git a/app/models/ability.rb b/app/models/ability.rb index fbf66f57..9f1f105b 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -71,6 +71,7 @@ class Ability can :rounding_adj, :payment can :foc, :payment can :print, :payment + can :change_tax, :payment can :move_dining, :movetable can :moving, :movetable @@ -154,6 +155,7 @@ class Ability can :rounding_adj, :payment can :foc, :payment can :print, :payment + can :change_tax, :payment can :move_dining, :movetable can :moving, :movetable @@ -249,6 +251,7 @@ class Ability can :rounding_adj, :payment can :print, :payment can :foc, :payment + can :change_tax, :payment can :manage, Commission can :manage, Commissioner diff --git a/app/models/order.rb b/app/models/order.rb index 9a52942e..fea98438 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -317,10 +317,10 @@ class Order < ApplicationRecord #Send to background job for processing # OrderBroadcastJob.perform_later(table,type) if ENV["SERVER_MODE"] == 'cloud' - from = request.subdomain + "." + request.domain - else - from = "" - end + from = request.subdomain + "." + request.domain + else + from = "" + end ActionCable.server.broadcast "order_channel",table: table,type:type,from:from end diff --git a/app/models/sale.rb b/app/models/sale.rb index 24d3f81c..b7547c23 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -131,7 +131,6 @@ class Sale < ApplicationRecord if order_source.nil? order_source = order.source end - puts "compute source" compute(order_source) #Update the order items that is billed @@ -346,7 +345,7 @@ class Sale < ApplicationRecord end #compute - invoice total - def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil,order_source=nil) + def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil,order_source=nil,tax_type=nil) sale = Sale.find(sale_id) sales_items = sale_itemss @@ -365,7 +364,7 @@ class Sale < ApplicationRecord end end - compute_tax(sale, total_taxable, total_discount, order_source) + compute_tax(sale, total_taxable, total_discount, order_source, tax_type) sale.total_amount = subtotal_price sale.total_discount = total_discount @@ -412,7 +411,7 @@ class Sale < ApplicationRecord end # Tax Re-Calculte - def compute_tax(sale, total_taxable, total_discount = 0, order_source = nil) + def compute_tax(sale, total_taxable, total_discount = 0, order_source = nil, tax_type=nil) shop = Shop.first(); #if tax is not apply create new record @@ -429,60 +428,59 @@ class Sale < ApplicationRecord if sale.payment_status != 'foc' tax_profiles.each do |tax| - # customer.tax_profiles.each do |cus_tax| - # if cus_tax.to_i == tax.id if tax.group_type.to_s == order_source.to_s - if customer.customer_type.downcase == 'takeaway' - if tax.name.downcase == 'commercial tax' - sale_tax = SaleTax.new(:sale => sale) - sale_tax.tax_name = tax.name - sale_tax.tax_rate = tax.rate + if tax_type + if tax_type.to_s == tax.name.to_s || tax_type == 'all' + sale_tax = SaleTax.new(:sale => sale) + sale_tax.tax_name = tax.name + sale_tax.tax_rate = tax.rate - # substract , to give after discount - total_tax = total_taxable - total_discount - #include or execulive - if tax.inclusive - rate = tax.rate - divided_value = (100 + rate)/rate - sale_tax.tax_payable_amount = total_tax / divided_value - else - sale_tax.tax_payable_amount = total_tax * tax.rate / 100 - total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount + # substract , to give after discount + total_tax = total_taxable - total_discount + #include or execulive + if tax.inclusive + rate = tax.rate + divided_value = (100 + rate)/rate + sale_tax.tax_payable_amount = total_tax / divided_value + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount + end + #new taxable amount is standard rule for step by step + if shop.calc_tax_order + total_taxable = total_taxable + sale_tax.tax_payable_amount + end + sale_tax.inclusive = tax.inclusive + sale_tax.save end - #new taxable amount is standard rule for step by step - if shop.calc_tax_order - total_taxable = total_taxable + sale_tax.tax_payable_amount - end - - sale_tax.inclusive = tax.inclusive - sale_tax.save - end else - sale_tax = SaleTax.new(:sale => sale) - sale_tax.tax_name = tax.name - sale_tax.tax_rate = tax.rate + # customer.tax_profiles.each do |cus_tax| + # if cus_tax.to_i == tax.id + sale_tax = SaleTax.new(:sale => sale) + sale_tax.tax_name = tax.name + sale_tax.tax_rate = tax.rate - # substract , to give after discount - total_tax = total_taxable - total_discount - #include or execulive - if tax.inclusive - rate = tax.rate - divided_value = (100 + rate)/rate - sale_tax.tax_payable_amount = total_tax / divided_value - else - sale_tax.tax_payable_amount = total_tax * tax.rate / 100 - total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount - end - #new taxable amount is standard rule for step by step - if shop.calc_tax_order - total_taxable = total_taxable + sale_tax.tax_payable_amount - end - sale_tax.inclusive = tax.inclusive - sale_tax.save + # substract , to give after discount + total_tax = total_taxable - total_discount + #include or execulive + if tax.inclusive + rate = tax.rate + divided_value = (100 + rate)/rate + sale_tax.tax_payable_amount = total_tax / divided_value + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount + end + #new taxable amount is standard rule for step by step + if shop.calc_tax_order + total_taxable = total_taxable + sale_tax.tax_payable_amount + end + sale_tax.inclusive = tax.inclusive + sale_tax.save + # end + # end end end - # end - # end end end @@ -510,11 +508,9 @@ class Sale < ApplicationRecord #Create new tax records tax_profiles.each do |tax| - # customer.tax_profiles.each do |cus_tax| - # if cus_tax.to_i == tax.id if tax.group_type.to_s == order_source.to_s - if customer.customer_type.downcase == 'takeaway' - if tax.name.downcase == 'commercial tax' + # customer.tax_profiles.each do |cus_tax| + # if cus_tax.to_i == tax.id sale_tax = SaleTax.new(:sale => self) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate @@ -538,35 +534,9 @@ class Sale < ApplicationRecord sale_tax.inclusive = tax.inclusive sale_tax.save - end - else - sale_tax = SaleTax.new(:sale => self) - sale_tax.tax_name = tax.name - sale_tax.tax_rate = tax.rate - - # substract , to give after discount - total_tax = total_taxable - self.total_discount - #include or execulive - if tax.inclusive - rate = tax.rate - divided_value = (100 + rate)/rate - sale_tax.tax_payable_amount = total_tax / divided_value - else - sale_tax.tax_payable_amount = total_tax * tax.rate / 100 - total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount - end - - #new taxable amount is standard rule for step by step - if shop.calc_tax_order - total_taxable = total_taxable + sale_tax.tax_payable_amount - end - - sale_tax.inclusive = tax.inclusive - sale_tax.save - end + # end + # end end - # end - # end end self.total_tax = total_tax_amount end diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 477cdca6..b1c9dde6 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -1,4 +1,4 @@ -`
+
@@ -99,52 +99,21 @@ - Tax - -
-
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
-
- + <% if !@account_arr.empty? %> + Tax + (<% @i = 0 + @account_arr.each do |ct| %> + <%=ct.tax_name%> + <% if @account_arr.count != @i+1%> + + <% @i =+1 %> + <%end%> + <%end %>) + <% else %> + No Tax + <% end %>
+ - <%= number_with_precision(@sale_data.total_tax, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%> + <%= number_with_precision(@sale_data.total_tax, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i )%> Rounding Adj: @@ -574,6 +543,61 @@
+ + +

Card Tap

@@ -719,6 +743,8 @@ var customer_name = "<%= @customer.name %>"; var credit = $('#credit').text(); var card = $('#card').text(); + var tax_type = $("input:radio[name=tax_type]:checked").val(); + if (credit <= 0) { calculate_member_discount(sale_id); } @@ -727,7 +753,7 @@ var customer_name = "<%= @customer.name %>"; $('#pdfModal').focus() }).modal({show : true, backdrop : false, keyboard : false}); $.ajax({type: "POST", url: "<%= origami_payment_cash_path %>", - data: "cash="+ cash + "&sale_id=" + sale_id + "&type=" + cashier_type, + data: "cash="+ cash + "&sale_id=" + sale_id + "&type=" + cashier_type + "&tax_type=" + tax_type, success:function(result){ /* start delete receipt no in first bill*/ if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){ @@ -1384,4 +1410,41 @@ var customer_name = "<%= @customer.name %>"; } }); } + + /* Start function for tax changable */ + $(".change_tax").on("click",function(){ + $("#change_taxModal").modal({show: true, backdrop: false, keyboard: false}); + }); + + $("button[name=tax_type]").on("click", function(){ + var type = $(this).attr("data-value"); + var cashier_type = '<%= @cashier_type %>'; + var sale_id = $('#sale_id').text(); + console.log(type); + swal({ + title: "Alert", + text: "Are you sure want to change tax?", + type: "warning", + showCancelButton: true, + confirmButtonColor: "#DD6B55", + confirmButtonText: "Yes, change it!", + closeOnConfirm: false + }, function (isConfirm) { + if (isConfirm) { + $.ajax({ + type: "POST", + url: "/origami/payment/"+cashier_type+"/change_tax", + data: {sale_id: sale_id, cashier_type: cashier_type, tax_type: type}, + success:function(data){ + if(data.status){ + window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment'; + } + } + }); + }else{ + swal.close(); + } + }); + }); + /* End function for tax changable */ diff --git a/config/routes.rb b/config/routes.rb index 7f776da0..5f213d33 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -199,6 +199,8 @@ scope "(:locale)", locale: /en|mm/ do post 'payment/junctionpay' => 'junctionpay#create' post 'payment/dinga' => 'dinga#create' + post 'payment/:type/change_tax' => 'payments#change_tax', :defaults => {:format => 'json'} + get 'sale/:sale_id/:type/payment/credit_payment' => "credit_payments#index" get 'sale/:sale_id/:type/payment/others_payment' => "others_payments#index" get 'sale/:sale_id/:type/payment/others_payment/MPU' => "mpu#index" From 590b67abdf3c5f43cd7e5456e50d2b423cb537cd Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 25 May 2018 14:46:40 +0630 Subject: [PATCH 12/14] show incl exec in receipt bill --- app/models/sale.rb | 3 ++- app/pdf/receipt_bill_a5_pdf.rb | 6 +++++- app/pdf/receipt_bill_pdf.rb | 7 ++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index b7547c23..aa489c7d 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -421,6 +421,7 @@ class Sale < ApplicationRecord end total_tax_amount = 0 + tax_incl_exec = "execulsive" #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") customer = Customer.find(sale.customer_id) @@ -483,7 +484,7 @@ class Sale < ApplicationRecord end end end - + sale.tax_type = sale.total_tax = total_tax_amount end diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb index 55b09668..550195ed 100644 --- a/app/pdf/receipt_bill_a5_pdf.rb +++ b/app/pdf/receipt_bill_a5_pdf.rb @@ -303,12 +303,16 @@ class ReceiptBillA5Pdf < Prawn::Document end if sale_data.sale_taxes.length > 0 + incl_tax = "" + if sale_data.tax_type == "inculsive" + incl_tax = "Incl." + end sale_data.sale_taxes.each do |st| move_down line_move y_position = cursor bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do - text "#{ st.tax_name } ( #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left + text "#{ st.tax_name } (#{incl_tax} #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left end bounding_box([self.description_width,y_position], :width =>self.label_width) do text "#{number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 5f3cdc09..ac79297c 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -290,12 +290,17 @@ class ReceiptBillPdf < Prawn::Document end if sale_data.sale_taxes.length > 0 + incl_tax = "" + if sale_data.tax_type == "inculsive" + incl_tax = "Incl." + end + sale_data.sale_taxes.each do |st| move_down line_move y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do - text "#{ st.tax_name } ( #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left + text "#{ st.tax_name } (#{incl_tax} #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left end bounding_box([self.item_description_width,y_position], :width =>self.label_width) do text "#{number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right From b3e0e7e4533b29e20ff7c00e9e7309f375b3d95e Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 25 May 2018 15:01:15 +0630 Subject: [PATCH 13/14] check survey params --- app/controllers/api/survey_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/survey_controller.rb b/app/controllers/api/survey_controller.rb index 27fe327d..06c9f643 100644 --- a/app/controllers/api/survey_controller.rb +++ b/app/controllers/api/survey_controller.rb @@ -18,8 +18,8 @@ class Api::SurveyController < Api::ApiController cashier_zone = CashierTerminalByZone.find_by_zone_id(dining_facility.zone_id) shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil) - if params[:id] - survey = Survey.find(params[:id]) + if params[:survey][:id] + survey = Survey.find(params[:survey][:id]) else survey = Survey.new end From 5d63d38e4e548b4c3616b3797f4c8a9590870116 Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 25 May 2018 15:25:39 +0630 Subject: [PATCH 14/14] add inclc in receipt bill --- app/models/sale.rb | 53 +++++++++++++++++++--------------- app/pdf/receipt_bill_a5_pdf.rb | 2 +- app/pdf/receipt_bill_pdf.rb | 2 +- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index aa489c7d..979d265c 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -421,7 +421,7 @@ class Sale < ApplicationRecord end total_tax_amount = 0 - tax_incl_exec = "execulsive" + tax_incl_exec = "exclusive" #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") customer = Customer.find(sale.customer_id) @@ -431,29 +431,30 @@ class Sale < ApplicationRecord tax_profiles.each do |tax| if tax.group_type.to_s == order_source.to_s if tax_type - if tax_type.to_s == tax.name.to_s || tax_type == 'all' - sale_tax = SaleTax.new(:sale => sale) - sale_tax.tax_name = tax.name - sale_tax.tax_rate = tax.rate + if tax_type.to_s == tax.name.to_s || tax_type == 'all' + sale_tax = SaleTax.new(:sale => sale) + sale_tax.tax_name = tax.name + sale_tax.tax_rate = tax.rate - # substract , to give after discount - total_tax = total_taxable - total_discount - #include or execulive - if tax.inclusive - rate = tax.rate - divided_value = (100 + rate)/rate - sale_tax.tax_payable_amount = total_tax / divided_value - else - sale_tax.tax_payable_amount = total_tax * tax.rate / 100 - total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount - end - #new taxable amount is standard rule for step by step - if shop.calc_tax_order - total_taxable = total_taxable + sale_tax.tax_payable_amount - end - sale_tax.inclusive = tax.inclusive - sale_tax.save + # substract , to give after discount + total_tax = total_taxable - total_discount + #include or execulive + if tax.inclusive + tax_incl_exec = "inclusive" + rate = tax.rate + divided_value = (100 + rate)/rate + sale_tax.tax_payable_amount = total_tax / divided_value + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount end + #new taxable amount is standard rule for step by step + if shop.calc_tax_order + total_taxable = total_taxable + sale_tax.tax_payable_amount + end + sale_tax.inclusive = tax.inclusive + sale_tax.save + end else # customer.tax_profiles.each do |cus_tax| # if cus_tax.to_i == tax.id @@ -465,6 +466,7 @@ class Sale < ApplicationRecord total_tax = total_taxable - total_discount #include or execulive if tax.inclusive + tax_incl_exec = "inclusive" rate = tax.rate divided_value = (100 + rate)/rate sale_tax.tax_payable_amount = total_tax / divided_value @@ -484,7 +486,7 @@ class Sale < ApplicationRecord end end end - sale.tax_type = + sale.tax_type = tax_incl_exec sale.total_tax = total_tax_amount end @@ -499,6 +501,7 @@ class Sale < ApplicationRecord end total_tax_amount = 0 + tax_incl_exec = "exclusive" #tax_profile - list by order_by tax_profiles = TaxProfile.all.order("order_by asc") @@ -520,6 +523,7 @@ class Sale < ApplicationRecord total_tax = total_taxable - self.total_discount #include or execulive if tax.inclusive + tax_incl_exec = "inclusive" rate = tax.rate divided_value = (100 + rate)/rate sale_tax.tax_payable_amount = total_tax / divided_value @@ -539,7 +543,8 @@ class Sale < ApplicationRecord # end end end - self.total_tax = total_tax_amount + self.tax_type = tax_incl_exec + self.total_tax = total_tax_amount end def product_get_unit_price(item_code) diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb index 550195ed..707ecf00 100644 --- a/app/pdf/receipt_bill_a5_pdf.rb +++ b/app/pdf/receipt_bill_a5_pdf.rb @@ -304,7 +304,7 @@ class ReceiptBillA5Pdf < Prawn::Document if sale_data.sale_taxes.length > 0 incl_tax = "" - if sale_data.tax_type == "inculsive" + if sale_data.tax_type == "inclusive" incl_tax = "Incl." end sale_data.sale_taxes.each do |st| diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index ac79297c..92ce858d 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -291,7 +291,7 @@ class ReceiptBillPdf < Prawn::Document if sale_data.sale_taxes.length > 0 incl_tax = "" - if sale_data.tax_type == "inculsive" + if sale_data.tax_type == "inclusive" incl_tax = "Incl." end