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 r-1804001-01

Browse Source
This commit is contained in:
Aung Myo
2018-04-22 16:42:52 +06:30
parent b949020153 8806027793
commit 39c7cec32b
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,8 @@ class Origami::WasteSpoileController < BaseOrigamiController
if customer.membership_id != nil && rebate if customer.membership_id != nil && rebate
member_info = Customer.get_member_account(customer) member_info = Customer.get_member_account(customer)
rebate_amount = Customer.get_membership_transactions(customer,sale.receipt_no) rebate_amount = Customer.get_membership_transactions(customer,sale.receipt_no)
current_balance = SaleAudit.paymal_search(sale_id) # current_balance = SaleAudit.paymal_search(sale_id)
current_balance = 0
end end
# get printer info # get printer info

5
app/pdf/receipt_bill_pdf.rb
View File

@@ -84,7 +84,7 @@ class ReceiptBillPdf < Prawn::Document
#start for individual payment #start for individual payment
if !sale_data.equal_persons.nil? if !sale_data.equal_persons.nil?
individual_payment(sale_data, printer_settings.precision, delimiter) individual_payment(sale_data,sale_data.equal_persons, printer_settings.precision, delimiter)
end end
#end for individual payment #end for individual payment
@@ -487,7 +487,8 @@ class ReceiptBillPdf < Prawn::Document
#individual payment per person #individual payment per person
def individual_payment(sale_data, survey, precision, delimiter) def individual_payment(sale_data, survey, precision, delimiter)
per_person = sale_data.grand_total.to_f / survey.total_customer.to_i # per_person = sale_data.grand_total.to_f / survey.total_customer.to_i
per_person = sale_data.grand_total.to_f / survey.to_i
stroke_horizontal_rule stroke_horizontal_rule
move_down line_move move_down line_move
y_position = cursor y_position = cursor

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

@@ -523,14 +523,24 @@ var customer_name = "<%= @customer.name %>";
if ($("#server_mode").val() != "cloud") { // first bill not used in cloud if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
payment_type = checkReceiptNoInFirstBillData(receipt_no,"payment"); payment_type = checkReceiptNoInFirstBillData(receipt_no,"payment");
console.log(payment_type)
if (member_id && member_discount) { if (member_id && member_discount) {
if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){ if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
$("#credit_payment").hide(); $("#credit_payment").hide();
} else{ } else{
$("#credit_payment").show(); $("#credit_payment").show();
} }
console.log(jQuery.inArray("Master", payment_type))
if(parseInt(jQuery.inArray("MPU", payment_type)) !=-1 || parseInt(jQuery.inArray("VISA", payment_type)) !=-1 || parseInt(jQuery.inArray("JCB", payment_type)) !=-1 || parseInt(jQuery.inArray("Master", payment_type)) !=-1 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Redeem", payment_type)) !=-1, parseInt(jQuery.inArray("PAYMAL", payment_type)) !=-1 || parseInt(jQuery.inArray("JUNCTIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Alipay", payment_type)) !=-1 || parseInt(jQuery.inArray("DINGA", payment_type)) !=-1){ if(parseInt(jQuery.inArray("MPU", payment_type)) != -1 ||
parseInt(jQuery.inArray("VISA", payment_type)) != -1 ||
parseInt(jQuery.inArray("JCB", payment_type)) != -1 ||
parseInt(jQuery.inArray("Master", payment_type)) != -1 ||
parseInt(jQuery.inArray("UNIONPAY", payment_type)) != -1 ||
parseInt(jQuery.inArray("Redeem", payment_type)) != -1 ||
parseInt(jQuery.inArray("PAYMAL", payment_type)) != -1 ||
parseInt(jQuery.inArray("JUNCTIONPAY", payment_type)) != -1 ||
parseInt(jQuery.inArray("Alipay", payment_type)) != -1 ||
parseInt(jQuery.inArray("DINGA", payment_type)) != -1){
$("#card_payment").show(); $("#card_payment").show();
} else{ } else{
$("#card_payment").hide(); $("#card_payment").hide();

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

@@ -361,7 +361,7 @@ $('#pay').on('click',function() {
$('#back').on('click',function(){ $('#back').on('click',function(){
var lookup_split_bill = '<%= @split_bill %>'; var lookup_split_bill = '<%= @split_bill %>';
if(lookup_split_bill == '1'){ if(lookup_split_bill == '1'){
window.location.href = '/origami/table/<%= @table.id %>/split_bills'; window.location.href = '/origami/table/<%= @table.id %>/cashier/split_bills';
}else{ }else{
window.location.href = '/origami/table/<%= @table.id %>'; window.location.href = '/origami/table/<%= @table.id %>';
} }