tax_jp 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11a54f4e4111eb0c5218fbf446e5ce265341bcd87989e1e7654ef6405742f845
-  data.tar.gz: 7051c81595882053ff3c15baa5ef41cee96ce0b8869dd74d480e3180bd428a3f
+  metadata.gz: 5d231fd19f8e0a2603cd6f289aae66de527a7dc29705b8831387ebb179b3150a
+  data.tar.gz: a72410cc728a5146a06acc4e6335fa557ccd96e5bd86a7c1a50c416868a0f691
 SHA512:
-  metadata.gz: 1f162c5013f8694da55e3fbb86fd1a5e4acb94b7eee0b15104730682334ef38bee3228975dcf137e4ccdd26f641d83ab36ee869c661452bf431a1b541f48748f
-  data.tar.gz: f9658e9db888dfb35da7802908d15527501f51573198a7500c673b076d495e75c4d8515dbffc607baaac9e768b141e825f268ecc4f4d0f0a661d38cdf6b8a561
+  metadata.gz: 074e65b0c5ab90955d77815a6ea4d576fb4dbbf2b30396f33fed66f983e5aed351c145f16dbda4bd8bfb9807795a3da1954c4b1b454764d75a00d213564a9f5a
+  data.tar.gz: a67853c1323bb72909316ff98639ccb2585d235558aae48b83a68ce48acd344e36bdf26d8a3d8e931f1e55362daa1d2204a5e77594df641eaa4f2d1bda98f305

data/app/assets/javascripts/tax.js

@@ -7,9 +7,10 @@ tax.INCLUSIVE = 2; // 内税
 tax.EXCLUSIVE = 3; // 外税
 
 tax.consumptionTaxes = [
-    {date: Date.parse('2014-04-01'), rate: 0.08},
-    {date: Date.parse('1997-04-01'), rate: 0.05},
-    {date: Date.parse('1989-04-01'), rate: 0.03},
+    {date: Date.parse('2019-10-01'), rate: 0.1, reduced_rate: 0.08},
+    {date: Date.parse('2014-04-01'), rate: 0.08, reduced_rate: 0},
+    {date: Date.parse('1997-04-01'), rate: 0.05, reduced_rate: 0},
+    {date: Date.parse('1989-04-01'), rate: 0.03, reduced_rate: 0},
 ];
 
 tax.getRateOn = function(date, options) {
@@ -20,7 +21,11 @@ tax.getRateOn = function(date, options) {
 
   var ret = 0;
   for (var i = 0; this.consumptionTaxes.length; i ++) {
-    ret = this.consumptionTaxes[i].rate;
+    if (options.reduced) {
+      ret = this.consumptionTaxes[i].reduced_rate;
+    } else {
+      ret = this.consumptionTaxes[i].rate;
+    }
     if (date >= this.consumptionTaxes[i].date) {
       break;
     }
@@ -29,7 +34,7 @@ tax.getRateOn = function(date, options) {
   if (options.percent) {
     ret *= 100;
   }
-  
+
   return ret;
 };
 
@@ -40,8 +45,7 @@ tax.calcTaxAmount = function(taxType, rate, amount) {
 
   if ( taxType == tax.INCLUSIVE ) {
     return parseInt(amount * rate / (1 + rate));
-  }
-  else if ( taxType == tax.EXCLUSIVE ) {
+  } else if ( taxType == tax.EXCLUSIVE ) {
     return parseInt(amount * rate); 
   }
 

data/app/views/tax_jp/consumption_taxes/index.html.erb

@@ -22,9 +22,9 @@
           <td class="text-center"><%= number_to_currency(ct.national_percent, unit: '', precision: 1) if ct.national_percent > 0 %></td>
           <td class="text-center"><%= number_to_currency(ct.local_percent, unit: '', precision: 1) if ct.local_percent > 0 %></td>
           <td class="text-center"><%= number_to_currency(ct.total_percent, unit: '') if ct.total_percent > 0 %></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
+          <td class="text-center"><%= number_to_currency(ct.national_reduced_percent, unit: '', precision: 2) if ct.national_reduced_percent > 0 %></td>
+          <td class="text-center"><%= number_to_currency(ct.local_reduced_percent, unit: '', precision: 2) if ct.local_reduced_percent > 0 %></td>
+          <td class="text-center"><%= number_to_currency(ct.total_reduced_percent, unit: '') if ct.total_reduced_percent > 0 %></td>
         </tr>
       <% end %>
    </tbody> 

data/data//346/266/210/350/262/273/347/250/216.yml

@@ -2,14 +2,23 @@
   national: 0.03
   local: 0.00
   total: 0.03
+  national_reduced: 0
+  local_reduced: 0
+  total_reduced: 0
 1997-04-01:
   national: 0.04
   local: 0.01
   total: 0.05
+  national_reduced: 0
+  local_reduced: 0
+  total_reduced: 0
 2014-04-01:
   national: 0.063
   local: 0.017
   total: 0.08
+  national_reduced: 0
+  local_reduced: 0
+  total_reduced: 0
 2019-10-01:
   national: 0.078
   local: 0.022

data/lib/tax_jp/consumption_tax.rb

@@ -7,12 +7,16 @@ module TaxJp
 
     attr_reader :valid_from
     attr_reader :national, :local, :total
+    attr_reader :national_reduced, :local_reduced, :total_reduced
 
     def initialize(valid_from, values)
       @valid_from = valid_from
       @national = values['national']
       @local = values['local']
       @total = values['total']
+      @national_reduced = values['national_reduced']
+      @local_reduced = values['local_reduced']
+      @total_reduced = values['total_reduced']
     end
 
     def self.all
@@ -53,5 +57,16 @@ module TaxJp
       total * 100
     end
 
+    def national_reduced_percent
+      national_reduced * 100
+    end
+
+    def local_reduced_percent
+      local_reduced * 100
+    end
+
+    def total_reduced_percent
+      total_reduced * 100
+    end
   end
 end

data/lib/tax_jp/version.rb

@@ -1,3 +1,3 @@
 module TaxJp
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tax_jp
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - ichylinux
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2019-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap
@@ -237,8 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 税金計算ライブラリ