From 46cf25b585ae993f360862b597bfc7451feb0856 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 29 Jan 2019 02:53:39 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8A=B9=EC=9D=B8=EC=8B=9C=20=EC=9D=B4?=
 =?UTF-8?q?=EC=A0=84=20=EB=82=B4=EC=9A=A9=20=EC=A4=91=EC=B2=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/j_diplomacy_respond_letter.php |  4 ++-
 hwe/js/diplomacy.js                | 42 ++----------------------------
 2 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/hwe/j_diplomacy_respond_letter.php b/hwe/j_diplomacy_respond_letter.php
index 76ab1b1d..c1b69c73 100644
--- a/hwe/j_diplomacy_respond_letter.php
+++ b/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}가 승인되었습니다.";
 }
diff --git a/hwe/js/diplomacy.js b/hwe/js/diplomacy.js
index b9e3ec19..977816b8 100644
--- a/hwe/js/diplomacy.js
+++ b/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'){