fixed some bugs

Controllers/ApiController.cs

@@ -245,6 +245,8 @@ namespace QuotationMaker.Controllers
             //簽章欄
             row = (XSSFRow)sheet.GetRow(27);
             row.Cells[3].SetCellValue(row.Cells[3].StringCellValue.Replace("{user_name}", objDetail.user.user_name));
+            row = (XSSFRow)sheet.GetRow(24);
+            row.Cells[0].SetCellValue(row.Cells[0].StringCellValue.Replace("{company_name}", objDetail.company.company_name));
 
             //匯款項目與發票
             int payment_count = objDetail.payments.Count;

Controllers/AuthApiController.cs

@@ -862,13 +862,13 @@ namespace QuotationMaker.Controllers
                 return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8");
             }
 
-            if (token.user_perm != "system")
+            //if (token.user_perm != "system")
-            {
+            //{
-                ret.ret = "no";
+            //    ret.ret = "no";
-                ret.err_code = "90001";
+            //    ret.err_code = "90001";
-                ret.message = "此帳號無此api使用權限!";
+            //    ret.message = "此帳號無此api使用權限!";
-                return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8");
+            //    return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8");
-            }
+            //}
 
             string dept_uid = obj["dept_uid"].ToString();
             string mainItem_uid = obj["mainItem_uid"].ToString();
@@ -1017,13 +1017,13 @@ namespace QuotationMaker.Controllers
                 return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8");
             }
 
-            if (token.user_perm != "system")
+            //if (token.user_perm != "system")
-            {
+            //{
-                ret.ret = "no";
+            //    ret.ret = "no";
-                ret.err_code = "90001";
+            //    ret.err_code = "90001";
-                ret.message = "此帳號無此api使用權限!";
+            //    ret.message = "此帳號無此api使用權限!";
-                return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8");
+            //    return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8");
-            }
+            //}
 
             string dept_uid = obj["dept_uid"].ToString();
 

Views/Home/ProjectList.cshtml

@@ -639,7 +639,8 @@
                             <option value="cheque">支票</option>
                             <option value="telegraphic">電匯</option>
                             <option value="paycash">一次付清</option>
-                            <option value="downpayment">頭期款(即期支付)</option>
+                            <option value="downpayment">頭期款</option>
+                            <option value="lastpayment">尾款</option>
                             <option value="custom">手動輸入</option>
 
                         </select>

Views/Shared/_LooperLayout.cshtml

@@ -30,7 +30,8 @@
     <link rel="stylesheet" href="~/assets/vendor/tributejs/tribute.css">
     <link rel="stylesheet" href="~/assets/vendor/at.js/css/jquery.atwho.min.css">
     <link rel="stylesheet" href="~/assets/vendor/bootstrap-select/css/bootstrap-select.min.css">
-    <link rel="stylesheet" href="~/assets/vendor/flatpickr/flatpickr.min.css">
+    @* <link rel="stylesheet" href="~/assets/vendor/flatpickr/flatpickr.min.css"> *@
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
     
     <link rel="stylesheet" href="~/assets/vendor/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css">
     <link rel="stylesheet" href="~/assets/vendor/bootstrap-touchspin/jquery.bootstrap-touchspin.min.css">
@@ -210,8 +211,10 @@
     <script src="~/assets/vendor/perfect-scrollbar/perfect-scrollbar.min.js"></script>
     <script src="~/assets/vendor/bootstrap-select/js/bootstrap-select.min.js"></script>
     <script src="~/assets/vendor/masonry-layout/masonry.pkgd.min.js"></script>
-    <script src="~/assets/vendor/flatpickr/flatpickr.min.js"></script>
+    @* <script src="~/assets/vendor/flatpickr/flatpickr.min.js"></script>
-    <script src="~/assets/vendor/flatpickr/plugins/monthSelect/index.js"></script>
+    <script src="~/assets/vendor/flatpickr/plugins/monthSelect/index.js"></script> *@
+    <script src="https://cdn.jsdelivr.net/npm/flatpickr/dist/plugins/monthSelect/index.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
     <script src="https://npmcdn.com/flatpickr@4.6.3/dist/l10n/zh-tw.js"></script>
     <script src="~/assets/vendor/flatpickr/l10n/zh-tw.js"></script>
     <script src="~/assets/vendor/wnumb/wNumb.min.js"></script>

wwwroot/assets/javascript/custom/projectlist.js

@@ -611,6 +611,9 @@ $(document).ready(function () {
             case 'downpayment':
                 $('#payment_descript').val('').trigger('change');
                 break;
+            case 'lastpayment':
+                $('#payment_descript').val('').trigger('change');
+                break;
             case 'custom':
                 $('#payment_descript').val('').trigger('change');
                 break;
@@ -629,7 +632,7 @@ $(document).ready(function () {
 
 
 
-        if (payment_method != 'paycash' && payment_method != 'downpayment') {
+        if (payment_method != 'paycash' && payment_method != 'downpayment' && payment_method != 'lastpayment') {
             if (payment_descript == '') {
                 alert('請輸入付款資訊!');
                 return;