git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update sale audit all process in origami

Browse Source
This commit is contained in:
Aung Myo
2018-07-12 13:10:11 +06:30
parent b1a4f19b1c
commit 7945da99ed
18 changed files with 63 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/credit_payments_controller.rb
View File

@@ -43,7 +43,7 @@ class Origami::CreditPaymentsController < BaseOrigamiController
saleObj = Sale.find(sale_id) saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, @user, cash, "creditnote") @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "creditnote")
end end
end end

2
app/controllers/origami/dinga_controller.rb
View File

@@ -86,7 +86,7 @@ def create
# saleObj = Sale.find(sale_id) # saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new sale_payment = SalePayment.new
status, @sale,@membership_data = sale_payment.process_payment(saleObj, @user, cash, "dinga",account_no) status, @sale,@membership_data = sale_payment.process_payment(saleObj, current_user.name, cash, "dinga",account_no)
if status == true && @membership_data["status"] == true if status == true && @membership_data["status"] == true
@out = true, "Success!" @out = true, "Success!"

16
app/controllers/origami/discounts_controller.rb
View File

@@ -70,24 +70,24 @@ class Origami::DiscountsController < BaseOrigamiController
sale_item.price = di["price"] sale_item.price = di["price"]
sale_item.save sale_item.save
action_by = current_user.id action_by = current_user.name
remark = "Discount Item Name ->#{sale_item.product_name}-Product Code ->#{sale_item.product_code} | Price [#{sale_item.price}] | Receipt No #{sale.receipt_no} " remark = "Discount Item Name ->#{sale_item.product_name}-Product Code ->#{sale_item.product_code} | Price [#{sale_item.price}] | Receipt No #{sale.receipt_no} "
sale_audit = SaleAudit.record_audit_discount(sale_item.sale_id,sale.cashier_id, action_by,remark,"ITEMDISCOUNT" ) sale_audit = SaleAudit.record_audit_discount(sale_item.sale_id,sale.cashier_name, action_by,remark,"ITEMDISCOUNT" )
end end
end end
# Re-calc All Amount in Sale # Re-calc All Amount in Sale
if overall_discount.to_f > 0 if overall_discount.to_f > 0
action_by = current_user.id action_by = current_user.name
if table.nil? if table.nil?
remark = "Discount Overall Price [#{overall_discount}]| Receipt No #{sale.receipt_no} | Table- no Table " remark = "Discount Overall Price [#{overall_discount}]| Receipt No #{sale.receipt_no} | Table- no Table "
else else
remark = "Discount Overall Price [#{overall_discount}]| Receipt No #{sale.receipt_no} | Table- #{table.name} " remark = "Discount Overall Price [#{overall_discount}]| Receipt No #{sale.receipt_no} | Table- #{table.name} "
end end
sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_id, action_by,remark,"OVERALLDISCOUNT" ) sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_name, action_by,remark,"OVERALLDISCOUNT" )
end end
sale.compute_by_sale_items(sale_id, sale.sale_items, overall_discount.to_f, nil,order_source) sale.compute_by_sale_items(sale_id, sale.sale_items, overall_discount.to_f, nil,order_source)
if !table.nil? if !table.nil?
@@ -129,13 +129,13 @@ class Origami::DiscountsController < BaseOrigamiController
sale_item = SaleItem.find(di["id"]) sale_item = SaleItem.find(di["id"])
sale.total_amount = (sale.total_amount + sale_item.price.abs) sale.total_amount = (sale.total_amount + sale_item.price.abs)
action_by = current_user.id action_by = current_user.name
if table.nil? if table.nil?
remark = "Remove Item Discount Item Name ->#{sale_item.product_name}-Product Code ->#{sale_item.product_code} | Price [#{sale_item.price}] | Receipt No #{sale.receipt_no} | Table- No Table " remark = "Remove Item Discount Item Name ->#{sale_item.product_name}-Product Code ->#{sale_item.product_code} | Price [#{sale_item.price}] | Receipt No #{sale.receipt_no} | Table- No Table "
else else
remark = "Remove Item Discount Item Name ->#{sale_item.product_name}-Product Code ->#{sale_item.product_code} | Price [#{sale_item.price}] | Receipt No #{sale.receipt_no} | Table- #{table.name} " remark = "Remove Item Discount Item Name ->#{sale_item.product_name}-Product Code ->#{sale_item.product_code} | Price [#{sale_item.price}] | Receipt No #{sale.receipt_no} | Table- #{table.name} "
end end
sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_id, action_by,remark,"REMOVEITEMDISCOUNT" ) sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_name, action_by,remark,"REMOVEITEMDISCOUNT" )
sale_item.destroy sale_item.destroy
end end
@@ -197,13 +197,13 @@ class Origami::DiscountsController < BaseOrigamiController
#destroy in sale.sale_items #destroy in sale.sale_items
sale.sale_items.destroy(discount_items) sale.sale_items.destroy(discount_items)
action_by = current_user.id action_by = current_user.name
if table.nil? if table.nil?
remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- No Table" remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- No Table"
else else
remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- #{table.name} " remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- #{table.name} "
end end
sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_id, action_by,remark,"REMOVEALLDISCOUNT" ) sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_name, action_by,remark,"REMOVEALLDISCOUNT" )
# Re-calc All Amount in Sale # Re-calc All Amount in Sale
sale.compute_by_sale_items(sale_id, sale.sale_items, 0, nil, order_source) sale.compute_by_sale_items(sale_id, sale.sale_items, 0, nil, order_source)

2
app/controllers/origami/gift_voucher_controller.rb
View File

@@ -59,7 +59,7 @@ class Origami::GiftVoucherController < BaseOrigamiController
# saleObj = Sale.find(sale_id) # saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, @user, cash, "GiftVoucher",ref_no) @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "GiftVoucher",ref_no)
end end
end end

2
app/controllers/origami/jcb_controller.rb
View File

@@ -67,7 +67,7 @@ class Origami::JcbController < BaseOrigamiController
# saleObj = Sale.find(sale_id) # saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, @user, cash, "jcb",ref_no) @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "jcb",ref_no)
end end
end end

2
app/controllers/origami/junction_pay_controller.rb
View File

@@ -63,7 +63,7 @@ class Origami::JunctionPayController < BaseOrigamiController
# saleObj = Sale.find(sale_id) # saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, @user, cash, "JunctionPay", remarks) @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "JunctionPay", remarks)
end end
end end

2
app/controllers/origami/master_controller.rb
View File

@@ -64,7 +64,7 @@ class Origami::MasterController < BaseOrigamiController
# saleObj = Sale.find(sale_id) # saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, @user, cash, "master",ref_no) @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "master",ref_no)
end end
end end

2
app/controllers/origami/mpu_controller.rb
View File

@@ -65,7 +65,7 @@ class Origami::MpuController < BaseOrigamiController
# saleObj = Sale.find(sale_id) # saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, @user, cash, "mpu",ref_no) @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "mpu",ref_no)
end end
end end

4
app/controllers/origami/other_charges_controller.rb
View File

@@ -60,14 +60,14 @@ class Origami::OtherChargesController < BaseOrigamiController
sale_item.price = di["price"] * 1 sale_item.price = di["price"] * 1
sale_item.save sale_item.save
action_by = current_user.id action_by = current_user.name
if table.nil? if table.nil?
remark = "Add Other Charges - Receipt No #{sale.receipt_no} | Sale ID #{sale.sale_id} |Charges ->#{di["price"]} For ->#{di["name"]}- Table ->" remark = "Add Other Charges - Receipt No #{sale.receipt_no} | Sale ID #{sale.sale_id} |Charges ->#{di["price"]} For ->#{di["name"]}- Table ->"
else else
remark = "Add Other Charges - Receipt No #{sale.receipt_no} | Sale ID #{sale.sale_id} |Charges ->#{di["price"]} For ->#{di["name"]}- Table ->#{table.name}" remark = "Add Other Charges - Receipt No #{sale.receipt_no} | Sale ID #{sale.sale_id} |Charges ->#{di["price"]} For ->#{di["name"]}- Table ->#{table.name}"
end end
sale_audit = SaleAudit.record_audit_for_edit(sale.sale_id,sale.cashier_id, action_by,remark,"ADDOTHERCHARGES" ) sale_audit = SaleAudit.record_audit_for_edit(sale.sale_id,sale.cashier_name, action_by,remark,"ADDOTHERCHARGES" )
end end
end end

6
app/controllers/origami/payments_controller.rb
View File

@@ -60,6 +60,12 @@ class Origami::PaymentsController < BaseOrigamiController
end end
end end
#end rounding adjustment #end rounding adjustment
#record for sale audit
action_by = current_user.name
type = "FIRST_BILL"
remark = "#{action_by} print out first bill for Receipt No #{sale_data.receipt_no}"
sale_audit = SaleAudit.record_audit_sale(sale_id,remark,action_by,type )
# get member information # get member information
rebate = MembershipSetting.find_by_rebate(1) rebate = MembershipSetting.find_by_rebate(1)
if customer.membership_id != nil && rebate if customer.membership_id != nil && rebate

6
app/controllers/origami/request_bills_controller.rb
View File

@@ -46,6 +46,12 @@ class Origami::RequestBillsController < ApplicationController
# @sale_data.shift_sale_id = shift.id # @sale_data.shift_sale_id = shift.id
# @sale_data.save # @sale_data.save
action_by = current_user.name
type = "REQUEST_BILL"
remark = "Request bill Receipt No #{@sale_data.receipt_no}"
sale_audit = SaleAudit.record_audit_sale(@sale_data.sale_id,remark,action_by,type )
# Promotion Activation # Promotion Activation
Promotion.promo_activate(@sale) Promotion.promo_activate(@sale)

12
app/controllers/origami/sale_edit_controller.rb
View File

@@ -57,7 +57,7 @@ class Origami::SaleEditController < BaseOrigamiController
action_by = Employee.find_by_emp_id(access_code).name action_by = Employee.find_by_emp_id(access_code).name
end end
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}" 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" ) sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,current_user.name, action_by,remark,"SALEITEMVOID" )
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) ProductCommission.create_product_commission(@newsaleitem, saleitemObj)
@@ -94,7 +94,7 @@ class Origami::SaleEditController < BaseOrigamiController
action_by = Employee.find_by_emp_id(access_code).name action_by = Employee.find_by_emp_id(access_code).name
end end
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}" 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" ) sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,current_user.name, 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) ProductCommission.create_product_commission(@newsaleitem, saleitemObj)
@@ -127,6 +127,8 @@ class Origami::SaleEditController < BaseOrigamiController
access_code = params[:access_code] access_code = params[:access_code]
order_source = params[:type] order_source = params[:type]
saleitemObj = SaleItem.find(saleitemId) saleitemObj = SaleItem.find(saleitemId)
original_qty = saleitemObj.qty
original_price = saleitemObj.unit_price
sale = Sale.find(saleitemObj.sale_id) sale = Sale.find(saleitemObj.sale_id)
saleitemObj.qty = update_qty saleitemObj.qty = update_qty
@@ -138,8 +140,8 @@ class Origami::SaleEditController < BaseOrigamiController
if access_code != "null" && current_user.role == "cashier" if access_code != "null" && current_user.role == "cashier"
action_by = Employee.find_by_emp_id(access_code).name action_by = Employee.find_by_emp_id(access_code).name
end end
remark = "Update Qty #{update_qty} Price [#{saleitemObj.price}]| Receipt No #{sale.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}" remark = "Update From Qty=>#{original_qty} Price=>[#{original_price}] to qty=>#{update_qty} Price =>[#{saleitemObj.price}]| Receipt No #{sale.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,sale.cashier_id, action_by,remark,"SALEITEMEDIT" ) sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,current_user.name, action_by,remark,"SALEITEMEDIT" )
# saleitemObj.remark = 'edit' # saleitemObj.remark = 'edit'
unless saleitemObj.product_name.include? 'updated' unless saleitemObj.product_name.include? 'updated'
@@ -193,7 +195,7 @@ class Origami::SaleEditController < BaseOrigamiController
action_by = Employee.find_by_emp_id(access_code).name action_by = Employee.find_by_emp_id(access_code).name
end end
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}" 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" ) sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,current_user.name, 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) ProductCommission.remove_product_commission(saleitemObj)

11
app/controllers/origami/sales_controller.rb
View File

@@ -26,6 +26,7 @@ class Origami::SalesController < BaseOrigamiController
# existing_booking.update_attributes(checkout_at: checkout_at) # existing_booking.update_attributes(checkout_at: checkout_at)
# end # end
if booking.sale_id.nil? if booking.sale_id.nil?
order_array = []
booking.booking_orders.each do |booking_order| booking.booking_orders.each do |booking_order|
booking.booking_status = 'moved' booking.booking_status = 'moved'
@@ -48,8 +49,18 @@ class Origami::SalesController < BaseOrigamiController
saleobj.save saleobj.save
order.save order.save
booking.save booking.save
order_array.push(order.order_id)
end end
receipt_no = Sale.find(sale_id).receipt_no
action_by = current_user.name
type = "ADD_TO_EXISTING"
remark = "#{action_by} add to existing order #{order_array} to Receipt No=>#{receipt_no} in #{table.name}"
sale_audit = SaleAudit.record_audit_sale(sale_id,remark,action_by,type )
booking_order = BookingOrder.where('booking_id=?',booking) booking_order = BookingOrder.where('booking_id=?',booking)
booking_order.each do |bo| booking_order.each do |bo|
bo.booking_id = existing_booking.booking_id bo.booking_id = existing_booking.booking_id

2
app/controllers/origami/unionpay_controller.rb
View File

@@ -63,7 +63,7 @@ class Origami::UnionpayController < BaseOrigamiController
# saleObj = Sale.find(sale_id) # saleObj = Sale.find(sale_id)
#end rounding adjustment #end rounding adjustment
sale_payment = SalePayment.new sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, @user, cash, "unionpay",ref_no) @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "unionpay",ref_no)
end end
end end

2
app/controllers/origami/visa_controller.rb
View File

@@ -63,7 +63,7 @@ class Origami::VisaController < BaseOrigamiController
# saleObj = Sale.find(sale_id) # saleObj = Sale.find(sale_id)
#end rounding adjustment #end rounding adjustment
sale_payment = SalePayment.new sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, @user, cash, "visa",ref_no) @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "visa",ref_no)
end end
end end

2
app/controllers/origami/void_controller.rb
View File

@@ -78,7 +78,7 @@ class Origami::VoidController < BaseOrigamiController
end end
# remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}" # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, action_by,remark,"SALEVOID" ) sale_audit = SaleAudit.record_audit_for_edit(sale_id,current_user.name, action_by,remark,"SALEVOID" )
# For Print # For Print

2
app/controllers/origami/waste_spoile_controller.rb
View File

@@ -59,7 +59,7 @@ class Origami::WasteSpoileController < BaseOrigamiController
action_by = Employee.find_by_emp_id(access_code).name action_by = Employee.find_by_emp_id(access_code).name
end end
# remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}" # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, action_by,remark,remark ) sale_audit = SaleAudit.record_audit_for_edit(sale_id,current_user.name, action_by,remark,remark )
# For Print # For Print

13
app/models/sale_audit.rb
View File

@@ -72,7 +72,7 @@ class SaleAudit < ApplicationRecord
sale_audit.sale_id = sale_id sale_audit.sale_id = sale_id
sale_audit.action = "SALEPAYMENT" sale_audit.action = "SALEPAYMENT"
sale_audit.action_at = DateTime.now.utc sale_audit.action_at = DateTime.now.utc
sale_audit.action_by = Sale.find(sale_id).cashier_id sale_audit.action_by = action_by
sale_audit.remark = remark sale_audit.remark = remark
sale_audit.approved_by = action_by sale_audit.approved_by = action_by
sale_audit.save! sale_audit.save!
@@ -89,6 +89,17 @@ class SaleAudit < ApplicationRecord
sale_audit.save! sale_audit.save!
end end
def self.record_audit_sale(sale_id, remark, action_by,type)
sale_audit = SaleAudit.new()
sale_audit.sale_id = sale_id
sale_audit.action = type
sale_audit.action_at = DateTime.now.utc
sale_audit.action_by = action_by
sale_audit.remark = remark
sale_audit.approved_by = action_by
sale_audit.save!
end
def self.paymal_search(sale_id) def self.paymal_search(sale_id)
paymal = SaleAudit.where("sale_id =? and action = 'PAYMAL'",sale_id) paymal = SaleAudit.where("sale_id =? and action = 'PAYMAL'",sale_id)
remark = paymal[0].remark.split("}") remark = paymal[0].remark.split("}")