diff --git a/src/common/pages/Dashboard/index.js b/src/common/pages/Dashboard/index.js
index 16ffaad..72f8731 100644
--- a/src/common/pages/Dashboard/index.js
+++ b/src/common/pages/Dashboard/index.js
@@ -27,6 +27,8 @@ import {
import Grid from '@material-ui/core/Grid';
import {default as MuiCard} from '@material-ui/core/Card'
import {default as MuiCardContent} from '@material-ui/core/CardContent';
+import {default as MuiCardActions} from '@material-ui/core/CardActions';
+import {default as MuiCardButton} from '@material-ui/core/Button';
import EmptyComponent from '../EmptyComponent';
import * as _ from 'lodash';
import {grey400, darkBlack, lightBlack, black} from 'material-ui/styles/colors';
@@ -49,6 +51,7 @@ import PopularItemCardComponent from "./PopularItemCard";
import NewItemCardComponent from "./NewItemCard";
import '../Vouchers/style.scss';
import ModalTopupComponent from "../Wallet/Modal";
+import Typography from '@material-ui/core/Typography';
import {styles} from "../RegisterNew/styles";
const {
@@ -119,7 +122,7 @@ class DashboardComponent extends React.Component {
};
return (
-
+
- Voucher
-
- {/* */}
+
+ Voucher
+
+
-
-
+
+
+ this.setModalTopup(true)}>Add Voucher
+
) : ''}
@@ -201,8 +195,15 @@ class DashboardComponent extends React.Component {
-
-
+
+
+

@@ -220,11 +221,10 @@ class DashboardComponent extends React.Component {
-
+
-
-
- {/*
+
+ {/*
@@ -252,44 +252,44 @@ class DashboardComponent extends React.Component {
*/}
-
-
-
-
-
- Voucher & Gift Card
-
-
- {
- (this.vouchersStore.list.length > 0) ?
- this.vouchersStore.list.map((item, index) => {
- return ( this.setState({isOpened: true, data: item})} key={index} span={6}>
-
- )
- })
- : (
-
- )
- }
-
+
+
+
+
+
+ Voucher & Gift Card
+
- this.setState({isOpened: false})}
- onCancel={() => this.setState({isOpened: false})}
- />
-
+
+ {
+ (this.vouchersStore.list.length > 0) ?
+ this.vouchersStore.list.map((item, index) => {
+ return ( this.setState({isOpened: true, data: item})} key={index} span={6}>
+
+ )
+ })
+ : (
+
+ )
+ }
+
+
+
this.setState({isOpened: false})}
+ onCancel={() => this.setState({isOpened: false})}
+ />
-
+
-
-
+
+
this.setModalTopup(false)} onCancel={() => this.setModalTopup(false)} isVisible={this.state.modalTopup}/>
-
+
);
}
}