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

check tax profile

Browse Source
This commit is contained in:
phyusin
2018-03-19 11:35:43 +06:30
parent e55ff8b5e0
commit a9c8eb4e93
12 changed files with 61 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/origami/addorders_controller.rb
View File

@@ -103,11 +103,11 @@ class Origami::AddordersController < BaseOrigamiController
} }
# begin # begin
if params[:order_source] == "quick_service" # if params[:order_source] == "quick_service"
customer_id = "CUS-000000000002" # for no customer id from mobile # customer_id = "CUS-000000000002" # for no customer id from mobile
else # else
customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
end # end
@order = Order.new @order = Order.new
@order.source = params[:order_source] @order.source = params[:order_source]
@order.order_type = params[:order_type] @order.order_type = params[:order_type]

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

@@ -402,12 +402,13 @@ class Origami::PaymentsController < BaseOrigamiController
member_info = nil member_info = nil
rebate_amount = nil rebate_amount = nil
current_balance = nil current_balance = nil
order_source = params[:type]
if(Sale.exists?(sale_id)) if(Sale.exists?(sale_id))
saleObj = Sale.find(sale_id) saleObj = Sale.find(sale_id)
if saleObj.discount_type == "member_discount" if saleObj.discount_type == "member_discount"
saleObj.update_attributes(rounding_adjustment: 0) saleObj.update_attributes(rounding_adjustment: 0)
saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0) saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0,order_source)
end end
saleObj.update_attributes(rounding_adjustment: 0) saleObj.update_attributes(rounding_adjustment: 0)

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

@@ -13,7 +13,7 @@ class Origami::RequestBillsController < ApplicationController
if check_booking.sale_id.nil? if check_booking.sale_id.nil?
# Create Sale if it doesn't exist # Create Sale if it doesn't exist
@status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user) @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user, order.source)
@sale_data = Sale.find_by_sale_id(@sale_id) @sale_data = Sale.find_by_sale_id(@sale_id)
@sale_items = SaleItem.where("sale_id=?",@sale_id) @sale_items = SaleItem.where("sale_id=?",@sale_id)
else else

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

@@ -76,11 +76,14 @@ class Origami::SaleEditController < BaseOrigamiController
# re-calc tax # re-calc tax
saleObj = Sale.find(saleitemObj.sale_id) saleObj = Sale.find(saleitemObj.sale_id)
order_id = SaleOrder.find_by_sale_id(saleitemObj.sale_id).order_id
order = Order.find(order_id)
action_by = current_user.id action_by = current_user.id
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,saleObj.cashier_id, action_by,remark,"SALEITEMFOC" )
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) ProductCommission.create_product_commission(@newsaleitem, saleitemObj)
end end
@@ -141,7 +144,7 @@ class Origami::SaleEditController < BaseOrigamiController
end end
end end
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.edit_product_commission(saleitemObj) ProductCommission.edit_product_commission(saleitemObj)
end end
@@ -162,17 +165,21 @@ class Origami::SaleEditController < BaseOrigamiController
# re-calc tax # re-calc tax
saleObj = Sale.find(saleitemObj.sale_id) saleObj = Sale.find(saleitemObj.sale_id)
order_id = SaleOrder.find_by_sale_id(saleitemObj.sale_id).order_id
order = Order.find(order_id)
action_by = current_user.id action_by = current_user.id
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,saleObj.cashier_id, action_by,remark,"ITEMCANCELVOID" )
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.remove_product_commission(saleitemObj) ProductCommission.remove_product_commission(saleitemObj)
end end
# remove all void items # remove all void items
def cancel_all_void def cancel_all_void
sale_id = params[:sale_id] sale_id = params[:sale_id]
order_source = params[:type]
saleObj = Sale.find(sale_id) saleObj = Sale.find(sale_id)
saleObj.sale_items.each do |item| saleObj.sale_items.each do |item|
if item.qty.to_i < 0 if item.qty.to_i < 0
@@ -185,13 +192,14 @@ class Origami::SaleEditController < BaseOrigamiController
end end
# re-calc tax # re-calc tax
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)
end end
def apply_void def apply_void
sale_id = params[:sale_id] sale_id = params[:sale_id]
order_source = params[:type]
saleObj = Sale.find(sale_id) saleObj = Sale.find(sale_id)
saleObj.compute_without_void saleObj.compute_without_void(order_source)
saleObj.sale_items.each do |item| saleObj.sale_items.each do |item|
ProductCommission.remove_product_commission(item) ProductCommission.remove_product_commission(item)
end end

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

@@ -4,12 +4,13 @@ class Origami::VoidController < BaseOrigamiController
sale_id = params[:sale_id] sale_id = params[:sale_id]
remark = params[:remark] remark = params[:remark]
order_source = params[:type] #tax profile source
if Sale.exists?(sale_id) if Sale.exists?(sale_id)
sale = Sale.find_by_sale_id(sale_id) sale = Sale.find_by_sale_id(sale_id)
if sale.discount_type == "member_discount" if sale.discount_type == "member_discount"
sale.update_attributes(total_discount: 0) sale.update_attributes(total_discount: 0)
sale.compute_by_sale_items(sale_id, sale.sale_items,0) sale.compute_by_sale_items(sale_id, sale.sale_items,0,order_source)
end end
# update count for shift sale # update count for shift sale

52
app/models/sale.rb
View File

@@ -26,7 +26,7 @@ class Sale < ApplicationRecord
SALE_STATUS_OUTSTANDING = "outstanding" SALE_STATUS_OUTSTANDING = "outstanding"
SALE_STATUS_COMPLETED = "completed" SALE_STATUS_COMPLETED = "completed"
def generate_invoice_from_booking(booking_id, requested_by, cashier) def generate_invoice_from_booking(booking_id, requested_by, cashier, order_source = nil)
booking = Booking.find(booking_id) booking = Booking.find(booking_id)
status = false status = false
Rails.logger.debug "Booking -> " + booking.id.to_s Rails.logger.debug "Booking -> " + booking.id.to_s
@@ -36,9 +36,9 @@ class Sale < ApplicationRecord
booking.booking_orders.each do |order| booking.booking_orders.each do |order|
if booking.sale_id if booking.sale_id
status, sale_id = generate_invoice_from_order(order.order_id, nil, booking, requested_by, cashier) status, sale_id = generate_invoice_from_order(order.order_id, nil, booking, requested_by, cashier, order_source)
else else
status, sale_id = generate_invoice_from_order(order.order_id, booking.sale_id, booking, requested_by, cashier) status, sale_id = generate_invoice_from_order(order.order_id, booking.sale_id, booking, requested_by, cashier, order_source)
end end
booking.sale_id = sale_id booking.sale_id = sale_id
end end
@@ -58,7 +58,7 @@ class Sale < ApplicationRecord
end end
end end
def generate_invoice_from_order (order_id, sale_id, booking, requested_by, cashier = nil) def generate_invoice_from_order (order_id, sale_id, booking, requested_by, cashier = nil, order_source = nil)
taxable = true taxable = true
#if sale_id is exsit and validate #if sale_id is exsit and validate
#add order to that invoice #add order to that invoice
@@ -128,7 +128,7 @@ class Sale < ApplicationRecord
self.save! self.save!
#compute sales summary #compute sales summary
compute compute(order_source)
#Update the order items that is billed #Update the order items that is billed
order.update_items_status_to_billed(nil) order.update_items_status_to_billed(nil)
@@ -172,7 +172,7 @@ class Sale < ApplicationRecord
# Create Sale if it doesn't exist # Create Sale if it doesn't exist
# puts "current_login_employee" # puts "current_login_employee"
# puts current_login_employee.name # puts current_login_employee.name
@status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee,current_user) @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee,current_user,order.source)
@sale_data = Sale.find_by_sale_id(@sale_id) @sale_data = Sale.find_by_sale_id(@sale_id)
@sale_items = SaleItem.where("sale_id=?",@sale_id) @sale_items = SaleItem.where("sale_id=?",@sale_id)
else else
@@ -310,7 +310,7 @@ class Sale < ApplicationRecord
end end
#compute - invoice total #compute - invoice total
def compute def compute(order_source = nil)
sales_items = self.sale_items sales_items = self.sale_items
#Computation Fields #Computation Fields
@@ -329,7 +329,7 @@ class Sale < ApplicationRecord
# total_taxable = total_taxable + (item.taxable_price * item.qty) # total_taxable = total_taxable + (item.taxable_price * item.qty)
end end
apply_tax (total_taxable) apply_tax(total_taxable, order_source)
self.total_amount = subtotal_price self.total_amount = subtotal_price
self.total_discount = total_discount self.total_discount = total_discount
@@ -342,7 +342,7 @@ class Sale < ApplicationRecord
end end
#compute - invoice total #compute - invoice total
def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil) def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil,order_source=nil)
sale = Sale.find(sale_id) sale = Sale.find(sale_id)
sales_items = sale_itemss sales_items = sale_itemss
@@ -362,7 +362,7 @@ class Sale < ApplicationRecord
end end
end end
compute_tax(sale, total_taxable, total_discount) compute_tax(sale, total_taxable, total_discount, order_source)
sale.total_amount = subtotal_price sale.total_amount = subtotal_price
sale.total_discount = total_discount sale.total_discount = total_discount
sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax
@@ -376,7 +376,7 @@ class Sale < ApplicationRecord
end end
# No Use too many wrong # No Use too many wrong
def compute_without_void def compute_without_void(order_source = nil)
sales_items = self.sale_items sales_items = self.sale_items
#Computation Fields #Computation Fields
@@ -396,7 +396,7 @@ class Sale < ApplicationRecord
end end
end end
apply_tax (total_taxable) apply_tax(total_taxable, order_source)
self.total_amount = subtotal_price self.total_amount = subtotal_price
self.total_discount = total_discount self.total_discount = total_discount
self.grand_total = (self.total_amount - self.total_discount) + self.total_tax self.grand_total = (self.total_amount - self.total_discount) + self.total_tax
@@ -407,7 +407,7 @@ class Sale < ApplicationRecord
end end
# Tax Re-Calculte # Tax Re-Calculte
def compute_tax(sale, total_taxable, total_discount = 0) def compute_tax(sale, total_taxable, total_discount = 0, order_source = nil)
shop = Shop.first(); shop = Shop.first();
#if tax is not apply create new record #if tax is not apply create new record
@@ -423,8 +423,9 @@ class Sale < ApplicationRecord
# #Creat new tax records # #Creat new tax records
if sale.payment_status != 'foc' if sale.payment_status != 'foc'
tax_profiles.each do |tax| tax_profiles.each do |tax|
customer.tax_profiles.each do |cus_tax| # customer.tax_profiles.each do |cus_tax|
if cus_tax.to_i == tax.id # if cus_tax.to_i == tax.id
if tax.group_type.to_s == order_source.to_s
sale_tax = SaleTax.new(:sale => sale) sale_tax = SaleTax.new(:sale => sale)
sale_tax.tax_name = tax.name sale_tax.tax_name = tax.name
sale_tax.tax_rate = tax.rate sale_tax.tax_rate = tax.rate
@@ -447,15 +448,16 @@ class Sale < ApplicationRecord
sale_tax.inclusive = tax.inclusive sale_tax.inclusive = tax.inclusive
sale_tax.save sale_tax.save
end
end end
# end
# end
end end
end end
sale.total_tax = total_tax_amount sale.total_tax = total_tax_amount
end end
# Tax Calculate # Tax Calculate
def apply_tax(total_taxable) def apply_tax(total_taxable, order_source = nil)
shop = Shop.first(); shop = Shop.first();
#if tax is not apply create new record #if tax is not apply create new record
@@ -469,11 +471,14 @@ class Sale < ApplicationRecord
tax_profiles = TaxProfile.all.order("order_by asc") tax_profiles = TaxProfile.all.order("order_by asc")
customer = Customer.find(self.customer_id) customer = Customer.find(self.customer_id)
if order_source.to_s == "emenu"
order_source = "cashier"
end
#Create new tax records #Create new tax records
tax_profiles.each do |tax| tax_profiles.each do |tax|
customer.tax_profiles.each do |cus_tax| # customer.tax_profiles.each do |cus_tax|
if cus_tax.to_i == tax.id # if cus_tax.to_i == tax.id
if tax.group_type.to_s == order_source.to_s
sale_tax = SaleTax.new(:sale => self) sale_tax = SaleTax.new(:sale => self)
sale_tax.tax_name = tax.name sale_tax.tax_name = tax.name
sale_tax.tax_rate = tax.rate sale_tax.tax_rate = tax.rate
@@ -497,8 +502,9 @@ class Sale < ApplicationRecord
sale_tax.inclusive = tax.inclusive sale_tax.inclusive = tax.inclusive
sale_tax.save sale_tax.save
end
end end
# end
# end
end end
self.total_tax = total_tax_amount self.total_tax = total_tax_amount
end end
@@ -1963,7 +1969,7 @@ end
end end
# Re-compute for add # Re-compute for add
saleobj.compute saleobj.compute(order.source)
saleobj.save saleobj.save
order.save order.save
booking.save booking.save
@@ -1993,7 +1999,7 @@ end
end end
# Re-compute for add # Re-compute for add
saleobj.compute saleobj.compute(order.source)
saleobj.save saleobj.save
order.save order.save
booking.save booking.save

2
app/views/origami/home/show.html.erb
View File

@@ -905,7 +905,7 @@
}, function (isConfirm) { }, function (isConfirm) {
if (isConfirm) { if (isConfirm) {
var sale_id = "<%= @obj_sale.sale_id rescue "" %>" var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
var ajax_url = "/origami/sale/" + sale_id + '/void'; var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
var remark = $("#remark").val(); var remark = $("#remark").val();
$.ajax({ $.ajax({

4
app/views/origami/payments/show.html.erb
View File

@@ -691,7 +691,7 @@ var customer_name = "<%= @customer.name %>";
if (isConfirm) { if (isConfirm) {
var sale_id = $('#sale_id').text(); var sale_id = $('#sale_id').text();
var remark = $("#remark").val(); var remark = $("#remark").val();
var ajax_url = "/origami/sale/" + sale_id + '/void'; var ajax_url = "/origami/sale/" + sale_id +'/'+cashier_type+ '/void';
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: ajax_url, url: ajax_url,
@@ -897,7 +897,7 @@ var customer_name = "<%= @customer.name %>";
if (isConfirm) { if (isConfirm) {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "<%= origami_payment_foc_path %>", url: "/origami/payment/"+cashier_type+"/foc",
data: params, data: params,
success:function(result){ success:function(result){
customer_display_view(null,"reload"); customer_display_view(null,"reload");

2
app/views/origami/rooms/show.html.erb
View File

@@ -889,7 +889,7 @@ $('#add_invoice').on('click',function(){
var sure = confirm("Are you sure want to Void"); var sure = confirm("Are you sure want to Void");
if (sure == true) { if (sure == true) {
var sale_id = $('#sale_id').val(); var sale_id = $('#sale_id').val();
var ajax_url = "/origami/sale/" + sale_id + '/void'; var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: ajax_url, url: ajax_url,

4
app/views/origami/sale_edit/edit.html.erb
View File

@@ -331,7 +331,7 @@ var cashier_type = "<%= @cashier_type %>";
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: ajax_url, url: ajax_url,
data: 'sale_id=' + sale_id, data: 'sale_id=' + sale_id +'&type='+cashier_type,
success: function (result) { success: function (result) {
location.reload(); location.reload();
} }
@@ -345,7 +345,7 @@ var cashier_type = "<%= @cashier_type %>";
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: ajax_url, url: ajax_url,
data: 'sale_id=' + sale_id, data: 'sale_id=' + sale_id+'&type='+cashier_type,
success: function (result) { success: function (result) {
if (cashier_type=="quick_service") { if (cashier_type=="quick_service") {
window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/'; window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';

4
app/views/origami/table_invoices/show.html.erb
View File

@@ -261,7 +261,7 @@ $('#void').on('click',function () {
if (isConfirm) { if (isConfirm) {
var sale_id = $('#sale_id').val(); var sale_id = $('#sale_id').val();
var remark = $("#remark").val(); var remark = $("#remark").val();
var ajax_url = "/origami/sale/" + sale_id + '/void'; var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: ajax_url, url: ajax_url,
@@ -291,7 +291,7 @@ $('#foc').click(function() {
if ($(this).attr('active')=== "true") { if ($(this).attr('active')=== "true") {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "<%= origami_payment_foc_path %>", url: "/origami/payment/cashier/foc",
data: params, data: params,
success:function(result){ success:function(result){
if (cash >= 0) { if (cash >= 0) {

4
config/routes.rb
View File

@@ -170,7 +170,7 @@ scope "(:locale)", locale: /en|mm/ do
get 'sale/:sale_id/:type/payment' => 'payments#show' get 'sale/:sale_id/:type/payment' => 'payments#show'
post 'sale/:sale_id/:type/payment/print' => 'payments#print' #route for print receipt post 'sale/:sale_id/:type/payment/print' => 'payments#print' #route for print receipt
post 'payment/foc' => 'payments#foc', :defaults => {:format => 'json'} post 'payment/:type/foc' => 'payments#foc', :defaults => {:format => 'json'}
post 'payment/cash' => 'payments#create' post 'payment/cash' => 'payments#create'
post 'payment/mpu' => "mpu#create" post 'payment/mpu' => "mpu#create"
post 'payment/jcb' => "jcb#create" post 'payment/jcb' => "jcb#create"
@@ -192,7 +192,7 @@ scope "(:locale)", locale: /en|mm/ do
get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index" get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index"
#---------Void --------------# #---------Void --------------#
post 'sale/:sale_id/void' => 'void#overall_void' post 'sale/:sale_id/:type/void' => 'void#overall_void'
#---------Multiple Invoices --------------# #---------Multiple Invoices --------------#
get 'table/:table_id/table_invoices' => "table_invoices#index", :as => "table_invoice_index" get 'table/:table_id/table_invoices' => "table_invoices#index", :as => "table_invoice_index"