From 8dbdeb3fe668476c88d7bf6ef5ee0b7a59f4f638 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Tue, 25 Apr 2023 14:28:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9B=A2=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E3=80=81=E6=8E=A5=E6=9C=BA=E7=89=8C=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/Auth.js                 |  4 +--
 src/stores/Reservation.js          | 53 +++++++++++++++++-------------
 src/views/reservation/Detail.jsx   |  2 +-
 src/views/reservation/NameCard.jsx | 11 ++-----
 4 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/stores/Auth.js b/src/stores/Auth.js
index 6b1679c..2eb3051 100644
--- a/src/stores/Auth.js
+++ b/src/stores/Auth.js
@@ -9,8 +9,8 @@ class Auth {
 
   login = {
     userId: 1,
-    username: 'Vu Xuan Giang(TOI)',
-    travelAgencyId: 30333
+    username: 'Vu Xuan Giang(ANP)',
+    travelAgencyId: 32531
   }
 }
 
diff --git a/src/stores/Reservation.js b/src/stores/Reservation.js
index 1b2f6bb..6426d06 100644
--- a/src/stores/Reservation.js
+++ b/src/stores/Reservation.js
@@ -66,7 +66,10 @@ class Reservation {
               }
             });
             this.reservationDetail = {
-              referenceNumber: json.PlanDetail[0].GRI_Name, tourGuide: json.Guide[0].TGI2_Name, arrivalDate: json.PlanDetail[0].eoi_getdate
+              referenceNumber: json.PlanDetail[0].GRI_Name, tourGuide: json.PlanDetail[0].Guide, arrivalDate: json.PlanDetail[0].eoi_getdate
+            };
+            this.meetAndGreet = {
+              customerNames: json.JJPInfo[0].CustomerName, referenceNumber: json.JJPInfo[0].GroupName, pax: json.JJPInfo[0].Str_PersonNum
             };
             this.customerNames = json.CusAndRequest[0].GCI_CustomerList;
           } else {
@@ -82,31 +85,35 @@ class Reservation {
     referenceNumber: '', arrivalDate: '', tourGuide: ''
   };
 
+  meetAndGreet = {
+    referenceNumber: '', customerNames: '', pax: ''
+  }
+
   itineraryList = [
   ];
 
-  customerList = [
-    {
-      title: 'Crane / Gemma Chelse',
-      description: 'Gender: Male  Nationality: United States  Passport: 655844449  Expiration Date: 2030-09-07  Birth Date: 1979-12-23',
-    },
-    {
-      title: 'McCracken / Ryan Lee',
-      description: 'Gender: Female  Nationality: United States  Passport: 655844450  Expiration Date: 2030-09-07  Birth Date: 1983-05-17',
-    },
-    {
-      title: 'Ramlakhan / Darryl',
-      description: 'Gender: Female  Nationality: United States  Passport: 661810034  Expiration Date: 2026-03-16  Birth Date: 2006-07-12',
-    },
-    {
-      title: 'Ramlakhan / Reanne',
-      description: 'Gender: Male  Nationality: United States  Passport: 593422145  Expiration Date: 2023-04-25  Birth Date: 2012-03-26',
-    },
-    {
-      title: 'Alexander Daich',
-      description: 'Gender: Male  Nationality: United States  Passport: 593422145  Expiration Date: 2023-04-25  Birth Date: 2012-03-26s',
-    },
-  ];
+  customerList = [];
+  //   {
+  //     title: 'Crane / Gemma Chelse',
+  //     description: 'Gender: Male  Nationality: United States  Passport: 655844449  Expiration Date: 2030-09-07  Birth Date: 1979-12-23',
+  //   },
+  //   {
+  //     title: 'McCracken / Ryan Lee',
+  //     description: 'Gender: Female  Nationality: United States  Passport: 655844450  Expiration Date: 2030-09-07  Birth Date: 1983-05-17',
+  //   },
+  //   {
+  //     title: 'Ramlakhan / Darryl',
+  //     description: 'Gender: Female  Nationality: United States  Passport: 661810034  Expiration Date: 2026-03-16  Birth Date: 2006-07-12',
+  //   },
+  //   {
+  //     title: 'Ramlakhan / Reanne',
+  //     description: 'Gender: Male  Nationality: United States  Passport: 593422145  Expiration Date: 2023-04-25  Birth Date: 2012-03-26',
+  //   },
+  //   {
+  //     title: 'Alexander Daich',
+  //     description: 'Gender: Male  Nationality: United States  Passport: 593422145  Expiration Date: 2023-04-25  Birth Date: 2012-03-26s',
+  //   },
+  // ];
   customerNames = '';
 }
 
diff --git a/src/views/reservation/Detail.jsx b/src/views/reservation/Detail.jsx
index ef34bf2..9d2d321 100644
--- a/src/views/reservation/Detail.jsx
+++ b/src/views/reservation/Detail.jsx
@@ -92,7 +92,7 @@ function Detail() {
       <Row>
         <Col span={24}>
           <List
-            header={<Title level={5}>Customer Names (Full name as it appears on passport)</Title>}
+            header={<><Title level={5}>Customer Names (Full name as it appears on passport)</Title><span>{customerNames}</span></>}
             itemLayout="horizontal"
             dataSource={toJS(customerList)}
             renderItem={(item, index) => (
diff --git a/src/views/reservation/NameCard.jsx b/src/views/reservation/NameCard.jsx
index 35169ae..9052b84 100644
--- a/src/views/reservation/NameCard.jsx
+++ b/src/views/reservation/NameCard.jsx
@@ -40,7 +40,7 @@ function NameCard() {
   const navigate = useNavigate();
   const { reservationId } = useParams();
   const { reservationStore } = useStore();
-  const { itineraryList, customerList } = reservationStore;
+  const { meetAndGreet } = reservationStore;
 
   useEffect(() => {
     console.info('Detail.useEffect: ' + reservationId);
@@ -51,17 +51,12 @@ function NameCard() {
     <Space direction="vertical" style={{ width: '100%' }}>
       <Row gutter={{ md: 24 }}>
         <Col span={24}>
-          <Title level={1}>Mr. Prasanna Venkatesa</Title>
+          <Title level={1}>{meetAndGreet.customerNames}</Title>
         </Col>
       </Row>
       <Row gutter={{ md: 24 }}>
         <Col span={24}>
-          <Title level={1}>Nathan  Group</Title>
-        </Col>
-      </Row>
-      <Row gutter={{ md: 24 }}>
-        <Col span={24}>
-          <Title level={1}>(4 Persons)</Title>
+          <Title level={1}>{meetAndGreet.pax}</Title>
         </Col>
       </Row>
     </Space>