From cec778e335c06fe084b09777a041718dd4bd7915 Mon Sep 17 00:00:00 2001 From: lyt Date: Thu, 12 Jul 2018 09:19:19 +0800 Subject: [PATCH] =?UTF-8?q?paypal=20=E5=A2=9E=E5=8A=A0=E5=86=99=E5=85=A5?= =?UTF-8?q?=E4=BB=98=E6=AC=BE=E4=BA=BA=E5=90=8D=E5=AD=97=E5=88=B0HT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/paypal/controllers/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index 3aab75e2..4cfb5f40 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -557,6 +557,7 @@ class Index extends CI_Controller { $pn_invoice = $this->input->post('invoice'); empty($pn_invoice) ? $pn_invoice = $this->input->post('transaction_subject') : false; + empty($pn_invoice) ? $pn_invoice = '' : false; $pn_custom = $this->input->post('custom'); empty($pn_custom) ? $pn_custom = '' : false; @@ -814,7 +815,7 @@ class Index extends CI_Controller { $ht_memo = '交易号(自动录入):' . $item->pn_txn_id; $GAI_COLI_SN = isset($advisor_info->COLI_SN) ? $advisor_info->COLI_SN : 0; $ssje = $this->Paypal_model->get_ssje($item->pn_mc_gross, '15002', mb_strtoupper($item->pn_mc_currency)); - $this->Paypal_model->add_tour_account_info($GAI_COLI_SN, $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_email, $item->pn_txn_id, $ht_memo); + $this->Paypal_model->add_tour_account_info($GAI_COLI_SN, $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->update_coli_introduction($GAI_COLI_SN, '已支付 ' . mb_strtoupper($item->pn_mc_currency) . $item->pn_mc_gross); }