Pull from master

2018-08-06 17:52:03 +06:30
parent 35ac07b0a6
commit e99e907bc4
33 changed files with 455 additions and 126 deletions
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -130,6 +130,19 @@ class Origami::HomeController < BaseOrigamiController
        end
      end
    end
+
+    #for changable on/off
+    @changable_tax = true
+    lookup_changable_tax = Lookup.collection_of('changable_tax')
+    if !lookup_changable_tax.empty?
+      lookup_changable_tax.each do |changable_tax|
+        if changable_tax[0].downcase == "change" 
+          if changable_tax[1] == '0' 
+            @changable_tax = false
+          end
+        end
+      end
+    end
  end

 def check_emp_access_code