Total Pembayaran Point
@@ -122,3 +130,5 @@ export default class CheckoutVouchers extends React.Component {
)
}
}
+
+export default withStyles(styles)(CheckoutVouchers);
diff --git a/src/common/pages/Vouchers/Checkout/style.scss b/src/common/pages/Vouchers/Checkout/style.scss
index e928943..477240c 100644
--- a/src/common/pages/Vouchers/Checkout/style.scss
+++ b/src/common/pages/Vouchers/Checkout/style.scss
@@ -1,4 +1,53 @@
-.imageCard{
- max-width: 20vw;
- max-height: 20vw;
+@media(min-width: 1000px){
+ .imageCard{
+ width: 20vw;
+ height: 25vh;
+ }
+
+ .upper-card{
+ width: 60vw;
+ margin-left: -1vw;
+ margin-bottom: 15px;
+ }
+
+ .bottom-card{
+ width: 60vw;
+ margin-left: -1vw;
+ }
+
+ .right-container{
+ //background-color: red;
+ height: 25vh;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ //align-items: center;
+ }
+}
+
+@media(max-width: 999px){
+ .imageCard{
+ width: 80vw;
+ height: 25vh;
+ margin-bottom: 30px;
+ }
+
+ .upper-card{
+ width: 90vw;
+ margin-left: -3.5vw;
+ margin-bottom: 15px;
+ }
+
+ .bottom-card{
+ width: 90vw;
+ margin-left: -3.5vw;
+ }
+
+ .right-container{
+ margin-left: -2.5vw;
+ }
+}
+
+.checkout-parent{
+ //width: 100%;
}
diff --git a/src/common/pages/Vouchers/Modal/index.js b/src/common/pages/Vouchers/Modal/index.js
index f8b43a8..36d4d56 100644
--- a/src/common/pages/Vouchers/Modal/index.js
+++ b/src/common/pages/Vouchers/Modal/index.js
@@ -7,6 +7,7 @@ import { Route } from 'react-router-dom'
import {LINKS} from "../../../routes";
import NumberFormat from 'react-number-format';
import get from 'lodash.get';
+import ReactHtmlParser from "react-html-parser";
const Option = Select.Option;
@@ -83,7 +84,7 @@ export default class ModalVouchersComponent extends React.Component {
flex: 0.7,
padding: 30
}}>
-
{data.description}
+
{ReactHtmlParser(data.description)}
{(additional_data.information != null) &&
diff --git a/src/common/pages/Vouchers/Payment/index.js b/src/common/pages/Vouchers/Payment/index.js
index ebf93cf..0199c49 100644
--- a/src/common/pages/Vouchers/Payment/index.js
+++ b/src/common/pages/Vouchers/Payment/index.js
@@ -8,12 +8,14 @@ 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 './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 {APP_TYPE} from "../../../config/app";
+import get from "lodash.get";
+import ReactHtmlParser, { processNodes, convertNodeToElement, htmlparser2 } from 'react-html-parser';
const Panel = Collapse.Panel;
@@ -34,7 +36,7 @@ export default class PaymentVouchers extends React.Component {
}
componentDidMount() {
-
+ console.log(this.props.vouchersStore, 'this.props.vouchersStore this.props.vouchersStore this.props.vouchersStore')
}
render() {
@@ -51,16 +53,23 @@ export default class PaymentVouchers extends React.Component {
const qty = 1;
const total = price * qty;
- let applicationName = 'Giift';
- let applicationLogo = 'http://giift.asacreative.com/giift_logo_wide.4d15de72.png';
- if(APP_TYPE === 'btn') {
- applicationName = 'BTN';
- applicationLogo = 'http://btn-redemption-2.bangun-kreatif.com/dr6u0fppdi4xy.cloudfront.net/FilesDirectory/Albilad/ImgIconImage/logo-btn.png';
+ // let applicationName = 'Giift';
+ // let applicationLogo = 'http://giift.asacreative.com/giift_logo_wide.4d15de72.png';
+ // if(APP_TYPE === 'btn') {
+ // applicationName = 'BTN';
+ // applicationLogo = 'http://btn-redemption-2.bangun-kreatif.com/dr6u0fppdi4xy.cloudfront.net/FilesDirectory/Albilad/ImgIconImage/logo-btn.png';
+ // }
+ const logoUrl = (this.props.vouchersStore.dataItems.images.logo) ? get(this.vouchersStore.dataItems, 'images.logo', '') : 'http://lorempixel.com/400/200';
+
+ let image = logoUrl;
+
+ if (!image.includes('http')) {
+ image = this.http.appendImagePath(image);
}
return(
-
+
@@ -94,25 +103,27 @@ export default class PaymentVouchers extends React.Component {
-
-
-
-
- Points {applicationName}
+
+
+
+
+ {this.props.vouchersStore.dataItems.name} - {this.props.vouchersStore.skuName}
+
+
+ BTN Points Payment
-
-
-
-
- Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.
- Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.
-
+
+ {ReactHtmlParser(this.props.vouchersStore.dataItems.description)}
+ {/*
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. */}
+ {/*Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. */}
+
- this.props.history.goBack() : this.handlePrev}
- style={{marginRight: 12}}
- />
- this.props.history.goBack() : this.handlePrev}*/}
+ {/*style={{marginRight: 12}}*/}
+ {/*/>*/}
+ this.props.history.goBack() : this.handlePrev} className={classes.button}>Back
+
+ {this.state.stepIndex === 2 ? 'Finish' : 'Next'}
+
+ {/*
);
};
@@ -126,6 +147,7 @@ export default class VoucherStepperComponent extends React.Component {
render() {
const {finished, stepIndex} = this.state;
+ const {classes} = this.props;
const contentStyle = {margin: '0 16px'};
if(!this.vouchersStore.dataItems.name){
@@ -147,36 +169,36 @@ export default class VoucherStepperComponent extends React.Component {
{/* */}
-
-
- Checkout your Voucher
-
-
- Process your Payment
-
-
- Finish
-
-
-
+
+
+
+ Checkout your Voucher
+
+
+ Process your Payment
+
+
+ Finish
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {/*
*/}
@@ -184,3 +206,9 @@ export default class VoucherStepperComponent extends React.Component {
}
}
+
+VoucherStepper.propTypes = {
+ classes: PropTypes.object.isRequired,
+};
+
+export default withStyles(styles)(VoucherStepper);
diff --git a/src/common/pages/Vouchers/Stepper/style.scss b/src/common/pages/Vouchers/Stepper/style.scss
index f4639bd..7729811 100644
--- a/src/common/pages/Vouchers/Stepper/style.scss
+++ b/src/common/pages/Vouchers/Stepper/style.scss
@@ -1,9 +1,23 @@
.stepper{
margin-top: 5vh;
- .divider-container{
- max-width: 65vw;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ //background-color: #fff;
+ @media(min-width: 1000px){
+ .divider-container{
+ width: 60vw;
+ }
+ .stepper-container{
+ width: 60vw;
+ }
}
- .stepper-container{
- max-width: 65vw;
+ @media(max-width: 999px){
+ .divider-container{
+ width: 90vw;
+ }
+ .stepper-container{
+ width: 90vw;
+ }
}
}
diff --git a/src/common/pages/Wallet/index.js b/src/common/pages/Wallet/index.js
index 1b9b1a1..d3c3b42 100644
--- a/src/common/pages/Wallet/index.js
+++ b/src/common/pages/Wallet/index.js
@@ -53,6 +53,7 @@ export default class WalletComponent extends React.Component {
}
componentDidMount() {
+ this.props.appstate.transaction.getAll();
this.purchasedItemStore.getAll().then(res => {
console.log(res, 'ini purchased items')
})
@@ -74,38 +75,39 @@ export default class WalletComponent extends React.Component {
const voucher =
;
const points =
;
- const data = [
- {
- id: faker.random.uuid(),
- created_at: faker.date.past(),
- type: 'Points',
- amount: faker.commerce.price()
- },
- {
- id: faker.random.uuid(),
- created_at: faker.date.past(),
- type: 'Points',
- amount: faker.commerce.price()
- },
- {
- id: faker.random.uuid(),
- created_at: faker.date.past(),
- type: 'Voucher',
- amount: faker.commerce.price()
- },
- {
- id: faker.random.uuid(),
- created_at: faker.date.past(),
- type: 'Voucher',
- amount: faker.commerce.price()
- },
- {
- id: faker.random.uuid(),
- created_at: faker.date.past(),
- type: 'Points',
- amount: faker.commerce.price()
- },
- ];
+ // const data = [
+ // {
+ // id: faker.random.uuid(),
+ // created_at: faker.date.past(),
+ // type: 'Points',
+ // amount: faker.commerce.price()
+ // },
+ // {
+ // id: faker.random.uuid(),
+ // created_at: faker.date.past(),
+ // type: 'Points',
+ // amount: faker.commerce.price()
+ // },
+ // {
+ // id: faker.random.uuid(),
+ // created_at: faker.date.past(),
+ // type: 'Voucher',
+ // amount: faker.commerce.price()
+ // },
+ // {
+ // id: faker.random.uuid(),
+ // created_at: faker.date.past(),
+ // type: 'Voucher',
+ // amount: faker.commerce.price()
+ // },
+ // {
+ // id: faker.random.uuid(),
+ // created_at: faker.date.past(),
+ // type: 'Points',
+ // amount: faker.commerce.price()
+ // },
+ // ];
+ const data = this.props.appstate.transaction.list;
const columns = [{
title: 'Id',
diff --git a/src/common/stores/authenticaton.js b/src/common/stores/authenticaton.js
index d4ba8d7..2e20726 100644
--- a/src/common/stores/authenticaton.js
+++ b/src/common/stores/authenticaton.js
@@ -9,7 +9,7 @@ export class Authentication {
@observable isLoggingIn = false;
@observable isInviting = false;
@observable removingUser = false;
- @observable isNeedEmailVerification = false;
+ // @observable isNeedEmailVerification = false;
@observable userWallet = {};
@observable userProfile = {
email : '',
@@ -37,6 +37,7 @@ export class Authentication {
// airline_settings: []
// }
};
+ @observable otpData = {}
constructor(context) {
this.context = context;
@@ -51,9 +52,10 @@ export class Authentication {
return this.http.post("authentication/login", data)
.then(res => {
this.isLoggingIn = false;
- this.isNeedEmailVerification = res.need_email_verification;
- this.context.setToken(res.token);
- this.context.loadDataAfterLogin();
+ if(res.token) {
+ this.context.setToken(res.token);
+ this.context.loadDataAfterLogin();
+ }
return res;
})
.catch(err => {
@@ -73,6 +75,13 @@ export class Authentication {
})
}
+ @action
+ verifyEmail(key) {
+ return this.http.post('authentication/email_verification', {
+ key
+ })
+ }
+
@action
logout() {
this.context.setToken("");
@@ -117,6 +126,31 @@ export class Authentication {
})
}
+ @action
+ resendEmail(data) {
+ this.isRegistering = true;
+ return this.http.post("authentication/resend_email_verification", data)
+ .then(res => {
+ return res;
+ })
+ .catch(err => {
+ throw err;
+ })
+ }
+
+ @action
+ validateOtp(data) {
+ return this.http.post("authentication/validate_otp", data)
+ .then(res => {
+ this.context.setToken(res.token);
+ this.context.loadDataAfterLogin();
+ return res;
+ })
+ .catch(err => {
+ throw err;
+ })
+ }
+
createCookie(name,value,days) {
let expires
if (days) {
diff --git a/src/common/stores/transaction.js b/src/common/stores/transaction.js
index c943449..8cea6ab 100644
--- a/src/common/stores/transaction.js
+++ b/src/common/stores/transaction.js
@@ -98,7 +98,7 @@ export default class Transaction {
};
}
- // @action
+ // @action
// getAll() {
// this.isLoading = true;
// return this.http.get("transaction")
@@ -111,7 +111,7 @@ export default class Transaction {
@action
getAll() {
this.isLoading = true;
- return this.http.get("transaction")
+ return this.http.get("transactions")
.then(res => {
this.list = res;
this.isLoading = false;
}){kind=logo}