luca-jp 0.20.3 → 0.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 827562f80bb3c45d9b0058ba94e99c08e537c6e05288d695970b2b25420abf6d
-  data.tar.gz: c7b1dc9f95b4d5a0a0430a312d32eb17e679e8ca0e9a7679f0b28fb8d754b7fd
+  metadata.gz: ea7c42dee2cf6b8002de5606bf2056714154a68bd4212762580029644f2f6607
+  data.tar.gz: f759cb53bf48adfe8148eb5f68f6f95a71c8b2decc103d63cfb6e4dce3fac2c9
 SHA512:
-  metadata.gz: d48e2910162d833838b007ba484490f24db49b8ad22917cea36eb76abfa59366db5df2f674a17f80c602d12278b3cc02b2ed03c8b4856e1ca7f2caafa7ac265f
-  data.tar.gz: 2d14ba140686ec2957cd0d8b09e887aa9cc7dfc4816c4e9a9ebeeb9b96f43975576e5ab4d96d350c5efad30068495fef1ed5ed27533db29fb88f6b2f4127039e
+  metadata.gz: 3a5e412b5cb291bd2be9e39350385969e7ad6bb9f13b8f67c62b52bdc23a5f8aa226eee59cba6684d9d787bb0e6dff14b6b711113f9e5d2291d2e467419f7c7e
+  data.tar.gz: 92333c73665f5e7a06a6830a4e79f4cf67ee82b3f04f715efcd1136fe66ebdb3daee355693ceecfec1199b6f8c763ecd95c5af9d2907b0a6aefdfaf2ad10236e

data/lib/luca/jp/version.rb

@@ -2,6 +2,6 @@
 
 module Luca
   module Jp
-    VERSION = '0.20.3'
+    VERSION = '0.20.4'
   end
 end

data/lib/luca_salary/jp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaSalaryJp
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/luca_salary/jp.rb

@@ -43,8 +43,8 @@ class LucaSalary::Jp < LucaSalary::Base
     payment.tap do |p|
       p['901'] = 給与等の金額
       p['911'] = JpNationalTax::IncomeTax.basic_deduction(給与等の金額, date)
-      p['916'] = 配偶者控除の金額(p['1'], profile['spouse'], date)
-      p['917'] = 配偶者特別控除の金額(p['1'], profile['spouse'], date)
+      p['916'] = 配偶者控除の金額(給与等の金額, profile['spouse'], date)
+      p['917'] = 配偶者特別控除の金額(給与等の金額, profile['spouse'], date)
       p['918'] = 扶養控除の金額(profile['family'], date)
       p['912'] = ['201', '202', '204', '205'].map{ |cd| p[cd] }.compact.sum
       課税給与所得金額 = 給与等の金額 - ['911', '912', '916', '917', '918'].map{ |cd| p[cd] }.compact.sum
@@ -65,68 +65,23 @@ class LucaSalary::Jp < LucaSalary::Base
     end
   end
 
-  def self.配偶者控除の金額(income, spouse, date)
-    puts spouse
+  def self.配偶者控除の金額(salary, spouse, date)
     return nil if spouse.nil?
 
-    puts spouse
     spouse_salary = JpNationalTax::IncomeTax.year_salary_taxable(spouse['income'][date.year.to_s] || 0, date)
-    return 0 if spouse_salary > 480_000
-
-    salary = JpNationalTax::IncomeTax.year_salary_taxable(income || 0, date)
-    birth_date = spouse['birth_date'] || date
-    if salary <= 9_000_000
-      birth_date <= date.prev_year(70) ? 480_000 : 380_000
-    elsif salary <= 9_500_000
-      birth_date <= date.prev_year(70) ? 320_000 : 260_000
-    elsif salary <= 10_000_000
-      birth_date <= date.prev_year(70) ? 160_000 : 130_000
-    else
-      0
-    end
+    return 0 if spouse_salary > 580_000
+
+    JpNationalTax::IncomeTax.spouse_deduction(salary, spouse_salary, date, spouse['birth_date'])
   end
 
-  def self.配偶者特別控除の金額(income, spouse, date)
+  def self.配偶者特別控除の金額(salary, spouse, date)
     return nil if spouse.nil?
-
-    salary = JpNationalTax::IncomeTax.year_salary_taxable(income || 0, date)
     return 0 if salary > 10_000_000
 
     spouse_salary = JpNationalTax::IncomeTax.year_salary_taxable(spouse['income'][date.year.to_s] || 0, date)
-    return 0 if spouse_salary <= 480_000
-    return 0 if spouse_salary > 1_330_000
-
-    if salary <= 9_000_000
-      return 380_000 if spouse_salary <= 950_000
-      return 360_000 if spouse_salary <= 1_000_000
-      return 310_000 if spouse_salary <= 1_050_000
-      return 260_000 if spouse_salary <= 1_100_000
-      return 210_000 if spouse_salary <= 1_150_000
-      return 160_000 if spouse_salary <= 1_200_000
-      return 110_000 if spouse_salary <= 1_250_000
-      return 60_000 if spouse_salary <= 1_300_000
-      return 30_000
-    elsif salary <= 9_500_000
-      return 260_000 if spouse_salary <= 950_000
-      return 240_000 if spouse_salary <= 1_000_000
-      return 210_000 if spouse_salary <= 1_050_000
-      return 180_000 if spouse_salary <= 1_100_000
-      return 140_000 if spouse_salary <= 1_150_000
-      return 110_000 if spouse_salary <= 1_200_000
-      return 80_000 if spouse_salary <= 1_250_000
-      return 40_000 if spouse_salary <= 1_300_000
-      return 20_000
-    else
-      return 130_000 if spouse_salary <= 950_000
-      return 120_000 if spouse_salary <= 1_000_000
-      return 110_000 if spouse_salary <= 1_050_000
-      return 90_000 if spouse_salary <= 1_100_000
-      return 70_000 if spouse_salary <= 1_150_000
-      return 60_000 if spouse_salary <= 1_200_000
-      return 40_000 if spouse_salary <= 1_250_000
-      return 20_000 if spouse_salary <= 1_300_000
-      return 10_000
-    end
+    return 0 if spouse_salary <= 580_000
+
+    JpNationalTax::IncomeTax.spouse_deduction(salary, spouse_salary, date, spouse['birth_date'])
   end
 
   def self.扶養控除の金額(family, date)
@@ -139,15 +94,8 @@ class LucaSalary::Jp < LucaSalary::Base
     birth_date = person['birth_date']
     return 0 if birth_date.nil?
 
-    if birth_date > date.prev_year(16)
-      0
-    elsif birth_date <= date.prev_year(70)
-      person['live_with'] ? 580_000 : 480_000 # 老人扶養親族
-    elsif birth_date <= date.prev_year(19) and birth_date > date.prev_year(23)
-      630_000 # 特定扶養親族
-    else
-      380_000
-    end
+    salary = JpNationalTax::IncomeTax.year_salary_taxable(person.dig('income', date.year.to_s) || 0, date)
+    JpNationalTax::IncomeTax.family_deduction(birth_date, date, salary, live_with: person['live_with'])
   end
 
   def self.扶養控除対象者の数(family, date)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luca-jp
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 0.20.4
 platform: ruby
 authors:
 - Chuma Takahiro
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement