perf: PayPal: 优化 显示

webht/third_party/pay/config/paypal.php

@@ -7,7 +7,8 @@ $config["method_code"] = 15002;
 // lyt sandbox
 // $config['client_id'] = "AcMk2gic4iPAILnAuJnTQ4ndyz3k35APxNrqtqtG8-stjj7LykAkdPwmMG_AFvopDJCCt0Z-LQawoL9f";
 // $config['secret']    = "EBPs37WgdYMLtrTTRv6usynF4eT-xGuk42VmvjePKxsQU6PfIk9aKe0zF8yIEo02vqP6oqkLWMdtJnU8";
-// ycc live
+
+// ycc live: APP name: Express_Checkout
 $config['client_id'] = "Af8wR2_0NnDo3hf8axMkI-5TFd_UccjP4fZzsKz7136pBe6pj69QQIodqYAOjKr0wE-gpAE7Ilo4i_eh";
 $config['secret']    = "EMp7oGhy8wX8pvJHC2Ey0_hnAxl2Oh559mSrbcnAqO526BhgxDR0gauTwYjY99DD7OBw0zeo4CIBWEfx";
 

webht/third_party/pay/controllers/PaymentService.php

@@ -310,7 +310,7 @@ class PaymentService extends CI_Controller {
              * @author LYT
              */
             if (empty($opi_email) && $item->OPN_accountStatus === 'recorded') {
-                $this->note_model->update_send($item->OPN_SN, $item->OPN_transactionId, 'closed');
+                $this->note_model->update_send($item->OPN_SN, $item->OPN_transactionId, 'send');
                 continue;
             }
 

webht/third_party/paypal/controllers/index.php

@@ -568,7 +568,10 @@ class Index extends CI_Controller {
         $this->load->view('n-footer');
     }
 
-    //存储paypal发送的消息
+    /**
+     * IPN
+     * 存储paypal发送的消息
+     */
     public function paypal_note() {
         $pn_txn_id = $this->input->post('txn_id');
         log_message('error','paypal-note: ' . $pn_txn_id);
@@ -1273,8 +1276,8 @@ class Index extends CI_Controller {
     public function note_list() {
         $this->permission->is_admin(true);
         $data = array();
-//有关键词则不限制日期
-        $data['search_key'] = $this->input->post('search_key');
+        //有关键词则不限制日期
+        $data['search_key'] = $this->input->get_post('search_key');
         $data['date'] = $this->input->get('date');
         empty($data['date']) ? $data['date'] = date('Y-m-d') : false;
 

webht/third_party/paypal/models/note_model.php

@@ -163,6 +163,7 @@ class Note_model extends CI_Model {
         if ($this->topnum === 1) {
             if ($query->num_rows() > 0) {
                 $row = $query->row();
+                $this->set_fundsource($row);
                 return $row;
             } else {
                 return FALSE;
@@ -190,6 +191,7 @@ class Note_model extends CI_Model {
         if ( ! isset($raw->ipn_track_id) && (isset($raw->id) && strpos($raw->id, "WH-") === 0)) {
             $ele->fundsource = '';
         }
+        $ele->parent_txn_id = isset($raw->parent_txn_id) ? $raw->parent_txn_id : '';
     }
 
     public function update_send($pn_txn_id, $pn_send, $pn_sn=NULL) {

webht/third_party/paypal/models/paypal_model.php

@@ -213,8 +213,8 @@ class Paypal_model extends CI_Model {
                        ,GAI_AccreditNo
                        ,GAI_Memo
                        ,GAI_State
-                       ,DeleteFlag
-                    ) VALUES (?,?,15010,?,?,?,?,?,?,?,?,?,?,?,0,0)";
+                       ,DeleteFlag,LastEditTime
+                    ) VALUES (?,?,15010,?,?,?,?,?,?,?,?,?,?,?,0,0,GETDATE())";
         $query = $this->HT->query($sql, array($GAI_COLI_SN, $GAI_SQJE, $GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo));
         $insertid = $this->HT->last_id('BIZ_GroupAccountInfo');
         return $query;
@@ -247,8 +247,8 @@ class Paypal_model extends CI_Model {
                        ,GAI_AccreditNo
                        ,GAI_Memo
                        ,GAI_State
-                       ,DeleteFlag
-                    ) VALUES (?,?,15002,?,?,?,?,?,?,?,?,?,?,?,?,0,0)";
+                       ,DeleteFlag,LastEditTime
+                    ) VALUES (?,?,15002,?,?,?,?,?,?,?,?,?,?,?,?,0,0,GETDATE())";
         $query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_Money, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo));
         $insertid = $this->HT->last_id('BIZ_GroupAccountInfo');
         return $query;
@@ -279,8 +279,8 @@ class Paypal_model extends CI_Model {
                        ,GAI_AccreditNo
                        ,GAI_Memo
                        ,GAI_State
-                       ,DeleteFlag
-                    ) VALUES (?,15002,?,?,?,?,?,?,?,?,?,?,?,0,0)";
+                       ,DeleteFlag,LastEditTime
+                    ) VALUES (?,15002,?,?,?,?,?,?,?,?,?,?,?,0,0,GETDATE())";
         $query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo));
         $insertid = $this->HT->last_id('GroupAccountInfo');
         return $insertid;

webht/third_party/paypal/views/note_list.php

@@ -97,11 +97,11 @@
                                 <?php
                                 if ( ! empty($record_flags)) {
                                     foreach ($record_flags as $kf => $vf) {
-echo "<option value=\"$vf->TEL_SN@" . strstr($vf->TEL_transactionDate, " ", true) . "@" . $vf->TEL_transactionCurrency . "\">"
+                                        echo "<option value=\"$vf->TEL_SN@" . strstr($vf->TEL_transactionDate, " ", true) . "@" . $vf->TEL_transactionCurrency . "\">"
                                         . " [" . strstr($vf->TEL_exportDate, " ", true) . "] "
-    . $vf->TEL_transactionCurrency . " " .  $vf->TEL_transactionAmount . ' - '.  $vf->TEL_exportAmount
+                                        . $vf->TEL_transactionCurrency . " " .  $vf->TEL_transactionAmount . ' - ' .  $vf->TEL_exportAmount
                                             . " / " . $vf->TEL_orderId . ' / '
-    . substr($vf->TEL_transactionDate,0,16)
+                                            . substr($vf->TEL_transactionDate, 0, 16)
                                             . "</option>";
                                     }
                                 }
@@ -224,8 +224,19 @@ echo "<option value=\"$vf->TEL_SN@" . strstr($vf->TEL_transactionDate, " ", true
                             <?php echo htmlentities($item->pn_invoice) . ' / ' . $item->pn_mc_gross . $item->pn_mc_currency . ' / ' . $item->pn_payer; ?>
                         </a></li>
 
-                    <li class="col-sm-4 nopadding-L" style="overflow:hidden;word-break: break-all;height: 25px;"><?php echo $item->pn_payer_email; ?></li>
-                    <li class="col-sm-4 nopadding-L" style="overflow:hidden;word-break: break-all;height: 25px;"><?php echo $item->pn_txn_id; ?></li>
+                    <li class="col-sm-4 nopadding-L" style="overflow:hidden;word-break: break-all;height: 25px;">
+                        <a href="<?php echo site_url('apps/paypal/index/note_list?search_key='.$item->pn_payer_email); ?>"><?php echo $item->pn_payer_email; ?></a>
+                    </li>
+                    <li class="col-sm-4 nopadding-L" style="overflow:hidden;word-break: break-all;height: 45px;">
+                    <?php echo $item->pn_txn_id; ?>
+                    <div>
+                        <span>
+                            <?php if ($item->parent_txn_id) { ?>
+                                ┖ <a href="<?php echo site_url('apps/paypal/index/note_list?search_key='.$item->parent_txn_id); ?>"><?php echo $item->parent_txn_id; ?></a>
+                        <?php }  ?>
+                        </span>
+                    </div>
+                    </li>
 
                     <li class="col-sm-3 nopadding-L" style="overflow:hidden;word-break: break-all;height: 25px;"><?php echo date('Y-m-d H:i:s', strtotime($item->pn_payment_date) + 3600 * 8); ?></li>
                     <li class="col-sm-2 nopadding-L" ><?php echo $item->pn_datetime; ?></li>
@@ -238,7 +249,8 @@ echo "<option value=\"$vf->TEL_SN@" . strstr($vf->TEL_transactionDate, " ", true
                         if ($item->pn_send == 'send' || substr($item->pn_send, 0, 5) == "send-") {
                             $show_send = $item->pn_send . " / " . str_ireplace('completed', '', $item->pn_payment_status);
                         } elseif ($item->pn_send == 'closeRecord') {
-                            $show_send = $show_record = '已忽略';
+                            $show_send = '已忽略' . " / " . str_ireplace('completed', '', $item->pn_payment_status);
+                            $show_record = '已忽略';
                         } else if (strtolower($item->pn_payment_status) == 'completed') {
                             $class_css = 'btn-danger';
                             $show_send = $item->pn_send;