Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

paypal ...

Browse Source
webht/payment
Lei OT 5 months ago
parent 3614c4b7c2
commit 65624e9a8e
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File

13
webht/third_party/pay/models/Online_payment_account_model.php vendored
Unescape Escape View File

@ -168,9 +168,11 @@ class Online_payment_account_model extends CI_Model {
$info_sql = "SELECT GAI_SN, GAI_State,GAI_COLI_ID as orderId
,CAST(GAI_SQJE AS VARCHAR) GAI_SQJE,GAI_SQJECurrency
,CAST(GAI_SSJE AS VARCHAR) GAI_SSJE,GAI_Memo
,'B' AS ordertype FROM BIZ_GroupAccountInfo
WHERE GAI_AccreditNo = '$pn_txn_id'
OR CHARINDEX('$pn_txn_id', gai_memo) > 0
,'B' AS ordertype
FROM BIZ_GroupAccountInfo
WHERE (GAI_AccreditNo = '$pn_txn_id'
OR CHARINDEX('$pn_txn_id', gai_memo) > 0)
AND BIZ_GroupAccountInfo.DeleteFlag =0
UNION
SELECT GAI_SN, GAI_State
,(
@ -182,8 +184,9 @@ class Online_payment_account_model extends CI_Model {
,cast(GAI_SSJE as varchar) GAI_SSJE,GAI_Memo
,'T' AS ordertype
FROM GroupAccountInfo
WHERE GAI_AccreditNo = '$pn_txn_id'
OR CHARINDEX('$pn_txn_id', gai_memo) > 0";
WHERE (GAI_AccreditNo = '$pn_txn_id'
OR CHARINDEX('$pn_txn_id', gai_memo) > 0)
AND GroupAccountInfo.DeleteFlag =0";
$info_query = $this->HT->query($info_sql);
$info_result = $info_query->result();

1
webht/third_party/pay/models/Online_payment_note_model.php vendored
Unescape Escape View File

@ -244,6 +244,7 @@ class Online_payment_note_model extends CI_Model {
$this->search = $method===null ? "" : " AND OPN_accountMethod IN ($method) ";
$this->search .= " AND (OPN_noticeTime BETWEEN '$date 00:00:00' AND '$date 23:59:59'
OR OPN_noticeSendTime BETWEEN '$date 00:00:00' AND '$date 23:59:59'
OR OPN_completeTime BETWEEN '$date 00:00:00' AND '$date 23:59:59'
)
";
$this->send = " AND isnull(OPN_noticeSendStatus,'') NOT IN ('', 'sendfail', 'unsend', 'closed' )";

13
webht/third_party/paypal/controllers/index.php vendored
Unescape Escape View File

@ -717,8 +717,11 @@ class Index extends CI_Controller {
$pn_receiver_account = $GAI_API->payee->email_address;
$pn_receiver_account_name = $GAI_API->payee->merchant;
// $pn_receiver_account_name = $this->fundsource_map($pn_receiver_account)->merchant;
$save_to_pn = $GAI_API->payee->email_address == 'pay@trippest.com' ? true : false;
break;
case 'PAYMENT.SALE.REFUNDED':
$save_to_pn = false;
case 'PAYMENT.SALE.REVERSED':
$pn_invoice = $post_data->resource->invoice_number;
$pn_mc_currency = $post_data->resource->amount->currency;
@ -741,10 +744,13 @@ class Index extends CI_Controller {
$post_data->GAI_API = $GAI_API;
break;
case 'PAYMENT.CAPTURE.COMPLETED':
case 'PAYMENT.CAPTURE.DECLINED': // todo: CHECKOUT.PAYMENT-APPROVAL.REVERSED
$save_to_pn = true;
case 'PAYMENT.CAPTURE.PENDING':
$save_to_pn = $post_data->event_type !== 'PAYMENT.CAPTURE.PENDING'; // false;
$save_to_pn = false;
// $save_to_pn = $post_data->event_type !== 'PAYMENT.CAPTURE.PENDING'; // false;
case 'PAYMENT.CAPTURE.COMPLETED':
// $save_to_pn = false;
$fund_type = 'pay';
$pn_invoice = $post_data->resource->invoice_id;
$pn_custom = isset($post_data->resource->custom_id) ? $post_data->resource->custom_id : '';
@ -760,8 +766,11 @@ class Index extends CI_Controller {
$post_data->GAI_API = $GAI_API;
$pn_receiver_account = $GAI_API->payee->email_address;
$pn_receiver_account_name = $this->fundsource_map($pn_receiver_account)->merchant;
$save_to_pn = $post_data->event_type === 'PAYMENT.CAPTURE.COMPLETED' ? ($GAI_API->payee->email_address == 'pay@trippest.com' ? true : false) : $save_to_pn;
break;
case 'PAYMENT.CAPTURE.REFUNDED':
$save_to_pn = false;
case 'PAYMENT.CAPTURE.REVERSED':
$fund_type = 'refund';
$pn_invoice = $post_data->resource->invoice_id;

Write Preview
Loading…
Cancel
Save