訂單後臺要能顯示上傳的匯款單圖片

EuroTran/EasyBL.WEBAPP/ShowEasy/BookingMaintain_UpdService.cs

@@ -29,21 +29,19 @@ namespace EasyBL.WEBAPP.WSM
                 do
                 {
                     var sBookingID = _fetchString(i_crm, @"BookingID");
-                    var oEntity = db.Queryable<SETB_SAL_BookingOnline, OTB_SYS_Members, OTB_SYS_Members, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Member, SETB_SCM_Supplier>
-                        ((t1, t2, t3, t4, t5, t6) =>
+                    var oEntity = db.Queryable<SETB_SAL_BookingOnline, OTB_SYS_Members, OTB_SYS_Members, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Member, SETB_SCM_Supplier,SETB_SAL_Payment>
+                        ((t1, t2, t3, t4, t5, t6,t7) =>
                         new object[] {
                                 JoinType.Left, t1.OrgID == t2.OrgID && t1.CreateUser == t2.MemberID,
                                 JoinType.Left, t1.OrgID == t3.OrgID && t1.ModifyUser == t3.MemberID,
                                  JoinType.Left, t1.ServiceID == t4.ServiceID && t1.OrgID==t4.OrgID && t1.LangType==t4.LangID,
                                  JoinType.Left, t1.OrgID == t5.OrgID && t1.Account == t5.Account ,
-                                JoinType.Left, t1.OrgID == t6.OrgID && t4.SupplierID == t6.SupplierID && t4.LangID == t6.LangType
-
-
-
+                                JoinType.Left, t1.OrgID == t6.OrgID && t4.SupplierID == t6.SupplierID && t4.LangID == t6.LangType,
+                                 JoinType.Left, t1.BookingID == t7.BookingID 
                               }
                         )
-                        .Where((t1, t2, t3, t4, t5, t6) => t1.OrgID == i_crm.ORIGID && t1.BookingID == sBookingID)
-                        .Select((t1, t2, t3, t4, t5, t6) => new View_SAL_BookingOnline
+                        .Where((t1, t2, t3, t4, t5, t6, t7) => t1.OrgID == i_crm.ORIGID && t1.BookingID == sBookingID)
+                        .Select((t1, t2, t3, t4, t5, t6, t7) => new View_SAL_BookingOnline
                         {
                             ServiceID = SqlFunc.GetSelfAndAutoFill(t1.ServiceID),
                             CreateUserName = t2.MemberName,
@@ -51,10 +49,15 @@ namespace EasyBL.WEBAPP.WSM
                             MemberName = t5.LastName + t5.FirstName,
                             MemberEmail=t5.Email,
                             ServiceName=t4.ServiceName,
-                            SupplierName=t6.CompanyName
+                            SupplierName=t6.CompanyName,
+                            PaymentRemittance=t7.Remittance
 
                         })
                         .Single();
+
+
+
+
                     rm = new SuccessResponseMessage(null, i_crm);
                     rm.DATA.Add(BLWording.REL, oEntity);
                 } while (false);
@@ -76,7 +79,7 @@ namespace EasyBL.WEBAPP.WSM
 
         #endregion 預訂維護（單筆查詢 call BookingMaintainQryService QueryOne）
 
-        #region 確認 拒絕
+        #region 確認 拒絕 更新供應商狀態與訂單狀態
         /// <summary>
         /// 確認拒絕
         /// </summary>
@@ -264,7 +267,7 @@ namespace EasyBL.WEBAPP.WSM
 
         #endregion Onsite管理其他資訊編輯（修改）
 
-        #region 處理中，已完成
+        #region 更新供應商狀態 處理中，已完成
         /// <summary>
         /// 處理中，已完成
         /// </summary>
@@ -437,8 +440,7 @@ namespace EasyBL.WEBAPP.WSM
 
         #endregion Onsite管理其他資訊編輯（修改）
 
-
-        #region 修改狀態
+        #region 訂單修改
 
         /// <summary>
         /// 供應商管理編輯（修改）
@@ -459,8 +461,10 @@ namespace EasyBL.WEBAPP.WSM
                        
                         var sBookingID = _fetchString(i_crm, @"BookingID");
                         var oNewEntity = _fetchEntity<SETB_SAL_BookingOnline>(i_crm); 
-
-
+                        //供應商狀態已完成 付款狀態已完成的時候，訂單狀態自動變成已完成
+                        if (oNewEntity.SupplierStatus == "04" && oNewEntity.PaymentStatus == "03") {
+                            oNewEntity.BookingStatus = "03";
+                        }
                         var oBookingOnline = new SETB_SAL_BookingOnline
                         {
                             PaymentStatus = oNewEntity.PaymentStatus,
@@ -473,8 +477,8 @@ namespace EasyBL.WEBAPP.WSM
                                 .UpdateColumns(it => new { it.PaymentStatus, it.BookingStatus, it.Message, it.ModifyUser, it.ModifyDate })
                                 .Where(x => x.BookingID == sBookingID && x.OrgID == i_crm.ORIGID).ExecuteCommand();
 
-                        //訂單狀態進行中 付款狀態已付款時
-                        if (iRel > 0 && (oNewEntity.PaymentStatus == "03" && oNewEntity.BookingStatus=="02")) {
+                        //訂單狀態進行中 付款狀態已付款時 且是第一次發送時
+                        if (iRel > 0 && (oNewEntity.PaymentStatus == "03" && string.IsNullOrEmpty(oNewEntity.PSendMailFlag))) {
 
                             var objBookingOnline = db.Queryable<SETB_SAL_BookingOnline, SETB_PDT_ONSiteBaseInfo, SETB_CMS_Member, OTB_SYS_Arguments>
                                    ((t1, t2, t3,t4) =>
@@ -530,10 +534,7 @@ namespace EasyBL.WEBAPP.WSM
 
 
                             if (oNewEntity.PaymentStatus == "03") {
-
                             //收款后
-
-                            
                                 try
                                 {
                                     //開始寄信
@@ -553,6 +554,20 @@ namespace EasyBL.WEBAPP.WSM
                                     oEmail.Attachments = null;
                                     oEmail.EmailTo = toEmail;
                                     var bSend = new MailService(i_crm.ORIGID, true).MailFactory(oEmail, out sError);
+
+
+                                    var sUploadTime = db.Updateable<SETB_SAL_Payment>()   //更新付款時間 
+                                           .UpdateColumns(x => new SETB_SAL_Payment { PaymentDate = DateTime.Now })
+                                           .Where(x => x.BookingID == objBookingOnline.BookingID)
+                                           .ExecuteCommand();
+
+                                    var sBookingStatus = db.Updateable<SETB_SAL_BookingOnline>()   //更新已付款發送郵件的記錄
+                                                            .UpdateColumns(x => new SETB_SAL_BookingOnline { PSendMailFlag = objBookingOnline.PaymentStatus })
+                                                            .Where(x => x.BookingID == objBookingOnline.BookingID)
+                                                            .ExecuteCommand();
+
+
+
                                 }
                                 catch (Exception)
                                 {

EuroTran/Entity/Sugar/SETB_SAL_BookingOnline.cs

@@ -218,7 +218,13 @@ namespace Entity.Sugar
         public string Message { get; set; }
         public const string CN_MESSAGE = "Message";
 
-
+        /// <summary>
+        /// Desc:
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string PSendMailFlag { get; set; }
+        public const string CN_PSENDMAILFLAG = "PSendMailFlag";
 
     }
 }

EuroTran/Entity/ViewModels/View_SAL_BookingOnline.cs

@@ -23,5 +23,7 @@ namespace Entity.ViewModels
 
         public string ExhibitionName { get; set; }
         public string CurrencyName { get; set; }
+
+        public string PaymentRemittance { get; set; }
     }
 }

EuroTran/WebApp/Page/ShowEasy/BookingMaintain_Upd.html

@@ -13,6 +13,8 @@
     <link href="/Scripts/plugins/fontawesome/css/font-awesome.css" rel="stylesheet" type="text/css" />
     <link href="/Scripts/plugins/uniform/css/uniform.default.min.css" rel="stylesheet" />
     <link href="/Scripts/plugins/toastr/toastr.min.css" rel="stylesheet" type="text/css" />
+    <link href="/Scripts/3rd/jquery.filer/jquery.filer.css" rel="stylesheet" />
+    <link href="/Scripts/3rd/jquery.filer/jquery.filer-dragdropbox-theme.css" rel="stylesheet" />
     <link href="/Content/modern.min.css" rel="stylesheet" />
     <link href="/Content/custom.min.css" rel="stylesheet" type="text/css" />
     <link href="/Content/themes/red.css" rel="stylesheet" type="text/css" />
@@ -39,6 +41,9 @@
                                 <span data-i18n="BookingMaintain_Qry.BookingNo">訂購號碼</span><span>：</span>
                                 <input name="BookingID" type="hidden" id="BookingID" />
                                 <input name="PayType" type="hidden" id="PayType" />
+                                <input name="PSendMailFlag" type="hidden" id="PSendMailFlag" />
+
+
                             </label>
                             <div class="col-sm-3">
                                 <input name="BookingNo" type="text" maxlength="100" id="BookingNo" class="form-control w100p" />
@@ -62,6 +67,7 @@
                             </label>
                             <div class="col-sm-3">
                                 <select class="form-control w100p" id="BookingStatus" name="BookingStatus"></select>
+                                <button type="button" class="btn-custom blue" id="btnBookingCancel" hidden>訂單取消</button>
                             </div>
 
                             <label class="col-sm-2 control-label" for="input-Default">
@@ -262,6 +268,14 @@
 
                         </div>
 
+                        <div class="form-group" id="divPaymentRemittance" hidden>
+                            <label class="col-sm-2 control-label wright" for="input-Default">匯款單：</label>
+                            <div class="col-sm-8 file1">
+                                <input type="file" class="displayNone" name="files[]" id="fileInput1" multiple>
+                            </div>
+                        </div>
+
+                       
 
 
                         <div class="form-group">

EuroTran/WebApp/Scripts/pages/ShowEasy/BookingMaintain_Upd.js

@@ -177,10 +177,12 @@ var fnPageInit = function () {
                         //啓用 當訂單狀態進行中，已完成，付款狀態可使用
                         $('#PaymentStatus').prop('disabled', false);
                     }
-
-
-
-
+                    //訂單狀態禁用了，所有的形態都是自動產生的
+                    $('#BookingStatus').prop('disabled', true);
+                    if (pargs.data.PaymentRemittance) {
+                        $("#divPaymentRemittance").show();
+                        fnGetUploadFiles(pargs.data.PaymentRemittance, fnUpload, 'fileInput1');//, 'fileInput1'
+                    }
                 }
 
             });
@@ -263,9 +265,46 @@ var fnPageInit = function () {
                 });
             });
 
+            //訂單取消
+            $('#btnBookingCancel').click(function () {
+                var data = {};
+                data.BookingID = $('#BookingID').val();
+                data.BookingStatus = "04";//已取消
+                return g_api.ConnectLite("BookingMaintain_Upd", "UpdateSupplierStatus", data, function (res) {
+                    if (res.RESULT) {
+                        showMsgAndGo(i18next.t("message.Modify_Success"), "BookingMaintain_Qry", ''); // ╠message.Save_Success⇒新增成功╣
+                    }
+                    else {
+                        showMsg(i18next.t("message.Modify_Failed") + '<br>' + res.MSG, 'error');// ╠message.Insert_Failed⇒新增失敗╣
+                    }
+                }, function () {
+                    showMsg(i18next.t("message.Modify_Error"), 'error');// ╠message.Insert_Error⇒新增資料異常╣
+                });
+            });
+
         }
 
     }),
+            /**
+       * 上傳附件
+       * @param {Array} files 當前文件
+       * @param {String} parentid
+       * @param {String} inputid file input id
+       */
+        fnUpload = function (files, parentid, inputid) {
+            var option = {};
+            option.limit = 1;
+            option.type = 'one';
+            option.theme = 'dragdropbox1';
+            option.input = $('#fileInput1');
+            option.parentid = parentid;
+            option.extensions = ['jpg', 'jpeg', 'png', 'bmp', 'gif', 'png', 'svg'];
+            option.folder = 'Booking';
+            if (files) {
+                option.files = files;
+            }
+            fnUploadRegister(option);
+        },
 
         /**
         * 停用輸入
@@ -292,4 +331,4 @@ var fnPageInit = function () {
 
 };
 
-require(['base', 'select2', 'jsgrid', 'util', 'cando'], fnPageInit);
+require(['base', 'select2', 'jsgrid', 'util', 'filer', 'cando'], fnPageInit);