Changeset 3036865

Timestamp:

02/16/2024 01:34:40 PM (2 years ago)

Author:

best2pay

Message:

updated to ver 2.2.0

Location:

best2pay-payment-method-visamastercard

Files:

• tags/2.1.5 (added)
• tags/2.1.5/assets (added)
• tags/2.1.5/assets/fonts (added)
• tags/2.1.5/assets/fonts/Montserrat-Bold.eot (added)
• tags/2.1.5/assets/fonts/Montserrat-Bold.ttf (added)
• tags/2.1.5/assets/fonts/Montserrat-Bold.woff (added)
• tags/2.1.5/assets/fonts/Montserrat-Medium.eot (added)
• tags/2.1.5/assets/fonts/Montserrat-Medium.ttf (added)
• tags/2.1.5/assets/fonts/Montserrat-Medium.woff (added)
• tags/2.1.5/assets/fonts/Montserrat-Regular.eot (added)
• tags/2.1.5/assets/fonts/Montserrat-Regular.ttf (added)
• tags/2.1.5/assets/fonts/Montserrat-Regular.woff (added)
• tags/2.1.5/assets/fonts/Montserrat-SemiBold.eot (added)
• tags/2.1.5/assets/fonts/Montserrat-SemiBold.ttf (added)
• tags/2.1.5/assets/fonts/Montserrat-SemiBold.woff (added)
• tags/2.1.5/assets/fonts/montserrat-v25-latin-regular.eot (added)
• tags/2.1.5/assets/fonts/montserrat-v25-latin-regular.svg (added)
• tags/2.1.5/assets/fonts/montserrat-v25-latin-regular.ttf (added)
• tags/2.1.5/assets/fonts/montserrat-v25-latin-regular.woff (added)
• tags/2.1.5/assets/fonts/montserrat-v25-latin-regular.woff2 (added)
• tags/2.1.5/assets/fonts/montserrat.css (added)
• tags/2.1.5/assets/img (added)
• tags/2.1.5/assets/img/best2pay.png (added)
• tags/2.1.5/assets/img/halva.svg (added)
• tags/2.1.5/assets/img/halva_logo.svg (added)
• tags/2.1.5/assets/js (added)
• tags/2.1.5/assets/js/scripts.js (added)
• tags/2.1.5/best2pay-payment_method.php (added)
• tags/2.1.5/halva_widget.php (added)
• tags/2.1.5/languages (added)
• tags/2.1.5/languages/best2pay-payment_method-ru_RU.mo (added)
• tags/2.1.5/languages/best2pay-payment_method-ru_RU.po (added)
• tags/2.1.5/languages/best2pay-payment_method.pot (added)
• tags/2.1.5/readme.txt (added)
• trunk/assets/img/best2pay.png (modified) (previous)
• trunk/assets/img/svkb.svg (added)
• trunk/assets/img/svkb_logo.svg (added)
• trunk/assets/js/admin.js (added)
• trunk/best2pay-payment_method.php (modified) (59 diffs)
• trunk/languages/best2pay-payment_method-ru_RU.mo (modified) (previous)
• trunk/languages/best2pay-payment_method-ru_RU.po (modified) (5 diffs)
• trunk/languages/best2pay-payment_method.pot (modified) (3 diffs)
• trunk/readme.txt (modified) (1 diff)
• trunk/svkb_widget.php (added)

best2pay-payment-method-visamastercard/trunk/best2pay-payment_method.php

@@ -1 +1 @@
 <?php
 declare(strict_types=1);
-
 
 /*
@@ -17 +16 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+
 /**
- * Plugin Name: Best2Pay payment method (Visa/MasterCard/MIR)
+ * Plugin Name: Best2Pay payment module
  * Plugin URI: https://best2pay.net/
  * Description: Receive payments via Visa/Mastercard/MIR easily with Best2Pay bank cards processing
- * Version: 2.1.5
+ * Version: 2.2.0
  * Author: Best2Pay
- * Tested up to: 6.3.2
+ * Tested up to: 6.4.3
  * License: GPL3
  *
@@ -35 +35 @@
 add_action('plugins_loaded', 'init_woocommerce_best2pay', 0);
 
-function init_woocommerce_best2pay()
-{
+function init_woocommerce_best2pay() {
     if(!class_exists('WC_Payment_Gateway')){
         return;
     }
-    
+
     load_plugin_textdomain('best2pay-payment_method', false, dirname(plugin_basename(__FILE__)) . '/languages');
-    
-    class woocommerce_best2pay extends WC_Payment_Gateway
-    {
+
+    class woocommerce_best2pay extends WC_Payment_Gateway {
         const PLUGIN_SITE = 'https://best2pay.net';
         const SHOP_CART_MAX_LENGTH = 1000;
@@ -55 +53 @@
             'loan' => '/webapi/custom/unicheckout/PurchaseWithLoanManager'
         ];
-        
+
         const OLD_TO_NEW_PAYMENT_METHODS = [
             'Purchase' => 'acquiring',
@@ -63 +61 @@
             'PurchaseSBP' => 'sbp'
         ];
+
         private const OPERATION_TYPES = [
             'PURCHASE',
@@ -70 +69 @@
             'COMPLETE'
         ];
+
         private const PAID_OPERATION_TYPES = [
             'PURCHASE',
@@ -75 +75 @@
             'AUTHORIZE',
         ];
+
         private const OPERATION_APPROVED = 'APPROVED';
         private const OPERATION_COMPLETE = 'COMPLETE';
@@ -90 +91 @@
         protected string $testmode;
         protected string $hash_algo;
+        protected string $notify_customer_enabled;
         protected string $registered_status;
         protected string $authorized_status;
         protected string $loan_status;
         protected string $completed_status;
+        protected string $agreement_status;
+        protected string $payment_expected_status;
         protected string $canceled_status;
         protected string $payment_method;
@@ -101 +105 @@
         protected string $fiscal_positions;
         protected array $shop_cart;
+        protected string $logo_field;
+        protected string $remove_logo_field;
         /**
          * Init fields, set settings, register hooks
          */
-        public function __construct()
-        {
+        public function __construct() {
             require_once ABSPATH . 'wp-admin/includes/file.php';
+
             // plugin settings
             $this->id = 'best2pay';
@@ -115 +121 @@
                 '[email protected]'
             );
-            $this->title = __('Best2Pay', 'best2pay-payment_method');
-            $this->description = sprintf(
-                __('Payments with bank cards via the <a href="%s" target="_blank">Best2Pay</a> payment system.', 'best2pay-payment_method'),
-                self::PLUGIN_SITE
-            );
             $this->icon = plugins_url('assets/img/best2pay.png', __FILE__);
             $this->has_fields = true;
             $this->notify_url = add_query_arg('wc-api', 'best2pay_notify', home_url('/'));
             $this->callback_url = add_query_arg('wc-api', 'best2pay', home_url('/'));
-            
+
             // means that the gateway accept refunds
             $this->supports = array('refunds', 'products');
-            
+
             $this->init_form_fields();
             $this->init_settings();
-            
+
             // variables
+            $this->title = !empty($this->settings['title']) ? $this->settings['title'] : $this->method_title;
+            $this->description = !empty($this->settings['description']) ? $this->settings['description'] : sprintf(
+                __('Payments with bank cards via the <a href="%s" target="_blank">Best2Pay</a> payment system.', 'best2pay-payment_method'),
+                self::PLUGIN_SITE
+            );
+            $this->logo = $this->settings['logo'] ?? '';
             $this->sector = $this->settings['sector'];
             $this->password = $this->settings['password'];
@@ -137 +144 @@
             $this->payment_method = $this->settings['payment_method'] ?? '';
             $this->tax = $this->settings['tax'] ?? '6';
-            $this->hash_algo = $this->settings['hash_algo'] ?? 'md5';
-            
+            $this->hash_algo = !empty($this->settings['hash_algo']) ? $this->settings['hash_algo'] : 'md5';
+            $this->notify_customer_enabled = $this->settings['notify_customer_enabled'] ?? '';
+
             //statuses
             $this->registered_status = $this->settings['registered_status'] ?? '';
@@ -145 +153 @@
             $this->completed_status = $this->settings['completed_status'] ?? '';
             $this->canceled_status = $this->settings['canceled_status'] ?? '';
-            
+            $this->agreement_status = $this->settings['agreement_status'] ?? '';
+            $this->payment_expected_status = $this->settings['payment_expected_status'] ?? '';
+
             $this->currency = $this->get_currency(get_woocommerce_currency());
             $this->url = $this->best2pay_get_url();
-            
+            $this->logo_field = $this->plugin_id . $this->id . '_logo';
+            $this->remove_logo_field = $this->plugin_id . $this->id . '_remove_logo';
+
             switch($this->payment_method) {
                 case 'halva':
                 case 'halva_two_steps':
-                    $this->title = __('Pay for your order in installments', 'best2pay-payment_method'); //'Оплатить заказ Частями';
-                    $this->icon = plugins_url('assets/img/halva.svg', __FILE__);
+                    $this->title = __('Pay for your order in installments', 'best2pay-payment_method');
+                    $this->icon = plugins_url('assets/img/svkb.svg', __FILE__);
                     $this->description = '<iframe style="width:100%;height:180px;border:none;min-width: 440px;margin-left: -50px;"
-                        src="' . plugins_url('halva_widget.php', __FILE__) . '?amount='
+                        src="' . plugins_url('svkb_widget.php', __FILE__) . '?amount='
                         . print_r((isset(WC()->cart->cart_contents_total)) ? WC()->cart->cart_contents_total : '', true) . '"></iframe>';
                     break;
-                case 'sbp':
-                    $this->title = __('Pay by QR', 'best2pay-payment_method'); //'Оплатить по QR';
-                    $this->icon = null;
+                default:
+                    if($this->logo)
+                        $this->icon = wp_get_attachment_url($this->logo);
                     break;
             }
+
             // actions
             add_action('init', array($this, 'successful_request'));
@@ -170 +183 @@
             add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
             add_action('woocommerce_order_item_add_action_buttons', array($this, 'wc_order_item_add_complete_button'), 10, 1);
-        }
-        
+            add_filter('woocommerce_generate_image_html', 'woocommerce_generate_image_html');
+            add_action("woocommerce_order_status_changed", array($this, 'wc_best2pay_order_payment_change'), 10, 4);
+        }
+
+        public function generate_image_html( $key, $data ) {
+            $field_key = $this->get_field_key( $key );
+            $defaults  = array(
+                'title'             => '',
+                'disabled'          => false,
+                'class'             => '',
+                'css'               => '',
+                'placeholder'       => '',
+                'type'              => 'file',
+                'desc_tip'          => false,
+                'description'       => '',
+                'custom_attributes' => array(),
+            );
+
+            $data = wp_parse_args( $data, $defaults );
+
+            ob_start();?>
+            <tr valign="top">
+                <th scope="row" class="titledesc">
+                    <label for="<?php echo esc_attr( $field_key ); ?>"><?php echo wp_kses_post( $data['title'] ); ?> <?php echo $this->get_tooltip_html( $data );?></label>
+                </th>
+                <td class="forminp">
+                    <fieldset>
+                        <legend class="screen-reader-text"><span><?php echo wp_kses_post( $data['title'] ); ?></span></legend>
+                        <input class="input-text regular-input" type="file" name="<?php echo esc_attr( $field_key ); ?>" id="<?php echo esc_attr( $field_key ); ?>" accept="image/*">
+                    </fieldset>
+                    <?php if(!empty($this->logo)){
+                        $logo_meta = wp_get_attachment_metadata($this->logo);?>
+                        <img src="<?php echo wp_get_attachment_url($this->logo) ?>" alt="" width="100" style="margin: 10px">
+                        <div>(<?php echo $logo_meta['width'] . 'x' . $logo_meta['height'];?>)</div>
+                        <br>
+                        <label for="<?php echo esc_attr( $this->remove_logo_field ); ?>">
+                            <input class="" type="checkbox" name="<?php echo esc_attr( $this->remove_logo_field ); ?>" id="<?php echo esc_attr( $this->remove_logo_field ); ?>" style="" value="1"> <?php echo wp_kses_post( __('Remove logo', 'best2pay-payment_method') ); ?></label>
+                        <?php
+                    } else { ?>
+                        <img src="<?php echo plugins_url('assets/img/best2pay.png', plugin_basename(__FILE__)); ?>" alt="" width="100" style="margin: 10px">
+                    <?php } ?>
+                </td>
+            </tr>
+            <?php return ob_get_clean();
+        }
+
         /**
          * Initialise Gateway Settings Form Fields
@@ -177 +234 @@
          * @return void
          */
-        public function init_form_fields()
-        {
+        public function init_form_fields() {
             $wc_statuses = wc_get_order_statuses();
-            
-            //  array to generate admin form
+
             $this->form_fields = array(
                 'enabled' => array(
@@ -189 +244 @@
                     'default' => 'yes'
                 ),
-                
+                'title' => array(
+                    'title' => __('Title', 'best2pay-payment_method'),
+                    'type' => 'text',
+                    'description' => __('Custom title for payment type', 'best2pay-payment_method'),
+                    'desc_tip' => true,
+                    'default' => '',
+                    'placeholder' => $this->method_title
+                ),
+                'description' => array(
+                    'title' => __('Description', 'best2pay-payment_method'),
+                    'type' => 'textarea',
+                    'description' => __('Custom description for payment type', 'best2pay-payment_method'),
+                    'desc_tip' => true,
+                    'default' => '',
+                    'css' => 'width: 400px;'
+                ),
+                'logo' => array(
+                    'title' => __('Logo', 'best2pay-payment_method'),
+                    'type' => 'image',
+                    'description' => __('Custom logo for payment type', 'best2pay-payment_method'),
+                    'desc_tip' => true,
+                    'default' => ''
+                ),
                 'sector' => array(
                     'title' => __('Sector ID', 'best2pay-payment_method'),
@@ -197 +274 @@
                     'default' => ''
                 ),
-                
                 'password' => array(
                     'title' => __('Password', 'best2pay-payment_method'),
@@ -205 +281 @@
                     'default' => ''
                 ),
-                
                 'testmode' => array(
                     'title' => __('Test Mode', 'best2pay-payment_method'),
@@ -214 +289 @@
                     ),
                     'description' => __('Select test or live mode', 'best2pay-payment_method'),
-                    'desc_tip' => true,
-                ),
-                
+                    'desc_tip' => true
+                ),
                 'payment_method' => array(
                     'title' => __('Payment method', 'best2pay-payment_method'),
@@ -223 +297 @@
                         'acquiring' => __('Standard acquiring (one-stage payment)', 'best2pay-payment_method'),
                         'acquiring_two_steps' => __('Standard acquiring (two-stage payment)', 'best2pay-payment_method') . ' *',
-                        'halva' => __('Halva Chastyami (one-stage payment)', 'best2pay-payment_method'),
-                        'halva_two_steps' => __('Halva Chastyami (two-stage payment)', 'best2pay-payment_method') . ' *',
+                        'halva' => __('Plait (one-stage payment)', 'best2pay-payment_method'),
+                        'halva_two_steps' => __('Plait (two-stage payment)', 'best2pay-payment_method') . ' *',
                         'sbp' => __('Fast Payment System', 'best2pay-payment_method'),
                         'loan' => __('Loan', 'best2pay-payment_method')
                     ),
                     'description' => '* ' . __('Payment occurs after confirmation by the manager in the personal account', 'best2pay-payment_method'),
-                    'desc_tip' => true,
-                ),
-                
+                    'desc_tip' => true
+                ),
                 'tax' => array(
                     'title' => __('TAX', 'best2pay-payment_method'),
@@ -243 +316 @@
                         6 => __('Not subject to VAT', 'best2pay-payment_method'),
                     ),
-                    'default' => '6',
-                ),
-                
+                    'default' => '6'
+                ),
                 'notify_url' => array(
                     'title' => __('Notify URL', 'best2pay-payment_method'),
@@ -254 +326 @@
                     'custom_attributes' => array(
                         'readonly' => 'readonly',
-                    ),
-                ),
-                
+                    )
+                ),
                 'hash_algo' => array(
                     'title' => __('Data encryption algorithm', 'best2pay-payment_method'),
@@ -266 +337 @@
                     'description' => __('Must match your sector encryption settings in your personal account', 'best2pay-payment_method'),
                     'desc_tip' => true,
-                    'default' => 'md5',
-                ),
-                
+                    'default' => 'md5'
+                ),
                 'custom_statuses_header' => array(
                     'title' => __('Custom statuses for orders', 'best2pay-payment_method'),
-                    'type' => 'title',
-                ),
-                
-                // custom order statuses
+                    'type' => 'title'
+                ),
                 'registered_status' => array(
                     'title' => __('Order registered', 'best2pay-payment_method'),
                     'type' => 'select',
-                    'options' => $wc_statuses,
+                    'options' => $wc_statuses
                 ),
                 'authorized_status' => array(
                     'title' => __('Order authorized', 'best2pay-payment_method'),
                     'type' => 'select',
-                    'options' => $wc_statuses,
+                    'options' => $wc_statuses
                 ),
                 'loan_status' => array(
                     'title' => __('Loan agreement approved but not signed', 'best2pay-payment_method'),
                     'type' => 'select',
-                    'options' => $wc_statuses,
+                    'options' => $wc_statuses
                 ),
                 'completed_status' => array(
                     'title' => __('Order successfully paid', 'best2pay-payment_method'),
                     'type' => 'select',
-                    'options' => $wc_statuses,
+                    'options' => $wc_statuses
                 ),
                 'canceled_status' => array(
                     'title' => __('Order canceled', 'best2pay-payment_method'),
                     'type' => 'select',
+                    'options' => $wc_statuses
+                ),
+                'notify_customer_enabled' => array(
+                    'title' => __('Issuing an invoice for payment', 'best2pay-payment_method'),
+                    'type' => 'checkbox',
+                    'label' => __('Enable issuing an invoice for payment by email of the payer', 'best2pay-payment_method'),
+                    'default' => 'no'
+                ),
+                'agreement_status' => array(
+                    'title' => __('Order agreement', 'best2pay-payment_method'),
+                    'type' => 'select',
                     'options' => $wc_statuses,
-                ),
-                
+                    'default' => 'wc-on-hold'
+                ),
+                'payment_expected_status' => array(
+                    'title' => __('Payment expected', 'best2pay-payment_method'),
+                    'type' => 'select',
+                    'options' => $wc_statuses,
+                    'default' => 'wc-pending'
+                )
             );
-            
-        }
-        
-        /**
-         * Overwritten WC function.
-         * Register order @ Best2Pay and redirect user to payment form
-         *
-         * @param $order_id
-         * @return string[]
-         **/
-        public function process_payment($order_id)
-        {
-            $order = wc_get_order($order_id);
+
+            wp_enqueue_script('admin-best2pay-script', plugins_url('assets/js/admin.js', __FILE__));
+        }
+
+        public function wc_best2pay_order_payment_change ($order_id, $status_from, $status_to, $order) {
+            if($order->payment_method === 'best2pay' && ($status_from === 'on-hold' && $status_to === 'pending')) {
+                $this->process_payment_registration($order);
+            }
+        }
+
+        public function process_payment_registration($order) {
             $order_amount = $this->centify($order->get_total());
-            
+
             $this->calc_fiscal_position_shop_cart($order, $order_amount);
-            
+
             $args = array(
                 'sector' => $this->sector,
@@ -332 +415 @@
                 'signature' => $this->generate_sign([$this->sector, $order_amount, $this->currency], true)
             );
-            
+
+            if($this->notify_customer_enabled === 'yes') {
+                $args = array_merge($args, ['notify_customer' => 1]);
+            }
+
             try {
                 $response = $this->send_request($this->url . '/webapi/Register', ['body' => $args]);
                 if (is_wp_error($response))
                     throw new Exception($response->get_error_message());
+
                 $response = $response['body'] ?? $response;
+
                 $b2p_order_id = (int) $response;
                 if ($b2p_order_id == 0)
                     throw new Exception(__('Failed to register order', 'best2pay-payment_method') . '<br>' . $response );
+
             } catch(Exception $e) {
                 $this->log($e->getMessage(), ['args' => $args, 'response' => $response]);
                 wc_add_notice($e->getMessage(), 'error' );
+
                 return [
                     'result' => 'failure',
@@ -349 +440 @@
                 ];
             }
-            
+
             update_post_meta($order->get_id(), 'best2pay_order_id', $b2p_order_id);
             update_post_meta($order->get_id(), 'best2pay_order_state', self::ORDER_REGISTERED);
             $order->add_order_note(__('Order registered successfully', 'best2pay-payment_method') . " (ID: $b2p_order_id)");
-            
+
+            return $b2p_order_id;
+        }
+
+        public function process_payment_payform($pay_order_id) : string {
             $data = [
                 'sector' => $this->sector,
-                'id' => $b2p_order_id
+                'id' => $pay_order_id
             ];
+
             if(($this->payment_method === 'halva' || $this->payment_method === 'halva_two_steps') && $this->shop_cart) {
                 $shop_cart_encoded = base64_encode(json_encode($this->shop_cart, JSON_UNESCAPED_UNICODE));
+
                 if(strlen($shop_cart_encoded) > self::SHOP_CART_MAX_LENGTH)
                     $shop_cart_encoded = '';
+
                 $data['shop_cart'] = $shop_cart_encoded;
             }
+
             $this->sign_data($data, true);
             $payment_path = self::PAYMENT_PATHS_BY_METHOD[$this->payment_method];
-            $payment_url = $this->url . $payment_path . '?' . http_build_query($data);
+
+            return $this->url . $payment_path . '?' . http_build_query($data);
+        }
+
+        public function process_admin_options() {
+            if(!empty($_POST[$this->remove_logo_field]) && !empty($this->logo)){
+                if(wp_delete_attachment($this->logo))
+                    $this->update_option('logo');
+            } else if (!empty($_FILES[$this->logo_field]['name'])) {
+                require_once( ABSPATH . 'wp-admin/includes/image.php' );
+                require_once( ABSPATH . 'wp-admin/includes/file.php' );
+                require_once( ABSPATH . 'wp-admin/includes/media.php' );
+                if(!file_is_valid_image($_FILES[$this->logo_field]['tmp_name']))
+                    return false;
+
+                $attachment_id = media_handle_upload($this->logo_field, 0 );
+                if (is_wp_error($attachment_id))
+                    return $attachment_id->get_error_message();
+
+                // remove old attachment
+                if(!empty($this->logo))
+                    wp_delete_attachment($this->logo);
+
+                $this->update_option('logo', $attachment_id);
+            }
+
+            $this->init_settings();
+
+            $post_data = $this->get_post_data();
+
+            foreach ( $this->get_form_fields() as $key => $field ) {
+                if(in_array($this->get_field_type( $field ), ['title', 'image'])) continue;
+
+                try {
+                    $this->settings[ $key ] = $this->get_field_value( $key, $field, $post_data );
+                } catch ( Exception $e ) {
+                    $this->add_error( $e->getMessage() );
+                }
+            }
+
+            return update_option( $this->get_option_key(), apply_filters( 'woocommerce_settings_api_sanitized_fields_' . $this->id, $this->settings ) );
+        }
+
+        /**
+         * Overwritten WC function.
+         * Register order @ Best2Pay and redirect user to payment form
+         *
+         * @param $order_id
+         * @return string[]
+         **/
+        public function process_payment($order_id) {
+            $order = wc_get_order($order_id);
+
+            if($this->notify_customer_enabled === 'yes' && $order->get_status() !== $this->agreement_status && !get_post_meta($order_id, 'best2pay_order_moderated', true)) {
+                $order->add_order_note(__('Order successfully create', 'best2pay-payment_method'));
+                $order->update_status($this->agreement_status);
+
+                update_post_meta($order->get_id(), 'best2pay_order_moderated', 'yes');
+
+                WC()->cart->empty_cart();
+
+                return array(
+                    'result'   => 'success',
+                    'redirect' => $this->get_return_url($order),
+                );
+            }
+
+            $register_order_id = get_post_meta($order_id, 'best2pay_order_id', true);
+
+            if($register_order_id) {
+                $payment_url = $this->process_payment_payform(intval($register_order_id));
+            } else {
+                $pay_order_id = intval($this->process_payment_registration($order));
+                $payment_url = $this->process_payment_payform($pay_order_id);
+            }
+
             return array(
                 'result' => 'success',
@@ -372 +546 @@
             );
         }
-        
+
         /**
          * Callback from payment gateway was received
          **/
-        public function callback_from_gateway()
-        {
+        public function callback_from_gateway() {
             $response = '';
             $order = [];
             $checkout_url = apply_filters('woocommerce_get_checkout_url', wc_get_checkout_url());
+
             try{
-                // processing center order ID
                 $pc_order_id = intval($_REQUEST['id']);
                 if(!$pc_order_id)
                     throw new Exception(__('Failed to get Best2pay order ID', 'best2pay-payment_method'));
+
                 $pc_operation_id = intval($_REQUEST['operation']);
                 if(!$pc_operation_id)
                     throw new Exception(__('Failed to get Best2pay operation ID', 'best2pay-payment_method'));
+
                 $order_id = intval($_REQUEST['reference']);
                 if(!$order_id)
                     throw new Exception(__('Undefined order ID', 'best2pay-payment_method'));
+
                 $order = wc_get_order($order_id);
                 if(!$order)
                     throw new Exception(__('Failed to get order information', 'best2pay-payment_method'));
+                
+                $db_pc_order_id = (int) get_post_meta($order_id, 'best2pay_order_id', true);
+                if($db_pc_order_id !== $pc_order_id)
+                    throw new Exception(__('Request data is not valid', 'best2pay-payment_method'));
                 
                 // if order already paid
@@ -402 +582 @@
                     exit();
                 }
-                
+
                 $pc_order = $this->get_pc_order($pc_order_id);
                 $this->pc_order_validation($pc_order);
@@ -408 +588 @@
                 if(!$operation)
                     throw new Exception(__('Could not find operation', 'best2pay-payment_method') . " ( $pc_operation_id )");
+
                 $this->pc_order_operation_validation($operation, true);
-                
+
                 $pc_order_params = $this->get_pc_order_params($pc_order);
                 $is_loan = (!empty($pc_order_params['vda_application_id']) || !empty($pc_order_params['fb_application_id']));
+
                 // There is no valid operation amount in case of LOAN (VsegdaDa\FinBox)
                 if(!$is_loan)
@@ -418 +600 @@
                 $message = __('Failed to pay for the order', 'best2pay-payment_method') . ":\n" . $e->getMessage();
                 $this->log($message, ['data' => $data ?? '', 'response' => $response]);
+
                 if($order)
                     $order->add_order_note(nl2br($message));
+
                 wc_add_notice(nl2br($message), 'error');
                 wp_redirect($checkout_url);
+
                 exit();
             }
+
             if($pc_order_state !== $pc_order['state']) {
-                // updating order status
                 $order_status = $this->get_custom_order_status($operation['type'], $is_loan);
                 $order->update_status($order_status);
-                // updating order metadata
                 update_post_meta($order_id, 'best2pay_order_state', $pc_order['state']);
-                
-                // updating order real payment method
                 $payment_method = get_post_meta($order_id, 'best2pay_payment_method', true);
+
                 if(!$payment_method){
                     $is_halva = !empty($pc_order_params['buyIdSumAmount']);
@@ -438 +621 @@
                     update_post_meta($order_id, 'best2pay_payment_method', $payment_method);
                 }
+
                 $order->add_order_note(__('Payment completed successfully', 'best2pay-payment_method'));
             }
+
             wp_redirect($this->get_return_url($order));
+
             exit();
         }
-        
+
         /**
          * Payment notify from gateway was received
          **/
-        public function notify_from_gateway()
-        {
+        public function notify_from_gateway() {
             global $wp_filesystem;
             $order = [];
             $pc_operation = [];
+
             if (empty($wp_filesystem))
                 WP_Filesystem();
+
             try {
                 $response = $wp_filesystem->get_contents('php://input');
@@ -460 +647 @@
                 if(!$order_id)
                     throw new Exception(__('Undefined order ID', 'best2pay-payment_method'));
+
                 $order = wc_get_order($order_id);
                 if(!$order)
                     throw new Exception(__('Failed to get order information', 'best2pay-payment_method'));
-                
-                // if order already completed\refunded
+
                 $pc_order_state = get_post_meta($order_id, 'best2pay_order_state', true);
-                
                 if ($pc_order_state === self::ORDER_CANCELED || $pc_order_state === self::ORDER_BLOCKED || $pc_order_state === self::ORDER_EXPIRED)
                     throw new Exception(sprintf(__('The order has already been %s', 'best2pay-payment_method'), $pc_order_state));
+
                 $this->pc_operation_validation($pc_operation);
-                
                 $pc_order = $this->get_pc_order((int) $pc_operation['order_id']);
                 $this->pc_order_validation($pc_order);
-                
                 $pc_order_params = $this->get_pc_order_params($pc_order);
                 $is_loan = (!empty($pc_order_params['vda_application_id']) || !empty($pc_order_params['fb_application_id']));
+
                 // There is no valid operation amount in case of LOAN (VsegdaDa\FinBox)
                 if(!$is_loan)
                     $this->operation_amount_validation($pc_operation, $this->centify($order->get_total()));
-                
             } catch(Exception $e) {
                 $message = sprintf(__('Failed to complete request for operation %s from the processing center', 'best2pay-payment_method'), $pc_operation['type']) . PHP_EOL . $e->getMessage();
                 $this->log($message, $pc_operation);
+
                 if($order)
                     $order->add_order_note($message);
+
                 exit($message);
             }
-            // updating order real payment method
+
             $payment_method = get_post_meta($order_id, 'best2pay_payment_method', true);
+
             if(!$payment_method){
                 $is_halva = !empty($pc_order_params['buyIdSumAmount']);
@@ -494 +682 @@
                 update_post_meta($order_id, 'best2pay_payment_method', $payment_method);
             }
-            
-            // updating order status
+
             $order_status = $this->get_custom_order_status($pc_operation['type']);
             $order->update_status($order_status);
-            // updating order metadata
             update_post_meta($order_id, 'best2pay_order_state', $pc_order['state']);
             $message = sprintf(__('Request for operation %s from the processing center was completed successfully', 'best2pay-payment_method'), $pc_operation['type']);
             $order->add_order_note($message);
+
             exit('ok');
         }
-        
+
         public function complete_payment(){
             echo $this->payment_action(self::OPERATION_COMPLETE);
+
             exit();
         }
-        
+
         /**
          * Inherited method Process refund.
@@ -521 +709 @@
          * @return boolean True or false based on success, or a WP_Error object.
          */
-        public function process_refund($order_id, $amount = null, $reason = '')
-        {
+        public function process_refund($order_id, $amount = null, $reason = '') {
             return $this->payment_action(self::OPERATION_REFUND, $order_id, $amount, $reason);
         }
-        
+
         /**
          * Check operation state for hold order and set complete state
@@ -531 +718 @@
          * @return string void
          */
-        public function payment_action($type, $order_id = 0, $amount = null, $reason = '')
-        {
+        public function payment_action($type, $order_id = 0, $amount = null, $reason = '') {
             try{
                 $order = [];
                 $operation = [];
-                
+
                 // get variables from request and checking token for custom 'complete' action
                 if($type === self::OPERATION_COMPLETE){
@@ -544 +730 @@
                         throw new Exception(__('Operation failed. Please refresh the page', 'best2pay-payment_method'));
                 }
-                
+
                 if(!$order_id)
                     throw new Exception(__('Undefined order ID', 'best2pay-payment_method'));
+
                 $order = wc_get_order($order_id);
                 if(!$order)
                     throw new Exception(__('Failed to get order information', 'best2pay-payment_method'));
+
                 $pc_order_id = get_post_meta($order_id, 'best2pay_order_id', true);
                 if(!$pc_order_id)
                     throw new Exception(__('Failed to get Best2pay order ID', 'best2pay-payment_method'));
-                
+
                 $payment_method = get_post_meta($order_id, 'best2pay_payment_method', true);
-                // converting old method to new
                 $payment_method = self::OLD_TO_NEW_PAYMENT_METHODS[$payment_method] ?? $payment_method;
                 $request_path = self::get_action_path($type, $payment_method);
                 if(!$request_path)
                     throw new Exception(__('Failed to get operation request path', 'best2pay-payment_method'));
-                // full refund for AUTHORIZED orders only
+
                 $pc_order_state = get_post_meta($order_id, 'best2pay_order_state', true);
                 if($amount && $amount !== $order->get_total() && $type === self::OPERATION_REFUND && $pc_order_state === self::ORDER_AUTHORIZED){
                     throw new Exception(__('For orders with AUTHORIZED status, only full refunds are available', 'best2pay-payment_method'));
                 }
+
                 // hardcode loan amount = 0! we use loans only without prepayment! otherwise we need to save and use the prepayment amount!!
-                if($payment_method === 'loan')
+                if($payment_method === 'loan') {
                     $amount = 0;
-                elseif($amount)
+                } elseif($amount) {
                     $amount = $this->centify($amount);
-                else
+                } else {
                     $amount = $this->centify($order->get_total());
-                
+                }
+
                 $data = [
                     'sector' => $this->sector,
@@ -579 +768 @@
                     'currency' => $this->currency
                 ];
+
                 $this->sign_data($data, true);
                 $response = $this->send_request($this->url . $request_path, ['body' => $data]);
@@ -585 +775 @@
                 if($operation['type'] !== $type)
                     throw new Exception(__('Operation type and action type are not equal', 'best2pay-payment_method'));
-                // for COMPLETED orders the operation amount may not be equal to the order amount(partial refund/complete)
             } catch(Exception $e) {
                 $comment = $this->get_action_comment($type)['fail'] . PHP_EOL . $e->getMessage();
@@ -591 +780 @@
                 if($order)
                     $order->add_order_note($comment);
+
                 return json_encode([
                     'success' => false,
@@ -596 +786 @@
                 ]);
             }
-            
+
             $order_status = $this->get_custom_order_status($operation['type']);
             if($order_status)
                 $order->update_status($order_status);
+
             update_post_meta($order_id, 'best2pay_order_state', $operation['order_state']);
+
             $comment = $this->get_action_comment($type)['success'];
             if($reason){
                 $comment .= PHP_EOL . esc_html($reason);
             }
-            
+
             $order->add_order_note($comment);
+
             return json_encode([
                 'success' => true,
@@ -612 +805 @@
             ]);
         }
-        
+
         /**
          * Draw Complete button for authorized orders
@@ -618 +811 @@
          * @return void
          */
-        function wc_order_item_add_complete_button($order)
-        {
+        function wc_order_item_add_complete_button($order) {
             if($order->get_payment_method() == $this->id){
                 $pc_order_state = get_post_meta($order->get_id(), 'best2pay_order_state', true);
+
                 if($pc_order_state === self::ORDER_AUTHORIZED){
                     $label = __('Complete payment', 'best2pay-payment_method');
-                    $nonce_complete = wp_create_nonce('best2pay_complete' . $order->get_id());
-                    ?>
+                    $nonce_complete = wp_create_nonce('best2pay_complete' . $order->get_id());?>
+
                     <script src="<?php echo plugins_url('assets/js/scripts.js', plugin_basename(__FILE__)); ?>"></script>
                     <input type="hidden" id="nonce_best2pay_complete" value="<?php echo $nonce_complete; ?>">
-                    <button type="button" id="button_best2pay_complete"
-                                    class="button custom-items"><?php echo $label; ?></button>
-                    <?php
-                }
-            }
-        }
-        
-        private function calc_fiscal_position_shop_cart($order, $order_amount)
-        {
+                    <button type="button" id="button_best2pay_complete" class="button custom-items"><?php echo $label; ?></button>
+                <?php }
+            }
+        }
+
+        private function calc_fiscal_position_shop_cart($order, $order_amount) {
             $fiscal_positions = '';
             $fiscal_amount = 0;
@@ -642 +832 @@
             $shop_cart_key = 0;
             $order_items = $order->get_items();
-            
+
             foreach($order_items as $item) {
                 $item_data = $item->get_data();
@@ -653 +843 @@
                 $fiscal_positions .= str_replace([';', '|'], '', $item_data['name']) . '|';
                 $fiscal_amount += $item_data['quantity'] * $element_price;
-                
                 $shop_cart[$shop_cart_key]['quantityGoods'] = (int)$item['quantity'];
                 $shop_cart[$shop_cart_key]['goodCost'] = $item_price - $item_discount;
@@ -659 +848 @@
                 $shop_cart_key++;
             }
-            
+
             $shipping_amount = $order->get_shipping_total();
+
             if ($shipping_amount){
                 $fiscal_positions .= '1;' . $this->centify($shipping_amount) . ';6;Доставка|';
                 $fiscal_amount += $this->centify($shipping_amount);
-                
                 $shop_cart[$shop_cart_key]['quantityGoods'] = 1;
                 $shop_cart[$shop_cart_key]['goodCost'] = $shipping_amount;
                 $shop_cart[$shop_cart_key]['name'] = 'Доставка';
             }
+
             $fiscalDiff = abs($fiscal_amount - $order_amount);
+
             if ($fiscalDiff){
                 $fiscal_positions .= '1;' . $fiscalDiff . ';6;Скидка;14|';
                 $shop_cart = [];
             }
+
             $this->fiscal_positions = substr($fiscal_positions, 0, -1);
             $this->shop_cart = $shop_cart;
         }
-        
-        private function get_pc_order($pc_order_id)
-        {
+
+        private function get_pc_order($pc_order_id) {
             if(!$pc_order_id)
                 throw new Exception(__('Missing PC order ID', 'best2pay-payment_method'));
+
             $data = [
                 'sector' => $this->sector,
                 'id' => $pc_order_id,
             ];
+
             $this->sign_data($data, true);
             $response = $this->send_request($this->url . '/webapi/Order', ['body' => $data]);
+
             return $this->parse_xml($response['body']);
         }
-        
-        private function get_pc_order_operation($pc_order, $pc_operation_id)
-        {
+
+        private function get_pc_order_operation($pc_order, $pc_operation_id) {
             if(empty($pc_order['operations']['operation']))
                 throw new Exception(__('There are no operations in the order', 'best2pay-payment_method'));
-            // "operation" may contain one or few operations (array)
+
             $operations = isset($pc_order['operations']['operation'][0]) ? $pc_order['operations']['operation'] : [$pc_order['operations']['operation']];
+
             foreach($operations as $operation) {
                 if(empty($operation['id'])) continue;
@@ -702 +896 @@
                     return $operation;
             }
+
             return [];
         }
-        
-        private function get_pc_order_params($pc_order)
-        {
+
+        private function get_pc_order_params($pc_order) {
             $params = [];
+
             if(empty($pc_order['parameters']['parameter'])) return $params;
             foreach($pc_order['parameters']['parameter'] as $param) {
@@ -718 +913 @@
                 $params[$key] = $param['value'] ?? 'null';
             }
+
             return $params;
         }
-        
-        public function pc_operation_validation($response): void
-        {
+
+        public function pc_operation_validation($response): void {
             if(empty($response['reason_code']) && !empty($response['code']) && !empty($response['description']))
                 throw new Exception("$response[description] (error code $response[code])");
+
             if(empty($response['signature']))
                 throw new Exception(__('Signature is missing', 'best2pay-payment_method'));
+
             $xml_string = self::xml_values_to_string($response);
             $signature = $this->generate_sign($xml_string, true);
             if ($signature !== $response['signature'])
                 throw new Exception(__('Invalid signature', 'best2pay-payment_method'));
+
             if(!in_array($response['type'], self::OPERATION_TYPES))
                 throw new Exception(__('Unknown operation type', 'best2pay-payment_method') . ' : ' . $response['type']);
+
             if($response['state'] !== self::OPERATION_APPROVED)
                 throw new Exception(__('Operation not approved', 'best2pay-payment_method'));
         }
-        
-        public function pc_order_validation($order): void
-        {
+
+        public function pc_order_validation($order): void {
             if(empty($order['reason_code']) && !empty($order['code']) && !empty($order['description']))
                 throw new Exception("$order[description] (error code $order[code])");
+
             if(empty($order['signature']))
                 throw new Exception(__('Signature is missing', 'best2pay-payment_method'));
+
             $xml_string = self::xml_values_to_string($order);
             $signature = $this->generate_sign($xml_string, true);
@@ -748 +948 @@
                 throw new Exception(__('Invalid signature', 'best2pay-payment_method'));
         }
-        public function pc_order_operation_validation($operation, $is_payment = false): void
-        {
+
+        public function pc_order_operation_validation($operation, $is_payment = false): void {
             if(empty($operation['reason_code']) && !empty($operation['code']) && !empty($operation['description']))
                 throw new Exception(__('An error occurred during the operation', 'best2pay-payment_method') . "($operation[code] : $operation[description])");
+
             if(!in_array($operation['type'], self::OPERATION_TYPES))
                 throw new Exception(__('Unknown operation type', 'best2pay-payment_method') . ' : ' . $operation['type']);
+
             if($operation['state'] !== self::OPERATION_APPROVED)
                 throw new Exception(__('Operation not approved', 'best2pay-payment_method'));
+
             if($is_payment && !in_array($operation['type'], self::PAID_OPERATION_TYPES)) {
                 throw new Exception(__('Unknown payment operation type', 'best2pay-payment_method') . ' : ' . $operation['type']);
             }
         }
-        
-        public static function xml_values_to_string($xml_array): string
-        {
+
+        public static function xml_values_to_string($xml_array): string {
             if(!is_array($xml_array)) return '';
+
             $res = '';
             foreach($xml_array as $key => $value) {
@@ -769 +972 @@
                 $res .= is_string($value) ? $value : self::xml_values_to_string($value);
             }
+
             return $res;
         }
-        
-        public function get_operation_amount($operation): int
-        {
+
+        public function get_operation_amount($operation): int {
             return !empty($operation['buyIdSumAmount']) ? (int) $operation['buyIdSumAmount'] : (int) $operation['amount'];
         }
-        
-        private function operation_amount_validation($operation, $order_amount): void
-        {
+
+        private function operation_amount_validation($operation, $order_amount): void {
             $operation_amount = self::get_operation_amount($operation);
+
             if (!$operation_amount || $operation_amount !== $order_amount)
                 throw new \Exception(__('Invalid operation amount', 'best2pay-payment_method'));
         }
-        
-        public function get_custom_order_status($operation_type, $is_loan = false)
-        {
+
+        public function get_custom_order_status($operation_type, $is_loan = false) {
             switch($operation_type){
                 case 'PURCHASE':
@@ -796 +998 @@
                     return $this->canceled_status ?? false;
             }
+
             return false;
         }
-        
-        private function get_action_path($action_type, $payment_type)
-        {
+
+        private function get_action_path($action_type, $payment_type) {
             $prefix = ($payment_type == 'halva' || $payment_type == 'halva_two_steps') ? '/webapi/custom/svkb/' : '/webapi/';
+
             switch($action_type) {
                 case self::OPERATION_COMPLETE: return $prefix . 'Complete';
                 case self::OPERATION_REFUND: return $prefix . 'Reverse';
             }
+
             return false;
         }
-        
-        private function get_action_comment($action)
-        {
+
+        private function get_action_comment($action) {
             switch($action) {
                 case self::OPERATION_COMPLETE: return [
@@ -822 +1025 @@
             }
         }
-        
-        private function get_pc_payment_method($operation_type, $is_halva, $is_loan)
-        {
+
+        private function get_pc_payment_method($operation_type, $is_halva, $is_loan) {
             switch($operation_type) {
                 case 'PURCHASE':
@@ -841 +1043 @@
             return '';
         }
-        
-        private function send_request($url, $args, $method = 'post', int $repeat = 3)
-        {
+
+        private function send_request($url, $args, $method = 'post', int $repeat = 3) {
             $method = (strtolower($method) === 'get') ? 'get' : 'post';
             $repeat = !$repeat ? 1 : $repeat;
@@ -853 +1054 @@
                 sleep(2);
             }
+
             return $response;
         }
-        
+
         /**
          * Admin Panel Options
          **/
-        public function admin_options()
-        {
-            ?>
+        public function admin_options() {?>
             <h3><?php _e('Best2Pay', 'best2pay-payment_method'); ?></h3>
             <p><?php echo sprintf(__('Payments with bank cards via the <a href="%s" target="_blank">Best2Pay</a> payment system.', 'best2pay-payment_method'), self::PLUGIN_SITE); ?></p>
             <table class="form-table">
-                <?php
-                // Generate the HTML For the settings form.
-                $this->generate_settings_html();
-                ?>
-            </table><!--/.form-table-->
-            <?php
-        }
-        
+                <?php $this->generate_settings_html(); ?>
+            </table>
+        <?php }
+
         /**
          * Get current currency code
@@ -878 +1074 @@
          * @return string
          */
-        public function get_currency($wc_currency): string
-        {
+        public function get_currency($wc_currency): string {
             switch($wc_currency) {
                 case 'EUR': return '978';
                 case 'USD': return '840';
+
                 default: return '643';
             }
         }
-        
+
         /**
          * @param array $data
@@ -892 +1088 @@
          * @return void
          */
-        public function sign_data(&$data, $password = false): void
-        {
+        public function sign_data(&$data, $password = false): void {
             unset($data['signature']);
+
             $sign = implode('', $data);
             if($password)
                 $sign .= $this->password;
+
             $data['signature'] = base64_encode($this->sign_hash($sign));
         }
-        
-        public function generate_sign($data, $password = false): string
-        {
+
+        public function generate_sign($data, $password = false): string {
             $string = is_array($data) ? implode('', $data) : (string) $data;
             if($password)
                 $string .= $this->password;
+
             return base64_encode($this->sign_hash($string));
         }
-        
-        private function sign_hash($data)
-        {
+
+        private function sign_hash($data) {
             return hash($this->hash_algo, $data);
         }
-        
+
         /**
          * Changes a currency unit to a derived equivalent currency unit
@@ -920 +1116 @@
          * @return int
          */
-        public function centify($value): int
-        {
+        public function centify($value): int {
             return intval(strval($value * 100));
         }
-        
-        private function best2pay_get_url(): string
-        {
+
+        private function best2pay_get_url(): string {
             $best2pay_url = "https://test.best2pay.net";
+
             if ($this->testmode == "0"){
                 $best2pay_url = "https://pay.best2pay.net";
             }
+
             return $best2pay_url;
         }
-        
+
         /**
          * Parse $xml from PC with removing element with values = '' or null
@@ -939 +1135 @@
          * @return false|mixed
          */
-        public function parse_xml(string $string)
-        {
+        public function parse_xml(string $string) {
             if (!$string)
                 throw new Exception(__('Server response is empty', 'best2pay-payment_method'));
+
             $xml = simplexml_load_string($string);
             if (!$xml)
                 throw new Exception(__('Invalid XML from response', 'best2pay-payment_method'));
+
             $valid_xml = json_decode(json_encode($xml), true);
             if (!$valid_xml)
                 throw new Exception(__('Unable to decode xml', 'best2pay-payment_method'));
+
             return $valid_xml;
         }
-        
+
         /**
          * Write log-messages in file when it accessible in FS on hosting
@@ -958 +1156 @@
          * @param array $data
          */
-        public function log(string $message, array $data = [])
-        {
+        public function log(string $message, array $data = []) {
             $log = "\n[" . date("H:i:s d.m.Y") . '] ' . $message;
             if($data)
                 $log .= "\n" . var_export($data, true);
+
             file_put_contents(ABSPATH . $this->id . '.log', $log, FILE_APPEND);
         }
-        
-    } // class
+    }
+
     /**
      * Add this gateway to the list of available payment gateways
@@ -973 +1171 @@
      * @return mixed
      */
-    function add_best2pay_gateway($methods)
-    {
+    function add_best2pay_gateway($methods) {
         $methods[] = 'woocommerce_best2pay';
+
         return $methods;
     }
-    
+
     add_filter('woocommerce_payment_gateways', 'add_best2pay_gateway');
-    
+
     add_filter(
         'plugin_action_links_' . plugin_basename( __FILE__ ),
@@ -992 +1190 @@
             if (!class_exists('woocommerce'))
                 return $links;
-            
+
             array_unshift(
                 $links,
@@ -1001 +1199 @@
                 )
             );
-            
+
             return $links;
         }

best2pay-payment-method-visamastercard/trunk/languages/best2pay-payment_method-ru_RU.po

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Best2Pay payment method (Visa/MasterCard/MIR) 2.1.0\n"
+"Project-Id-Version: Best2Pay payment module 2.2\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/best2pay-payment-method-visamastercard\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -16 +16 @@
 
 #. Plugin Name of the plugin
-msgid "Best2Pay payment method (Visa/MasterCard/MIR)"
-msgstr "Оплата с Best2Pay (Visa/MasterCard/МИР)"
+msgid "Best2Pay payment module"
+msgstr "Модуль оплаты Best2Pay"
 
 #. Plugin URI of the plugin
@@ -28 +28 @@
 
 #. Author of the plugin
-#: best2pay-payment_method.php:110
-#: best2pay-payment_method.php:111
-#: best2pay-payment_method.php:855
+#: best2pay-payment_method.php:113
+#: best2pay-payment_method.php:981
 msgid "Best2Pay"
 msgstr "Best2Pay"
 
+#: best2pay-payment_method.php:115
 msgid "To accept payments through the plugin, you need to apply to connect to Best2pay on the website <a href=\"%1$s\" target=\"_blank\">%1$s</a> and enter into an agreement with the company.<br/>Support email: <a href=\"mailto:%2$s\">%2$s</a>"
 msgstr ""
@@ -39 +39 @@
 "<a href=\"%1$s\" target=\"_blank\">%1$s</a> и заключить договор с компанией.<br/>Электронная почта службы поддержки: <a href=\"mailto:%2$s\">%2$s</a>"
 
-#: best2pay-payment_method.php:112
-#: best2pay-payment_method.php:856
+#: best2pay-payment_method.php:133
+#: best2pay-payment_method.php:982
 msgid "Payments with bank cards via the <a href=\"%s\" target=\"_blank\">Best2Pay</a> payment system."
 msgstr ""
@@ -46 +46 @@
 "href=\"%s\" target=\"_blank\">Best2Pay</a>."
 
-#: best2pay-payment_method.php:145
+#: best2pay-payment_method.php:159
 msgid "Pay for your order in installments"
 msgstr "Оплатите заказ частями"
 
-#: best2pay-payment_method.php:152
-msgid "Pay by QR"
-msgstr "Оплата по QR"
-
-#: best2pay-payment_method.php:177
+#: best2pay-payment_method.php:215
+msgid "Remove logo"
+msgstr "Удалить логотип"
+
+#: best2pay-payment_method.php:241
 msgid "Enable/Disable"
 msgstr "Включить/Выключить"
 
-#: best2pay-payment_method.php:179
+#: best2pay-payment_method.php:243
 msgid "Enable Best2Pay checkout method"
 msgstr "Включить использование метода платежа Best2Pay"
 
-#: best2pay-payment_method.php:184
+#: best2pay-payment_method.php:248
+msgid "Title"
+msgstr "Название"
+
+#: best2pay-payment_method.php:250
+msgid "Custom title for payment type"
+msgstr "Свое название для типа платежа"
+
+#: best2pay-payment_method.php:257
+msgid "Description"
+msgstr "Описание"
+
+#: best2pay-payment_method.php:259
+msgid "Custom description for payment type"
+msgstr "Свое описание для типа платежа"
+
+#: best2pay-payment_method.php:266
+msgid "Logo"
+msgstr "Логотип"
+
+#: best2pay-payment_method.php:268
+msgid "Custom logo for payment type"
+msgstr "Свой логотип для типа платежа"
+
+#: best2pay-payment_method.php:274
 msgid "Sector ID"
 msgstr "Sector ID"
 
-#: best2pay-payment_method.php:186
+#: best2pay-payment_method.php:276
 msgid "Your shop identifier at Best2Pay"
 msgstr "Идентификатор вашего магазина в системе Best2Pay"
 
-#: best2pay-payment_method.php:192
+#: best2pay-payment_method.php:282
 msgid "Password"
 msgstr "Пароль"
 
-#: best2pay-payment_method.php:194
+#: best2pay-payment_method.php:284
 msgid "Password to use for digital signature"
 msgstr "Пароль для цифровой подписи"
 
-#: best2pay-payment_method.php:200
+#: best2pay-payment_method.php:290
 msgid "Test Mode"
 msgstr "Тестовый режим"
 
-#: best2pay-payment_method.php:203
+#: best2pay-payment_method.php:293
 msgid "Test mode - real payments will not be processed"
 msgstr "Тестовый режим - средства с карты не списываются"
 
-#: best2pay-payment_method.php:204
+#: best2pay-payment_method.php:294
 msgid "Production mode - payments will be processed"
 msgstr "Рабочий режим - средства списываются с карты"
 
-#: best2pay-payment_method.php:206
+#: best2pay-payment_method.php:296
 msgid "Select test or live mode"
 msgstr "Выберите тестовый или рабочий режим"
 
-#: best2pay-payment_method.php:211
+#: best2pay-payment_method.php:301
 msgid "Payment method"
 msgstr "Способ оплаты"
 
-#: best2pay-payment_method.php:214
+#: best2pay-payment_method.php:304
 msgid "Standard acquiring (one-stage payment)"
 msgstr "Стандартный эквайринг (одностадийная оплата)"
 
-#: best2pay-payment_method.php:215
+#: best2pay-payment_method.php:305
 msgid "Standard acquiring (two-stage payment)"
 msgstr "Стандартный эквайринг (двухстадийная оплата)"
 
-#: best2pay-payment_method.php:216
-msgid "Halva Chastyami (one-stage payment)"
-msgstr "Только Халва Частями (одностадийная оплата)"
-
-#: best2pay-payment_method.php:217
-msgid "Halva Chastyami (two-stage payment)"
-msgstr "Только Халва Частями (двухстадийная оплата)"
-
-#: best2pay-payment_method.php:218
+#: best2pay-payment_method.php:306
+msgid "Plait (one-stage payment)"
+msgstr "Плайт (одностадийная оплата)"
+
+#: best2pay-payment_method.php:307
+msgid "Plait (two-stage payment)"
+msgstr "Плайт (двухстадийная оплата)"
+
+#: best2pay-payment_method.php:308
 msgid "Fast Payment System"
 msgstr "Система Быстрых Платежей (СБП)"
 
-#: best2pay-payment_method.php:219
+#: best2pay-payment_method.php:309
 msgid "Loan"
 msgstr "Кредитование"
 
-#: best2pay-payment_method.php:221
+#: best2pay-payment_method.php:311
 msgid "Payment occurs after confirmation by the manager in the personal account"
 msgstr "Оплата происходит после подтверждения менеджером в ЛК"
 
-#: best2pay-payment_method.php:226
+#: best2pay-payment_method.php:316
 msgid "TAX"
 msgstr "Налог"
 
-#: best2pay-payment_method.php:229
+#: best2pay-payment_method.php:319
 msgid "VAT rate 20%"
 msgstr "ставка НДС 20%"
 
-#: best2pay-payment_method.php:230
+#: best2pay-payment_method.php:320
 msgid "VAT rate 10%"
 msgstr "ставка НДС 10%"
 
-#: best2pay-payment_method.php:231
+#: best2pay-payment_method.php:321
 msgid "VAT rate calc. 20/120"
 msgstr "ставка НДС расч. 20/120"
 
-#: best2pay-payment_method.php:232
+#: best2pay-payment_method.php:322
 msgid "VAT rate calc. 10/110"
 msgstr "ставка НДС расч. 10/110"
 
-#: best2pay-payment_method.php:233
+#: best2pay-payment_method.php:323
 msgid "VAT rate 0%"
 msgstr "ставка НДС 0%"
 
-#: best2pay-payment_method.php:234
+#: best2pay-payment_method.php:324
 msgid "Not subject to VAT"
 msgstr "НДС не облагается"
 
-#: best2pay-payment_method.php:240
+#: best2pay-payment_method.php:330
 msgid "Notify URL"
 msgstr "URL для уведомлений"
 
-#: best2pay-payment_method.php:242
+#: best2pay-payment_method.php:332
 msgid "Report this URL to Best2Pay technical support to receive payment notifications"
 msgstr "Сообщите в службу технической поддержки Best2Pay этот URL для получения уведомлений о платеже"
 
-#: best2pay-payment_method.php:251
+#: best2pay-payment_method.php:341
 msgid "Data encryption algorithm"
 msgstr "Алгоритм шифрования данных"
 
-#: best2pay-payment_method.php:257
+#: best2pay-payment_method.php:347
 msgid "Must match your sector encryption settings in your personal account"
 msgstr "Должен соответствовать настройкам шифрования вашего сектора в личном кабинете"
 
-#: best2pay-payment_method.php:263
+#: best2pay-payment_method.php:353
 msgid "Custom statuses for orders"
 msgstr "Настраиваемые статусы для заказов"
 
-#: best2pay-payment_method.php:269
+#: best2pay-payment_method.php:359
 msgid "Order registered"
 msgstr "Заказ зарегистрирован"
 
-#: best2pay-payment_method.php:274
+#: best2pay-payment_method.php:364
 msgid "Order authorized"
 msgstr "Средства захолдированы"
 
-#: best2pay-payment_method.php:279
+#: best2pay-payment_method.php:369
 msgid "Loan agreement approved but not signed"
 msgstr "Кредитный договор одобрен, но не подписан"
 
-#: best2pay-payment_method.php:284
+#: best2pay-payment_method.php:374
 msgid "Order successfully paid"
 msgstr "Заказ успешно оплачен"
 
-#: best2pay-payment_method.php:289
+#: best2pay-payment_method.php:379
 msgid "Order canceled"
 msgstr "Платеж отменен"
 
-#: best2pay-payment_method.php:317
+#: best2pay-payment_method.php:371
+msgid "Issuing an invoice for payment"
+msgstr "Выставление счёта на оплату"
+
+#: best2pay-payment_method.php:373
+msgid "Enable issuing an invoice for payment by email of the payer"
+msgstr "Включить выставление счёта на оплату на email плательщика"
+
+#: best2pay-payment_method.php:377
+msgid "Order agreement"
+msgstr "Заказ на согласовании"
+
+#: best2pay-payment_method.php:383
+msgid "Payment expected"
+msgstr "Ожидается оплата"
+
+#: best2pay-payment_method.php:443
 msgid "Order #%s"
 msgstr "Заказ №%s"
 
-#: best2pay-payment_method.php:333
+#: best2pay-payment_method.php:459
 msgid "Failed to register order"
 msgstr "Не удалось зарегистрировать заказ"
 
-#: best2pay-payment_method.php:345
+#: best2pay-payment_method.php:471
 msgid "Order registered successfully"
 msgstr "Заказ успешно зарегистрирован"
 
-#: best2pay-payment_method.php:378
-#: best2pay-payment_method.php:545
+#: best2pay-payment_method.php:504
+#: best2pay-payment_method.php:671
 msgid "Failed to get Best2pay order ID"
 msgstr "Не удалось получить ID заказа Best2pay"
 
-#: best2pay-payment_method.php:381
+#: best2pay-payment_method.php:507
 msgid "Failed to get Best2pay operation ID"
 msgstr "Не удалось получить ID операции Best2pay"
 
-#: best2pay-payment_method.php:384
-#: best2pay-payment_method.php:452
-#: best2pay-payment_method.php:539
+#: best2pay-payment_method.php:510
+#: best2pay-payment_method.php:578
+#: best2pay-payment_method.php:665
 msgid "Undefined order ID"
 msgstr "Неопределенный ID заказа"
 
-#: best2pay-payment_method.php:387
-#: best2pay-payment_method.php:455
-#: best2pay-payment_method.php:542
+#: best2pay-payment_method.php:513
+#: best2pay-payment_method.php:581
+#: best2pay-payment_method.php:668
 msgid "Failed to get order information"
 msgstr "Не удалось получить информацию о заказе"
 
-#: best2pay-payment_method.php:400
+#: best2pay-payment_method.php:526
 msgid "Could not find operation"
 msgstr "Не удалось найти операцию"
 
-#: best2pay-payment_method.php:409
+#: best2pay-payment_method.php:535
 msgid "Failed to pay for the order"
 msgstr "Не удалось оплатить заказ"
 
-#: best2pay-payment_method.php:431
+#: best2pay-payment_method.php:557
 msgid "Payment completed successfully"
 msgstr "Платеж успешно завершен"
 
-#: best2pay-payment_method.php:461
+#: best2pay-payment_method.php:587
 msgid "The order has already been %s"
 msgstr "Заказ уже %s"
 
-#: best2pay-payment_method.php:474
+#: best2pay-payment_method.php:600
 msgid "Failed to complete request for operation %s from the processing center"
 msgstr "Не удалось выполнить запрос операции %s от процессингового центра"
 
-#: best2pay-payment_method.php:493
+#: best2pay-payment_method.php:619
 msgid "Request for operation %s from the processing center was completed successfully"
 msgstr "Запрос операции %s от процессингового центра выполнен успешно"
 
-#: best2pay-payment_method.php:535
+#: best2pay-payment_method.php:661
 msgid "Operation failed. Please refresh the page"
 msgstr "Не удалось выполнить операцию. Обновите страницу"
 
-#: best2pay-payment_method.php:552
+#: best2pay-payment_method.php:678
 msgid "Failed to get operation request path"
 msgstr "Не удалось получить путь запроса операции"
 
-#: best2pay-payment_method.php:556
+#: best2pay-payment_method.php:682
 msgid "For orders with AUTHORIZED status, only full refunds are available"
 msgstr "Для заказов со статусом AUTHORIZED возможен только полный возврат средств"
 
-#: best2pay-payment_method.php:577
+#: best2pay-payment_method.php:703
 msgid "Operation type and action type are not equal"
 msgstr "Тип операции и тип действия не совпадают"
 
-#: best2pay-payment_method.php:616
+#: best2pay-payment_method.php:742
 msgid "Complete payment"
 msgstr "Списать средства"
 
-#: best2pay-payment_method.php:674
+#: best2pay-payment_method.php:800
 msgid "Missing PC order ID"
 msgstr "Отсутствует ID заказа Пц"
 
-#: best2pay-payment_method.php:687
+#: best2pay-payment_method.php:813
 msgid "There are no operations in the order"
 msgstr "Операции заказа не найдены"
 
-#: best2pay-payment_method.php:719
-#: best2pay-payment_method.php:735
+#: best2pay-payment_method.php:845
+#: best2pay-payment_method.php:861
 msgid "Signature is missing"
 msgstr "Отсутствует подпись"
 
-#: best2pay-payment_method.php:723
-#: best2pay-payment_method.php:739
+#: best2pay-payment_method.php:849
+#: best2pay-payment_method.php:865
 msgid "Invalid signature"
 msgstr "Неверная подпись"
 
-#: best2pay-payment_method.php:725
-#: best2pay-payment_method.php:746
+#: best2pay-payment_method.php:851
+#: best2pay-payment_method.php:872
 msgid "Unknown operation type"
 msgstr "Неизвестный тип операции"
 
-#: best2pay-payment_method.php:727
-#: best2pay-payment_method.php:748
+#: best2pay-payment_method.php:853
+#: best2pay-payment_method.php:874
 msgid "Operation not approved"
 msgstr "Операция не одобрена"
 
-#: best2pay-payment_method.php:744
+#: best2pay-payment_method.php:870
 msgid "An error occurred during the operation"
 msgstr "Во время операции произошла ошибка"
 
-#: best2pay-payment_method.php:750
+#: best2pay-payment_method.php:876
 msgid "Unknown payment operation type"
 msgstr "Неизвестный тип платежной операции"
 
-#: best2pay-payment_method.php:774
+#: best2pay-payment_method.php:900
 msgid "Invalid operation amount"
 msgstr "Неверная сумма операции"
 
-#: best2pay-payment_method.php:806
+#: best2pay-payment_method.php:932
 msgid "Funds for the order have been successfully debited"
 msgstr "Средства за заказ успешно списаны"
 
-#: best2pay-payment_method.php:807
+#: best2pay-payment_method.php:933
 msgid "Failed to complete payment"
 msgstr "Не удалось завершить платеж"
 
-#: best2pay-payment_method.php:810
+#: best2pay-payment_method.php:936
 msgid "Payment refunded successfully"
 msgstr "Платеж успешно возвращен"
 
-#: best2pay-payment_method.php:811
+#: best2pay-payment_method.php:937
 msgid "Failed to refund payment"
 msgstr "Не удалось вернуть платеж"
 
-#: best2pay-payment_method.php:935
+#: best2pay-payment_method.php:1061
 msgid "Server response is empty"
 msgstr "Ответ сервера пуст"
 
-#: best2pay-payment_method.php:938
+#: best2pay-payment_method.php:1064
 msgid "Invalid XML from response"
 msgstr "Неверный XML в ответе"
 
-#: best2pay-payment_method.php:941
+#: best2pay-payment_method.php:1067
 msgid "Unable to decode xml"
 msgstr "Невозможно декодировать XML"
 
-#: best2pay-payment_method.php:991
+#: best2pay-payment_method.php:1117
 msgid "Settings"
 msgstr "Настройки"

best2pay-payment-method-visamastercard/trunk/languages/best2pay-payment_method.pot

@@ -1 @@
-# Copyright (C) 2023 Best2Pay
+# Copyright (C) 2024 Best2Pay
 # This file is distributed under the GPL3.
 msgid ""
 msgstr ""
-"Project-Id-Version: Best2Pay payment method (Visa/MasterCard/MIR) 2.1.5\n"
-"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/trunk\n"
+"Project-Id-Version: Best2Pay payment module 2.2\n"
+"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/best2pay\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-11-17T14:41:40+03:00\n"
+"POT-Creation-Date: 2024-02-06T18:05:18+03:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.8.1\n"
+"X-Generator: WP-CLI 2.9.0\n"
 "X-Domain: best2pay-payment_method\n"
 
 #. Plugin Name of the plugin
-msgid "Best2Pay payment method (Visa/MasterCard/MIR)"
+msgid "Best2Pay payment module"
 msgstr ""
 
@@ -28 +28 @@
 
 #. Author of the plugin
-#: best2pay-payment_method.php:110
-#: best2pay-payment_method.php:111
-#: best2pay-payment_method.php:855
+#: best2pay-payment_method.php:117
+#: best2pay-payment_method.php:1059
 msgid "Best2Pay"
 msgstr ""
 
-#: best2pay-payment_method.php:112
-#: best2pay-payment_method.php:856
+#: best2pay-payment_method.php:119
+msgid "To accept payments through the plugin, you need to apply to connect to Best2pay on the website <a href=\"%1$s\" target=\"_blank\">%1$s</a> and enter into an agreement with the company.<br/>Support email: <a href=\"mailto:%2$s\">%2$s</a>"
+msgstr ""
+
+#: best2pay-payment_method.php:137
+#: best2pay-payment_method.php:1060
 msgid "Payments with bank cards via the <a href=\"%s\" target=\"_blank\">Best2Pay</a> payment system."
 msgstr ""
 
-#: best2pay-payment_method.php:145
+#: best2pay-payment_method.php:166
 msgid "Pay for your order in installments"
 msgstr ""
 
-#: best2pay-payment_method.php:152
-msgid "Pay by QR"
-msgstr ""
-
-#: best2pay-payment_method.php:177
+#: best2pay-payment_method.php:221
+msgid "Remove logo"
+msgstr ""
+
+#: best2pay-payment_method.php:241
 msgid "Enable/Disable"
 msgstr ""
 
-#: best2pay-payment_method.php:179
+#: best2pay-payment_method.php:243
 msgid "Enable Best2Pay checkout method"
 msgstr ""
 
-#: best2pay-payment_method.php:184
+#: best2pay-payment_method.php:247
+msgid "Title"
+msgstr ""
+
+#: best2pay-payment_method.php:249
+msgid "Custom title for payment type"
+msgstr ""
+
+#: best2pay-payment_method.php:255
+msgid "Description"
+msgstr ""
+
+#: best2pay-payment_method.php:257
+msgid "Custom description for payment type"
+msgstr ""
+
+#: best2pay-payment_method.php:263
+msgid "Logo"
+msgstr ""
+
+#: best2pay-payment_method.php:265
+msgid "Custom logo for payment type"
+msgstr ""
+
+#: best2pay-payment_method.php:270
 msgid "Sector ID"
 msgstr ""
 
-#: best2pay-payment_method.php:186
+#: best2pay-payment_method.php:272
 msgid "Your shop identifier at Best2Pay"
 msgstr ""
 
-#: best2pay-payment_method.php:192
+#: best2pay-payment_method.php:277
 msgid "Password"
 msgstr ""
 
-#: best2pay-payment_method.php:194
+#: best2pay-payment_method.php:279
 msgid "Password to use for digital signature"
 msgstr ""
 
-#: best2pay-payment_method.php:200
+#: best2pay-payment_method.php:284
 msgid "Test Mode"
 msgstr ""
 
-#: best2pay-payment_method.php:203
+#: best2pay-payment_method.php:287
 msgid "Test mode - real payments will not be processed"
 msgstr ""
 
-#: best2pay-payment_method.php:204
+#: best2pay-payment_method.php:288
 msgid "Production mode - payments will be processed"
 msgstr ""
 
-#: best2pay-payment_method.php:206
+#: best2pay-payment_method.php:290
 msgid "Select test or live mode"
 msgstr ""
 
-#: best2pay-payment_method.php:211
+#: best2pay-payment_method.php:294
 msgid "Payment method"
 msgstr ""
 
-#: best2pay-payment_method.php:214
+#: best2pay-payment_method.php:297
 msgid "Standard acquiring (one-stage payment)"
 msgstr ""
 
-#: best2pay-payment_method.php:215
+#: best2pay-payment_method.php:298
 msgid "Standard acquiring (two-stage payment)"
 msgstr ""
 
-#: best2pay-payment_method.php:216
-msgid "Halva Chastyami (one-stage payment)"
-msgstr ""
-
-#: best2pay-payment_method.php:217
-msgid "Halva Chastyami (two-stage payment)"
-msgstr ""
-
-#: best2pay-payment_method.php:218
+#: best2pay-payment_method.php:299
+msgid "Plait (one-stage payment)"
+msgstr ""
+
+#: best2pay-payment_method.php:300
+msgid "Plait (two-stage payment)"
+msgstr ""
+
+#: best2pay-payment_method.php:301
 msgid "Fast Payment System"
 msgstr ""
 
-#: best2pay-payment_method.php:219
+#: best2pay-payment_method.php:302
 msgid "Loan"
 msgstr ""
 
-#: best2pay-payment_method.php:221
+#: best2pay-payment_method.php:304
 msgid "Payment occurs after confirmation by the manager in the personal account"
 msgstr ""
 
-#: best2pay-payment_method.php:226
+#: best2pay-payment_method.php:308
 msgid "TAX"
 msgstr ""
 
-#: best2pay-payment_method.php:229
+#: best2pay-payment_method.php:311
 msgid "VAT rate 20%"
 msgstr ""
 
-#: best2pay-payment_method.php:230
+#: best2pay-payment_method.php:312
 msgid "VAT rate 10%"
 msgstr ""
 
-#: best2pay-payment_method.php:231
+#: best2pay-payment_method.php:313
 msgid "VAT rate calc. 20/120"
 msgstr ""
 
-#: best2pay-payment_method.php:232
+#: best2pay-payment_method.php:314
 msgid "VAT rate calc. 10/110"
 msgstr ""
 
-#: best2pay-payment_method.php:233
+#: best2pay-payment_method.php:315
 msgid "VAT rate 0%"
 msgstr ""
 
-#: best2pay-payment_method.php:234
+#: best2pay-payment_method.php:316
 msgid "Not subject to VAT"
 msgstr ""
 
-#: best2pay-payment_method.php:240
+#: best2pay-payment_method.php:321
 msgid "Notify URL"
 msgstr ""
 
-#: best2pay-payment_method.php:242
+#: best2pay-payment_method.php:323
 msgid "Report this URL to Best2Pay technical support to receive payment notifications"
 msgstr ""
 
-#: best2pay-payment_method.php:251
+#: best2pay-payment_method.php:331
 msgid "Data encryption algorithm"
 msgstr ""
 
-#: best2pay-payment_method.php:257
+#: best2pay-payment_method.php:337
 msgid "Must match your sector encryption settings in your personal account"
 msgstr ""
 
-#: best2pay-payment_method.php:263
+#: best2pay-payment_method.php:342
 msgid "Custom statuses for orders"
 msgstr ""
 
-#: best2pay-payment_method.php:269
+#: best2pay-payment_method.php:346
 msgid "Order registered"
 msgstr ""
 
-#: best2pay-payment_method.php:274
+#: best2pay-payment_method.php:351
 msgid "Order authorized"
 msgstr ""
 
-#: best2pay-payment_method.php:279
+#: best2pay-payment_method.php:356
 msgid "Loan agreement approved but not signed"
 msgstr ""
 
-#: best2pay-payment_method.php:284
+#: best2pay-payment_method.php:361
 msgid "Order successfully paid"
 msgstr ""
 
-#: best2pay-payment_method.php:289
+#: best2pay-payment_method.php:366
 msgid "Order canceled"
 msgstr ""
 
-#: best2pay-payment_method.php:317
+#: best2pay-payment_method.php:371
+msgid "Issuing an invoice for payment"
+msgstr ""
+
+#: best2pay-payment_method.php:373
+msgid "Enable issuing an invoice for payment by email of the payer"
+msgstr ""
+
+#: best2pay-payment_method.php:377
+msgid "Order agreement"
+msgstr ""
+
+#: best2pay-payment_method.php:383
+msgid "Payment expected"
+msgstr ""
+
+#: best2pay-payment_method.php:409
 msgid "Order #%s"
 msgstr ""
 
-#: best2pay-payment_method.php:333
+#: best2pay-payment_method.php:431
 msgid "Failed to register order"
 msgstr ""
 
-#: best2pay-payment_method.php:345
+#: best2pay-payment_method.php:445
 msgid "Order registered successfully"
 msgstr ""
 
-#: best2pay-payment_method.php:378
-#: best2pay-payment_method.php:545
+#: best2pay-payment_method.php:521
+msgid "Order successfully create"
+msgstr ""
+
+#: best2pay-payment_method.php:560
+#: best2pay-payment_method.php:737
 msgid "Failed to get Best2pay order ID"
 msgstr ""
 
-#: best2pay-payment_method.php:381
+#: best2pay-payment_method.php:564
 msgid "Failed to get Best2pay operation ID"
 msgstr ""
 
-#: best2pay-payment_method.php:384
-#: best2pay-payment_method.php:452
-#: best2pay-payment_method.php:539
+#: best2pay-payment_method.php:568
+#: best2pay-payment_method.php:643
+#: best2pay-payment_method.php:729
 msgid "Undefined order ID"
 msgstr ""
 
-#: best2pay-payment_method.php:387
-#: best2pay-payment_method.php:455
-#: best2pay-payment_method.php:542
+#: best2pay-payment_method.php:572
+#: best2pay-payment_method.php:647
+#: best2pay-payment_method.php:733
 msgid "Failed to get order information"
 msgstr ""
 
-#: best2pay-payment_method.php:400
+#: best2pay-payment_method.php:584
 msgid "Could not find operation"
 msgstr ""
 
-#: best2pay-payment_method.php:409
+#: best2pay-payment_method.php:595
 msgid "Failed to pay for the order"
 msgstr ""
 
-#: best2pay-payment_method.php:431
+#: best2pay-payment_method.php:619
 msgid "Payment completed successfully"
 msgstr ""
 
-#: best2pay-payment_method.php:461
+#: best2pay-payment_method.php:651
 msgid "The order has already been %s"
 msgstr ""
 
-#: best2pay-payment_method.php:474
+#: best2pay-payment_method.php:663
 msgid "Failed to complete request for operation %s from the processing center"
 msgstr ""
 
-#: best2pay-payment_method.php:493
+#: best2pay-payment_method.php:683
 msgid "Request for operation %s from the processing center was completed successfully"
 msgstr ""
 
-#: best2pay-payment_method.php:535
+#: best2pay-payment_method.php:725
 msgid "Operation failed. Please refresh the page"
 msgstr ""
 
-#: best2pay-payment_method.php:552
+#: best2pay-payment_method.php:743
 msgid "Failed to get operation request path"
 msgstr ""
 
-#: best2pay-payment_method.php:556
+#: best2pay-payment_method.php:747
 msgid "For orders with AUTHORIZED status, only full refunds are available"
 msgstr ""
 
-#: best2pay-payment_method.php:577
+#: best2pay-payment_method.php:771
 msgid "Operation type and action type are not equal"
 msgstr ""
 
-#: best2pay-payment_method.php:616
+#: best2pay-payment_method.php:813
 msgid "Complete payment"
 msgstr ""
 
-#: best2pay-payment_method.php:674
+#: best2pay-payment_method.php:869
 msgid "Missing PC order ID"
 msgstr ""
 
-#: best2pay-payment_method.php:687
+#: best2pay-payment_method.php:884
 msgid "There are no operations in the order"
 msgstr ""
 
-#: best2pay-payment_method.php:719
-#: best2pay-payment_method.php:735
+#: best2pay-payment_method.php:919
+#: best2pay-payment_method.php:938
 msgid "Signature is missing"
 msgstr ""
 
-#: best2pay-payment_method.php:723
-#: best2pay-payment_method.php:739
+#: best2pay-payment_method.php:924
+#: best2pay-payment_method.php:943
 msgid "Invalid signature"
 msgstr ""
 
-#: best2pay-payment_method.php:725
-#: best2pay-payment_method.php:746
+#: best2pay-payment_method.php:927
+#: best2pay-payment_method.php:951
 msgid "Unknown operation type"
 msgstr ""
 
-#: best2pay-payment_method.php:727
-#: best2pay-payment_method.php:748
+#: best2pay-payment_method.php:930
+#: best2pay-payment_method.php:954
 msgid "Operation not approved"
 msgstr ""
 
-#: best2pay-payment_method.php:744
+#: best2pay-payment_method.php:948
 msgid "An error occurred during the operation"
 msgstr ""
 
-#: best2pay-payment_method.php:750
+#: best2pay-payment_method.php:957
 msgid "Unknown payment operation type"
 msgstr ""
 
-#: best2pay-payment_method.php:774
+#: best2pay-payment_method.php:981
 msgid "Invalid operation amount"
 msgstr ""
 
-#: best2pay-payment_method.php:806
+#: best2pay-payment_method.php:1013
 msgid "Funds for the order have been successfully debited"
 msgstr ""
 
-#: best2pay-payment_method.php:807
+#: best2pay-payment_method.php:1014
 msgid "Failed to complete payment"
 msgstr ""
 
-#: best2pay-payment_method.php:810
+#: best2pay-payment_method.php:1017
 msgid "Payment refunded successfully"
 msgstr ""
 
-#: best2pay-payment_method.php:811
+#: best2pay-payment_method.php:1018
 msgid "Failed to refund payment"
 msgstr ""
 
-#: best2pay-payment_method.php:935
+#: best2pay-payment_method.php:1134
 msgid "Server response is empty"
 msgstr ""
 
-#: best2pay-payment_method.php:938
+#: best2pay-payment_method.php:1138
 msgid "Invalid XML from response"
 msgstr ""
 
-#: best2pay-payment_method.php:941
+#: best2pay-payment_method.php:1142
 msgid "Unable to decode xml"
 msgstr ""
 
-#: best2pay-payment_method.php:991
+#: best2pay-payment_method.php:1193
 msgid "Settings"
 msgstr ""

best2pay-payment-method-visamastercard/trunk/readme.txt

@@ -1 @@
-=== best2pay payment method ===
+=== Модуль оплаты Best2Pay ===
 Contributors: best2pay
-Tags: e-commerce, payments, best2pay, платежные системы
-Tested up to: 6.3.2
+Tags: woocommerce, payments, best2pay, платежные системы
 Requires at least: 4.7
+Tested up to: 6.4.3
 Requires PHP: 7.4
-Stable tag: 2.0.1
+Stable tag: 2.2.0
+WC requires at least: 6.0
+WC tested up to: 8.5.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
 == Description ==
+
 Плагин «Best2pay» – платежное решение для сайтов на WooCommerce:
-*  включает 7 cпособов приема платежей,
-*  подходит для юрлиц и ИП,
-*  деньги поступают на банковский счет компании.
-*  Соблюдение 54 ФЗ
+- Включает 7 cпособов приема платежей
+- Подходит для юрлиц и ИП
+- Деньги поступают на банковский счет компании
+- Соблюдение 54 ФЗ
 
-Настройка плагина
-Чтобы принимать платежи через плагин, нужно подать заявку на подключение к Best2pay на сайте https://best2pay.net и заключить договор с компанией. 
+= Тарифы =
+
+Подключение Bes2pay и настройка плагина – бесплатно. Комиссия за прием платежей – от 3,2%.
+
+= Все возможности Best2pay =
+
+После подключения Best2pay доступны:
+- 12 способов приема платежей. Интернет-банки, СБП, виртуальные карты. Вы сами выбираете, какие способы нужны, и перечисляете их в договоре. Кнопки оплаты можно разместить на своем сайте или на сайте Best2pay: выберите подходящий вариант при настройке плагина.
+- Личный кабинет на сайте Best2pay. В нем можно делать возвраты платежей, выставлять и отправлять счета, общаться с менеджерами.
+
+== Installation ==
+
+Чтобы принимать платежи через плагин, нужно подать заявку на подключение к Best2pay на сайте https://best2pay.net и заключить договор с компанией.
 После этого вы получите нужные настройки.
 Поддержка передачи данных чека:
-1. Через Bes2pay вы настраивали отправку чеков в налоговую (по 54-ФЗ)
+1. Отправка чеков через Bes2pay в налоговую (по 54-ФЗ)
 2. Через подключённых партнёров.
 
-Тарифы
-Подключение Bes2pay и настройка плагина – бесплатно. Комиссия за прием платежей – от 3,2%.
+== Screenshots ==
 
-Все возможности Best2pay
-После подключения Best2pay доступны:
-* 12 способов приема платежей. Интернет-банки, СБП, виртуальные карты. Вы сами выбираете, какие способы нужны, и перечисляете их в договоре. Кнопки оплаты можно разместить на своем сайте или на сайте Best2pay: выберите подходящий вариант при настройке плагина.
-* Личный кабинет на сайте Best2pay. В нем можно делать возвраты платежей, выставлять и отправлять счета, общаться с менеджерами.
-
-== Screenshots ==
 1. Страница настроек плагина