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

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

Browse Source
This commit is contained in:
Aung Myo
2017-12-28 18:05:44 +06:30
parent d58f7d1605 c8d31e4523
commit c9f230fa70
7 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/check_in_process_controller.rb
View File

@@ -11,6 +11,8 @@ class Api::CheckInProcessController < Api::ApiController
check_in_time = booking.checkin_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
check_out_time = booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
extra_minutes = (booking.checkout_at - booking.reserved_at) / 1.minutes
lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
alert_time_min = 0
if !lookup_checkout_time.nil?
@@ -21,7 +23,7 @@ class Api::CheckInProcessController < Api::ApiController
end
end
render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time, :alert_time_min => alert_time_min }
render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time, :alert_time_min => alert_time_min, :extra_minutes => extra_minutes }
else
render :json => { :status => false, :error_message => "No current booking!" }
end

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

@@ -261,6 +261,11 @@ class Origami::PaymentsController < BaseOrigamiController
if(Sale.exists?(sale_id))
saleObj = Sale.find(sale_id)
if saleObj.discount_type == "member_discount"
saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
end
sale_payment = SalePayment.new
sale_payment.process_payment(saleObj, @user, cash, "foc")

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

@@ -6,7 +6,11 @@ class Origami::VoidController < BaseOrigamiController
if Sale.exists?(sale_id)
sale = Sale.find_by_sale_id(sale_id)
if sale.discount_type == "member_discount"
sale.update_attributes(total_discount: 0)
sale.compute_by_sale_items(sale_id, sale.sale_items,0)
end
# update count for shift sale
if(sale.sale_status == "completed")
if sale.shift_sale_id != nil
@@ -21,7 +25,7 @@ class Origami::VoidController < BaseOrigamiController
shift.save
end
end
sale.payment_status = 'void'
sale.sale_status = 'void'
sale.save

1
app/models/sale.rb
View File

@@ -247,6 +247,7 @@ class Sale < ApplicationRecord
#compute - invoice total
def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil)
sale = Sale.find(sale_id)
sales_items = sale_itemss

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

@@ -587,9 +587,9 @@
var sale_id = $('#sale_id').val();
type = $('.payment_method').val();
calculate_member_discount(sale_id,type);
if (type != "Credit") {
calculate_member_discount(sale_id,type);
}
var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
$.ajax({
type: "GET",

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

@@ -425,14 +425,14 @@
var sale_id = $('#sale_id').text();
// var item_row = $('.is_card');
// if (item_row.length < 1) {
calculate_member_discount(sale_id);
// }
// payment
var cash = $('#cash').text();
// payment
var cash = $('#cash').text();
var credit = $('#credit').text();
var card = $('#card').text();
var card = $('#card').text();
if (credit <= 0) {
calculate_member_discount(sale_id);
}
$.ajax({type: "POST",
url: "<%= origami_payment_cash_path %>",