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
373a4923
Commit
373a4923
authored
May 25, 2023
by
Riri Novita
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Currency MB
parent
724b4974
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
218 additions
and
53 deletions
+218
-53
BalanceSheet.js
src/container/BudgetTahunan/BalanceSheet.js
+20
-2
CashFlow.js
src/container/BudgetTahunan/CashFlow.js
+5
-2
CorporateAnnualTarget.js
src/container/BudgetTahunan/CorporateAnnualTarget.js
+90
-20
FixedAssetsMovement.js
src/container/BudgetTahunan/FixedAssetsMovement.js
+92
-21
ProfitLoss.js
src/container/BudgetTahunan/ProfitLoss.js
+2
-1
TaxPlanning.js
src/container/BudgetTahunan/TaxPlanning.js
+9
-7
No files found.
src/container/BudgetTahunan/BalanceSheet.js
View file @
373a4923
...
...
@@ -295,8 +295,9 @@ export default class BalanceSheet extends Component {
let
res
=
await
fetch
(
`
${
process
.
env
.
REACT_APP_URL_MAIN_BE
}
/public/transaction/master_budget/download_template?report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
`
)
console
.
log
(
res
);
res
=
await
res
.
blob
()
//
console.log(res)
console
.
log
(
res
)
if
(
res
.
size
>
0
)
{
let
url
=
window
.
URL
.
createObjectURL
(
res
);
let
a
=
document
.
createElement
(
'a'
);
...
...
@@ -306,6 +307,23 @@ export default class BalanceSheet extends Component {
}
}
// downloadTemplate = async () => {
// let res = await fetch(
// `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/master_budget/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}`
// )
// console.log(res)
// res = await res.blob()
// console.log(res)
// if (res.size > 0) {
// let url = window.URL.createObjectURL(res);
// console.log(url);
// let a = document.createElement('a');
// a.href = url;
// a.download = 'Template Master Budget Balance Sheet.xlsx';
// a.click();
// }
// }
fileHandler
=
(
event
)
=>
{
let
fileObj
=
event
ExcelRenderer
(
fileObj
,
(
err
,
resp
)
=>
{
...
...
@@ -3803,7 +3821,7 @@ export default class BalanceSheet extends Component {
/
>
<
/div
>
<
/div
>
<
div
style
=
{{
padding
:
'1
0px 30
px'
}}
>
<
div
style
=
{{
padding
:
'1
5px 30px 55
px'
}}
>
<
UploadFile
type
=
{
this
.
state
.
uploadStatus
}
percentage
=
{
this
.
state
.
percentage
}
...
...
src/container/BudgetTahunan/CashFlow.js
View file @
373a4923
...
...
@@ -8,7 +8,7 @@ import Images from '../../assets/Images';
import
*
as
R
from
'ramda'
import
{
PropagateLoader
}
from
'react-spinners'
;
import
Constant
from
'../../library/Constant'
;
import
{
Alert
}
from
'@material-ui/lab'
;
import
{
Alert
,
Autocomplete
}
from
'@material-ui/lab'
;
var
ct
=
require
(
"../../library/CustomTable"
);
const
getMuiTheme
=
()
=>
createMuiTheme
(
ct
.
customTable3
());
...
...
@@ -42,7 +42,9 @@ export default class CashFlow extends Component {
loading
:
false
,
minValue
:
"0"
,
maxValue
:
"0"
,
handleDoubleClick
:
0
handleDoubleClick
:
0
,
defaultCurrencyUpload
:
this
.
props
.
defaultCurrency
,
visibleAlertSave
:
false
}
}
...
...
@@ -380,6 +382,7 @@ export default class CashFlow extends Component {
"company_id"
:
this
.
props
.
company
.
company_id
,
"periode"
:
this
.
props
.
periode
,
"report_id"
:
6
,
"currency_id"
:
this
.
props
.
defaultCurrency
.
id
,
"status"
:
"submitted"
,
"cash_flow"
:
dbcf
}
...
...
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @
373a4923
This diff is collapsed.
Click to expand it.
src/container/BudgetTahunan/FixedAssetsMovement.js
View file @
373a4923
This diff is collapsed.
Click to expand it.
src/container/BudgetTahunan/ProfitLoss.js
View file @
373a4923
...
...
@@ -252,6 +252,7 @@ export default class ProfitLoss extends Component {
backToMasterBudget
(
type
)
{
// tambahin currency
console
.
log
(
"tes"
);
let
data
=
[]
this
.
state
.
dataTable
.
map
(
i
=>
{
data
.
push
({
...
...
@@ -3228,7 +3229,7 @@ export default class ProfitLoss extends Component {
/
>
<
/div
>
<
/div
>
<
div
style
=
{{
padding
:
'1
0px 30
px'
}}
>
<
div
style
=
{{
padding
:
'1
5px 30px 55
px'
}}
>
<
UploadFile
type
=
{
this
.
state
.
uploadStatus
}
percentage
=
{
this
.
state
.
percentage
}
...
...
src/container/BudgetTahunan/TaxPlanning.js
View file @
373a4923
...
...
@@ -765,8 +765,9 @@ export default class TaxPlanning extends Component {
let
res
=
await
fetch
(
`
${
process
.
env
.
REACT_APP_URL_MAIN_BE
}
/public/transaction/master_budget/download_template?report_id=
${
this
.
props
.
report_id
}
&&company_id=
${
this
.
props
.
company
.
company_id
}
&&year=
${
this
.
props
.
periode
}
`
)
console
.
log
(
res
)
res
=
await
res
.
blob
()
//
console.log(res)
console
.
log
(
res
)
if
(
res
.
size
>
0
)
{
let
url
=
window
.
URL
.
createObjectURL
(
res
);
let
a
=
document
.
createElement
(
'a'
);
...
...
@@ -9085,8 +9086,8 @@ export default class TaxPlanning extends Component {
<
/div
>
<
/button
>
<
/div
>
{
this
.
props
.
isApprover
===
true
||
this
.
state
.
dataTable
.
length
==
0
?
null
:
(
!
this
.
props
.
truelyApprover
)
&&
(
this
.
props
.
lastStatus
===
'SUBMIT'
||
this
.
props
.
lastStatus
===
'REVISION'
)
&&
this
.
props
.
prevRevision
===
false
&&
(
this
.
props
.
status
===
'revision'
||
this
.
props
.
status
===
'not-yet'
||
this
.
props
.
status
===
'draft'
||
this
.
props
.
status
===
'submitted'
)
?
{
/* {
this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
(!this.props.truelyApprover) && (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ?
*/
}
<
div
className
=
"col-2"
style
=
{{
display
:
'flex'
,
justifyContent
:
'flex-end'
,
maxWidth
:
'100%'
}}
>
<
button
className
=
"button"
...
...
@@ -9159,8 +9160,9 @@ export default class TaxPlanning extends Component {
<
Typography
style
=
{{
fontSize
:
'11px'
,
color
:
'#fff'
,
textAlign
:
'center'
}}
>
Save
&
Complete
<
/Typography
>
<
/div
>
<
/button
>
<
/div> : nul
l
}
<
/div
>
{
/* : null
} */
}
<
/div
>
<
/Paper
>
:
...
...
@@ -9321,7 +9323,7 @@ export default class TaxPlanning extends Component {
/
>
<
/div
>
<
/div
>
<
div
style
=
{{
padding
:
'1
0px 30
px'
}}
>
<
div
style
=
{{
padding
:
'1
5px 30px 55
px'
}}
>
<
UploadFile
type
=
{
this
.
state
.
uploadStatus
}
percentage
=
{
this
.
state
.
percentage
}
...
...
@@ -9342,7 +9344,7 @@ export default class TaxPlanning extends Component {
<
/div
>
)}
{
this
.
state
.
visibleAlertSave
&&
(
{
this
.
state
.
visibleAlertSave
&&
(
<
div
className
=
"test app-popup-show"
>
<
div
className
=
"popup-content border-radius"
style
=
{{
background
:
'#FFF27D'
,
borderRadius
:
10
,
width
:
715
,
height
:
238
}}
>
<
div
style
=
{{
margin
:
30
}}
>
...
...
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