Merge branch 'master' of https://gitlab.com/asacreative/redemption-point/new-frontend-customer-redemption-point
This commit is contained in:
commit
931ac3fa98
|
@ -53,7 +53,7 @@
|
||||||
"feather-icons": "^4.7.3",
|
"feather-icons": "^4.7.3",
|
||||||
"feather-icons-react": "^0.2.0",
|
"feather-icons-react": "^0.2.0",
|
||||||
"file-loader": "^1.1.5",
|
"file-loader": "^1.1.5",
|
||||||
"firebase": "^5.5.1",
|
"firebase": "^5.7.2",
|
||||||
"frappe-gantt": "0.3.0",
|
"frappe-gantt": "0.3.0",
|
||||||
"froala-editor": "^2.8.4",
|
"froala-editor": "^2.8.4",
|
||||||
"fs-extra-promise": "^1.0.1",
|
"fs-extra-promise": "^1.0.1",
|
||||||
|
|
|
@ -69,7 +69,7 @@ export default class CardAgent extends React.Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
this.transactionStore.getAmount();
|
// this.transactionStore.getAmount();
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
|
@ -97,7 +97,7 @@ export default class CardAgent extends React.Component {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
|
|
||||||
<div className="col s12 m4 l4 row">
|
<div className="col s12 m4 l4 row">
|
||||||
<Card style={{backgroundColor: '#2196f3', minHeight: 245}} className="cardLite">
|
<Card style={{backgroundColor: '#2196f3', minHeight: 245}} className="cardLite">
|
||||||
<CardHeader
|
<CardHeader
|
||||||
|
|
|
@ -74,12 +74,12 @@ export default class BankComponent extends React.Component {
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
|
|
||||||
|
|
||||||
if(this.userData.role == 'store') {
|
// if(this.userData.role == 'store') {
|
||||||
this.userBanks.getAllBanks();
|
// this.userBanks.getAllBanks();
|
||||||
}
|
// }
|
||||||
else if(this.userData.role == 'administrator') {
|
// else if(this.userData.role == 'administrator') {
|
||||||
this.userBanks.getAllBanksAdmin(this.props.id);
|
// this.userBanks.getAllBanksAdmin(this.props.id);
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
handleOpenDialog = () => {
|
handleOpenDialog = () => {
|
||||||
|
|
|
@ -45,7 +45,7 @@ export default class WithdrawDialogComponent extends React.Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
this.bankStore.getAll();
|
// this.bankStore.getAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
get stepperContent() {
|
get stepperContent() {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user