tax_jp 1.2.12 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c25556cce1f63a7ecb67162e912d3df083fc84119581e6bd6a9ea2ebb8f62cca
4
- data.tar.gz: 77a8c61f79abe76c560ae122999e989d15eb4ba8f2dcbdcfbaa37cd3135c9866
3
+ metadata.gz: 2652469c41cff73f9aa0f9d7cc8eacba00ccc04de45ee6bf10af24b51cc5dd60
4
+ data.tar.gz: 1f5ddc9c8d7936425df87cafecbfaca618d53af4038c71c7ee0f1605a37ffa05
5
5
  SHA512:
6
- metadata.gz: 6f829f033456329bd3d2d7da04cbc87ac540312bc689b5b27e45c229a2007776e8f78a46c7cbc15a3f2b685c9c650f4058d1b68c20d864dbeaef3226f19c5c4a
7
- data.tar.gz: 7d870a4ae3ef50d38b681f316b83cd432b8d22817714da0a436ae5e89e65ab0d79904ddc03fed26af3f282b9c07af5a5bd06747b2f6cd02c6624e7660636252d
6
+ metadata.gz: 2699522895fbd5e6bc441c38ed0bef758f2ba5e04c2702ae2df84c6897d09920ea26657e14fa9820f90cb936b339e33ebb3a5f5297ef1ba5b0eeaf43eb0b2132
7
+ data.tar.gz: 23815220d9a5adfb047c46bce7589ed731d60bda4f468c3125b78770a659741979affb651f4db37a2ea00a61bf1cbb79f3781175aed735e518e1bbaeb80be71e
@@ -27,14 +27,31 @@
27
27
  </thead>
28
28
  <tbody>
29
29
  <% @withheld_taxes.each do |wt| %>
30
- <tr>
31
- <td class="text-center"><%= wt.salary_range_from.to_s(:delimited) %></td>
32
- <td class="text-center"><%= wt.salary_range_to.to_s(:delimited) %></td>
33
- <% 8.times do |i| %>
34
- <td class="text-end"><%= wt.__send__("dependent_#{i}").to_s(:delimited) %></td>
35
- <% end %>
36
- <td class="text-end"><%= wt.sub_salary.to_s(:delimited) %></td>
37
- </tr>
30
+ <% if wt.extra_rate > 0 or wt.sub_extra_rate > 0 %>
31
+ <tr>
32
+ <td class="text-center" colspan="2"><%= wt.salary_range_from.to_s(:delimited) %></td>
33
+ <% 8.times do |i| %>
34
+ <td class="text-end"><%= wt.__send__("dependent_#{i}").to_s(:delimited) %></td>
35
+ <% end %>
36
+ <td class="text-end"><%= wt.sub_salary.to_s(:delimited) %></td>
37
+ </tr>
38
+ <tr>
39
+ <td colspan="2"></td>
40
+ <td class="text-center" colspan="8"><%= (wt.extra_rate.rationalize * 100).to_f %>%</td>
41
+ <td class="text-center"><%= (wt.sub_extra_rate.rationalize * 100).to_f %>%</td>
42
+ </tr>
43
+ <% else %>
44
+ <tr>
45
+ <td class="text-center"><%= wt.salary_range_from.to_s(:delimited) %></td>
46
+ <td class="text-center">
47
+ <%= wt.salary_range_to == TaxJp::INTEGER_MAX ? '-' : wt.salary_range_to.to_s(:delimited) %>
48
+ </td>
49
+ <% 8.times do |i| %>
50
+ <td class="text-end"><%= wt.__send__("dependent_#{i}").to_s(:delimited) %></td>
51
+ <% end %>
52
+ <td class="text-end"><%= wt.sub_salary.to_s(:delimited) %></td>
53
+ </tr>
54
+ <% end %>
38
55
  <% end %>
39
56
  </tbody>
40
57
  </table>
@@ -11,5 +11,7 @@ create table withheld_taxes (
11
11
  dependent_5 integer not null,
12
12
  dependent_6 integer not null,
13
13
  dependent_7 integer not null,
14
- sub_salary integer not null
14
+ sub_salary integer not null,
15
+ extra_rate decimal(6,5) not null,
16
+ sub_extra_rate decimal(6,5) not null
15
17
  );