diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb index fde9d6f7..f78ea560 100755 --- a/app/controllers/origami/credit_payments_controller.rb +++ b/app/controllers/origami/credit_payments_controller.rb @@ -4,9 +4,18 @@ class Origami::CreditPaymentsController < BaseOrigamiController # limit visa_amount sale_data = Sale.find_by_sale_id(@sale_id) - total = sale_data.grand_total + total = sale_data.grand_total @creditcount = 0 others = 0 + + @shop = Shop::ShopDetail + if @shop.is_rounding_adj + new_total = Sale.get_rounding_adjustment(sale_data.grand_total) + else + new_total = sale_data.grand_total + end + @rounding_adj = new_total-sale_data.grand_total + sale_data.sale_payments.each do |sale_payment| if sale_payment.payment_method == "creditnote" @creditcount = @creditcount + sale_payment.payment_amount diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 8e5b33c2..47ec2383 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -6,7 +6,7 @@ class Origami::HomeController < BaseOrigamiController @rooms = Room.all.active.order('status desc') @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) @orders = Order.all.order('date desc') - @shop = Shop.find_by_id(1) + @shop = Shop::ShopDetail # @shift = ShiftSale.current_open_shift(current_user.id) end diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb index a8b77861..02cf28ea 100755 --- a/app/controllers/origami/jcb_controller.rb +++ b/app/controllers/origami/jcb_controller.rb @@ -8,6 +8,15 @@ class Origami::JcbController < BaseOrigamiController total = sale_data.grand_total @jcbcount = 0 others = 0 + + @shop = Shop::ShopDetail + if @shop.is_rounding_adj + new_total = Sale.get_rounding_adjustment(sale_data.grand_total) + else + new_total = sale_data.grand_total + end + @rounding_adj = new_total-sale_data.grand_total + sale_data.sale_payments.each do |sale_payment| if sale_payment.payment_method == "jcb" @jcbcount = @jcbcount + sale_payment.payment_amount diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb index ba97cad9..14a43c28 100755 --- a/app/controllers/origami/master_controller.rb +++ b/app/controllers/origami/master_controller.rb @@ -8,6 +8,15 @@ class Origami::MasterController < BaseOrigamiController total = sale_data.grand_total @mastercount = 0 others = 0 + + @shop = Shop::ShopDetail + if @shop.is_rounding_adj + new_total = Sale.get_rounding_adjustment(sale_data.grand_total) + else + new_total = sale_data.grand_total + end + @rounding_adj = new_total-sale_data.grand_total + sale_data.sale_payments.each do |sale_payment| if sale_payment.payment_method == "master" @mastercount = @mastercount + sale_payment.payment_amount diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb index 8e62ecda..3b29599f 100755 --- a/app/controllers/origami/mpu_controller.rb +++ b/app/controllers/origami/mpu_controller.rb @@ -8,6 +8,14 @@ class Origami::MpuController < BaseOrigamiController @mpucount = 0 others = 0 + @shop = Shop::ShopDetail + if @shop.is_rounding_adj + new_total = Sale.get_rounding_adjustment(sale_data.grand_total) + else + new_total = sale_data.grand_total + end + @rounding_adj = new_total-sale_data.grand_total + sale_data.sale_payments.each do |sale_payment| if sale_payment.payment_method == "mpu" @mpucount = @mpucount + sale_payment.payment_amount diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index a551b585..7342a4bb 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -24,7 +24,7 @@ class Origami::PaymentsController < BaseOrigamiController # Print for First Bill to Customer unique_code = "ReceiptBillPdf" #shop detail - shop_details = Shop.find(1) + shop_details = Shop::ShopDetail # customer= Customer.where('customer_id=' +.customer_id) customer= Customer.find(sale_data.customer_id) # get member information @@ -54,7 +54,7 @@ class Origami::PaymentsController < BaseOrigamiController if(Sale.exists?(sale_id)) saleObj = Sale.find(sale_id) - shop_details = Shop.find(1) + shop_details = Shop::ShopDetail if shop_details.is_rounding_adj new_total = Sale.get_rounding_adjustment(saleObj.grand_total) @@ -121,7 +121,7 @@ class Origami::PaymentsController < BaseOrigamiController @accountable_type = '' @table_no = '' - @shop = Shop.find_by_id(1) + @shop = Shop::ShopDetail if @shop.is_rounding_adj new_total = Sale.get_rounding_adjustment(@sale_data.grand_total) else @@ -205,7 +205,7 @@ class Origami::PaymentsController < BaseOrigamiController customer= Customer.find(saleObj.customer_id) #shop detail - shop_details = Shop.find(1) + shop_details = Shop::ShopDetail # get member information rebate = MembershipSetting.find_by_rebate(1) if customer.membership_id != nil && rebate @@ -254,7 +254,7 @@ class Origami::PaymentsController < BaseOrigamiController customer= Customer.find(saleObj.customer_id) #shop detail - shop_details = Shop.find(1) + shop_details = Shop::ShopDetail # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb index 802ba51b..b0f40d34 100755 --- a/app/controllers/origami/redeem_payments_controller.rb +++ b/app/controllers/origami/redeem_payments_controller.rb @@ -5,76 +5,65 @@ class Origami::RedeemPaymentsController < BaseOrigamiController @membership_rebate_balance=0 sale_data = Sale.find_by_sale_id(@sale_id) - # limit redeem_amount - # rebate_prices = SaleItem.calculate_food_beverage(sale_data.sale_items) - # nonrebate_prices = sale_data.total_amount - rebate_prices - # @payparcount = 0 - # others = 0 - # sale_data.sale_payments.each do |sale_payment| - # if sale_payment.payment_method == "paypar" - # @payparcount = @payparcount + sale_payment.payment_amount - # else - # others = others + sale_payment.payment_amount - # end - # end - # non_rebate_exceed = others - (nonrebate_prices + sale_data.total_tax) - # if non_rebate_exceed < 0 - # @redeem_prices = rebate_prices - @payparcount - # else - # @redeem_prices = rebate_prices - @payparcount -non_rebate_exceed - # end - - @payparcount = 0 - others = 0 - sale_data.sale_payments.each do |sale_payment| - if sale_payment.payment_method == "paypar" - @payparcount = @payparcount + sale_payment.payment_amount + @shop = Shop::ShopDetail + if @shop.is_rounding_adj + new_total = Sale.get_rounding_adjustment(sale_data.grand_total) else - others = others + sale_payment.payment_amount + new_total = sale_data.grand_total end - end - @redeem_prices = sale_data.grand_total - @payparcount -others + @rounding_adj = new_total-sale_data.grand_total + + @payparcount = 0 + others = 0 + sale_data.sale_payments.each do |sale_payment| + if sale_payment.payment_method == "paypar" + @payparcount = @payparcount + sale_payment.payment_amount + else + others = others + sale_payment.payment_amount + end + end + @redeem_prices = sale_data.grand_total - @payparcount -others - if sale_data - if sale_data.customer_id - customer_data= Customer.find_by_customer_id(sale_data.customer_id) - if customer_data - @membership_id = customer_data.membership_id - if !@membership_id.nil? - membership_setting = MembershipSetting.find_by_membership_type("paypar_url") - if membership_setting.gateway_url - member_actions =MembershipAction.find_by_membership_type("get_account_balance") - if member_actions.gateway_url - @campaign_type_id = member_actions.additional_parameter["campaign_type_id"] - url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s - merchant_uid= member_actions.merchant_account_id - auth_token = member_actions.auth_token.to_s - membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token) - if membership_data["status"]==true - @membership_rebate_balance=membership_data["balance"] - @out = true, @membership_rebate_balance,@membership_id - end - else - @out =false,0 - end - else - @out = false,0 - end + if sale_data + if sale_data.customer_id + customer_data= Customer.find_by_customer_id(sale_data.customer_id) + if customer_data + @membership_id = customer_data.membership_id + if !@membership_id.nil? + membership_setting = MembershipSetting.find_by_membership_type("paypar_url") + if membership_setting.gateway_url + member_actions =MembershipAction.find_by_membership_type("get_account_balance") + if member_actions.gateway_url + @campaign_type_id = member_actions.additional_parameter["campaign_type_id"] + url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s + merchant_uid= member_actions.merchant_account_id + auth_token = member_actions.auth_token.to_s + membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token) + if membership_data["status"]==true + @membership_rebate_balance=membership_data["balance"] + @out = true, @membership_rebate_balance,@membership_id + end + else + @out =false,0 + end + else + @out = false,0 + end - else - @out = false, 0 - end - else - @out = false, 0 - end - else - @out = false, 0 - end - else - @out = false, 0 - end - @out = false, 0 - end + else + @out = false, 0 + end + else + @out = false, 0 + end + else + @out = false, 0 + end + else + @out = false, 0 + end + @out = false, 0 + end end diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb index 4f750fb5..f8dbbfa0 100755 --- a/app/controllers/origami/visa_controller.rb +++ b/app/controllers/origami/visa_controller.rb @@ -7,6 +7,15 @@ class Origami::VisaController < BaseOrigamiController total = sale_data.grand_total @visacount = 0 others = 0 + + @shop = Shop::ShopDetail + if @shop.is_rounding_adj + new_total = Sale.get_rounding_adjustment(sale_data.grand_total) + else + new_total = sale_data.grand_total + end + @rounding_adj = new_total-sale_data.grand_total + sale_data.sale_payments.each do |sale_payment| if sale_payment.payment_method == "visa" @visacount = @visacount + sale_payment.payment_amount diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb index 421c31a0..c4b3c840 100755 --- a/app/controllers/origami/voucher_controller.rb +++ b/app/controllers/origami/voucher_controller.rb @@ -7,6 +7,15 @@ class Origami::VoucherController < BaseOrigamiController total = sale_data.grand_total @vouchercount = 0 others = 0 + + @shop = Shop::ShopDetail + if @shop.is_rounding_adj + new_total = Sale.get_rounding_adjustment(sale_data.grand_total) + else + new_total = sale_data.grand_total + end + @rounding_adj = new_total-sale_data.grand_total + sale_data.sale_payments.each do |sale_payment| if sale_payment.payment_method == "voucher" @vouchercount = @vouchercount + sale_payment.payment_amount diff --git a/app/models/shop.rb b/app/models/shop.rb index 9e8217df..c722adc2 100755 --- a/app/models/shop.rb +++ b/app/models/shop.rb @@ -1,3 +1,3 @@ class Shop < ApplicationRecord - + ShopDetail = Shop.find_by_id(1) end diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb index a1c3629b..712284da 100755 --- a/app/views/origami/credit_payments/index.html.erb +++ b/app/views/origami/credit_payments/index.html.erb @@ -21,6 +21,7 @@
+ <%@can_credit = @can_credit +@rounding_adj%>
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb index 0f38afcf..226accab 100755 --- a/app/views/origami/jcb/index.html.erb +++ b/app/views/origami/jcb/index.html.erb @@ -20,6 +20,7 @@
+ <%@can_jcb = @can_jcb +@rounding_adj%>
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb index 497bfa3b..fb271154 100755 --- a/app/views/origami/master/index.html.erb +++ b/app/views/origami/master/index.html.erb @@ -20,6 +20,7 @@
+ <%@can_master = @can_master +@rounding_adj%>
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb index 89196450..82ed09f2 100755 --- a/app/views/origami/mpu/index.html.erb +++ b/app/views/origami/mpu/index.html.erb @@ -21,7 +21,8 @@
- + <%@can_mpu = @can_mpu +@rounding_adj%> +
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index b64a0310..796015d6 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -98,7 +98,7 @@ Grand Total - <%=@sale_data.grand_total rescue 0%> + <%=@sale_data.grand_total+ @rounding_adj rescue 0%> <%if @balance > 0%> @@ -121,7 +121,7 @@
Amount Due
-
<%= @sale_data.grand_total %>
+
<%= @sale_data.grand_total + @rounding_adj rescue 0%>
@@ -219,7 +219,7 @@
Balance
-
<%= @sale_data.grand_total %>
+
<%= @sale_data.grand_total+ @rounding_adj rescue 0 %>
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index 23b6dc29..20ebdd88 100755 --- a/app/views/origami/redeem_payments/index.html.erb +++ b/app/views/origami/redeem_payments/index.html.erb @@ -17,6 +17,7 @@
+ <%@redeem_prices = @redeem_prices +@rounding_adj%>
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb index dead9527..04dad682 100755 --- a/app/views/origami/visa/index.html.erb +++ b/app/views/origami/visa/index.html.erb @@ -20,6 +20,7 @@
+ <%@can_visa = @can_visa +@rounding_adj%>