Changeset 3262812

Timestamp:

03/27/2025 12:25:09 PM (12 months ago)

Author:

openstream

Message:

• Added support for WooCommerce HPOS
• Added code improvements, escaping and sanitizing text
• Moved language handling to [GlotPress](​https://translate.wordpress.org/projects/wp-plugins/run-my-accounts-for-woocommerce/)
• Bumped required WordPress version to 6.2
• Bumped required WooCommerce version to 8.2

Location:

run-my-accounts-for-woocommerce

Files:

• tags/1.8.0 (added)
• tags/1.8.0/LICENSE (added)
• tags/1.8.0/README.md (added)
• tags/1.8.0/assets (added)
• tags/1.8.0/assets/css (added)
• tags/1.8.0/assets/css/select2.min.css (added)
• tags/1.8.0/assets/js (added)
• tags/1.8.0/assets/js/admin.js (added)
• tags/1.8.0/assets/js/select2.min.js (added)
• tags/1.8.0/classes (added)
• tags/1.8.0/classes/class-RMA_WC_API.php (added)
• tags/1.8.0/classes/class-RMA_WC_Backend.php (added)
• tags/1.8.0/classes/class-RMA_WC_Backend_Abstract.php (added)
• tags/1.8.0/classes/class-RMA_WC_Collective_Invoicing.php (added)
• tags/1.8.0/classes/class-RMA_WC_Frontend.php (added)
• tags/1.8.0/classes/class-RMA_WC_Payment.php (added)
• tags/1.8.0/classes/class-RMA_WC_Rental_And_Booking.php (added)
• tags/1.8.0/classes/class-RMA_WC_Settings_Page.php (added)
• tags/1.8.0/index.php (added)
• tags/1.8.0/readme.txt (added)
• tags/1.8.0/rma-wc-main.php (added)
• tags/1.8.0/rma-wc.php (added)
• tags/1.8.0/templates (added)
• tags/1.8.0/templates/email (added)
• tags/1.8.0/templates/email/error-email-template.php (added)
• tags/1.8.0/uninstall.php (added)
• trunk/classes/class-RMA_Settings_Page.php (deleted)
• trunk/classes/class-RMA_WC_API.php (modified) (13 diffs)
• trunk/classes/class-RMA_WC_Backend.php (modified) (1 diff)
• trunk/classes/class-RMA_WC_Backend_Abstract.php (modified) (18 diffs)
• trunk/classes/class-RMA_WC_Collective_Invoicing.php (modified) (7 diffs)
• trunk/classes/class-RMA_WC_Frontend.php (modified) (9 diffs)
• trunk/classes/class-RMA_WC_Payment.php (modified) (5 diffs)
• trunk/classes/class-RMA_WC_Rental_And_Booking.php (modified) (1 diff)
• trunk/classes/class-RMA_WC_Settings_Page.php (modified) (1 diff)
• trunk/languages (deleted)
• trunk/readme.txt (modified) (2 diffs)
• trunk/rma-wc-main.php (added)
• trunk/rma-wc.php (modified) (2 diffs)
• trunk/templates/email/error-email-template.php (modified) (1 diff)

run-my-accounts-for-woocommerce/trunk/classes/class-RMA_WC_API.php

@@ -11 +11 @@
         public function __construct() {
 
-            // define constants only if they are not defined yet
-            // for this we check for two common constants which definitely needs to be defined
-            if ( !defined( 'RMA_MANDANT' ) || !defined( 'RMA_INVOICE_PREFIX' ) )
-                self::define_constants();
-
-        }
-
-        /**
-         * define default constants
-         */
+            // define constants only if they are not defined yet
+            // for this we check for two common constants which definitely needs to be defined
+            if ( !defined( 'RMA_MANDANT' ) || !defined( 'RMA_INVOICE_PREFIX' ) )
+                self::define_constants();
+
+        }
+
+        /**
+         * define default constants
+         */
         private function define_constants() {
 
-            // read rma settings
-            $settings = get_option('wc_rma_settings');
-
-            // check if operation mode is set and is live
-            if( isset( $settings['rma-mode'] ) && 'live' == $settings['rma-mode'] ) {
-
-                // define constants with live values
-                if( !defined( 'RMA_MANDANT' ) )       DEFINE( 'RMA_MANDANT', ( $settings[ 'rma-live-client' ] ?? '') );
-                if( !defined( 'RMA_APIKEY' ) )        DEFINE( 'RMA_APIKEY', ( $settings[ 'rma-live-apikey' ] ?? '') );
-                if( !defined( 'RMA_CALLERSANDBOX' ) ) DEFINE( 'RMA_CALLERSANDBOX', FALSE );
-
-            }
-            else {
-
-                // set default operation mode to test
-                if( !defined( 'RMA_MANDANT' ) )       DEFINE( 'RMA_MANDANT', ( $settings[ 'rma-test-client' ] ?? '') );
-                if( !defined( 'RMA_APIKEY' ) )        DEFINE( 'RMA_APIKEY', ( $settings[ 'rma-test-apikey' ] ?? '') );
-                if( !defined( 'RMA_CALLERSANDBOX' ) ) DEFINE( 'RMA_CALLERSANDBOX', TRUE );
-
-            }
-
-            DEFINE( 'RMA_GLOBAL_PAYMENT_PERIOD', ( $settings[ 'rma-payment-period' ] ?? '0') ); // default value 0 days
-            DEFINE( 'RMA_INVOICE_PREFIX', ( $settings[ 'rma-invoice-prefix' ] ?? '') );
-            DEFINE( 'RMA_INVOICE_DIGITS', ( isset( $settings['rma-digits'] ) ? $settings[ 'rma-invoice-description' ] : '' ) );
-
-            // if rma-loglevel ist not set, LOGLEVEL is set to error by default
-            if( isset( $settings['rma-loglevel'] ) ) {
-                if( 'error' == $settings['rma-loglevel']  || empty( $settings['rma-loglevel'] ) ) {
-                    if( !defined( 'LOGLEVEL' ) ) DEFINE( 'LOGLEVEL' , 'error' );
-                }
-                elseif ( $settings['rma-loglevel'] == 'complete' ) {
-                    if( !defined( 'LOGLEVEL' ) ) DEFINE( 'LOGLEVEL' , 'complete' );
-                }
-            } else {
-                if( !defined( 'LOGLEVEL' ) ) DEFINE( 'LOGLEVEL' , 'error' );
-            }
-
-            // if rma-log-send-email ist not set, SENDLOGEMAIL is set to false by default
-            if( isset ( $settings['rma-log-send-email'] ) &&
-                'yes' == $settings['rma-log-send-email'] ) {
-                if( !defined( 'SENDLOGEMAIL' ) ) DEFINE( 'SENDLOGEMAIL' , true );
-
-                // who will get email on error
-                if( !defined( 'LOGEMAIL' ) ) DEFINE( 'LOGEMAIL', ( !empty( $settings['rma-log-email'] ) ? $settings['rma-log-email'] : get_option( 'admin_email' ) ) );
-
-            } else {
-                if( !defined( 'SENDLOGEMAIL' ) ) DEFINE( 'SENDLOGEMAIL' , false );
-            }
-
-        }
+            // read rma settings
+            $settings = get_option('wc_rma_settings');
+
+            // check if operation mode is set and is live
+            if( isset( $settings['rma-mode'] ) && 'live' == $settings['rma-mode'] ) {
+
+                // define constants with live values
+                if( !defined( 'RMA_MANDANT' ) )       DEFINE( 'RMA_MANDANT', ( $settings[ 'rma-live-client' ] ?? '') );
+                if( !defined( 'RMA_APIKEY' ) )        DEFINE( 'RMA_APIKEY', ( $settings[ 'rma-live-apikey' ] ?? '') );
+                if( !defined( 'RMA_CALLERSANDBOX' ) ) DEFINE( 'RMA_CALLERSANDBOX', FALSE );
+
+            }
+            else {
+
+                // set default operation mode to test
+                if( !defined( 'RMA_MANDANT' ) )       DEFINE( 'RMA_MANDANT', ( $settings[ 'rma-test-client' ] ?? '') );
+                if( !defined( 'RMA_APIKEY' ) )        DEFINE( 'RMA_APIKEY', ( $settings[ 'rma-test-apikey' ] ?? '') );
+                if( !defined( 'RMA_CALLERSANDBOX' ) ) DEFINE( 'RMA_CALLERSANDBOX', TRUE );
+
+            }
+
+            DEFINE( 'RMA_GLOBAL_PAYMENT_PERIOD', ( $settings[ 'rma-payment-period' ] ?? '0') ); // default value 0 days
+            DEFINE( 'RMA_INVOICE_PREFIX', ( $settings[ 'rma-invoice-prefix' ] ?? '') );
+            DEFINE( 'RMA_INVOICE_DIGITS', ( isset( $settings['rma-digits'] ) ? $settings[ 'rma-invoice-description' ] : '' ) );
+
+            // if rma-loglevel ist not set, LOGLEVEL is set to error by default
+            if( isset( $settings['rma-loglevel'] ) ) {
+                if( 'error' == $settings['rma-loglevel']  || empty( $settings['rma-loglevel'] ) ) {
+                    if( !defined( 'LOGLEVEL' ) ) DEFINE( 'LOGLEVEL' , 'error' );
+                }
+                elseif ( $settings['rma-loglevel'] == 'complete' ) {
+                    if( !defined( 'LOGLEVEL' ) ) DEFINE( 'LOGLEVEL' , 'complete' );
+                }
+            } else {
+                if( !defined( 'LOGLEVEL' ) ) DEFINE( 'LOGLEVEL' , 'error' );
+            }
+
+            // if rma-log-send-email ist not set, SENDLOGEMAIL is set to false by default
+            if( isset ( $settings['rma-log-send-email'] ) &&
+                'yes' == $settings['rma-log-send-email'] ) {
+                if( !defined( 'SENDLOGEMAIL' ) ) DEFINE( 'SENDLOGEMAIL' , true );
+
+                // who will get email on error
+                if( !defined( 'LOGEMAIL' ) ) DEFINE( 'LOGEMAIL', ( !empty( $settings['rma-log-email'] ) ? $settings['rma-log-email'] : get_option( 'admin_email' ) ) );
+
+            } else {
+                if( !defined( 'SENDLOGEMAIL' ) ) DEFINE( 'SENDLOGEMAIL' , false );
+            }
+
+        }
 
         /**
          * Set Caller URL live oder sandbox
-         *
+         *
          * @return string
          */
         public static function get_caller_url(): string
-        {
+        {
             // Set caller URL
             if( RMA_CALLERSANDBOX ) { // Caller URL for sandbox
-                $url = 'https://service.int.runmyaccounts.com/api/latest/clients/'; // End with / !
-                //$url = ' https://service-swint.runmyaccounts.com/api/latest/clients/'; // End with / !
+                $url = 'https://service.int.runmyaccounts.com/api/latest/clients/'; // End with / !
+                //$url = ' https://service-swint.runmyaccounts.com/api/latest/clients/'; // End with / !
             }
             else { // Caller URL set for Live page
@@ -95 +95 @@
         /**
          * Read customer list from RMA
-         *
+         *
          * @return mixed
          */
         public function get_customers() {
 
-            if( !RMA_MANDANT || !RMA_APIKEY ) {
-
-                $log_values = array(
-                    'status' => 'error',
-                    'section_id' => '',
-                    'section' => esc_html_x('Get Customer', 'Log Section', 'rma-wc'),
-                    'mode' => self::rma_mode(),
-                    'message' => esc_html__('Missing API data', 'rma-wc') );
-
-                self::write_log($log_values);
-
-                return false;
-
-            }
+            if( !RMA_MANDANT || !RMA_APIKEY ) {
+
+                $log_values = array(
+                    'status' => 'error',
+                    'section_id' => '',
+                    'section' => esc_html_x('Get Customer', 'Log Section', 'run-my-accounts-for-woocommerce'),
+                    'mode' => self::rma_mode(),
+                    'message' => esc_html__('Missing API data', 'run-my-accounts-for-woocommerce') );
+
+                self::write_log($log_values);
+
+                return false;
+
+            }
 
             $url       = self::get_caller_url() . RMA_MANDANT . '/customers?api_key=' . RMA_APIKEY;
-            $response  = wp_remote_get( $url );
-
-            // Check response code
+            $response  = wp_remote_get( $url );
+
+            // Check response code
             if ( 200 <> wp_remote_retrieve_response_code( $response ) ){
 
-                $message = esc_html__( 'Response Code', 'rma-wc') . ' '. wp_remote_retrieve_response_code( $response );
-                $message .= ' '. wp_remote_retrieve_response_message( $response );
-
-
-                if ( is_wp_error( $response ) ) {
-
-                    $error_string = $response->get_error_message();
-                    echo '<div id="message" class="error"><p>' . $error_string . '</p></div>';
-
-                    return false;
-
-                }
-
-                $response = (array) $response['http_response'];
-
-                foreach ( $response as $object ) {
-                    $message .= ' ' . $object->url;
-                    break;
-                }
-
-                $log_values = array(
-                    'status' => 'error',
-                    'section_id' => '',
-                    'section' => esc_html_x('Get Customer', 'Log Section', 'rma-wc'),
-                    'mode' => self::rma_mode(),
-                    'message' => $message );
-
-                self::write_log($log_values);
-
-                return false;
+                $message = esc_html__( 'Response Code', 'run-my-accounts-for-woocommerce') . ' '. wp_remote_retrieve_response_code( $response );
+                $message .= ' '. wp_remote_retrieve_response_message( $response );
+
+
+                if ( is_wp_error( $response ) ) {
+
+                    $error_string = sanitize_text_field( $response->get_error_message() );
+                    echo '<div id="message" class="error"><p>' . esc_html( $error_string ) . '</p></div>';
+
+                    return false;
+
+                }
+
+                $response = (array) $response['http_response'];
+
+                foreach ( $response as $object ) {
+                    $message .= ' ' . $object->url;
+                    break;
+                }
+
+                $log_values = array(
+                    'status' => 'error',
+                    'section_id' => '',
+                    'section' => esc_html_x('Get Customer', 'Log Section', 'run-my-accounts-for-woocommerce'),
+                    'mode' => self::rma_mode(),
+                    'message' => $message );
+
+                self::write_log($log_values);
+
+                return false;
 
             }
             else {
 
-                libxml_use_internal_errors( true );
-
-                $body = wp_remote_retrieve_body( $response );
-                $xml  = simplexml_load_string( $body );
+                libxml_use_internal_errors( true );
+
+                $body = wp_remote_retrieve_body( $response );
+                $xml  = simplexml_load_string( $body );
 
                 if ( !$xml ) {
                     // ToDO: Add this information to error log
                     foreach( libxml_get_errors() as $error ) {
-                        echo "\t", $error->message;
+                        echo "\t", esc_html( $error->message );
                     }
 
@@ -177 +177 @@
 
                         foreach ($value as $key => $customer ) {
-                            $number = $customer['customernumber'];
-
-                            if ( is_array( $customer['name'] ) ) {
-
-                                if ( is_array( $customer['firstname'] ) ||
-                                     is_array( $customer['lastname'] )) {
-                                    $name = '';
-                                }
-                                else {
-                                    $name = $customer['firstname'] . ' ' . $customer['lastname'];
-                                }
-
-                            }
-                            else {
-                                $name   = $customer['name'];
-                            }
-
-                            $customers[ $number ] = $name . ' ( ' . $number . ' )';
+                            $number = $customer['customernumber'];
+
+                            if ( is_array( $customer['name'] ) ) {
+
+                                if ( is_array( $customer['firstname'] ) ||
+                                     is_array( $customer['lastname'] )) {
+                                    $name = '';
+                                }
+                                else {
+                                    $name = $customer['firstname'] . ' ' . $customer['lastname'];
+                                }
+
+                            }
+                            else {
+                                $name   = $customer['name'];
+                            }
+
+                            $customers[ $number ] = $name . ' ( ' . $number . ' )';
                         }
 
@@ -204 +204 @@
         }
 
-        /**
-         * Read parts list from RMA
-         *
-         * @return mixed
-         *
-         * @since 1.5.0
-         */
-        public function get_parts() {
-
-            if( !RMA_MANDANT || !RMA_APIKEY ) {
-
-                $log_values = array(
-                    'status' => 'error',
-                    'section_id' => '',
-                    'section' => esc_html_x('Get Parts', 'Log Section', 'rma-wc'),
-                    'mode' => self::rma_mode(),
-                    'message' => esc_html__('Missing API data', 'rma-wc') );
-
-                self::write_log($log_values);
-
-                return false;
-
-            }
-
-            $url       = self::get_caller_url() . RMA_MANDANT . '/parts?api_key=' . RMA_APIKEY;
-
-            $response  = wp_remote_get( $url );
-
-            // Check response code
-            if ( 200 <> wp_remote_retrieve_response_code( $response ) ){
-
-                $message = esc_html__( 'Response Code', 'rma-wc') . ' '. wp_remote_retrieve_response_code( $response );
-                $message .= ' '. wp_remote_retrieve_response_message( $response );
-
-                $response = (array) $response[ 'http_response' ];
-
-                foreach ( $response as $object ) {
-                    $message .= ' ' . $object->url;
-                    break;
-                }
-
-                $log_values = array(
-                    'status' => 'error',
-                    'section_id' => '',
-                    'section' => esc_html_x('Get Parts', 'Log Section', 'rma-wc'),
-                    'mode' => self::rma_mode(),
-                    'message' => $message );
-
-                self::write_log($log_values);
-
-                return false;
-
-            }
-            else {
-
-                libxml_use_internal_errors( true );
-
-                $body = wp_remote_retrieve_body( $response );
-                $xml  = simplexml_load_string( $body );
-
-                if ( !$xml ) {
-                    // ToDO: Add this information to error log
-                    foreach( libxml_get_errors() as $error ) {
-                        echo "\t", $error->message;
-                    }
-
-                    return false;
-
-                }
-                else {
-                    // Parse response
-                    $array = json_decode( json_encode( (array)$xml ), TRUE);
-
-                    $sku_list = array();
-
-                    foreach ( $array['part'] as $part ) {
-
-                        $sku_list[ $part['partnumber'] ] = $part['partnumber'];
-
-                    }
-
-                    return ( !empty( $sku_list ) ? $sku_list : false );
-                }
-            }
-        }
-
-        /**
-         * Collect data for invoice
-         *
-         * @param $order_id
-         *
-         * @return array
-         * @throws DOMException
-         */
+        /**
+         * Read parts list from RMA
+         *
+         * @return mixed
+         *
+         * @since 1.5.0
+         */
+        public function get_parts() {
+
+            if( !RMA_MANDANT || !RMA_APIKEY ) {
+
+                $log_values = array(
+                    'status' => 'error',
+                    'section_id' => '',
+                    'section' => esc_html_x('Get Parts', 'Log Section', 'run-my-accounts-for-woocommerce'),
+                    'mode' => self::rma_mode(),
+                    'message' => esc_html__('Missing API data', 'run-my-accounts-for-woocommerce') );
+
+                self::write_log($log_values);
+
+                return false;
+
+            }
+
+            $url       = self::get_caller_url() . RMA_MANDANT . '/parts?api_key=' . RMA_APIKEY;
+
+            $response  = wp_remote_get( $url );
+
+            // Check response code
+            if ( 200 <> wp_remote_retrieve_response_code( $response ) ){
+
+                $message = esc_html__( 'Response Code', 'run-my-accounts-for-woocommerce') . ' '. wp_remote_retrieve_response_code( $response );
+                $message .= ' '. wp_remote_retrieve_response_message( $response );
+
+                $response = (array) $response[ 'http_response' ];
+
+                foreach ( $response as $object ) {
+                    $message .= ' ' . $object->url;
+                    break;
+                }
+
+                $log_values = array(
+                    'status' => 'error',
+                    'section_id' => '',
+                    'section' => esc_html_x('Get Parts', 'Log Section', 'run-my-accounts-for-woocommerce'),
+                    'mode' => self::rma_mode(),
+                    'message' => $message );
+
+                self::write_log($log_values);
+
+                return false;
+
+            }
+            else {
+
+                libxml_use_internal_errors( true );
+
+                $body = wp_remote_retrieve_body( $response );
+                $xml  = simplexml_load_string( $body );
+
+                if ( !$xml ) {
+                    // ToDO: Add this information to error log
+                    foreach( libxml_get_errors() as $error ) {
+                        echo "\t", esc_html( $error->message );
+                    }
+
+                    return false;
+
+                }
+                else {
+                    // Parse response
+                    $array = json_decode( json_encode( (array)$xml ), TRUE);
+
+                    $sku_list = array();
+
+                    foreach ( $array['part'] as $part ) {
+
+                        $sku_list[ $part['partnumber'] ] = $part['partnumber'];
+
+                    }
+
+                    return ( !empty( $sku_list ) ? $sku_list : false );
+                }
+            }
+        }
+
+        /**
+         * Collect data for invoice
+         *
+         * @param $order_id
+         *
+         * @return array
+         * @throws DOMException
+         */
         private function get_invoice_values( $order_id ): array
-        {
+        {
 
             $order_details = self::get_wc_order_details( $order_id );
 
-            // add products to order
-            $order_details_products = self::get_order_details_products( $order_id );
-
-            // add shipping costs to order
-            $order_details_products = self::get_order_details_shipping_costs( $order_id, $order_details_products );
-
-            $invoice_id = RMA_INVOICE_PREFIX . str_pad( $order_id, max(intval(RMA_INVOICE_DIGITS) - strlen(RMA_INVOICE_PREFIX ), 0 ), '0', STR_PAD_LEFT );
-
-            return self::get_invoice_data( $order_details, $order_details_products, $invoice_id, $order_id );
-
-        }
-
-        public static function get_invoice_data( $order_details, $order_details_products, $invoice_id, $order_id, $description = '' ): array {
-
-            $settings     = get_option( 'wc_rma_settings' );
-            $fallback_sku = $settings[ 'rma-product-fallback_id' ];
-
-            if ( !empty( $fallback_sku ) )
-                $rma_part_numbers = (new RMA_WC_API)->get_parts();
-
-            if( empty( $description ) ) {
-
-                $description = str_replace('[orderdate]', $order_details[ 'orderdate' ], $settings[ 'rma-invoice-description' ] ?? '' );
-
-            }
-
-            $data = array(
-                'invoice' => array(
-                    'invnumber'      => $invoice_id,
-                    'ordnumber'      => $order_id,
-                    'status'         => 'OPEN',
-                    'currency'       => $order_details[ 'currency' ],
-                    'ar_accno'       => $order_details[ 'ar_accno' ],
-                    'transdate'      => date(DateTimeInterface::RFC3339, time() ),
-                    'duedate'        => $order_details[ 'duedate' ], //date( DateTime::RFC3339, time() ),
-                    'description'    => $description,
-                    'notes'          => '',
-                    'intnotes'       => $order_details[ 'notes' ],
-                    'taxincluded'    => $order_details[ 'taxincluded' ],
-                    'dcn'            => '',
-                    'customernumber' => $order_details[ 'customernumber' ],
-                    'payment_accno'  => $order_details[ 'payment_accno' ]
-                ),
-                'part' => array()
-            );
-
-            // Add parts
-            if ( count( $order_details_products ) > 0 ) :
-
-                foreach ( $order_details_products as $part_number => $part ) :
-
-                    // check if fallback sku exist and part number does not exist in list of RMA part numbers
-                    if( !empty( $fallback_sku ) &&
-                        !array_key_exists( $part_number, $rma_part_numbers ) )
-                        $part_number = $fallback_sku;
-
-                    $data['part'][] = apply_filters( 'rma_invoice_part', array (
-                        'partnumber'   => $part_number,
-                        'description'  => $part[ 'name' ],
-                        'unit'         => '',
-                        'quantity'     => $part[ 'quantity' ],
-                        'sellprice'    => $part[ 'price' ],
-                        'discount'     => '0.0',
-                        'itemnote'     => '',
-                        'price_update' => '',
-                    ), $part[ 'item_id' ] ?? null );
-                endforeach;
-
-            endif;
-
-            return $data;
-
-        }
-
-        /**
-         * Prepare data of a customer by user id for sending to Run my Accounts
-         *
-         * @param $user_id
-         *
-         * @return array
-         * @throws Exception
-         */
+            // add products to order
+            $order_details_products = self::get_order_details_products( $order_id );
+
+            // add shipping costs to order
+            $order_details_products = self::get_order_details_shipping_costs( $order_id, $order_details_products );
+
+            $invoice_id = RMA_INVOICE_PREFIX . str_pad( $order_id, max(intval(RMA_INVOICE_DIGITS) - strlen(RMA_INVOICE_PREFIX ), 0 ), '0', STR_PAD_LEFT );
+
+            return self::get_invoice_data( $order_details, $order_details_products, $invoice_id, $order_id );
+
+        }
+
+        public static function get_invoice_data( $order_details, $order_details_products, $invoice_id, $order_id, $description = '' ): array {
+
+            $settings     = get_option( 'wc_rma_settings' );
+            $fallback_sku = $settings[ 'rma-product-fallback_id' ];
+
+            if ( !empty( $fallback_sku ) )
+                $rma_part_numbers = (new RMA_WC_API)->get_parts();
+
+            if( empty( $description ) ) {
+
+                $description = str_replace('[orderdate]', $order_details[ 'orderdate' ], $settings[ 'rma-invoice-description' ] ?? '' );
+
+            }
+
+            $data = array(
+                'invoice' => array(
+                    'invnumber'      => $invoice_id,
+                    'ordnumber'      => $order_id,
+                    'status'         => 'OPEN',
+                    'currency'       => $order_details[ 'currency' ],
+                    'ar_accno'       => $order_details[ 'ar_accno' ],
+                    'transdate'      => gmdate(DateTimeInterface::RFC3339, time() ),
+                    'duedate'        => $order_details[ 'duedate' ], //gmdate( DateTime::RFC3339, time() ),
+                    'description'    => $description,
+                    'notes'          => '',
+                    'intnotes'       => $order_details[ 'notes' ],
+                    'taxincluded'    => $order_details[ 'taxincluded' ],
+                    'dcn'            => '',
+                    'customernumber' => $order_details[ 'customernumber' ],
+                    'payment_accno'  => $order_details[ 'payment_accno' ]
+                ),
+                'part' => array()
+            );
+
+            // Add parts
+            if ( count( $order_details_products ) > 0 ) :
+
+                foreach ( $order_details_products as $part_number => $part ) :
+
+                    // check if fallback sku exist and part number does not exist in list of RMA part numbers
+                    if( !empty( $fallback_sku ) &&
+                        !array_key_exists( $part_number, $rma_part_numbers ) )
+                        $part_number = $fallback_sku;
+
+                    $data['part'][] = apply_filters( 'rma_invoice_part', array (
+                        'partnumber'   => $part_number,
+                        'description'  => $part[ 'name' ],
+                        'unit'         => '',
+                        'quantity'     => $part[ 'quantity' ],
+                        'sellprice'    => $part[ 'price' ],
+                        'discount'     => '0.0',
+                        'itemnote'     => '',
+                        'price_update' => '',
+                    ), $part[ 'item_id' ] ?? null );
+                endforeach;
+
+            endif;
+
+            return $data;
+
+        }
+
+        /**
+         * Prepare data of a customer by user id for sending to Run my Accounts
+         *
+         * @param $user_id
+         *
+         * @return array
+         * @throws Exception
+         */
         private function get_customer_values_by_user_id( $user_id ) :array {
 
-            $settings        = get_option( 'wc_rma_settings' );
-            $customer_prefix = isset( $settings[ 'rma-customer-prefix' ] ) ? $settings[ 'rma-customer-prefix' ] : '';
-
-            $customer        = new WC_Customer( $user_id );
-
-            $is_company      = !empty( $customer->get_billing_company() ) ? true : false;
-            $billing_account = get_user_meta( $user_id, 'rma_billing_account', true );
-
-            return array(
+            $settings        = get_option( 'wc_rma_settings' );
+            $customer_prefix = isset( $settings[ 'rma-customer-prefix' ] ) ? $settings[ 'rma-customer-prefix' ] : '';
+
+            $customer        = new WC_Customer( $user_id );
+
+            $is_company      = !empty( $customer->get_billing_company() ) ? true : false;
+            $billing_account = get_user_meta( $user_id, 'rma_billing_account', true );
+
+            return array(
                 'customernumber'    => $customer_prefix . $user_id,
                 'name'              => ( $is_company ? $customer->get_billing_company() : $customer->get_billing_first_name() . ' ' . $customer->get_billing_last_name() ),
-                'created'           => date('Y-m-d') . 'T00:00:00+01:00',
-                'salutation'        => ( 1 == get_user_meta( $user_id, 'billing_title', true ) ? __('Mr.', 'rma-wc') : __('Ms.', 'rma-wc') ),
+                'created'           => gmdate('Y-m-d') . 'T00:00:00+01:00',
+                'salutation'        => ( 1 == get_user_meta( $user_id, 'billing_title', true ) ? __('Mr.', 'run-my-accounts-for-woocommerce') : __('Ms.', 'run-my-accounts-for-woocommerce') ),
                 'firstname'         => $customer->get_billing_first_name(),
                 'lastname'          => $customer->get_billing_last_name(),
@@ -417 +417 @@
                 'remittancevoucher' => 'false',
                 'arap_accno'        => !empty ( $billing_account ) ? $billing_account : '', // Default accounts receivable account number - 1100
-                'payment_accno'     => '', // Default payment account number    1020
+                'payment_accno'     => '', // Default payment account number    1020
                 'notes'             => '',
                 'terms'             => '0',
@@ -426 +426 @@
         }
 
-        /**
-         * Prepare data of a customer by order id for sending to Run my Accounts
-         *
-         * @param $order_id
-         *
-         * @return array
-         * @throws Exception
-         */
-        private function get_customer_values_by_order_id( $order_id ) : array {
-
-            $settings        = get_option( 'wc_rma_settings' );
-            $customer_prefix = isset( $settings[ 'rma-guest-customer-prefix' ] ) ? $settings[ 'rma-guest-customer-prefix' ] : '';
-            unset( $settings );
-
-            $order                = new WC_Order( $order_id );
-
-            $is_company           = !empty( $order->get_billing_company() );
-
-            return array(
-                'customernumber'    => $customer_prefix . $order_id,
-                'name'              => ( $is_company ? $order->get_billing_company() : $order->get_billing_first_name() . ' ' . $order->get_billing_last_name() ),
-                'created'           => date('Y-m-d') . 'T00:00:00+01:00',
-                'salutation'        => ( 1 == get_post_meta( $order_id, '_billing_title', true ) ? __('Mr.', 'rma-wc') : __('Ms.', 'rma-wc') ),
-                'firstname'         => $order->get_billing_first_name(),
-                'lastname'          => $order->get_billing_last_name(),
-                'address1'          => $order->get_billing_address_1(),
-                'address2'          => $order->get_billing_address_2(),
-                'zipcode'           => $order->get_billing_postcode(),
-                'city'              => $order->get_billing_city(),
-                'state'             => $order->get_billing_state(),
-                'country'           => WC()->countries->countries[ $order->get_billing_country() ],
-                'phone'             => $order->get_billing_phone(),
-                'fax'               => '',
-                'mobile'            => '',
-                'email'             => $order->get_billing_email(),
-                'cc'                => '',
-                'bcc'               => '',
-                'language_code'     => '',
-                'remittancevoucher' => 'false',
-                'arap_accno'        => '', // Default accounts receivable account number - 1100
-                'payment_accno'     => '', // Default payment account number    1020
-                'notes'             => '',
-                'terms'             => '0',
-                'typeofcontact'     => ( $is_company ? 'company' : 'person' ),
-                'gender'            => ( 1 == $order->get_meta( '_billing_title' ) ? 'M' : 'F' ),
-
-            );
-
-        }
-
-        /**
-         * get WooCommerce order details
-         *
-         * @param $order_id
-         *
-         * @return array
-         * @throws DOMException
-         */
+        /**
+         * Prepare data of a customer by order id for sending to Run my Accounts
+         *
+         * @param $order_id
+         *
+         * @return array
+         * @throws Exception
+         */
+        private function get_customer_values_by_order_id( $order_id ) : array {
+
+            $settings        = get_option( 'wc_rma_settings' );
+            $customer_prefix = isset( $settings[ 'rma-guest-customer-prefix' ] ) ? $settings[ 'rma-guest-customer-prefix' ] : '';
+            unset( $settings );
+
+            $order                = new WC_Order( $order_id );
+
+            $is_company           = !empty( $order->get_billing_company() );
+
+            return array(
+                'customernumber'    => $customer_prefix . $order_id,
+                'name'              => ( $is_company ? $order->get_billing_company() : $order->get_billing_first_name() . ' ' . $order->get_billing_last_name() ),
+                'created'           => gmdate('Y-m-d') . 'T00:00:00+01:00',
+                'salutation'        => ( 1 == $order->get_meta( '_billing_title', true ) ? __('Mr.', 'run-my-accounts-for-woocommerce') : __('Ms.', 'run-my-accounts-for-woocommerce') ),
+                'firstname'         => $order->get_billing_first_name(),
+                'lastname'          => $order->get_billing_last_name(),
+                'address1'          => $order->get_billing_address_1(),
+                'address2'          => $order->get_billing_address_2(),
+                'zipcode'           => $order->get_billing_postcode(),
+                'city'              => $order->get_billing_city(),
+                'state'             => $order->get_billing_state(),
+                'country'           => WC()->countries->countries[ $order->get_billing_country() ],
+                'phone'             => $order->get_billing_phone(),
+                'fax'               => '',
+                'mobile'            => '',
+                'email'             => $order->get_billing_email(),
+                'cc'                => '',
+                'bcc'               => '',
+                'language_code'     => '',
+                'remittancevoucher' => 'false',
+                'arap_accno'        => '', // Default accounts receivable account number - 1100
+                'payment_accno'     => '', // Default payment account number    1020
+                'notes'             => '',
+                'terms'             => '0',
+                'typeofcontact'     => ( $is_company ? 'company' : 'person' ),
+                'gender'            => ( 1 == $order->get_meta( '_billing_title' ) ? 'M' : 'F' ),
+
+            );
+
+        }
+
+        /**
+         * get WooCommerce order details
+         *
+         * @param $order_id
+         *
+         * @return array
+         * @throws DOMException
+         */
         public static function get_wc_order_details( $order_id ): array {
 
-            $order                = wc_get_order( $order_id );
+            $order                = wc_get_order( $order_id );
             $option_accounting    = get_option( 'wc_rma_settings_accounting' );
-            $order_payment_method = $order->get_payment_method();
-
-            // if order is done without user account
-            if ( 0 == get_post_meta( $order_id, '_customer_user', true ) ) {
-
-                $settings = get_option('wc_rma_settings');
-
-                if ( 1 == $settings[ 'rma-create-guest-customer' ] ) {
-
-                    $rma_customer_id = (new RMA_WC_API)->create_rma_customer('order', $order_id );
-
-                    if ( false == $rma_customer_id ) {
-
-                        $log_values = array(
-                            'status' => 'error',
-                            'section_id' => $order_id,
-                            'section' => esc_html_x( 'Customer', 'Log Section', 'rma-wc'),
-                            'mode' => self::rma_mode(),
-                            'message' => __( 'Could not create RMA customer dedicated guest account', 'rma-wc' )
-                        );
-
-                        (new RMA_WC_API)->write_log($log_values);
-
-                    }
-
-                }
-                else {
-
-                    // customer id is equal to predefined catch all guest account
-                    $rma_customer_id         = $settings['rma-guest-catch-all'];
-
-                }
-
-            }
-            // ...or with user account
-            else {
-
-                $rma_customer_id             = get_user_meta( $order->get_customer_id(), 'rma_customer', true );
-
-            }
-
-            // Set order header
+            $order_payment_method = $order->get_payment_method();
+
+            // if order is done without user account
+            if ( 0 == $order->get_meta( '_customer_user', true ) ) {
+
+                $settings = get_option('wc_rma_settings');
+
+                if ( 1 == $settings[ 'rma-create-guest-customer' ] ) {
+
+                    $rma_customer_id = (new RMA_WC_API)->create_rma_customer('order', $order_id );
+
+                    if ( false == $rma_customer_id ) {
+
+                        $log_values = array(
+                            'status' => 'error',
+                            'section_id' => $order_id,
+                            'section' => esc_html_x( 'Customer', 'Log Section', 'run-my-accounts-for-woocommerce'),
+                            'mode' => self::rma_mode(),
+                            'message' => __( 'Could not create RMA customer dedicated guest account', 'run-my-accounts-for-woocommerce' )
+                        );
+
+                        (new RMA_WC_API)->write_log($log_values);
+
+                    }
+
+                }
+                else {
+
+                    // customer id is equal to predefined catch all guest account
+                    $rma_customer_id         = $settings['rma-guest-catch-all'];
+
+                }
+
+            }
+            // ...or with user account
+            else {
+
+                $rma_customer_id             = get_user_meta( $order->get_customer_id(), 'rma_customer', true );
+
+            }
+
+            // Set order header
             $order_details[ 'currency' ]       = $order->get_currency();
             $order_details[ 'orderdate' ]      = wc_format_datetime( $order->get_date_created(),'d.m.Y' );
             $order_details[ 'taxincluded' ]    = $order->get_prices_include_tax() ? 'true' : 'false';
             $order_details[ 'customernumber' ] = $rma_customer_id;
-            $order_details[ 'ar_accno' ]       = isset( $option_accounting[ $order_payment_method ] ) && !empty( $option_accounting[ $order_payment_method ] ) ? $option_accounting[ $order_payment_method ] : '';
-            $order_details[ 'payment_accno' ]  = isset( $option_accounting[ $order_payment_method . '_payment_account' ] ) && !empty( $option_accounting[ $order_payment_method . '_payment_account' ] ) ? $option_accounting[ $order_payment_method . '_payment_account' ] : '' ;
-
-            // Calculate due date
+            $order_details[ 'ar_accno' ]       = isset( $option_accounting[ $order_payment_method ] ) && !empty( $option_accounting[ $order_payment_method ] ) ? $option_accounting[ $order_payment_method ] : '';
+            $order_details[ 'payment_accno' ]  = isset( $option_accounting[ $order_payment_method . '_payment_account' ] ) && !empty( $option_accounting[ $order_payment_method . '_payment_account' ] ) ? $option_accounting[ $order_payment_method . '_payment_account' ] : '' ;
+
+            // Calculate due date
             $user_payment_period               = get_user_meta( $order->get_customer_id(), 'rma_payment_period', true );
             // Set payment period - if user payment period not exist set to global period
             $payment_period                    = $user_payment_period ? $user_payment_period : RMA_GLOBAL_PAYMENT_PERIOD;
             // Calculate duedate (now + payment period)
-            $order_details[ 'duedate' ]        = date( DateTime::RFC3339, time() + ( $payment_period*60*60*24 ) );
-
-            // add shipping address if needed
-            $order_details[ 'notes' ]          = '';
-            if( $order->needs_shipping_address() ) {
-
-                // first converts a break tag to a newline – no matter what kind of HTML is being processed.
-                $order_details[ 'notes' ]      = preg_replace('/<br(\s+)?\/?>/i', "\n", $order->get_formatted_shipping_address());
-
-            }
+            $order_details[ 'duedate' ]        = gmdate( DateTime::RFC3339, time() + ( $payment_period*60*60*24 ) );
+
+            // add shipping address if needed
+            $order_details[ 'notes' ]          = '';
+            if( $order->needs_shipping_address() ) {
+
+                // first converts a break tag to a newline – no matter what kind of HTML is being processed.
+                $order_details[ 'notes' ]      = preg_replace('/<br(\s+)?\/?>/i', "\n", $order->get_formatted_shipping_address());
+
+            }
 
             return $order_details;
@@ -557 +557 @@
         }
 
-        /**
-         * Collect products as order details
-         *
-         * @param int $order_id
-         * @param array $order_details_products
-         *
-         * @return array
-         *
-         * @since 1.7.0
-         */
-        public static function get_order_details_products( int $order_id, array $order_details_products = array() ): array
-        {
-
-            $order = wc_get_order( $order_id );
-
-            // add line items
-            foreach ( $order->get_items() as $item_id => $item ) {
-                $product       = $item->get_product();
-
-                // make sure the product is still available in WooCommerce
-                if( is_object( $product ) ) {
-
-                    $order_details_products[ $product->get_sku() ] = array(
-                        'name'     => $item->get_name(),
-                        'quantity' => $item->get_quantity(),
-                        'price'    => wc_format_decimal( $product->get_price(), 2 ),
-                        'item_id'  => $item_id
-                    );
-
-                }
-
-            }
-
-            return $order_details_products;
-
-        }
-
-        /**
-         * Add shipping costs as product, if necessary
-         *
-         * @param int $order_id
-         * @param array $order_details_products
-         *
-         * @return array
-         *
-         * @since 1.7.0
-         */
-        public static function get_order_details_shipping_costs( int $order_id, array $order_details_products): array
-        {
-
-            $settings = get_option( 'wc_rma_settings' );
-            $order    = wc_get_order( $order_id );
-
-            // Add Shipping costs
-            // @since 1.6.0
-            $order_shipping_total_net  = (float) $order->get_shipping_total();
-            $order_shipping_tax        = (float) $order->get_shipping_tax();
-            $shipping_costs_product_id = $settings['rma-shipping-id'] ?? '';
-
-            // Calculate shipping costs w/ or wo/ tax
-            if( $order->get_prices_include_tax() ) {
-                $order_shipping_total  = $order_shipping_total_net + $order_shipping_tax;
-            }
-            else {
-                $order_shipping_total  = $order_shipping_total_net;
-            }
-
-            // do we have shipping costs and a product id on file?
-            if( 0 < $order_shipping_total && !empty( $shipping_costs_product_id ) ) {
-
-                // we get shipping text from settings page otherwise we take shipping method
-                $shipping_text = ( isset( $settings['rma-shipping-text'] ) && !empty( $settings['rma-shipping-text'] ) ? $settings['rma-shipping-text'] : $order->get_shipping_method() );
-
-                $order_details_products[ $shipping_costs_product_id ] = array(
-                    'name'     => $shipping_text,
-                    'quantity' => 1,
-                    'price'    => $order_shipping_total
-                );
-
-            }
-            // do we have shipping costs but no product id on file?
-            elseif ( 0 < $order_shipping_total && empty( $shipping_costs_product_id ) ) {
-
-                $log_values = array(
-                    'status' => 'error',
-                    'section_id' => $order->get_id(),
-                    'section' => esc_html_x( 'Invoice', 'Log Section', 'rma-wc'),
-                    'mode' => (new RMA_WC_API)->rma_mode(),
-                    'message' => __( 'Could not add shipping costs to invoice because of missing shipping costs product sku', 'rma-wc' )
-                );
-
-                (new RMA_WC_API)->write_log($log_values);
-
-            }
-
-            return $order_details_products;
-
-        }
-
-        /**
-         * Create invoice in Run my Accounts
-         *
-         * @param string $order_id
-         *
-         * @return bool
-         *
-         * @throws DOMException
-         */
+        /**
+         * Collect products as order details
+         *
+         * @param int $order_id
+         * @param array $order_details_products
+         *
+         * @return array
+         *
+         * @since 1.7.0
+         */
+        public static function get_order_details_products( int $order_id, array $order_details_products = array() ): array
+        {
+
+            $order = wc_get_order( $order_id );
+
+            // add line items
+            foreach ( $order->get_items() as $item_id => $item ) {
+                $product       = $item->get_product();
+
+                // make sure the product is still available in WooCommerce
+                if( is_object( $product ) ) {
+
+                    $order_details_products[ $product->get_sku() ] = array(
+                        'name'     => $item->get_name(),
+                        'quantity' => $item->get_quantity(),
+                        'price'    => wc_format_decimal( $product->get_price(), 2 ),
+                        'item_id'  => $item_id
+                    );
+
+                }
+
+            }
+
+            return $order_details_products;
+
+        }
+
+        /**
+         * Add shipping costs as product, if necessary
+         *
+         * @param int $order_id
+         * @param array $order_details_products
+         *
+         * @return array
+         *
+         * @since 1.7.0
+         */
+        public static function get_order_details_shipping_costs( int $order_id, array $order_details_products): array
+        {
+
+            $settings = get_option( 'wc_rma_settings' );
+            $order    = wc_get_order( $order_id );
+
+            // Add Shipping costs
+            // @since 1.6.0
+            $order_shipping_total_net  = (float) $order->get_shipping_total();
+            $order_shipping_tax        = (float) $order->get_shipping_tax();
+            $shipping_costs_product_id = $settings['rma-shipping-id'] ?? '';
+
+            // Calculate shipping costs w/ or wo/ tax
+            if( $order->get_prices_include_tax() ) {
+                $order_shipping_total  = $order_shipping_total_net + $order_shipping_tax;
+            }
+            else {
+                $order_shipping_total  = $order_shipping_total_net;
+            }
+
+            // do we have shipping costs and a product id on file?
+            if( 0 < $order_shipping_total && !empty( $shipping_costs_product_id ) ) {
+
+                // we get shipping text from settings page otherwise we take shipping method
+                $shipping_text = ( isset( $settings['rma-shipping-text'] ) && !empty( $settings['rma-shipping-text'] ) ? $settings['rma-shipping-text'] : $order->get_shipping_method() );
+
+                $order_details_products[ $shipping_costs_product_id ] = array(
+                    'name'     => $shipping_text,
+                    'quantity' => 1,
+                    'price'    => $order_shipping_total
+                );
+
+            }
+            // do we have shipping costs but no product id on file?
+            elseif ( 0 < $order_shipping_total && empty( $shipping_costs_product_id ) ) {
+
+                $log_values = array(
+                    'status' => 'error',
+                    'section_id' => $order->get_id(),
+                    'section' => esc_html_x( 'Invoice', 'Log Section', 'run-my-accounts-for-woocommerce'),
+                    'mode' => (new RMA_WC_API)->rma_mode(),
+                    'message' => __( 'Could not add shipping costs to invoice because of missing shipping costs product sku', 'run-my-accounts-for-woocommerce' )
+                );
+
+                (new RMA_WC_API)->write_log($log_values);
+
+            }
+
+            return $order_details_products;
+
+        }
+
+        /**
+         * Create invoice in Run my Accounts
+         *
+         * @param string $order_id
+         *
+         * @return bool
+         *
+         * @throws DOMException
+         */
         public function create_invoice( string $order_id='' ): bool {
 
-            $is_active = self::is_activated( '$order_id ' . $order_id );
+            $is_active = self::is_activated( '$order_id ' . $order_id );
 
             // Continue only if an order_id is available and plugin function is activated
@@ -674 +674 @@
             $data = self::get_invoice_values( $order_id );
 
-            return self::create_xml_content( $data, array( $order_id ) );
-
-        }
-
-        /**
-         * Creates XML and send to Run My Accounts
-         *
-         * @param array $data              data of the complete invoice
-         * @param array $order_ids         an array of all affected orders for which we create the invoice
-         * @param bool $collective_invoice true if we create an collective invoice
-         *
-         * @return bool                    true if the invoice creation was successful otherwise false
-         * @throws DOMException
-         */
-        public static function create_xml_content( array $data, array $order_ids, bool $collective_invoice = false ): bool {
-
-            $url  = self::get_caller_url() . RMA_MANDANT . '/invoices?api_key=' . RMA_APIKEY;
-
-            //create the xml document
-            $xml  = new DOMDocument('1.0', 'UTF-8');
-
-            // create root element invoice and child
-            $root = $xml->appendChild( $xml->createElement("invoice") );
-            foreach( $data[ 'invoice' ] as $key => $value ) {
-                if ( ! empty( $key ) )
-                    $root->appendChild( $xml->createElement( $key, $value ) );
-            }
-
-            $tab_invoice = $root->appendChild($xml->createElement('parts'));
-
-            // create child elements part
-            foreach( $data[ 'part' ] as $part ){
-                if( !empty( $part ) ){
-                    $tab_part = $tab_invoice->appendChild($xml->createElement('part'));
-
-                    foreach( $part as $key=>$value ){
-                        $tab_part->appendChild($xml->createElement($key, $value));
-                    }
-                }
-            }
-
-            // make the output pretty
-            $xml->formatOutput = true;
-
-            // create xml content
-            $xml_str = $xml->saveXML() . "\n";
-
-            // send xml content to RMA
-            $response = self::send_xml_content( $xml_str, $url );
-
-            // $response empty == no errors
-            if ( 200 == self::first_key_of_array( $response ) ||
-                 204 == self::first_key_of_array( $response )) {
-
-                $status         = 'invoiced';
-                $invoice_type   = $collective_invoice ? esc_html_x( 'Collective invoice', 'Order Note', 'rma-wc') : esc_html_x( 'Invoice', 'Order Note', 'rma-wc') ;
-
-                $invoice_number = $data[ 'invoice' ][ 'invnumber' ];
-                $message        = sprintf( esc_html_x( '%s %s created', 'Log', 'rma-wc'), $collective_invoice, $invoice_number);
-
-                // add order note to each order
-                foreach ( $order_ids as $order_id ) {
-
-                    $order          = wc_get_order(  $order_id );
-                    $note           = sprintf( esc_html_x( '%s %s created in Run my Accounts', 'Order Note', 'rma-wc'), $invoice_type, $invoice_number);
-                    $order->add_order_note( $note );
-
-                    update_post_meta( $order_id, '_rma_invoice', $invoice_number );
-
-                    unset( $order );
-
-                }
-
-                $return = true;
-
-            }
-            else {
-
-                $status  = 'error';
-                $message = '[' . self::first_key_of_array( $response ) . '] ' . reset( $response ); // get value of first key = return message
-
-                $return = false;
-
-            }
-
-            if ( ( 'error' == LOGLEVEL && 'error' == $status ) || 'complete' == LOGLEVEL ) {
-
-                $log_values = array(
-                    'status' => $status,
-                    'section_id' => $order_id,
-                    'section' => esc_html_x('Invoice', 'Log Section', 'rma-wc'),
-                    'mode' => self::rma_mode(),
-                    'message' => $message );
-
-                (new RMA_WC_API)->write_log($log_values);
-
-                // send email on error
-                if ( 'error' == $status && SENDLOGEMAIL ) (new RMA_WC_API)->send_log_email($log_values);
-
-            }
-
-            return $return;
-
-        }
-
-        /**
-         * Create customer in Run my Accounts
-         *
-         * @param string $type
-         * @param string $id
-         * @param string $action new|update
-         *
-         * @return bool|string
-         *
-         * @throws DOMException
-         */
+            return self::create_xml_content( $data, array( $order_id ) );
+
+        }
+
+        /**
+         * Creates XML and send to Run My Accounts
+         *
+         * @param array $data              data of the complete invoice
+         * @param array $order_ids         an array of all affected orders for which we create the invoice
+         * @param bool $collective_invoice true if we create an collective invoice
+         *
+         * @return bool                    true if the invoice creation was successful otherwise false
+         * @throws DOMException
+         */
+        public static function create_xml_content( array $data, array $order_ids, bool $collective_invoice = false ): bool {
+
+            $url  = self::get_caller_url() . RMA_MANDANT . '/invoices?api_key=' . RMA_APIKEY;
+
+            //create the xml document
+            $xml  = new DOMDocument('1.0', 'UTF-8');
+
+            // create root element invoice and child
+            $root = $xml->appendChild( $xml->createElement("invoice") );
+            foreach( $data[ 'invoice' ] as $key => $value ) {
+                if ( ! empty( $key ) )
+                    $root->appendChild( $xml->createElement( $key, $value ) );
+            }
+
+            $tab_invoice = $root->appendChild($xml->createElement('parts'));
+
+            // create child elements part
+            foreach( $data[ 'part' ] as $part ){
+                if( !empty( $part ) ){
+                    $tab_part = $tab_invoice->appendChild($xml->createElement('part'));
+
+                    foreach( $part as $key=>$value ){
+                        $tab_part->appendChild($xml->createElement($key, $value));
+                    }
+                }
+            }
+
+            // make the output pretty
+            $xml->formatOutput = true;
+
+            // create xml content
+            $xml_str = $xml->saveXML() . "\n";
+
+            // send xml content to RMA
+            $response = self::send_xml_content( $xml_str, $url );
+
+            // $response empty == no errors
+            if ( 200 == self::first_key_of_array( $response ) ||
+                 204 == self::first_key_of_array( $response )) {
+
+                $status         = 'invoiced';
+                $invoice_type   = $collective_invoice ? esc_html_x( 'Collective invoice', 'Order Note', 'run-my-accounts-for-woocommerce') : esc_html_x( 'Invoice', 'Order Note', 'run-my-accounts-for-woocommerce') ;
+
+                $invoice_number = $data[ 'invoice' ][ 'invnumber' ];
+                $message        = sprintf( esc_html_x( '%1$s %2$s created', 'Log', 'run-my-accounts-for-woocommerce'), $collective_invoice, $invoice_number);
+
+                // add order note to each order
+                foreach ( $order_ids as $order_id ) {
+
+                    $order          = wc_get_order(  $order_id );
+                    $note           = sprintf( esc_html_x( '%1$s %2$s created in Run my Accounts', 'Order Note', 'run-my-accounts-for-woocommerce'), $invoice_type, $invoice_number);
+                    $order->add_order_note( $note );
+                    $order->update_meta_data( '_rma_invoice', $invoice_number );
+
+                    $order->save();
+
+                    unset( $order );
+
+                }
+
+                $return = true;
+
+            }
+            else {
+
+                $status  = 'error';
+                $message = '[' . self::first_key_of_array( $response ) . '] ' . reset( $response ); // get value of first key = return message
+
+                $return = false;
+
+            }
+
+            if ( ( 'error' == LOGLEVEL && 'error' == $status ) || 'complete' == LOGLEVEL ) {
+
+                $log_values = array(
+                    'status' => $status,
+                    'section_id' => $order_id,
+                    'section' => esc_html_x('Invoice', 'Log Section', 'run-my-accounts-for-woocommerce'),
+                    'mode' => self::rma_mode(),
+                    'message' => $message );
+
+                (new RMA_WC_API)->write_log($log_values);
+
+                // send email on error
+                if ( 'error' == $status && SENDLOGEMAIL ) (new RMA_WC_API)->send_log_email($log_values);
+
+            }
+
+            return $return;
+
+        }
+
+        /**
+         * Create customer in Run my Accounts
+         *
+         * @param string $type
+         * @param string $id
+         * @param string $action new|update
+         *
+         * @return bool|string
+         *
+         * @throws DOMException
+         */
         public function create_rma_customer( $type, $id='', $action = 'new') {
 
-            if( !$id || !$type)
-                return false;
-
-            // exit if plugin is not activated
+            if( !$id || !$type)
+                return false;
+
+            // exit if plugin is not activated
             if ( !self::is_activated('$user_id ' . $id ) )
-                return false;
+                return false;
 
             // exit if a customer should not be created automatically
-            if ( !self::do_create_customer() )
-                return false;
-
-            // exit if user is already linked to a RMA customer account
-            if ( 'user' == $type   &&
-                 'new'  == $action &&
-                 get_user_meta( $id, 'rma_customer', true ) )
-                return false;
-
-            $method = 'get_customer_values_by_' . $type . '_id';
-            $data   = self::$method( $id );
+            if ( !self::do_create_customer() )
+                return false;
+
+            // exit if user is already linked to a RMA customer account
+            if ( 'user' == $type   &&
+                 'new'  == $action &&
+                 get_user_meta( $id, 'rma_customer', true ) )
+                return false;
+
+            $method = 'get_customer_values_by_' . $type . '_id';
+            $data   = self::$method( $id );
 
             // build REST api url for Run my Accounts
@@ -836 +837 @@
             }
 
-            //create xml content
-            $xml_str = $xml_doc->saveXML() . "\n";
-
-            // send xml content to RMA with curl
-            $response = self::send_xml_content( $xml_str, $caller_url_customer );
-
-            // $response empty == no errors
-            if ( 200 == self::first_key_of_array( $response ) ||
-                 204 == self::first_key_of_array( $response )) {
-
-                // add RMA customer number to user_meta
-                $status         = 'created';
-                $message        = sprintf( esc_html_x( 'Customer %s created', 'Log', 'rma-wc'), $data['customernumber']);
-
-                if ( 'user' == $type )
-                    update_user_meta( $id, 'rma_customer', $data[ 'customernumber' ] );
-
-            }
-            else {
-
-                $status  = 'error';
-                $message = '[' . self::first_key_of_array( $response ) . '] ' . reset( $response ); // get value of first key = return message
-
-            }
-
-            if ( ( 'error' == LOGLEVEL && 'error' == $status ) || 'complete' == LOGLEVEL ) {
-
-                $log_values = array(
-                    'status' => $status,
-                    'section_id' => $id,
-                    'section' => sprintf( esc_html_x('Customer by %s id', 'Log Section', 'rma-wc'), $type),
-                    'mode' => self::rma_mode(),
-                    'message' => $message );
-
-                self::write_log($log_values);
-
-            }
+            //create xml content
+            $xml_str = $xml_doc->saveXML() . "\n";
+
+            // send xml content to RMA with curl
+            $response = self::send_xml_content( $xml_str, $caller_url_customer );
+
+            // $response empty == no errors
+            if ( 200 == self::first_key_of_array( $response ) ||
+                 204 == self::first_key_of_array( $response )) {
+
+                // add RMA customer number to user_meta
+                $status         = 'created';
+                $message        = sprintf( esc_html_x( 'Customer %s created', 'Log', 'run-my-accounts-for-woocommerce'), $data['customernumber']);
+
+                if ( 'user' == $type )
+                    update_user_meta( $id, 'rma_customer', $data[ 'customernumber' ] );
+
+            }
+            else {
+
+                $status  = 'error';
+                $message = '[' . self::first_key_of_array( $response ) . '] ' . reset( $response ); // get value of first key = return message
+
+            }
+
+            if ( ( 'error' == LOGLEVEL && 'error' == $status ) || 'complete' == LOGLEVEL ) {
+
+                $log_values = array(
+                    'status' => $status,
+                    'section_id' => $id,
+                    'section' => sprintf( esc_html_x('Customer by %s id', 'Log Section', 'run-my-accounts-for-woocommerce'), $type),
+                    'mode' => self::rma_mode(),
+                    'message' => $message );
+
+                self::write_log($log_values);
+
+            }
 
             return 'error' == $status ? 'false' : $data[ 'customernumber' ];
         }
 
-        /**
-         * Return first key of an array
-         * can be replaced by array_key_first() when min. PHP is 7.3
-         *
-         * @param $array
-         *
-         * @return string
-         *
-         * @since 1.5.2
-         */
-        // ToDo: replace this function as soon as min. PHP is 7.3 or above
+        /**
+         * Return first key of an array
+         * can be replaced by array_key_first() when min. PHP is 7.3
+         *
+         * @param $array
+         *
+         * @return string
+         *
+         * @since 1.5.2
+         */
+        // ToDo: replace this function as soon as min. PHP is 7.3 or above
         public static function first_key_of_array( $array ): string
-        {
-
-            // set point of the array
-            reset( $array );
-
-            // return the key
-            return key( $array );
-
-        }
-
-        /**
-         * Send xml content to RMA with curl
-         *
-         * @param $xml string
-         * @param $url string
-         *
-         * @return array
-         */
+        {
+
+            // set point of the array
+            reset( $array );
+
+            // return the key
+            return key( $array );
+
+        }
+
+        /**
+         * Send xml content to RMA with curl
+         *
+         * @param $xml string
+         * @param $url string
+         *
+         * @return array
+         */
         public static function send_xml_content( string $xml, string $url ): array {
 
-            $response = wp_safe_remote_post(
-                $url,
-                array(
-                    'headers'          => array(
-                        'Content-Type' => 'application/xml'
-                    ),
-                    'body'             => $xml
-                )
-            );
-
-            $response_code    = wp_remote_retrieve_response_code( $response );
-            $response_body    = wp_remote_retrieve_body( $response );
-
-            return array( $response_code => $response_body );
-
-        }
+            $response = wp_safe_remote_post(
+                $url,
+                array(
+                    'headers'          => array(
+                        'Content-Type' => 'application/xml'
+                    ),
+                    'body'             => $xml
+                )
+            );
+
+            $response_code    = wp_remote_retrieve_response_code( $response );
+            $response_body    = wp_remote_retrieve_body( $response );
+
+            return array( $response_code => $response_body );
+
+        }
 
         /**
@@ -943 +944 @@
                     'status'     => 'deactivated',
                     'section_id' => $section_id,
-                    'section'    => esc_html_x( 'Activation', 'Log Section', 'rma-wc' ),
+                    'section'    => esc_html_x( 'Activation', 'Log Section', 'run-my-accounts-for-woocommerce' ),
                     'mode'       => self::rma_mode(),
-                    'message'    => esc_html_x( 'Plugin was not activated', 'Log', 'rma-wc' ) );
+                    'message'    => esc_html_x( 'Plugin was not activated', 'Log', 'run-my-accounts-for-woocommerce' ) );
 
                 self::write_log($log_values);
@@ -955 +956 @@
         }
 
-        /**
-         * Check if the customer should be created in Run my Accounts
-         *
-         * @return string
-         */
-        private function do_create_customer(): string {
-
-            $settings = get_option( 'wc_rma_settings' );
-            return isset( $settings[ 'rma-create-customer' ] ) ? $settings[ 'rma-create-customer' ] : '';
-
-        }
-
-        /**
-         * @return string
-         */
-        public static function rma_mode(): string
-        {
-            return RMA_CALLERSANDBOX ? 'Test' : 'Live' ;
-        }
+        /**
+         * Check if the customer should be created in Run my Accounts
+         *
+         * @return string
+         */
+        private function do_create_customer(): string {
+
+            $settings = get_option( 'wc_rma_settings' );
+            return isset( $settings[ 'rma-create-customer' ] ) ? $settings[ 'rma-create-customer' ] : '';
+
+        }
+
+        /**
+         * @return string
+         */
+        public static function rma_mode(): string
+        {
+            return RMA_CALLERSANDBOX ? 'Test' : 'Live' ;
+        }
 
         /**
@@ -983 +984 @@
          */
         public function write_log( &$values ): bool {
-            global $wpdb;
-
-            $table_name = $wpdb->prefix . RMA_WC_LOG_TABLE;
-
-            $wpdb->insert( $table_name,
-                array(
-                    'time'       => current_time( 'mysql' ),
-                    'status'     => $values['status'],
-                    'section_id' => $values['section_id'],
-                    'section'    => $values['section'],
-                    'mode'       => $values['mode'],
-                    'message'    => $values['message']
-                )
+
+            If( ! function_exists( 'wc_get_logger' ) || empty( $values ) ) {
+                return false;
+            }
+
+            // create the message
+            $message = sprintf( esc_html__( 'Section %1$s: status %2$s message "%3$s".', 'run-my-accounts-for-woocommerce'),
+                                $values['section'],
+                                $values['status'],
+                                $values['message']
             );
 
-            // send email on error
-            if ( 'error' == $values['status'] && SENDLOGEMAIL ) $this->send_log_email($values);
-
-            return true;
+            // array with additional log information
+            $args = array(
+                'source'  => 'Run My Accounts',
+                'section' => $values['section'],
+                'ID'      => $values['section_id'],
+                'mode'    => $values['mode']
+
+            );
+
+            switch( $values['status'] ) {
+                /*
+                 * wc_get_logger()->emergency( '' ); system is unusable
+                 * wc_get_logger()->alert( '' ); action must be taken immediately
+                 * wc_get_logger()->critical( '' ); critical conditions
+                 * wc_get_logger()->error( '' ); error conditions
+                 * wc_get_logger()->warning( '' ); warning conditions
+                 * wc_get_logger()->notice( '' ); normal but significant condition
+                 * wc_get_logger()->info( '' ); informational messages
+                 * wc_get_logger()->debug( '' ); debug-level messages
+                 */
+                case 'error':
+                    wc_get_logger()->error( $message, $args );
+
+                    // send email on error
+                    if ( SENDLOGEMAIL ) $this->send_log_email($values);
+
+                    break;
+
+                case 'failed':
+                    wc_get_logger()->warning( $message, $args );
+                    break;
+                default:
+                    wc_get_logger()->info( $message, $args );
+                    break;
+            }
+
+            return true;
         }
 
@@ -1013 +1044 @@
         public function send_log_email( &$values ): bool {
 
-            ob_start();
-            include( plugin_dir_path( __FILE__ ) . '../templates/email/error-email-template.php');
-            $email_content = ob_get_contents();
-            ob_end_clean();
-
-            $headers = array('Content-Type: text/html; charset=UTF-8');
-            if ( !wp_mail( LOGEMAIL, esc_html_x('An error occurred while connecting with Run my Accounts API', 'email', 'rma-wc'), $email_content, $headers) ) {
-
-                $log_values = array(
-                    'status'     => 'failed',
-                    'section_id' => LOGEMAIL,
-                    'section'    => esc_html_x( 'Email', 'Log Section', 'rma-wc' ),
-                    'mode'       => self::rma_mode(),
-                    'message'    => esc_html_x( 'Failed to send email.' , 'Log', 'rma-wc') );
-
-                self::write_log($log_values);
-
-            } elseif ( 'complete' == LOGLEVEL) {
-
-                $log_values = array(
-                    'status'     => 'send',
-                    'section_id' => LOGEMAIL,
-                    'section'    => esc_html_x( 'Email', 'Log Section', 'rma-wc' ),
-                    'mode'       => self::rma_mode(),
-                    'message'    => esc_html_x( 'Email sent successfully.' , 'Log', 'rma-wc') );
-
-                self::write_log($log_values);
-
-            }
+            ob_start();
+            include( plugin_dir_path( __FILE__ ) . '../templates/email/error-email-template.php');
+            $email_content = ob_get_contents();
+            ob_end_clean();
+
+            $headers = array('Content-Type: text/html; charset=UTF-8');
+            if ( !wp_mail( LOGEMAIL, esc_html_x('An error occurred while connecting with Run my Accounts API', 'email', 'run-my-accounts-for-woocommerce'), $email_content, $headers) ) {
+
+                $log_values = array(
+                    'status'     => 'failed',
+                    'section_id' => LOGEMAIL,
+                    'section'    => esc_html_x( 'Email', 'Log Section', 'run-my-accounts-for-woocommerce' ),
+                    'mode'       => self::rma_mode(),
+                    'message'    => esc_html_x( 'Failed to send email.' , 'Log', 'run-my-accounts-for-woocommerce') );
+
+                self::write_log($log_values);
+
+            } elseif ( 'complete' == LOGLEVEL) {
+
+                $log_values = array(
+                    'status'     => 'send',
+                    'section_id' => LOGEMAIL,
+                    'section'    => esc_html_x( 'Email', 'Log Section', 'run-my-accounts-for-woocommerce' ),
+                    'mode'       => self::rma_mode(),
+                    'message'    => esc_html_x( 'Email sent successfully.' , 'Log', 'run-my-accounts-for-woocommerce') );
+
+                self::write_log($log_values);
+
+            }
 
             return true;

run-my-accounts-for-woocommerce/trunk/classes/class-RMA_WC_Backend.php

@@ -71 +71 @@
         public function plugins_loaded() {
 
-            $this->create();
             $this->update();
         }

run-my-accounts-for-woocommerce/trunk/classes/class-RMA_WC_Backend_Abstract.php

@@ -17 +17 @@
 
         const VERSION = '1.7.1';
-        const DB_VERSION = '1.1.0';
-
-        private static function _table_log() {
-            global $wpdb;
-            return $wpdb->prefix . RMA_WC_LOG_TABLE;
-        }
-
-        public function create() {
-
-            /**
-             * Create Custom Table
-             * https://codex.wordpress.org/Creating_Tables_with_Plugins
-             */
-
-            global $wpdb;
-
-            if ($wpdb->get_var("SHOW TABLES LIKE '".self::_table_log()."'") != self::_table_log()) {
-
-                $charset_collate = $wpdb->get_charset_collate();
-
-                $sql = 'CREATE TABLE ' . self::_table_log() . ' (
-                    id mediumint(9) NOT NULL AUTO_INCREMENT,
-                    time datetime DEFAULT "0000-00-00 00:00:00" NOT NULL,
-                    status text NOT NULL,
-                    section text NOT NULL, 
-                    section_id text NOT NULL,
-                    mode text NOT NULL,
-                    message text NOT NULL, 
-                    UNIQUE KEY id (id) ) ' . $charset_collate . ';';
-
-                require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
-
-                dbDelta($sql);
-
-            }
-
-        }
 
         /**
@@ -60 +23 @@
          */
         public function update() {
-            /**
-             * get_option() WP Since: 1.0.0
-             * https://codex.wordpress.org/Function_Reference/get_option
-             */
-            if ( self::DB_VERSION > get_option( 'wc_rma_db_version' ) ) { // update option if value is different
-
-                // database update if necessary
-                /**
-                 * update_option() WP Since: 1.0.0
-                 * https://codex.wordpress.org/Function_Reference/update_option
-                 */
-                update_option("wc_rma_db_version", self::DB_VERSION);
-
-            }
 
             if ( self::VERSION > get_option( 'wc_rma_version' ) ) { // update option if value is different
@@ -90 +39 @@
 
                 // drop table
-                $wpdb->query('DROP TABLE IF EXISTS ' . self::_table_log() . ';');
+                $table_name = $wpdb->prefix . 'rma_wc_log';
+                $wpdb->query( $wpdb->prepare( 'DROP TABLE IF EXISTS %i', $table_name ) ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.SchemaChange
 
                 // delete all options
@@ -107 +57 @@
              */
             add_option('wc_rma_version', self::VERSION);
-            add_option('wc_rma_db_version', self::DB_VERSION);
+
         }
 
@@ -126 +76 @@
 
                 // add invoice column to order page
-                add_filter( 'manage_edit-shop_order_columns', array( $this, 'add_column_to_order_table' ) );
-                add_action( 'manage_shop_order_posts_custom_column', array( $this, 'add_value_to_order_table_row' ) );
-
-                // add bulk action to order page
+                add_filter( 'manage_edit-shop_order_columns', array( $this, 'add_column_to_order_table' ) ); // compatibility without HPOS
+                add_action( 'manage_shop_order_posts_custom_column', array( $this, 'add_value_to_order_table_row' ) );  // compatibility without HPOS
+
+                add_filter( 'manage_woocommerce_page_wc-orders_columns', array( $this, 'add_column_to_order_table' ) ); // with HPOS
+                add_action( 'manage_woocommerce_page_wc-orders_custom_column', array( $this, 'add_value_to_order_table_row_hpos' ), 10, 2 ); // with HPOS
+
+                // add bulk action to order page
                 add_filter( 'bulk_actions-edit-shop_order', array( $this, 'create_invoice_bulk_actions_edit_product'), 20, 1 );
                 add_filter( 'handle_bulk_actions-edit-shop_order', array( $this, 'create_invoice_handle_bulk_action_edit_shop_order'), 10, 3 );
@@ -158 +111 @@
          */
         public function create_invoice_bulk_actions_edit_product( $actions ) {
-            $actions['rma_create_invoice'] = __( 'Create Invoice', 'rma-wc' );
+            $actions['rma_create_invoice'] = __( 'Create Invoice', 'run-my-accounts-for-woocommerce' );
             return $actions;
         }
@@ -192 +145 @@
             foreach ( $post_ids as $post_id ) {
 
-                $invoice_number = get_post_meta( $post_id, '_rma_invoice' );
+                $order = wc_get_order( $post_id );
+                $invoice_number = $order->get_meta( '_rma_invoice', true );
 
                 // order has already an invoice
@@ -245 +199 @@
                         'Created %s invoices',
                         $success_count,
-                        'rma-wc'
+                        'run-my-accounts-for-woocommerce'
                     ) . '</p></div>', number_format_i18n( $success_count ) );
 
@@ -263 +217 @@
 
             // bail if the order has been paid for or invoice was already created
-            if ( $theorder->is_paid() || !empty( get_post_meta( $theorder->get_id(), '_rma_invoice', true ) ) ){
+            if ( $theorder->is_paid() || !empty( $theorder->get_meta( '_rma_invoice', true ) ) ){
                 return $actions;
             }
 
-            $actions['create_rma_invoice'] = __( 'Create invoice in Run my Accounts', 'rma-wc' );
+            $actions['create_rma_invoice'] = __( 'Create invoice in Run my Accounts', 'run-my-accounts-for-woocommerce' );
             return $actions;
 
@@ -293 +247 @@
          * @return array
          */
-        public function add_column_to_order_table( $columns ) {
-
-            $columns = RMA_WC_Frontend::array_insert( $columns, 'order_total', 'rma_invoice', __( 'Invoice #', 'rma-wc'));
-
-            return $columns;
-        }
-
+        public function add_column_to_order_table( $columns ): array {
+
+            return RMA_WC_Frontend::array_insert($columns, 'order_total', 'rma_invoice', __('Invoice #', 'run-my-accounts-for-woocommerce'));
+
+        }
         public function add_value_to_order_table_row( $column ) {
 
@@ -306 +258 @@
             switch ( $column ) {
                 case 'rma_invoice' :
-                    echo get_post_meta( $post->ID, '_rma_invoice', true );
+
+                    $order = wc_get_order( $post->ID );
+                    echo $order->get_meta( '_rma_invoice', true );
+
                 default:
             }
@@ -312 +267 @@
 
         }
+
+        /**
+         * Add value to admin order table for HPOS
+         *
+         * @param $column
+         * @param $wc_order_obj
+         *
+         * @return void
+         */
+        public function add_value_to_order_table_row_hpos( $column, $wc_order_obj ) {
+
+            switch ( $column ) {
+                case 'rma_invoice' :
+
+                    echo $wc_order_obj->get_meta( '_rma_invoice', true );
+
+                default:
+            }
+
+
+        }
 
         /**
@@ -366 +342 @@
             if ( ! defined( 'WC_GERMANIZED_VERSION' ) ) {
                 $fields['billing']['fields']['billing_title'] = array(
-                    'label'       => __('Title', 'rma-wc'),
+                    'label'       => __('Title', 'run-my-accounts-for-woocommerce'),
                     'type'        => 'select',
                     'options'     => apply_filters( 'woocommerce_rma_title_options',
                         array(
-                            1 => __('Mr.', 'rma-wc'),
-                            2 => __('Ms.', 'rma-wc')
+                            1 => __('Mr.', 'run-my-accounts-for-woocommerce'),
+                            2 => __('Ms.', 'run-my-accounts-for-woocommerce')
                         )
                     )
@@ -377 +353 @@
             }
 
-            $fields[ 'rma' ][ 'title' ] = __( 'Settings Run my Accounts', 'rma-wc' );
+            $fields[ 'rma' ][ 'title' ] = __( 'Settings Run my Accounts', 'run-my-accounts-for-woocommerce' );
 
             $RMA_WC_API = new RMA_WC_API();
@@ -385 +361 @@
 
                 $fields[ 'rma' ][ 'fields' ][ 'rma_customer' ] = array(
-                    'label'       => __( 'Customer', 'rma-wc' ),
+                    'label'       => __( 'Customer', 'run-my-accounts-for-woocommerce' ),
                     'type'        => 'select',
-                    'options'     => array('' => __( 'Error while connecting to RMA. Please check your settings.', 'rma-wc' )),
-                    'description' => __( 'Select the corresponding RMA customer for this account.', 'rma-wc' )
+                    'options'     => array('' => __( 'Error while connecting to RMA. Please check your settings.', 'run-my-accounts-for-woocommerce' )),
+                    'description' => __( 'Select the corresponding RMA customer for this account.', 'run-my-accounts-for-woocommerce' )
                 );
 
@@ -394 +370 @@
             }
 
-            $options = array('' => __( 'Select customer...', 'rma-wc' )) + $options;
+            $options = array('' => __( 'Select customer...', 'run-my-accounts-for-woocommerce' )) + $options;
 
             $fields[ 'rma' ][ 'fields' ][ 'rma_customer' ] = array(
-                'label'       => __( 'Customer', 'rma-wc' ),
+                'label'       => __( 'Customer', 'run-my-accounts-for-woocommerce' ),
                 'type'        => 'select',
                 'options'     => $options,
-                'description' => __( 'Select the corresponding RMA customer for this account.', 'rma-wc' )
+                'description' => __( 'Select the corresponding RMA customer for this account.', 'run-my-accounts-for-woocommerce' )
             );
 
@@ -406 +382 @@
 
             $fields[ 'rma' ][ 'fields' ][ 'rma_billing_account' ] = array(
-                'label'       => __( 'Receivables Account', 'rma-wc' ),
+                'label'       => __( 'Receivables Account', 'run-my-accounts-for-woocommerce' ),
                 'type'        => 'input',
-                'description' => __( 'The receivables account has to be available in RMA. Leave it blank to use default value 1100.', 'rma-wc' )
+                'description' => __( 'The receivables account has to be available in RMA. Leave it blank to use default value 1100.', 'run-my-accounts-for-woocommerce' )
             );
 
             $fields[ 'rma' ][ 'fields' ][ 'rma_payment_period' ] = array(
-                'label'       => __( 'Payment Period', 'rma-wc' ),
+                'label'       => __( 'Payment Period', 'run-my-accounts-for-woocommerce' ),
                 'type'        => 'input',
-                'description' => __( 'How many days has this customer to pay your invoice?', 'rma-wc' )
+                'description' => __( 'How many days has this customer to pay your invoice?', 'run-my-accounts-for-woocommerce' )
             );
 
@@ -424 +400 @@
          *
          * @param $user_id int the ID of the current user.
+         *
          * @return bool Meta ID if the key didn't exist, true on successful update, false on failure.
          */
-        public function usermeta_form_field_update( $user_id ) {
+        public function usermeta_form_field_update( int $user_id ): bool {
             // check that the current user have the capability to edit the $user_id
             if (!current_user_can('edit_user', $user_id))

run-my-accounts-for-woocommerce/trunk/classes/class-RMA_WC_Collective_Invoicing.php

@@ -41 +41 @@
         if( !empty( $dates ) ) {
 
-            $this->settings[ 'collective_invoice_next_date_ts' ] = strtotime(date('Y-m-d', $dates[ 'next_date_ts' ] ) );
+            $this->settings[ 'collective_invoice_next_date_ts' ] = strtotime(gmdate('Y-m-d', $dates[ 'next_date_ts' ] ) );
             update_option( 'wc_rma_settings_collective_invoice', $this->settings );
 
@@ -81 +81 @@
 
                 // if weekday is today and the next cron run is today
-                if( date('N', strtotime( 'now' ) ) == $weekday_number &&
+                if( gmdate('N', strtotime( 'now' ) ) == $weekday_number &&
                     $next_time[ 'next_time_ts_utc' ] == $possible_today_cron_ts_utc ) {
 
@@ -161 +161 @@
                     return array(
                         'next_time_ts_utc' => $next_ts_utc,
-                        'time_utc'         => date( get_option( 'time_format' ) . ':s', $next_ts_utc ),
-                        'time'             => get_date_from_gmt( date( get_option( 'time_format' ), $next_ts_utc ), get_option( 'time_format' ) )
+                        'time_utc'         => gmdate( get_option( 'time_format' ) . ':s', $next_ts_utc ),
+                        'time'             => get_date_from_gmt( gmdate( get_option( 'time_format' ), $next_ts_utc ), get_option( 'time_format' ) )
                     );
 
@@ -197 +197 @@
         }
 
-        $orders_no_invoice = get_posts( array(
-                                            'numberposts'     => -1,
-                                            'post_type'       => 'shop_order',
-                                            'post_status'     => 'wc-completed',
-                                            'meta_query'      => array(
-                                                'relation'    => 'AND',
-                                                array(
-                                                    'key'     => '_rma_invoice',
-                                                    'compare' => 'NOT EXISTS',
-                                                ),
-                                            )
-                                        )
-        );
+        $orders_no_invoice = wc_get_orders(
+            array(
+                'type' => 'shop_order',
+                'limit' => -1,
+                'status' => array(
+                    'wc-completed'
+                ),
+                array(
+                    'meta_query'      => array(
+                        'relation'    => 'AND',
+                        array(
+                            'key'     => '_rma_invoice',
+                            'compare' => 'NOT EXISTS',
+                        ),
+                    )
+                )
+            )
+        );
 
         $cumulated_orders_by_customer_id = array();
@@ -257 +262 @@
 
         // get the timestamp with the current date, but without time
-        $current_date = strtotime(date('Y-m-d', time() ) );
+        $current_date = strtotime(gmdate('Y-m-d', time() ) );
 
         // if we do not have to create collective invoices today
@@ -348 +353 @@
 
             $headers = array('Content-Type: text/html; charset=UTF-8');
-            $email_content = sprintf( esc_html_x('The following collective invoices were sent: %s', 'email', 'rma-wc'), implode(', ', $created_invoices ) );
-            wp_mail( LOGEMAIL, esc_html_x( 'Collective invoices were sent', 'email', 'rma-wc' ), $email_content, $headers);
+            $email_content = sprintf( esc_html_x('The following collective invoices were sent: %s', 'email', 'run-my-accounts-for-woocommerce'), implode(', ', $created_invoices ) );
+            wp_mail( LOGEMAIL, esc_html_x( 'Collective invoices were sent', 'email', 'run-my-accounts-for-woocommerce' ), $email_content, $headers);
 
         }
@@ -361 +366 @@
         if( !empty( $dates ) ) {
 
-            $this->settings[ 'collective_invoice_next_date_ts' ] = strtotime(date('Y-m-d', $dates[ 'next_date_ts' ] ) );
+            $this->settings[ 'collective_invoice_next_date_ts' ] = strtotime(gmdate('Y-m-d', $dates[ 'next_date_ts' ] ) );
             update_option( 'wc_rma_settings_collective_invoice', $this->settings );
 

run-my-accounts-for-woocommerce/trunk/classes/class-RMA_WC_Frontend.php

@@ -106 +106 @@
 
             $fields['billing_title'] = array(
-                'label'       => esc_html__('Title', 'rma-wc'),
+                'label'       => esc_html__('Title', 'run-my-accounts-for-woocommerce'),
                 'type'        => 'select',
                 'class'       => array ( 'form-row-wide', 'address-field' ),
@@ -112 +112 @@
                     'woocommerce_rma_title_options',
                     array(
-                        1 => __('Mr.', 'rma-wc'),
-                        2 => __('Ms.', 'rma-wc')
+                        1 => __('Mr.', 'run-my-accounts-for-woocommerce'),
+                        2 => __('Ms.', 'run-my-accounts-for-woocommerce')
                     )
                 ),
@@ -133 +133 @@
 
             if ( ! empty( $_POST['billing_title'] ) ) {
-                update_post_meta( $order_id, '_billing_title', sanitize_text_field( $_POST['billing_title'] ) );
+
+                $order = wc_get_order( $order_id );
+                $order->update_meta_data( '_billing_title', sanitize_text_field( $_POST['billing_title'] ) );
+                $order->save();
+
             }
 
@@ -147 +151 @@
         public function add_column_to_user_table( $column ): array {
 
-            $column = self::array_insert( $column, 'email', 'rma_customer_id', __( 'RMA Customer # ', 'rma-wc') );
+            $column = self::array_insert( $column, 'email', 'rma_customer_id', __( 'RMA Customer # ', 'run-my-accounts-for-woocommerce') );
 
             return $column;
@@ -197 +201 @@
         public function plugins_loaded() {
 
-            self::load_textdomain();
-
             // Display the admin notification
             add_action( 'admin_notices', array( $this, 'admin_notices' ) ) ;
-        }
-
-        /**
-         * Load Textdomains
-         */
-        public function load_textdomain() {
-
-            /**
-             * load_textdomain() WP Since: 1.0.0
-             * https://codex.wordpress.org/Function_Reference/load_textdomain
-             */
-            load_textdomain( 'rma-wc', WP_LANG_DIR . "/plugins/rma-wc/rma-wc-$this->locale.mo" );
-
-            /**
-             * load_plugin_textdomain() WP Since: 1.0.0
-             * https://codex.wordpress.org/Function_Reference/load_plugin_textdomain
-             */
-            load_plugin_textdomain( 'rma-wc', false, plugin_basename( RMA_WC_PFAD . 'languages/' ) );
-
         }
 
@@ -234 +217 @@
                 $html = '<div class="notice notice-error">';
                 $html .= '<p>';
-                $html .= '<b>'.esc_html__( 'Run my Accounts for WooCommerce', 'rma-wc' ).'&nbsp;</b>';
-                $html .= esc_html__( 'You are using a wrong PHP version. You need to install PHP 7.2 or higher.', 'rma-wc' );
+                $html .= '<b>'.esc_html__( 'Run my Accounts for WooCommerce', 'run-my-accounts-for-woocommerce' ).'&nbsp;</b>';
+                $html .= esc_html__( 'You are using a wrong PHP version. You need to install PHP 7.2 or higher.', 'run-my-accounts-for-woocommerce' );
                 $html .= '&nbsp;';
-                $html .= sprintf( esc_html__( 'The current PHP version is %s.', 'rma-wc' ), PHP_VERSION);
+                $html .= sprintf( esc_html__( 'The current PHP version is %s.', 'run-my-accounts-for-woocommerce' ), PHP_VERSION);
                 $html .= '</p>';
                 $html .= '</div>';
@@ -249 +232 @@
                 $html = '<div class="notice notice-warning">';
                 $html .= '<p>';
-                $html .= '<b>'.esc_html__( 'Warning', 'rma-wc' ).'&nbsp;</b>';
-                $html .= esc_html__('Please enter your Production Client and Production API Key before using Run my Accounts for WooCommerce in production mode.', 'rma-wc' );
+                $html .= '<b>'.esc_html__( 'Warning', 'run-my-accounts-for-woocommerce' ).'&nbsp;</b>';
+                $html .= esc_html__('Please enter your Production Client and Production API Key before using Run my Accounts for WooCommerce in production mode.', 'run-my-accounts-for-woocommerce' );
                 $html .= '</p>';
                 $html .= '</div>';
@@ -261 +244 @@
 
                 $html = '<div class="update-nag">';
-                $html .= esc_html__( 'WooCommerce Run my Accounts is not activated. No invoice will be created.', 'rma-wc' );
+                $html .= esc_html__( 'WooCommerce Run my Accounts is not activated. No invoice will be created.', 'run-my-accounts-for-woocommerce' );
                 $html .= '</div>';
 
@@ -324 +307 @@
         public function create_invoice_on_status_change( $order_id, $old_status, $new_status ) {
 
-            $invoice_number = get_post_meta( $order_id, '_rma_invoice', true );
+            $order = wc_get_order( $order_id );
+            $invoice_number = $order->get_meta( '_rma_invoice', true );
 
             if( !empty( $invoice_number ) || 'completed' != $new_status || !class_exists('RMA_WC_API') )

run-my-accounts-for-woocommerce/trunk/classes/class-RMA_WC_Payment.php

@@ -81 +81 @@
 
         // get the Run My Accounts invoice number
-        $this->invoice = get_post_meta( $this->order_id, '_rma_invoice', true );
+        $order = wc_get_order( $this->order_id );
+        $this->invoice = $order->get_meta('_rma_invoice', true );
 
         $data = self::get_payment_details();
@@ -111 +112 @@
             $status         = 'paid';
 
-            $message        = sprintf( esc_html_x( 'Payment %s %s booked on account %s', 'Order Note', 'rma-wc'), $data['payment']['amount_paid'], $data['payment']['currency'], $data['payment']['payment_accno'] );
+            $message        = sprintf( esc_html_x( 'Payment %1$s %2$s booked on account %3$s', 'Order Note', 'run-my-accounts-for-woocommerce'), $data['payment']['amount_paid'], $data['payment']['currency'], $data['payment']['payment_accno'] );
 
             // add order note
@@ -130 +131 @@
 
             $log_values = array(
-                'status' => $status,
+                'status'     => $status,
                 'section_id' => $this->order_id,
-                'section' => esc_html_x('Payment', 'Log Section', 'rma-wc'),
-                'mode' => (new RMA_WC_API)->rma_mode(),
-                'message' => $message );
+                'section'    => esc_html_x('Payment', 'Log Section', 'run-my-accounts-for-woocommerce'),
+                'mode'       => (new RMA_WC_API)->rma_mode(),
+                'message'    => $message );
 
             (new RMA_WC_API)->write_log($log_values);
@@ -158 +159 @@
         if ( isset( $this->settings[ $name ] ) && 1 == $this->settings[ $name ] ) {
 
-            $message        = esc_html_x( 'Payment not booked in Run my Accounts. Payment method is excluded for payment booking.', 'Order Note', 'rma-wc');
+            $message        = esc_html_x( 'Payment not booked in Run my Accounts. Payment method is excluded for payment booking.', 'Order Note', 'run-my-accounts-for-woocommerce');
             // add order note
             $order->add_order_note( $message );
@@ -189 +190 @@
                 'id'             => $this->order_id,
                 'invnumber'      => $this->invoice,
-                'datepaid'       => date(DATE_RFC3339), //$order->get_date_paid() ,//date( DateTime::RFC3339, time() ),
+                'datepaid'       => gmdate(DATE_RFC3339), //$order->get_date_paid() ,//gmdate( DateTime::RFC3339, time() ),
                 'amount_paid'    => $order->get_total(),
                 'source'         => 'Shop-Payment',

run-my-accounts-for-woocommerce/trunk/classes/class-RMA_WC_Rental_And_Booking.php

@@ -105 +105 @@
         // build multiline description
         $part[ 'description' ] = $part[ 'description' ] . "\n" .
-                                 sprintf( __( 'Pickup Location: %s', 'rma-wc' ), $pickup_location ) . "\n" .
-                                 sprintf( __( 'Pickup Date/Time: %s', 'rma-wc' ), $pickup_date ) . "\n" .
-                                 sprintf( __( 'Return Date/Time: %s', 'rma-wc' ), $return_date ) . "\n" .
-                                 sprintf( __( 'Total Days: %s (%s)', 'rma-wc' ), $days, $total_days );
+                                 sprintf( __( 'Pickup Location: %s', 'run-my-accounts-for-woocommerce' ), $pickup_location ) . "\n" .
+                                 sprintf( __( 'Pickup Date/Time: %s', 'run-my-accounts-for-woocommerce' ), $pickup_date ) . "\n" .
+                                 sprintf( __( 'Return Date/Time: %s', 'run-my-accounts-for-woocommerce' ), $return_date ) . "\n" .
+                                 sprintf( __( 'Total Days: %1$s (%2$s)', 'run-my-accounts-for-woocommerce' ), $days, $total_days );
 
         // return modified array

run-my-accounts-for-woocommerce/trunk/classes/class-RMA_WC_Settings_Page.php

@@ -14 +14 @@
 if ( !class_exists('RMA_WC_Settings_Page') ) {
 
-    class RMA_WC_Settings_Page {
-
-        private $admin_url;
-        private $option_group_general;
-        private $option_group_accounting;
-        private $option_group_collective_invoice;
-        private $options_general;
-        private $options_accounting;
-        private $options_collective_invoice;
-        private $option_page_general;
-        private $option_page_accounting;
-        private $option_page_collective_invoice;
-        private $option_page_log;
-        private $rma_log_count;
-
-        public function __construct() {
-
-            $this->admin_url                       = 'admin.php?page=rma-wc';
-            $this->option_group_general            = 'wc_rma_settings';
-            $this->option_group_accounting         = 'wc_rma_settings_accounting';
-            $this->option_group_collective_invoice = 'wc_rma_settings_collective_invoice';
-            $this->option_page_general             = 'settings-general';
-            $this->option_page_accounting          = 'settings-accounting';
-            $this->option_page_collective_invoice  = 'settings-collective-invoice';
-            $this->option_page_log                 = 'settings-log';
-
-            $this->options_general            = get_option( $this->option_group_general );
-            $this->options_accounting         = get_option( $this->option_group_accounting );
-            $this->options_collective_invoice = get_option( $this->option_group_collective_invoice );
-
-            add_action( 'wp_ajax_rma_log_table', array( $this, 'ajax_handle_database_log_table') );
-
-            add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue' ) );
-
-            add_action( 'admin_menu', array( $this, 'add_plugin_page' ) );
-        }
-
-        public function admin_enqueue( $hook ) {
-
-            if( 'woocommerce_page_rma-wc' != $hook )
-                return;
-
-            // enqueue script and style for autocomplete on admin page
-            wp_enqueue_script( 'select2', plugins_url( '../assets/js/select2.min.js', __FILE__ ), array('jquery'), '4.0.13', 'true' );
-            wp_register_style( 'select2', plugins_url( '../assets/css/select2.min.css', __FILE__ ), false, '4.0.13' );
-            wp_enqueue_style( 'select2' );
-
-            wp_enqueue_script( 'rma-admin-script', plugins_url( '../assets/js/admin.js', __FILE__ ), array('jquery'), get_option( 'wc_rma_version' ), 'true' );
-
-        }
-
-        public function add_plugin_page(){
-            // This page will be under "WooCommerce"
-            add_submenu_page('woocommerce', // $parent_slug
-                             'Run my Accounts - Settings', // $page_title
-                             __('Run my Accounts', 'rma-wc'), // $menu_title
-                             'manage_options', // $capability
-                             'rma-wc', // $menu_slug
-                             array($this, 'create_admin_page') // $function
-            );
-
-            add_action( 'admin_init', array( $this, 'options_init') );
-
-        }
-
-        public function create_admin_page() {
-
-            $active_page = sanitize_text_field( ( isset( $_GET[ 'tab' ] ) ? $_GET[ 'tab' ] : 'general' ) ); // set default tab ?>
+    class RMA_WC_Settings_Page {
+
+        private $admin_url;
+        private $option_group_general;
+        private $option_group_accounting;
+        private $option_group_collective_invoice;
+        private $options_general;
+        private $options_accounting;
+        private $options_collective_invoice;
+        private $option_page_general;
+        private $option_page_accounting;
+        private $option_page_collective_invoice;
+        private $option_page_log;
+        private $rma_log_count;
+
+        public function __construct() {
+
+            $this->admin_url                       = 'admin.php?page=rma-wc';
+            $this->option_group_general            = 'wc_rma_settings';
+            $this->option_group_accounting         = 'wc_rma_settings_accounting';
+            $this->option_group_collective_invoice = 'wc_rma_settings_collective_invoice';
+            $this->option_page_general             = 'settings-general';
+            $this->option_page_accounting          = 'settings-accounting';
+            $this->option_page_collective_invoice  = 'settings-collective-invoice';
+            $this->option_page_log                 = 'settings-log';
+
+            $this->options_general            = get_option( $this->option_group_general );
+            $this->options_accounting         = get_option( $this->option_group_accounting );
+            $this->options_collective_invoice = get_option( $this->option_group_collective_invoice );
+
+            add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue' ) );
+
+            add_action( 'admin_menu', array( $this, 'add_plugin_page' ) );
+        }
+
+        public function admin_enqueue( $hook ) {
+
+            if( 'woocommerce_page_rma-wc' != $hook )
+                return;
+
+            // enqueue script and style for autocomplete on admin page
+            wp_enqueue_script( 'select2', plugins_url( '../assets/js/select2.min.js', __FILE__ ), array('jquery'), '4.0.13', 'true' );
+            wp_register_style( 'select2', plugins_url( '../assets/css/select2.min.css', __FILE__ ), false, '4.0.13' );
+            wp_enqueue_style( 'select2' );
+
+            wp_enqueue_script( 'rma-admin-script', plugins_url( '../assets/js/admin.js', __FILE__ ), array('jquery'), get_option( 'wc_rma_version' ), 'true' );
+
+        }
+
+        public function add_plugin_page(){
+            // This page will be under "WooCommerce"
+            add_submenu_page('woocommerce', // $parent_slug
+                             esc_html__('Run my Accounts - Settings', 'run-my-accounts-for-woocommerce'), // $page_title
+                             'Run my Accounts', // $menu_title
+                             'manage_options', // $capability
+                             'rma-wc', // $menu_slug
+                             array($this, 'create_admin_page') // $function
+            );
+
+            add_action( 'admin_init', array( $this, 'options_init') );
+
+        }
+
+        public function create_admin_page() {
+
+            $active_page = sanitize_text_field( ( isset( $_GET[ 'tab' ] ) ? $_GET[ 'tab' ] : 'general' ) ); // set default tab ?>
 
             <div class="wrap">
-                <h1><?php _e('Run my Accounts - Settings', 'rma-wc'); ?></h1>
-                <?php settings_errors(); ?>
+                <h1><?php esc_html_e('Run my Accounts - Settings', 'run-my-accounts-for-woocommerce'); ?></h1>
+                <?php settings_errors(); ?>
                 <h2 class="nav-tab-wrapper">
-                    <a href="<?php echo admin_url( $this->admin_url ); ?>" class="nav-tab<?php echo ( 'general' == $active_page ? ' nav-tab-active' : '' ); ?>"><?php esc_html_e('General', 'rma-wc'); ?></a>
-                    <a href="<?php echo esc_url( add_query_arg( array( 'tab' => 'accounting' ), admin_url( $this->admin_url ) ) ); ?>" class="nav-tab<?php echo ( 'accounting' == $active_page ? ' nav-tab-active' : '' ); ?>"><?php esc_html_e('Accounting', 'rma-wc'); ?></a>
-                    <a href="<?php echo esc_url( add_query_arg( array( 'tab' => 'collective' ), admin_url( $this->admin_url ) ) ); ?>" class="nav-tab<?php echo ( 'collective' == $active_page ? ' nav-tab-active' : '' ); ?>"><?php esc_html_e('Collective Invoice', 'rma-wc'); ?></a>
-                    <a href="<?php echo esc_url( add_query_arg( array( 'tab' => 'log' ), admin_url( $this->admin_url ) ) ); ?>" class="nav-tab<?php echo ( 'log' == $active_page ? ' nav-tab-active' : '' ); ?>"><?php esc_html_e('Log', 'rma-wc'); ?></a>
+                    <a href="<?php echo admin_url( $this->admin_url ); ?>" class="nav-tab<?php echo ( 'general' == $active_page ? ' nav-tab-active' : '' ); ?>"><?php esc_html_e('General', 'run-my-accounts-for-woocommerce'); ?></a>
+                    <a href="<?php echo esc_url( add_query_arg( array( 'tab' => 'accounting' ), admin_url( $this->admin_url ) ) ); ?>" class="nav-tab<?php echo ( 'accounting' == $active_page ? ' nav-tab-active' : '' ); ?>"><?php esc_html_e('Accounting', 'run-my-accounts-for-woocommerce'); ?></a>
+                    <a href="<?php echo esc_url( add_query_arg( array( 'tab' => 'collective' ), admin_url( $this->admin_url ) ) ); ?>" class="nav-tab<?php echo ( 'collective' == $active_page ? ' nav-tab-active' : '' ); ?>"><?php esc_html_e('Collective Invoice', 'run-my-accounts-for-woocommerce'); ?></a>
+                    <a href="<?php echo esc_url( add_query_arg( array( 'tab' => 'log' ), admin_url( $this->admin_url ) ) ); ?>" class="nav-tab<?php echo ( 'log' == $active_page ? ' nav-tab-active' : '' ); ?>"><?php esc_html_e('Log', 'run-my-accounts-for-woocommerce'); ?></a>
                 </h2>
 
                 <form method="post" action="options.php"><?php //   settings_fields( $this->option_group_general );
-                    switch ( $active_page ) {
-                        case 'accounting':
-                            settings_fields( $this->option_group_accounting );
-                            do_settings_sections( $this->option_page_accounting );
-                            submit_button();
-                            break;
-                        case 'log':
-                            do_settings_sections( $this->option_page_log );
-                            $this->flush_log_button();
-                            break;
-                        case 'collective':
-                            settings_fields( $this->option_group_collective_invoice );
-                            do_settings_sections( $this->option_page_collective_invoice );
-                            submit_button();
-                            break;
-
-                        default:
-                            settings_fields( $this->option_group_general );
-                            do_settings_sections( $this->option_page_general );
-                            submit_button();
-                            break;
-                    } ?>
+                    switch ( $active_page ) {
+                        case 'accounting':
+                            settings_fields( $this->option_group_accounting );
+                            do_settings_sections( $this->option_page_accounting );
+                            submit_button();
+                            break;
+                        case 'log':
+                            do_settings_sections( $this->option_page_log );
+                            break;
+                        case 'collective':
+                            settings_fields( $this->option_group_collective_invoice );
+                            do_settings_sections( $this->option_page_collective_invoice );
+                            submit_button();
+                            break;
+
+                        default:
+                            settings_fields( $this->option_group_general );
+                            do_settings_sections( $this->option_page_general );
+                            submit_button();
+                            break;
+                    } ?>
                 </form>
             </div> <?php
 
-        }
-
-        /**
-         * Initialize Options on Settings Page
-         */
-        public function options_init() {
-            register_setting(
-                $this->option_group_general, // Option group
-                $this->option_group_general, // Option name
-                array( $this, 'sanitize' ) // Sanitize
-            );
-
-            $this->options_general_api();
-
-            $this->options_general_customer();
-
-            $this->options_general_billing();
-
-            $this->options_general_payment();
-
-            $this->options_general_product();
-
-            $this->options_general_shipping();
-
-            $this->options_general_log();
-
-            $this->options_general_misc();
-
-            register_setting(
-                $this->option_group_accounting, // Option group
-                $this->option_group_accounting, // Option name
-                array( $this, 'sanitize' ) // Sanitize
-            );
-
-            $this->options_accounting_gateways();
-
-            $this->options_payment_gateways();
-
-            register_setting(
-                $this->option_group_collective_invoice, // Option group
-                $this->option_group_collective_invoice, // Option name
-                array( $this, 'sanitize' ) // Sanitize
-            );
-
-            $this->options_collective_invoice();
-
-            $this->log();
-
-        }
-
-        /**
-         * Page General, Section API
-         */
-        public function options_general_api() {
-            $section = 'general_settings_api';
-
-            add_settings_section(
-                $section, // ID
-                esc_html__('API', 'rma-wc'),
-                '', // Callback
-                $this->option_page_general // Page
-            );
-
-            $id = 'rma-active';
-            add_settings_field(
-                $id,
-                esc_html__('Activate Function', 'rma-wc'),
-                array( $this, 'option_input_checkbox_cb'), // general callback for checkbox
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
-                    'description'  => esc_html__('Do not activate the plugin before you have set up all data.', 'rma-wc' )
-                )
-            );
-
-            $id = 'rma-mode';
-            add_settings_field(
-                $id,
-                esc_html__('Operation Mode', 'rma-wc'),
-                array( $this, 'rma_mode_cb'), // individual callback
-                $this->option_page_general,
-                $section,
-                array( 'option_group' => $this->option_group_general,
-                       'id'           => $id
-                )
-            );
-
-            $id = 'rma-live-client';
-            add_settings_field(
-                $id,
-                esc_html__('Production Client', 'rma-wc'),
-                array( $this, 'option_input_text_cb'), // general call back for input text
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : ''
-                )
-            );
-
-            $id = 'rma-live-apikey';
-            add_settings_field(
-                $id,
-                esc_html__('Production API key', 'rma-wc'),
-                array( $this, 'option_input_text_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : ''
-                )
-            );
-
-            $id = 'rma-test-client';
-            add_settings_field(
-                $id,
-                esc_html__('Sandbox Client', 'rma-wc'),
-                array( $this, 'option_input_text_cb'), // general call back for input text
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : ''
-                )
-            );
-
-            $id = 'rma-test-apikey';
-            add_settings_field(
-                $id,
-                esc_html__('Sandbox API key', 'rma-wc'),
-                array( $this, 'option_input_text_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : ''
-                )
-            );
-        }
-
-        /**
-         * Page General, Section Billing
-         */
-        public function options_general_billing() {
-
-            $section = 'general_settings_billing';
-
-            add_settings_section(
-                $section, // ID
-                esc_html__('Billing', 'rma-wc'),
-                '', // Callback
-                $this->option_page_general // Page
-            );
-
-            $id = 'rma-invoice-trigger';
-            add_settings_field(
-                $id,
-                esc_html__('Trigger', 'rma-wc'),
-                array( $this, 'option_select_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group'    => $this->option_group_general,
-                    'id'              => $id,
-                    'options'         => $this->options_general,
-                    'select_options'  => array(
-                        'immediately' => esc_html__('Immediately after ordering','rma-wc'),
-                        'completed'   => esc_html__('On order status completed','rma-wc'),
-                        'collective'  => esc_html__('Collective invoice','rma-wc'),
-                    ),
-                    'class'        => 'invoice-trigger',
-                    'description'  => esc_html__('When should customers and invoices be created in Run My Accounts?', 'rma-wc' ),
-
-                )
-            );
-
-            $id = 'rma-payment-period';
-            add_settings_field(
-                $id,
-                esc_html__('Payment Period in days', 'rma-wc'),
-                array( $this, 'option_input_text_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
-                    'description'  => esc_html__('Please set the general payment period. You can set a individual value, for a customer, in the user profile.', 'rma-wc' )
-                )
-            );
-
-            $id = 'rma-invoice-prefix';
-            add_settings_field(
-                $id,
-                esc_html__('Invoice Prefix', 'rma-wc'),
-                array( $this, 'option_input_text_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => 'rma-invoice-prefix',
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
-                    'description'  => esc_html__('Prefix followed by order number will be the invoice number in Run my Accounts.', 'rma-wc' )
-                )
-            );
-
-            $id = 'rma-digits';
-            add_settings_field(
-                $id,
-                esc_html__('Number of digits', 'rma-wc'),
-                array( $this, 'option_input_text_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
-                    'description'  => esc_html__('Set the maximum number of digits for the invoice number (including prefix).', 'rma-wc' )
-                )
-            );
-
-            $id = 'rma-invoice-description';
-            add_settings_field(
-                $id,
-                esc_html__('Invoice Description', 'rma-wc'),
-                array( $this, 'option_input_text_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => $this->options_general[$id] ?? '',
-                    'description'  => esc_html__('Description of the invoice in Run My Accounts. Possible variable: [orderdate]', 'rma-wc' )
-                )
-            );
-
-            $id = 'rma-collective-invoice-description';
-            add_settings_field(
-                $id,
-                esc_html__('Collective Invoice Description', 'rma-wc'),
-                array( $this, 'option_input_text_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => $this->options_general[$id] ?? '',
-                    'description'  => esc_html__('Description of the collective invoice in Run My Accounts. Possible variable: [period]', 'rma-wc' )
-                )
-            );
-
-        }
-
-        /**
-         * Page General, Section Payment
-         */
-        public function options_general_payment() {
-
-            $section = 'general_settings_payment';
-
-            add_settings_section(
-                $section, // ID
-                esc_html__('Payment', 'rma-wc'),
-                '', // Callback
-                $this->option_page_general // Page
-            );
-
-            $id = 'rma-payment-trigger';
-            add_settings_field(
-                $id,
-                esc_html__('Trigger', 'rma-wc'),
-                array( $this, 'option_select_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group'    => $this->option_group_general,
-                    'id'              => $id,
-                    'options'         => $this->options_general,
-                    'select_options'  => array(
-                        ''            => esc_html__('Booking manually','rma-wc'),
-                        'immediately' => esc_html__('Immediately after ordering','rma-wc'),
-                        'completed'   => esc_html__('On order status completed','rma-wc'),
-                    ),
-                    'class'        => 'payment-trigger',
-                    'description'  => esc_html__('When should the payment be booked in Run My Accounts', 'rma-wc' ),
-
-                )
-            );
-
-            $id = 'rma-payment-trigger-exclude';
-            add_settings_field(
-                $id,
-                esc_html__('Excluded Payment Options', 'rma-wc'),
-                array( $this, 'option_select_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'options'      => $this->options_general,
-                    'select_options' => array(
-                        'no'         => esc_html__('no','rma-wc'),
-                        'yes'        => esc_html__('yes','rma-wc'),
-                    ),
-                    'class'        => 'payment-trigger-exclude',
-                    'description'  => esc_html__('Would you like to exclude payment options from the payment booking?', 'rma-wc' ),
-                )
-            );
-
-            $id = 'rma-payment-trigger-exclude-values';
-            add_settings_field(
-                $id,
-                '',
-                array( $this, 'option_input_multiple_payment_gateway_checkbox_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => $this->options_general[$id] ?? '',
-                    'description'  => esc_html__('Please select the payment options you want to exclude?', 'rma-wc' ),
-                )
-            );
-
-        }
-
-        /**
-         * Page General, Section Customer
-         */
-        public function options_general_customer() {
-
-            $section = 'general_settings_customer';
-
-            add_settings_section(
-                $section, // ID
-                esc_html__('Customer', 'rma-wc'),
-                '', // Callback
-                $this->option_page_general // Page
-            );
-
-            $id = 'rma-create-customer';
-            add_settings_field(
-                $id,
-                esc_html__('Create New Customer', 'rma-wc'),
-                array( $this, 'option_input_checkbox_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
-                    'description'  => esc_html__('Tick this if you want to create a customer as soon as a new user is created in WooCommerce (recommended if customer can register by itself).', 'rma-wc' )
-                )
-            );
-
-            $id = 'rma-customer-prefix';
-            add_settings_field(
-                $id,
-                esc_html__('Customer Number Prefix', 'rma-wc'),
-                array( $this, 'option_input_text_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
-                    'description'  => esc_html__('Prefix followed by user id will be  the customer number in Run my Accounts.', 'rma-wc' )
-                )
-            );
-
-            $id = 'rma-create-guest-customer';
-            add_settings_field(
-                $id,
-                esc_html__('Create Account for Guests', 'rma-wc'),
-                array( $this, 'option_input_checkbox_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
-                    'description'  => esc_html__('Tick this if you want to create unique customer account in Run my Accounts for guest orders. Otherwise the guest orders will be booked on a pre-defined catch-all customer account.', 'rma-wc' )
-                )
-            );
-
-            $id = 'rma-guest-customer-prefix';
-            add_settings_field(
-                $id,
-                esc_html__('Guest Customer Number Prefix', 'rma-wc'),
-                array( $this, 'option_input_text_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
-                    'description'  => esc_html__('Prefix followed by order id will be the customer number in Run my Accounts.', 'rma-wc' )
-                )
-            );
-
-            $id = 'rma-guest-catch-all';
-            add_settings_field(
-                $id,
-                esc_html__('Catch-All Account', 'rma-wc'),
-                array( $this, 'rma_customer_accounts_cb'), // individual callback
-                $this->option_page_general,
-                $section,
-                array( 'option_group' => $this->option_group_general,
-                       'id'           => $id
-                )
-            );
-
-        }
-
-        /**
-         * Page General, Section Product
-         */
-        public function options_general_product() {
-
-            $section = 'general_settings_product';
-
-            add_settings_section(
-                $section, // ID
-                esc_html__('Product', 'rma-wc'),
-                '', // Callback
-                $this->option_page_general // Page
-            );
-
-            $id = 'rma-product-fallback_id';
-            add_settings_field(
-                $id,
-                esc_html__('Fallback product sku', 'rma-wc'),
-                array( $this, 'rma_parts_cb'), // individual callback
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
-                    'description'  => esc_html__('This is a fallback sku in Run My Accounts which will be used to create an invoice if the WooCommerce sku of a product is not available in Run My Accounts. Leave it empty if you do not want to use it. In this case the invoice cannot be created if the sku is not available in Run My Accounts.', 'rma-wc' )
-                )
-            );
-
-        }
-
-        /**
-         * Page General, Section Shipping
-         */
-        public function options_general_shipping() {
-
-            $section = 'general_settings_shipping';
-
-            add_settings_section(
-                $section, // ID
-                esc_html__('Shipping', 'rma-wc'),
-                '', // Callback
-                $this->option_page_general // Page
-            );
-
-            $id = 'rma-shipping-id';
-            add_settings_field(
-                $id,
-                esc_html__('SKU', 'rma-wc'),
-                array( $this, 'rma_parts_cb'), // individual callback
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
-                    'description'  => esc_html__('To book the shipping costs, you have to select a dedicated product in Run my Accounts. The shipping costs will be booked on this product id.', 'rma-wc' )
-                )
-            );
-
-            $id = 'rma-shipping-text';
-            add_settings_field(
-                $id,
-                esc_html__('Description', 'rma-wc'),
-                array( $this, 'option_input_text_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
-                    'description'  => esc_html__('Optionally, the text on the invoice for shipping. Usually it is the text from the shipping method chosen by the customer.', 'rma-wc' )
-                )
-            );
-
-
-        }
-
-        /**
-         * Page General, Section Misc
-         */
-        public function options_general_log() {
-
-            $section = 'general_settings_log';
-
-            add_settings_section(
-                $section, // ID
-                esc_html__('Error Log', 'rma-wc'),
-                '', // Callback
-                $this->option_page_general // Page
-            );
-
-            $id = 'rma-loglevel';
-            add_settings_field(
-                $id,
-                esc_html__('Log Level', 'rma-wc'),
-                array( $this, 'option_select_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group'   => $this->option_group_general,
-                    'id'             => $id,
-                    'options'        => $this->options_general,
-                    'select_options' => array(
-                        'error'      => esc_html__('error','rma-wc'),
-                        'complete'   => esc_html__('complete','rma-wc'),
-                    )
-                )
-            );
-
-            $id = 'rma-log-send-email';
-            add_settings_field(
-                $id,
-                esc_html__('Send email', 'rma-wc'),
-                array( $this, 'option_select_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group'   => $this->option_group_general,
-                    'id'             => $id,
-                    'options'        => $this->options_general,
-                    'select_options' => array(
-                        'no'         => esc_html__('no','rma-wc'),
-                        'yes'        => esc_html__('yes','rma-wc'),
-                    ),
-                    'description'  => esc_html__('Receive emails on errors and general notifications.', 'rma-wc' )
-
-                )
-            );
-
-            $id = 'rma-log-email';
-            add_settings_field(
-                $id,
-                esc_html__('email', 'rma-wc'),
-                array( $this, 'option_input_text_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group' => $this->option_group_general,
-                    'id'           => $id,
-                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : get_option( 'admin_email' ),
-                    'description'  => esc_html__( 'Get an email to this recipient. Administrators email address is used by default.', 'rma-wc' )
-                )
-            );
-
-
-        }
-
-        /**
-         * Page General, Section Misc
-         */
-        public function options_general_misc() {
-
-            $section = 'general_settings_misc';
-
-            add_settings_section(
-                $section, // ID
-                esc_html__('Misc', 'rma-wc'),
-                '', // Callback
-                $this->option_page_general // Page
-            );
-
-            $id = 'rma-delete-settings';
-            add_settings_field(
-                $id,
-                esc_html__('Delete Settings', 'rma-wc'),
-                array( $this, 'option_select_cb'),
-                $this->option_page_general,
-                $section,
-                array(
-                    'option_group'   => $this->option_group_general,
-                    'id'             => $id,
-                    'options'        => $this->options_general,
-                    'select_options' => array(
-                        'no'         => esc_html__('no','rma-wc'),
-                        'yes'        => esc_html__('yes','rma-wc'),
-                    ),
-                    'description'  => esc_html__('Remove all plugin data when using the "Delete" link on the plugins screen', 'rma-wc' ),
-
-                )
-            );
-
-        }
-
-        public function options_accounting_gateways() {
-
-            $section = 'accounting_settings_payment';
-
-            add_settings_section(
-                $section, // ID
-                esc_html__('Receivables Account', 'rma-wc'), // Title
-                array( $this, 'section_info_accounting' ), // Callback
-                $this->option_page_accounting // Page
-            );
-
-            // add  settings fields for all payment gateways
-            $available_gateways = WC()->payment_gateways->get_available_payment_gateways();
-
-            foreach ( $available_gateways as $gateway_key => $values ) {
-
-                add_settings_field(
-                    $gateway_key,
-                    $values->title,
-                    array( $this, 'option_input_text_cb'),
-                    $this->option_page_accounting,
-                    $section,
-                    array(
-                        'option_group' => $this->option_group_accounting,
-                        'id'           => $gateway_key,
-                        'value'        => isset( $this->options_accounting[ $gateway_key ] ) ? $this->options_accounting[ $gateway_key ] : ''
-                    )
-                );
-
-            }
-
-        }
-
-        public function options_payment_gateways() {
-
-            $section = 'accounting_settings_payment_account';
-
-            add_settings_section(
-                $section, // ID
-                esc_html__('Payment Account', 'rma-wc'), // Title
-                array( $this, 'section_info_payment' ), // Callback
-                $this->option_page_accounting // Page
-            );
-
-            // add  settings fields for all payment gateways
-            $available_gateways = WC()->payment_gateways->get_available_payment_gateways();
-
-            foreach ( $available_gateways as $gateway_key => $values ) {
-
-                $field_id = $gateway_key . '_payment_account';
-
-                add_settings_field(
-                    $field_id,
-                    $values->title,
-                    array( $this, 'option_input_text_cb'),
-                    $this->option_page_accounting,
-                    $section,
-                    array(
-                        'option_group' => $this->option_group_accounting,
-                        'id'           => $field_id,
-                        'value'        => isset( $this->options_accounting[ $field_id ] ) ? $this->options_accounting[ $field_id ] : '',
-                        'placeholder'  => '1020'
-                    )
-                );
-
-            }
-
-        }
-
-        public function options_collective_invoice() {
-
-            $section = 'collective_invoice_settings';
-            add_settings_section(
-                $section, // ID
-                esc_html__( 'Collective Invoice', 'rma-wc'), // Title
-                array( $this, 'section_info_collective_invoice' ), // Callback
-                $this->option_page_collective_invoice // Page
-            );
-
-            if( empty( $this->options_collective_invoice[ 'collective_invoice_next_date_ts' ] ) ) {
-                $text = __('The next invoice date cannot be calculated. Please set all options first.');
-            }
-            else {
-                $text = date_i18n( get_option('date_format') , $this->options_collective_invoice[ 'collective_invoice_next_date_ts' ] );
-            }
-            $id = 'collective_invoice_next_text';
-            add_settings_field(
-                $id,
-                esc_html__('Next Invoice Date', 'rma-wc'),
-                array( $this, 'plain_text_cb'),
-                $this->option_page_collective_invoice,
-                $section,
-                array(
-                    'text'  => $text,
-                    'class' => 'next-invoice-date'
-                )
-            );
-
-            $id = 'collective_invoice_period';
-            add_settings_field(
-                $id,
-                esc_html__('Invoice Period', 'rma-wc'),
-                array( $this, 'option_select_cb'),
-                $this->option_page_collective_invoice,
-                $section,
-                array(
-                    'option_group' => $this->option_group_collective_invoice,
-                    'id'           => $id,
-                    'options'      => $this->options_collective_invoice,
-                    'select_options'  => array(
-                        'week'        => esc_html__( 'Once a week','rma-wc'),
-                        'second_week' => esc_html__( 'Every second week','rma-wc'),
-                        'month'       => esc_html__( 'Every month (first weekday of the month)','rma-wc'),
-                    ),
-                    'description'  => esc_html__('For what period of time should collective invoices be created?', 'rma-wc' ),
-                    'class'        => 'collective-invoice__period'
-                )
-            );
-
-            $id = 'collective_invoice_weekday';
-            add_settings_field(
-                $id,
-                esc_html__('Weekday', 'rma-wc'),
-                array( $this, 'option_input_multiple_radio_cb'),
-                $this->option_page_collective_invoice,
-                $section,
-                array(
-                    'option_group' => $this->option_group_collective_invoice,
-                    'id'           => $id,
-                    'value'        => $this->options_collective_invoice[$id] ?? '',
-                    'description'  => esc_html__('Please select the days of the week on which a collective invoice should be created.', 'rma-wc' ),
-                    'values'       => array(
-                            'monday'    => esc_html__( 'Monday', 'rma-wc' ),
-                            'tuesday'   => esc_html__( 'Tuesday', 'rma-wc' ),
-                            'wednesday' => esc_html__( 'Wednesday', 'rma-wc' ),
-                            'thursday'  => esc_html__( 'Thursday', 'rma-wc' ),
-                            'friday'    => esc_html__( 'Friday', 'rma-wc' ),
-                            'saturday'  => esc_html__( 'Saturday', 'rma-wc' ),
-                            'sunday'    => esc_html__( 'Sunday', 'rma-wc' ),
-                    ),
-                    'line_break'  => false,
-                    'class'       => 'collective-invoice__weekday'
-                )
-            );
-
-            $id = 'collective_invoice_span';
-            add_settings_field(
-                $id,
-                esc_html__('Invoice Span', 'rma-wc'),
-                array( $this, 'option_select_cb'),
-                $this->option_page_collective_invoice,
-                $section,
-                array(
-                    'option_group' => $this->option_group_collective_invoice,
-                    'id'           => $id,
-                    'options'      => $this->options_collective_invoice,
-                    'select_options' => array(
-                        'all'        => esc_html__( 'All unbilled invoices','rma-wc'),
-                        'per_week'   => esc_html__( 'Day of creation and a week before','rma-wc'),
-                        'per_month'  => esc_html__( 'Day of creation and a month before','rma-wc'),
-                    ),
-                    'description'  => esc_html__('For what period of time should collective invoices be created?', 'rma-wc' ),
-
-                )
-            );
-
-        }
-
-        public function section_info_accounting() {
-            esc_html_e('You can specify a dedicated receivable account for each active payment gateway.', 'rma-wc');
-        }
-
-        public function section_info_collective_invoice() {
-            esc_html_e('Set up the handling of the collective invoices', 'rma-wc');
-        }
-
-        public function section_info_payment() {
-            esc_html_e('You can specify a dedicated payment account for each active payment gateway.', 'rma-wc');
-        }
-
-        /**
-         * Page Error Log, Section Log
-         */
-        public function log() {
-
-            $section = 'log';
-
-            add_settings_section(
-                $section, // ID
-                esc_html__('Error Log', 'rma-wc'),
-                array( $this, 'section_info_log' ), // Callback
-                $this->option_page_log // Page
-            );
-
-            $id = 'rma-error-log';
-            add_settings_field(
-                $id,
-                '',
-                array( $this, 'output_log'), // general callback for checkbox
-                $this->option_page_log,
-                $section
-            );
-
-        }
-
-        public function section_info_log() {
-            esc_html_e('This page shows you the error logs.', 'rma-wc');
-        }
-
-        /**
-         * General Input Field Checkbox
-         *
-         * @param array $args
-         */
-        public function option_input_checkbox_cb( $args ){
-
-            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
-            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
-            $checked      = ( isset( $args['value'] ) && !empty( $args['value'] ) ) ? 'checked' : '';
-            $description  = ( isset( $args['description'] ) ) ? $args['description'] : '';
-
-            printf(
-                '<input type="checkbox" id="%1$s" name="%3$s[%1$s]" value="1" %2$s />',
-                $id, $checked, $option_group
-            );
-
-            if ( !empty( $description) )
-                echo '<p class="description">' . $description . '</p>';
-
-        }
-
-        /**
-         * General Input with Multiple Checkboxes
-         *
-         * @param array $args
-         *
-         * @since 1.7.0
-         */
-        public function option_input_multiple_checkbox_cb( $args ){
-
-            $legend       = ( isset( $args['legend'] ) ) ? $args['legend'] : '';
-            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
-            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
-            $options      = ( isset( $args['options'] ) ) ? $args['options'] : '';
-            $description  = ( isset( $args['description'] ) ) ? $args['description'] : '';
-            $values       = ( isset( $args['values'] ) ) ? $args['values'] : '';
-            $line_break   = ( isset( $args['line_break'] ) ) ? $args['line_break'] : true;
-
-            if( 0 == count( $values ) )
-                return;
-
-            echo '<fieldset id="' . $id . '"> ';
-            if( $legend ) {
-                printf( '<legend>%1$s</legend>', $legend );
-            }
-
-            foreach ( $values as $key => $title ) {
-
-                $checked = isset( $options[ $id . '-'. $key ] ) && 1 == $options[ $id . '-'. $key ] ? 'checked' : '';
-                $br      = isset( $line_break ) && true === $line_break ? '<br>' : '&nbsp;';
-
-                printf(
-                    '<input type="checkbox" id="%5$s" name="%3$s[%1$s-%5$s]" value="1" %2$s /><label for="%5$s">%4$s</label>%6$s',
-                    $id, $checked, $option_group, $title, $key, $br
-                );
-
-            }
-
-            echo '</fieldset>';
-
-            if ( !empty( $description) )
-                echo '<p class="description">' . $description . '</p>';
-
-        }
-
-        /**
-         * General Input with Multiple Checkboxes
-         *
-         * @param array $args
-         *
-         * @since 1.7.0
-         */
-        public function option_input_multiple_radio_cb( $args ){
-
-            $legend       = ( isset( $args['legend'] ) ) ? $args['legend'] : '';
-            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
-            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
-            $value        = ( isset( $args['value'] ) ) ? $args['value'] : '';
-            $description  = ( isset( $args['description'] ) ) ? $args['description'] : '';
-            $values       = ( isset( $args['values'] ) ) ? $args['values'] : '';
-            $line_break   = ( isset( $args['line_break'] ) ) ? $args['line_break'] : true;
-
-            if( 0 == count( $values ) )
-                return;
-
-            if( $legend ) {
-                printf( '<legend>%1$s</legend>', $legend );
-            }
-
-            foreach ( $values as $key => $title ) {
-
-                $checked = $value == $key ? 'checked' : '';
-                $br      = isset( $line_break ) && true === $line_break ? '<br>' : '&nbsp;';
-
-                printf(
-                    '<input type="radio" id="%5$s" name="%3$s[%1$s]" value="%5$s" %2$s /><label for="%5$s">%4$s</label>%6$s',
-                    $id, $checked, $option_group, $title, $key, $br
-                );
-
-            }
-
-            if ( !empty( $description) )
-                echo '<p class="description">' . $description . '</p>';
-
-        }
-
-        /**
-         * Input Field with Multiple Checkboxes for Payment Gateways
-         *
-         * @param array $args
-         */
-        public function option_input_multiple_payment_gateway_checkbox_cb( $args ){
-
-            // add  settings fields for all payment gateways
-            $available_gateways = WC()->payment_gateways->get_available_payment_gateways();
-
-            if( 0 == count( $available_gateways ) )
-                return;
-
-            $legend       = ( isset( $args['legend'] ) ) ? $args['legend'] : '';
-            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
-            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
-            $description  = ( isset( $args['description'] ) ) ? $args['description'] : '';
-
-            $s = get_option('wc_rma_settings');
-
-            echo '<fieldset id="' . $id . '"> ';
-            if( $legend ) {
-                printf( '<legend>%1$s</legend>', $legend );
-            }
-
-            foreach ( $available_gateways as $gateway_key => $values ) {
-
-                $checked = ( isset( $this->options_general[ $id . '-'. $gateway_key ] ) && 1 == $this->options_general[ $id . '-'. $gateway_key ] ) ? 'checked' : '';
-
-                printf(
-                    '<input type="checkbox" id="%5$s" name="%3$s[%1$s-%5$s]" value="1" %2$s />&nbsp;%4$s<br />',
-                    $id, $checked, $option_group, $values->title, $gateway_key
-                );
-
-            }
-
-            echo '</fieldset>';
-
-            if ( !empty( $description) )
-                echo '<p class="description">' . $description . '</p>';
-
-        }
-
-        /**
-         * General Input Field Text
-         *
-         * @param array $args
-         */
-        public function option_input_text_cb( $args ) {
-
-            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
-            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
-            $value        = ( isset( $args['value'] ) ) ? $args['value'] : '';
-            $placeholder  = ( isset( $args['placeholder'] ) ) ? $args['placeholder'] : '';
-            $description  = ( isset( $args['description'] ) ) ? $args['description'] : '';
-
-            printf(
-                '<input type="text" id="%1$s" name="%3$s[%1$s]" value="%2$s" placeholder="%4$s" />',
-                $id, $value, $option_group, $placeholder
-            );
-
-            if ( !empty( $description) )
-                echo '<p class="description">' . $description . '</p>';
-        }
-
-        /**
-         * General Select
-         *
-         * @param array $args
-         */
-        public function option_select_cb( $args ) {
-            $option_group   = (isset($args['option_group'])) ? $args['option_group'] : '';
-            $id             = (isset($args['id'])) ? $args['id'] : '';
-            $options        = (isset($args['options'])) ? $args['options'] : '';
-            $select_options = (isset($args['select_options'])) ? $args['select_options'] : array();
-            $description    = (isset($args['description'])) ? $args['description'] : '';
-            $class          = (isset($args['class'])) ? $args['class'] : '';
-
-            echo '<select name="' . $option_group . '[' . $id . ']"' . ( !empty( $class) ? 'id="'. $id .'" class="' . $class . '"' : '' ) . '>';
-
-            foreach ( $select_options as $value => $text ) {
-                printf(
-                    '<option value="%1$s" %2$s />%3$s</option>',
-                    $value,
-                    ( isset( $options[ $id ] ) && $value == $options[ $id ] ) ? 'selected="selected"' : '',
-                    $text
-                );
-            }
-
-            echo '</select>';
-
-            if ( !empty( $description) )
-                echo '<p class="description">' . $description . '</p>';
-
-        }
-
-        /**
-         * @param array
-         */
-        public function plain_text_cb( $args ) {
-            $text  = ( isset( $args[ 'text' ] ) ) ? $args[ 'text' ] : '';
-            $class = ( isset( $args[ 'class' ] ) ) ? $args[ 'class' ] : '';
-
-            echo '<p class="' . $class . '">' . $text . '</p>';
-        }
-
-        /**
-         * Individual pulldown
-         *
-         * @param array $args
-         */
-        public function rma_mode_cb( $args ) {
-            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
-            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
-
-            $select_args  = array(
-                'option_group' => $option_group,
-                'id'           => $id,
-                'options'      => $this->options_general,
-                'select_options' => array(
-                    'test' => esc_html__('Sandbox Test','rma-wc'),
-                    'live' => esc_html__('Production','rma-wc'),
-                )
-            );
-
-            // create select
-            self::option_select_cb( $select_args );
-
-            // output connection status
-            $RMA_WC_API = new RMA_WC_API();
-            // Retrieve customers to check connection
-            $options = $RMA_WC_API->get_customers();
-            unset( $RMA_WC_API );
-
-            if ( ! $options )
-                echo '&nbsp;<span style="color: red; font-weight: bold">' . __('No connection. Please check your settings.', 'rma-wc') . '</span>';
-            else
-                echo '&nbsp;<span style="color: green">' . __('Connection successful.', 'rma-wc') . '</span>';
-
-        }
-
-        /**
-         * Pull down with RMA customer list
-         *
-         * @param $args
-         */
-        public function rma_customer_accounts_cb( $args ) {
-            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
-            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
-
-            $RMA_WC_API = new RMA_WC_API();
-            $options = $RMA_WC_API->get_customers();
-
-            if ( !empty( $RMA_WC_API ) ) unset( $RMA_WC_API );
-
-            if( !isset( $options ) || !$options ) {
-
-                $options = array('' => __( 'Error while connecting to RMA. Please check your settings.', 'rma-wc' ) );
-
-            }
-            else {
-
-                $options = array('' => __( 'Select...', 'rma-wc' ) ) + $options;
-
-            }
-
-            $select_args  = array (
-                'option_group'   => $option_group,
-                'id'             => $id,
-                'options'        => $this->options_general,
-                'select_options' => $options,
-                'class'          => 'select2'
-            );
-
-            // create select
-            self::option_select_cb( $select_args );
-
-        }
-
-        /**
-         * Pull down with RMA parts list
-         *
-         * @param $args
-         *
-         * @since 1.5.0
-         */
-        public function rma_parts_cb( $args ) {
-            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
-            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
-            $description  = ( isset( $args['description'] ) ) ? $args['description'] : '';
-
-            if ( !isset( $parts ) || empty( $parts ) ) {
-
-                $rma_api = new RMA_WC_API();
-                $parts   = $rma_api->get_parts();
-
-                if ( !empty( $RMA_WC_API ) ) unset( $RMA_WC_API );
-
-            }
-
-            if( !isset( $parts ) || !$parts ) {
-
-                $options = array('' => __( 'Error while connecting to RMA. Please check your settings.', 'rma-wc' ) );
-
-            }
-            else {
-
-                $options = array('' => __( 'Select...', 'rma-wc' ) ) + $parts;
-
-            }
-
-            $select_args  = array (
-                'option_group'   => $option_group,
-                'id'             => $id,
-                'options'        => $this->options_general,
-                'select_options' => $options,
-                'description'    => $description,
-                'class'          => 'select2'
-            );
-
-            // create select
-            self::option_select_cb( $select_args );
-
-        }
-
-
-        /**
-         * Output the error log from database
-         */
-        public function output_log() {
-
-            $output = $this->get_log_from_database();
-
-            echo '<style>[scope=row]{ display:none; }.form-table th { padding: 8px 10px; width: unset; font-weight: unset; }#textarea td {border: 1px solid #ddd; border-width: 0 1px 1px 0; }</style>';
-
-            echo '<div id="textarea" contenteditable>';
-            echo $output;
-            echo '</div>';
-
-        }
-
-        /**
-         * Sanitizes a string from user input
-         * Checks for invalid UTF-8, Converts single < characters to entities, Strips all tags, Removes line breaks, tabs, and extra whitespace, Strips octets
-         *
-         * @param array $input
-         *
-         * @return array
-         */
-        public function sanitize( $input )  {
-
-            $new_input = array();
-
-            foreach ( $input as $key => $value ) {
-
-                $new_input[ $key ] = sanitize_text_field( $input[ $key ] );
-
-            }
-
-            return $new_input;
-        }
-
-        /**
-         * Read log information from database
-         *
-         * @return string
-         */
-        private function get_log_from_database() {
-
-            global $wpdb;
-
-            $table_name = $wpdb->prefix . RMA_WC_LOG_TABLE;
-
-            $results = $wpdb->get_results( "SELECT SQL_CALC_FOUND_ROWS * FROM $table_name ORDER BY id DESC;", ARRAY_A );
-
-            if ( 0 == count( $results ) ) {
-
-                $this->rma_log_count = 0;
-
-                return esc_html__('No error data was found.', 'rma-wc');
-
-            }
-
-            $output = '<table class="widefat">';
-
-            $table_header = true;
-
-            foreach ( $results as $result ) {
-
-                if ( $table_header ) {
-                    $output .= '<thead><tr>';
-                    foreach ( array_keys( ( $result ) ) as $key ) {
-                        $output .= '<th>' . $key . '</th>';
-                    }
-                    $output .= '</tr></thead>';
-
-                    $table_header = false;
-                }
-
-                $output .= '<tr>';
-                foreach ( $result as $key => $value ) {
-
-                    $value = str_replace('error','<span style="color: red;">error</span>',$value);
-                    $value = str_replace('failed','<span style="color: red;">failed</span>',$value);
-                    $value = str_replace('success','<span style="color: green;">success</span>',$value);
-                    $value = str_replace('paid','<span style="color: green;">paid</span>',$value);
-                    $value = str_replace('created','<span style="color: green;">created</span>',$value);
-                    $value = str_replace('invoiced','<span style="color: green;">invoiced</span>',$value);
-
-                    $output .= '<td>' . $value . '</td>';
-                }
-                $output .= '</tr>';
-            }
-
-            $output .= '</table>';
-
-            return $output;
-
-        }
-
-        /**
-         * Add flush table button below table
-         */
-        private function flush_log_button() {
-
-            if ( 0 < $this->rma_log_count || !empty( $this->rma_log_count ) || !isset( $this->rma_log_count )) {
-                echo sprintf(
-                    '<a href="#" id="flush-table" class="button-primary">%s</a>&nbsp;<span class="spinner">',
-                    esc_html__('Flush Table', 'rma-wc')
-                );
-            }
-
-        }
-
-        /**
-         * WP ajax request to flush error table
-         */
-        public function ajax_handle_database_log_table() {
-            global $wpdb; // this is how you get access to the database
-
-            $db_action = $_POST['db_action'];
-
-            switch ( $db_action ) {
-                case 'flush':
-
-                    $table_name = $wpdb->prefix . RMA_WC_LOG_TABLE;
-
-                    $wpdb->query("TRUNCATE TABLE $table_name");
-
-                    if($wpdb->last_error !== '') {
-
-                        esc_html_e( 'An error occurred while flushing the error log.', 'rma-wc');
-
-                        $wpdb->print_error();
-
-                        break;
-
-                    }
-
-                    $this->rma_log_count = 0;
-
-                    break;
-                default:
-                    break;
-            }
-
-            wp_die(); // this is required to terminate immediately and return a proper response
-        }
-
-    }
+        }
+
+        /**
+         * Initialize Options on Settings Page
+         */
+        public function options_init() {
+            register_setting(
+                $this->option_group_general, // Option group
+                $this->option_group_general, // Option name
+                array( $this, 'sanitize' ) // Sanitize
+            );
+
+            $this->options_general_api();
+
+            $this->options_general_customer();
+
+            $this->options_general_billing();
+
+            $this->options_general_payment();
+
+            $this->options_general_product();
+
+            $this->options_general_shipping();
+
+            $this->options_general_log();
+
+            $this->options_general_misc();
+
+            register_setting(
+                $this->option_group_accounting, // Option group
+                $this->option_group_accounting, // Option name
+                array( $this, 'sanitize' ) // Sanitize
+            );
+
+            $this->options_accounting_gateways();
+
+            $this->options_payment_gateways();
+
+            register_setting(
+                $this->option_group_collective_invoice, // Option group
+                $this->option_group_collective_invoice, // Option name
+                array( $this, 'sanitize' ) // Sanitize
+            );
+
+            $this->options_collective_invoice();
+
+            $this->log();
+
+        }
+
+        /**
+         * Page General, Section API
+         */
+        public function options_general_api() {
+            $section = 'general_settings_api';
+
+            add_settings_section(
+                $section, // ID
+                esc_html__('API', 'run-my-accounts-for-woocommerce'),
+                '', // Callback
+                $this->option_page_general // Page
+            );
+
+            $id = 'rma-active';
+            add_settings_field(
+                $id,
+                esc_html__('Activate Function', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_checkbox_cb'), // general callback for checkbox
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
+                    'description'  => esc_html__('Do not activate the plugin before you have set up all data.', 'run-my-accounts-for-woocommerce' )
+                )
+            );
+
+            $id = 'rma-mode';
+            add_settings_field(
+                $id,
+                esc_html__('Operation Mode', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'rma_mode_cb'), // individual callback
+                $this->option_page_general,
+                $section,
+                array( 'option_group' => $this->option_group_general,
+                       'id'           => $id
+                )
+            );
+
+            $id = 'rma-live-client';
+            add_settings_field(
+                $id,
+                esc_html__('Production Client', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_text_cb'), // general call back for input text
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : ''
+                )
+            );
+
+            $id = 'rma-live-apikey';
+            add_settings_field(
+                $id,
+                esc_html__('Production API key', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_text_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : ''
+                )
+            );
+
+            $id = 'rma-test-client';
+            add_settings_field(
+                $id,
+                esc_html__('Sandbox Client', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_text_cb'), // general call back for input text
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : ''
+                )
+            );
+
+            $id = 'rma-test-apikey';
+            add_settings_field(
+                $id,
+                esc_html__('Sandbox API key', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_text_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : ''
+                )
+            );
+        }
+
+        /**
+         * Page General, Section Billing
+         */
+        public function options_general_billing() {
+
+            $section = 'general_settings_billing';
+
+            add_settings_section(
+                $section, // ID
+                esc_html__('Billing', 'run-my-accounts-for-woocommerce'),
+                '', // Callback
+                $this->option_page_general // Page
+            );
+
+            $id = 'rma-invoice-trigger';
+            add_settings_field(
+                $id,
+                esc_html__('Trigger', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_select_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group'    => $this->option_group_general,
+                    'id'              => $id,
+                    'options'         => $this->options_general,
+                    'select_options'  => array(
+                        'immediately' => esc_html__('Immediately after ordering','run-my-accounts-for-woocommerce'),
+                        'completed'   => esc_html__('On order status completed','run-my-accounts-for-woocommerce'),
+                        'collective'  => esc_html__('Collective invoice','run-my-accounts-for-woocommerce'),
+                    ),
+                    'class'        => 'invoice-trigger',
+                    'description'  => esc_html__('When should customers and invoices be created in Run My Accounts?', 'run-my-accounts-for-woocommerce' ),
+
+                )
+            );
+
+            $id = 'rma-payment-period';
+            add_settings_field(
+                $id,
+                esc_html__('Payment Period in days', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_text_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
+                    'description'  => esc_html__('Please set the general payment period. You can set a individual value, for a customer, in the user profile.', 'run-my-accounts-for-woocommerce' )
+                )
+            );
+
+            $id = 'rma-invoice-prefix';
+            add_settings_field(
+                $id,
+                esc_html__('Invoice Prefix', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_text_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => 'rma-invoice-prefix',
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
+                    'description'  => esc_html__('Prefix followed by order number will be the invoice number in Run my Accounts.', 'run-my-accounts-for-woocommerce' )
+                )
+            );
+
+            $id = 'rma-digits';
+            add_settings_field(
+                $id,
+                esc_html__('Number of digits', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_text_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
+                    'description'  => esc_html__('Set the maximum number of digits for the invoice number (including prefix).', 'run-my-accounts-for-woocommerce' )
+                )
+            );
+
+            $id = 'rma-invoice-description';
+            add_settings_field(
+                $id,
+                esc_html__('Invoice Description', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_text_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => $this->options_general[$id] ?? '',
+                    'description'  => esc_html__('Description of the invoice in Run My Accounts. Possible variable: [orderdate]', 'run-my-accounts-for-woocommerce' )
+                )
+            );
+
+            $id = 'rma-collective-invoice-description';
+            add_settings_field(
+                $id,
+                esc_html__('Collective Invoice Description', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_text_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => $this->options_general[$id] ?? '',
+                    'description'  => esc_html__('Description of the collective invoice in Run My Accounts. Possible variable: [period]', 'run-my-accounts-for-woocommerce' )
+                )
+            );
+
+        }
+
+        /**
+         * Page General, Section Payment
+         */
+        public function options_general_payment() {
+
+            $section = 'general_settings_payment';
+
+            add_settings_section(
+                $section, // ID
+                esc_html__('Payment', 'run-my-accounts-for-woocommerce'),
+                '', // Callback
+                $this->option_page_general // Page
+            );
+
+            $id = 'rma-payment-trigger';
+            add_settings_field(
+                $id,
+                esc_html__('Trigger', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_select_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group'    => $this->option_group_general,
+                    'id'              => $id,
+                    'options'         => $this->options_general,
+                    'select_options'  => array(
+                        ''            => esc_html__('Booking manually','run-my-accounts-for-woocommerce'),
+                        'immediately' => esc_html__('Immediately after ordering','run-my-accounts-for-woocommerce'),
+                        'completed'   => esc_html__('On order status completed','run-my-accounts-for-woocommerce'),
+                    ),
+                    'class'        => 'payment-trigger',
+                    'description'  => esc_html__('When should the payment be booked in Run My Accounts', 'run-my-accounts-for-woocommerce' ),
+
+                )
+            );
+
+            $id = 'rma-payment-trigger-exclude';
+            add_settings_field(
+                $id,
+                esc_html__('Excluded Payment Options', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_select_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'options'      => $this->options_general,
+                    'select_options' => array(
+                        'no'         => esc_html__('no','run-my-accounts-for-woocommerce'),
+                        'yes'        => esc_html__('yes','run-my-accounts-for-woocommerce'),
+                    ),
+                    'class'        => 'payment-trigger-exclude',
+                    'description'  => esc_html__('Would you like to exclude payment options from the payment booking?', 'run-my-accounts-for-woocommerce' ),
+                )
+            );
+
+            $id = 'rma-payment-trigger-exclude-values';
+            add_settings_field(
+                $id,
+                '',
+                array( $this, 'option_input_multiple_payment_gateway_checkbox_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => $this->options_general[$id] ?? '',
+                    'description'  => esc_html__('Please select the payment options you want to exclude.', 'run-my-accounts-for-woocommerce' ),
+                )
+            );
+
+        }
+
+        /**
+         * Page General, Section Customer
+         */
+        public function options_general_customer() {
+
+            $section = 'general_settings_customer';
+
+            add_settings_section(
+                $section, // ID
+                esc_html__('Customer', 'run-my-accounts-for-woocommerce'),
+                '', // Callback
+                $this->option_page_general // Page
+            );
+
+            $id = 'rma-create-customer';
+            add_settings_field(
+                $id,
+                esc_html__('Create New Customer', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_checkbox_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
+                    'description'  => esc_html__('Tick this if you want to create a customer as soon as a new user is created in WooCommerce (recommended if customer can register by itself).', 'run-my-accounts-for-woocommerce' )
+                )
+            );
+
+            $id = 'rma-customer-prefix';
+            add_settings_field(
+                $id,
+                esc_html__('Customer Number Prefix', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_text_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
+                    'description'  => esc_html__('Prefix followed by user id will be  the customer number in Run my Accounts.', 'run-my-accounts-for-woocommerce' )
+                )
+            );
+
+            $id = 'rma-create-guest-customer';
+            add_settings_field(
+                $id,
+                esc_html__('Create Account for Guests', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_checkbox_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
+                    'description'  => esc_html__('Tick this if you want to create unique customer account in Run my Accounts for guest orders. Otherwise the guest orders will be booked on a pre-defined catch-all customer account.', 'run-my-accounts-for-woocommerce' )
+                )
+            );
+
+            $id = 'rma-guest-customer-prefix';
+            add_settings_field(
+                $id,
+                esc_html__('Guest Customer Number Prefix', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_text_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
+                    'description'  => esc_html__('Prefix followed by order id will be the customer number in Run my Accounts.', 'run-my-accounts-for-woocommerce' )
+                )
+            );
+
+            $id = 'rma-guest-catch-all';
+            add_settings_field(
+                $id,
+                esc_html__('Catch-All Account', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'rma_customer_accounts_cb'), // individual callback
+                $this->option_page_general,
+                $section,
+                array( 'option_group' => $this->option_group_general,
+                       'id'           => $id
+                )
+            );
+
+        }
+
+        /**
+         * Page General, Section Product
+         */
+        public function options_general_product() {
+
+            $section = 'general_settings_product';
+
+            add_settings_section(
+                $section, // ID
+                esc_html__('Product', 'run-my-accounts-for-woocommerce'),
+                '', // Callback
+                $this->option_page_general // Page
+            );
+
+            $id = 'rma-product-fallback_id';
+            add_settings_field(
+                $id,
+                esc_html__('Fallback product sku', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'rma_parts_cb'), // individual callback
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
+                    'description'  => esc_html__('This is a fallback sku in Run My Accounts which will be used to create an invoice if the WooCommerce sku of a product is not available in Run My Accounts. Leave it empty if you do not want to use it. In this case the invoice cannot be created if the sku is not available in Run My Accounts.', 'run-my-accounts-for-woocommerce' )
+                )
+            );
+
+        }
+
+        /**
+         * Page General, Section Shipping
+         */
+        public function options_general_shipping() {
+
+            $section = 'general_settings_shipping';
+
+            add_settings_section(
+                $section, // ID
+                esc_html__('Shipping', 'run-my-accounts-for-woocommerce'),
+                '', // Callback
+                $this->option_page_general // Page
+            );
+
+            $id = 'rma-shipping-id';
+            add_settings_field(
+                $id,
+                esc_html__('SKU', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'rma_parts_cb'), // individual callback
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
+                    'description'  => esc_html__('To book the shipping costs, you have to select a dedicated product in Run my Accounts. The shipping costs will be booked on this product id.', 'run-my-accounts-for-woocommerce' )
+                )
+            );
+
+            $id = 'rma-shipping-text';
+            add_settings_field(
+                $id,
+                esc_html__('Description', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_text_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : '',
+                    'description'  => esc_html__('Optionally, the text on the invoice for shipping. Usually it is the text from the shipping method chosen by the customer.', 'run-my-accounts-for-woocommerce' )
+                )
+            );
+
+
+        }
+
+        /**
+         * Page General, Section Misc
+         */
+        public function options_general_log() {
+
+            $section = 'general_settings_log';
+
+            add_settings_section(
+                $section, // ID
+                esc_html__('Error Log', 'run-my-accounts-for-woocommerce'),
+                '', // Callback
+                $this->option_page_general // Page
+            );
+
+            $id = 'rma-loglevel';
+            add_settings_field(
+                $id,
+                esc_html__('Log Level', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_select_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group'   => $this->option_group_general,
+                    'id'             => $id,
+                    'options'        => $this->options_general,
+                    'select_options' => array(
+                        'error'      => esc_html__('error','run-my-accounts-for-woocommerce'),
+                        'complete'   => esc_html__('complete','run-my-accounts-for-woocommerce'),
+                    )
+                )
+            );
+
+            $id = 'rma-log-send-email';
+            add_settings_field(
+                $id,
+                esc_html__('Send email', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_select_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group'   => $this->option_group_general,
+                    'id'             => $id,
+                    'options'        => $this->options_general,
+                    'select_options' => array(
+                        'no'         => esc_html__('no','run-my-accounts-for-woocommerce'),
+                        'yes'        => esc_html__('yes','run-my-accounts-for-woocommerce'),
+                    ),
+                    'description'  => esc_html__('Receive emails on errors and general notifications.', 'run-my-accounts-for-woocommerce' )
+
+                )
+            );
+
+            $id = 'rma-log-email';
+            add_settings_field(
+                $id,
+                esc_html__('email', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_text_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group' => $this->option_group_general,
+                    'id'           => $id,
+                    'value'        => isset( $this->options_general[ $id ] ) ? $this->options_general[ $id ] : get_option( 'admin_email' ),
+                    'description'  => esc_html__( 'Get an email to this recipient. Administrators email address is used by default.', 'run-my-accounts-for-woocommerce' )
+                )
+            );
+
+
+        }
+
+        /**
+         * Page General, Section Misc
+         */
+        public function options_general_misc() {
+
+            $section = 'general_settings_misc';
+
+            add_settings_section(
+                $section, // ID
+                esc_html__('Misc', 'run-my-accounts-for-woocommerce'),
+                '', // Callback
+                $this->option_page_general // Page
+            );
+
+            $id = 'rma-delete-settings';
+            add_settings_field(
+                $id,
+                esc_html__('Delete Settings', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_select_cb'),
+                $this->option_page_general,
+                $section,
+                array(
+                    'option_group'   => $this->option_group_general,
+                    'id'             => $id,
+                    'options'        => $this->options_general,
+                    'select_options' => array(
+                        'no'         => esc_html__('no','run-my-accounts-for-woocommerce'),
+                        'yes'        => esc_html__('yes','run-my-accounts-for-woocommerce'),
+                    ),
+                    'description'  => esc_html__('Remove all plugin data when using the "Delete" link on the plugins screen', 'run-my-accounts-for-woocommerce' ),
+
+                )
+            );
+
+        }
+
+        public function options_accounting_gateways() {
+
+            $section = 'accounting_settings_payment';
+
+            add_settings_section(
+                $section, // ID
+                esc_html__('Receivables Account', 'run-my-accounts-for-woocommerce'), // Title
+                array( $this, 'section_info_accounting' ), // Callback
+                $this->option_page_accounting // Page
+            );
+
+            // add  settings fields for all payment gateways
+            $available_gateways = WC()->payment_gateways->get_available_payment_gateways();
+
+            foreach ( $available_gateways as $gateway_key => $values ) {
+
+                add_settings_field(
+                    $gateway_key,
+                    $values->title,
+                    array( $this, 'option_input_text_cb'),
+                    $this->option_page_accounting,
+                    $section,
+                    array(
+                        'option_group' => $this->option_group_accounting,
+                        'id'           => $gateway_key,
+                        'value'        => isset( $this->options_accounting[ $gateway_key ] ) ? $this->options_accounting[ $gateway_key ] : ''
+                    )
+                );
+
+            }
+
+        }
+
+        public function options_payment_gateways() {
+
+            $section = 'accounting_settings_payment_account';
+
+            add_settings_section(
+                $section, // ID
+                esc_html__('Payment Account', 'run-my-accounts-for-woocommerce'), // Title
+                array( $this, 'section_info_payment' ), // Callback
+                $this->option_page_accounting // Page
+            );
+
+            // add  settings fields for all payment gateways
+            $available_gateways = WC()->payment_gateways->get_available_payment_gateways();
+
+            foreach ( $available_gateways as $gateway_key => $values ) {
+
+                $field_id = $gateway_key . '_payment_account';
+
+                add_settings_field(
+                    $field_id,
+                    $values->title,
+                    array( $this, 'option_input_text_cb'),
+                    $this->option_page_accounting,
+                    $section,
+                    array(
+                        'option_group' => $this->option_group_accounting,
+                        'id'           => $field_id,
+                        'value'        => isset( $this->options_accounting[ $field_id ] ) ? $this->options_accounting[ $field_id ] : '',
+                        'placeholder'  => '1020'
+                    )
+                );
+
+            }
+
+        }
+
+        public function options_collective_invoice() {
+
+            $section = 'collective_invoice_settings';
+            add_settings_section(
+                $section, // ID
+                esc_html__( 'Collective Invoice', 'run-my-accounts-for-woocommerce' ), // Title
+                array( $this, 'section_info_collective_invoice' ), // Callback
+                $this->option_page_collective_invoice // Page
+            );
+
+            if( empty( $this->options_collective_invoice[ 'collective_invoice_next_date_ts' ] ) ) {
+                $text = esc_html__( 'The next invoice date cannot be calculated. Please set all options first.', 'run-my-accounts-for-woocommerce' );
+            }
+            else {
+                $text = date_i18n( get_option('date_format') , $this->options_collective_invoice[ 'collective_invoice_next_date_ts' ] );
+            }
+            $id = 'collective_invoice_next_text';
+            add_settings_field(
+                $id,
+                esc_html__('Next Invoice Date', 'run-my-accounts-for-woocommerce' ),
+                array( $this, 'plain_text_cb'),
+                $this->option_page_collective_invoice,
+                $section,
+                array(
+                    'text'  => $text,
+                    'class' => 'next-invoice-date'
+                )
+            );
+
+            $id = 'collective_invoice_period';
+            add_settings_field(
+                $id,
+                esc_html__('Invoice Period', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_select_cb'),
+                $this->option_page_collective_invoice,
+                $section,
+                array(
+                    'option_group' => $this->option_group_collective_invoice,
+                    'id'           => $id,
+                    'options'      => $this->options_collective_invoice,
+                    'select_options'  => array(
+                        'week'        => esc_html__( 'Once a week','run-my-accounts-for-woocommerce'),
+                        'second_week' => esc_html__( 'Every second week','run-my-accounts-for-woocommerce'),
+                        'month'       => esc_html__( 'Every month (first weekday of the month)','run-my-accounts-for-woocommerce'),
+                    ),
+                    'description'  => esc_html__('For what period of time should collective invoices be created?', 'run-my-accounts-for-woocommerce' ),
+                    'class'        => 'collective-invoice__period'
+                )
+            );
+
+            $id = 'collective_invoice_weekday';
+            add_settings_field(
+                $id,
+                esc_html__('Weekday', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_input_multiple_radio_cb'),
+                $this->option_page_collective_invoice,
+                $section,
+                array(
+                    'option_group' => $this->option_group_collective_invoice,
+                    'id'           => $id,
+                    'value'        => $this->options_collective_invoice[$id] ?? '',
+                    'description'  => esc_html__('Please select the days of the week on which a collective invoice should be created.', 'run-my-accounts-for-woocommerce' ),
+                    'values'       => array(
+                        'monday'    => esc_html__( 'Monday', 'run-my-accounts-for-woocommerce' ),
+                        'tuesday'   => esc_html__( 'Tuesday', 'run-my-accounts-for-woocommerce' ),
+                        'wednesday' => esc_html__( 'Wednesday', 'run-my-accounts-for-woocommerce' ),
+                        'thursday'  => esc_html__( 'Thursday', 'run-my-accounts-for-woocommerce' ),
+                        'friday'    => esc_html__( 'Friday', 'run-my-accounts-for-woocommerce' ),
+                        'saturday'  => esc_html__( 'Saturday', 'run-my-accounts-for-woocommerce' ),
+                        'sunday'    => esc_html__( 'Sunday', 'run-my-accounts-for-woocommerce' ),
+                    ),
+                    'line_break'  => false,
+                    'class'       => 'collective-invoice__weekday'
+                )
+            );
+
+            $id = 'collective_invoice_span';
+            add_settings_field(
+                $id,
+                esc_html__('Invoice Span', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'option_select_cb'),
+                $this->option_page_collective_invoice,
+                $section,
+                array(
+                    'option_group' => $this->option_group_collective_invoice,
+                    'id'           => $id,
+                    'options'      => $this->options_collective_invoice,
+                    'select_options' => array(
+                        'all'        => esc_html__( 'All unbilled invoices','run-my-accounts-for-woocommerce'),
+                        'per_week'   => esc_html__( 'Day of creation and a week before','run-my-accounts-for-woocommerce'),
+                        'per_month'  => esc_html__( 'Day of creation and a month before','run-my-accounts-for-woocommerce'),
+                    ),
+                    'description'  => esc_html__('For what period of time should collective invoices be created?', 'run-my-accounts-for-woocommerce' ),
+
+                )
+            );
+
+        }
+
+        public function section_info_accounting() {
+            esc_html_e('You can specify a dedicated receivable account for each active payment gateway.', 'run-my-accounts-for-woocommerce');
+        }
+
+        public function section_info_collective_invoice() {
+            esc_html_e('Set up the handling of the collective invoices', 'run-my-accounts-for-woocommerce');
+        }
+
+        public function section_info_payment() {
+            esc_html_e('You can specify a dedicated payment account for each active payment gateway.', 'run-my-accounts-for-woocommerce');
+        }
+
+        /**
+         * Page Error Log, Section Log
+         */
+        public function log() {
+
+            $section = 'log';
+
+            add_settings_section(
+                $section, // ID
+                esc_html__('Error Log', 'run-my-accounts-for-woocommerce'),
+                array( $this, 'section_info_log' ), // Callback
+                $this->option_page_log // Page
+            );
+
+            $id = 'rma-error-log';
+            add_settings_field(
+                $id,
+                '',
+                array( $this, 'output_log'), // general callback for checkbox
+                $this->option_page_log,
+                $section
+            );
+
+        }
+
+        public function section_info_log() {
+            echo sprintf( esc_html__('We have moved the logs to %s', 'run-my-accounts-for-woocommerce'), '<a href="https://plugins.trac.wordpress.org/wp-admin/admin.php?page=wc-status&tab=logs">' . esc_html__('WooCommerce Logs', 'run-my-accounts-for-woocommerce') . '</a>');
+        }
+
+        /**
+         * General Input Field Checkbox
+         *
+         * @param array $args
+         */
+        public function option_input_checkbox_cb( $args ){
+
+            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
+            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
+            $checked      = ( isset( $args['value'] ) && !empty( $args['value'] ) ) ? 'checked' : '';
+            $description  = ( isset( $args['description'] ) ) ? $args['description'] : '';
+
+            printf(
+                '<input type="checkbox" id="%1$s" name="%3$s[%1$s]" value="1" %2$s />',
+                $id, $checked, $option_group
+            );
+
+            if ( !empty( $description) )
+                echo '<p class="description">' . $description . '</p>';
+
+        }
+
+        /**
+         * General Input with Multiple Checkboxes
+         *
+         * @param array $args
+         *
+         * @since 1.7.0
+         */
+        public function option_input_multiple_checkbox_cb( $args ){
+
+            $legend       = ( isset( $args['legend'] ) ) ? $args['legend'] : '';
+            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
+            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
+            $options      = ( isset( $args['options'] ) ) ? $args['options'] : '';
+            $description  = ( isset( $args['description'] ) ) ? $args['description'] : '';
+            $values       = ( isset( $args['values'] ) ) ? $args['values'] : '';
+            $line_break   = ( isset( $args['line_break'] ) ) ? $args['line_break'] : true;
+
+            if( 0 == count( $values ) )
+                return;
+
+            echo '<fieldset id="' . $id . '"> ';
+            if( $legend ) {
+                printf( '<legend>%1$s</legend>', $legend );
+            }
+
+            foreach ( $values as $key => $title ) {
+
+                $checked = isset( $options[ $id . '-'. $key ] ) && 1 == $options[ $id . '-'. $key ] ? 'checked' : '';
+                $br      = isset( $line_break ) && true === $line_break ? '<br>' : '&nbsp;';
+
+                printf(
+                    '<input type="checkbox" id="%5$s" name="%3$s[%1$s-%5$s]" value="1" %2$s /><label for="%5$s">%4$s</label>%6$s',
+                    $id, $checked, $option_group, $title, $key, $br
+                );
+
+            }
+
+            echo '</fieldset>';
+
+            if ( !empty( $description) )
+                echo '<p class="description">' . $description . '</p>';
+
+        }
+
+        /**
+         * General Input with Multiple Checkboxes
+         *
+         * @param array $args
+         *
+         * @since 1.7.0
+         */
+        public function option_input_multiple_radio_cb( $args ){
+
+            $legend       = ( isset( $args['legend'] ) ) ? $args['legend'] : '';
+            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
+            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
+            $value        = ( isset( $args['value'] ) ) ? $args['value'] : '';
+            $description  = ( isset( $args['description'] ) ) ? $args['description'] : '';
+            $values       = ( isset( $args['values'] ) ) ? $args['values'] : '';
+            $line_break   = ( isset( $args['line_break'] ) ) ? $args['line_break'] : true;
+
+            if( 0 == count( $values ) )
+                return;
+
+            if( $legend ) {
+                printf( '<legend>%1$s</legend>', $legend );
+            }
+
+            foreach ( $values as $key => $title ) {
+
+                $checked = $value == $key ? 'checked' : '';
+                $br      = isset( $line_break ) && true === $line_break ? '<br>' : '&nbsp;';
+
+                printf(
+                    '<input type="radio" id="%5$s" name="%3$s[%1$s]" value="%5$s" %2$s /><label for="%5$s">%4$s</label>%6$s',
+                    $id, $checked, $option_group, $title, $key, $br
+                );
+
+            }
+
+            if ( !empty( $description) )
+                echo '<p class="description">' . $description . '</p>';
+
+        }
+
+        /**
+         * Input Field with Multiple Checkboxes for Payment Gateways
+         *
+         * @param array $args
+         */
+        public function option_input_multiple_payment_gateway_checkbox_cb( $args ){
+
+            // add  settings fields for all payment gateways
+            $available_gateways = WC()->payment_gateways->get_available_payment_gateways();
+
+            if( 0 == count( $available_gateways ) )
+                return;
+
+            $legend       = ( isset( $args['legend'] ) ) ? $args['legend'] : '';
+            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
+            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
+            $description  = ( isset( $args['description'] ) ) ? $args['description'] : '';
+
+            $s = get_option('wc_rma_settings');
+
+            echo '<fieldset id="' . $id . '"> ';
+            if( $legend ) {
+                printf( '<legend>%1$s</legend>', $legend );
+            }
+
+            foreach ( $available_gateways as $gateway_key => $values ) {
+
+                $checked = ( isset( $this->options_general[ $id . '-'. $gateway_key ] ) && 1 == $this->options_general[ $id . '-'. $gateway_key ] ) ? 'checked' : '';
+
+                printf(
+                    '<input type="checkbox" id="%5$s" name="%3$s[%1$s-%5$s]" value="1" %2$s />&nbsp;%4$s<br />',
+                    $id, $checked, $option_group, $values->title, $gateway_key
+                );
+
+            }
+
+            echo '</fieldset>';
+
+            if ( !empty( $description) )
+                echo '<p class="description">' . $description . '</p>';
+
+        }
+
+        /**
+         * General Input Field Text
+         *
+         * @param array $args
+         */
+        public function option_input_text_cb( $args ) {
+
+            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
+            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
+            $value        = ( isset( $args['value'] ) ) ? $args['value'] : '';
+            $placeholder  = ( isset( $args['placeholder'] ) ) ? $args['placeholder'] : '';
+            $description  = ( isset( $args['description'] ) ) ? $args['description'] : '';
+
+            printf(
+                '<input type="text" id="%1$s" name="%3$s[%1$s]" value="%2$s" placeholder="%4$s" />',
+                $id, $value, $option_group, $placeholder
+            );
+
+            if ( !empty( $description) )
+                echo '<p class="description">' . $description . '</p>';
+        }
+
+        /**
+         * General Select
+         *
+         * @param array $args
+         */
+        public function option_select_cb( $args ) {
+            $option_group   = (isset($args['option_group'])) ? $args['option_group'] : '';
+            $id             = (isset($args['id'])) ? $args['id'] : '';
+            $options        = (isset($args['options'])) ? $args['options'] : '';
+            $select_options = (isset($args['select_options'])) ? $args['select_options'] : array();
+            $description    = (isset($args['description'])) ? $args['description'] : '';
+            $class          = (isset($args['class'])) ? $args['class'] : '';
+
+            echo '<select name="' . $option_group . '[' . $id . ']"' . ( !empty( $class) ? 'id="'. $id .'" class="' . $class . '"' : '' ) . '>';
+
+            foreach ( $select_options as $value => $text ) {
+                printf(
+                    '<option value="%1$s" %2$s />%3$s</option>',
+                    $value,
+                    ( isset( $options[ $id ] ) && $value == $options[ $id ] ) ? 'selected="selected"' : '',
+                    $text
+                );
+            }
+
+            echo '</select>';
+
+            if ( !empty( $description) )
+                echo '<p class="description">' . $description . '</p>';
+
+        }
+
+        /**
+         * @param array
+         */
+        public function plain_text_cb( $args ) {
+            $text  = ( isset( $args[ 'text' ] ) ) ? $args[ 'text' ] : '';
+            $class = ( isset( $args[ 'class' ] ) ) ? $args[ 'class' ] : '';
+
+            echo '<p class="' . $class . '">' . $text . '</p>';
+        }
+
+        /**
+         * Individual pulldown
+         *
+         * @param array $args
+         */
+        public function rma_mode_cb( $args ) {
+            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
+            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
+
+            $select_args  = array(
+                'option_group' => $option_group,
+                'id'           => $id,
+                'options'      => $this->options_general,
+                'select_options' => array(
+                    'test' => esc_html__('Sandbox Test','run-my-accounts-for-woocommerce'),
+                    'live' => esc_html__('Production','run-my-accounts-for-woocommerce'),
+                )
+            );
+
+            // create select
+            self::option_select_cb( $select_args );
+
+            // output connection status
+            $RMA_WC_API = new RMA_WC_API();
+            // Retrieve customers to check connection
+            $options = $RMA_WC_API->get_customers();
+            unset( $RMA_WC_API );
+
+            if ( ! $options )
+                echo '&nbsp;<span style="color: red; font-weight: bold">' . __('No connection. Please check your settings.', 'run-my-accounts-for-woocommerce') . '</span>';
+            else
+                echo '&nbsp;<span style="color: green">' . __('Connection successful.', 'run-my-accounts-for-woocommerce') . '</span>';
+
+        }
+
+        /**
+         * Pull down with RMA customer list
+         *
+         * @param $args
+         */
+        public function rma_customer_accounts_cb( $args ) {
+            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
+            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
+
+            $RMA_WC_API = new RMA_WC_API();
+            $options = $RMA_WC_API->get_customers();
+
+            if ( !empty( $RMA_WC_API ) ) unset( $RMA_WC_API );
+
+            if( !isset( $options ) || !$options ) {
+
+                $options = array('' => __( 'Error while connecting to RMA. Please check your settings.', 'run-my-accounts-for-woocommerce' ) );
+
+            }
+            else {
+
+                $options = array('' => __( 'Select...', 'run-my-accounts-for-woocommerce' ) ) + $options;
+
+            }
+
+            $select_args  = array (
+                'option_group'   => $option_group,
+                'id'             => $id,
+                'options'        => $this->options_general,
+                'select_options' => $options,
+                'class'          => 'select2'
+            );
+
+            // create select
+            self::option_select_cb( $select_args );
+
+        }
+
+        /**
+         * Pull down with RMA parts list
+         *
+         * @param $args
+         *
+         * @since 1.5.0
+         */
+        public function rma_parts_cb( $args ) {
+            $option_group = ( isset( $args['option_group'] ) ) ? $args['option_group'] : '';
+            $id           = ( isset( $args['id'] ) ) ? $args['id'] : '';
+            $description  = ( isset( $args['description'] ) ) ? $args['description'] : '';
+
+            if ( !isset( $parts ) || empty( $parts ) ) {
+
+                $rma_api = new RMA_WC_API();
+                $parts   = $rma_api->get_parts();
+
+                if ( !empty( $RMA_WC_API ) ) unset( $RMA_WC_API );
+
+            }
+
+            if( !isset( $parts ) || !$parts ) {
+
+                $options = array('' => __( 'Error while connecting to RMA. Please check your settings.', 'run-my-accounts-for-woocommerce' ) );
+
+            }
+            else {
+
+                $options = array('' => __( 'Select...', 'run-my-accounts-for-woocommerce' ) ) + $parts;
+
+            }
+
+            $select_args  = array (
+                'option_group'   => $option_group,
+                'id'             => $id,
+                'options'        => $this->options_general,
+                'select_options' => $options,
+                'description'    => $description,
+                'class'          => 'select2'
+            );
+
+            // create select
+            self::option_select_cb( $select_args );
+
+        }
+
+        /**
+         * Sanitizes a string from user input
+         * Checks for invalid UTF-8, Converts single < characters to entities, Strips all tags, Removes line breaks, tabs, and extra whitespace, Strips octets
+         *
+         * @param array $input
+         *
+         * @return array
+         */
+        public function sanitize( $input )  {
+
+            $new_input = array();
+
+            foreach ( $input as $key => $value ) {
+
+                $new_input[ $key ] = sanitize_text_field( $input[ $key ] );
+
+            }
+
+            return $new_input;
+        }
+
+    }
 
 }

run-my-accounts-for-woocommerce/trunk/readme.txt

@@ -2 +2 @@
 * Contributors: openstream
 * Tags: Run my Accounts, WooCommerce, Billing
-* Requires at least: 4.7
-* Tested up to: 6.7
-* Stable tag: 1.7.1
+* Requires at least: 6.2
+* Tested up to: 6.8
+* Stable tag: 1.8.0
 * Requires PHP: 7.2
-* License: GPLv3
-* License URI: https://www.gnu.org/licenses/gpl-3.0.html
+* License: GPLv2
+* License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
 This plug-in connects WooCommerce with Run my Accounts.
@@ -54 +54 @@
 
 == Changelog ==
+= 1.8.0 =
+* Added support for WooCommerce HPOS
+* Added code improvements, escaping and sanitizing text
+* Moved language handling to [GlotPress](https://translate.wordpress.org/projects/wp-plugins/run-my-accounts-for-woocommerce/)
+* Bumped required WordPress version to 6.2
+* Bumped required WooCommerce version to 8.2
+
 = 1.7.1 =
 * Fix - added handling cURL error on settings page
-* Compatibility - tested up to WooCommerce 7.4
+* Compatibility - tested up to WooCommerce 7.4 - 8.3
 * Compatibility - tested up to WordPress 6.2 - 6.7
 

run-my-accounts-for-woocommerce/trunk/rma-wc.php

@@ -1 +1 @@
 <?php
-
 /**
  * rma-wc.php
@@ -8 +7 @@
  * @package              RunmyAccountsforWooCommerce
  * @author               Sandro Lucifora
- * @copyright            2023 Openstream Internet Solutions
+ * @copyright            2025 Openstream Internet Solutions
  * @license              GPL-3.0-or-later
  *
  * Plugin Name:          Run my Accounts for WooCommerce
- * Version:              1.7.1
+ * Version:              1.8.0
  * Description:          This plug-in connects WooCommerce to <a href="https://www.runmyaccounts.ch/">Run my Accounts</a>. Create customers and invoices as soon as you get an order in your WooCommerce shop.
- * Requires at least:    4.7
+ * Requires at least:    6.2
  * Requires PHP:         7.2
  * Author:               Openstream Internet Solutions
  * Author URI:           https://www.openstream.ch
- * Text Domain:          rma-wc
- * Domain Path:          /languages/
- * WC requires at least: 3.2
- * WC tested up to:      7.4
+ * Text Domain:          run-my-accounts-for-woocommerce
+ * WC requires at least: 8.2
+ * WC tested up to:      9.7
  * License:              GPL v2 or later
  * License URI:          https://www.gnu.org/licenses/gpl-2.0.html
  */
 
-if ( !defined('ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH' ) ) exit;
 
 // Set full path
-if (!defined('RMA_WC_PFAD')) { define('RMA_WC_PFAD', plugin_dir_path(__FILE__)); }
-if (!defined('RMA_WC_LOG_TABLE')) { define('RMA_WC_LOG_TABLE', 'rma_wc_log'); }
+if ( ! defined('RMA_WC_PFAD') ) {
+    define('RMA_WC_PFAD', trailingslashit( plugin_dir_path( __FILE__) ) );
+}
 
 /**
- * Class autoload for plugin classes which contains RMA in the class name
+ * Declare WooCommerce HPOS compatibility
  *
- * @param $class_name
+ * @since 1.8.0
  */
-function rma_wc_autoloader( $class_name )
-{
-    if ( false !== strpos( $class_name, 'RMA' ) ) {
-        require_once plugin_dir_path(__FILE__) . 'classes/class-' . $class_name . '.php';
-    }
+function rma_declare_hpos() : void{
+    if ( class_exists( \Automattic\WooCommerce\Utilities\FeaturesUtil::class ) ) {
+        \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', __FILE__, true );
+    }
 }
+add_action( 'before_woocommerce_init', 'rma_declare_hpos');
 
-spl_autoload_register('rma_wc_autoloader');
+/**
+ * Load the main file only if WooCommerce is full loaded
+ *
+ * @return void
+ */
+function rma_woocommerce_loaded_action(){
 
-// LOAD BACKEND ////////////////////////////////////////////////////////////////
-
-if ( is_admin() ) {
-
-    // Instantiate backend class
-    $RMA_WC_BACKEND = new RMA_WC_Backend();
-
-    register_activation_hook(__FILE__, array('RMA_WC_Backend', 'activate') );
-    register_deactivation_hook(__FILE__, array('RMA_WC_Backend', 'deactivate') );
-
-    $my_settings_page = new RMA_WC_Settings_Page();
+    include_once RMA_WC_PFAD . '/rma-wc-main.php';
 
 }
-
-/*
- * Instantiate Frontend Class
- */
-$RMA_WC_FRONTEND = new RMA_WC_Frontend();
-
-$t = new RMA_WC_Collective_Invoicing();
-
-/*
- * Integration of WooCommerce Rental & Booking System if activated
- * https://codecanyon.net/item/rnb-woocommerce-rental-booking-system/14835145
- */
-$active_plugins   = apply_filters( 'active_plugins', get_option( 'active_plugins' ) );
-$required_plugins = ['woocommerce-rental-and-booking'];
-if ( count( array_intersect( $required_plugins, $active_plugins ) ) !== count( $required_plugins ) ) {
-
-    $RMA_RnB = new RMA_WC_Rental_And_Booking();
-
-}
+add_action( 'woocommerce_loaded', 'rma_woocommerce_loaded_action' );

run-my-accounts-for-woocommerce/trunk/templates/email/error-email-template.php

@@ -1 @@
-<p><?php echo esc_html_X('While connecting with Run my Accounts API the following error occurred:', 'error email body', 'rma-wc') ?></p>
+<p><?php echo esc_html_X('While connecting with Run my Accounts API the following error occurred:', 'error email body', 'run-my-accounts-for-woocommerce') ?></p>
 <table border="1">
     <tr>
-        <th><?php echo esc_html_x('Mode', 'error email body', 'rma-wc') ?></th>
-        <th><?php echo esc_html_x('Section', 'error email body', 'rma-wc') ?></th>
-        <th><?php echo esc_html_x('Section ID', 'error email body', 'rma-wc') ?></th>
-        <th><?php echo esc_html_x('Message', 'error email body', 'rma-wc') ?></th>
+        <th><?php echo esc_html_x('Mode', 'error email body', 'run-my-accounts-for-woocommerce') ?></th>
+        <th><?php echo esc_html_x('Section', 'error email body', 'run-my-accounts-for-woocommerce') ?></th>
+        <th><?php echo esc_html_x('Section ID', 'error email body', 'run-my-accounts-for-woocommerce') ?></th>
+        <th><?php echo esc_html_x('Message', 'error email body', 'run-my-accounts-for-woocommerce') ?></th>
     </tr>
     <tr>
-        <td><?php echo $values['mode']; ?></td>
-        <td><?php echo $values['section']; ?></td>
-        <td><?php echo $values['section_id']; ?></td>
-        <td><?php echo $values['message']; ?></td>
+        <td><?php sanitize_text_field( $values['mode'] ); ?></td>
+        <td><?php sanitize_text_field( $values['section'] ); ?></td>
+        <td><?php sanitize_text_field( $values['section_id'] ); ?></td>
+        <td><?php sanitize_text_field( $values['message'] ); ?></td>
     </tr>
 </table>