From 0166e701fcef070db77260c30a6a5783ed3d8a40 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Wed, 11 Dec 2019 11:59:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20PayPal=E5=A2=9E=E5=8A=A0=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=95=99=E8=A8=80,=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/paypal/views/note_setting.php | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/webht/third_party/paypal/views/note_setting.php b/webht/third_party/paypal/views/note_setting.php
index dd492f2f..241f3bc6 100644
--- a/webht/third_party/paypal/views/note_setting.php
+++ b/webht/third_party/paypal/views/note_setting.php
@@ -12,8 +12,6 @@
         <dt>客人姓名，邮箱</dt>
         <dd><?php echo $note->pn_payer ?> , <?php echo $note->pn_payer_email ?></dd>
     </dl>
-
-
     <dl class="dl-horizontal">
         <dt>产品名</dt>
         <dd><?php echo $note->pn_item_name ?></dd>
@@ -26,15 +24,28 @@
         <dt>付款时间</dt>
         <dd><?php echo date('Y-m-d H:i:s', strtotime($note->pn_payment_date) + 3600 * 8); ?></dd>
     </dl>
+    <dl class="dl-horizontal">
+        <dt>备注&nbsp;/&nbsp;留言</dt>
+        <dd>
+            <?php
+            $content = json_decode($note->pn_memo);
+            if (isset($content->memo)) {
+                echo $content->memo . "<br>";
+            }
+            if (isset($content->transaction_subject)) {
+                echo $content->transaction_subject;
+            } ?>
+        </dd>
+    </dl>
 
 
     <dl class="dl-horizontal">
         <dt>订单号</dt>
         <dd>
             <div class="input-group">
-                <input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php echo!empty($pn_invoice) ? $pn_invoice : $note->pn_invoice; ?>">
+                <input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php echo !empty($pn_invoice) ? $pn_invoice : $note->pn_invoice; ?>">
                 <span class="input-group-btn">
-                    <button class="btn btn-default" type="button" onclick="show_order_modal('<?php echo $note->pn_txn_id; ?>', 0, $('#pn_invoice').val())" ><span class="glyphicon glyphicon-search"></span></button>
+                    <button class="btn btn-default" type="button" onclick="show_order_modal('<?php echo $note->pn_txn_id; ?>', 0, $('#pn_invoice').val())"><span class="glyphicon glyphicon-search"></span></button>
                 </span>
             </div>
             <label class="text-danger">订单号形如: 160414408_B , B商务订单，JJ160321052_T,T传统订单，请务必加上后缀</label>
@@ -51,8 +62,8 @@
                 echo "COLI_ID => $order_info->COLI_ID<br/>";
                 echo "OPI_Email => $order_info->OPI_Email<br/>";
                 echo "OPI_Name => $order_info->OPI_Name<br/>";
-                echo!empty($order_info->COLI_GroupCode) ? "COLI_GroupCode => $order_info->COLI_GroupCode<br/>" : false;
-                echo!empty($order_info->COLI_OrderDetailText) ? "COLI_OrderDetailText => $order_info->COLI_OrderDetailText\n" : false;
+                echo !empty($order_info->COLI_GroupCode) ? "COLI_GroupCode => $order_info->COLI_GroupCode<br/>" : false;
+                echo !empty($order_info->COLI_OrderDetailText) ? "COLI_OrderDetailText => $order_info->COLI_OrderDetailText\n" : false;
             } else {
                 echo '找不到订单内容';
             }
@@ -61,8 +72,10 @@
         </dd>
     </dl>
     <dl class="dl-horizontal">
-        <dt><a href="javascript:void(0);" onclick="$('#note_original_data').toggle()" >原始数据</a></dt>
-        <dd> <span style="display: none;" id="note_original_data"><?php echo str_replace('","', '"<br/>"', $note->pn_memo); ?></span></dd>
+        <dt><a href="javascript:void(0);" onclick="$('#note_original_data').toggle()">原始数据</a></dt>
+        <dd> <span style="display: none;" id="note_original_data">
+                <?php echo str_replace('","', '"<br/>"', $note->pn_memo); ?>
+            </span></dd>
     </dl>
 
     <input type="hidden" name="pn_txn_id" id="pn_txn_id" value="<?php echo $note->pn_txn_id ?>" />