diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index 612ee7f7..5eb58be6 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -1127,12 +1127,12 @@ class Index extends CI_Controller { $M_State = 0; $this->Paypal_model->save_automail($fromName, $fromEmail, $toName, $toEmail, $subject, $body, $M_RelatedInfo, $M_State, $M_AddTime, 'paypal note'); // 通知客人, 客人邮箱 - $customer_detail = $this->Paypal_model->get_customer_detail($advisor_info->COLI_SN, $orderid_info->ordertype); + // $customer_detail = $this->Paypal_model->get_customer_detail($advisor_info->COLI_SN, $orderid_info->ordertype); $c_fromName = $advisor_detail->fullname ? $advisor_detail->fullname : $opi_firstname; $opi_email_list = explode(";", $advisor_detail->email); // 解析外联的邮件 $c_fromEmail = isset($opi_email_list[0]) ? trim($opi_email_list[0]) : $opi_email; - $c_toName = $customer_detail->fullname; - $c_toEmail = $customer_detail->email; + $c_toName = $item->pn_payer; // $customer_detail->fullname; + $c_toEmail = $item->pn_payer_email ; // $customer_detail->email; $c_subject = $item->pn_mc_currency . " " . str_replace('-', '', $item->pn_mc_gross) . " Refunded to your account, booking number " . $item->pn_invoice; $c_body = $this->load->view('refund_buyer', $item, true); $c_M_RelatedInfo = $item->pn_sn; @@ -1611,7 +1611,7 @@ class Index extends CI_Controller { $post_body .= '&appkey=jdfk*$jfjdk1688'; $app_return = $this->async_curl("http://wx.chinatrainbooking.com/paypalend/", $post_body, 5); if (intval($app_return)===200) { - return false; // 下一步更新为send + return false; // 下一步更新为send-app } return true; // 下一步: sendfail diff --git a/webht/third_party/paypal/views/note_list.php b/webht/third_party/paypal/views/note_list.php index 7d58f1be..47b4c3a9 100644 --- a/webht/third_party/paypal/views/note_list.php +++ b/webht/third_party/paypal/views/note_list.php @@ -211,7 +211,7 @@ echo "