Merge branch 'main' of https://git.17888.com.tw/yiming/17168ERP

# Conflicts:
#	web/admin/guadan/create.aspx

web/App_Code/Model/Partial/family_members.cs

@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+using System.ComponentModel.DataAnnotations;
+
+/// <summary>
+/// added
+/// </summary>
+namespace Model
+{
+    [MetadataType(typeof(family_membersMetadata))]
+    public partial class family_members
+    {
+        private class family_membersMetadata
+        {
+            [JsonIgnore]
+            public virtual follower follower { get; set; }
+        }
+    }
+}
+

web/App_Code/Model/Partial/follower.cs

@@ -45,6 +45,19 @@ namespace Model
             public virtual ICollection<followers_tablet> followers_tablet { get; set; }
             [JsonIgnore]
             public virtual appellation appellation { get; set; }
+            /// <summary>
+            /// added
+            /// </summary>
+            [JsonIgnore]
+            public virtual ICollection<family_members> family_members { get; set; }
+            [JsonIgnore]
+            public virtual ICollection<transfer_register> transfer_register { get; set; }
+            [JsonIgnore]
+            public virtual ICollection<transfer_register> transfer_register1 { get; set; }
+            [JsonIgnore]
+            public virtual ICollection<GuaDanOrder> GuaDanOrder { get; set; }
+            [JsonIgnore]
+            public virtual ICollection<GuaDanOrderGuest> GuaDanOrderGuest { get; set; }
 
 
         }

web/App_Code/api/familyMembersController.cs

@@ -98,7 +98,17 @@ public class familyMembersController : ApiController
         [Route("api/familymembers/follower/{followerId}")]
         public IHttpActionResult GetByFollower(int followerId)
         {
+            //var originalLazyLoading = _db.Configuration.LazyLoadingEnabled;
+            //var originalProxyCreation = _db.Configuration.ProxyCreationEnabled;
+//
+            //_db.Configuration.LazyLoadingEnabled = false;
+            //_db.Configuration.ProxyCreationEnabled = false;
+
             var familyMembers = _db.family_members.Where(fm => fm.follower_num == followerId).ToList();
+
+            //_db.Configuration.LazyLoadingEnabled = originalLazyLoading;
+            //_db.Configuration.ProxyCreationEnabled = originalProxyCreation;
+
             return Ok(familyMembers);
         }
 

web/admin/guadan/create.aspx

@@ -1393,7 +1393,7 @@
                         message: `確定要將 ${guest.follower.u_name || ''} 退房嗎？`,
                         onConfirm: async () => {
                             try {
-                                const response = await axios.post(`/api/guadanorderguest/checkout`, null, {
+                                const response = await axios.post(HTTP_HOST + HTTP_HOST + `api/guadanorderguest/checkout`, null, {
                                     params: { uuid: guest.uuid }
                                 });
 
@@ -1594,7 +1594,7 @@
                         onConfirm: async () => {
                             try {
                                 // 發送請求到後端 API
-                                const response = await axios.post(`/api/guadanorderguest/checkin`, null, {
+                                const response = await axios.post(HTTP_HOST + `api/guadanorderguest/checkin`, null, {
                                     params: { uuid: guest.uuid }
                                 });