Context Navigation

← Previous Changeset
Next Changeset →

Changeset 2989450

Timestamp:

11/05/2023 09:47:02 PM (2 years ago)

Author:

bluempaymentservices

Message:

1.3.17.12: Stability fixes and improvements.

Location:

bluem

Files:

: 1330 added
: 20 edited

Legend:

: Unmodified
: Added
: Removed

bluem/trunk/README.md

-                      r2975761
+                      r2989450
 bluem_is_ajax=true
 ```
+Also, add a checkbox with the name 'bluem_mandate_approve'. This will give the user-permission to perform the mandate request.
+Otherwise, the form will be submitted but our mandate request wouldn't be executed. U can mark the checkbox within ContactForm 7 as required to always force the mandate request after form submission.
 ## Gravity Forms
 To activate our Gravity Forms integration, you have to add some hidden fields to the form to activate the flow.
 ```
+```php
 bluem_mandate=true
 bluem_mandate_reason="Lidmaatschap"
 …
 bluem_is_ajax=true
 ```
+Also, add a checkbox with the name 'bluem_mandate_approve' (under 'Advanced' section, after enabling dynamic entries) and a label with the value 'true'. This will give the permission to perform the mandate request.
+Also, if you want to store transaction details, you have to name the fields with the following names:
+Also, add a checkbox with the name 'bluem_mandate_approve' (under 'Advanced' section, after enabling dynamic entries) and a label with the value 'true'. This will give the user-permission to perform the mandate request.
+Otherwise, the form will be submitted but our mandate request wouldn't be executed. U can mark the checkbox within Gravity Forms as required to always force the mandate request after form submission.
+Also, if you want to store additional transaction details, add hidden fields with the following field names.
+Our plug-in will fill these fields so that they are saved with the other form data.
+The transaction and details are always visible through our plug-in page.
 ```php
 bluem_mandate_accountname = Name of the accountholder

bluem/trunk/bluem-db.php

-                      r2975761
+                      r2989450
             $record_id = $result[0]->id;
+            $new_object = [];
             if ( $decoded_data !== null ) {
-                $new_object = [];
                 // Loop through current data
                 foreach ($decoded_data as $key => $value) {
                     $new_object[$key] = $value;
+                }
-                // Loop through new data
-                foreach ($object as $key => $value) {
-                    $new_object[$key] = $value; // Overwrite if key exists
+                }
-                return bluem_db_update_storage($record_id, [
-                    'data' => json_encode( $new_object ),
-                ]);
+            }
+            // Loop through new data
+            foreach ($object as $key => $value) {
+                $new_object[$key] = $value; // Overwrite if key exists
+            }
+            return bluem_db_update_storage($record_id, [
+                'data' => json_encode( $new_object ),
+            ]);
+        }
+    }

bluem/trunk/bluem-idin.php

-                      r2981398
+                      r2989450
             $validation_text = "";
             if ( get_user_meta( $current_user->ID, 'bluem_idin_validated', true ) ) {
                 $validation_text = __( 'ja', 'bluem' );
+                $validation_text = __( 'yes', 'bluem' );
                 // $validation_text .= " (Transactie ". get_user_meta($current_user->ID, 'bluem_idin_transaction_id', true).")";
             } else {
                 $validation_text = __( 'ja, als gastgebruiker', 'bluem' );
+                $validation_text = __( 'yes, as a guest user', 'bluem' );
+            }
+        }
         $fields['bluem_idin_validated'] = [
             'label' => __( 'Identiteit geverifieerd', 'bluem' ),
+            'label' => __( 'Identity verified', 'bluem' ),
             'value' => $validation_text
         ];
 …
                 $fields['bluem_idin_address'] = [
                     'label' => __( 'Adres uit verificatie', 'bluem' ),
+                    'label' => __( 'Address from verification', 'bluem' ),
                     'value' => $address_text
                 ];
             } else {
                 $fields['bluem_idin_address'] = [
                     'label' => __( 'Adres uit verificatie', 'bluem' ),
                     'value' => "Onbekend"
+                    'label' => __( 'Address from verification', 'bluem' ),
+                    'value' => __( 'Unknown', 'bluem' )
                 ];
+            }
 …
             $fields['bluem_idin_name'] = [
                 'label' => __( 'Naam uit verificatie', 'bluem' ),
+                'label' => __( 'Name from verification', 'bluem' ),
                 'value' => $name_text
             ];
         } else {
             $fields['bluem_idin_name'] = [
                 'label' => __( 'Naam uit verificatie', 'bluem' ),
                 'value' => "Onbekend"
+                'label' => __( 'Name from verification', 'bluem' ),
+                'value' => __( 'Unknown', 'bluem' )
             ];
+        }
 …
             $fields['bluem_idin_birthdate'] = [
                 'label' => __( 'Geboortedatum uit verificatie', 'bluem' ),
+                'label' => __( 'Date of birth from verification', 'bluem' ),
                 'value' => $birthdate_text
             ];
         } else {
             $fields['bluem_idin_birthdate'] = [
                 'label' => __( 'Geboortedatum uit verificatie', 'bluem' ),
                 'value' => "Onbekend"
+                'label' => __( 'Date of birth from verification', 'bluem' ),
+                'value' => __( 'Unknown', 'bluem' )
             ];
+        }

bluem/trunk/bluem-integrations.php

-                      r2975761
+                      r2989450
 /**
  * ContactForm 7 integration.
+ *
+ *
  * Javascript code in footer.
  */
 …
 /**
  * Gravity Forms integration.
+ *
+ *
  * Javascript code in footer.
  */
 …
                 );
-                // Save the necessary data to later request more information and refer to this transaction
-                bluem_db_insert_storage([
-                    'bluem_integration_wpcf7_form_id' => $contact_form_id,
-                    'bluem_mandate_transaction_id' => $request->mandateID,
-                    'bluem_mandate_entrance_code' => $request->entranceCode,
-                ]);
                 // Actually perform the request.
                 try {
 …
                         if ( isset( $response->EMandateTransactionResponse->Error->ErrorMessage ) ) {
                             $msg .= "<br>" .
                                     $response->EMandateTransactionResponse->Error->ErrorMessage;
+                                $response->EMandateTransactionResponse->Error->ErrorMessage;
                         } elseif ( get_class( $response ) == "Bluem\BluemPHP\ErrorBluemResponse" ) {
                             $msg .= "<br>" .
                                     $response->Error();
+                                $response->Error();
                         } else {
                             $msg .= "<br>Algemene fout";
 …
                         'bluem_mandate_transaction_id' => $mandate_id,
                         'bluem_mandate_transaction_url' => $transactionURL,
+                        'bluem_integration_wpcf7_form_id' => $contact_form_id,
+                        'bluem_mandate_entrance_code' => $request->entranceCode,
                     ]);
 …
     $bluem_mandate_approve = $contact_form->pref( 'bluem_mandate_approve' );
     $bluem_mandate_reason = $contact_form->pref( 'bluem_mandate_reason' );
     /**
      * TODO: Add to request.
 …
                 );
-                // Save the necessary data to later request more information and refer to this transaction
-                bluem_db_insert_storage([
-                    'bluem_integration_wpcf7_form_id' => $contact_form_id,
-                    'bluem_mandate_transaction_id' => $request->mandateID,
-                    'bluem_mandate_entrance_code' => $request->entranceCode,
-                ]);
                 // Actually perform the request.
                 try {
 …
                         if ( isset( $response->EMandateTransactionResponse->Error->ErrorMessage ) ) {
                             $msg .= "<br>" .
                                     $response->EMandateTransactionResponse->Error->ErrorMessage;
+                                $response->EMandateTransactionResponse->Error->ErrorMessage;
                         } elseif ( get_class( $response ) == "Bluem\BluemPHP\ErrorBluemResponse" ) {
                             $msg .= "<br>" .
                                     $response->Error();
+                                $response->Error();
                         } else {
                             $msg .= "<br>Algemene fout";
 …
                         'bluem_mandate_transaction_id' => $mandate_id,
                         'bluem_mandate_transaction_url' => $transactionURL,
+                        'bluem_integration_wpcf7_form_id' => $contact_form_id,
+                        'bluem_mandate_entrance_code' => $request->entranceCode,
                     ]);
 …
+        }
+    }
     // Get custom parameters for this form
     $bluem_mandate = $form_data['bluem_mandate'];
 …
     $bluem_mandate_reason = $form_data['bluem_mandate_reason'];
     $bluem_mandate_type = $form_data['bluem_mandate_type'];
     $bluem_is_ajax = $form_data['bluem_is_ajax'];
 …
                 );
-                // Save the necessary data to later request more information and refer to this transaction
-                bluem_db_insert_storage([
-                    'bluem_integration_gform_form_id' => $payload['form_id'],
-                    'bluem_integration_gform_entry_id' => $payload['entry_id'],
-                    'bluem_mandate_transaction_id' => $request->mandateID,
-                    'bluem_mandate_entrance_code' => $request->entranceCode,
-                ]);
                 // Actually perform the request.
                 try {
 …
                         if ( isset( $response->EMandateTransactionResponse->Error->ErrorMessage ) ) {
                             $msg .= "<br>" .
                                     $response->EMandateTransactionResponse->Error->ErrorMessage;
+                                $response->EMandateTransactionResponse->Error->ErrorMessage;
                         } elseif ( get_class( $response ) == "Bluem\BluemPHP\ErrorBluemResponse" ) {
                             $msg .= "<br>" .
                                     $response->Error();
+                                $response->Error();
                         } else {
                             $msg .= "<br>Algemene fout";
 …
                         'bluem_mandate_transaction_id' => $mandate_id,
                         'bluem_mandate_transaction_url' => $transactionURL,
+                        'bluem_integration_gform_form_id' => $payload['form_id'],
+                        'bluem_integration_gform_entry_id' => $payload['entry_id'],
+                        'bluem_mandate_entrance_code' => $request->entranceCode,
                     ]);
 …
              */
             $entry = GFAPI::get_entry( $entryID );
             // Get the form instance
             $form = GFAPI::get_form( $formID );
 …
          */
         $entry = GFAPI::get_entry( $entry_id );
         // Get the form instance
         $form = GFAPI::get_form( $entry['form_id'] );

bluem/trunk/bluem-interface.php

r2959619	r2989450
24	24	function bluem_render_request_table( $requests, $users_by_id = [] ) {
25	25	if ( count( $requests ) == 0 ) {
26		echo "<p>" . __( "No~~g geen transacties~~", 'bluem' ) . "</p>";
	26	echo "<p>" . __( "No transactions yet", 'bluem' ) . "</p>";
27	27
28	28	return;

bluem/trunk/bluem-mandates-instant.php

-                      r2975761
+                      r2989450
             );
-            // Save the necessary data to later request more information and refer to this transaction
-            bluem_db_insert_storage([
-                'bluem_mandate_transaction_id' => $request->mandateID,
-                'bluem_mandate_entrance_code' => $request->entranceCode,
-            ]);
             // Actually perform the request.
             try {
 …
                     if ( isset( $response->EMandateTransactionResponse->Error->ErrorMessage ) ) {
                         $msg .= "<br>" .
                                 $response->EMandateTransactionResponse->Error->ErrorMessage;
+                            $response->EMandateTransactionResponse->Error->ErrorMessage;
                     } elseif ( get_class( $response ) == "Bluem\BluemPHP\ErrorBluemResponse" ) {
                         $msg .= "<br>" .
                                 $response->Error();
+                            $response->Error();
                     } else {
                         $msg .= "<br>Algemene fout";
 …
                     'bluem_mandate_transaction_id' => $mandate_id,
                     'bluem_mandate_transaction_url' => $transactionURL,
+                    'bluem_mandate_entrance_code' => $request->entranceCode,
                 ]);

bluem/trunk/bluem.php

-                      r2981419
+                      r2989450
 /**
  * Plugin Name: Bluem ePayments, iDIN and eMandates integration for shortcodes and WooCommerce checkout
  * Version: 1.3.17.11
+ * Version: 1.3.17.12
  * Plugin URI: https://wordpress.org/plugins/bluem
  * Description: Bluem integration for WordPress and WooCommerce to facilitate Bluem services inside your site. Payments and eMandates payment gateway and iDIN identity verification
 …
+ *
  * Text Domain: bluem
- * Domain Path: /lang/
+ *
  * @package WordPress
 …
     // Retrieve the version constraint of the specified dependency
     $version_constraint = reset($package_entry)['version'];
     return $version_constraint;
+}
 …
                     $new_data['report'] = $identityReport;
                     if ( count( $new_data ) > 0 ) {
                         bluem_db_put_request_payload(
 …
             $statusUpdateObject = $response->EMandateStatusUpdate;
             $statusCode = $statusUpdateObject->EMandateStatus->Status . "";
+            $statusCode = $statusUpdateObject->EMandateStatus->Status . "";
             /**
 …
             if ( $statusCode === "Success" ) {
                 if ( !empty ( $order ) ) {
                     $order->update_status( 'processing', __( 'Machtiging is binnengekomen', 'wc-gateway-bluem' ) );
                     $order->add_order_note( __( "Betalingsproces voltooid" ) );
+                    $order->update_status( 'processing', __( 'Authorization has been received', 'bluem' ) );
+                    $order->add_order_note( __( "Payment process completed", 'bluem' ) );
+                }
                 if ( !empty( $request->id ) ) {
                     $new_data = [];
                     if ( isset( $response->EMandateStatusUpdate->EMandateStatus->PurchaseID ) ) {
                         $new_data['purchaseID'] = $response->EMandateStatusUpdate->EMandateStatus->PurchaseID;
+                    }
                     if ( isset( $response->EMandateStatusUpdate->EMandateStatus->AcceptanceReport ) ) {
                         $new_data['report'] = $response->EMandateStatusUpdate->EMandateStatus->AcceptanceReport;
+                    }
                     if ( count( $new_data ) > 0 ) {
                         bluem_db_put_request_payload(
 …
             } elseif ( $statusCode === "Cancelled" ) {
                 if ( !empty ( $order ) ) {
                     $order->update_status( 'cancelled', __( 'Machtiging is geannuleerd', 'wc-gateway-bluem' ) );
+                    $order->update_status( 'cancelled', __( 'Authorization has been canceled', 'bluem' ) );
+                }
             } elseif ( $statusCode === "Open" ) {
 …
             } elseif ( $statusCode === "Expired" ) {
                 if ( !empty ( $order ) ) {
                     $order->update_status( 'failed', __( 'Machtiging is verlopen', 'wc-gateway-bluem' ) );
+                    $order->update_status( 'failed', __( 'Authorization has expired', 'bluem' ) );
+                }
             } elseif ( $statusCode === "New" ) {
 …
             } else {
                 if ( !empty ( $order ) ) {
                     $order->update_status( 'failed', __( 'Machtiging is gefaald: fout of onbekende status', 'wc-gateway-bluem' ) );
+                    $order->update_status( 'failed', __( 'Authorization failed: error or unknown status', 'bluem' ) );
+                }
+            }
 …
             $statusUpdateObject = $response->PaymentStatusUpdate;
             $statusCode = $statusUpdateObject->Status . "";
+            $statusCode = $statusUpdateObject->Status . "";
             /**
 …
             if ( $statusCode === "Success" ) {
                 if ( !empty ( $order ) ) {
                     $order->update_status( 'processing', __( 'Betaling is binnengekomen', 'wc-gateway-bluem' ) );
                     $order->add_order_note( __( "Betalingsproces voltooid" ) );
+                    $order->update_status( 'processing', __( 'Betaling is binnengekomen', 'bluem' ) );
+                    $order->add_order_note( __( "Betalingsproces voltooid", 'bluem' ) );
+                }
             } elseif ( $statusCode === "Pending" ) {
 …
             } elseif ( $statusCode === "Cancelled" ) {
                 if ( !empty ( $order ) ) {
                     $order->update_status( 'cancelled', __( 'Betaling is geannuleerd', 'wc-gateway-bluem' ) );
+                    $order->update_status( 'cancelled', __( 'Betaling is geannuleerd', 'bluem' ) );
+                }
             } elseif ( $statusCode === "Open" ) {
 …
             } elseif ( $statusCode === "Expired" ) {
                 if ( !empty ( $order ) ) {
                     $order->update_status( 'failed', __( 'Betaling is verlopen', 'wc-gateway-bluem' ) );
+                    $order->update_status( 'failed', __( 'Betaling is verlopen', 'bluem' ) );
+                }
             } elseif ( $statusCode === "New" ) {
 …
             } else {
                 if ( !empty ( $order ) ) {
                     $order->update_status( 'failed', __( 'Betaling is gefaald: fout of onbekende status', 'wc-gateway-bluem' ) );
+                    $order->update_status( 'failed', __( 'Betaling is gefaald: fout of onbekende status', 'bluem' ) );
+                }
+            }
 …
         add_settings_section(
             'bluem_woocommerce_modules_section',
             _( 'Beheer onderdelen van deze plug-in' ),
+            _( 'Manage components of this plugin', 'bluem' ),
             'bluem_woocommerce_modules_settings_section',
             'bluem_woocommerce'
 …
         add_settings_field(
             "mandates_enabled",
             _( "Mandates actief" ),
+            _( "eMandates active", 'bluem' ),
             "bluem_woocommerce_modules_render_mandates_activation",
             "bluem_woocommerce",
 …
         add_settings_field(
             "payments_enabled",
             _( "ePayments actief" ),
+            _( "ePayments active", 'bluem' ),
             "bluem_woocommerce_modules_render_payments_activation",
             "bluem_woocommerce",
 …
         add_settings_field(
             "idin_enabled",
             _( "iDIN actief" ),
+            _( "iDIN active", 'bluem' ),
             "bluem_woocommerce_modules_render_idin_activation",
             "bluem_woocommerce",
 …
         add_settings_field(
             "suppress_warning",
             _( "In admin omgeving waarschuwen als plugin nog niet goed is ingesteld" ),
+            _( "Warn in admin environment if plugin has not yet been set up properly", 'bluem' ),
             "bluem_woocommerce_modules_render_suppress_warning",
             "bluem_woocommerce",
 …
         add_settings_section(
             'bluem_woocommerce_general_section',
             '<span class="dashicons dashicons-admin-settings"></span> Algemene instellingen',
+            '<span class="dashicons dashicons-admin-settings"></span> ' . _( "General settings", 'bluem' ),
             'bluem_woocommerce_general_settings_section',
             'bluem_woocommerce'
 …
         add_settings_section(
             'bluem_woocommerce_mandates_section',
             '<span class="dashicons dashicons-money"></span> Digitale Incassomachtiging instellingen',
+            '<span class="dashicons dashicons-money"></span> ' . _( "eMandates settings", 'bluem' ),
             'bluem_woocommerce_mandates_settings_section',
             'bluem_woocommerce'
 …
         add_settings_section(
             'bluem_woocommerce_payments_section',
             '<span class="dashicons dashicons-money-alt"></span> ePayments payments instellingen',
+            '<span class="dashicons dashicons-money-alt"></span> ' . _( "ePayments settings", 'bluem' ),
             'bluem_woocommerce_payments_settings_section',
             'bluem_woocommerce'
 …
         add_settings_section(
             'bluem_woocommerce_idin_section',
             '<span class="dashicons dashicons-admin-users"></span> iDIN instellingen',
+            '<span class="dashicons dashicons-admin-users"></span> ' . _( "eIdentity settings", 'bluem' ),
             'bluem_woocommerce_idin_settings_section',
             'bluem_woocommerce'
 …
     add_settings_section(
         'bluem_woocommerce_integrations_section',
         '<span class="dashicons dashicons-admin-plugins"></span> Integratie instellingen',
+        '<span class="dashicons dashicons-admin-plugins"></span> ' . _( "integration settings", 'bluem' ),
         'bluem_woocommerce_integrations_settings_section',
         'bluem_woocommerce'
 …
     $user = wp_get_current_user();
     // Check if user is administrator
     if (in_array('administrator', $user->roles)) {
 …
+}
+// Only executed on admin pages and AJAX requests.
 add_action( 'admin_init', 'bluem_woocommerce_register_settings' );
+function bluem_woocommerce_init() {
+    /**
+     * Create session storage.
+     */
+    bluem_db_insert_storage([
+        'bluem_storage_init' => true,
+    ]);
+}
+// Always executed while plug-in is activated
+add_action( 'init', 'bluem_woocommerce_init' );
 add_action( 'show_user_profile', 'bluem_woocommerce_show_general_profile_fields', 1 );
 …
                 ?>
                 <option
                     value="<?php echo $option_value; ?>" <?php if ( isset( $values[ $key ] ) && $values[ $key ] !== "" && $option_value == $values[ $key ] ) {
+                        value="<?php echo $option_value; ?>" <?php if ( isset( $values[ $key ] ) && $values[ $key ] !== "" && $option_value == $values[ $key ] ) {
                     echo "selected='selected'";
                 } ?>><?php echo $option_name; ?></option>
 …
 function bluem_woocommerce_register_age_verification_attribute() {
     $args = array(
       'name'         => 'Age verification',
       'slug'         => 'age_verification',
       'type'         => 'select',
       'order_by'     => 'menu_order',
       'has_archives' => true,
+        'name'         => 'Age verification',
+        'slug'         => 'age_verification',
+        'type'         => 'select',
+        'order_by'     => 'menu_order',
+        'has_archives' => true,
     );
     register_taxonomy( 'pa_age_verification', 'product', $args );
 …
     echo '<div class="options_group">';
     // Custom Attribute Field
     woocommerce_wp_select( array(
         'id' => 'age_verification',
         'label' => __('Age verification', 'bluem-woocommerce'),
+        'label' => __('Age verification', 'bluem'),
         'placeholder' => '',
         'options' => array(
             'enable' => __('Enable', 'bluem-woocommerce'),
             'disable' => __('Disable', 'bluem-woocommerce'),
+            'enable' => __('Enable', 'bluem'),
+            'disable' => __('Disable', 'bluem'),
         ),
         'value' => $age_verification_value,
     ));
     echo '</div>';
+}
 …
         return;
+    }
     if ( isset( $_POST['age_verification'] ) ) {
         $attribute_value = isset($_POST['age_verification']) ? sanitize_text_field($_POST['age_verification']) : '';
 …
     if ( ! isset( $settings['error_reporting_email'] )
          || $settings['error_reporting_email'] == 1
+        || $settings['error_reporting_email'] == 1
     ) {
         if ( $debug ) {
 …
     $bluem_options = get_option( 'bluem_woocommerce_options' );
     $bluem_registration = get_option( 'bluem_woocommerce_registration' );
 …
     $data->{'Tech telephone'} = $bluem_registration['tech_contact']['telephone'];
     $data->{'Tech email'} = $bluem_registration['tech_contact']['email'];
     $data->{'WooCommerce version'} = class_exists('WooCommerce') ? WC()->version : __('WooCommerce niet geinstalleerd.', 'bluem-woocommerce');
+    $data->{'WooCommerce version'} = class_exists('WooCommerce') ? WC()->version : __('WooCommerce not installed', 'bluem');
     $data->{'WordPress version'} = get_bloginfo( 'version' );
     $data->{'Bluem PHP-library'} = $dependency_bluem_php_version;
 …
     if ( ! isset( $settings['transaction_notification_email'] )
          || $settings['transaction_notification_email'] == 1
+        || $settings['transaction_notification_email'] == 1
     ) {
         if ( $debug ) {
 …
+    }
     if ( $bluem_options !== false
          && ! isset( $bluem_options["{$module}_enabled"] )
          || $bluem_options["{$module}_enabled"] == "1"
+        && ! isset( $bluem_options["{$module}_enabled"] )
+        || $bluem_options["{$module}_enabled"] == "1"
     ) {
         return true;
 …
         $messages    = [];
         if ( ! array_key_exists( 'senderID', $options )
              || $options['senderID'] === ""
+            || $options['senderID'] === ""
         ) {
             $messages[]  = "SenderID ontbreekt";
 …
+        }
         if ( ! array_key_exists( 'test_accessToken', $options )
              || $options['test_accessToken'] === ""
+            || $options['test_accessToken'] === ""
         ) {
             $messages[]  = "Test accessToken ontbreekt";
 …
         if ( isset( $options['environment'] )
              && $options['environment'] == "prod"
              && (
                  ! array_key_exists( 'production_accessToken', $options )
                  || $options['production_accessToken'] === ""
+             )
+            && $options['environment'] == "prod"
+            && (
+                ! array_key_exists( 'production_accessToken', $options )
+                || $options['production_accessToken'] === ""
+            )
         ) {
             $messages[]  = "Production accessToken ontbreekt";
 …
         if ( bluem_module_enabled( 'mandates' )
              && (
                  ! array_key_exists( 'brandID', $options )
                  || $options['brandID'] === ""
+             )
+            && (
+                ! array_key_exists( 'brandID', $options )
+                || $options['brandID'] === ""
+            )
         ) {
             $messages[]  = "eMandates brandID ontbreekt";
 …
         if ( bluem_module_enabled( 'mandates' )
              && (
                  ! array_key_exists( 'merchantID', $options )
                  || $options['merchantID'] === ""
+             )
+            && (
+                ! array_key_exists( 'merchantID', $options )
+                || $options['merchantID'] === ""
+            )
         ) {
             $messages[]  = "eMandates merchantID ontbreekt";
 …
         if ( bluem_module_enabled( 'idin' )
              && ( ! array_key_exists( 'IDINBrandID', $options )
                   || $options['IDINBrandID'] === "" )
+            && ( ! array_key_exists( 'IDINBrandID', $options )
+                || $options['IDINBrandID'] === "" )
         ) {
             $messages[]  = "iDIN BrandID ontbreekt";
 …
     add_meta_box(
         'bluem_order_requests_metabox_content',
+        __(
+            'Bluem request(s)',
+            'bluem'
+        ),
+        __('Bluem request(s)', 'bluem'),
         'bluem_order_requests_metabox_content',
         'shop_order',
 …
     margin:40pt auto; padding:10pt 20pt; border:1px solid #eee;
     background:#fff; max-width:500px;'>" .
            bluem_get_bluem_logo_html( 48 );
+        bluem_get_bluem_logo_html( 48 );
+}
 …
 function bluem_dialogs_get_simple_footer( bool $include_link = true ): string {
     return (
            $include_link ?
                "<p><a href='" . home_url() . "' target='_self' style='text-decoration:none;'>Ga terug naar de webshop</a></p>" :
                ""
            ) . "</div></body></html>";
+        $include_link ?
+            "<p><a href='" . home_url() . "' target='_self' style='text-decoration:none;'>Ga terug naar de webshop</a></p>" :
+            ""
+        ) . "</div></body></html>";
+}

bluem/trunk/composer.lock

r2981398	r2989450
4338	4338	},
4339	4339	"platform-dev": [],
4340		"plugin-api-version": "2.3.0"
	4340	"plugin-api-version": "2.6.0"
4341	4341	}

bluem/trunk/gateways/Bluem_Bank_Based_Payment_Gateway.php

-                      r2981398
+                      r2989450
         // Possible statuses: 'pending', 'processing', 'on-hold', 'completed', 'refunded, 'failed', 'cancelled',
         $order->update_status( 'pending', __( 'Awaiting Bluem Payment Signature', 'wc-gateway-bluem' ) );
+        $order->update_status( 'pending', __( 'Awaiting Bluem Payment Signature', 'bluem' ) );
         if ( isset( $response->PaymentTransactionResponse->TransactionURL ) ) {
             $order->add_order_note( __( "Betalingsproces geïnitieerd" ) );
+            $order->add_order_note( __( "Betalingsproces geïnitieerd", 'bluem' ) );
             $transactionID = "" . $response->PaymentTransactionResponse->TransactionID;
 …
                         // order is already marked as processing, nothing more is necessary
                     } else if ( $order_status === "pending" ) {
                         $order->update_status( 'processing', __( 'Betaling is gelukt en goedgekeurd; via webhook', 'wc-gateway-bluem' ) );
+                        $order->update_status( 'processing', __( 'Betaling is gelukt en goedgekeurd; via webhook', 'bluem' ) );
+                    }
                 } elseif ( $webhook_status === "Cancelled" ) {
                     $order->update_status('cancelled', __('Betaling is geannuleerd; via webhook', 'wc-gateway-bluem'));
+                    $order->update_status('cancelled', __('Betaling is geannuleerd; via webhook', 'bluem'));
                 } elseif ( $webhook_status === "Open" || $webhook_status == "Pending" ) {
                     // if the webhook is still open or pending, nothing has to be done yet
                 } elseif ( $webhook_status === "Expired" ) {
                     $order->update_status( 'failed', __( 'Betaling is verlopen; via webhook', 'wc-gateway-bluem' ) );
+                    $order->update_status( 'failed', __( 'Betaling is verlopen; via webhook', 'bluem' ) );
                 } else {
                     $order->update_status( 'failed', __( 'Betaling is gefaald: fout of onbekende status; via webhook', 'wc-gateway-bluem' ) );
+                    $order->update_status( 'failed', __( 'Betaling is gefaald: fout of onbekende status; via webhook', 'bluem' ) );
+                }
                 http_response_code(200);
 …
         if ( $statusCode === self::PAYMENT_STATUS_SUCCESS ) {
             $order->update_status( 'processing', __( 'Betaling is binnengekomen', 'wc-gateway-bluem' ) );
             $order->add_order_note( __( "Betalingsproces voltooid" ) );
+            $order->update_status( 'processing', __( 'Payment has been received', 'bluem' ) );
+            $order->add_order_note( __( "Payment process completed", 'bluem' ) );
             bluem_transaction_notification_email(
 …
             $this->thank_you_page( $order->get_id() );
         } elseif ( $statusCode === self::PAYMENT_STATUS_FAILURE ) {
             $order->update_status( 'failed', __( 'Betaling is verlopen', 'wc-gateway-bluem' ) );
             $order->add_order_note( __( "Betalingsproces niet voltooid" ) );
+            $order->update_status( 'failed', __( 'Payment has expired', 'bluem' ) );
+            $order->add_order_note( __( "Payment process not completed", 'bluem' ) );
             bluem_transaction_notification_email(
                 $request_from_db->id
 …
             exit;
         } elseif ( $statusCode === "Cancelled" ) {
             $order->update_status( 'cancelled', __( 'Betaling is geannuleerd', 'wc-gateway-bluem' ) );
+            $order->update_status( 'cancelled', __( 'Payment has been canceled', 'bluem' ) );
 …
             exit;
         } elseif ( $statusCode === "Expired" ) {
             $order->update_status( 'failed', __( 'Betaling is verlopen', 'wc-gateway-bluem' ) );
+            $order->update_status( 'failed', __( 'Payment has expired', 'bluem' ) );
             bluem_transaction_notification_email(
                 $request_from_db->id
 …
             exit;
         } else {
             $order->update_status( 'failed', __( 'Betaling is gefaald: fout of onbekende status', 'wc-gateway-bluem' ) );
+            $order->update_status( 'failed', __( 'Payment failed: error or unknown status', 'bluem' ) );
             bluem_transaction_notification_email(
                 $request_from_db->id

bluem/trunk/gateways/Bluem_CarteBancaire_Payment_Gateway.php

-                      r2841693
+                      r2989450
         parent::__construct(
             'bluem_payments_cartebancaire',
             __('Bluem betalingen via Carte Bancaire'),
             __('Betaal gemakkelijk, snel en veilig via Carte Bancaire')
+            __('Bluem payments via Carte Bancaire', 'bluem'),
+            __('Pay easily, quickly and safely via Carte Bancaire', 'bluem')
         );

bluem/trunk/gateways/Bluem_Creditcard_Payment_Gateway.php

-                      r2824418
+                      r2989450
         parent::__construct(
             'bluem_payments_creditcard',
             __('Bluem betalingen via Credit Card'),
             __('Betaal gemakkelijk, snel en veilig via Credit Card'),
+            __('Bluem payments via Credit Card', 'bluem'),
+            __('Pay easily, quickly and safely via Credit Card', 'bluem'),
             home_url( 'wc-api/bluem_payments_callback' )
         );

bluem/trunk/gateways/Bluem_Mandates_Payment_Gateway.php

-                      r2981398
+                      r2989450
         global $woocommerce;
         $woocommerce->cart->empty_cart();
         $order->update_status( 'pending', __( 'Awaiting Bluem eMandate Signature', 'wc-gateway-bluem' ) );
+        $order->update_status( 'pending', __( 'Awaiting Bluem eMandate Signature', 'bluem' ) );
         if ( isset( $response->EMandateTransactionResponse->TransactionURL ) ) {
 …
                             $order->update_status(
                                 'processing',
                                 __(
                                     "Machtiging (Mandaat ID $mandateID) is gelukt en goedgekeurd; via webhook",
                                     'wc-gateway-bluem'
+                                printf(
+                                    __( 'Authorization (Mandate ID %s) was successful and approved; via webhook', 'bluem' ),
+                                    $mandateID
+                                )
                             );
 …
+                    }
                 } elseif ( $webhook_status === "Cancelled" ) {
                     $order->update_status( 'cancelled', __( 'Machtiging is geannuleerd; via webhook', 'wc-gateway-bluem' ) );
+                    $order->update_status( 'cancelled', __( 'Authorization has been canceled; via webhook', 'bluem' ) );
                 } elseif ($webhook_status === "Open" || $webhook_status == "Pending") {
                     // if the webhook is still open or pending, nothing has to be done yet
                 } elseif ( $webhook_status === "Expired" ) {
                     $order->update_status( 'failed', __( 'Machtiging is verlopen; via webhook', 'wc-gateway-bluem' ) );
+                    $order->update_status( 'failed', __( 'Authorization has expired; via webhook', 'bluem' ) );
                 } else {
                     $order->update_status( 'failed', __( 'Machtiging is gefaald: fout of onbekende status; via webhook', 'wc-gateway-bluem' ) );
+                    $order->update_status( 'failed', __( 'Authorization failed: error or unknown status; via webhook', 'bluem' ) );
+                }
                 http_response_code(200);
 …
             $order->update_status(
                 'cancelled',
                 __( 'Machtiging is geannuleerd', 'wc-gateway-bluem' )
+                __( 'Authorization has been canceled', 'bluem' )
             );
 …
             $order->update_status(
                 'failed',
+                __(
+                    'Machtiging is verlopen',
+                    'wc-gateway-bluem'
+                )
+                __('Authorization has expired', 'bluem')
             );
 …
             $order->update_status(
                 'failed',
+                __(
+                    'Machtiging is gefaald: fout of onbekende status',
+                    'wc-gateway-bluem'
+                )
+                __('Authorization failed: error or unknown status', 'bluem')
             );
             $errormessage = "Fout: Onbekende of foutieve status teruggekregen: {$statusCode}
 …
                     $successful_mandate = true;
                 } else if ( $block_processing ) {
                     $order->update_status( 'pending', __( 'Machtiging moet opnieuw ondertekend worden, want mandaat bedrag is te laag', 'wc-gateway-bluem' ) );
                     $url                     = $order->get_checkout_payment_url();
+                    $order->update_status( 'pending', __( 'Authorization must be signed again because the mandate amount is too low', 'bluem' ) );
+                    $url = $order->get_checkout_payment_url();
                     $order_total_plus_string = str_replace( ".", ",", ( "" . round( $order_total_plus, 2 ) ) );
                     bluem_dialogs_render_prompt(
 …
 The user is prompted to create a new mandate to fulfill this order."
                     );
                     exit;
+                }
 …
             $order->update_status(
                 'processing',
+                __(
+                    "Machtiging (mandaat ID {$mandate_id}, verzoek ID {$request_id}
+                        is gelukt en goedgekeurd",
+                    'wc-gateway-bluem'
+                )
+                printf(__('Authorization (Mandate ID %1$s, Request ID %2$s) has been obtained and approved', 'bluem'), $mandate_id, $request_id)
             );

bluem/trunk/gateways/Bluem_PayPal_Payment_Gateway.php

-                      r2824418
+                      r2989450
         parent::__construct(
             'bluem_payments_paypal',
             __('Bluem betalingen via PayPal'),
             __('Betaal gemakkelijk, snel en veilig via PayPal')
+            __('Bluem payments via PayPal', 'bluem'),
+            __('Pay easily, quickly and safely via PayPal', 'bluem')
         );

bluem/trunk/gateways/Bluem_Payment_Gateway.php

-                      r2915532
+                      r2989450
         $this->form_fields = apply_filters( 'wc_offline_form_fields', [
             'enabled'     => [
                 'title'       => __('Inschakelen/uitschakelen'),
+                'title'       => __('Enable/disable', 'bluem'),
                 'label'       => 'Enable '.$this->method_title,
                 'type'        => 'checkbox',
 …
             ],
             'title'       => [
                 'title'       => __('Weergegeven titel'),
+                'title'       => __('Displayed title', 'bluem'),
                 'type'        => 'text',
                 'description' => __('Dit is de titel die de gebruiker ziet bij het afrekenen.'),
+                'description' => __('This is the title the user sees during checkout.', 'bluem'),
                 'default'     => $this->method_title,
             ],
             'description' => [
                 'title'       => __('Beschrijving'),
+                'title'       => __('Description', 'bluem'),
                 'type'        => 'textarea',
                 'description' => __('Dit is de beschrijving die de gebruiker ziet tijdens het afrekenen.'),
+                'description' => __('This is the description the user sees during checkout.', 'bluem'),
                 'default'     => $this->description
+            ]

bluem/trunk/gateways/Bluem_Sofort_Payment_Gateway.php

-                      r2841693
+                      r2989450
         parent::__construct(
             'bluem_payments_sofort',
             __('Bluem betalingen via SOFORT'),
             __('Betaal gemakkelijk, snel en veilig via SOFORT')
+            __('Bluem payments via SOFORT', 'bluem'),
+            __('Pay easily, quickly and safely via SOFORT', 'bluem')
         );

bluem/trunk/gateways/Bluem_iDEAL_Payment_Gateway.php

-                      r2915532
+                      r2989450
         parent::__construct(
             'bluem_payments_ideal',
             __('Bluem betalingen via iDEAL'),
             __('Betaal gemakkelijk, snel en veilig via iDEAL')
+            __('Bluem payments via iDEAL', 'bluem'),
+            __('Pay easily, quickly and safely via iDEAL', 'bluem')
         );
 …
                 'type' => 'select',
                 'required' => true,
                 'label' => 'Selecteer een bank:',
+                'label' => __('Select a bank:', 'bluem'),
                 'options' => $options
             ), '' );

bluem/trunk/readme.txt

-                      r2981419
+                      r2989450
 Tested up to: 6.3
 Requires PHP: 7.4
 Stable tag: 1.3.17.11
+Stable tag: 1.3.17.12
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 == Changelog ==
+- 1.3.17.12: Stability fixes and improvements.
 - 1.3.17.11: Stability fixes.
 - 1.3.17.10: Updated eMandates BIC list in PHP library and webhook improvements.

bluem/trunk/vendor/composer/ClassLoader.php

-                      r2886890
+                      r2989450
     private static $includeFile;
     /** @var ?string */
+    /** @var string|null */
     private $vendorDir;
     // PSR-4
     /**
+     * @var array[]
+     * @psalm-var array<string, array<string, int>>
+     * @var array<string, array<string, int>>
      */
     private $prefixLengthsPsr4 = array();
     /**
+     * @var array[]
+     * @psalm-var array<string, array<int, string>>
+     * @var array<string, list<string>>
      */
     private $prefixDirsPsr4 = array();
     /**
+     * @var array[]
+     * @psalm-var array<string, string>
+     * @var list<string>
      */
     private $fallbackDirsPsr4 = array();
 …
     // PSR-0
     /**
+     * @var array[]
+     * @psalm-var array<string, array<string, string[]>>
+     * List of PSR-0 prefixes
+     *
+     * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
+     *
+     * @var array<string, array<string, list<string>>>
      */
     private $prefixesPsr0 = array();
     /**
+     * @var array[]
+     * @psalm-var array<string, string>
+     * @var list<string>
      */
     private $fallbackDirsPsr0 = array();
 …
     /**
+     * @var string[]
+     * @psalm-var array<string, string>
+     * @var array<string, string>
      */
     private $classMap = array();
 …
     /**
+     * @var bool[]
+     * @psalm-var array<string, bool>
+     * @var array<string, bool>
      */
     private $missingClasses = array();
     /** @var ?string */
+    /** @var string|null */
     private $apcuPrefix;
     /**
      * @var self[]
+     * @var array<string, self>
      */
     private static $registeredLoaders = array();
     /**
      * @param ?string $vendorDir
+     * @param string|null $vendorDir
      */
     public function __construct($vendorDir = null)
 …
     /**
      * @return string[]
+     * @return array<string, list<string>>
      */
     public function getPrefixes()
 …
     /**
+     * @return array[]
+     * @psalm-return array<string, array<int, string>>
+     * @return array<string, list<string>>
      */
     public function getPrefixesPsr4()
 …
     /**
+     * @return array[]
+     * @psalm-return array<string, string>
+     * @return list<string>
      */
     public function getFallbackDirs()
 …
     /**
+     * @return array[]
+     * @psalm-return array<string, string>
+     * @return list<string>
      */
     public function getFallbackDirsPsr4()
 …
     /**
+     * @return string[] Array of classname => path
+     * @psalm-return array<string, string>
+     * @return array<string, string> Array of classname => path
      */
     public function getClassMap()
 …
     /**
+     * @param string[] $classMap Class to filename map
+     * @psalm-param array<string, string> $classMap
+     * @param array<string, string> $classMap Class to filename map
+     *
      * @return void
 …
      * appending or prepending to the ones previously set for this prefix.
+     *
      * @param string          $prefix  The prefix
      * @param string[]|string $paths   The PSR-0 root directories
      * @param bool            $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix
+     * @param list<string>|string $paths   The PSR-0 root directories
+     * @param bool                $prepend Whether to prepend the directories
+     *
      * @return void
 …
     public function add($prefix, $paths, $prepend = false)
+    {
+        $paths = (array) $paths;
         if (!$prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
                     (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr0
                 );
 …
                 $this->fallbackDirsPsr0 = array_merge(
                     $this->fallbackDirsPsr0,
                     (array) $paths
+                    $paths
                 );
+            }
 …
         $first = $prefix[0];
         if (!isset($this->prefixesPsr0[$first][$prefix])) {
             $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+            $this->prefixesPsr0[$first][$prefix] = $paths;
             return;
 …
         if ($prepend) {
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 (array) $paths,
+                $paths,
                 $this->prefixesPsr0[$first][$prefix]
             );
 …
             $this->prefixesPsr0[$first][$prefix] = array_merge(
                 $this->prefixesPsr0[$first][$prefix],
                 (array) $paths
+                $paths
             );
+        }
 …
      * appending or prepending to the ones previously set for this namespace.
+     *
      * @param string          $prefix  The prefix/namespace, with trailing '\\'
      * @param string[]|string $paths   The PSR-4 base directories
      * @param bool            $prepend Whether to prepend the directories
+     * @param string              $prefix  The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths   The PSR-4 base directories
+     * @param bool                $prepend Whether to prepend the directories
+     *
      * @throws \InvalidArgumentException
 …
     public function addPsr4($prefix, $paths, $prepend = false)
+    {
+        $paths = (array) $paths;
         if (!$prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
                 $this->fallbackDirsPsr4 = array_merge(
                     (array) $paths,
+                    $paths,
                     $this->fallbackDirsPsr4
                 );
 …
                 $this->fallbackDirsPsr4 = array_merge(
                     $this->fallbackDirsPsr4,
                     (array) $paths
+                    $paths
                 );
+            }
 …
+            }
             $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
             $this->prefixDirsPsr4[$prefix] = (array) $paths;
+            $this->prefixDirsPsr4[$prefix] = $paths;
         } elseif ($prepend) {
             // Prepend directories for an already registered namespace.
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 (array) $paths,
+                $paths,
                 $this->prefixDirsPsr4[$prefix]
             );
 …
             $this->prefixDirsPsr4[$prefix] = array_merge(
                 $this->prefixDirsPsr4[$prefix],
                 (array) $paths
+                $paths
             );
+        }
 …
      * replacing any others previously set for this prefix.
+     *
      * @param string          $prefix The prefix
      * @param string[]|string $paths  The PSR-0 base directories
+     * @param string              $prefix The prefix
+     * @param list<string>|string $paths  The PSR-0 base directories
+     *
      * @return void
 …
      * replacing any others previously set for this namespace.
+     *
      * @param string          $prefix The prefix/namespace, with trailing '\\'
      * @param string[]|string $paths  The PSR-4 base directories
+     * @param string              $prefix The prefix/namespace, with trailing '\\'
+     * @param list<string>|string $paths  The PSR-4 base directories
+     *
      * @throws \InvalidArgumentException
 …
     /**
      * Returns the currently registered loaders indexed by their corresponding vendor directories.
+     *
      * @return self[]
+     * Returns the currently registered loaders keyed by their corresponding vendor directories.
+     *
+     * @return array<string, self>
      */
     public static function getRegisteredLoaders()

bluem/trunk/views/home.php

r2959619	r2989450
39	39	<p><strong>Plugin versie</strong><br />Versie <?php $bluem = get_plugin_data( WP_PLUGIN_DIR . '/bluem/bluem.php' ); echo $bluem['Version']; ?> (<a href="<?php echo admin_url('plugin-install.php?tab=plugin-information&plugin=bluem&TB_iframe=true&width=600&height=550'); ?>" target="_blank">Details bekijken</a>)</p>
40	40
41		<p><strong>Technische informatie</strong><br />WordPress versie: <?php echo get_bloginfo('version'); ?><br />WooCommerce versie: <?php echo class_exists('WooCommerce') ? WC()->version : __('WooCommerce n~~iet geinstalleerd.', 'bluem-woocommerce~~'); ?><br />Bluem PHP-library versie: <?php echo $dependency_bluem_php_version; ?><br />PHP versie: <?php echo phpversion(); ?></p>
	41	<p><strong>Technische informatie</strong><br />WordPress versie: <?php echo get_bloginfo('version'); ?><br />WooCommerce versie: <?php echo class_exists('WooCommerce') ? WC()->version : __('WooCommerce not installed', 'bluem'); ?><br />Bluem PHP-library versie: <?php echo $dependency_bluem_php_version; ?><br />PHP versie: <?php echo phpversion(); ?></p>
42	42
43	43	<?php bluem_render_footer(); ?>

bluem/trunk/views/settings.php

r2959619	r2989450
77	77
78	78	<div style="margin-top: 0; padding-top: 25px; border-top: 1px solid #2b4e6c;">
79		<input name="submit" class="button button-primary" type="submit" value="<?php esc_attr_e( '~~Wijzigingen opslaan~~' ); ?>" />
	79	<input name="submit" class="button button-primary" type="submit" value="<?php esc_attr_e( 'Save changes', 'bluem' ); ?>" />
80	80	</div>
81	81	</form>

Note: See TracChangeset for help on using the changeset viewer.

Trac UI Preferences

Plugin Directory