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

Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev

Browse Source
This commit is contained in:
NyanLinHtut
2019-11-13 13:34:29 +06:30
parent 216dfe4f2f 9b798dc699
commit 92dd2aeb5a
34 changed files with 930 additions and 1009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Capfile
View File

@@ -22,10 +22,15 @@ require "capistrano/bundler"
require "capistrano/rails" require "capistrano/rails"
require "capistrano/rails/assets" require "capistrano/rails/assets"
require "capistrano/rails/migrations" require "capistrano/rails/migrations"
# require "capistrano/passenger" require "capistrano/scm/git"
install_plugin Capistrano::SCM::Git
require 'capistrano/puma'
install_plugin Capistrano::Puma, load_hooks: false # Default puma tasks
install_plugin Capistrano::Puma::Monit # if you need the monit tasks
install_plugin Capistrano::Puma::Jungle # if you need the jungle tasks
# Load custom tasks from `lib/capistrano/tasks` if you have any defined # Load custom tasks from `lib/capistrano/tasks` if you have any defined
Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r } Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }
Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r } Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
Dir.glob('lib/capistrano/**/*.rb').each { |r| import r } Dir.glob('lib/capistrano/**/*.rb').each { |r| import r }

4
Gemfile
View File

@@ -44,7 +44,8 @@ gem 'mini_magick'
gem 'jquery-fileupload-rails', '~> 0.4.7' gem 'jquery-fileupload-rails', '~> 0.4.7'
#Report and Printing gems #Report and Printing gems
gem 'cups' #gem 'cups' #remove for cloud installation
gem 'cups', '~>0.0.7'
gem 'prawn' gem 'prawn'
gem 'prawn-table' gem 'prawn-table'
gem 'prawn-qrcode' gem 'prawn-qrcode'
@@ -114,6 +115,7 @@ group :development do
gem 'capistrano-bundler' gem 'capistrano-bundler'
gem 'capistrano-rails' gem 'capistrano-rails'
gem 'capistrano-rbenv', github: "capistrano/rbenv" gem 'capistrano-rbenv', github: "capistrano/rbenv"
gem 'capistrano3-puma'
end end
group :test do group :test do

17
Gemfile.lock
View File

@@ -72,11 +72,15 @@ GEM
capistrano-rails (1.4.0) capistrano-rails (1.4.0)
capistrano (~> 3.1) capistrano (~> 3.1)
capistrano-bundler (~> 1.1) capistrano-bundler (~> 1.1)
capistrano3-puma (3.1.1)
capistrano (~> 3.7)
capistrano-bundler
puma (~> 3.4)
carrierwave (1.3.1) carrierwave (1.3.1)
activemodel (>= 4.0.0) activemodel (>= 4.0.0)
activesupport (>= 4.0.0) activesupport (>= 4.0.0)
mime-types (>= 1.16) mime-types (>= 1.16)
chartkick (3.2.1) chartkick (3.2.2)
chronic (0.10.2) chronic (0.10.2)
chunky_png (1.3.11) chunky_png (1.3.11)
coffee-rails (4.2.2) coffee-rails (4.2.2)
@@ -89,7 +93,7 @@ GEM
concurrent-ruby (1.1.5) concurrent-ruby (1.1.5)
connection_pool (2.2.2) connection_pool (2.2.2)
crass (1.0.5) crass (1.0.5)
cups (0.1.10) cups (0.0.7)
database_cleaner (1.7.0) database_cleaner (1.7.0)
diff-lcs (1.3) diff-lcs (1.3)
erubi (1.9.0) erubi (1.9.0)
@@ -140,7 +144,7 @@ GEM
listen (3.0.8) listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
loofah (2.3.0) loofah (2.3.1)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.7.1)
@@ -265,7 +269,7 @@ GEM
simple_form (5.0.1) simple_form (5.0.1)
actionpack (>= 5.0) actionpack (>= 5.0)
activemodel (>= 5.0) activemodel (>= 5.0)
spreadsheet (1.2.4) spreadsheet (1.2.5)
ruby-ole (>= 1.0) ruby-ole (>= 1.0)
spring (2.0.2) spring (2.0.2)
activesupport (>= 4.2) activesupport (>= 4.2)
@@ -322,10 +326,11 @@ DEPENDENCIES
capistrano-bundler capistrano-bundler
capistrano-rails capistrano-rails
capistrano-rbenv! capistrano-rbenv!
capistrano3-puma
carrierwave (~> 1.0) carrierwave (~> 1.0)
chartkick chartkick
coffee-rails (~> 4.2) coffee-rails (~> 4.2)
cups cups (~> 0.0.7)
database_cleaner database_cleaner
factory_girl_rails (~> 4.0) factory_girl_rails (~> 4.0)
faker faker
@@ -370,8 +375,8 @@ DEPENDENCIES
web-console (>= 3.3.0) web-console (>= 3.3.0)
whenever whenever
RUBY VERSION RUBY VERSION
ruby 2.4.1p111 ruby 2.4.1p111
BUNDLED WITH BUNDLED WITH
2.0.2 2.0.2

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

@@ -305,7 +305,7 @@ class Origami::AddordersController < BaseOrigamiController
def getCloudDomain def getCloudDomain
from = "" from = ""
if ENV["SERVER_MODE"] == 'cloud' if ENV["SERVER_MODE"] == 'cloud'
from = request.subdomain + "." + request.domain from = request.subdomain.to_s + "." + request.domain.to_s
end end
return from return from

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

@@ -7,9 +7,9 @@ class Origami::DiscountsController < BaseOrigamiController
@print_settings = PrintSetting.get_precision_delimiter() @print_settings = PrintSetting.get_precision_delimiter()
@webview = false @webview = false
if check_mobile if check_mobile
@webview = true @webview = true
end end
sale_id = params[:id] sale_id = params[:id]
@cashier_type = params[:type] @cashier_type = params[:type]
if Sale.exists?(sale_id) if Sale.exists?(sale_id)
@@ -32,7 +32,7 @@ class Origami::DiscountsController < BaseOrigamiController
discount_items = JSON.parse(params[:discount_items]) discount_items = JSON.parse(params[:discount_items])
overall_discount = params[:overall_discount] overall_discount = params[:overall_discount]
sub_total = params[:sub_total] sub_total = params[:sub_total]
if Sale.exists?(sale_id) if Sale.exists?(sale_id)
sale = Sale.find(sale_id) sale = Sale.find(sale_id)
@@ -44,26 +44,29 @@ class Origami::DiscountsController < BaseOrigamiController
table_id = nil table_id = nil
end end
# sale.total_discount = overall_discount.to_f # sale.total_discount = overall_discount.to_f
# sale.total_amount = sub_total.to_f # sale.total_amount = sub_total.to_f
# sale.grand_total = (sub_total.to_f - overall_discount.to_f) + sale.total_tax; # sale.grand_total = (sub_total.to_f - overall_discount.to_f) + sale.total_tax;
# sale.save # sale.save
if discount_items.length > 0 if discount_items.length > 0
#save sale item for discount #save sale item for discount
discount_items.each do |di| discount_items.each do |di|
origin_sale_item = SaleItem.find(di["id"]) origin_sale_item = SaleItem.find(di["id"])
sale_item = SaleItem.new sale_item = SaleItem.new
if !origin_sale_item.nil? # if !origin_sale_item.nil?
menu_category = MenuCategory.get_menu_category(origin_sale_item.product_code) #get menu category for menu items # menu_category = MenuCategory.get_menu_category(origin_sale_item.product_code) #get menu category for menu items
if !menu_category.nil? # if !menu_category.nil?
sale_item.menu_category_code = menu_category.code # sale_item.menu_category_code = menu_category.code
sale_item.menu_category_name = menu_category.name # sale_item.menu_category_name = menu_category.name
end # end
end # end
sale_item.menu_category_code = origin_sale_item.menu_category_code
sale_item.menu_category_name = origin_sale_item.menu_category_name
sale_item.sale_id = sale_id sale_item.sale_id = sale_id
sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id
@@ -73,7 +76,7 @@ class Origami::DiscountsController < BaseOrigamiController
sale_item.status = "Discount" sale_item.status = "Discount"
sale_item.qty = -1 sale_item.qty = -1
sale_item.unit_price = di["price"].to_f * (-1) sale_item.unit_price = di["price"].to_f * -1
sale_item.taxable_price = di["price"] sale_item.taxable_price = di["price"]
sale_item.is_taxable = 1 sale_item.is_taxable = 1
sale_item.account_id = origin_sale_item.account_id sale_item.account_id = origin_sale_item.account_id
@@ -83,11 +86,11 @@ class Origami::DiscountsController < BaseOrigamiController
action_by = current_user.name 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_name, 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
@@ -97,24 +100,24 @@ class Origami::DiscountsController < BaseOrigamiController
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_name, 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?
result = {:status=> "Success", :table_id => table_id, :table_type => table.type } result = {:status=> "Success", :table_id => table_id, :table_type => table.type }
else else
result = {:status=> "Success" } result = {:status=> "Success" }
end end
else else
if !table.nil? if !table.nil?
result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table.type } result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table.type }
else else
result = {:status=> "Please, Check Again!" } result = {:status=> "Please, Check Again!" }
end end
end end
render :json => result.to_json render :json => result.to_json
end end
@@ -131,45 +134,45 @@ class Origami::DiscountsController < BaseOrigamiController
else else
table_id = nil table_id = nil
table = nil table = nil
end end
if discount_items.length > 0 if discount_items.length > 0
#destroy sale item for discount #destroy sale item for discount
discount_items.each do |di| discount_items.each do |di|
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.name 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_name, action_by,remark,"REMOVEITEMDISCOUNT" ) sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_name, action_by,remark,"REMOVEITEMDISCOUNT" )
sale_item.destroy
end
end
# sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax; sale_item.destroy
end
end
# sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax;
# sale.save # sale.save
# Re-calc All Amount in Sale # Re-calc All Amount in Sale
sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount, nil, order_source) sale.compute_by_sale_items(sale_id, sale.sale_items, sale.total_discount, nil, order_source)
if table.nil? if table.nil?
result = {:status=> "Success"} result = {:status=> "Success"}
else else
result = {:status=> "Success", :table_id => table_id, :table_type => table.type } result = {:status=> "Success", :table_id => table_id, :table_type => table.type }
end end
else else
if table.nil? if table.nil?
result = {:status=> "Please, Check Again!"} result = {:status=> "Please, Check Again!"}
else else
result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table.type } result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table.type }
end end
end end
render :json => result.to_json render :json => result.to_json
end end
@@ -180,29 +183,29 @@ class Origami::DiscountsController < BaseOrigamiController
order_source = params[:type] order_source = params[:type]
if Sale.exists?(sale_id) if Sale.exists?(sale_id)
sale = Sale.find(sale_id) sale = Sale.find(sale_id)
if sale.bookings[0].dining_facility_id.to_i > 0 if sale.bookings[0].dining_facility_id.to_i > 0
table_id = sale.bookings[0].dining_facility_id table_id = sale.bookings[0].dining_facility_id
table = DiningFacility.find(table_id) table = DiningFacility.find(table_id)
table_type = table.type table_type = table.type
else else
table_id = nil table_id = nil
table = nil table = nil
table_type = nil table_type = nil
end end
discount_items = [] discount_items = []
#destroy all discount sale item #destroy all discount sale item
sale.sale_items.each do |si| sale.sale_items.each do |si|
if si.status == "Discount" && si.price < 0 if si.status == "Discount" && si.price < 0
sale.total_amount = (sale.total_amount + si.price.abs) sale.total_amount = (sale.total_amount + si.price.abs)
discount_items.push(si) discount_items.push(si)
end end
end end
# sale.total_discount = 0 # sale.total_discount = 0
# sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax; # sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax;
# sale.save # sale.save
#destroy in sale.sale_items #destroy in sale.sale_items
@@ -215,23 +218,23 @@ class Origami::DiscountsController < BaseOrigamiController
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_name, 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)
if table.nil? if table.nil?
result = {:status=> "Success"} result = {:status=> "Success"}
else else
result = {:status=> "Success", :table_id => table_id, :dining => table.name, :table_type => table_type } result = {:status=> "Success", :table_id => table_id, :dining => table.name, :table_type => table_type }
end end
else else
if table.nil? if table.nil?
result = {:status=> "Please, Check Again!"} result = {:status=> "Please, Check Again!"}
else else
result = {:status=> "Please, Check Again!", :table_id => table_id, :dining => table.name, :table_type => table_type } result = {:status=> "Please, Check Again!", :table_id => table_id, :dining => table.name, :table_type => table_type }
end end
end end
render :json => result.to_json render :json => result.to_json
end end
@@ -251,7 +254,7 @@ class Origami::DiscountsController < BaseOrigamiController
end end
# Check for Card Payment # Check for Card Payment
is_card_payment = SalePayment.get_sale_payments_by_card(sale.sale_payments) is_card_payment = SalePayment.get_sale_payments_by_card(sale.sale_payments)
# if is_card != "true" # if is_card != "true"
account_types = Account.where("discount=?",true) account_types = Account.where("discount=?",true)
table_id = sale.bookings[0].dining_facility_id table_id = sale.bookings[0].dining_facility_id
@@ -267,9 +270,9 @@ class Origami::DiscountsController < BaseOrigamiController
str={type:pc[:name],amount:pc[:price]} str={type:pc[:name],amount:pc[:price]}
acc_prices.push(str) acc_prices.push(str)
end end
end end
end end
generic_customer_id = sale.customer.membership_id generic_customer_id = sale.customer.membership_id
receipt_no = sale.receipt_no receipt_no = sale.receipt_no
membership = MembershipSetting.find_by_membership_type("paypar_url") membership = MembershipSetting.find_by_membership_type("paypar_url")
memberaction = MembershipAction.find_by_membership_type("member_discount") memberaction = MembershipAction.find_by_membership_type("member_discount")
@@ -282,7 +285,7 @@ class Origami::DiscountsController < BaseOrigamiController
# Check for items for Paypar Cloud # Check for items for Paypar Cloud
if acc_prices.length > 0 if acc_prices.length > 0
begin begin
response = HTTParty.post(url, response = HTTParty.post(url,
:body => { account_no: account_no, :body => { account_no: account_no,
generic_customer_id:generic_customer_id , generic_customer_id:generic_customer_id ,
campaign_type_id: campaign_type_id, campaign_type_id: campaign_type_id,
@@ -307,7 +310,7 @@ class Origami::DiscountsController < BaseOrigamiController
rescue SocketError rescue SocketError
response = {"status": false, "message": "Can't open membership server " } response = {"status": false, "message": "Can't open membership server " }
end end
else else
response = {"status": false, "message": "You have no selected discount item" } response = {"status": false, "message": "You have no selected discount item" }
end end
Rails.logger.debug "-------------- Member Discount Osaka ---------" Rails.logger.debug "-------------- Member Discount Osaka ---------"
@@ -325,7 +328,7 @@ class Origami::DiscountsController < BaseOrigamiController
else else
result = {:status=> response["message"],:title=>"Alert", :table_id => table_id,:table_type => table_type } result = {:status=> response["message"],:title=>"Alert", :table_id => table_id,:table_type => table_type }
end end
render :json => result.to_json render :json => result.to_json
# end #end Is Card Payment # end #end Is Card Payment
@@ -376,5 +379,5 @@ class Origami::DiscountsController < BaseOrigamiController
# redirect_to origami_path(sale_id) # redirect_to origami_path(sale_id)
# end # end
end end

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

@@ -64,15 +64,9 @@ class Origami::PaymentsController < BaseOrigamiController
customer = Customer.find(sale_data.customer_id) customer = Customer.find(sale_data.customer_id)
# rounding adjustment # rounding adjustment
if shop_detail.is_rounding_adj if shop_detail.is_rounding_adj
a = sale_data.grand_total % 25 # Modulus new_total = Sale.get_rounding_adjustment(sale_data.grand_total)
b = sale_data.grand_total / 25 # Division rounding_adj = new_total - sale_data.grand_total
#not calculate rounding if modulus is 0 and division is even sale_data.update_attributes(grand_total: new_total,old_grand_total: sale_data.grand_total,rounding_adjustment:rounding_adj) if rounding_adj > 0
#calculate rounding if modulus is zero or not zero and division are not even
if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
new_total = Sale.get_rounding_adjustment(sale_data.grand_total)
rounding_adj = new_total-sale_data.grand_total
sale_data.update_attributes(grand_total: new_total,old_grand_total: sale_data.grand_total,rounding_adjustment:rounding_adj)
end
end end
#end rounding adjustment #end rounding adjustment
#record for sale audit #record for sale audit
@@ -151,15 +145,9 @@ class Origami::PaymentsController < BaseOrigamiController
# rounding adjustment # rounding adjustment
if !path.include? ("credit_payment") if !path.include? ("credit_payment")
if shop_detail.is_rounding_adj if shop_detail.is_rounding_adj
a = saleObj.grand_total % 25 # Modulus new_total = Sale.get_rounding_adjustment(saleObj.grand_total)
b = saleObj.grand_total / 25 # Division rounding_adj = new_total - saleObj.grand_total
#not calculate rounding if modulus is 0 and division is even saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj) if rounding_adj > 0
#calculate rounding if modulus is zero or not zero and division are not even
if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
new_total = Sale.get_rounding_adjustment(saleObj.grand_total)
rounding_adj = new_total-saleObj.grand_total
saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)
end
end end
end end
#end rounding adjustment #end rounding adjustment
@@ -839,7 +827,7 @@ class Origami::PaymentsController < BaseOrigamiController
def getCloudDomain def getCloudDomain
from = "" from = ""
if ENV["SERVER_MODE"] == 'cloud' if ENV["SERVER_MODE"] == 'cloud'
from = request.subdomain + "." + request.domain from = request.subdomain.to_s + "." + request.domain.to_s
end end
return from return from

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

@@ -22,7 +22,7 @@ class Origami::PendingOrderController < BaseOrigamiController
else else
redirect_to "/origami/#{params[:type]}" and return redirect_to "/origami/#{params[:type]}" and return
end end
elsif id.start_with?("BKI") elsif (id.start_with?("BKI") || id.start_with?("CBKI"))
@bookings = Booking.find(id) @bookings = Booking.find(id)
@order = @bookings.orders.where(status: "new").first @order = @bookings.orders.where(status: "new").first
@order_items = @bookings.order_items @order_items = @bookings.order_items

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

@@ -72,7 +72,7 @@ class Origami::SaleEditController < BaseOrigamiController
saleitemObj.status = 'foc' saleitemObj.status = 'foc'
saleitemObj.remark = remark saleitemObj.remark = remark
saleitemObj.save saleitemObj.save
@newsaleitem = SaleItem.new
@newsaleitem = saleitemObj.dup @newsaleitem = saleitemObj.dup
@newsaleitem.qty = saleitemObj.qty * -1 @newsaleitem.qty = saleitemObj.qty * -1
@newsaleitem.unit_price = saleitemObj.unit_price * 1 @newsaleitem.unit_price = saleitemObj.unit_price * 1
@@ -143,7 +143,7 @@ class Origami::SaleEditController < BaseOrigamiController
sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,current_user.name, 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'
saleitemObj.product_name = saleitemObj.product_name + ' (UPDATED)' saleitemObj.product_name = saleitemObj.product_name + ' (UPDATED)'
end end

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

@@ -333,7 +333,7 @@ class Origami::SplitBillController < BaseOrigamiController
end end
end end
Promotion.promo_activate(sale) Promotion.promo_activate(sale_data)
if ENV["SERVER_MODE"] == 'cloud' if ENV["SERVER_MODE"] == 'cloud'
from = request.subdomain + "." + request.domain from = request.subdomain + "." + request.domain
else else

2
app/models/order_reservation.rb
View File

@@ -75,7 +75,7 @@ class OrderReservation < ApplicationRecord
order_reservation.discount_amount = order_reserve[:payment_info][:discount_amount] order_reservation.discount_amount = order_reserve[:payment_info][:discount_amount]
order_reservation.convenience_charge = order_reserve[:payment_info][:convenience_charge] order_reservation.convenience_charge = order_reserve[:payment_info][:convenience_charge]
order_reservation.grand_total = order_reserve[:payment_info][:grand_total] order_reservation.grand_total = order_reserve[:payment_info][:grand_total]
order_reservation.transaction_fee = order_reserve[:payment_info][:transaction_fee] # order_reservation.transaction_fee = order_reserve[:payment_info][:transaction_fee]
order_reservation.order_remark = order_reserve[:order_info][:order_remark] order_reservation.order_remark = order_reserve[:order_info][:order_remark]
end end
if order_reserve[:reservation_info] if order_reserve[:reservation_info]

442
app/models/promotion.rb
View File

@@ -11,37 +11,23 @@ class Promotion < ApplicationRecord
PROMO_TYPE3 = "Net_price" # 1800 => 1000 => 1000 PROMO_TYPE3 = "Net_price" # 1800 => 1000 => 1000
PROMO_TYPE4 = "Percentage" PROMO_TYPE4 = "Percentage"
def is_promo_day
promo_day.include? Date.today.wday.to_s
end
def self.promo_activate(saleObj) def self.promo_activate(saleObj)
array_same =[]
current_day = Time.now.strftime("%Y-%m-%d") current_day = Time.now.strftime("%Y-%m-%d")
current_time = Time.now.strftime('%H:%M:%S') current_time = Time.now.strftime('%H:%M:%S')
day = Date.today.wday day = Date.today.wday
promoList = is_between_promo_datetime(current_day,current_time) promoList = is_between_promo_datetime(current_day,current_time)
puts "promoList - " + promoList.size.to_s
if promoList.size > 0 promoList.each do |promo|
itemList = combine_item(saleObj) if promo.is_promo_day
itemList.each do|list| if item = saleObj.qty_of(promo.original_product)
list.each do |l| check_promo_type(promo, item, saleObj)
array_same.push({
item_instance_code: l.item_instance_code,
order_id:l.order_id,
qty:l.qty
})
end end
end end
end end
item_list =[]
array_same.group_by do |same|
same.values_at :item_instance_code
end.map do |(item_instance_code), array_same|
quantities = array_same.map { |p| p[:qty] }
qty = quantities.all? ? quantities.reduce(:+) : nil
item_list.push({ item_instance_code: item_instance_code, qty: qty })
end
Rails.logger.debug "-------promo_activate array_same-------"
puts item_list.to_json
is_promo_day(promoList,day, item_list, saleObj.sale_id)
end end
def self.is_between_promo_datetime(current_day,current_time) #database is not local time def self.is_between_promo_datetime(current_day,current_time) #database is not local time
@@ -49,45 +35,7 @@ class Promotion < ApplicationRecord
return promoList return promoList
end end
def self.combine_item(saleObj) def self.check_promo_type(promo, orderitem, saleObj)
# order_id = saleObj.sale_orders[0][0].order_id
# itemList = OrderItem.where("order_id = ?", order_id).group(:item_instance_code).sum(:qty)
# array_same =[]
itemList = []
saleObj.sale_orders.each do |so|
# itemList << OrderItem.where("order_id = ?",so.order_id).group(["item_instance_code", "order_id"]).sum(:qty)
itemList << OrderItem.where("order_id = ?",so.order_id).select(:item_instance_code,:order_id,:qty)
end
return itemList
end
def self.is_promo_day(promoList, day, orderitemList, sale_id)
puts "Today date - " + day.to_s
promoList.each do |promo|
dayresult = promo.promo_day.include?(day.to_s)
if dayresult
orderitemList.each do |item|
find_promo_item(promo, item, sale_id)
end
end
end
end
def self.find_promo_item(promo, orderitem, sale_id)
item_code = OrderItem.find_by_item_instance_code(orderitem[:item_instance_code]).item_code
# orderitem.each do |odr_item|
if promo.original_product.downcase.to_s == orderitem[:item_instance_code]
if promo.min_qty.to_i > orderitem[:qty].to_i
return false
else
check_promo_type(promo,orderitem, sale_id)
end
end
# end
end
def self.check_promo_type(promo, orderitem, sale_id)
promo.promotion_products.each do |promo_product| promo.promotion_products.each do |promo_product|
if promo_product.item_code.downcase == orderitem[:item_instance_code] if promo_product.item_code.downcase == orderitem[:item_instance_code]
same = true same = true
@@ -97,20 +45,20 @@ class Promotion < ApplicationRecord
end end
# same, promo_product = check_giveaway_product(promo, orderitem[0][0]) # same, promo_product = check_giveaway_product(promo, orderitem[0][0])
if promo.promo_type == Promotion::PROMO_TYPE1 if promo.promo_type == Promotion::PROMO_TYPE1
if same if same
give_promotion_same_product(orderitem[:qty], promo.min_qty, promo_product.min_qty, orderitem, sale_id,promo_product.item_code) give_promotion_same_product(orderitem[:qty], promo.min_qty, promo_product.min_qty, orderitem, saleObj, promo_product.item_code)
else else
give_promotion_second_product(orderitem[:qty], promo.min_qty, promo_product.item_code, orderitem, sale_id) give_promotion_second_product(orderitem[:qty], promo.min_qty, promo_product.item_code, orderitem, saleObj)
end end
elsif promo.promo_type == Promotion::PROMO_TYPE2 elsif promo.promo_type == Promotion::PROMO_TYPE2
give_promotion_nett_off(same,promo_product,promo.min_qty, orderitem, sale_id) give_promotion_nett_off(same,promo_product,promo.min_qty, orderitem, saleObj)
elsif promo.promo_type == Promotion::PROMO_TYPE3 elsif promo.promo_type == Promotion::PROMO_TYPE3
give_promotion_nett_price(same,promo_product,promo.min_qty, orderitem, sale_id) give_promotion_nett_price(same,promo_product,promo.min_qty, orderitem, saleObj)
elsif promo.promo_type == Promotion::PROMO_TYPE4 elsif promo.promo_type == Promotion::PROMO_TYPE4
give_promotion_discount(same,promo_product,promo.min_qty, orderitem, sale_id) give_promotion_discount(same,promo_product,promo.min_qty, orderitem, saleObj)
end end
end end
end end
@@ -128,106 +76,66 @@ class Promotion < ApplicationRecord
# end # end
end end
def self.give_promotion_same_product(qty, promoqty, foc_min_qty, orderitem, sale_id,promo_product) def self.give_promotion_same_product(qty, promoqty, foc_min_qty, orderitem, saleObj,promo_product)
item ='' puts " Order qty: " + qty.to_s + " / promoqty: " + promoqty.to_s + " / giveaway: " + foc_min_qty.to_s
puts " Order qty: " + qty.to_s + " / promoqty: " + promoqty.to_s + " / giveaway: " + foc_min_qty.to_s multiple = qty.to_i / promoqty.to_i # loop count
multiple = qty.to_i / promoqty.to_i # loop count charge_qty = 0
charge_qty = 0 foc_qty = 0
foc_qty = 0 if multiple > 0
if multiple > 0 multiple.times.each do |key|
multiple.times.each do |key| if qty > promoqty
if qty > promoqty charge_qty += promoqty
charge_qty += promoqty different = qty - promoqty
different = qty - promoqty qty = different
qty = different if different == 0
if different == 0 foc_qty += foc_min_qty
foc_qty += foc_min_qty
else
foc_qty += foc_min_qty
qty = qty - foc_min_qty
end
else else
charge_qty += qty foc_qty += foc_min_qty
qty = qty - foc_min_qty
end end
else
charge_qty += qty
end end
if multiple == foc_qty end
charge_qty += qty if multiple == foc_qty
end
else
charge_qty += qty charge_qty += qty
end end
sale_order =SaleOrder.where("sale_id=?",sale_id) else
price =0 charge_qty += qty
source ='' end
sale_order.each do|order|
source = Order.find(order.order_id).source
end
item = OrderItem.where("item_instance_code = ?",orderitem[:item_instance_code]).order("order_items_id DESC").first price = 0
item ={ source = saleObj.orders.first.source
item_code:item.item_code, item = saleObj.order_items.where(item_instance_code: promo_product).first
item_instance_code:item.item_instance_code,
item_name:item.item_name,
alt_name:item.alt_name,
account_id:item.account_id,
price:item.price
}
if promo_product.downcase != item[:item_instance_code]
sale_order.each do|order| if !item.nil?
source = Order.find(order.order_id).source update_existing_item(foc_qty, item, sale_id, "promotion", item[:price], source)
end end
item = OrderItem.where("item_code = ?",promo_product).order("order_items_id DESC").first
item ={
item_code:item.item_code,
item_instance_code:item.item_instance_code,
item_name:item.item_name,
alt_name:item.alt_name,
account_id:item.account_id,
price:item.price
}
end
if !item.nil?
update_existing_item(foc_qty, item, sale_id, "promotion", item[:price],source)
end
end end
# AA - 10 # 3 # BB # orderList, #S34345 # AA - 10 # 3 # BB # orderList, #S34345
def self.give_promotion_second_product(orderitem_count, foc_min_qty, promo_product, orderitem, sale_id) def self.give_promotion_second_product(orderitem_count, foc_min_qty, promo_product, orderitem, saleObj)
source =''
item =''
puts "..... orderitem_count: " + orderitem_count.to_s + " / foc_min_qty: " + foc_min_qty.to_s + " /promo_product: " + promo_product + " orderitem: " + orderitem.to_s puts "..... orderitem_count: " + orderitem_count.to_s + " / foc_min_qty: " + foc_min_qty.to_s + " /promo_product: " + promo_product + " orderitem: " + orderitem.to_s
promotion_qty = orderitem_count.to_i / foc_min_qty.to_i # get foc item qty promotion_qty = orderitem_count.to_i / foc_min_qty.to_i # get foc item qty
foc_qty = find_second_item_qty(sale_id, promo_product) foc_qty = saleObj.qty_of(promo_product).qty rescue 0
if (foc_qty < promotion_qty) if (foc_qty < promotion_qty)
promotion_qty = foc_qty promotion_qty = foc_qty
end end
# item = OrderItem.find_by_item_instance_code(promo_product) # item = OrderItem.find_by_item_instance_code(promo_product)
sale_order =SaleOrder.where("sale_id=?",sale_id)
price =0 price = 0
sale_order.each do|order| source = saleObj.orders.first.source
source = Order.find(order.order_id).source item = saleObj.order_items.where(item_instance_code: promo_product).first
end
item = OrderItem.where("item_instance_code = ?",promo_product).order("order_items_id DESC").first
item ={
item_code:item.item_code,
item_instance_code:item.item_instance_code,
item_name:item.item_name,
alt_name:item.alt_name,
account_id:item.account_id,
price:item.price
}
# item = OrderItem.where("item_instance_code = '#{promo_product}' and order_id = '#{orderitem[0][1]}'").first
if !item.nil? if !item.nil?
# source = Order.find(item.order_id).source
update_existing_item(promotion_qty, item, sale_id, "promotion", item[:price],source) update_existing_item(promotion_qty, item, sale_id, "promotion", item[:price],source)
end end
end end
def self.update_existing_item(qty, item, saleObj, type, item_price,source)
def self.update_existing_item(qty, item, sale_id, type, item_price,source) if qty > 0
if qty >0
menu_category = MenuCategory.get_menu_category(item[:item_code]) #get menu category for menu items menu_category = MenuCategory.get_menu_category(item[:item_code]) #get menu category for menu items
sale_item = SaleItem.new sale_item = SaleItem.new
if !menu_category.nil? if !menu_category.nil?
sale_item.menu_category_code = menu_category.code sale_item.menu_category_code = menu_category.code
@@ -247,216 +155,84 @@ class Promotion < ApplicationRecord
sale_item.price = qty * item_price * (-1) sale_item.price = qty * item_price * (-1)
sale_item.is_taxable = 1 sale_item.is_taxable = 1
sale_item.sale_id = sale_id sale_item.sale = saleObj
sale_item.save sale_item.save
sale = Sale.find(sale_id)
sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount,nil,source) saleObj.compute_by_sale_items(saleObj.id, saleObj.sale_items, saleObj.total_discount,nil,source)
end end
end end
def self.give_promotion_nett_off(same, promo_product, foc_min_qty, orderitem, sale_id) def self.give_promotion_nett_off(same, promo_product, foc_min_qty, orderitem, saleObj)
item =''
source =''
puts " same: " + same.to_s + " promo_product: " + promo_product.item_code.to_s + " foc_min_qty: " + foc_min_qty.to_s + " orderitem: " + orderitem.to_s puts " same: " + same.to_s + " promo_product: " + promo_product.item_code.to_s + " foc_min_qty: " + foc_min_qty.to_s + " orderitem: " + orderitem.to_s
sale_order =SaleOrder.where("sale_id=?",sale_id)
if same
foc_qty = orderitem[:qty].to_i / foc_min_qty
# item = OrderItem.find_by_item_instance_code(orderitem[0][0])
price =0
sale_order.each do|order|
source = Order.find(order.order_id).source
end
item = OrderItem.where("item_instance_code = ?",orderitem[:item_instance_code]).order("order_items_id DESC").first
item ={
item_code:item.item_code,
item_instance_code:item.item_instance_code,
item_name:item.item_name,
alt_name:item.alt_name,
account_id:item.account_id,
price:item.price
}
# item = OrderItem.where("item_instance_code = '#{orderitem[0][0]}' and order_id = '#{orderitem[0][1]}'").first
if !item.nil?
# source = Order.find(item.order_id).source
update_existing_item(foc_qty, item, sale_id, "promotion nett off", promo_product.net_off,source)
end
else
foc_qty = orderitem[:qty].to_i / foc_min_qty
# foc_qty = find_second_item_qty(sale_id, promo_product.item_code)
# item = OrderItem.find_by_item_instance_code(promo_product.item_code)
# item = OrderItem.where("item_instance_code = '#{promo_product.item_code}' and order_id = '#{orderitem[0][1]}'").first
sale_order.each do|order|
source = Order.find(order.order_id).source
end
item = OrderItem.where("item_instance_code = ?",promo_product.item_code).order("order_items_id DESC").first
item ={
item_code:item.item_code,
item_instance_code:item.item_instance_code,
item_name:item.item_name,
alt_name:item.alt_name,
account_id:item.account_id,
price:item.price
}
if !item.nil?
# source = Order.find(item.order_id).source
update_existing_item(foc_qty, item, sale_id, "promotion nett off", promo_product.net_off,source)
end
end foc_qty = orderitem[:qty].to_i / foc_min_qty
end if !same
order_qty = saleObj.qty_of(promo_product.item_code).qty rescue 0
def self.give_promotion_nett_price(same, promo_product, foc_min_qty, orderitem, sale_id)
puts " same: " + same.to_s + " promo_product: " + promo_product.item_code.to_s + " foc_min_qty: " + foc_min_qty.to_s + " orderitem: " + orderitem.to_s
sale_order =SaleOrder.where("sale_id=?",sale_id)
source =''
item =''
if same
foc_qty = orderitem[:qty].to_i / foc_min_qty
# item = OrderItem.find_by_item_instance_code(orderitem[0][0]) # need to specify with menu item instance
# item = OrderItem.where("item_instance_code = '#{orderitem[0][0]}' and order_id = '#{orderitem[0][1]}'").first
sale_order.each do|order|
source = Order.find(order.order_id).source
end
item = OrderItem.where("item_instance_code = ?",orderitem[:item_instance_code]).order("order_items_id DESC").first
item ={
item_code:item.item_code,
item_instance_code:item.item_instance_code,
item_name:item.item_name,
alt_name:item.alt_name,
account_id:item.account_id,
price:item.price
}
if !item.nil?
price = item[:price].to_i - promo_product.net_price.to_i
# source = Order.find(item.order_id).source
update_existing_item(foc_qty, item, sale_id, "promotion nett price", price,source)
end
else
order_qty = find_second_item_qty(sale_id, promo_product.item_code)# need to check for qty
foc_qty = orderitem[:qty].to_i / foc_min_qty foc_qty = orderitem[:qty].to_i / foc_min_qty
if foc_qty > order_qty if foc_qty > order_qty
foc_qty = order_qty foc_qty = order_qty
end end
# item = OrderItem.find_by_item_instance_code(promo_product.item_code) end
# item = OrderItem.where("item_instance_code = '#{promo_product.item_code}' and order_id = '#{orderitem[0][1]}'").first
sale_order.each do|order|
source = Order.find(order.order_id).source
end
item = OrderItem.where("item_instance_code",promo_product.item_code).order("order_items_id DESC").first
item ={
item_code:item.item_code,
item_instance_code:item.item_instance_code,
item_name:item.item_name,
alt_name:item.alt_name,
account_id:item.account_id,
price:item.price
}
if !item.nil? source = saleObj.orders.first.source
price = item[:price].to_i - promo_product.net_price.to_i item = saleObj.order_items.where(item_instance_code: promo_product.item_code).first
# source = Order.find(item.order_id).source
update_existing_item(foc_qty, item, sale_id, "promotion nett price", price,source) if !item.nil?
end update_existing_item(foc_qty, item, sale_id, "promotion nett off", promo_product.net_off,source)
end end
end end
def self.give_promotion_discount(same, promo_product, foc_min_qty, orderitem, sale_id) def self.give_promotion_nett_price(same, promo_product, foc_min_qty, orderitem, saleObj)
puts " same: " + same.to_s + " promo_product: " + promo_product.item_code.to_s + " foc_min_qty: " + foc_min_qty.to_s + " orderitem: " + orderitem.to_s puts " same: " + same.to_s + " promo_product: " + promo_product.item_code.to_s + " foc_min_qty: " + foc_min_qty.to_s + " orderitem: " + orderitem.to_s
sale_order =SaleOrder.where("sale_id=?",sale_id)
source ='' foc_qty = orderitem[:qty].to_i / foc_min_qty
item ='' if !same
if same order_qty = saleObj.qty_of(promo_product.item_code).qty rescue 0
foc_qty = orderitem[:qty].to_i / foc_min_qty foc_qty = orderitem[:qty].to_i / foc_min_qty
# item = OrderItem.find_by_item_instance_code(orderitem[0][0])
# item = OrderItem.where("item_instance_code = '#{orderitem[0][0]}' and order_id = '#{orderitem[0][1]}'").first
sale_order.each do|order|
source = Order.find(order.order_id).source
end
item = OrderItem.where("item_instance_code = ?",orderitem[:item_instance_code]).order("order_items_id DESC").first
item ={
item_code:item.item_code,
item_instance_code:item.item_instance_code,
item_name:item.item_name,
alt_name:item.alt_name,
account_id:item.account_id,
price:item.price
}
# total = orderitem[1].to_i * item.price
if !item.nil?
total = item[:price]
price = calculate_discount(total, promo_product.percentage)
# source = Order.find(item.order_id).source
update_existing_item(foc_qty, item, sale_id, "promotion discount", price,source)
end
else
order_qty = find_second_item_qty(sale_id, promo_product.item_code) #need to check
foc_qty = orderitem[:qty].to_i / foc_min_qty
# give total qty is 1
#foc_qty = (foc_qty - foc_qty) + 1
if foc_qty > order_qty if foc_qty > order_qty
foc_qty = order_qty foc_qty = order_qty
end end
# item = OrderItem.find_by_item_instance_code(promo_product.item_code) end
# item = OrderItem.where("item_instance_code = '#{promo_product.item_code}' and order_id = '#{orderitem[0][1]}'").first
sale_order.each do|order| source = saleObj.orders.first.source
source = Order.find(order.order_id).source item = saleObj.order_items.where(item_instance_code: promo_product.item_code).first
end
item = OrderItem.where("item_instance_code = ?",promo_product.item_code).order("order_items_id DESC").first if !item.nil?
item ={ price = item[:price].to_i - promo_product.net_price.to_i
item_code:item.item_code, update_existing_item(foc_qty, item, saleObj, "promotion nett price", price,source)
item_instance_code:item.item_instance_code,
item_name:item.item_name,
alt_name:item.alt_name,
account_id:item.account_id,
price:item.price
}
# total = item.price * foc_qty
if !item.nil?
total = item[:price]
price = calculate_discount(total, promo_product.percentage)
# source = Order.find(item.order_id).source
update_existing_item(foc_qty, item, sale_id, "promotion discount", price,source)
end
end end
end end
def self.find_second_item_qty(sale_id, promo_item) def self.give_promotion_discount(same, promo_product, foc_min_qty, orderitem, saleObj)
array_same =[] puts " same: " + same.to_s + " promo_product: " + promo_product.item_code.to_s + " foc_min_qty: " + foc_min_qty.to_s + " orderitem: " + orderitem.to_s
saleObj = Sale.find_by_sale_id(sale_id)
itemList = combine_item(saleObj) foc_qty = orderitem[:qty].to_i / foc_min_qty
itemList.each do|list| if !same
list.each do |l| order_qty = saleObj.qty_of(promo_product.item_code).qty rescue 0
array_same.push({ foc_qty = orderitem[:qty].to_i / foc_min_qty
item_instance_code: l.item_instance_code,
order_id:l.order_id, if foc_qty > order_qty
qty:l.qty foc_qty = order_qty
})
end end
end end
item_list =[]
array_same.group_by do |same|
same.values_at :item_instance_code
end.map do |(item_instance_code), array_same|
quantities = array_same.map { |p| p[:qty] }
qty = quantities.all? ? quantities.reduce(:+) : nil
item_list.push({ item_instance_code: item_instance_code, qty: qty })
end
item_list.each do |item|
if item[:item_instance_code] == promo_item.downcase
return item[:qty].to_i
end
end
return 0
end
def self.calculate_discount(total, percentage) source = saleObj.orders.first.source
return (total.to_i * percentage.to_i) / 100 item = saleObj.order_items.where(item_instance_code: promo_product.item_code).first
end puts saleObj
puts item
# total = orderitem[1].to_i * item.price
if item
total = item[:price]
price = calculate_discount(total, promo_product.percentage)
# source = Order.find(item.order_id).source
update_existing_item(foc_qty, item, saleObj, "promotion discount", price,source)
end
end
def self.calculate_discount(total, percentage)
return (total * percentage) / 100
end
end end

304
app/models/sale.rb
View File

@@ -14,14 +14,20 @@ class Sale < ApplicationRecord
has_many :sale_payments has_many :sale_payments
has_many :sale_orders has_many :sale_orders
has_many :orders, through: :sale_orders has_many :orders, through: :sale_orders
has_many :order_items, through: :sale_orders
has_many :bookings has_many :bookings
has_many :product_commissions has_many :product_commissions
before_validation :round_to_precision
after_update :update_stock_journal after_update :update_stock_journal
scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") } scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
scope :complete_sale, -> { where("sale_status = 'completed' and receipt_date BETWEEN '#{DateTime.now.utc.beginning_of_day}' AND '#{DateTime.now.utc.end_of_day}'") } scope :complete_sale, -> { where("sale_status = 'completed' and receipt_date BETWEEN '#{DateTime.now.utc.beginning_of_day}' AND '#{DateTime.now.utc.end_of_day}'") }
def qty_of(item_instance_code)
order_items.select(:order_items_id, :item_instance_code, 'SUM(qty) as qty').where(item_instance_code: item_instance_code).group(:item_instance_code).first
end
REPORT_TYPE = { REPORT_TYPE = {
"daily" => 0, "daily" => 0,
"monthly" => 1, "monthly" => 1,
@@ -418,11 +424,11 @@ class Sale < ApplicationRecord
apply_tax(total_taxable, order_source, tax_type) apply_tax(total_taxable, order_source, tax_type)
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
self.grand_total_round # self.grand_total_round
#compute rounding adjustment #compute rounding adjustment
adjust_rounding # adjust_rounding
self.save! self.save!
@@ -455,7 +461,7 @@ class Sale < ApplicationRecord
sale.grand_total = 0 sale.grand_total = 0
else else
sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax
sale.grand_total_round # sale.grand_total_round
end end
if discount_type == "member_discount" if discount_type == "member_discount"
@@ -463,7 +469,6 @@ class Sale < ApplicationRecord
end end
#compute rounding adjustment #compute rounding adjustment
# adjust_rounding # adjust_rounding
sale.rounding_adjustment = compute_adjust_rounding(sale.grand_total)
sale.save! sale.save!
end end
@@ -491,11 +496,11 @@ class Sale < ApplicationRecord
apply_tax(total_taxable, order_source) 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
self.grand_total_round # self.grand_total_round
#compute rounding adjustment #compute rounding adjustment
adjust_rounding # adjust_rounding
self.save! self.save!
end end
@@ -509,89 +514,45 @@ class Sale < ApplicationRecord
# #delete existing and create new # #delete existing and create new
# existing_tax.delete # existing_tax.delete
# end # end
taxes = SaleTax.where("sale_id='#{sale.sale_id}'").pluck(:sale_tax_id) taxes = SaleTax.where("sale_id='#{self.sale_id}'").destroy_all
SaleTax.where("sale_tax_id IN (?)", taxes).destroy_all
total_tax_amount = 0 total_tax_amount = 0
tax_incl_exec = "exclusive" tax_incl_exec = "exclusive"
#tax_profile - list by order_by #tax_profile - list by order_by
# tax_profiles = TaxProfile.all.order("order_by asc") # tax_profiles = TaxProfile.all.order("order_by asc")
# customer = Customer.find(sale.customer_id) # customer = Customer.find(sale.customer_id)
arr_tax = []
arr_tax = unique_tax_profiles(order_source, self.customer_id)
if !arr_tax.empty?
if tax_type.nil?
tax_profiles = TaxProfile.where(:id => arr_tax)
else
tax_profiles = TaxProfile.where("group_type=?",order_source)
end
else
tax_profiles = TaxProfile.where("group_type=?",order_source)
end
# #Creat new tax records
if order_source.to_s == "emenu" if order_source.to_s == "emenu"
order_source = "cashier" order_source = "cashier"
end end
tax_profiles = unique_tax_profiles(order_source, self.customer_id)
# #Creat new tax records
if sale.payment_status != 'foc' if sale.payment_status != 'foc'
tax_profiles.each do |tax| tax_profiles.each do |tax|
if tax.group_type.to_s == order_source.to_s sale_tax = SaleTax.new(:sale => sale)
if tax_type sale_tax.tax_name = tax.name
if tax_type.to_s == tax.name.to_s || tax_type == 'all' sale_tax.tax_rate = tax.rate
sale_tax = SaleTax.new(:sale => sale)
sale_tax.tax_name = tax.name
sale_tax.tax_rate = tax.rate
# substract , to give after discount # substract , to give after discount
total_tax = total_taxable - total_discount total_tax = total_taxable - total_discount
#include or execulive #include or execulive
if tax.inclusive if tax.inclusive
tax_incl_exec = "inclusive" tax_incl_exec = "inclusive"
rate = tax.rate rate = tax.rate
divided_value = (100 + rate)/rate divided_value = (100 + rate)/rate
sale_tax.tax_payable_amount = total_tax / divided_value sale_tax.tax_payable_amount = total_tax / divided_value
else else
sale_tax.tax_payable_amount = total_tax * tax.rate / 100 sale_tax.tax_payable_amount = total_tax * tax.rate / 100
total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
end
#new taxable amount is standard rule for step by step
if shop.calc_tax_order
total_taxable = total_taxable + sale_tax.tax_payable_amount
end
sale_tax.inclusive = tax.inclusive
sale_tax.save
end
else
# customer.tax_profiles.each do |cus_tax|
# if cus_tax.to_i == tax.id
sale_tax = SaleTax.new(:sale => sale)
sale_tax.tax_name = tax.name
sale_tax.tax_rate = tax.rate
# substract , to give after discount
total_tax = total_taxable - total_discount
#include or execulive
if tax.inclusive
tax_incl_exec = "inclusive"
rate = tax.rate
divided_value = (100 + rate)/rate
sale_tax.tax_payable_amount = total_tax / divided_value
else
sale_tax.tax_payable_amount = total_tax * tax.rate / 100
total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
end
#new taxable amount is standard rule for step by step
if shop.calc_tax_order
total_taxable = total_taxable + sale_tax.tax_payable_amount
end
sale_tax.inclusive = tax.inclusive
sale_tax.save
# end
# end
end
end end
#new taxable amount is standard rule for step by step
if shop.calc_tax_order
total_taxable = total_taxable + sale_tax.tax_payable_amount
end
sale_tax.inclusive = tax.inclusive
sale_tax.save
end end
end end
sale.tax_type = tax_incl_exec sale.tax_type = tax_incl_exec
@@ -608,8 +569,7 @@ class Sale < ApplicationRecord
# existing_tax.delete # existing_tax.delete
# end # end
taxes = SaleTax.where("sale_id='#{self.sale_id}'").pluck(:sale_tax_id) taxes = SaleTax.where("sale_id='#{self.sale_id}'").destroy_all
SaleTax.where("sale_tax_id IN (?)", taxes).destroy_all
total_tax_amount = 0 total_tax_amount = 0
tax_incl_exec = "exclusive" tax_incl_exec = "exclusive"
@@ -622,77 +582,34 @@ class Sale < ApplicationRecord
# tax_data = TaxProfile.unscoped.where("group_type=?",order_source).pluck(:id) # tax_data = TaxProfile.unscoped.where("group_type=?",order_source).pluck(:id)
# customer = Customer.find(self.customer_id).tax_profiles # customer = Customer.find(self.customer_id).tax_profiles
arr_tax = [] tax_profiles = unique_tax_profiles(order_source, self.customer_id)
arr_tax = unique_tax_profiles(order_source, self.customer_id)
if !arr_tax.empty?
if tax_type.nil?
tax_profiles = TaxProfile.where(:id => arr_tax)
else
tax_profiles = TaxProfile.where("group_type=?",order_source)
end
else
tax_profiles = TaxProfile.where("group_type=?",order_source)
end
#Create new tax records #Create new tax records
tax_profiles.each do |tax| tax_profiles.each do |tax|
if tax.group_type.to_s == order_source.to_s sale_tax = SaleTax.new(:sale => self)
if tax_type sale_tax.tax_name = tax.name
if tax_type.to_s == tax.name.to_s || tax_type == 'all' sale_tax.tax_rate = tax.rate
sale_tax = SaleTax.new(:sale => self)
sale_tax.tax_name = tax.name
sale_tax.tax_rate = tax.rate
# substract , to give after discount # substract , to give after discount
total_tax = total_taxable - total_discount total_tax = total_taxable - self.total_discount
#include or execulive #include or execulive
if tax.inclusive if tax.inclusive
tax_incl_exec = "inclusive" tax_incl_exec = "inclusive"
rate = tax.rate rate = tax.rate
divided_value = (100 + rate)/rate divided_value = (100 + rate)/rate
sale_tax.tax_payable_amount = total_tax / divided_value sale_tax.tax_payable_amount = total_tax / divided_value
else else
sale_tax.tax_payable_amount = total_tax * tax.rate / 100 sale_tax.tax_payable_amount = total_tax * tax.rate / 100
total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
end
#new taxable amount is standard rule for step by step
if shop.calc_tax_order
total_taxable = total_taxable + sale_tax.tax_payable_amount
end
sale_tax.inclusive = tax.inclusive
sale_tax.save
end
else
# customer.tax_profiles.each do |cus_tax|
# if cus_tax.to_i == tax.id
sale_tax = SaleTax.new(:sale => self)
sale_tax.tax_name = tax.name
sale_tax.tax_rate = tax.rate
# substract , to give after discount
total_tax = total_taxable - self.total_discount
#include or execulive
if tax.inclusive
tax_incl_exec = "inclusive"
rate = tax.rate
divided_value = (100 + rate)/rate
sale_tax.tax_payable_amount = total_tax / divided_value
else
sale_tax.tax_payable_amount = total_tax * tax.rate / 100
total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount
end
#new taxable amount is standard rule for step by step
if shop.calc_tax_order
total_taxable = total_taxable + sale_tax.tax_payable_amount
end
sale_tax.inclusive = tax.inclusive
sale_tax.save
# end
# end
end
end end
#new taxable amount is standard rule for step by step
if shop.calc_tax_order
total_taxable = total_taxable + sale_tax.tax_payable_amount
end
sale_tax.inclusive = tax.inclusive
sale_tax.save
end end
self.tax_type = tax_incl_exec self.tax_type = tax_incl_exec
self.total_tax = total_tax_amount self.total_tax = total_tax_amount
@@ -727,42 +644,16 @@ class Sale < ApplicationRecord
shop_details = Shop.first shop_details = Shop.first
# rounding adjustment # rounding adjustment
if shop_details.is_rounding_adj if shop_details.is_rounding_adj
a = self.grand_total % 25 # Modulus new_total = Sale.get_rounding_adjustment(self.grand_total)
b = self.grand_total / 25 # Division self.rounding_adjustment = new_total - self.grand_total
#not calculate rounding if modulus is 0 and division is even self.old_grand_total = self.grand_total
#calculate rounding if modulus is zero or not zero and division are not even self.grand_total = new_total
if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
new_total = Sale.get_rounding_adjustment(self.grand_total)
self.rounding_adjustment = new_total - self.grand_total
else
self.rounding_adjustment = 0.00
end
else else
self.rounding_adjustment = 0.00 self.rounding_adjustment = 0.00
end end
end end
def compute_adjust_rounding(grand_total)
shop_details = Shop.first
# rounding adjustment
if shop_details.is_rounding_adj
a = grand_total % 25 # Modulus
b = grand_total / 25 # Division
#not calculate rounding if modulus is 0 and division is even
#calculate rounding if modulus is zero or not zero and division are not even
if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
new_total = Sale.get_rounding_adjustment(grand_total)
rounding_adjustment = new_total - grand_total
else
rounding_adjustment = 0.00
end
else
rounding_adjustment = 0.00
end
return rounding_adjustment
end
#Generate new Receipt No when it is not assigned #Generate new Receipt No when it is not assigned
def generate_receipt_no def generate_receipt_no
#shop_code and client_code #shop_code and client_code
@@ -857,36 +748,16 @@ class Sale < ApplicationRecord
# if get_rounded_amt == true # if get_rounded_amt == true
value = 0 value = 0
num = num.to_f.round # num = num.to_f.round
get_last_no = num.to_s.last(2).to_f mod = num % 50
if get_last_no.between?(0,25) if mod > 0 && mod <= 25
## down to 0 num -= mod
num -= get_last_no elsif mod > 25
else num += 50 - mod
if get_last_no.between?(26,50)
## up to 50
value = 50 - get_last_no.to_f
num += value
puts 'up to 50'
else
if get_last_no.between?(51, 75)
## down to 50
value = get_last_no.to_f - 50
num -= value
puts 'down to 50'
else
## up to 100
value = 100 - get_last_no.to_f
num += value
puts 'up to 100'
end
end
end end
# end
return num return num
end end
def self.daily_sales_list(from,to) def self.daily_sales_list(from,to)
sub_query = "SELECT (CASE WHEN SUM(sale_payments.payment_amount) > 0 THEN sub_query = "SELECT (CASE WHEN SUM(sale_payments.payment_amount) > 0 THEN
(SUM(sale_payments.payment_amount) + SUM(sale_payments.outstanding_amount)) ELSE 0 END) (SUM(sale_payments.payment_amount) + SUM(sale_payments.outstanding_amount)) ELSE 0 END)
@@ -2646,20 +2517,15 @@ def self.get_sale_data_for_other_payment_credit(sale_id)
end end
def unique_tax_profiles(order_source, customer_id) def unique_tax_profiles(order_source, customer_id)
tax_data = TaxProfile.where("group_type='#{order_source}'").pluck(:id) tax_data = TaxProfile
customer_tax_profiles = Customer.find(customer_id).tax_profiles .where(group_type: order_source)
arr_data = [] customer_tax_profiles = Customer.select(:tax_profiles).where(customer_id: customer_id).first
if !customer_tax_profiles.empty? if customer_tax_profiles.present?
customer_tax_profiles.each do |value1| tax_data = tax_data.where(id: customer_tax_profiles.tax_profiles)
if tax_data.include? value1.to_i
arr_data.push(value1.to_i)
end
end
return arr_data
else
return tax_data
end end
return tax_data
end end
def self.top_bottom(today,shift=nil,from=nil,to=nil,from_time=nil,to_time=nil) def self.top_bottom(today,shift=nil,from=nil,to=nil,from_time=nil,to_time=nil)
@@ -3026,6 +2892,20 @@ private
end end
end end
def round_to_precision
if (self.total_amount != self.total_amount_was || self.total_discount != self.total_discount_was || self.total_tax != self.total_tax_was)
if (self.total_amount % 1 > 0 || self.total_discount % 1 > 0 || self.total_tax % 1 > 0)
precision = PrintSetting.get_precision_delimiter().precision.to_i
self.total_amount = self.total_amount.round(precision)
self.total_discount = self.total_discount.round(precision)
self.total_tax = self.total_tax.round(precision)
self.grand_total = (self.total_amount - self.total_discount) + self.total_tax
end
adjust_rounding
end
end
def update_stock_journal def update_stock_journal
if self.sale_status == "void" && self.sale_status_before_last_save != "void" if self.sale_status == "void" && self.sale_status_before_last_save != "void"
self.sale_items.each do |item| self.sale_items.each do |item|

19
app/models/sale_item.rb
View File

@@ -11,6 +11,7 @@ class SaleItem < ApplicationRecord
def compute_item def compute_item
end end
before_validation :round_to_precision
after_update :update_stock_journal after_update :update_stock_journal
# Add Sale Items # Add Sale Items
@@ -231,6 +232,24 @@ class SaleItem < ApplicationRecord
end end
end end
def round_to_precision
unit_price_fraction = self.unit_price % 1
price_fraction = self.unit_price % 1
# is_dining_charge = self.menu_category_code == 'DingingCharge'
if self.unit_price != self.unit_price_was || self.price != self.price_was
if unit_price_fraction > 0 || price_fraction > 0
if ['Discount', 'promotion'].include?(self.status)
precision = PrintSetting.get_precision_delimiter().precision.to_i
self.unit_price = self.unit_price.round(precision)
self.price = (self.unit_price * self.qty).round(precision)
self.taxable_price = self.price
end
end
end
end
def update_stock_journal def update_stock_journal
is_void = self.status == "void" && self.status_before_last_save != "void" is_void = self.status == "void" && self.status_before_last_save != "void"
cancel_void = self.status_before_last_save == "void" && self.status.nil? cancel_void = self.status_before_last_save == "void" && self.status.nil?

5
app/models/sale_order.rb
View File

@@ -6,8 +6,9 @@ class SaleOrder < ApplicationRecord
belongs_to :sale belongs_to :sale
belongs_to :order belongs_to :order
has_many :order_items, foreign_key: "order_id", primary_key: "order_id"
def create_sale_order(sale_id, order_id) def create_sale_order(sale_id, order_id)
# sale_order = SaleOrder.new # sale_order = SaleOrder.new
self.sale_id = sale_id self.sale_id = sale_id
self.order_id = order_id self.order_id = order_id
@@ -37,6 +38,6 @@ class SaleOrder < ApplicationRecord
if self.sale_order_id.nil? if self.sale_order_id.nil?
self.sale_order_id = SeedGenerator.generate_id(self.class.name, 'SOI') self.sale_order_id = SeedGenerator.generate_id(self.class.name, 'SOI')
end end
end end
end end

11
app/models/sale_tax.rb
View File

@@ -5,6 +5,8 @@ class SaleTax < ApplicationRecord
before_create :generate_custom_id before_create :generate_custom_id
belongs_to :sale belongs_to :sale
before_validation :round_to_precision
def self.sync_sale_tax_records(sale_taxes) def self.sync_sale_tax_records(sale_taxes)
if !sale_taxes.nil? if !sale_taxes.nil?
sale_taxes.each do |t| sale_taxes.each do |t|
@@ -38,4 +40,13 @@ class SaleTax < ApplicationRecord
self.sale_tax_id = SeedGenerator.generate_id(self.class.name, "STI") self.sale_tax_id = SeedGenerator.generate_id(self.class.name, "STI")
end end
end end
def round_to_precision
if self.tax_payable_amount != self.tax_payable_amount_was
if self.tax_payable_amount % 1 > 0
precision = PrintSetting.get_precision_delimiter().precision.to_i
self.tax_payable_amount = self.tax_payable_amount.round(precision)
end
end
end
end end

347
app/views/origami/discounts/index.html.erb
View File

@@ -34,7 +34,7 @@
<span class="hidden" id ="table_id" value="<%=@table%>"><%=@table%></span> <span class="hidden" id ="table_id" value="<%=@table%>"><%=@table%></span>
<span class="hidden" id="table_type" value="<%=@table%>"><%=@table%></span> <span class="hidden" id="table_type" value="<%=@table%>"><%=@table%></span>
<%end%> <%end%>
<p id="sale-id" class="hidden"><%=@sale_data.sale_id %></p> <p id="sale-id" class="hidden"><%=@sale_data.sale_id %></p>
<p class="m-l-10">Receipt No: <span id="receipt_no"><%=@sale_data.receipt_no rescue ' '%></span></p> <p class="m-l-10">Receipt No: <span id="receipt_no"><%=@sale_data.receipt_no rescue ' '%></span></p>
<!-- <p>Cashier: <span id="cashier"><%=@sale_data.cashier_name rescue ' '%></span></p> --> <!-- <p>Cashier: <span id="cashier"><%=@sale_data.cashier_name rescue ' '%></span></p> -->
@@ -44,24 +44,22 @@
</div> </div>
</div> </div>
<div id="order-detail-slimscroll" data-height="160"> <div id="order-detail-slimscroll" data-height="160">
<div class="card-text dining"> <div class="card-text dining">
<span id="discount_itemsErr" style="color:red;"></span> <span id="discount_itemsErr" style="color:red;"></span>
<table class="table table-default" id="order-items-table"> <table class="table table-default" id="order-items-table">
<thead> <thead>
<tr> <tr>
<th class="item-name">Items</th> <th class="item-name">Items</th>
<th class="item-attr">QTY</th> <th class="item-attr">QTY</th>
<th class="item-attr">Price</th> <th class="item-attr">Price</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% sub_total = 0 %> <% sub_total = 0 %>
<% @sale_data.sale_items.each do |sale_item| %> <% @sale_data.sale_items.each do |sale_item| %>
<% <% sub_total += sale_item.qty * sale_item.unit_price %>
sub_total += sale_item.qty*sale_item.unit_price <% if sale_item.price > 0 && sale_item.status.blank? %>
if sale_item.price != 0 && sale_item.status != "void" && sale_item.status != "foc" <tr class="item-row item" id=<%= sale_item.sale_item_id %> >
%>
<tr class="item-row" id=<%= sale_item.sale_item_id %> >
<td style="width:60%; text-align:left"> <td style="width:60%; text-align:left">
<span id="item-account-type" class="hidden"><%=sale_item.account_id%></span> <span id="item-account-type" class="hidden"><%=sale_item.account_id%></span>
<span id="item-account-qty" class="hidden"><%=sale_item.qty%></span> <span id="item-account-qty" class="hidden"><%=sale_item.qty%></span>
@@ -74,14 +72,26 @@
<span id="item-total-price"><%=(sale_item.qty*sale_item.unit_price)%></span> <span id="item-total-price"><%=(sale_item.qty*sale_item.unit_price)%></span>
</td> </td>
</tr> </tr>
<% <% elsif sale_item.price < 0 && sale_item.status == "Discount" %>
end <tr class="item-row discount" id=<%= sale_item.sale_item_id %> >
end <td style="width:60%; text-align:left">
%> <span id="item-account-type" class="hidden"><%=sale_item.account_id%></span>
</tbody> <span id="item-account-qty" class="hidden"><%=sale_item.qty%></span>
</table> <span id="item-name-price"><%=sale_item.product_name%>@<%=sale_item.unit_price%></span>
</div> </td>
</div> <td style="width:20%; text-align:right">
<span id="item-qty"><%=sale_item.qty.abs%></span>
</td>
<td style="width:20%; text-align:right">
<span id="item-total-price"><%=(sale_item.qty*sale_item.unit_price)%></span>
</td>
</tr>
<% end %>
<% end %>
</tbody>
</table>
</div>
</div>
<div class="card-footer"> <div class="card-footer">
<table class="table" id="order-charges-table" border="0"> <table class="table" id="order-charges-table" border="0">
<tr> <tr>
@@ -130,18 +140,18 @@
<div class="card-block"> <div class="card-block">
<div class="card-title"> <div class="card-title">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="col-md-12"> <div class="col-md-12">
<div class="form-group"> <div class="form-group">
<input type="text" id="discount-amount" name="discount-amount" value="<%= @sale_data.total_discount rescue 0 %>" class="form-control" /> <input type="text" id="discount-amount" name="discount-amount" value="0" class="form-control" />
<span id="discount-amountErr" style="color:red;"></span> <span id="discount-amountErr" style="color:red;"></span>
</div> </div>
<br> <br>
<div class="form-group"> <div class="form-group">
<% @accounts.each do |acc| %> <% @accounts.each do |acc| %>
<button id="account-<%= acc.id %>" class="accounts-type btn bg-default"><%= acc.title %></button> <button id="account-<%= acc.id %>" class="accounts-type btn bg-default"><%= acc.title %></button>
<% end %> <% end %>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@@ -217,11 +227,11 @@
<div class="col-md-4"> <div class="col-md-4">
<div class="form-group"> <div class="form-group">
<button id="net" class="btn bg-info fluid action-btn">Nett</button> <button id="net" class="btn bg-info fluid action-btn">Nett</button>
<button id="percentage" class="btn bg-primary fluid action-btn" style="font-size: 12.4px">Percentage</button> <button id="percentage" class="btn bg-primary fluid action-btn" style="font-size: 12.4px">Percentage</button>
<button id="remove-item" class="btn bg-default fluid action-btn">Clear Discount</button> <button id="remove-item" class="btn bg-default fluid action-btn">Clear Discount</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@@ -235,7 +245,7 @@
<div class="form-horizontal"> <div class="form-horizontal">
<div class="p-l-20"> <div class="p-l-20">
<div class="row"> <div class="row">
<div class="col-md-8 form-group"> <div class="col-md-8 form-group">
<div class="form-group"> <div class="form-group">
<input type="text" id="promo-code" name="promo-code" value="" class="form-control" /></span> <input type="text" id="promo-code" name="promo-code" value="" class="form-control" /></span>
</div> </div>
@@ -243,11 +253,11 @@
<div class="col-md-4"> <div class="col-md-4">
<button id="" class="btn bg-primary btn-block action-btn">Promo</button> <button id="" class="btn bg-primary btn-block action-btn">Promo</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> --> </div> -->
</div> </div>
<!-- Column Three --> <!-- Column Three -->
@@ -259,7 +269,7 @@
<button id="remove-all" class="btn bg-primary btn-block action-btn">Remove All</button> <button id="remove-all" class="btn bg-primary btn-block action-btn">Remove All</button>
<button id="pay-discount" class="btn bg-primary btn-block action-btn">Enter</button> <button id="pay-discount" class="btn bg-primary btn-block action-btn">Enter</button>
<% if @member_discount%> <% if @member_discount%>
<!-- <hr /> <!-- <hr />
<button id="member-discount" class="btn btn-success btn-block action-btn <button id="member-discount" class="btn btn-success btn-block action-btn
<%= @sale_data.customer.membership_id ? " " : "disabled"%>">Member Discount</button> --> <%= @sale_data.customer.membership_id ? " " : "disabled"%>">Member Discount</button> -->
<%end %> <%end %>
@@ -270,6 +280,9 @@
<script type="text/javascript"> <script type="text/javascript">
var cashier_type = "<%= @cashier_type %>"; var cashier_type = "<%= @cashier_type %>";
var totalAmount = <%= sub_total %>;
var totalDiscount = <%= @sale_data.total_discount %>
var precision = <%= precision %>;
$(document).ready(function(){ $(document).ready(function(){
setHeaderBreadCrumb(_DISCOUNTS_); setHeaderBreadCrumb(_DISCOUNTS_);
/* check webview loaded*/ /* check webview loaded*/
@@ -300,10 +313,10 @@ var cashier_type = "<%= @cashier_type %>";
case 'num': case 'num':
var input_value = $(this).attr("data-value"); var input_value = $(this).attr("data-value");
if (original_value == "0.0"){ if (original_value == "0.0"){
$('#discount-amount').val(input_value); $('#discount-amount').val(input_value);
} }
else{ else{
$('#discount-amount').val(original_value + '' + input_value); $('#discount-amount').val(original_value + '' + input_value);
} }
break; break;
case 'add': case 'add':
@@ -313,10 +326,10 @@ var cashier_type = "<%= @cashier_type %>";
break; break;
case 'del' : case 'del' :
var discount_text=$('#discount-amount').val(); var discount_text=$('#discount-amount').val();
$('#discount-amount').val(discount_text.substr(0,discount_text.length-1)); $('#discount-amount').val(discount_text.substr(0,discount_text.length-1));
break; break;
case 'clr': case 'clr':
$('#discount-amount').val("0.0"); $('#discount-amount').val("0.0");
break; break;
} }
event.handled = true; event.handled = true;
@@ -326,28 +339,12 @@ var cashier_type = "<%= @cashier_type %>";
}); });
// Select Sale Item // Select Sale Item
$('.item-row').on('click',function(){ $('#order-items-table').on('click', '.item-row', function(){
if($(this).hasClass('selected-item') == true){ if($(this).hasClass('selected-item') == true){
$(this).removeClass('selected-item'); $(this).removeClass('selected-item');
} }
else { else {
if(parseInt($(this).children().find("#item-account-qty").text()) >0 && parseInt($(this).children().find("#item-total-price").text()) >0){ $(this).addClass('selected-item');
$(this).addClass('selected-item');
}
}
});
// Select discount-item
$('#order-items-table tbody').on('click', '.discount-item-row',function(){
if($(this).hasClass('selected-item') == true){
$(this).removeClass('selected-item');
}
else {
if(parseInt($(this).children().find("#item-account-qty").text()) >0 && parseInt($(this).children().find("#item-total-price").text()) >0){
$(this).addClass('selected-item');
}
} }
}); });
@@ -374,7 +371,7 @@ var cashier_type = "<%= @cashier_type %>";
} }
} }
}); });
} }
}); });
// Calculate Net Discount for Payment // Calculate Net Discount for Payment
@@ -384,7 +381,7 @@ var cashier_type = "<%= @cashier_type %>";
var discount_value = $('#discount-amount').val(); var discount_value = $('#discount-amount').val();
var sub_total = parseFloat($('#order-sub-total').text()); var sub_total = parseFloat($('#order-sub-total').text());
var ajax_url = "/origami/" + sale_id + "/discount"; var ajax_url = "/origami/" + sale_id + "/discount";
if(discount_value!=""){ if(discount_value!=""){
if(discount_value > 0){ if(discount_value > 0){
if(parseFloat(discount_value) > sub_total){ if(parseFloat(discount_value) > sub_total){
@@ -393,7 +390,7 @@ var cashier_type = "<%= @cashier_type %>";
}else{ }else{
$("#discount-amountErr").html(""); $("#discount-amountErr").html("");
// Selected Items // Selected Items
var sale_items = get_selected_sale_items(); var sale_items = get_selected_sale_items();
// Selected Account // Selected Account
var account_types = get_selected_account_types(); var account_types = get_selected_account_types();
@@ -401,9 +398,9 @@ var cashier_type = "<%= @cashier_type %>";
if(sale_items.length == 0 && account_types.length == 0){ if(sale_items.length == 0 && account_types.length == 0){
calculate_overall_discount(0, discount_value); calculate_overall_discount(0, discount_value);
} }
else { else if(sale_items.length > 0){
calculate_item_discount(0, discount_value, sale_items, account_types); calculate_item_discount(0, discount_value, sale_items, account_types);
} }
// Remove Selection // Remove Selection
selection_remove(); selection_remove();
@@ -414,7 +411,7 @@ var cashier_type = "<%= @cashier_type %>";
}else{ }else{
$("#discount-amountErr").html("can't be blank"); $("#discount-amountErr").html("can't be blank");
} }
}); });
// Calculate Percentage Discount for Payment // Calculate Percentage Discount for Payment
@@ -424,34 +421,46 @@ var cashier_type = "<%= @cashier_type %>";
var discount_value = $('#discount-amount').val(); var discount_value = $('#discount-amount').val();
var ajax_url = "/origami/" + sale_id + "/discount"; var ajax_url = "/origami/" + sale_id + "/discount";
// Selected Items if(discount_value!=""){
var sale_items = get_selected_sale_items(); if(discount_value > 0){
// Selected Account $("#discount-amountErr").val("");
var account_types = get_selected_account_types();
// Selected Items
if(sale_items.length == 0 && account_types.length == 0){ var sale_items = get_selected_sale_items();
calculate_overall_discount(1, discount_value); // Selected Account
} var account_types = get_selected_account_types();
else {
calculate_item_discount(1, discount_value, sale_items, account_types); if(sale_items.length == 0 && account_types.length == 0){
calculate_overall_discount(1, discount_value);
} else if(sale_items.length > 0){
calculate_item_discount(1, discount_value, sale_items, account_types);
}
}else{
$("#discount-amountErr").html("Discount must be greater than 0!");
}
}else{
$("#discount-amountErr").html("can't be blank");
} }
// Remove Selection // Remove Selection
selection_remove(); selection_remove();
}); });
// Remove selected discount items // Remove selected discount items
$("#remove-item").on('click', function(e){ $("#remove-item").on('click', function(e){
e.preventDefault(); e.preventDefault();
var origin_sub_total = parseFloat($("#order-sub-total").text()); var origin_sub_total = parseFloat($("#order-sub-total").text());
var total = 0; // var total = 0;
$('.discount-item-row.selected-item').each(function(i){ $('.item-row.new-discount').each(function(i){
var amount = parseFloat($(this).find('#item-total-price').text()); var amount = parseFloat($(this).find('#item-total-price').text());
total = total + Math.abs(amount); totalAmount += Math.abs(amount)
// total = total + Math.abs(amount);
$(this).remove(); $(this).remove();
}); });
$("#order-sub-total").text(origin_sub_total + total);
$("#order-sub-total").text(totalAmount);
$("#order-discount").text(totalDiscount.toFixed(<%= precision.to_i %>));
}); });
// Pay Discount for Payment // Pay Discount for Payment
@@ -462,10 +471,10 @@ var cashier_type = "<%= @cashier_type %>";
} }
$("#loading_wrapper").show(); $("#loading_wrapper").show();
var sale_id = $('#sale-id').text(); var sale_id = $('#sale-id').text();
var discount_items = JSON.stringify(get_discount_item_rows()); var discount_items = JSON.stringify(get_new_discount_item_rows());
var overall_discount = $("#order-discount").text(); var overall_discount = $("#order-discount").text();
var sub_total = $('#order-sub-total').text(); var sub_total = $('#order-sub-total').text();
var ajax_url = "/origami/" + sale_id + "/discount"; var ajax_url = "/origami/" + sale_id + "/discount";
var params = { 'cashier_type' : cashier_type,'sale_id': sale_id, 'sub_total': sub_total, 'discount_items': discount_items, 'overall_discount': overall_discount }; var params = { 'cashier_type' : cashier_type,'sale_id': sale_id, 'sub_total': sub_total, 'discount_items': discount_items, 'overall_discount': overall_discount };
@@ -473,8 +482,8 @@ var cashier_type = "<%= @cashier_type %>";
type: "POST", type: "POST",
url: ajax_url, url: ajax_url,
data: params, data: params,
success:function(result){ success:function(result){
$("#loading_wrapper").hide(); $("#loading_wrapper").hide();
swal({ swal({
title: "Information!", title: "Information!",
text: result.status, text: result.status,
@@ -489,7 +498,7 @@ var cashier_type = "<%= @cashier_type %>";
window.location.href = "/origami/room/" + result.table_id window.location.href = "/origami/room/" + result.table_id
} }
} }
}); });
} }
}); });
}); });
@@ -500,13 +509,7 @@ var cashier_type = "<%= @cashier_type %>";
var sale_id = $('#sale-id').text(); var sale_id = $('#sale-id').text();
var discount_items = []; var discount_items = [];
// Selected Items var sale_items = get_selected_discount_items();
var sale_items = get_selected_sale_items();
if(sale_items.length == 0){
//swal("Information!", "You have no selected item!");
swal ( "Oops" , "You have no selected item!" , "error" );
return;
}
for(var i=0;i < sale_items.length;i++){ for(var i=0;i < sale_items.length;i++){
if(sale_items[i].price < 0){ if(sale_items[i].price < 0){
@@ -514,7 +517,7 @@ var cashier_type = "<%= @cashier_type %>";
} }
else { else {
swal ("Oops" , "You have no selected item!" , "error" ); swal ("Oops" , "You have no selected item!" , "error" );
return; return;
} }
} }
@@ -539,7 +542,7 @@ var cashier_type = "<%= @cashier_type %>";
window.location.href = "/origami/room/" + result.table_id window.location.href = "/origami/room/" + result.table_id
} }
} }
}); });
} }
}); });
}); });
@@ -566,7 +569,7 @@ var cashier_type = "<%= @cashier_type %>";
window.location.href = "/origami/room/" + result.table_id window.location.href = "/origami/room/" + result.table_id
} }
} }
}); });
} }
}); });
}); });
@@ -575,8 +578,8 @@ var cashier_type = "<%= @cashier_type %>";
$("#member-discount").on('click', function(e){ $("#member-discount").on('click', function(e){
e.preventDefault(); e.preventDefault();
var sale_id = $('#sale-id').text(); var sale_id = $('#sale-id').text();
var sub_total = $('#order-sub-total').text(); var sub_total = $('#order-sub-total').text();
var ajax_url = "/origami/" + sale_id + "/member_discount"; var ajax_url = "/origami/" + sale_id + "/member_discount";
// Selected Account // Selected Account
//var account_types = JSON.stringify(get_selected_account_types()); //var account_types = JSON.stringify(get_selected_account_types());
@@ -618,96 +621,95 @@ var cashier_type = "<%= @cashier_type %>";
}); });
} }
}); });
});//end member discount });//end member discount
}); });
/* Remove Selection */ /* Remove Selection */
function selection_remove(){ function selection_remove(){
$(".item-row").removeClass("selected-item"); $(".item-row").removeClass("selected-item");
$(".discount_item_row").removeClass("selected-item");
$(".accounts-type").removeClass("selected-account"); $(".accounts-type").removeClass("selected-account");
} }
/* Get Item rows but not discount*/ /* Get Item rows but not discount*/
function get_item_rows(){ function get_item_rows(){
var sale_items = []; var sale_items = [];
$('.item-row').not('.discount-item-row').each(function(i){ $('.item-row.item').not('.discount').each(function(i){
var sale_item = {}; var sale_item = {};
sale_item.id = $(this).attr('id').substr(0,16); sale_item.id = $(this).attr('id').substr(0,16);
sale_item.name = $(this).find('#item-name-price').text().split('@')[0]; sale_item.name = $(this).find('#item-name-price').text().split('@')[0];
sale_item.account_id = $(this).find('#item-account-type').text(); sale_item.account_id = $(this).find('#item-account-type').text();
sale_item.price = $(this).find('#item-total-price').text(); sale_item.price = $(this).find('#item-total-price').text();
sale_items.push(sale_item); sale_items.push(sale_item);
}); });
return sale_items; return sale_items;
} }
/* Get discount Item rows */ /* Get discount Item rows */
function get_discount_item_rows(){ function get_new_discount_item_rows(){
var sale_items = []; var sale_items = [];
$('.discount-item-row').each(function(i){ $('.item-row.new-discount').each(function(i){
var sale_item = {}; var sale_item = {};
sale_item.id = $(this).attr('id'); sale_item.id = $(this).attr('id');
sale_item.name = $(this).find('#item-name-price').text(); sale_item.name = $(this).find('#item-name-price').text();
sale_item.account_id = $(this).find('#item_account_type').text(); sale_item.account_id = $(this).find('#item_account_type').text();
sale_item.price = $(this).find('#item-total-price').text(); sale_item.price = $(this).find('#item-total-price').text();
sale_items.push(sale_item); sale_items.push(sale_item);
}); });
return sale_items; return sale_items;
} }
/* Get discount Item rows */ /* Get discount Item rows */
// function get_selected_discount_items(){ function get_selected_discount_items(){
// var sale_items = []; var sale_items = [];
// $('.discount-item-row').hasClass('.selected-item').each(function(i){ $('.item-row.discount.selected-item').each(function(i){
// var sale_item = {}; var sale_item = {};
// sale_item.id = $(this).attr('id'); sale_item.id = $(this).attr('id');
// sale_item.name = $(this).find('#item-name-price').text(); sale_item.name = $(this).find('#item-name-price').text();
// sale_item.account_id = $(this).find('#item_account_type').text(); sale_item.account_id = $(this).find('#item_account_type').text();
// sale_item.price = $(this).find('#item-total-price').text(); sale_item.price = $(this).find('#item-total-price').text();
// sale_items.push(sale_item); sale_items.push(sale_item);
// }); });
// return sale_items; return sale_items;
// } }
/* Get Selected Sale Item's ID and Price */ /* Get Selected Sale Item's ID and Price */
function get_selected_sale_items(){ function get_selected_sale_items(){
var sale_items = []; var sale_items = [];
$('.item-row.selected-item').each(function(i){ $('.item-row.item.selected-item').each(function(i){
var sale_item = {}; var sale_item = {};
sale_item.id = $(this).attr('id').substr(0,16); sale_item.id = $(this).attr('id').substr(0,16);
sale_item.name = $(this).find('#item-name-price').text().split('@')[0]; sale_item.name = $(this).find('#item-name-price').text().split('@')[0];
sale_item.account_id = $(this).find('#item-account-type').text(); sale_item.account_id = $(this).find('#item-account-type').text();
sale_item.price = $(this).find('#item-total-price').text(); sale_item.price = $(this).find('#item-total-price').text();
sale_items.push(sale_item); sale_items.push(sale_item);
}); });
return sale_items; return sale_items;
} }
/* Get Selected Accounts ID and Price */ /* Get Selected Accounts ID and Price */
function get_selected_account_types(){ function get_selected_account_types(){
var account_types = []; var account_types = [];
$('.selected-account').each(function(i){ $('.selected-account').each(function(i){
var account= {}; var account= {};
account.id = $(this).attr('id').substr(8); account.id = $(this).attr('id').substr(8);
account.name = $(this).text(); account.name = $(this).text();
account_types.push(account); account_types.push(account);
}); });
return account_types; return account_types;
} }
/* Calculate Overall Discount*/ /* Calculate Overall Discount*/
function calculate_overall_discount(type, amount){ function calculate_overall_discount(type, amount){
var origin_sub_total = parseFloat($("#order-sub-total").text()); var origin_sub_total = parseFloat($("#order-sub-total").text()) + parseFloat($("#order-discount").text());
var dis_amount = 0; var dis_amount = 0;
var sub_total = 0; var sub_total = 0;
var total_discount = 0; var total_discount = 0;
// For Net Pay // For Net Pay
if(type == 0){ if(type == 0){
total_discount = amount; total_discount = Math.round(amount * Math.pow(10, precision)) / Math.pow(10, precision);
} }
// For Percentage Pay // For Percentage Pay
@@ -719,34 +721,37 @@ function calculate_overall_discount(type, amount){
type: "error", type: "error",
confirmButtonText: 'OK', confirmButtonText: 'OK',
confirmButtonColor:"red" confirmButtonColor:"red"
}); });
} }
else{ else{
total_discount = (origin_sub_total * amount)/100; total_discount = Math.round(totalAmount * amount / 100 * Math.pow(10, precision)) / Math.pow(10, precision);
} }
} }
sub_total = parseFloat(totalAmount) - parseFloat(total_discount)
$("#order-discount").text(parseFloat(total_discount).toFixed(<%= precision.to_i %>)); $("#order-discount").text(parseFloat(total_discount).toFixed(<%= precision.to_i %>));
} }
/* Calculate Items Discount*/ /* Calculate Items Discount*/
function calculate_item_discount(type, amount, sale_items, account_types){ function calculate_item_discount(type, amount, sale_items, account_types){
var origin_sub_total = parseFloat($("#order-sub-total").text()); var origin_sub_total = parseFloat($("#order-sub-total").text());
var dis_amount = 0; var dis_amount = 0;
var sub_total = 0; var sub_total = 0;
var total_discount = 0; var total_discount = 0;
var arrItemName = ""; var arrItemName = "";
$("#discount_itemsErr").html(""); $("#discount_itemsErr").html("");
$("#discount-amountErr").html(""); $("#discount-amountErr").html("");
// For Net Pay // For Net Pay
if(origin_sub_total > 0){ if(origin_sub_total > 0){
if(type == 0){ if(type == 0){
dis_amount = (0 - amount); dis_amount = -Math.round(amount * Math.pow(10, precision)) / Math.pow(10, precision);
if(sale_items.length > 0){ if(sale_items.length > 0){
for(var i=0;i < sale_items.length;i++){ for(var i=0;i < sale_items.length;i++){
// if(account_types.length > 0){ // if(account_types.length > 0){
// for(var j=0; j < account_types.length; j++){ // for(var j=0; j < account_types.length; j++){
// if(sale_items[i].account_id == account_types[j].id){ // if(sale_items[i].account_id == account_types[j].id){
// // Discount Items // // Discount Items
// var discount_item_row = item_row_template(type, sale_items[i], dis_amount, amount); // var discount_item_row = item_row_template(type, sale_items[i], dis_amount, amount);
// $("#order-items-table tbody").append(discount_item_row); // $("#order-items-table tbody").append(discount_item_row);
@@ -755,20 +760,19 @@ function calculate_item_discount(type, amount, sale_items, account_types){
// } // }
// } // }
// else { // else {
if(parseFloat(amount) > parseFloat(sale_items[i].price)){ if(parseFloat(amount) > parseFloat(sale_items[i].price)){
arrItemName += ", " + sale_items[i].name; arrItemName += ", " + sale_items[i].name;
}else{ }else{
var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount); var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
total_discount = parseFloat(total_discount) + parseFloat(amount); total_discount = parseFloat(total_discount) + parseFloat(amount);
if(parseFloat(origin_sub_total) >= parseFloat(total_discount)){ if(parseFloat(origin_sub_total) >= parseFloat(total_discount)){
$("#order-items-table tbody").append(discount_item_row); $("#order-items-table tbody").append(discount_item_row);
}else{ }else{
total_discount = parseFloat(total_discount) - parseFloat(amount); total_discount = parseFloat(total_discount) - parseFloat(amount);
$("#discount-amountErr").html("Discount is greater than sub total!"); $("#discount-amountErr").html("Discount is greater than sub total!");
}
} }
}
// } // }
} }
} }
@@ -782,11 +786,11 @@ function calculate_item_discount(type, amount, sale_items, account_types){
}else{ }else{
$("#discount_itemsErr").html("Discount is greater than "+arrItemName+" price"); $("#discount_itemsErr").html("Discount is greater than "+arrItemName+" price");
} }
} }
// No Needs For Auto Selected // No Needs For Auto Selected
// if(account_types.length > 0){ // if(account_types.length > 0){
// var item_rows=get_item_rows(); // var item_rows=get_item_rows();
// if(item_rows.length > 0){ // if(item_rows.length > 0){
// for(var k=0; k < item_rows.length; k++){ // for(var k=0; k < item_rows.length; k++){
@@ -802,10 +806,12 @@ function calculate_item_discount(type, amount, sale_items, account_types){
// } // }
// else { // else {
// alert("No Items!"); // alert("No Items!");
// } // }
// } // }
sub_total = parseFloat(origin_sub_total) - parseFloat(total_discount); sub_total = parseFloat(origin_sub_total) - parseFloat(total_discount);
totalAmount = sub_total
$("#order-sub-total").text(parseFloat(sub_total).toFixed(<%= precision.to_i %>));
} }
// For Percentage Pay // For Percentage Pay
@@ -817,7 +823,7 @@ function calculate_item_discount(type, amount, sale_items, account_types){
type: "error", type: "error",
confirmButtonText: 'OK', confirmButtonText: 'OK',
confirmButtonColor:"red" confirmButtonColor:"red"
}); });
} }
else{ else{
// Check sale items exists // Check sale items exists
@@ -825,7 +831,7 @@ function calculate_item_discount(type, amount, sale_items, account_types){
for(var i=0;i < sale_items.length;i++){ for(var i=0;i < sale_items.length;i++){
// if(account_types.length > 0){ // if(account_types.length > 0){
// for(var j=0; j < account_types.length; j++){ // for(var j=0; j < account_types.length; j++){
// if(sale_items[i].account_id == account_types[j].id){ // if(sale_items[i].account_id == account_types[j].id){
// // Discount Items // // Discount Items
// dis_amount = 0 - ((sale_items[i].price * amount)/100); // dis_amount = 0 - ((sale_items[i].price * amount)/100);
// var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount); // var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
@@ -835,9 +841,9 @@ function calculate_item_discount(type, amount, sale_items, account_types){
// } // }
// } // }
// else { // else {
dis_amount = 0 - ((sale_items[i].price * amount)/100); dis_amount = -Math.round(sale_items[i].price * amount / 100 * Math.pow(10, precision)) / Math.pow(10, precision);
var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount); var discount_item_row = item_row_template(type,sale_items[i], dis_amount, amount);
total_discount = total_discount + dis_amount; total_discount = total_discount + dis_amount;
if(parseFloat(origin_sub_total) >= parseFloat(total_discount)){ if(parseFloat(origin_sub_total) >= parseFloat(total_discount)){
$("#order-items-table tbody").append(discount_item_row); $("#order-items-table tbody").append(discount_item_row);
@@ -848,18 +854,20 @@ function calculate_item_discount(type, amount, sale_items, account_types){
// } // }
} }
sub_total = parseFloat(origin_sub_total) + parseFloat(total_discount); sub_total = parseFloat(origin_sub_total) + parseFloat(total_discount);
totalAmount = sub_total
$("#order-sub-total").text(parseFloat(sub_total).toFixed(<%= precision.to_i %>));
} }
} }
// No Needs For Auto Selected // No Needs For Auto Selected
// Check account types exists // Check account types exists
// if(account_types.length > 0){ // if(account_types.length > 0){
// var item_rows=get_item_rows(); // var item_rows=get_item_rows();
// console.log(account_types); // console.log(account_types);
// if(item_rows.length > 0){ // if(item_rows.length > 0){
// for(var k=0; k < item_rows.length; k++){ // for(var k=0; k < item_rows.length; k++){
// for(var j=0; j < account_types.length; j++){ // for(var j=0; j < account_types.length; j++){
// if(item_rows[k].account_id == account_types[j].id){ // if(item_rows[k].account_id == account_types[j].id){
// // Discount Items // // Discount Items
// dis_amount = 0 - ((item_rows[k].price * amount)/100); // dis_amount = 0 - ((item_rows[k].price * amount)/100);
// var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount); // var discount_item_row = item_row_template(type, item_rows[k], dis_amount, amount);
// $("#order-items-table tbody").append(discount_item_row); // $("#order-items-table tbody").append(discount_item_row);
@@ -870,15 +878,14 @@ function calculate_item_discount(type, amount, sale_items, account_types){
// } // }
// else { // else {
// alert("No Items!"); // alert("No Items!");
// } // }
// } // }
} }
$("#order-sub-total").text(parseFloat(sub_total).toFixed(<%= precision.to_i %>));
}else{ }else{
$("#discount-amountErr").html("Discount is greater than sub total!"); $("#discount-amountErr").html("Discount is greater than sub total!");
} }
} }
function item_row_template(type, item, discount_amount, amount){ function item_row_template(type, item, discount_amount, amount){
@@ -886,25 +893,25 @@ function item_row_template(type, item, discount_amount, amount){
if(type == 1){ if(type == 1){
dis_str = dis_str + "(" + amount + "%)" dis_str = dis_str + "(" + amount + "%)"
} }
var discount_item_row = "<tr class='discount-item-row' id='" + item.id + "'>" + var discount_item_row = "<tr class='item-row new-discount' id='" + item.id + "'>" +
"<td style='width: 60%; text-align: left;'>" + "<td style='width: 60%; text-align: left;'>" +
"<span id='item_account_type' class='hidden'>" + "<span id='item_account_type' class='hidden'>" +
item.account_id + item.account_id +
"</span>" + "</span>" +
"<span id='item-name-price'>" + "<span id='item-name-price'>" +
item.name + dis_str + item.name + dis_str +
"</span>" + "</span>" +
"</td>" + "</td>" +
"<td style='width: 20%; text-align: right;'>" + "<td style='width: 20%; text-align: right;'>" +
"<span id='item-qty'>1</span>" + "<span id='item-qty'>1</span>" +
"</td>" + "</td>" +
"<td style='width: 20%; text-align: right;'>" + "<td style='width: 20%; text-align: right;'>" +
"<span id='item-total-price'>" + "<span id='item-total-price'>" +
discount_amount + discount_amount +
"</span>" + "</span>" +
"</td>" + "</td>" +
"</tr>"; "</tr>";
return discount_item_row; return discount_item_row;
} }
</script> </script>

111
app/views/reports/receipt_no/index.html.erb
View File

@@ -98,8 +98,8 @@
<%if !@sale_data.nil? %> <%if !@sale_data.nil? %>
<% @sale_data.each do |result| %> <% @sale_data.each do |result| %>
<% grand_total +=result.grand_total.to_f %> <% grand_total += result.grand_total.to_f %>
<% old_grand_total += result.grand_total_after_rounding() %> <% old_grand_total += result.grand_total.to_f - result.rounding_adjustment.to_f %>
<% total_tax += result.total_tax.to_f %> <% total_tax += result.total_tax.to_f %>
<% total_sum += result.total_amount.to_f %> <% total_sum += result.total_amount.to_f %>
<% discount_amt += result.total_discount.to_f %> <% discount_amt += result.total_discount.to_f %>
@@ -124,50 +124,35 @@
</td> </td>
<td><%= result.receipt_no rescue '-' %> </td> <td><%= result.receipt_no rescue '-' %> </td>
<td><%= result.cashier_name rescue '-' %></td> <td><%= result.cashier_name rescue '-' %></td>
<td><%= number_with_precision(result.total_amount, precision: precision.to_i ,delimiter: delimiter) %></td> <td><%= number_with_precision(result.total_amount, precision: precision.to_i, delimiter: delimiter) %></td>
<td><%= number_with_precision(result.total_discount, precision: precision.to_i ,delimiter: delimiter) rescue '0' %> <td><%= number_with_precision(result.total_discount, precision: precision.to_i, delimiter: delimiter) rescue '0' %>
</td> </td>
<!-- <%if result.customer.customer_type == "Takeaway"%>
<td><%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %></td>
<%end%> -->
<% if !result.sale_taxes.empty? %> <% if !result.sale_taxes.empty? %>
<% num = 1 <% num = 1 %>
if tax_flag && tax_count > 0 %> <% if tax_flag && tax_count > 0 %>
<% while num <= tax_count %> <% while num <= tax_count %>
<td> <td><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %> <% num += 1 %>
</td> <% end %>
<% num += 1 <% end %>
end %> <% result.sale_taxes.each do |tax| %>
<% end %> <td><%= number_with_precision(tax.tax_payable_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<% result.sale_taxes.each do |tax| %> <%end%>
<td> <% num = 1 %>
<%= number_with_precision(tax.tax_payable_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> <% if !tax_flag && tax_count > 0 %>
</td> <% while num <= tax_count %>
<%end%> <td><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<% num = 1 <% num += 1 %>
if tax_flag==false && tax_count > 0 %> <% end %>
<% while num <= tax_count %> <% end %>
<td> <% else %>
<%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %> <% @tax_profiles.each do |tax| %>
</td> <td><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<% num += 1 <% end %>
end %> <%end%>
<% end %> <td><%= number_with_precision(result.grand_total - result.rounding_adjustment, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<% else %> <td><%= number_with_precision(result.rounding_adjustment.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<% @tax_profiles.each do |tax| %> <td><%= number_with_precision(result.grand_total, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<td><%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
<% end %>
<%end%>
<% if result.old_grand_total.nil? %>
<td><%= number_with_precision(result.grand_total, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
<%else%>
<td><%= number_with_precision(result.old_grand_total, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
<%end%>
<td><%= result.rounding_adjustment.to_f rescue '-' %></td>
<td><%= number_with_precision(result.grand_total, precision: precision.to_i ,delimiter: delimiter) %></td>
<% if @lookup.value.to_i == 1 %> <% if @lookup.value.to_i == 1 %>
<td> <td>
<!-- ############### Need to Check SyncStatus ############# --> <!-- ############### Need to Check SyncStatus ############# -->
@@ -185,54 +170,34 @@
<% end %> <% end %>
<tr style="border-top:4px double #666;"> <tr style="border-top:4px double #666;">
<td colspan="3">&nbsp;</td> <td colspan="3">&nbsp;</td>
<td><b><%= number_with_precision(total_sum, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td> <td><b><%= number_with_precision(total_sum, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
<td><b><%= number_with_precision(discount_amt, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td> <td><b><%= number_with_precision(discount_amt, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
<!-- <% if !@sale_taxes.empty?
@sale_taxes.each do |tax| %>
<td>
<b><%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b>
</td>
<% end %>
<% else %>
<% @tax_profiles.each do |tax| %>
<td><b>0</b></td>
<% end %>
<% end %> -->
<% if !@sale_taxes.empty? %> <% if !@sale_taxes.empty? %>
<% num = 1 <% num = 1
if ttax_flag && ttax_count > 0 %> if ttax_flag && ttax_count > 0 %>
<% while num <= ttax_count %> <% while num <= ttax_count %>
<td> <td><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) %></td>
<%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
</td>
<% num += 1 <% num += 1
end %> end %>
<% end %> <% end %>
<% @sale_taxes.each do |tax| %> <% @sale_taxes.each do |tax| %>
<td> <td><%= number_with_precision(tax.st_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
</td>
<%end%> <%end%>
<% num = 1 <% num = 1
if ttax_flag==false && ttax_count > 0 %> if ttax_flag==false && ttax_count > 0 %>
<% while num <= ttax_count %> <% while num <= ttax_count %>
<td> <td><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) %></td>
<%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
</td>
<% num += 1 <% num += 1
end %> end %>
<% end %> <% end %>
<% else %> <% else %>
<% @tax_profiles.each do |tax| %> <% @tax_profiles.each do |tax| %>
<td><%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td> <td><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<% end %> <% end %>
<%end%> <%end%>
<td><b><%= number_with_precision(old_grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '0' %></b></td>
<td><b><%= number_with_precision(old_grand_total.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '0' %></b></td> <td><b><%= number_with_precision(rounding_adj.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
<td><b><%= number_with_precision(grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
<td><b><%= rounding_adj.to_f rescue '-' %></b></td>
<td><b><%= number_with_precision(grand_total.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>

117
app/views/reports/receipt_no/index.xls.erb
View File

@@ -29,7 +29,7 @@
<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></th> <th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></th>
<th><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> </th> <th><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> </th>
<% @tax_profiles.each do |tax| %> <% @tax_profiles.each do |tax| %>
<th><%= tax.name %></th> <th><%= tax.name %></th>
<% end %> <% end %>
<!-- <th>Other Amount</th> --> <!-- <th>Other Amount</th> -->
<th><%= t("views.right_panel.detail.grand_total") %></th> <th><%= t("views.right_panel.detail.grand_total") %></th>
@@ -74,11 +74,11 @@
end end
%> %>
<%if !@sale_data.nil? %> <%if @sale_data %>
<% @sale_data.each do |result| %> <% @sale_data.each do |result| %>
<% grand_total +=result.grand_total.to_f %> <% grand_total += result.grand_total.to_f %>
<% old_grand_total += result.grand_total_after_rounding() %> <% old_grand_total += result.grand_total.to_f - result.rounding_adjustment.to_f %>
<% total_tax += result.total_tax.to_f %> <% total_tax += result.total_tax.to_f %>
<% total_sum += result.total_amount.to_f %> <% total_sum += result.total_amount.to_f %>
<% discount_amt += result.total_discount.to_f %> <% discount_amt += result.total_discount.to_f %>
@@ -91,59 +91,45 @@
tax_flag = false tax_flag = false
end end
end %> end %>
<tr>
<tr> <td>
<td> <%if result.type %>
<%if result.type %> <%= result.type %> - <%= result.name %>
<%= result.type %> - <%= result.name %> <% else %>
<% else %> -
- <% end %>
<% end %> </td>
</td> <td><%= result.receipt_no rescue '-' %> </td>
<td><%= result.receipt_no rescue '-' %> </td> <td><%= result.cashier_name rescue '-' %></td>
<td><%= result.cashier_name rescue '-' %></td> <td><%= number_with_precision(result.total_amount, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<td><%= number_with_precision(result.total_amount, precision: precision.to_i ,delimiter: delimiter) %></td> <td><%= number_with_precision(result.total_discount, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<td><%= number_with_precision(result.total_discount, precision: precision.to_i ,delimiter: delimiter) rescue '0' %> <% if !result.sale_taxes.empty? %>
</td> <% num = 1 %>
<% if !result.sale_taxes.empty? %> <% if tax_flag && tax_count > 0 %>
<% num = 1 <% while num <= tax_count %>
if tax_flag && tax_count > 0 %> <td><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<% while num <= tax_count %> <% num += 1 %>
<td> <% end %>
<%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
</td>
<% num += 1
end %>
<% end %> <% end %>
<% result.sale_taxes.each do |tax| %> <% result.sale_taxes.each do |tax| %>
<td> <td><%= number_with_precision(tax.tax_payable_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
<%= number_with_precision(tax.tax_payable_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> <% end %>
</td> <% num = 1
<%end%> if tax_flag==false && tax_count > 0 %>
<% num = 1 <% while num <= tax_count %>
if tax_flag==false && tax_count > 0 %> <td><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<% while num <= tax_count %> <% num += 1
<td> end %>
<%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
</td>
<% num += 1
end %>
<% end %> <% end %>
<% else %> <% else %>
<% @tax_profiles.each do |tax| %> <% @tax_profiles.each do |tax| %>
<td><%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td> <td><%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
<% end %> <% end %>
<%end%> <%end%>
<td><%= number_with_precision(result.grand_total - result.rounding_adjustment, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<% if result.old_grand_total.nil? %> <td><%= number_with_precision(result.rounding_adjustment.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<td><%= number_with_precision(result.grand_total, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td> <td><%= number_with_precision(result.grand_total, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<%else%> </tr>
<td><%= number_with_precision(result.old_grand_total, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
<%end%>
<td><%= result.rounding_adjustment.to_f rescue '-' %></td>
<td><%= number_with_precision(result.grand_total, precision: precision.to_i ,delimiter: delimiter) %></td>
</tr>
<% end %> <% end %>
<tr style="border-top:4px double #666;"> <tr style="border-top:4px double #666;">
<td colspan="3">&nbsp;</td> <td colspan="3">&nbsp;</td>
@@ -153,23 +139,17 @@
<% num = 1 <% num = 1
if ttax_flag && ttax_count > 0 %> if ttax_flag && ttax_count > 0 %>
<% while num <= ttax_count %> <% while num <= ttax_count %>
<td> <td><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
</td>
<% num += 1 <% num += 1
end %> end %>
<% end %> <% end %>
<% @sale_taxes.each do |tax| %> <% @sale_taxes.each do |tax| %>
<td> <td><%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
<%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
</td>
<%end%> <%end%>
<% num = 1 <% num = 1
if ttax_flag==false && ttax_count > 0 %> if ttax_flag==false && ttax_count > 0 %>
<% while num <= ttax_count %> <% while num <= ttax_count %>
<td> <td><%= number_with_precision(0, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
<%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
</td>
<% num += 1 <% num += 1
end %> end %>
<% end %> <% end %>
@@ -178,12 +158,9 @@
<td><%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td> <td><%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
<% end %> <% end %>
<%end%> <%end%>
<td><b><%= number_with_precision(old_grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '0' %></b></td>
<td><b><%= number_with_precision(old_grand_total.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '0' %></b></td> <td><b><%= number_with_precision(rounding_adj.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
<td><b><%= number_with_precision(grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
<td><b><%= rounding_adj.to_f rescue '-' %></b></td>
<td><b><%= number_with_precision(grand_total.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
<td></td>
</tr> </tr>
<tr> <tr>
<td colspan="3">&nbsp;</td> <td colspan="3">&nbsp;</td>
@@ -209,4 +186,4 @@
</div> </div>
</div> </div>
</body> </body>
</html> </html>

11
app/views/settings/menus/_form.html.erb
View File

@@ -7,8 +7,8 @@
<div class="form-inputs p-l-25"> <div class="form-inputs p-l-25">
<%= f.input :name,:input_html=>{:class=>"col-md-9"} %> <%= f.input :name,:input_html=>{:class=>"col-md-9"} %>
<%= f.input :is_active,:input_html=>{:class=>"col-md-9"} %> <%= f.input :is_active,:input_html=>{:class=>"col-md-9"}, as: :boolean %>
<%= f.input :is_ordering,:input_html=>{:class=>"col-md-9"} %> <%= f.input :is_ordering,:input_html=>{:class=>"col-md-9"}, as: :boolean %>
<div class="row checkboxes "> <div class="row checkboxes ">
<div class="col-md-2"> <div class="col-md-2">
<label class="control-label"><abbr title="required">*</abbr> Valid Day</label> <label class="control-label"><abbr title="required">*</abbr> Valid Day</label>
@@ -50,7 +50,7 @@
<% end %> <% end %>
</div> </div>
</div> </div>
</div> </div>
<div class="form-actions p-l-20"> <div class="form-actions p-l-20">
@@ -58,7 +58,7 @@
</div> </div>
<% end %> <% end %>
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4"> <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
<div class="card"> <div class="card">
@@ -81,7 +81,7 @@
2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %> <br> 2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %> <br>
</p> </p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<script> <script>
@@ -114,4 +114,3 @@
</script> </script>

100
config/deploy.rb
View File

@@ -1,20 +1,106 @@
lock "3.10.1" # config valid only for current version of Capistrano
lock '3.11.2'
set :application, "zsai" set :application, 'SmartsalesSX'
set :repo_url, 'git@bitbucket.org:code2lab/sxrestaurant.git'
set :deploy_user, 'deploy' set :deploy_user, 'deploy'
set :deploy_to, '/home/deploy/apps/SmartsalesSX'
set :rbenv_type, :global # setup repo details
#set :scm, :git
set :repo_url, 'git@gitlab.com:code2lab/SXRestaurant.git'
# setup rbenv.
set :rbenv_prefix, "RBENV_ROOT=#{fetch(:rbenv_path)} RBENV_VERSION=#{fetch(:rbenv_ruby)} #{fetch(:rbenv_path)}/bin/rbenv exec" set :rbenv_prefix, "RBENV_ROOT=#{fetch(:rbenv_path)} RBENV_VERSION=#{fetch(:rbenv_ruby)} #{fetch(:rbenv_path)}/bin/rbenv exec"
set :rbenv_map_bins, %w{rake gem bundle ruby rails} set :rbenv_map_bins, %w{rake gem bundle ruby rails}
# how many old releases do we want to keep, not much
set :keep_releases, 5 set :keep_releases, 5
set :linked_files, %w{config/database.yml config/secrets.yml config/puma.rb config/sidekiq.yml config/shops.json config/cable.yml} # files we want symlinking to specific entries in shared
set :linked_files, %w{config/database.yml config/secrets.yml}
set :linked_dirs, %w{bin log tmp/puma tmp/pids tmp/cache tmp/sockets vendor/bundle public/system pids sockets} # dirs we want symlinking to shared
set :linked_dirs, %w{log tmp/pids tmp/puma tmp/cache tmp/sockets vendor/bundle public/system}
# what specs should be run before deployment is allowed to
# continue, see lib/capistrano/tasks/run_tests.cap
set :tests, [] set :tests, []
set :pty, true set :pty, true
set :puma_jungle_conf, '/etc/puma.conf'
set :puma_run_path, '/usr/local/bin/run-puma'
set :puma_bind, %w(tcp://0.0.0.0:9393)
#set :enable_ssl, true
# which config files should be copied by deploy:setup_config
# see documentation in lib/capistrano/tasks/setup_config.cap
# for details of operations
set(:config_files, %w(
database.yml
log_rotation
monit.conf
sidekiq_init.sh
sidekiq.yml
))
# which config files should be made executable after copying
# by deploy:setup_config
set(:executable_config_files, %w(
sidekiq_init.sh
))
# files which need to be symlinked to other parts of the
# filesystem. For example nginx virtualhosts, log rotation
# init scripts etc. The full_app_name variable isn't
# available at this point so we use a custom template {{}}
# tag and then add it at run time.
set(:symlinks, [
{
source: "sidekiq_init.sh",
link: "/etc/init.d/sidekiq_{{full_app_name}}"
},
{
source: "log_rotation",
link: "/etc/logrotate.d/{{full_app_name}}"
},
{
source: "monit",
link: "/etc/monit/conf.d/{{full_app_name}}.conf"
}
])
# this:
# http://www.capistranorb.com/documentation/getting-started/flow/
# is worth reading for a quick overview of what tasks are called
# and when for `cap stage deploy`
namespace :deploy do
# make sure we're deploying what we think we're deploying
before :deploy, "deploy:check_revision"
# only allow a deploy with passing tests to deployed
before :deploy, "deploy:run_tests"
# compile assets locally then rsync
after 'deploy:symlink:shared', 'deploy:compile_assets_locally'
Rake::Task["deploy:assets:precompile"].clear_actions
after :finishing, 'deploy:cleanup'
#nginx will be install in the Load Balancer - No need to deploy there
# remove the default nginx configuration as it will tend
# to conflict with our configs.
#before 'deploy:setup_config', 'nginx:remove_default_vhost'
# reload nginx to it will pick up any modified vhosts from
# setup_config
#after 'deploy:setup_config', 'nginx:reload'
# Restart monit so it will pick up any monit configurations
# we've added
#after 'deploy:setup_config', 'monit:restart'
# As of Capistrano 3.1, the `deploy:restart` task is not called
# automatically.
after 'finishing', 'puma:jungle:restart'
end

17
config/deploy/production.rb
View File

@@ -1,9 +1,20 @@
# set :stage, :production
# set :server_name, "svr.sxrestaurant.host"
# set :full_app_name, "#{fetch(:application)}_#{fetch(:stage)}"
# server '192.168.1.27', user: 'deploy', roles: %w{web app db}, primary: true
# set :deploy_to, "/home/#{fetch(:deploy_user)}/apps/#{fetch(:full_app_name)}"
# set :rbenv_ruby, '2.4.1'
# set :rails_env, :production
set :stage, :production set :stage, :production
set :server_name, "svr.sxrestaurant.host" set :server_name, "a.c2l.shop"
set :branch, "r-1902001-01"
set :full_app_name, "#{fetch(:application)}_#{fetch(:stage)}" set :full_app_name, "#{fetch(:application)}_#{fetch(:stage)}"
server '192.168.1.27', user: 'deploy', roles: %w{web app db}, primary: true server '167.71.194.57', user: 'deploy', roles: %w{web app db}, primary: true
set :deploy_to, "/home/#{fetch(:deploy_user)}/apps/#{fetch(:full_app_name)}" set :deploy_to, "/home/#{fetch(:deploy_user)}/apps/#{fetch(:full_app_name)}"
set :rbenv_ruby, '2.4.1' set :rbenv_ruby, '2.6.5'
set :rails_env, :production set :rails_env, :production

6
config/initializers/license.rb
View File

@@ -1,6 +1,8 @@
if File.exist?("config/license.yml") if File.exist?("config/license.yml")
config = YAML.load_file(Rails.root.join("config/license.yml")) config = YAML.load_file(Rails.root.join("config/license.yml"))
config.fetch(Rails.env, {}).each do |key, value| config.fetch(Rails.env, {}).each do |key, value|
ENV[key.upcase] = value.to_s ENV[key.upcase] = value.to_s
end end
end else
ENV["SERVER_MODE"] = "cloud"
end

60
docker-compose.yml
View File

@@ -1,31 +1,33 @@
version: '3' version: '3'
services: services:
code2lab: code2lab:
build: build:
context: . context: .
dockerfile: ./Dockerfile dockerfile: ./Dockerfile
links: links:
- redis - redis
volumes: volumes:
- .:/sxrestaurant - .:/sxrestaurant
env_file: - "/etc/timezone:/etc/timezone:ro"
- .code2lab.env - "/etc/localtime:/etc/localtime:ro"
ports: env_file:
- '8082:62158' - .code2lab.env
environment: ports:
- REDIS_URL=redis://redis:6379/0 - '62160:62158'
sidekiq: environment:
build: . - REDIS_URL=redis://172.17.0.1:6380/0
command: bundle exec sidekiq -C config/sidekiq.yml sidekiq:
links: build: .
- redis command: bundle exec sidekiq -C config/sidekiq.yml
volumes: links:
- .:/sxrestaurant - redis
environment: volumes:
- REDIS_URL=redis://redis:6379/0 - .:/sxrestaurant
redis: environment:
image: redis - REDIS_URL=redis://172.17.0.1:6380/0
ports: redis:
- '6380:6379' image: redis
volumes: ports:
- ../data/redis:/data - '6380:6379'
volumes:
- ../data/redis:/data

BIN
dump.rdb
View File

Binary file not shown.

12
lib/capistrano/substitute_strings.rb Normal file
View File

@@ -0,0 +1,12 @@
# we often want to refer to variables which
# are defined in subsequent stage files. This
# let's us use the {{var}} to represent fetch(:var)
# in strings which are only evaluated at runtime.
def sub_strings(input_string)
output_string = input_string
input_string.scan(/{{(\w*)}}/).each do |var|
output_string.gsub!("{{#{var[0]}}}", fetch(var[0].to_sym))
end
output_string
end

14
lib/capistrano/tasks/check_revision.cap Normal file
View File

@@ -0,0 +1,14 @@
namespace :deploy do
desc "checks whether the currently checkout out revision matches the
remote one we're trying to deploy from"
task :check_revision do
branch = fetch(:branch)
unless `git rev-parse HEAD` == `git rev-parse #{branch}`
puts "WARNING: HEAD is not the same as #{branch}"
puts "Run `git push` to sync changes or make sure you've"
puts "checked out the branch: #{branch} as you can only deploy"
puts "if you've got the target branch checked out"
exit
end
end
end

17
lib/capistrano/tasks/compile_assets_locally.cap Normal file
View File

@@ -0,0 +1,17 @@
namespace :deploy do
desc "compiles assets locally then rsyncs"
task :compile_assets_locally do
run_locally do
execute "RAILS_ENV=#{fetch(:rails_env)} bundle exec rake assets:precompile"
end
on roles(:app) do |role|
run_locally do
execute"rsync -av ./public/assets/ #{role.user}@#{role.hostname}:#{release_path}/public/assets/;"
end
sudo "chmod -R 755 #{release_path}/public/assets/"
end
run_locally do
execute "rm -rf ./public/assets"
end
end
end

14
lib/capistrano/tasks/logs.cap Normal file
View File

@@ -0,0 +1,14 @@
namespace :logs do
task :tail, :file do |t, args|
if args[:file]
on roles(:app) do
execute "tail -f #{shared_path}/log/#{args[:file]}.log"
end
else
puts "please specify a logfile e.g: 'rake logs:tail[logfile]"
puts "will tail 'shared_path/log/logfile.log'"
puts "remember if you use zsh you'll need to format it as:"
puts "rake 'logs:tail[logfile]' (single quotes)"
end
end
end

10
lib/capistrano/tasks/monit.cap Normal file
View File

@@ -0,0 +1,10 @@
namespace :monit do
%w(start stop restart).each do |task_name|
desc "#{task_name} Monit"
task task_name do
on roles(:app), in: :sequence, wait: 5 do
sudo "service monit #{task_name}"
end
end
end
end

22
lib/capistrano/tasks/nginx.cap Normal file
View File

@@ -0,0 +1,22 @@
namespace :nginx do
%w(start stop restart reload).each do |task_name|
desc "#{task } Nginx"
task task_name do
on roles(:app), in: :sequence, wait: 5 do
sudo "/etc/init.d/nginx #{task_name}"
end
end
end
desc "Remove default Nginx Virtual Host"
task "remove_default_vhost" do
on roles(:app) do
if test("[ -f /etc/nginx/sites-enabled/default ]")
sudo "rm /etc/nginx/sites-enabled/default"
puts "removed default Nginx Virtualhost"
else
puts "No default Nginx Virtualhost to remove"
end
end
end
end

10
lib/capistrano/tasks/restart.cap Normal file
View File

@@ -0,0 +1,10 @@
namespace :deploy do
desc 'Commands for unicorn application'
%w(start stop force-stop restart upgrade reopen-logs).each do |command|
task command.to_sym do
on roles(:app), in: :sequence, wait: 5 do
sudo "/etc/init.d/unicorn_#{fetch(:full_app_name)} #{command}"
end
end
end
end

18
lib/capistrano/tasks/run_tests.cap Normal file
View File

@@ -0,0 +1,18 @@
namespace :deploy do
desc "Runs test before deploying, can't deploy unless they pass"
task :run_tests do
test_log = "log/capistrano.test.log"
tests = fetch(:tests)
tests.each do |test|
puts "--> Running tests: '#{test}', please wait ..."
unless system "bundle exec rspec #{test} > #{test_log} 2>&1"
puts "--> Tests: '#{test}' failed. Results in: #{test_log} and below:"
system "cat #{test_log}"
exit;
end
puts "--> '#{test}' passed"
end
puts "--> All tests passed"
system "rm #{test_log}"
end
end

33
lib/capistrano/tasks/setup_config.cap Normal file
View File

@@ -0,0 +1,33 @@
namespace :deploy do
task :setup_config do
on roles(:app) do
# make the config dir
execute :mkdir, "-p #{shared_path}/config"
full_app_name = fetch(:full_app_name)
# config files to be uploaded to shared/config, see the
# definition of smart_template for details of operation.
# Essentially looks for #{filename}.erb in deploy/#{full_app_name}/
# and if it isn't there, falls back to deploy/#{shared}. Generally
# everything should be in deploy/shared with params which differ
# set in the stage files
config_files = fetch(:config_files)
config_files.each do |file|
smart_template file
end
# which of the above files should be marked as executable
executable_files = fetch(:executable_config_files)
executable_files.each do |file|
execute :chmod, "+x #{shared_path}/config/#{file}"
end
# symlink stuff which should be... symlinked
symlinks = fetch(:symlinks)
symlinks.each do |symlink|
sudo "ln -nfs #{shared_path}/config/#{symlink[:source]} #{sub_strings(symlink[:link])}"
end
end
end
end

32
lib/capistrano/template.rb Normal file
View File

@@ -0,0 +1,32 @@
# will first try and copy the file:
# config/deploy/#{full_app_name}/#{from}.erb
# to:
# shared/config/to
# if the original source path doesn exist then it will
# search in:
# config/deploy/shared/#{from}.erb
# this allows files which are common to all enviros to
# come from a single source while allowing specific
# ones to be over-ridden
# if the target file name is the same as the source then
# the second parameter can be left out
def smart_template(from, to=nil)
to ||= from
full_to_path = "#{shared_path}/config/#{to}"
if from_erb_path = template_file(from)
from_erb = StringIO.new(ERB.new(File.read(from_erb_path)).result(binding))
upload! from_erb, full_to_path
info "copying: #{from_erb} to: #{full_to_path}"
else
error "error #{from} not found"
end
end
def template_file(name)
if File.exist?((file = "config/deploy/#{fetch(:full_app_name)}/#{name}.erb"))
return file
elsif File.exist?((file = "config/deploy/shared/#{name}.erb"))
return file
end
return nil
end