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

Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-05-18 18:02:40 +06:30
parent 4069f61bfc c1525be826
commit 5316f23ba7
2 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/pdf/receipt_bill_pdf.rb
View File

@@ -532,7 +532,7 @@ class ReceiptBillPdf < Prawn::Document
break;
end
end
if sale_data.payment_status == "foc"
if sale_data.payment_status == "foc" || sale_data.payment_status == "waste" || sale_data.payment_status == "spoile"
y_position = cursor
stroke_horizontal_rule
@@ -540,12 +540,19 @@ class ReceiptBillPdf < Prawn::Document
bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
move_down 70
stroke_horizontal_rule
end
end
bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
move_down 73
text "Acknowledged By" , :size => self.item_font_size,:align => :center
end
if sale_data.payment_status == "foc"
bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
move_down 73
text "Acknowledged By" , :size => self.item_font_size,:align => :center
end
elsif sale_data.payment_status == "waste" || sale_data.payment_status == "spoile"
bounding_box([self.label_width,y_position], :width =>self.item_description_width) do
move_down 73
text "Approved By" , :size => self.item_font_size,:align => :center
end
end
end
end

45
app/views/origami/surveys/_form.html.erb
View File

@@ -14,7 +14,7 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
<div class="form-group p-l-10 p-r-10">
<%= f.input :adult, input_html: { value: @survey_data.adult, class: 'col-md-10', :onChange => "total_customer();" }%>
<%= f.input :adult, input_html: { value: @survey_data.adult, class: 'col-md-10', :onkeyup => "total_customer();" }%>
</div>
</div>
</div>
@@ -332,10 +332,34 @@ var cashier_type = "<%= @cashier_type %>";
case 'num':
var input_value = $(this).attr("data-value");
if (original_value == "0.0"){
$('.addfocus').val(input_value);
var value = $('.addfocus').val(input_value);
if ($("#survey_child").hasClass('addfocus')){
var child = $("#survey_child").val()+value;
var adult = $("#survey_adult").val() || 0;
var result = parseInt(child) + parseInt(adult);
$("#survey_total_customer").val(result);
}
if ($("#survey_adult").hasClass('addfocus')){
var adult = $("#survey_adult").val()+value;
var child = $("#survey_child").val() || 0;
var result = parseInt(child) + parseInt(adult);
$("#survey_total_customer").val(result);
}
}
else{
$('.addfocus').val(original_value + '' + input_value);
var value = $('.addfocus').val(original_value + '' + input_value);
if ($("#survey_child").hasClass('addfocus')){
var child = $("#survey_child").val()+value;
var adult = $("#survey_adult").val() || 0;
var result = parseInt(child) + parseInt(adult);
$("#survey_total_customer").val(result);
}
if ($("#survey_adult").hasClass('addfocus')){
var adult = $("#survey_adult").val()+value;
var child = $("#survey_child").val() || 0;
var result = parseInt(child) + parseInt(adult);
$("#survey_total_customer").val(result);
}
}
break;
@@ -351,7 +375,18 @@ var cashier_type = "<%= @cashier_type %>";
break;
case 'clr':
$('.addfocus').val("");
$('.addfocus').val("");
if($("#survey_child").hasClass('addfocus')){
$("#survey_child").val("");
var adult = $("#survey_adult").val() || 0;
var result = parseInt(adult);
$("#survey_total_customer").val(result);
}else if($("#survey_adult").hasClass('addfocus')){
$("#survey_adult").val("");
var child = $("#survey_child").val() || 0;
var result = parseInt(child);
$("#survey_total_customer").val(result);
}
break;
}
event.handled = true;
@@ -464,4 +499,6 @@ var cashier_type = "<%= @cashier_type %>";
var result = parseInt(child) + parseInt(adult);
$("#survey_total_customer").val(result);
}
</script>