승인시 이전 내용 중첩

hwe/j_diplomacy_respond_letter.php

@@ -76,10 +76,12 @@ if($isAgree){
     ], 'no=%i', $letterNo);
     //TODO: 외교 서신에 대한 메시지를 양국에 발송해야함
 
-    if($letter['prev_no'] !== null){
+    $prevLetterNo = $letter['prev_no'];
+    while($prevLetterNo !== null){
         $db->update('ng_diplomacy', [
             'state'=>'replaced',
         ], 'no=%i', $letter['prev_no']);
+        $prevLetterNo = $db->queryFirstField('SELECT prev_no FROM ng_diplomacy WHERE state != \'replaced\' AND no = %i', $prevLetterNo);
     }
     $msgText = "외교 서신 #{$letterNo}가 승인되었습니다.";
 }

hwe/js/diplomacy.js

@@ -119,9 +119,9 @@ function rollbackLetter(letterNo){
     return false;
 }
 
-function destoryLetter(letterNo){
+function destroyLetter(letterNo){
     $.post({
-        url:'j_diplomacy_destory_letter.php',
+        url:'j_diplomacy_destroy_letter.php',
         dataType:'json',
         data:{
             letterNo:letterNo,
@@ -153,44 +153,6 @@ function destoryLetter(letterNo){
     return false;
 }
 
-function destroyLetter(letterNo){
-    var actionName = '회수를 ';
-    var target = 'j_diplomacy_rollback_letter.php';
-    if(!isRollback){
-        actionName = '파기 요청을 '
-        target = 'j_diplomacy_destroy_letter.php';
-    }
-    $.post({
-        url:target,
-        dataType:'json',
-        data:{
-            letterNo:letterNo,
-        }
-    }).then(function(data){
-        if(!data){
-            alert()
-            return quickReject(actionName+'실패했습니다.');
-        }
-        if(!data.result){
-            return quickReject(actionName+'실패했습니다. : '+data.reason);
-        }
-
-        if(isRollback){
-            
-        }
-        alert(actionName+'했습니다.');
-
-        location.reload();
-        return false;
-
-    }, errUnknown)
-    .fail(function(reason){
-        alert(reason);
-    });
-
-    return false;
-}
-
 function drawLetter(idx, letterObj){
     
     if(letterObj.state == 'cancelled'){