← All changes
|
stripe/controllers/FrmTransLitePaymentsController.php
+117
-7
6.27
→
trunk
View file →
| @@ -139,13 +139,15 @@ | ||
| 139 | 139 | echo esc_html( sprintf( __( '%d (Deleted)', 'formidable' ), $payment->item_id ) ); |
| 140 | 140 | return; |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | + // phpcs:disable Generic.WhiteSpace.ScopeIndent | |
| 143 | 144 | ?> |
| 144 | 145 | <a href="?page=formidable-entries&action=show&frm_action=show&id=<?php echo absint( $payment->item_id ); ?>"> |
| 145 | 146 | <?php echo absint( $payment->item_id ); ?> |
| 146 | 147 | </a> |
| 147 | 148 | <?php |
| 149 | + // phpcs:enable Generic.WhiteSpace.ScopeIndent | |
| 148 | 150 | } |
| 149 | 151 | |
| 150 | 152 | /** |
| 151 | 153 | * Get a refund link. |
| @@ -174,9 +176,9 @@ | ||
| 174 | 176 | * |
| 175 | 177 | * @param string $link |
| 176 | 178 | * @param object $payment |
| 177 | 179 | */ |
| 178 | - $link = apply_filters( 'frm_pay_' . $paysys . '_refund_link', $link, $payment ); | |
| 180 | + return apply_filters( 'frm_pay_' . $paysys . '_refund_link', $link, $payment ); | |
| 179 | 181 | } |
| 180 | 182 | |
| 181 | 183 | return $link; |
| 182 | 184 | } |
| @@ -205,12 +207,20 @@ | ||
| 205 | 207 | if ( ! $payment_id ) { |
| 206 | 208 | wp_die( esc_html__( 'Oops! No payment was selected for refund.', 'formidable' ) ); |
| 207 | 209 | } |
| 208 | 210 | |
| 209 | - $frm_payment = new FrmTransLitePayment(); | |
| 210 | - $payment = $frm_payment->get_one( $payment_id ); | |
| 211 | + $payment = ( new FrmTransLitePayment() )->get_one( $payment_id ); | |
| 211 | 212 | |
| 212 | - switch ( $payment->paysys ) { | |
| 213 | + if ( ! $payment ) { | |
| 214 | + wp_die( esc_html__( 'Oops! That payment does not exist.', 'formidable' ) ); | |
| 215 | + } | |
| 216 | + | |
| 217 | + $refunded = false; | |
| 218 | + $reason = ''; | |
| 219 | + $debug_id = ''; | |
| 220 | + $paysys = $payment->paysys; | |
| 221 | + | |
| 222 | + switch ( $paysys ) { | |
| 213 | 223 | case 'stripe': |
| 214 | 224 | $refunded = FrmStrpLiteAppHelper::call_stripe_helper_class( 'refund_payment', $payment->receipt_id ); |
| 215 | 225 | break; |
| 216 | 226 | case 'square': |
| @@ -215,24 +225,110 @@ | ||
| 215 | 225 | break; |
| 216 | 226 | case 'square': |
| 217 | 227 | $refunded = FrmSquareLiteConnectHelper::refund_payment( $payment->receipt_id ); |
| 218 | 228 | break; |
| 229 | + case 'paypal': | |
| 230 | + $response = FrmPayPalLiteConnectHelper::refund_payment( $payment->receipt_id ); | |
| 231 | + | |
| 232 | + // Check for structured error response with message and debug_id | |
| 233 | + if ( is_object( $response ) && isset( $response->message ) && isset( $response->debug_id ) ) { | |
| 234 | + $refunded = false; | |
| 235 | + $reason = $response->message; | |
| 236 | + $debug_id = $response->debug_id; | |
| 237 | + } elseif ( false === $response ) { | |
| 238 | + $refunded = false; | |
| 239 | + $reason = self::get_paypal_refund_reason(); | |
| 240 | + $debug_id = FrmPayPalLiteConnectHelper::get_latest_debug_id_from_paypal_api(); | |
| 241 | + } elseif ( is_object( $response ) && isset( $response->refund_error ) ) { | |
| 242 | + // Handle mock error responses from PayPal API | |
| 243 | + $refunded = false; | |
| 244 | + $reason = $response->message ?? ''; | |
| 245 | + $debug_id = $response->debug_id ?? ''; | |
| 246 | + } else { | |
| 247 | + $refunded = true; | |
| 248 | + } | |
| 249 | + | |
| 250 | + break; | |
| 219 | 251 | default: |
| 220 | 252 | $refunded = false; |
| 221 | 253 | break; |
| 222 | - } | |
| 254 | + }//end switch | |
| 223 | 255 | |
| 224 | 256 | if ( $refunded ) { |
| 225 | 257 | self::change_payment_status( $payment, 'refunded' ); |
| 226 | 258 | $message = __( 'Refunded', 'formidable' ); |
| 259 | + // phpcs:ignore Universal.ControlStructures.DisallowLonelyIf.Found | |
| 227 | 260 | } else { |
| 228 | - $message = __( 'Failed', 'formidable' ); | |
| 261 | + // If the reason is already a complete error message, use it directly | |
| 262 | + // instead of wrapping it redundantly in "Refund Failed (...)" | |
| 263 | + if ( $reason && ! preg_match( '/^[A-Z_]+$/', $reason ) ) { | |
| 264 | + $message = $reason; | |
| 265 | + } else { | |
| 266 | + $message = __( 'Refund Failed', 'formidable' ); | |
| 267 | + | |
| 268 | + if ( $reason ) { | |
| 269 | + $message .= ' (' . $reason . ')'; | |
| 270 | + } | |
| 271 | + } | |
| 229 | 272 | } |
| 230 | 273 | |
| 231 | - wp_die( esc_html( $message ) ); | |
| 274 | + if ( $debug_id ) { | |
| 275 | + $message .= '<br><br>Debug ID: ' . esc_html( $debug_id ); | |
| 276 | + } | |
| 277 | + | |
| 278 | + wp_die( | |
| 279 | + sprintf( | |
| 280 | + '<div class="%1$s">%2$s</div>', | |
| 281 | + $refunded ? 'frm_updated_message' : 'frm_error_style', | |
| 282 | + wp_kses_post( $message ) | |
| 283 | + ) | |
| 284 | + ); | |
| 232 | 285 | } |
| 233 | 286 | |
| 234 | 287 | /** |
| 288 | + * Get a human-friendly reason from the latest PayPal refund error. | |
| 289 | + * | |
| 290 | + * Handles both uppercase issue codes (e.g. REFUND_FAILED_INSUFFICIENT_FUNDS) | |
| 291 | + * and human-friendly description strings from the PayPal API. | |
| 292 | + * Strips the {{debug_id:...}} token if present. | |
| 293 | + * | |
| 294 | + * @since 6.31 | |
| 295 | + * | |
| 296 | + * @return string | |
| 297 | + */ | |
| 298 | + private static function get_paypal_refund_reason() { | |
| 299 | + $error = FrmPayPalLiteConnectHelper::get_latest_error_from_paypal_api(); | |
| 300 | + | |
| 301 | + if ( ! $error ) { | |
| 302 | + return ''; | |
| 303 | + } | |
| 304 | + | |
| 305 | + $error = preg_replace( '/\{\{debug_id:[^}]+\}\}/', '', $error ); | |
| 306 | + $error = trim( $error ); | |
| 307 | + | |
| 308 | + if ( preg_match( '/^[A-Z_]+$/', $error ) ) { | |
| 309 | + return self::convert_uppercase_underscores_to_ucwords( $error, array( 'REFUND_FAILED_', 'REFUND_' ) ); | |
| 310 | + } | |
| 311 | + | |
| 312 | + return $error; | |
| 313 | + } | |
| 314 | + | |
| 315 | + /** | |
| 316 | + * @param string $error The uppercase underscored string to convert. | |
| 317 | + * @param array $prefixes_to_strip Prefixes to remove before converting. | |
| 318 | + * | |
| 319 | + * @return string | |
| 320 | + */ | |
| 321 | + private static function convert_uppercase_underscores_to_ucwords( $error, $prefixes_to_strip = array() ) { | |
| 322 | + if ( ! preg_match( '/^[A-Z_]+$/', $error ) ) { | |
| 323 | + return ''; | |
| 324 | + } | |
| 325 | + | |
| 326 | + $reason = str_replace( $prefixes_to_strip, '', $error ); | |
| 327 | + return ucwords( strtolower( str_replace( '_', ' ', $reason ) ) ); | |
| 328 | + } | |
| 329 | + | |
| 330 | + /** | |
| 235 | 331 | * Update the status of a payment. |
| 236 | 332 | * |
| 237 | 333 | * @param object $payment |
| 238 | 334 | * @param string $status |
| @@ -247,6 +343,20 @@ | ||
| 247 | 343 | |
| 248 | 344 | $frm_payment = new FrmTransLitePayment(); |
| 249 | 345 | $frm_payment->update( $payment->id, array( 'status' => $status ) ); |
| 250 | 346 | FrmTransLiteActionsController::trigger_payment_status_change( compact( 'status', 'payment' ) ); |
| 347 | + } | |
| 348 | + | |
| 349 | + /** | |
| 350 | + * @since 6.31 | |
| 351 | + * | |
| 352 | + * @param array|string $expected_gateways | |
| 353 | + * @param array|string $selected_gateways | |
| 354 | + * | |
| 355 | + * @return void | |
| 356 | + */ | |
| 357 | + public static function maybe_hide_payment_setting( $expected_gateways, $selected_gateways ) { | |
| 358 | + if ( ! array_intersect( (array) $expected_gateways, (array) $selected_gateways ) ) { | |
| 359 | + echo ' frm_hidden'; | |
| 360 | + } | |
| 251 | 361 | } |
| 252 | 362 | } |