From 9ad85c83fa188ade8910b8bc7432b43138024278 Mon Sep 17 00:00:00 2001
From: Nakorn Rientrakrunchai <nakorn@tonproject.com>
Date: Sat, 15 Aug 2020 17:39:25 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B9=E0=B8=95=E0=B8=A3=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=99=E0=B8=A7=E0=B8=93=20=E0=B8=84?=
 =?UTF-8?q?=E0=B9=88=E0=B8=B2=E0=B8=84=E0=B8=A3=E0=B8=AD=E0=B8=87=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=B5=E0=B8=9E=E0=B9=83=E0=B8=AB=E0=B8=A1=E0=B9=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eva_adjust_postponement_normal_d.js                       | 4 ++--
 .../eva_adjust_postponement_quota_d.js                        | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js
index bdda2b6..21ef4fa 100644
--- a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js
+++ b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js
@@ -148,7 +148,7 @@ function Oneva_adjust_postponement_normal_percentageChange(){
 
 function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(){    
     var current_quota = $("#eva_adjust_postponement_normal_limit_quota").val().replace(/[,-]/g,'');
-    
+    console.log("yy");
     var sum_postpone = 0;
     
     $('#eva_adjust_postponement_detail_normal_02Body tr').each(function () {
@@ -167,7 +167,7 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged()
             $("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(new_salary));
 
             if(new_salary < 13285){
-                $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(1000);
+                $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(13285-new_salary);
             }else{
                 $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(0);
             }
diff --git a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js
index 4ef88c5..5bf6bc8 100644
--- a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js
+++ b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js
@@ -139,6 +139,7 @@ function Oneva_adjust_postponement_quota_limit_frame_quotaChange() {
 }
 
 function CalculateRemainQuota() {
+console.log("xx");
     var sum_receive_quota = 0;
     var limit_quota = parseFloat($("#eva_adjust_postponement_quota_limit_quota").val().replace(/[,-]/g,''));
 
@@ -157,7 +158,7 @@ function CalculateRemainQuota() {
             $("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(formatNumber(new_sarary_with_quota));
 
             if (new_sarary_with_quota < 13285) {
-                $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumber(1000));
+                $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumber(13285-new_sarary_with_quota));
             } else {
                 $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(0);
             }