tax_jp 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abb57ffb800c9774815ec28f56da7502c30b112cf9c3d05b3b38126b018bfc15
-  data.tar.gz: ec84cbcd5120b0dc413655e928fba77abcf2a0349b6eafd3069416d090ae35a5
+  metadata.gz: 4a6c0a4c5a2b6c4e6068fd78440a89de985020aac4274dfef9c7472c8195714d
+  data.tar.gz: 0c483de128eec29b328e6e45b7ed6ce69a3808f8e35fac1f5087a712099df974
 SHA512:
-  metadata.gz: 22312abd7983472c40ac53d72c84fb0eba92c83db5fa45eab749fa0972a7318a5f50ca1e4d951cfe556f3f97077243ff02d0e8fd67996fcd833d1ce2e5ff3d59
-  data.tar.gz: 19a6f2f3ce1d7587976fd096be36dd32715ec415459c552430ee02a0e5aa1b9271447a7f2a81c8b2ba16184fcb852aa74f0bb682cee44ad8425e839fc4ab0601
+  metadata.gz: 3c8a5b3567662da8918f944c6abdcbe92ab4f61df63cdfd44ebad233433d4c34f9100fc7653ebd2e66d36bd88beb811f969ee27492f014e847a3ec58ce12f1c3
+  data.tar.gz: 6d61f4e88649520646fb3e5d86eb8d28af2804e8855ffd0e5104684ba5aef6aa48830eca4961a7f926f91dc1b2aea3db240b8efa680e337e6c777b3468a04b6a

data/app/controllers/tax_jp/social_insurances_controller.rb

@@ -0,0 +1,29 @@
+require_dependency "tax_jp/application_controller"
+
+module TaxJp
+  class SocialInsurancesController < ApplicationController
+    before_action :preload_finder
+
+    def index
+      if params[:commit]
+        @social_insurances = TaxJp::SocialInsurance.find_all_by_date_and_prefecture(@finder.from, @finder.prefecture_code)
+      end
+    end
+
+    private
+    
+    def preload_finder
+      @finder = TaxJp::Finder.new(finder_params)
+      @finder.from ||= Date.today.strftime('%Y-%m-%d')
+    end
+  
+    def finder_params
+      if params[:finder].present?
+        params.require(:finder).permit(:from, :prefecture_code)
+      else
+        {}
+      end
+    end
+
+  end
+end

data/app/models/tax_jp/finder.rb

@@ -2,4 +2,5 @@ class TaxJp::Finder
   include ActiveModel::Model
   
   attr_accessor :from
+  attr_accessor :prefecture_code
 end

data/app/views/layouts/tax_jp/_nav.html.erb

@@ -1,6 +1,7 @@
 <nav class="nav justify-content-center">
   <%= link_to '源泉徴収税', withheld_taxes_path, class: "nav-link #{controller_name == 'withheld_taxes' ? 'active' : nil}" %>
   <%= link_to '源泉徴収税（賞与）', bonus_withheld_taxes_path, class: "nav-link #{controller_name == 'bonus_withheld_taxes' ? 'active' : nil}" %>
+  <%= link_to '社会保険料', social_insurances_path, class: "nav-link #{controller_name == 'social_insurances' ? 'active' : nil}" %>
   <%= link_to '雇用保険料', employment_insurances_path, class: "nav-link #{controller_name == 'employment_insurances' ? 'active' : nil}" %>
   <%= link_to '減価償却率', depreciation_rates_path, class: "nav-link #{controller_name == 'depreciation_rates' ? 'active' : nil}" %>
 </nav>

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

@@ -2,29 +2,12 @@
   <%= form_with model: @finder, url: {action: 'index'}, method: 'get', class: 'form form-vertical', local: true do |f| %>
     <div class="row">
       <div class="col-sm-3 form-group">
-        <div class="input-group date" id="datetimepicker4" data-target-input="nearest">
-          <label for="datetimepicker1" class="pt-2 pr-2">年月日:</label>
-          <%= f.text_field :from, class: 'form-control datetimepicker-input', data: {target: '#datetimepicker4'} %>
-          <div class="input-group-append" data-target="#datetimepicker4" data-toggle="datetimepicker">
-              <div class="input-group-text"><i class="fa fa-calendar"></i></div>
-          </div>
-        </div>
+        <%= f.t_date_field :from %>
       </div>
       <div class="col">
         <%= f.submit '表示', class: 'btn btn-sm btn-default mt-1' %>
       </div>
     </div>
-    <script>
-          $(function () {
-            $('#datetimepicker4').datetimepicker({
-              format: 'YYYY-MM-DD',
-              locale: 'ja',
-              buttons: {
-                showClose: true
-              }
-          });
-        });
-    </script>
   <% end %>
 </div>
 <div class="pl-4 pr-4">

data/app/views/tax_jp/common/_date_field.html.erb

@@ -0,0 +1,18 @@
+<div class="input-group date" id="datetimepicker4" data-target-input="nearest">
+  <label for="datetimepicker1" class="pt-2 pr-2">年月日:</label>
+  <%= f.text_field method, class: 'form-control datetimepicker-input', data: {target: '#datetimepicker4'} %>
+  <div class="input-group-append" data-target="#datetimepicker4" data-toggle="datetimepicker">
+    <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+  </div>
+  <script>
+        $(function () {
+          $('#datetimepicker4').datetimepicker({
+            format: 'YYYY-MM-DD',
+            locale: 'ja',
+            buttons: {
+              showClose: true
+            }
+        });
+      });
+  </script>
+</div>

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

@@ -0,0 +1,69 @@
+<div class="container">
+  <%= form_with model: @finder, url: {action: 'index'}, method: 'get', class: 'form form-vertical', local: true do |f| %>
+    <div class="row">
+      <div class="col-sm-3 form-group">
+        <%= f.t_date_field :from %>
+      </div>
+      <div class="col-sm-4 form-group form-inline">
+        <label for="finder_prefecture_code" class="pr-2">都道府県:</label>
+        <%= f.collection_select :prefecture_code, TaxJp::Prefecture.all, :code, :name, {}, class: 'form-control' %>
+      </div>
+      <div class="col">
+        <%= f.submit '表示', class: 'btn btn-sm btn-default mt-1' %>
+      </div>
+    </div>
+  <% end %>
+</div>
+<% if @social_insurances %>
+  <div class="pl-4 pr-4">
+    <div>
+      <span><%= @social_insurances.first.valid_from %></span>
+      <span>～</span>
+      <span><%= @social_insurances.first.valid_until %></span>
+    </div>
+    <table class="table table-striped table-bordered table-hover table-sm">
+      <thead class="thead-light">
+        <tr>
+          <th class="text-center" colspan="3">標準報酬</th>
+          <th class="text-center" colspan="2">報酬月額</th>
+          <th class="text-center" colspan="4">全国健康保険協会管掌健康保険料</th>
+          <th class="text-center" colspan="4">厚生年金保険料（厚生年金基金加入員を除く）</th>
+        </tr>
+        <tr>
+          <th class="text-center">等級</th>
+          <th class="text-center">月額</th>
+          <th class="text-center">日額</th>
+          <th class="text-center">円以上</th>
+          <th class="text-center">円未満</th>
+          <th class="text-center">全額</th>
+          <th class="text-center">折半額</th>
+          <th class="text-center"><span class="text-nowrap">全額</span> <span class="text-nowrap">（介護保険２号）</span></th>
+          <th class="text-center"><span class="text-nowrap">折半額</span> <span class="text-nowrap">（介護保険２号）</span></th>
+          <th class="text-center">全額</th>
+          <th class="text-center">折半額</th>
+          <th class="text-center"><span class="text-nowrap">全額</span> <span class="text-nowrap">（坑内員／船員）</th>
+          <th class="text-center"><span class="text-nowrap">折半額</span> <span class="text-nowrap">（坑内員／船員）</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @social_insurances.each do |si| %>
+          <tr>
+            <td class="text-center"><%= si.grade.grade %><%= "(#{si.grade.pension_grade})" if si.welfare_pension.general_amount > 0 %></td>
+            <td class="text-right"><%= si.grade.monthly_standard.to_s(:delimited) %></td>
+            <td class="text-right"><%= si.grade.daily_standard.to_s(:delimited) %></td>
+            <td class="text-right"><%= si.grade.salary_from.to_s(:delimited) %></td>
+            <td class="text-right"><%= si.grade.salary_to.to_s(:delimited) if si.grade.salary_to < 2_147_483_647 %></td>
+            <td class="text-right"><%= si.health_insurance.general_amount.to_s(:delimited) %></td>
+            <td class="text-right"><%= si.health_insurance.general_amount_half.to_s(:delimited) %></td>
+            <td class="text-right"><%= si.health_insurance.general_amount_care.to_s(:delimited) %></td>
+            <td class="text-right"><%= si.health_insurance.general_amount_care_half.to_s(:delimited) %></td>
+            <td class="text-right"><%= number_to_currency(si.welfare_pension.general_amount, unit: '', precision: 2) if si.welfare_pension.general_amount > 0 %></td>
+            <td class="text-right"><%= number_to_currency(si.welfare_pension.general_amount_half, unit: '', precision: 2) if si.welfare_pension.general_amount_half > 0 %></td>
+            <td class="text-right"><%= number_to_currency(si.welfare_pension.particular_amount, unit: '', precision: 2) if si.welfare_pension.particular_amount > 0 %></td>
+            <td class="text-right"><%= number_to_currency(si.welfare_pension.particular_amount_half, unit: '', precision: 2) if si.welfare_pension.particular_amount_half > 0 %></td>
+          </tr>
+        <% end %>
+      </tbody>  
+    </table>
+  </div>
+<% end %>

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

@@ -2,29 +2,12 @@
   <%= form_with model: @finder, url: {action: 'index'}, method: 'get', class: 'form form-vertical', local: true do |f| %>
     <div class="row">
       <div class="col-sm-3 form-group">
-        <div class="input-group date" id="datetimepicker4" data-target-input="nearest">
-          <label for="datetimepicker1" class="pt-2 pr-2">年月日:</label>
-          <%= f.text_field :from, class: 'form-control datetimepicker-input', data: {target: '#datetimepicker4'} %>
-          <div class="input-group-append" data-target="#datetimepicker4" data-toggle="datetimepicker">
-              <div class="input-group-text"><i class="fa fa-calendar"></i></div>
-          </div>
-        </div>
+        <%= f.t_date_field :from %>
       </div>
       <div class="col">
         <%= f.submit '表示', class: 'btn btn-sm btn-default mt-1' %>
       </div>
     </div>
-    <script>
-          $(function () {
-            $('#datetimepicker4').datetimepicker({
-              format: 'YYYY-MM-DD',
-              locale: 'ja',
-              buttons: {
-                showClose: true
-              }
-          });
-        });
-    </script>
   <% end %>
 </div>
 <div class="pl-4 pr-4">

data/config/routes.rb

@@ -2,6 +2,7 @@ TaxJp::Engine.routes.draw do
   resources :bonus_withheld_taxes, only: 'index'
   resources :depreciation_rates, only: 'index'
   resources :employment_insurances, only: 'index'
+  resources :social_insurances, only: 'index'
   resources :withheld_taxes, only: 'index'
 
   root to: 'top#index'

data/lib/tax_jp/engine.rb

@@ -1,5 +1,6 @@
 require 'bootstrap4-datetime-picker-rails'
 require 'font-awesome-rails'
+require_relative 'form_builder'
 
 module TaxJp
   class Engine < ::Rails::Engine

data/lib/tax_jp/form_builder.rb

@@ -0,0 +1,10 @@
+require 'action_view'
+
+class ActionView::Helpers::FormBuilder
+  include ActionView::Helpers::AssetTagHelper
+
+  def t_date_field(method, options = {})
+    @template.render 'tax_jp/common/date_field', f: self, method: method
+  end
+
+end

data/lib/tax_jp/social_insurances/health_insurance.rb

@@ -34,7 +34,7 @@ class TaxJp::SocialInsurances::HealthInsurance
   end
 
   def general_amount_half
-    floor_amount(general_amount / 2)
+    (general_amount / 2).floor(1)
   end
 
   def general_amount_care
@@ -42,7 +42,7 @@ class TaxJp::SocialInsurances::HealthInsurance
   end
 
   def general_amount_care_half
-    floor_amount(general_amount_care / 2) 
+    (general_amount_care / 2).floor(1) 
   end
 
   def salary
@@ -56,8 +56,4 @@ class TaxJp::SocialInsurances::HealthInsurance
     grade.grade > 0 ? grade.monthly_standard : 0
   end
 
-  def floor_amount(amount)
-    (amount * 10).floor * 0.1
-  end
-
 end

data/lib/tax_jp/social_insurances/welfare_pension.rb

@@ -29,7 +29,7 @@ class TaxJp::SocialInsurances::WelfarePension
   end
 
   def general_amount_half
-    floor_amount(general_amount / 2)
+    (general_amount / 2).floor(2)
   end
 
   def particular_amount
@@ -37,7 +37,7 @@ class TaxJp::SocialInsurances::WelfarePension
   end
 
   def particular_amount_half
-    floor_amount(particular_amount / 2) 
+    (particular_amount / 2).floor(2) 
   end
   
   def salary
@@ -60,8 +60,4 @@ class TaxJp::SocialInsurances::WelfarePension
     grade.daily_standard
   end
 
-  def floor_amount(amount)
-    (amount * 100).floor * 0.01
-  end
-
 end

data/lib/tax_jp/version.rb

@@ -1,3 +1,3 @@
 module TaxJp
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tax_jp
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - ichylinux
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-09 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.3
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.3
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: bootstrap4-datetime-picker-rails
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,7 @@ files:
 - app/controllers/tax_jp/bonus_withheld_taxes_controller.rb
 - app/controllers/tax_jp/depreciation_rates_controller.rb
 - app/controllers/tax_jp/employment_insurances_controller.rb
+- app/controllers/tax_jp/social_insurances_controller.rb
 - app/controllers/tax_jp/top_controller.rb
 - app/controllers/tax_jp/withheld_taxes_controller.rb
 - app/helpers/tax_jp/application_helper.rb
@@ -124,8 +125,10 @@ files:
 - app/views/layouts/tax_jp/_nav.html.erb
 - app/views/layouts/tax_jp/application.html.erb
 - app/views/tax_jp/bonus_withheld_taxes/index.html.erb
+- app/views/tax_jp/common/_date_field.html.erb
 - app/views/tax_jp/depreciation_rates/index.html.erb
 - app/views/tax_jp/employment_insurances/index.html.erb
+- app/views/tax_jp/social_insurances/index.html.erb
 - app/views/tax_jp/top/index.html.erb
 - app/views/tax_jp/withheld_taxes/index.html.erb
 - config/routes.rb
@@ -187,6 +190,7 @@ files:
 - lib/tax_jp/depreciation_rate.rb
 - lib/tax_jp/depreciation_rates/db_builder.rb
 - lib/tax_jp/engine.rb
+- lib/tax_jp/form_builder.rb
 - lib/tax_jp/gengou.rb
 - lib/tax_jp/labor_insurance.rb
 - lib/tax_jp/labor_insurances/employment_insurance.rb