Commit dc4d2727a0d85c976f8d5f49d7b01a494e2801e7

Authored by Vu Bui
1 parent c2c52fcf14
Exists in master

update

Showing 2 changed files with 11 additions and 7 deletions Side-by-side Diff

1 1  
2 2  
3 3 import axios from 'axios'
4   -const baseAPIUrl = window?.GDClinic?.api_host ? `${window?.GDClinic?.api_host}/api/v1` : process.env.REACT_APP_API_URL;
  4 +const baseAPIUrl = window?.GDClinic?.api_host ? `${window?.GDClinic?.api_host}/api/v1` : `${process.env.REACT_APP_BASE_API_URL}/api/v1`;
5 5  
6 6 const parseErrorMessage = ( error ) => {
7 7 let message = ''
... ... @@ -8,13 +8,15 @@ import Services from '../../components/Steps/Services'
8 8 import PickTime from '../../components/Steps/PickTime'
9 9 import PickDoctor from '../../components/Steps/PickDoctor';
10 10 import Profile from '../../components/Steps/Profile';
11   -import Payment from '../../components/Steps/Payment';
  11 +import Payment from '../../components/Steps/Payment/indexV2';
  12 +import PaymentStep from '../../components/Steps/PaymentStep'
12 13  
13 14 import './_styles.scss'
14 15 import { useCommonState, useCommonDispatch } from '../../store/common'
15 16  
16 17 function BookingWizard(props) {
17 18 const [show, setShow] = useState(false)
  19 +
18 20 const [userProfile, setUserProfile] = useState(null)
19 21 const [step, setStep] = useState('step-login')
20 22 const commonStore = useCommonState()
... ... @@ -195,7 +197,9 @@ function BookingWizard(props) {
195 197 </div>
196 198 <div className="bw-booking-modal-content">
197 199 <div className="bw-booking-modal-inner">
198   - <Payment />
  200 + {/* <Payment
  201 + /> */}
  202 + <PaymentStep/>
199 203 </div>
200 204 </div>
201 205 </>
... ... @@ -242,10 +246,10 @@ function BookingWizard(props) {
242 246 // :<root.div>
243 247 : <>
244 248 {/* <style type="text/css">
245   - {`@import "${process.env.REACT_APP_FIREBASE_URL}/static/css/app.chunk.css";`}
246   - {`@import "${process.env.REACT_APP_FIREBASE_URL}/static/css/main-app.chunk.css";`}
247   - {window?.GDClinic?.type ==='mm'? `@import "${process.env.REACT_APP_FIREBASE_URL}/static/css/mm-styles.css";`:'' }
248   - {window?.GDClinic?.type ==='sc'? `@import "${process.env.REACT_APP_FIREBASE_URL}/static/css/sc-styles.css";`:'' }
  249 + {`@import "${process.env.REACT_APP_SITE_URL}/static/css/app.chunk.css";`}
  250 + {`@import "${process.env.REACT_APP_SITE_URL}/static/css/main-app.chunk.css";`}
  251 + {window?.GDClinic?.type ==='mm'? `@import "${process.env.REACT_APP_SITE_URL}/static/css/mm-styles.css";`:'' }
  252 + {window?.GDClinic?.type ==='sc'? `@import "${process.env.REACT_APP_SITE_URL}/static/css/sc-styles.css";`:'' }
249 253 </style> */}
250 254 {show && <div className="bw-backdrop" onClick={() => handleCloseModal()}></div>}
251 255 {show && <div className={`bw-booking-popup-wraper ${step} ${window?.GDClinic?.type ? window.GDClinic.type+'-theme':'rce'}`}>