From 8abbf7f1d4981e31a5ff0eb50c727d42328b7205 Mon Sep 17 00:00:00 2001 From: Myat Zin Wai Maw Date: Wed, 29 Jan 2020 16:27:41 +0630 Subject: [PATCH] second display tax profile --- app/assets/javascripts/addorder.js | 2 +- app/controllers/origami/second_display_controller.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index e21d9c4a..6d2fee7b 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -1453,7 +1453,7 @@ $(function() { $.ajax({ type: "POST", url: url, - data: {"data":data,"status":status}, + data: {"data":data,"status":status,"type":$("#link_type").val()}, dataType: "json", success:function(result){ } diff --git a/app/controllers/origami/second_display_controller.rb b/app/controllers/origami/second_display_controller.rb index c8277ef7..90dcfcf9 100644 --- a/app/controllers/origami/second_display_controller.rb +++ b/app/controllers/origami/second_display_controller.rb @@ -11,7 +11,7 @@ class Origami::SecondDisplayController < BaseOrigamiController display_type = Lookup.find_by_lookup_type("display_type") if !display_type.nil? && display_type.value.to_i == 2 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 tax_profiles = nil end @@ -27,7 +27,7 @@ class Origami::SecondDisplayController < BaseOrigamiController #Shop Name in Navbor # helper_method :shop_detail # def shop_detail - # + # # end