diff --git a/Controllers/ApiController.cs b/Controllers/ApiController.cs
index ae95835c..419b8390 100644
--- a/Controllers/ApiController.cs
+++ b/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;
diff --git a/Controllers/AuthApiController.cs b/Controllers/AuthApiController.cs
index 6b2fbab0..0ddd75ff 100644
--- a/Controllers/AuthApiController.cs
+++ b/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")
- {
- ret.ret = "no";
- ret.err_code = "90001";
- ret.message = "此帳號無此api使用權限!";
- return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8");
- }
+ //if (token.user_perm != "system")
+ //{
+ // ret.ret = "no";
+ // ret.err_code = "90001";
+ // ret.message = "此帳號無此api使用權限!";
+ // 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")
- {
- ret.ret = "no";
- ret.err_code = "90001";
- ret.message = "此帳號無此api使用權限!";
- return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8");
- }
+ //if (token.user_perm != "system")
+ //{
+ // ret.ret = "no";
+ // ret.err_code = "90001";
+ // ret.message = "此帳號無此api使用權限!";
+ // return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8");
+ //}
string dept_uid = obj["dept_uid"].ToString();
diff --git a/Views/Home/ProjectList.cshtml b/Views/Home/ProjectList.cshtml
index 42b0d481..a651d93a 100644
--- a/Views/Home/ProjectList.cshtml
+++ b/Views/Home/ProjectList.cshtml
@@ -639,7 +639,8 @@
-
+
+
diff --git a/Views/Shared/_LooperLayout.cshtml b/Views/Shared/_LooperLayout.cshtml
index dca5da26..299639f9 100644
--- a/Views/Shared/_LooperLayout.cshtml
+++ b/Views/Shared/_LooperLayout.cshtml
@@ -30,7 +30,8 @@
-
+ @* *@
+
@@ -210,8 +211,10 @@
-
-
+ @*
+ *@
+
+
diff --git a/wwwroot/assets/javascript/custom/projectlist.js b/wwwroot/assets/javascript/custom/projectlist.js
index abb06380..1057828c 100644
--- a/wwwroot/assets/javascript/custom/projectlist.js
+++ b/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;
diff --git a/wwwroot/assets/vendor/flatpickr.zip b/wwwroot/assets/vendor/flatpickr.zip
new file mode 100644
index 00000000..dfc2baf0
Binary files /dev/null and b/wwwroot/assets/vendor/flatpickr.zip differ
diff --git a/wwwroot/logo/bremen_temp.xlsx b/wwwroot/logo/bremen_temp.xlsx
index 1476eee7..3774b698 100644
Binary files a/wwwroot/logo/bremen_temp.xlsx and b/wwwroot/logo/bremen_temp.xlsx differ
diff --git a/wwwroot/logo/journeys_temp.xlsx b/wwwroot/logo/journeys_temp.xlsx
index 341d86ee..9413a287 100644
Binary files a/wwwroot/logo/journeys_temp.xlsx and b/wwwroot/logo/journeys_temp.xlsx differ