From f17460389c91d1b51648aef0907175058e9a7d87 Mon Sep 17 00:00:00 2001 From: lyt Date: Wed, 8 May 2019 16:45:34 +0800 Subject: [PATCH] =?UTF-8?q?paypal=20=E9=80=80=E6=AC=BE:=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E5=95=86=E6=97=85=E7=9A=84APP=E5=92=8CAPP=E7=BB=84=E7=9A=84APP?= =?UTF-8?q?;=E9=80=80=E6=AC=BE=E9=82=AE=E4=BB=B6=E5=AE=A2=E4=BA=BA?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8E=8B=E7=BC=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/paypal/controllers/index.php | 2 +- .../third_party/paypal/views/refund_buyer.php | 40 +------------------ 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index 08bd185b..c5b2a1fd 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -940,7 +940,7 @@ class Index extends CI_Controller { $ht_memo .= '原收款号:' . $parent_txn_id; $GAI_COLI_SN = isset($advisor_info->COLI_SN) ? $advisor_info->COLI_SN : 0; //CHTAPP订单添加记录前判断是否有记录，以前的APP版本没有交易号，只能拿金额来判断 - if (substr($advisor_info->COLI_WebCode, 0, 6) == 'CHTAPP') {//只判断前6位字符，CHTAPP-fr CHTAPP-jp等各语种都属于APP订单 + if (substr($advisor_info->COLI_WebCode, 0, 6) == 'CHTAPP' && strstr($advisor_info->COLI_WebCode, "-") != '-biz') {//只判断前6位字符，CHTAPP-fr CHTAPP-jp等各语种都属于APP订单 $this->Paypal_model->add_account_info_forAPP($GAI_COLI_SN, $advisor_info->COLI_ID, $item->pn_mc_gross, $item->pn_payment_date, mb_strtoupper($item->pn_mc_currency), $ssje, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payer, $item->pn_payer_email, $item->pn_txn_id, $ht_memo); $this->Paypal_model->insert_biz_order_log($GAI_COLI_SN, 'Refunded'); } else { diff --git a/webht/third_party/paypal/views/refund_buyer.php b/webht/third_party/paypal/views/refund_buyer.php index a4b05563..002285d0 100644 --- a/webht/third_party/paypal/views/refund_buyer.php +++ b/webht/third_party/paypal/views/refund_buyer.php @@ -1,37 +1,5 @@ - -Your Submission Was Successful! - China Highlights - -
-
- -

Dear ,

-
-

China Highlights has refunded to your account today - . The transaction to appear on your account may take up to 2-weeks.

-
-

Please find below details of your refund transaction:

-
-

Transaction details

-

payment_date ?>

-

Payment status:

-
-

Payment details

-

Gross amount

-

-
-

Invoice ID

-

-
-

Contact information

-

-

-
-
- 
+ Your Submission Was Successful! - China Highlights  
 
  
Dear ,
 
 
China Highlights has refunded to your account today - . The transaction to appear on your account may take up to 2-weeks.
 
 
Please find below details of your refund transaction:
 
 
Transaction details
 
payment_date ?>
 
Payment status: 
 
 
Payment details
 
Gross amount
 
 
 
 
Invoice ID
 
 
 
Contact information
 
 
 
 
 
 Best Regards!
 
 fullname ?>, Travel Advisor

@@ -39,8 +7,4 @@ Tel: tel ?>  Mobile: mob
 E-mail: email ?>

 '; } ?>
 Address: Building 6, Chuangyi Business Park, 70 Qilidian Road, Guilin, Guangxi, 541004, China
-            

-        

-    

-
-
+