Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tia-dev
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dida Adams Arizona
Tia-dev
Commits
aa481418
Commit
aa481418
authored
Nov 29, 2020
by
Faisal Hamdi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rifka' into 'master'
issue tp 15 16 See merge request
!718
parents
5fd8cf97
35462c94
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
7 deletions
+39
-7
TaxPlanning.js
src/container/BudgetTahunan/TaxPlanning.js
+39
-7
No files found.
src/container/BudgetTahunan/TaxPlanning.js
View file @
aa481418
...
...
@@ -946,8 +946,13 @@ export default class TaxPlanning extends Component {
// console.log(tableMeta.rowData[8], baru, anjay, total);
if
(
String
(
tableMeta
.
rowData
[
8
]).
toLocaleUpperCase
()
==
"CORPORATE INCOME TAX"
)
{
total
=
R
.
equals
(
total
,
NaN
)
?
"0.00"
:
Number
(
total
).
toFixed
(
2
)
if
(
total
<
0
)
{
total
=
0
return
total
}
else
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
]
=
total
return
total
}
}
else
{
total
=
R
.
equals
(
total
,
NaN
)
?
"0.0"
:
Number
(
total
).
toFixed
(
1
)
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
]
=
total
...
...
@@ -1163,8 +1168,17 @@ export default class TaxPlanning extends Component {
}
else
{
if
(
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
.
value
==
undefined
)
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
=
Number
(
total
).
toFixed
(
1
)
}
else
{
if
(
tableMeta
.
rowData
[
8
]
==
"Corporate Income Tax"
)
{
if
(
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
.
value
)
<
0
)
{
total
=
0
}
else
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
.
value
=
Number
(
total
).
toFixed
(
1
)
}
}
else
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
.
value
=
Number
(
total
).
toFixed
(
1
)
}
}
}
...
...
@@ -1203,9 +1217,27 @@ export default class TaxPlanning extends Component {
}
}
else
{
if
(
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
.
value
==
undefined
)
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
=
total
if
(
tableMeta
.
rowData
[
8
]
==
"Corporate Income Tax"
)
{
if
(
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
)
<
0
)
{
total
=
0
}
else
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
=
Number
(
total
)
}
}
else
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
.
value
=
total
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
=
Number
(
total
)
}
}
else
{
if
(
tableMeta
.
rowData
[
8
]
==
"Corporate Income Tax"
)
{
if
(
Number
(
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
.
value
)
<
0
)
{
total
=
0
}
else
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
.
value
=
Number
(
total
)
}
}
else
{
dataTable2
[
tableMeta
.
rowIndex
][
tableMeta
.
columnIndex
].
tbf
.
value
=
Number
(
total
)
}
}
}
...
...
@@ -8207,7 +8239,7 @@ export default class TaxPlanning extends Component {
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
handleForecast
(
tableMeta
,
Number
(
this
.
props
.
periode
)
+
2
,
3
)).
toFixed
(
1
)}
value
=
{
Number
(
handleForecast
(
tableMeta
,
Number
(
this
.
props
.
periode
)
+
1
,
3
)).
toFixed
(
1
)}
/>
:
<
LightTooltip
title
=
{
this
.
state
.
minValue
===
null
?
`Value Should be
${
tableMeta
.
rowData
[
25
].
tbf
}
`
:
`Value Should be (
${
this
.
state
.
minValue
}
) up to (
${
this
.
state
.
maxValue
}
)`
}
arrow
>
<
NumberFormat
...
...
@@ -8224,7 +8256,7 @@ export default class TaxPlanning extends Component {
type
=
"text"
placeholder
=
""
disabled
=
{
true
}
value
=
{
Number
(
handleForecast
(
tableMeta
,
Number
(
this
.
props
.
periode
)
+
2
,
3
)).
toFixed
(
1
)}
value
=
{
Number
(
handleForecast
(
tableMeta
,
Number
(
this
.
props
.
periode
)
+
1
,
3
)).
toFixed
(
1
)}
/
>
<
/LightTooltip
>
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment