diff --git a/webht/third_party/pay/views/payment_gai_setting.php b/webht/third_party/pay/views/payment_gai_setting.php index c64de39f..323360c8 100644 --- a/webht/third_party/pay/views/payment_gai_setting.php +++ b/webht/third_party/pay/views/payment_gai_setting.php @@ -54,7 +54,7 @@
- +
$order_info->OPI_Email
";
echo "OPI_Name => $order_info->OPI_Name
";
echo!empty($order_info->COLI_GroupCode) ? "COLI_GroupCode => $order_info->COLI_GroupCode
" : false;
- echo!empty($order_info->COLI_OrderDetailText) ? "COLI_OrderDetailText => $order_info->COLI_OrderDetailText\n" : false;
+ echo!empty($order_info->COLI_OrderDetailText) ? "COLI_OrderDetailText => $order_info->COLI_OrderDetailText" : false;
echo "";
} else {
echo '找不到目标订单内容';
diff --git a/webht/third_party/pay/views/payment_list.php b/webht/third_party/pay/views/payment_list.php
index f84a79fe..63f29850 100644
--- a/webht/third_party/pay/views/payment_list.php
+++ b/webht/third_party/pay/views/payment_list.php
@@ -55,9 +55,12 @@
.text-declined, .text-declined a:not(.btn) {color: #c0192a;}
.text-under_review, .text-under_review a:not(.btn) {color: #ff9900;}
.text-resolved, .text-resolved a:not(.btn) {color: #ff9900;}
+ .text-paypal_dispute, .text-paypal_dispute a:not(.btn),
.text-customer_dispute_resolved, .text-customer_dispute_resolved a:not(.btn),
.text-customer_dispute_updated, .text-customer_dispute_updated a:not(.btn) {color: #ff9900;}
- .text-approved, .text-approved a:not(.btn) {color: #777;}
+ .text-approved, .text-approved a:not(.btn),
+ .text-paypal_order, .text-paypal_order a:not(.btn)
+ {color: #777;}
.flex {display: flex;}
.items-center {align-items: center;}
@@ -261,7 +264,8 @@
| # | @@ -278,8 +282,13 @@|
|---|---|
|
brand_name))."-color"; ?>">brand_name; ?>
@@ -348,16 +357,21 @@
?>
OPN_transactionResult !== 'completed') {
+ // declined pending dispute approved
$cls = "text-{$item->OPN_transactionResult}";
$text = strtoupper($item->OPN_transactionResult);
$send_text = $item->OPN_noticeType !== 'pay' ? strtoupper($item->OPN_noticeType) : $item->OPN_resultCode;
echo "{$text} "; } elseif ($item->OPN_noticeType !== 'pay') { - $send_text = $item->OPN_noticeType == 'refund' ? strtoupper($item->OPN_transactionResult) : $item->OPN_resultCode; - echo '' . strtoupper($item->OPN_noticeType) . ' '; + // refund + $send_text = $item->OPN_noticeType == 'refund' ? ($item->OPN_noticeSendStatus) : $item->OPN_resultCode; + $_cls = "tag-".$item->OPN_noticeType; + echo "" . strtoupper($item->OPN_noticeType) . ' '; } else { + // completed pay $send_text = ($item->OPN_noticeSendStatus ? $item->OPN_noticeSendStatus : '⏳'); - echo '' . strtoupper($item->OPN_transactionResult) . ' '; + $_cls = "tag-".$item->OPN_transactionResult; + echo "" . strtoupper($item->OPN_transactionResult) . ' '; } ?> |