}){kind=logo}
+ })
+ */}
+ {/**/}
+ {/**/}
+ {/*{this.state.showPassword ?
+ )
+ }
+}
+
+export default withStyles(styles)(RegisterPage);
\ No newline at end of file
diff --git a/src/common/pages/RegisterNew/styles.js b/src/common/pages/RegisterNew/styles.js
new file mode 100644
index 0000000..2f40d31
--- /dev/null
+++ b/src/common/pages/RegisterNew/styles.js
@@ -0,0 +1,36 @@
+import yellow from '@material-ui/core/colors/yellow';
+export const styles = theme => ({
+ container : {
+ flex :1,
+ flexGrow : 1,
+ height : '100vh',
+ backgroundColor:'#024f8e',
+ marginTop: '-56px'
+ },
+ gridContainer : {
+ flex :1,
+ justifyContent:'center'
+ },
+ registerContainer: {
+ marginTop : 50
+ },
+ formRegister : {
+ padding : 20,
+ display : 'flex',
+ flexDirection: 'column',
+ textAlign : 'center'
+ },
+ registerPaper : {
+ flex :1,
+ flexDirection : 'row',
+ justifyContent:'center'
+ },
+ logo : {
+ width : '200px'
+ },
+ logoContainer : {
+ textAlign : 'center',
+ background : yellow['500'],
+ padding : 20
+ }
+});
\ No newline at end of file
diff --git a/src/common/pages/Vouchers/Checkout/index.js b/src/common/pages/Vouchers/Checkout/index.js
index 59f759c..fd6071c 100644
--- a/src/common/pages/Vouchers/Checkout/index.js
+++ b/src/common/pages/Vouchers/Checkout/index.js
@@ -8,12 +8,12 @@ import { Affix, Card, Slider, Select, Row, Col, Icon, Tag,Rate, Button, Checkbox
import {startCase} from 'lodash';
import LoadingDialog from "../../LoadingDialog";
import Loader from 'react-loader-advanced';
-// import './style.scss';
import {DIALOG} from "../../../stores/global_ui";
import EmptyComponent from '../../EmptyComponent';
import NavigationArrowBack from 'material-ui/svg-icons/navigation/arrow-back';
import {LINKS} from "../../../routes";
import {Route} from "react-router-dom";
+import get from 'lodash.get';
@inject('appstate')
@observer
@@ -40,6 +40,12 @@ export default class CheckoutVouchers extends React.Component {
render() {
+ let image = get(this.vouchersStore.dataItems, 'images.logo', '');
+
+ if (!image.includes('http')) {
+ image = this.http.appendImagePath(image);
+ }
+
return (
+
+
+
+
+
+
+
+
@@ -56,7 +62,7 @@ export default class CheckoutVouchers extends React.Component {
icon={
//
diff --git a/src/common/pages/Vouchers/ItemCard/index.js b/src/common/pages/Vouchers/ItemCard/index.js
index 0fd52e6..79a60f5 100644
--- a/src/common/pages/Vouchers/ItemCard/index.js
+++ b/src/common/pages/Vouchers/ItemCard/index.js
@@ -28,16 +28,16 @@ export class ItemCard extends React.Component {
render() {
const {data = {}} = this.props;
- let image = ''
- if(data.images.logo.includes('http')){
- image = data.images.logo;
- }else{
- image = this.http.appendImagePath(data.images.logo);
+
+ let image = get(data, 'images.logo', '');
+
+ if (!image.includes('http')) {
+ image = this.http.appendImagePath(image);
}
return (
- 
+ 
)
diff --git a/src/common/pages/Vouchers/Modal/index.js b/src/common/pages/Vouchers/Modal/index.js
index 6d271ad..84e99a6 100644
--- a/src/common/pages/Vouchers/Modal/index.js
+++ b/src/common/pages/Vouchers/Modal/index.js
@@ -1,13 +1,16 @@
import React from 'react';
import {inject, observer} from 'mobx-react';
-import {Link} from 'react-router';
+import {Link, withRouter} from 'react-router';
import { Modal, Button, Alert, Select } from 'antd';
import './style.scss';
import { Route } from 'react-router-dom'
import {LINKS} from "../../../routes";
import NumberFormat from 'react-number-format';
+import get from 'lodash.get';
const Option = Select.Option;
+
+@withRouter
@inject('appstate')
@observer
export default class ModalVouchersComponent extends React.Component {
@@ -26,17 +29,25 @@ export default class ModalVouchersComponent extends React.Component {
this.vouchersStore = props.appstate.vouchers;
}
- componentDidMount() {}
+ componentDidMount() {
+ const {item} = this.props.appstate;
+
+ item.getDetail(this.props.data.id);
+ }
render() {
+ const {item} = this.props.appstate;
const {data = {}, isVisible = false, onOk = () => {}, onCancel = () => {}, title='Modal'} = this.props;
- let image = ''
- if(data.images.logo.includes('http')){
- image = data.images.logo;
- }else{
- image = this.http.appendImagePath(data.images.logo);
+ let image = get(data, 'images.logo', '');
+
+ if (!image.includes('http')) {
+ image = this.http.appendImagePath(image);
}
+ // console.log(item.selectedData);
+
+ const additional_data = get(data, 'additional_data', {}) || {};
+
return (
} type="success" />}
@@ -88,11 +99,10 @@ export default class ModalVouchersComponent extends React.Component {
placeholder="Please Select your Option"
optionFilterProp="children"
onChange={(value) => {
- this.setState({selectedOption: value})
- this.setState({hidden: 'none'})
+ this.setState({selectedOption: value});
+ this.setState({hidden: 'none'});
// console.log('onChange',value);
- const points = data.sku.filter(item => item.id == value);
- console.log(points[0].price,'points',points[0].name);
+ const points = item.selectedData.sku.filter(item => item.id == value);
this.setState({
skuName :points[0].name,
skuPrice : points[0].price,
@@ -104,9 +114,27 @@ export default class ModalVouchersComponent extends React.Component {
this.setState({hidden: 'inline'})
}}
>
- {data.sku.map((item, index) => {
- return
- // return
+ {(item.selectedData.sku || []).map((item, index) => {
+ // const {vouchers:[{count}]} = item;
+
+ let count = 1;
+
+ if (data.source === 'internal') {
+ count = get(item, 'vouchers[0].count', 0) || 0;
+ }
+ console.log(count);
+ const outOfStock = !(+count > 0);
+
+ return (
+
+ )
})}
@@ -117,16 +145,21 @@ export default class ModalVouchersComponent extends React.Component {
// Detail Pembelian @@ -74,7 +80,7 @@ export default class CheckoutVouchers extends React.Component {
- })
+ })
{/*
+ {data.name}
{data.description}
- {(data.additional_data.information != null) &&Information
-{data.additional_data.information}
+{additional_data.information}