From 081f64193efd9a86d604a2cc43ccf9f657605c38 Mon Sep 17 00:00:00 2001
From: berlin-tzen <berlintzen@gmail.com>
Date: Tue, 14 Mar 2023 14:19:44 +0800
Subject: [PATCH] =?UTF-8?q?[WHAT]=20=E6=9C=83=E5=93=A1=E8=A8=82=E5=96=AE?=
 =?UTF-8?q?=E5=88=86=E9=A0=81=E6=9F=A5=E8=A9=A2API=EF=BC=8C=E8=A8=82?=
 =?UTF-8?q?=E5=96=AEDTO=E5=A2=9E=E5=8A=A0PaymentType=E5=B1=AC=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ShowEasy/BookingMaintain_QryService.cs    |  1 +
 .../ShowEasy/BookingOnlineService.cs          | 34 +++++++++++++++++--
 EuroTran/Entity/ShowEasyDtos/BookingDTO.cs    |  1 +
 .../Controllers/BookingOnlineController.cs    |  5 +--
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_QryService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_QryService.cs
index 0536314..c74ea27 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_QryService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_QryService.cs
@@ -901,6 +901,7 @@ namespace EasyBL.WEBAPP.SYS
                 }
 
                 rsBooking.PaymentStatus = Booking.PaymentStatus;
+                rsBooking.PaymentType = Booking.PayType;
                 
                 rsBooking.BookingStatus = Booking.BookingStatus;
 
diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingOnlineService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingOnlineService.cs
index c24a558..1c0f519 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingOnlineService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/BookingOnlineService.cs
@@ -123,7 +123,7 @@ namespace EasyBL.WEBAPP.SYS
         /// </summary>
         /// <returns></returns>
         /// 
-        public HttpResponseMessage BookingCardList(string sAccount, string sLanguage, List<string> SubCategoryIDs, List<string> BookingStatuses, List<string> PaymentStatuses)
+        public HttpResponseMessage BookingCardList(string sLanguageID, string sAccount, int iPageIndex, int iPageSize, List<string> SubCategoryIDs, List<string> BookingStatuses, List<string> PaymentStatuses)
         {
 
             SuccessResponseMessage srm = null;
@@ -133,12 +133,40 @@ namespace EasyBL.WEBAPP.SYS
             {
                 do
                 {
+                    if (string.IsNullOrEmpty(sLanguageID)) {
+                        sLanguageID = WebAppGlobalConstWord.DEFAULT_LANGUAGE;
+                    }
+
+
                     BookingMaintain_QryService bm_qry = new BookingMaintain_QryService();
 
-                    var rsResult = bm_qry.QueryAllBookingAsDTO(sLanguage, sAccount, SubCategoryIDs, BookingStatuses, PaymentStatuses);
+                    var rsResult = bm_qry.QueryAllBookingAsDTO(sLanguageID, sAccount, SubCategoryIDs, BookingStatuses, PaymentStatuses).Values.ToList();
+
+                    // Pagination
+                    if (iPageSize <= 0)
+                    {
+                        iPageSize = 10;
+                    }
+
+                    if (iPageIndex <= 0)
+                    {
+                        iPageIndex = 1;
+                    }
+
+                    var pml = new PageModel
+                    {
+                        PageIndex = iPageIndex,
+                        PageSize = iPageSize
+                    };
+
+                    pml.Total = rsResult.Count;
+
+                    rsResult = rsResult.Skip(iPageSize * (iPageIndex - 1)).Take(iPageSize).ToList();
+
+                    pml.DataList = rsResult.ToList();
 
                     srm = new SuccessResponseMessage(null, null);
-                    srm.DATA.Add(BLWording.REL, rsResult.Values.ToList());
+                    srm.DATA.Add(BLWording.REL, pml);
 
                 } while (false);
             }
diff --git a/EuroTran/Entity/ShowEasyDtos/BookingDTO.cs b/EuroTran/Entity/ShowEasyDtos/BookingDTO.cs
index 218774d..09c03a3 100644
--- a/EuroTran/Entity/ShowEasyDtos/BookingDTO.cs
+++ b/EuroTran/Entity/ShowEasyDtos/BookingDTO.cs
@@ -33,6 +33,7 @@ namespace Entity.ShowEasyDtos
         public ContactDTO Contact = new ContactDTO();
 
         public PaymentDTO Payment = new PaymentDTO();
+        public string PaymentType { get; set; }
         public string PaymentStatus { get; set; }
         public string ShippingID { get; set; }
         public string BookingStatus { get; set; }
diff --git a/EuroTran/WebApp/Controllers/BookingOnlineController.cs b/EuroTran/WebApp/Controllers/BookingOnlineController.cs
index b373a59..a2e797d 100644
--- a/EuroTran/WebApp/Controllers/BookingOnlineController.cs
+++ b/EuroTran/WebApp/Controllers/BookingOnlineController.cs
@@ -47,10 +47,11 @@ namespace WebApp.Controllers
         [HttpGet]
         [SEApiSecurityFilter]
 
-        public HttpResponseMessage BookingCardList(string Lang, string SubCategoryIDs, string BookingStatuses, string PaymentStatuses)
+        public HttpResponseMessage BookingCardList(string Lang, int PageIndex, int PageSize, string SubCategoryIDs, string BookingStatuses, string PaymentStatuses)
         {
 
             var SEToken = SETokenUtil.GetToken(this.Request);
+            var sAccount = SEToken.Email;
 
             List<string> rsSubCategoryIDs = new List<string>();
             List<string> rsBookingStatuses = new List<string>();
@@ -71,7 +72,7 @@ namespace WebApp.Controllers
                 rsPaymentStatuses = JsonConvert.DeserializeObject<List<string>>(PaymentStatuses);
             }
 
-            return new BookingOnlineService().BookingCardList(SEToken.Account, Lang, rsSubCategoryIDs, rsBookingStatuses, rsPaymentStatuses);
+            return new BookingOnlineService().BookingCardList(Lang, sAccount, PageIndex, PageSize, rsSubCategoryIDs, rsBookingStatuses, rsPaymentStatuses);
         }
 
         /// <summary>