diff --git a/README.md b/README.md index 186c7336..5feb13ee 100755 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ Osaka => BITP Auth Token => pZBHXEFbGNj/G => New => V3 + iua0SjUHzRaQw => rj0MJ0XI5GsKZehE => Old => V2 => code2lab => Old diff --git a/app/assets/javascripts/channels/order_reservation.js b/app/assets/javascripts/channels/order_reservation.js index 7a6bb594..fc8662b8 100644 --- a/app/assets/javascripts/channels/order_reservation.js +++ b/app/assets/javascripts/channels/order_reservation.js @@ -28,6 +28,13 @@ App.order_reservation = App.cable.subscriptions.create('OrderReservationChannel' delivery_type = "DIRECT DELIVERY"; } + var payment_type = ""; + if(value.payment_type=="cash_on_delivery"){ + payment_type = "COD"; + }else if(value.payment_type =="dinga"){ + payment_type = "DINGA"; + } + if(key==0){ var order_id = value.order_reservation_id; var sr_no = rowCount; @@ -49,11 +56,13 @@ App.order_reservation = App.cable.subscriptions.create('OrderReservationChannel' +'' +''+created_at +'' - +''+time + +''+time +'' +''+value.grand_total +'' - +'' + +''+payment_type + +'' + +'' +''+ delivery_type +'' +'' +' '; diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index 71e6b25a..f0d4aa4d 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -7,6 +7,7 @@ $(function() { $('#cancel').hide(); $(".tbl_customer").hide(); $(".order_close_cashier").hide(); + $(".order_payment_type").hide(); $(function() { $('.first-1').click(); }); @@ -253,6 +254,8 @@ function refreshDetailData(){ $('#grand_total').text("0.00"); $(".tbl_customer").hide(); $(".order_close_cashier").hide(); + $(".order_payment_type").hide(); + $("#payment_type").text(""); } //show order list @@ -355,6 +358,13 @@ function show_order_detail(url,sr_no){ $('#phone').text(data.phone); $('#address').text(address); + $(".order_payment_type").show(); + if(data.payment_type == "cash_on_delivery"){ + $("#payment_type").text("COD"); + }else if(data.payment_type == "dinga"){ + $("#payment_type").text("DINGA"); + } + $('#ref_no').text(data.transaction_ref); $('#callback_url').text(data.callback_url); $('#order_id').text(data.order_reservation_id); diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index b9b2c5d4..b59aeb78 100755 --- a/app/controllers/origami/sale_edit_controller.rb +++ b/app/controllers/origami/sale_edit_controller.rb @@ -20,6 +20,7 @@ class Origami::SaleEditController < BaseOrigamiController saleitemId = params[:sale_item_id] remark = params[:remark] access_code = params[:access_code] + order_source = params[:type] saleitemObj = SaleItem.find(saleitemId) saleitemObj.status = 'void' saleitemObj.remark = remark @@ -58,7 +59,7 @@ class Origami::SaleEditController < BaseOrigamiController remark = "Void Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}" sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"SALEITEMVOID" ) - saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount) + saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order_source) ProductCommission.create_product_commission(@newsaleitem, saleitemObj) end @@ -66,6 +67,7 @@ class Origami::SaleEditController < BaseOrigamiController saleitemId = params[:sale_item_id] remark = params[:remark] access_code = params[:access_code] + order_source = params[:type] saleitemObj = SaleItem.find(saleitemId) saleitemObj.status = 'foc' saleitemObj.remark = remark @@ -94,7 +96,7 @@ class Origami::SaleEditController < BaseOrigamiController remark = "FOC Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}Receipt No #{saleObj.receipt_no}" sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"SALEITEMFOC" ) - saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order.source) + saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order_source) ProductCommission.create_product_commission(@newsaleitem, saleitemObj) end @@ -123,6 +125,7 @@ class Origami::SaleEditController < BaseOrigamiController update_qty = params[:update_qty] update_price = params[:update_price] access_code = params[:access_code] + order_source = params[:type] saleitemObj = SaleItem.find(saleitemId) sale = Sale.find(saleitemObj.sale_id) @@ -159,7 +162,7 @@ class Origami::SaleEditController < BaseOrigamiController end end - saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order.source) + saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order_source) ProductCommission.edit_product_commission(saleitemObj) end @@ -168,6 +171,7 @@ class Origami::SaleEditController < BaseOrigamiController def item_void_cancel saleitemId = params[:sale_item_id] access_code = params[:access_code] + order_source = params[:type] saleitemObj = SaleItem.find(saleitemId) both = SaleItem.where('product_code=?', saleitemObj.product_code) both.each do |item| @@ -191,7 +195,7 @@ class Origami::SaleEditController < BaseOrigamiController remark = "Cancle Void Sale Item ID #{saleitemObj.sale_item_id} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}|Receipt No #{saleObj.receipt_no}" sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"ITEMCANCELVOID" ) - saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount, order.source) + saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount, order_source) ProductCommission.remove_product_commission(saleitemObj) end diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index a8f1f4ec..ecad6da5 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -173,7 +173,6 @@ class OrderReservation < ApplicationRecord end def self.send_status_to_ordering(url,ref_no,status,waiting_time=nil,min_type=nil,reason=nil) - puts "send status to ordering" base_url = 'https://api.doemal.com' token = '3T-tnlYtFJ-5Z1vY6XQqxQ' order_reservation = Lookup.collection_of("order_reservation") @@ -400,7 +399,7 @@ class OrderReservation < ApplicationRecord if filter.blank? keyword = '' else - keyword = "status LIKE '%#{filter}%'" + keyword = "status LIKE '%#{filter}%' OR payment_type LIKE '%#{filter}%'" end if from.present? && to.present? @@ -411,7 +410,7 @@ class OrderReservation < ApplicationRecord else select("order_reservations.*, deliveries.provider, deliveries.delivery_fee") .joins(" JOIN deliveries on deliveries.order_reservation_id = order_reservations.order_reservation_id") - .where("status LIKE '%#{filter}%'") + .where("status LIKE '%#{filter}%' OR payment_type LIKE '%#{filter}%'") end end diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index 26ce197a..5a904000 100644 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -81,7 +81,7 @@ <% @response["data"].each do |transaction| %> <%= transaction["date"]%> - <% if transaction["status"] == 'Rebate' || transaction["status"] == 'Discount'%> + <% if transaction["status"] == 'Rebate' || transaction["status"] == 'Discount' || transaction["status"] == 'Reversal'%> <%= transaction["deposit"] %> <% else %> (<%= transaction["withdraw"] %>) @@ -95,7 +95,11 @@ Balance - <%= @response["data"].first["balance"] %> + <% if @response["data"].first["status"] == 'Reversal'%> + <%= @response["data"].first["balance"] + @response["data"][1]["balance"]%> + <%else%> + <%= @response["data"].first["balance"] %> + <%end%> <%end%> diff --git a/app/views/origami/junction_pay/index.html.erb b/app/views/origami/junction_pay/index.html.erb index 76be5380..05b770c9 100755 --- a/app/views/origami/junction_pay/index.html.erb +++ b/app/views/origami/junction_pay/index.html.erb @@ -205,7 +205,8 @@ $('#junction_pay').on('click',function(){ var com_port = '/dev/' + $("#com_port_name").val(); var is_rebate=false; //alert(cashier_id + amount + com_port); - code2lab.reqJunctionPay(true, cashier_id, parseFloat(amount), receipt_no, com_port); + code2lab.reqJunctionPay(true, cashier_id, parseFloat(amount), receipt_no, com_port); + resJunctionPayUpdate = function(totalBillAmount , finalBillAmt,giftCardAmount, voucherAmount,voucherNumber,receiptNumber){ $("#loading_wrapper").hide(); @@ -241,10 +242,25 @@ $('#junction_pay').on('click',function(){ }; resJunctionPay = function(memberno,transactionNo,finalBillingAmt){ - if(memberno != ''){ is_rebate = true; } + if(memberno != ''){ is_rebate = true; } }; - + resError = function(err_message){ + if(err_message != "ERROR: Verification cancelled"){ + $("#loading_wrapper").hide(); + swal({ + title: "Oops!", + text: err_message, + type: "error", + html: true, + closeOnConfirm: false, + closeOnCancel: false, + allowOutsideClick: false + }, function () { + window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type+"/payment/others_payment"; + }); + } + }; // $("#loading_wrapper").hide(); // $.ajax({type: "POST", // url: "/origami/payment/"+payment_type, diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb index 2192fbfd..7327eb01 100644 --- a/app/views/origami/order_reservation/index.html.erb +++ b/app/views/origami/order_reservation/index.html.erb @@ -79,13 +79,20 @@ <%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %> - - <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> + + <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> <%=order.grand_total%> - + + <% if order.payment_type == 'cash_on_delivery' %> + COD + <% elsif order.payment_type == 'dinga' %> + DINGA + <% end %> + + <% if order.delivery.delivery_type == 'service' %> DELIVERY @@ -122,13 +129,20 @@ <%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %> - - <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> + + <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> - <%=order.grand_total%> + <%=order.grand_total%> - + + <% if order.payment_type == 'cash_on_delivery' %> + COD + <% elsif order.payment_type == 'dinga' %> + DINGA + <% end %> + + <% if order.delivery.delivery_type == 'service' %> DELIVERY @@ -164,13 +178,20 @@ <%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %> - - <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> + + <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> <%=order.grand_total%> - + + <% if order.payment_type == 'cash_on_delivery' %> + COD + <% elsif order.payment_type == 'dinga' %> + DINGA + <% end %> + + <% if order.delivery.delivery_type == 'service' %> DELIVERY @@ -206,13 +227,20 @@ <%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %> - - <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> + + <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> <%=order.grand_total%> - + + <% if order.payment_type == 'cash_on_delivery' %> + COD + <% elsif order.payment_type == 'dinga' %> + DINGA + <% end %> + + <% if order.delivery.delivery_type == 'service' %> DELIVERY @@ -248,13 +276,20 @@ <%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %> - - <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> + + <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> <%=order.grand_total%> - + + <% if order.payment_type == 'cash_on_delivery' %> + COD + <% elsif order.payment_type == 'dinga' %> + DINGA + <% end %> + + <% if order.delivery.delivery_type == 'service' %> DELIVERY @@ -353,7 +388,7 @@ - GRAND TOTAL + GRAND TOTAL 0.00 @@ -398,10 +433,14 @@ - +
+ REF.
 + PAYMENT
+ +
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index e7332a2f..09fa7b94 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -626,6 +626,10 @@