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

second display tax profile

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2020-01-29 16:27:41 +06:30
parent 11ffaa738f
commit 8abbf7f1d4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/addorder.js
View File

@@ -1453,7 +1453,7 @@ $(function() {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: url, url: url,
data: {"data":data,"status":status}, data: {"data":data,"status":status,"type":$("#link_type").val()},
dataType: "json", dataType: "json",
success:function(result){ success:function(result){
} }

2
app/controllers/origami/second_display_controller.rb
View File

@@ -11,7 +11,7 @@ class Origami::SecondDisplayController < BaseOrigamiController
display_type = Lookup.find_by_lookup_type("display_type") display_type = Lookup.find_by_lookup_type("display_type")
if !display_type.nil? && display_type.value.to_i == 2 if !display_type.nil? && display_type.value.to_i == 2
if params[:status]!= "billed" if params[:status]!= "billed"
tax_profiles = TaxProfile.all.order("order_by asc") tax_profiles = TaxProfile.where(group_type: params[:type]).order("order_by asc")
else else
tax_profiles = nil tax_profiles = nil
end end