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

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
phyusin
2017-12-21 18:08:22 +06:30
parent a3e15bf68c f2fe6975d2
commit d904784e61
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/origami/home_controller.rb
View File

@@ -25,6 +25,7 @@ class Origami::HomeController < BaseOrigamiController
@shop = Shop::ShopDetail @shop = Shop::ShopDetail
@membership = MembershipSetting::MembershipSetting @membership = MembershipSetting::MembershipSetting
@payment_methods = PaymentMethodSetting.all @payment_methods = PaymentMethodSetting.all
@dining.bookings.active.each do |booking| @dining.bookings.active.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved' if booking.sale_id.nil? && booking.booking_status != 'moved'
@order_items = Array.new @order_items = Array.new

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

@@ -30,9 +30,10 @@ class Origami::PaymentsController < BaseOrigamiController
# rounding adjustment # rounding adjustment
if shop_details.is_rounding_adj if shop_details.is_rounding_adj
a = sale_data.grand_total % 25 a = sale_data.grand_total % 25 # Modulus
b = sale_data.grand_total / 25 b = sale_data.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) if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
new_total = Sale.get_rounding_adjustment(sale_data.grand_total) new_total = Sale.get_rounding_adjustment(sale_data.grand_total)
rounding_adj = new_total-sale_data.grand_total rounding_adj = new_total-sale_data.grand_total
@@ -74,8 +75,10 @@ class Origami::PaymentsController < BaseOrigamiController
# rounding adjustment # rounding adjustment
if shop_details.is_rounding_adj if shop_details.is_rounding_adj
a = saleObj.grand_total % 25 a = saleObj.grand_total % 25 # Modulus
b = saleObj.grand_total / 25 b = saleObj.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) if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
new_total = Sale.get_rounding_adjustment(saleObj.grand_total) new_total = Sale.get_rounding_adjustment(saleObj.grand_total)
rounding_adj = new_total-saleObj.grand_total rounding_adj = new_total-saleObj.grand_total
@@ -299,8 +302,10 @@ class Origami::PaymentsController < BaseOrigamiController
@shop = Shop.find_by_id(1) @shop = Shop.find_by_id(1)
if @shop.is_rounding_adj if @shop.is_rounding_adj
a = saleObj.grand_total % 25 # a = saleObj.grand_total % 25 # Modulus
b = saleObj.grand_total / 25 # b = saleObj.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) if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
new_total = Sale.get_rounding_adjustment(saleObj.grand_total) new_total = Sale.get_rounding_adjustment(saleObj.grand_total)
rounding_adj = new_total-saleObj.grand_total rounding_adj = new_total-saleObj.grand_total

1
app/controllers/origami/rooms_controller.rb
View File

@@ -22,6 +22,7 @@ class Origami::RoomsController < BaseOrigamiController
@shop = Shop::ShopDetail @shop = Shop::ShopDetail
@membership = MembershipSetting::MembershipSetting @membership = MembershipSetting::MembershipSetting
@payment_methods = PaymentMethodSetting.all @payment_methods = PaymentMethodSetting.all
@room.bookings.active.each do |booking| @room.bookings.active.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved' if booking.sale_id.nil? && booking.booking_status != 'moved'
@order_items = Array.new @order_items = Array.new

2
app/models/customer.rb
View File

@@ -147,7 +147,7 @@ class Customer < ApplicationRecord
response = self.rebat(Sale.find(sale.sale_id)) response = self.rebat(Sale.find(sale.sale_id))
#record an payment in sale-audit #record an payment in sale-audit
remark = "UPdate Rebate Response - #{response} for Customer #{sale.customer_id} Sale Id [#{sale.sale_id}]| pay amount -> #{sale.received_amount} " remark = "UPdate Rebate Response - #{response} for Customer #{sale.customer_id} Sale Id [#{sale.sale_id}]| pay amount -> #{sale.received_amount} "
sale_audit = SaleAudit.record_paymal(sale.sale_id, remark, "CronJob") sale_audit = SaleAudit.record_paymal(sale.sale_id, remark, 1)
if response["status"] == true if response["status"] == true
status = sale.update_attributes(rebate_status: "true") status = sale.update_attributes(rebate_status: "true")

4
app/models/sale_payment.rb
View File

@@ -278,7 +278,7 @@ class SalePayment < ApplicationRecord
#record an payment in sale-audit #record an payment in sale-audit
remark = "#{membership_data} Redeem- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} " remark = "#{membership_data} Redeem- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, "Cashier") sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
if membership_data["status"]==true if membership_data["status"]==true
self.payment_method = "paypar" self.payment_method = "paypar"
@@ -335,7 +335,7 @@ class SalePayment < ApplicationRecord
#record an payment in sale-audit #record an payment in sale-audit
remark = "#{response} Rebate- for Customer #{self.sale.customer_id} | Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} " remark = "#{response} Rebate- for Customer #{self.sale.customer_id} | Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, "Cashier") sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
if !response.nil? if !response.nil?
if response["status"] == true if response["status"] == true