Commit b6a8521f authored by fahrur huzain's avatar fahrur huzain

Merge branch 'ENV-PROD' into 'ENV-DEPLOYMENT-PROD'

issue TP RO view dan parameter value

See merge request !2347
parents 7099ac77 66e1e57c
...@@ -8,6 +8,7 @@ import * as R from 'ramda' ...@@ -8,6 +8,7 @@ import * as R from 'ramda'
import Images from '../../../assets/Images'; import Images from '../../../assets/Images';
import Constant from '../../../library/Constant'; import Constant from '../../../library/Constant';
import PopUpInformation from '../../../library/PopUpInformation'; import PopUpInformation from '../../../library/PopUpInformation';
import { fixNumber, roundMath } from '../../../library/Utils';
export default class CreateParameter extends Component { export default class CreateParameter extends Component {
constructor(props) { constructor(props) {
...@@ -1669,7 +1670,7 @@ export default class CreateParameter extends Component { ...@@ -1669,7 +1670,7 @@ export default class CreateParameter extends Component {
id="value" id="value"
label={"Value"} label={"Value"}
// get data IDR by IDR mn // get data IDR by IDR mn
value={this.state.tempData === null ? '' : this.state.tempData.setting_group === "CURRENCY" ? Number(this.state.tempData.value) * 1000 : this.state.tempData.value} value={this.state.tempData === null ? '' : this.state.tempData.setting_group === "CURRENCY" ? fixNumber(Number(this.state.tempData.value) * 1000) : this.state.tempData.value}
inputProps={{ inputProps={{
min: 0, min: 0,
style: { style: {
......
...@@ -14,6 +14,7 @@ import Constant from '../../../library/Constant'; ...@@ -14,6 +14,7 @@ import Constant from '../../../library/Constant';
import PopUpDelete from '../../../library/PopUpDelete'; import PopUpDelete from '../../../library/PopUpDelete';
import { css } from "@emotion/core"; import { css } from "@emotion/core";
import PropagateLoader from "react-spinners/PropagateLoader" import PropagateLoader from "react-spinners/PropagateLoader"
import { fixNumber, roundMath } from '../../../library/Utils';
const LightTooltip = withStyles((theme) => ({ const LightTooltip = withStyles((theme) => ({
tooltip: { tooltip: {
...@@ -119,7 +120,7 @@ export default class Parameter extends Component { ...@@ -119,7 +120,7 @@ export default class Parameter extends Component {
item.company_name, item.company_name,
item.description, item.description,
item.order, item.order,
item.setting_group === "CURRENCY" ? Number(item.value) * 1000 : item.value, // convert IDR mn to IDR item.setting_group === "CURRENCY" ? fixNumber(Number(item.value) * 1000) : item.value, // convert IDR mn to IDR
item.min_value, item.min_value,
item.max_value, item.max_value,
item.status item.status
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment