From 674f6cd37d9e67e606875dd7ae2f06057dc40269 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 9 Jan 2018 10:52:52 +0630 Subject: [PATCH 01/14] update decimal and delimeter for dashboard --- app/controllers/home_controller.rb | 3 +++ app/views/home/dashboard.html.erb | 21 ++++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 1ee30bab..25fb0d70 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -113,6 +113,9 @@ class HomeController < ApplicationController @top_items = Sale.top_items(today) @total_foc_items = Sale.total_foc_items(today) + + # get printer info + @print_settings = PrintSetting.get_precision_delimiter() end def destroy diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index 3ed5e068..eb1bdecd 100755 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -2,7 +2,18 @@

<%= t :dashboard %>

- + <% 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 + %>
@@ -125,19 +136,19 @@ <%= t("views.right_panel.detail.total") %> <%= t :sale %> : - <%= @summ_sale.total_amount %> + <%= number_with_precision( @summ_sale.total_amount, precision: precision.to_i ,delimiter: delimiter) %> <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.discount") %> : - <%= @summ_sale.total_discount %> + <%= number_with_precision( @summ_sale.total_discount, precision: precision.to_i ,delimiter: delimiter) %> <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.tax") %> : - <%= @summ_sale.total_tax %> + <%= number_with_precision( @summ_sale.total_tax , precision: precision.to_i ,delimiter: delimiter)%> <%= t("views.right_panel.detail.grand_total") %> : - <%= @summ_sale.grand_total %> + <%= number_with_precision( @summ_sale.grand_total , precision: precision.to_i ,delimiter: delimiter)%> From 6aab87a89d15024db3e3d214342a2e554135fd86 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 9 Jan 2018 12:04:56 +0630 Subject: [PATCH 02/14] update sale item report qty sum --- app/models/sale.rb | 2 +- app/views/reports/saleitem/index.html.erb | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 69aa930a..0b68bf49 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -654,7 +654,7 @@ def self.get_item_query() query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code,i.account_id as account_id, " + "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item,i.qty as qty," + "i.remark as status_type,"+ - " i.unit_price as unit_price,i.product_name as product_name, mc.name as" + + " i.unit_price as unit_price,i.price as price,i.product_name as product_name, mc.name as" + " menu_category_name,mc.id as menu_category_id ") query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb index 4ad30d82..a96b80f8 100644 --- a/app/views/reports/saleitem/index.html.erb +++ b/app/views/reports/saleitem/index.html.erb @@ -77,11 +77,14 @@ <% total_tax = 0 %> <% @sale_data.each do |sale| %> - + <% if sale.status_type != "Discount" && sale.status_type != "foc" total_qty += sale.total_item end %> - + <% if sale.status_type == "foc" && sale.price > 0 + total_qty += sale.total_item + end %> + <% if sale.status_type == "foc" && sale.grand_total < 0 total_item_foc += sale.grand_total*(-1) end %> @@ -127,9 +130,13 @@ <% count = count + 1 %> <% sub_total += sale.grand_total %> <% #sub_qty += sale.total_item %> - <% if sale.status_type != "Discount" && sale.status_type != "foc" + <% if sale.status_type!="Discount" && sale.status_type!="foc" sub_qty += sale.total_item end %> + <% if sale.status_type == "foc" && sale.price > 0 + sub_qty += sale.total_item + end %> + <% if count == value %> From 871683fdc052a87d2c0d1f948ca3dbbc6f75b552 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 9 Jan 2018 16:00:24 +0630 Subject: [PATCH 03/14] update valid time from menu --- app/models/menu_category.rb | 19 +++++++++++++++++++ app/views/origami/addorders/detail.html.erb | 18 ++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index 9930d3cd..200c4469 100755 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -37,6 +37,25 @@ class MenuCategory < ApplicationRecord end end + def valid_time + + menu_category = MenuCategory.find(self.id) + menu = Menu.find(menu_category.menu_id) + from = menu.valid_time_from.strftime("%H:%m:%S") + to = menu.valid_time_to.strftime("%H:%m:%S") + current = Time.now.utc.getlocal.strftime("%H:%m:%S") + + from = from.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b} + to = to.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b} + current = current.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b} + + if current.between?(from, to) + return true + else + return nil + end + end + private # def generate_menu_category_code diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index bebf18cc..ab813ec6 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -8,6 +8,7 @@
    <% @menu.each do |menu| %> + <% if !menu.valid_time.nil? %> <% if menu.menu_category_id.nil? %> <% if @table.get_current_checkout_booking.nil? %> <% if !menu.code.include? "SPL" %> @@ -28,21 +29,10 @@ <% end%> - <% end%> + <% end%> + <% end %> <%end %> - +
  • Products
    • From e3e32a0c10ac469587f80f071d1f1b0e1158819c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 9 Jan 2018 16:40:42 +0630 Subject: [PATCH 04/14] update close cashier for Total food amount precision --- app/pdf/close_cashier_pdf.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index d84b0366..35248b97 100755 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -360,7 +360,7 @@ class CloseCashierPdf < Prawn::Document text "Total #{amount.account_name} Amount :", :size => self.item_font_size, :align => :right end bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do - text "#{amount.total_price.round(2)} ", :size => self.item_font_size, :align => :right + text "#{number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right end end #end total amount by Account From 4146bc4fae880243740d6945cfae4bc7e48df2c2 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 9 Jan 2018 17:22:32 +0630 Subject: [PATCH 05/14] update menu category valid time --- app/models/menu_category.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index 200c4469..1f45b3ff 100755 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -41,10 +41,10 @@ class MenuCategory < ApplicationRecord menu_category = MenuCategory.find(self.id) menu = Menu.find(menu_category.menu_id) - from = menu.valid_time_from.strftime("%H:%m:%S") - to = menu.valid_time_to.strftime("%H:%m:%S") - current = Time.now.utc.getlocal.strftime("%H:%m:%S") - + from = menu.valid_time_from.strftime("%H:%M:%S") + to = menu.valid_time_to.strftime("%H:%M:%S") + current = Time.now.utc.getlocal.strftime("%H:%M:%S") + from = from.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b} to = to.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b} current = current.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b} From 410cacf279662b7238d77d3b6506bda36e1e1e82 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 10 Jan 2018 17:59:20 +0630 Subject: [PATCH 06/14] update limit tablet autorized --- app/controllers/api/authenticate_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/api/authenticate_controller.rb b/app/controllers/api/authenticate_controller.rb index fcd00f1b..8fbfda5b 100755 --- a/app/controllers/api/authenticate_controller.rb +++ b/app/controllers/api/authenticate_controller.rb @@ -7,8 +7,7 @@ class Api::AuthenticateController < Api::ApiController if emp_id && password @employee = Employee.login(emp_id, password) - - if @employee + if @employee && @employee.role == "waiter" render json: JSON.generate({:status => true, :session_token => @employee.token_session, :name => @employee.name, :role => @employee.role}) else render json: JSON.generate({:status => false, :error_message => "Bad Emp_ID or Password."}) From 903dddd8ccd8b243aa257c12566230c611673bdb Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 10 Jan 2018 18:08:28 +0630 Subject: [PATCH 07/14] CB ECR Integration --- .../origami/bank_integration.coffee | 3 + app/assets/javascripts/origami.js | 130 +++++++++++- .../origami/bank_integration.coffee | 3 + .../controllers/origami/bank_integration.scss | 3 + .../stylesheets/origami/bank_integration.scss | 3 + .../origami/bank_integration_controller.rb | 98 +++++++++ app/controllers/origami/jcb_controller.rb | 1 + app/controllers/origami/master_controller.rb | 1 + app/controllers/origami/mpu_controller.rb | 1 + .../origami/payments_controller.rb | 32 ++- app/controllers/origami/shifts_controller.rb | 9 + app/controllers/origami/visa_controller.rb | 1 + app/controllers/origami/void_controller.rb | 2 +- .../origami/bank_integration_helper.rb | 2 + .../origami/bank_integration_helper.rb | 2 + app/models/card_sale_tran.rb | 2 + app/models/card_settle_tran.rb | 2 + app/models/printer/receipt_printer.rb | 4 +- app/models/sale.rb | 10 + app/pdf/receipt_bill_pdf.rb | 29 ++- app/views/origami/jcb/index.html.erb | 52 +++-- app/views/origami/master/index.html.erb | 56 +++-- app/views/origami/mpu/index.html.erb | 59 ++++-- app/views/origami/payments/show.html.erb | 2 +- app/views/origami/shifts/show.html.erb | 196 +++++++++++++++++- app/views/origami/visa/index.html.erb | 51 +++-- config/locales/en.yml | 2 + config/locales/mm.yml | 3 +- config/routes.rb | 4 + ...20180108070325_create_card_settle_trans.rb | 34 +++ .../20180109085256_create_card_sale_trans.rb | 52 +++++ .../bank_integration_controller_spec.rb | 5 + .../bank_integration_controller_spec.rb | 5 + .../origami/bank_integration_helper_spec.rb | 15 ++ .../origami/bank_integration_helper_spec.rb | 15 ++ spec/models/card_sale_tran_spec.rb | 5 + spec/models/card_settle_tran_spec.rb | 5 + 37 files changed, 807 insertions(+), 92 deletions(-) create mode 100644 app/assets/javascripts/app/controllers/origami/bank_integration.coffee create mode 100644 app/assets/javascripts/origami/bank_integration.coffee create mode 100644 app/assets/stylesheets/app/controllers/origami/bank_integration.scss create mode 100644 app/assets/stylesheets/origami/bank_integration.scss create mode 100644 app/controllers/origami/bank_integration_controller.rb create mode 100644 app/helpers/app/controllers/origami/bank_integration_helper.rb create mode 100644 app/helpers/origami/bank_integration_helper.rb create mode 100644 app/models/card_sale_tran.rb create mode 100644 app/models/card_settle_tran.rb create mode 100644 db/migrate/20180108070325_create_card_settle_trans.rb create mode 100644 db/migrate/20180109085256_create_card_sale_trans.rb create mode 100644 spec/controllers/app/controllers/origami/bank_integration_controller_spec.rb create mode 100644 spec/controllers/origami/bank_integration_controller_spec.rb create mode 100644 spec/helpers/app/controllers/origami/bank_integration_helper_spec.rb create mode 100644 spec/helpers/origami/bank_integration_helper_spec.rb create mode 100644 spec/models/card_sale_tran_spec.rb create mode 100644 spec/models/card_settle_tran_spec.rb diff --git a/app/assets/javascripts/app/controllers/origami/bank_integration.coffee b/app/assets/javascripts/app/controllers/origami/bank_integration.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/app/controllers/origami/bank_integration.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 33252efa..5bdbe861 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -194,4 +194,132 @@ function deleteReceiptNoInFirstBillData(receipt_no) { localStorage.setItem("receipt_lists",JSON.stringify(json_data)); } } -/* end check first bill or not funs: */ \ No newline at end of file +/* end check first bill or not funs: */ + +//start CB ECR integration +//set CB com port data +function setCommPorts(comPortLists) { + var sale_id = "<%= @sale_id %>"; + $('#com_port_name').html(""); + var jsonPortLists = $.parseJSON(comPortLists); + // alert(jsonPortLists); + if((jsonPortLists!=undefined && jsonPortLists!='') && (jsonPortLists.length > 0)){ + $.each(jsonPortLists,function(key,value){ + $('#com_port_name').append(""); + }); + } + else{ + swal({ + title: 'Oops', + text: 'Payment device has been disconnected! Please plug it in.', + type: 'error', + html: true, + closeOnConfirm: false, + closeOnCancel: false, + allowOutsideClick: false + }, function () { + window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment"; + }); + } +} + +/** pay with CB bank **/ +function pay_withBank(cmd_type, payment_type, bnk_bill_amount,sale_id,receipt_no) { + $("#loading_wrapper").show(); + var com_port = $("#com_port_name").val(); + reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port); +} + +//add req data to card_sale_trans table +function reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port) { + var jobj = {"cmd_type" : cmd_type, "payment_type" : "CARD", "amt" : bnk_bill_amount, "sale_id" : sale_id, "inv_no" : receipt_no, "com_port" : com_port}; + $.ajax({ + type: "POST", + url: "/origami/bank_integration/sale_trans", + data: {type:"request", data: jobj}, + dataType: "json", + success: function(data) { + if (data.status == "success"){ + card_sale_trans_id = data.card_sale_trans_id; + resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port); + } + } + }); +} + +//add res data to card_sale_trans table +function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port) { + + var resMsg = ""; + var card_payment_type=""; + if($("#loading_wrapper").is(":visible")){ + if(payment_type=="mpu" || payment_type=="visa" || payment_type=="master" || payment_type=="jcb" || payment_type=="unionpay"){ + card_payment_type = "CARD"; + } + else if(payment_type == "alipay"){ + card_payment_type = "EWALLET"; + } + + bnk_bill_amount = parseFloat(bnk_bill_amount); + + resMsg = code2lab.reqBankPayment(cmd_type,card_payment_type,bnk_bill_amount,receipt_no,com_port); + } + + if(resMsg.includes("STATUS")){ + var jobj = $.parseJSON(resMsg); + + $.ajax({ + type: "POST", + url: "/origami/bank_integration/sale_trans", + data: {type:"response", card_sale_trans_id: card_sale_trans_id, data: jobj}, + dataType: "json", + success: function(data) { + if(data.status == "success"){ + resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port); + } + } + }); + }else{ + $("#loading_wrapper").hide(); + swal ( "Oops" , resMsg.toString() , "error" ); + } +} + + +function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port) { + $("#loading_wrapper").hide(); + var jobj = $.parseJSON(resMsg); + if(jobj.STATUS == "Approved"){ + $.ajax({type: "POST", + url: "/origami/payment/"+payment_type, + data: "amount="+ bnk_bill_amount + "&sale_id="+ sale_id, + success:function(result){ + if(result){ + swal({ + title: "Information!", + text: "Payment Successfully", + html: true, + closeOnConfirm: false, + closeOnCancel: false, + allowOutsideClick: false + }, function () { + window.location.href = '/origami/sale/'+ sale_id + "/payment"; + }); + } + } + }); + }else{ + swal({ + title: 'Oops', + text: "Transaction is " + (jobj.STATUS).toLowerCase(), + type: 'error', + html: true, + closeOnConfirm: false, + closeOnCancel: false, + allowOutsideClick: false + }, function () { + window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment/MPU"; + }); + } +} +//end CB ECR integration \ No newline at end of file diff --git a/app/assets/javascripts/origami/bank_integration.coffee b/app/assets/javascripts/origami/bank_integration.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/origami/bank_integration.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/app/controllers/origami/bank_integration.scss b/app/assets/stylesheets/app/controllers/origami/bank_integration.scss new file mode 100644 index 00000000..784f21f7 --- /dev/null +++ b/app/assets/stylesheets/app/controllers/origami/bank_integration.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the app/controllers/origami/BankIntegration controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/origami/bank_integration.scss b/app/assets/stylesheets/origami/bank_integration.scss new file mode 100644 index 00000000..5f839960 --- /dev/null +++ b/app/assets/stylesheets/origami/bank_integration.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the origami/BankIntegration controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/origami/bank_integration_controller.rb b/app/controllers/origami/bank_integration_controller.rb new file mode 100644 index 00000000..a5e5d59f --- /dev/null +++ b/app/controllers/origami/bank_integration_controller.rb @@ -0,0 +1,98 @@ +class Origami::BankIntegrationController < ApplicationController #BaseOrigamiController + + def settle_trans + if(params[:type] == 'request') + card_settle_trans = CardSettleTran.new() + card_settle_trans.req_date = Time.now.strftime("%Y-%m-%d") + card_settle_trans.req_time = Time.now.utc + card_settle_trans.req_cmd = params[:data][:cmd_type] + card_settle_trans.req_type = params[:data][:payment_type] + card_settle_trans.save() + + card_settle_trans_id = card_settle_trans.id + response = {status: 'success', card_settle_trans_id: card_settle_trans_id} + else + card_settle_trans = CardSettleTran.find(params[:card_settle_trans_id]) + card_settle_trans.res_date = Time.now.strftime("%Y-%m-%d") + card_settle_trans.res_time = Time.now.utc + card_settle_trans.res_cmd = params[:data][:CMD] + card_settle_trans.res_type = params[:data][:TYPE] + card_settle_trans.status = params[:data][:STATUS] + card_settle_trans.sale_cnt = params[:data][:SALECNT] + card_settle_trans.sale_amt = params[:data][:SALEAMT].to_f + card_settle_trans.void_cnt = params[:data][:VOIDCNT] + card_settle_trans.void_amt = params[:data][:VOIDAMT].to_f + card_settle_trans.refund_cnt = params[:data][:REFUNDCNT] + card_settle_trans.refund_amt = params[:data][:REFUNDAMT].to_f + card_settle_trans.print_text_part1_type = params[:data][:PRINTTEXTPART1TYPE] + card_settle_trans.print_text_part1_value = params[:data][:PRINTTEXTPART1VALUE] + card_settle_trans.print_text_part2_type = params[:data][:PRINTTEXTPART2TYPE] + card_settle_trans.print_text_part2_value = params[:data][:PRINTTEXTPART2VALUE] + card_settle_trans.print_text_part3_type = params[:data][:PRINTTEXTPART3TYPE] + card_settle_trans.print_text_part3_value = params[:data][:PRINTTEXTPART3VALUE] + card_settle_trans.print_text_part4_type = params[:data][:PRINTTEXTPART4TYPE] + card_settle_trans.print_text_part4_value = params[:data][:PRINTTEXTPART4VALUE] + card_settle_trans.save() + response = {status: 'success'} + end + render json: response + end + + def sale_trans + if(params[:type] == 'request') + card_sale_trans = CardSaleTran.new() + card_sale_trans.sale_id = params[:data][:sale_id] + card_sale_trans.req_date = Time.now.strftime("%Y-%m-%d") + card_sale_trans.req_time = Time.now.utc + card_sale_trans.req_amt = params[:data][:amt] + card_sale_trans.req_inv_no = params[:data][:inv_no] + card_sale_trans.req_cmd = params[:data][:cmd_type] + card_sale_trans.req_type = params[:data][:payment_type] + card_sale_trans.save() + + card_sale_trans_id = card_sale_trans.id + response = {status: 'success', card_sale_trans_id: card_sale_trans_id} + else + card_sale_trans = CardSaleTran.find(params[:card_sale_trans_id]) + card_sale_trans.res_date = params[:data][:DATE] + card_sale_trans.res_time = params[:data][:TIME] + card_sale_trans.res_amt = params[:data][:AMT].to_f / 100 + card_sale_trans.res_inv_no = params[:data][:ECRREF] + card_sale_trans.res_cmd = params[:data][:CMD] + card_sale_trans.res_type = params[:data][:TYPE] + card_sale_trans.status = params[:data][:STATUS] + card_sale_trans.resp = params[:data][:RESP] + card_sale_trans.trace = params[:data][:TRACE] + card_sale_trans.app_code = params[:data][:APPCODE] + card_sale_trans.pan = params[:data][:PAN] + card_sale_trans.exp_date = params[:data][:EXPDATE] + card_sale_trans.tips = params[:data][:TIPS] + card_sale_trans.entry_mode = params[:data][:ENTRYMODE] + card_sale_trans.terminal_id = params[:data][:TERMINALID] + card_sale_trans.merchant_id = params[:data][:MERCHANTID] + card_sale_trans.card_holder = params[:data][:CARDHOLDERNAME] + card_sale_trans.batch_no = params[:data][:BATCHNO] + card_sale_trans.ref_no = params[:data][:REFNUM] + card_sale_trans.app = params[:data][:APP] + card_sale_trans.emv_app_id = params[:data][:AID] + card_sale_trans.emv_cyptrogram = params[:data][:TC] + card_sale_trans.curr_code = params[:data][:CURRCODE] + card_sale_trans.fx_rate = params[:data][:FXRATE] + card_sale_trans.foreign_amt = params[:data][:FOREIGNAMT] + card_sale_trans.dcc_msg = params[:data][:DCCMSG] + card_sale_trans.tender = params[:data][:TENDER] + card_sale_trans.print_text_part1_type = params[:data][:PRINTTEXTPART1TYPE] + card_sale_trans.print_text_part1_value = params[:data][:PRINTTEXTPART1VALUE] + card_sale_trans.print_text_part2_type = params[:data][:PRINTTEXTPART2TYPE] + card_sale_trans.print_text_part2_value = params[:data][:PRINTTEXTPART2VALUE] + card_sale_trans.print_text_part3_type = params[:data][:PRINTTEXTPART3TYPE] + card_sale_trans.print_text_part3_value = params[:data][:PRINTTEXTPART3VALUE] + card_sale_trans.print_text_part4_type = params[:data][:PRINTTEXTPART4TYPE] + card_sale_trans.print_text_part4_value = params[:data][:PRINTTEXTPART4VALUE] + card_sale_trans.save() + + response = {status: 'success'} + end + render json: response + end +end diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb index a3b93efd..be4cc94c 100755 --- a/app/controllers/origami/jcb_controller.rb +++ b/app/controllers/origami/jcb_controller.rb @@ -29,6 +29,7 @@ class Origami::JcbController < BaseOrigamiController @member_discount = MembershipSetting.find_by_discount(1) @sub_total = sale_data.total_amount @membership_id = sale_data.customer.membership_id + @receipt_no = sale_data.receipt_no end def create diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb index 8eb2e02b..068095ca 100755 --- a/app/controllers/origami/master_controller.rb +++ b/app/controllers/origami/master_controller.rb @@ -28,6 +28,7 @@ class Origami::MasterController < BaseOrigamiController @member_discount = MembershipSetting.find_by_discount(1) @sub_total = sale_data.total_amount @membership_id = sale_data.customer.membership_id + @receipt_no = sale_data.receipt_no end def create diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb index 6bd0778f..d1cb3c81 100755 --- a/app/controllers/origami/mpu_controller.rb +++ b/app/controllers/origami/mpu_controller.rb @@ -28,6 +28,7 @@ class Origami::MpuController < BaseOrigamiController @member_discount = MembershipSetting.find_by_discount(1) @sub_total = sale_data.total_amount @membership_id = sale_data.customer.membership_id + @receipt_no = sale_data.receipt_no end def create diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 0bc77fc3..88577ac4 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -61,7 +61,7 @@ class Origami::PaymentsController < BaseOrigamiController printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance) + printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance,nil) end def create @@ -119,6 +119,18 @@ class Origami::PaymentsController < BaseOrigamiController current_balance = SaleAudit.paymal_search(sale_id) end + #for card sale data + card_data = Array.new + card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id) + if !card_sale_trans_ref_no.nil? + card_res_date = card_sale_trans_ref_no.res_date.strftime("%Y-%m-%d").to_s + card_res_time = card_sale_trans_ref_no.res_time.strftime("%H:%M").to_s + card_no = card_sale_trans_ref_no.pan.last(4) + card_no = card_no.rjust(19,"**** **** **** ") + card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => card_sale_trans_ref_no.batch_no, 'trace' => card_sale_trans_ref_no.trace, 'pan' => card_no, 'app' => card_sale_trans_ref_no.app, 'tid' => card_sale_trans_ref_no.terminal_id, 'app_code' => card_sale_trans_ref_no.app_code, 'ref_no' => card_sale_trans_ref_no.ref_no, 'mid' => card_sale_trans_ref_no.merchant_id}) + end + puts "card_data" + puts card_data.to_json # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) # Calculate Food and Beverage Total @@ -126,7 +138,7 @@ class Origami::PaymentsController < BaseOrigamiController discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance) + printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data) end end @@ -240,6 +252,18 @@ class Origami::PaymentsController < BaseOrigamiController rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) current_balance = SaleAudit.paymal_search(sale_id) end + + #for card sale data + card_data = Array.new + card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id) + if !card_sale_trans_ref_no.nil? + card_res_date = card_sale_trans_ref_no.res_date.strftime("%Y-%m-%d").to_s + card_res_time = card_sale_trans_ref_no.res_time.strftime("%H:%M").to_s + card_no = card_sale_trans_ref_no.pan.last(4) + card_no = card_no.rjust(19,"**** **** **** ") + card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => card_sale_trans_ref_no.batch_no, 'trace' => card_sale_trans_ref_no.trace, 'pan' => card_no, 'app' => card_sale_trans_ref_no.app, 'tid' => card_sale_trans_ref_no.terminal_id, 'app_code' => card_sale_trans_ref_no.app_code, 'ref_no' => card_sale_trans_ref_no.ref_no, 'mid' => card_sale_trans_ref_no.merchant_id}) + end + # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) @@ -248,7 +272,7 @@ class Origami::PaymentsController < BaseOrigamiController discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print",current_balance) + printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print",current_balance,card_data) end def foc @@ -298,7 +322,7 @@ class Origami::PaymentsController < BaseOrigamiController discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC",nil) + printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC",nil,nil) end end diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb index 851be7e5..1c75d3bd 100755 --- a/app/controllers/origami/shifts_controller.rb +++ b/app/controllers/origami/shifts_controller.rb @@ -45,6 +45,15 @@ class Origami::ShiftsController < BaseOrigamiController cashier_terminal.is_currently_login = 0 cashier_terminal.save + #add shift_sale_id to card_settle_trans + card_settle_trans = CardSettleTran.select('id').where(['shift_sale_id IS NULL and status IS NOT NULL']) + + card_settle_trans.each do |data| + card_sett_trans = CardSettleTran.find(data.id) + card_sett_trans.shift_sale_id = @shift.id + card_sett_trans.save() + end + unique_code = "CloseCashierPdf" shop_details = Shop.find(1) diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb index 3e2e56a3..a664e327 100755 --- a/app/controllers/origami/visa_controller.rb +++ b/app/controllers/origami/visa_controller.rb @@ -27,6 +27,7 @@ class Origami::VisaController < BaseOrigamiController @member_discount = MembershipSetting.find_by_discount(1) @sub_total = sale_data.total_amount @membership_id = sale_data.customer.membership_id + @receipt_no = sale_data.receipt_no end def create diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index 0ac9df9f..fe2ddca8 100755 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -95,7 +95,7 @@ class Origami::VoidController < BaseOrigamiController discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance) + printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil) #end print diff --git a/app/helpers/app/controllers/origami/bank_integration_helper.rb b/app/helpers/app/controllers/origami/bank_integration_helper.rb new file mode 100644 index 00000000..845cf827 --- /dev/null +++ b/app/helpers/app/controllers/origami/bank_integration_helper.rb @@ -0,0 +1,2 @@ +module App::Controllers::Origami::BankIntegrationHelper +end diff --git a/app/helpers/origami/bank_integration_helper.rb b/app/helpers/origami/bank_integration_helper.rb new file mode 100644 index 00000000..dd301d75 --- /dev/null +++ b/app/helpers/origami/bank_integration_helper.rb @@ -0,0 +1,2 @@ +module Origami::BankIntegrationHelper +end diff --git a/app/models/card_sale_tran.rb b/app/models/card_sale_tran.rb new file mode 100644 index 00000000..7c496b56 --- /dev/null +++ b/app/models/card_sale_tran.rb @@ -0,0 +1,2 @@ +class CardSaleTran < ApplicationRecord +end diff --git a/app/models/card_settle_tran.rb b/app/models/card_settle_tran.rb new file mode 100644 index 00000000..29670946 --- /dev/null +++ b/app/models/card_settle_tran.rb @@ -0,0 +1,2 @@ +class CardSettleTran < ApplicationRecord +end diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index adcb187e..49502b3f 100755 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -65,12 +65,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker end #Bill Receipt Print - def print_receipt_bill(printer_settings,cashier_terminal,sale_items,sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount=nil,shop_details, printed_status,balance) + def print_receipt_bill(printer_settings,cashier_terminal,sale_items,sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount=nil,shop_details, printed_status,balance,card_data) #Use CUPS service #Generate PDF #Print - pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance) + pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data) # print as print copies in printer setting count = printer_settings.print_copies diff --git a/app/models/sale.rb b/app/models/sale.rb index 69aa930a..35338665 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1125,6 +1125,16 @@ end .sum("a.qty") end + #card sale trans data + def self.getCardSaleTrans(sale_id) + query = Sale.select("cst.res_date,cst.res_time,cst.trace,cst.pan,cst.batch_no,cst.exp_date,cst.app,cst.res_type,cst.ref_no,cst.terminal_id,cst.merchant_id,cst.app_code") + .joins("JOIN card_sale_trans as cst on cst.sale_id = sales.sale_id") + .where("sales.sale_id=?",sale_id) + .first() + + return query + end + private def generate_custom_id diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index ae02b22d..ab33d6e4 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -1,7 +1,7 @@ class ReceiptBillPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width - def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance) + def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height self.margin = 0 @@ -65,6 +65,12 @@ class ReceiptBillPdf < Prawn::Document customer(customer_name) + #start card sale trans data + if card_data != nil + card_sale_data(card_data) + end + #end card sale trans data + if discount_price_by_accounts.length > 0 && shop_details.show_account_info discount_account(discount_price_by_accounts,printer_settings.precision,delimiter) end @@ -503,5 +509,26 @@ class ReceiptBillPdf < Prawn::Document move_down 5 end + + #start card sale trans data + def card_sale_data(card_data) + move_down 5 + stroke_horizontal_rule + move_down 5 + + y_position = cursor + if !card_data[0].nil? + if card_data[0]['app'] == 'CUP' + card_data[0]['app'] = 'UNIONPAY' + elsif card_data[0]['app'] == 'MASTERCARD' + card_data[0]['app'] = 'MASTER' + end + text "DATE/TIME: #{card_data[0]['res_date']} #{card_data[0]['res_time']} ", :size => @item_font_size, :align => :left + text "BATCH NUM: #{card_data[0]['batch_no']} TRACE#: #{card_data[0]['trace']}",:size => @item_font_size, :align => :left + text "RREF NUM: #{card_data[0]['ref_no']} APPR CODE: #{card_data[0]['app_code']} ",:size => @item_font_size, :align => :left + text "TID: #{card_data[0]['tid']} ",:size => @item_font_size, :align => :left + text "#{card_data[0]['app']} #{card_data[0]['pan']} ",:size => @item_font_size, :align => :left + end + end end diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb index c7cc79f9..1d855ad2 100755 --- a/app/views/origami/jcb/index.html.erb +++ b/app/views/origami/jcb/index.html.erb @@ -1,4 +1,7 @@
    + + + <% if @unionpaycount != 0.0 %> +
    +
    +
    UNIONPAY
    +
    <%= @unionpaycount %>
    +
    + <% else %> + + <% end %>
    Balance
    <%= @sale_data.grand_total rescue 0 %>
    @@ -303,7 +317,7 @@ }else if(payment_type=="Credit"){ $("#card_payment").hide(); $("#others_payment").hide(); - }else if(payment_type=="MPU"||payment_type=="VISA"||payment_type=="JCB"||payment_type=="Master"){ + }else if(payment_type=="MPU"||payment_type=="VISA"||payment_type=="JCB"||payment_type=="Master" || payment_type=="UNIONPAY"){ $("#credit_payment").hide(); } /* end check first bill or not*/ @@ -361,17 +375,18 @@ update_balance(); break; case 'nett': - var credit1 = $('#credit').text(); - var card1 = $('#others').text(); - var paypar1 = $('#ppamount').text(); - var visa1 = $('#visacount').text(); - var jcb1 = $('#jcbcount').text(); - var master1 = $('#mastercount').text(); - var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1); - var total = $('#amount_due').text(); - var amt = parseFloat(total) - parseFloat(othertotal); - $('#cash').text(parseFloat(amt).toFixed(2)); - update_balance(); + var credit1 = $('#credit').text(); + var card1 = $('#others').text(); + var paypar1 = $('#ppamount').text(); + var visa1 = $('#visacount').text(); + var jcb1 = $('#jcbcount').text(); + var master1 = $('#mastercount').text(); + var unionpay1 = $('#unionpaycount').text(); + var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1); + var total = $('#amount_due').text(); + var amt = parseFloat(total) - parseFloat(othertotal); + $('#cash').text(parseFloat(amt).toFixed(2)); + update_balance(); break; } event.handled = true; @@ -412,6 +427,9 @@ else if(payment_type == "Master" && $('#mastercount').text()==0 && sub_total != 0.0){ swal("Opps","Please Pay with Master Payment","warning"); } + else if(payment_type == "UNIONPAY" && $('#unionpaycount').text()==0 && sub_total != 0.0){ + swal("Opps","Please Pay with UNIONPAY Payment","warning"); + } else if(payment_type == "Credit" && $('#credit').text()==0 && sub_total != 0.0){ swal("Opps","Please Pay with Credit Payment","warning"); }else{ @@ -515,8 +533,9 @@ var visa = $('#visacount').text(); var jcb = $('#jcbcount').text(); var master = $('#mastercount').text(); + var unionpay = $('#unionpaycount').text(); var amount_due = $('#amount_due').text(); - var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay) var result = parseFloat(amount_due) - parseFloat(total); $('#balance').text(result.toFixed(2)); } diff --git a/app/views/origami/unionpay/create.json.jbuilder b/app/views/origami/unionpay/create.json.jbuilder new file mode 100755 index 00000000..9767a7d8 --- /dev/null +++ b/app/views/origami/unionpay/create.json.jbuilder @@ -0,0 +1,5 @@ +if(@status) + json.status @status +else + json.status false +end diff --git a/app/views/origami/unionpay/index.html.erb b/app/views/origami/unionpay/index.html.erb new file mode 100755 index 00000000..37476be9 --- /dev/null +++ b/app/views/origami/unionpay/index.html.erb @@ -0,0 +1,247 @@ +
    + + +
    UNIONPAY Payment
    +
    +
    + + + +
    +
    + <% if @bank_integration == '1' %> +
    +
    + + +
    +
    +
    + <% end %> + +
    +
    + + <%@can_unionpay = @can_unionpay +@rounding_adj%> + +
    +
    +
    + <% if @unionpaycount != 0 %> +
    +
    + + +
    +
    +
    + <% end %> +
    +
    + + +
    +
    +
    +
    +
    + +
    0.0
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    1
    +
    2
    +
    3
    +
    +
    +
    4
    +
    5
    +
    6
    +
    +
    +
    7
    +
    8
    +
    9
    +
    +
    +
    0
    +
    .
    +
    00
    +
    +
    +
    Nett
    +
    Del
    +
    Clr
    +
    +
    +
    +
    +
    1000
    +
    3000
    +
    +
    +
    5000
    +
    10000
    +
    +
    +
    Pay
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + diff --git a/config/routes.rb b/config/routes.rb index 5f57f339..a31dcb5c 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -156,6 +156,7 @@ scope "(:locale)", locale: /en|mm/ do post 'payment/jcb' => "jcb#create" post 'payment/master' => "master#create" post 'payment/visa' => "visa#create" + post 'payment/unionpay' => "unionpay#create" post 'payment/paypar' => 'paypar_payments#create' post 'payment/credit' => 'credit_payments#create' post 'payment/voucher' => 'voucher_payments#create' @@ -166,6 +167,7 @@ scope "(:locale)", locale: /en|mm/ do get 'sale/:sale_id/payment/others_payment/VISA' => "visa#index" get 'sale/:sale_id/payment/others_payment/Master' => "master#index" get 'sale/:sale_id/payment/others_payment/JCB' => "jcb#index" + get 'sale/:sale_id/payment/others_payment/UNIONPAY' => "unionpay#index" get 'sale/:sale_id/payment/others_payment/Redeem' => "redeem_payments#index" get 'sale/:sale_id/payment/others_payment/Voucher' => "voucher#index" diff --git a/spec/controllers/origami/unionpay_controller_spec.rb b/spec/controllers/origami/unionpay_controller_spec.rb new file mode 100644 index 00000000..059b5577 --- /dev/null +++ b/spec/controllers/origami/unionpay_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Origami::UnionpayController, type: :controller do + +end diff --git a/spec/helpers/origami/unionpay_helper_spec.rb b/spec/helpers/origami/unionpay_helper_spec.rb new file mode 100644 index 00000000..5fce324c --- /dev/null +++ b/spec/helpers/origami/unionpay_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Origami::UnionpayHelper. For example: +# +# describe Origami::UnionpayHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Origami::UnionpayHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end From 9f7ce6d4953c08cdc9f67bf4ee742448c093a7ab Mon Sep 17 00:00:00 2001 From: phyusin Date: Thu, 11 Jan 2018 17:36:40 +0630 Subject: [PATCH 12/14] check payment type --- app/assets/javascripts/origami.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 64ff62ab..712ce8f7 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -309,6 +309,9 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun } }); }else{ + if(payment_type!="master"){ + payment_type = payment_type.toUpperCase(); + } swal({ title: 'Oops', text: "Transaction is " + (jobj.STATUS).toLowerCase(), @@ -318,7 +321,7 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun closeOnCancel: false, allowOutsideClick: false }, function () { - window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment/"+payment_type.toUpperCase(); + window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment/"+payment_type; }); } } From 63991886964d8430a4a06b032b477808ffcf7e24 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 12 Jan 2018 09:23:41 +0630 Subject: [PATCH 13/14] update customer and ability --- app/models/ability.rb | 10 +++++----- app/models/customer.rb | 8 ++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/models/ability.rb b/app/models/ability.rb index 02b2618f..e6cdf9c3 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -104,11 +104,11 @@ class Ability can :index, :other_charge can :create, :other_charge - can :index, :discount - can :create, :discount - can :remove_discount_items, :discount - can :remove_all_discount, :discount - can :member_discount, :discount + # can :index, :discount + # can :create, :discount + # can :remove_discount_items, :discount + # can :remove_all_discount, :discount + # can :member_discount, :discount can :first_bill, :payment can :show, :payment diff --git a/app/models/customer.rb b/app/models/customer.rb index c228e3e6..949093ea 100755 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -146,9 +146,10 @@ class Customer < ApplicationRecord if sale.customer.membership_id response = self.rebat(Sale.find(sale.sale_id)) #record an payment in sale-audit + if !response.nil? remark = "UPdate Rebate Response - #{response} for Customer #{sale.customer_id} Sale Id [#{sale.sale_id}]| pay amount -> #{sale.amount_received} " sale_audit = SaleAudit.record_paymal(sale.sale_id, remark, 1) - + end if response["status"] == true status = sale.update_attributes(rebate_status: "true") end @@ -159,8 +160,9 @@ class Customer < ApplicationRecord def self.rebat(sObj) rebate_prices,campaign_method = SaleItem.calculate_rebate_by_account(sObj.sale_items) generic_customer_id = sObj.customer.membership_id - if generic_customer_id.present? + + if generic_customer_id.present? paypar = sObj.sale_payments payparcost = 0 credit = 0 @@ -171,6 +173,7 @@ class Customer < ApplicationRecord end if pp.payment_method == "creditnote" credit = 1 + sObj.update_attributes(rebate_status: nil) end end # overall_dis = SaleItem.get_overall_discount(sObj.id) @@ -287,6 +290,7 @@ class Customer < ApplicationRecord end end else + puts "no Response" response = { "status": "no_member", "message": "Not membership"} end end From cc710a992f6571593be1c4db12afee06620ba141 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 12 Jan 2018 14:33:30 +0630 Subject: [PATCH 14/14] update other multiple payments --- app/models/ability.rb | 1 + app/views/origami/home/show.html.erb | 10 ++++++--- .../origami/others_payments/index.html.erb | 11 +++++----- app/views/origami/payments/show.html.erb | 22 +++++++++++-------- app/views/origami/rooms/show.html.erb | 2 +- 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/app/models/ability.rb b/app/models/ability.rb index e6cdf9c3..560e0192 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -96,6 +96,7 @@ class Ability can :read, Order can :update, Order can :menage, Booking + can :manage, OrderQueueStation can :read, Sale can :update, Sale can :get_customer, Customer diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 29903480..f162be5d 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -390,7 +390,7 @@ <% if @status_sale == 'sale' %> - + @@ -419,7 +419,7 @@
    - <% @payment_methods.each do |pay| %> @@ -552,6 +552,8 @@ // Discount for Payment $('#discount').click(function () { + + if ($(this).attr('active')=== "true") { var sale = $('#sale_id').val(); if (sale != "") { var sale_id = sale @@ -565,7 +567,9 @@ else { swal ( "Oops" , "Please select an table!" , "warning" ); } - + }else{ + swal("Opps","You are not authorized for void","warning") + } return false; }); }); diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index c0185182..4e07274a 100755 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -34,11 +34,12 @@ } payment_type = checkReceiptNoInFirstBillData(receipt_no,"payment"); - if(payment_type) { - $(".others-payment").hide(); - $("."+payment_type).show(); - } - + if(payment_type) { + $(".others-payment").hide(); + $(payment_type).each(function(i){ + $("."+payment_type[i]).show(); + }); + } /* end check first bill or not*/ $('.others-payment').on('click',function(){ diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index dfff29cc..5e99509f 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -310,16 +310,20 @@ receipt_no = ($("#receipt_no").html()).trim(); } - payment_type = checkReceiptNoInFirstBillData(receipt_no,"payment") - if(payment_type=="Cash"){ + payment_type = checkReceiptNoInFirstBillData(receipt_no,"payment") + // console.log(jQuery.inArray("Credit", payment_type)) + // console.log(payment_type) + if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){ + $("#credit_payment").hide(); + } else{ + $("#credit_payment").show(); + } + + if(parseInt(jQuery.inArray("MPU", payment_type)) > 0 || parseInt(jQuery.inArray("VISA", payment_type)) > 0 || parseInt(jQuery.inArray("JCB", payment_type)) > 0 || parseInt(jQuery.inArray("Master", payment_type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) > 0 || parseInt(jQuery.inArray("Redeem", payment_type)) > 0){ + $("#card_payment").show(); + } else{ $("#card_payment").hide(); - $("#credit_payment").hide(); - }else if(payment_type=="Credit"){ - $("#card_payment").hide(); - $("#others_payment").hide(); - }else if(payment_type=="MPU"||payment_type=="VISA"||payment_type=="JCB"||payment_type=="Master" || payment_type=="UNIONPAY"){ - $("#credit_payment").hide(); - } + } /* end check first bill or not*/ var dining_id = "<%= @sale_data.bookings[0].dining_facility_id %>"; diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 3b7a5144..e01b2829 100755 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -393,7 +393,7 @@
    - <% @payment_methods.each do |pay| %>