← All changes
|
square/controllers/FrmSquareLiteActionsController.php
+2
-12
6.28
→
trunk
View file →
| @@ -115,9 +115,9 @@ | ||
| 115 | 115 | return $response; |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | if ( ! self::square_is_configured() ) { |
| 119 | - $response['error'] = __( 'There was a problem communicating with Square. Please try again.', 'formidable' ); | |
| 119 | + $response['error'] = __( 'Square still needs to be configured.', 'formidable' ); | |
| 120 | 120 | return $response; |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | $payment_args = compact( 'form', 'entry', 'action', 'amount' ); |
| @@ -693,19 +693,9 @@ | ||
| 693 | 693 | if ( ! $has_processed ) { |
| 694 | 694 | return $errors; |
| 695 | 695 | } |
| 696 | 696 | |
| 697 | - $field_id = $field->temp_id ?? $field->id; | |
| 698 | - | |
| 699 | - if ( isset( $errors[ 'field' . $field_id . '-cc' ] ) ) { | |
| 700 | - unset( $errors[ 'field' . $field_id . '-cc' ] ); | |
| 701 | - } | |
| 702 | - | |
| 703 | - if ( isset( $errors[ 'field' . $field_id ] ) ) { | |
| 704 | - unset( $errors[ 'field' . $field_id ] ); | |
| 705 | - } | |
| 706 | - | |
| 707 | - return $errors; | |
| 697 | + return FrmTransLiteActionsController::remove_cc_errors( $errors, $field ); | |
| 708 | 698 | } |
| 709 | 699 | |
| 710 | 700 | /** |
| 711 | 701 | * @return void |