Changeset 2387101

Timestamp:

09/23/2020 12:56:33 PM (6 years ago)

Author:

fastconnect

Message:

Versão 2.1.3

Location:

fastconnect-woocommerce/trunk

Files:

• includes/class-wc-fastconnect-api.php (modified) (1 diff)
• includes/class-wc-fastconnect-gateway.php (modified) (5 diffs)
• readme.txt (modified) (3 diffs)
• woocommerce-fastconnect.php (modified) (2 diffs)

fastconnect-woocommerce/trunk/includes/class-wc-fastconnect-api.php

@@ -608 +608 @@
 
                                         if ( 'yes' == $this->gateway->debug ) {
-                                                $this->gateway->log->add( $this->gateway->id, 'An error occurred while generating the FastConnect direct payment: ' . print_r( $response, true ) );
+                                                $this->gateway->log->add( $this->gateway->id, 'An error occurred while generating the FastConnect direct payment: ' . print_r( $data, true ) );
                                         }
 
-                                        foreach ( $data->errors as $error_key => $error ) {
-                                                if ( isset($error->code) ) {
-                                                        $msg = '<strong>' . __( 'FastConnect', 'woocommerce-fastconnect' ) . '</strong>: ' . $error->code . ' - ' . $error->message;
-
-                                                        if( isset($error->fields) && is_array($error->fields) && count($error->fields) )
-                                                                $msg .= '<br>' . join('<br>', $error->fields);
-
-                                                        $errors[] = $msg;
-                                                } else {
-                                                        $errors[] = '<strong>' . __( 'FastConnect', 'woocommerce-fastconnect' ) . '</strong>: ' . $error;
+                                        if( is_array($data->errors) && count($data->errors) ) {
+                                                foreach ( $data->errors as $error ) {
+                                                        if ( isset($error->code) ) {
+                                                                $msg = '<strong>' . __( 'FastConnect', 'woocommerce-fastconnect' ) . '</strong>: ' . $error->code . ' - ' . $error->message;
+
+                                                                print_r($error, true);
+
+                                                                if( is_array($error->fields) && count($error->fields) ) {
+                                                                        if( isset($error->fields[0]) && isset($error->fields[0]->code) ) {
+                                                                                foreach( $error->fields as $k => $v ) {
+                                                                                        $msg .= '<br>' . $v->message;
+                                                                                        if( isset($v->details) && is_array($v->details) && count($v->details) ) {
+                                                                                                $msg .= ', ' . join(';',$v->details);
+                                                                                        }
+                                                                                }
+                                                                        } else {
+                                                                                $msg .= '<br>' . join('<br>', $error->fields);
+                                                                        }
+                                                                }
+
+                                                                $errors[] = $msg;
+                                                        } else {
+                                                                $errors[] = '<strong>' . __( 'FastConnect', 'woocommerce-fastconnect' ) . '</strong>: ' . join('<br>', $error);
+                                                        }
                                                 }
+                                        } else {
+                                                $errors[] = '<strong>' . __( 'FastConnect', 'woocommerce-fastconnect' ) . '</strong>: Ocorreu um erro inesperado, tente novamente mais tarde';
                                         }
+
 
                                         return array(

fastconnect-woocommerce/trunk/includes/class-wc-fastconnect-gateway.php

@@ -52 +52 @@
                 $this->fc_status_due_date   = $this->get_option( 'fc_status_due_date', 'wc-on-hold' );
                 $this->fc_status_paid       = $this->get_option( 'fc_status_paid', 'wc-processing' );
+                $this->fc_billet_status_paid= $this->get_option( 'fc_billet_status_paid', 'wc-processing' );
+                $this->fc_credit_status_paid= $this->get_option( 'fc_credit_status_paid', 'wc-processing' );
                 $this->fc_status_pending    = $this->get_option( 'fc_status_pending', 'wc-on-hold' );
                 $this->invoice_prefix       = $this->get_option( 'invoice_prefix', 'WC-' );
@@ -333 +335 @@
                                 'default' => 'wc-on-hold',
                         ),
+                        'fc_billet_status_paid' => array(
+                                'title' => __('Status para ordem paga', 'wc-gateway-fastconnect'),
+                                'description' => __('Quando o pagamento por boleto for efetuado, mudar o status para', 'wc-gateway-fastconnect'),
+                                'type' => 'select',
+                                'options' => $orderStatus,
+                                'default' => 'wc-processing',
+                        ),
                         'fc_billet_message'    => array(
                                 'title'   => __( 'Mensagem para boleto', 'woocommerce-fastconnect' ),
-                                'type'    => 'input',
+                                'type' => 'textarea',
+                                'css' => 'max-width:400px;',
                                 'description'   => __( 'Isso será exibido no checkout para o usuário.', 'woocommerce-fastconnect' ),
                                 'default' => '',
                         ),
 
-                        //Boletos
+                        //Credito
                         'credit' => array(
                                 'title'       => __( 'Cartão de Crédito', 'wc-gateway-fastconnect' ),
@@ -383 +393 @@
                                 'desc_tip'    => true,
                         ),
+                        'fc_credit_status_paid' => array(
+                                'title' => __('Status para ordem paga', 'wc-gateway-fastconnect'),
+                                'description' => __('Quando o pagamento for efetuado por crédito, mudar o status para', 'wc-gateway-fastconnect'),
+                                'type' => 'select',
+                                'options' => $orderStatus,
+                                'default' => 'wc-processing',
+                        ),
 
                         'behavior'             => array(
@@ -404 +421 @@
                                 'default' => 'wc-on-hold',
                         ),
-                        /*'fc_status_paid' => array(
-                                'title' => __('Status para ordem paga', 'wc-gateway-fastconnect'),
-                                'description' => __('Quando o pagamento for efetuado, mudar o status para', 'wc-gateway-fastconnect'),
-                                'type' => 'select',
-                                'options' => $orderStatus,
-                                'default' => 'wc-processing',
-                        ),*/
 
                         'testing'              => array(
@@ -713 +723 @@
                                         // Sometimes FastConnect should change an order from cancelled to paid, so we need to handle it.
                                         if ( method_exists( $order, 'get_status' ) && 'cancelled' === $order->get_status() ) {
-                                                $order->update_status( str_replace('wc-', '', $this->fc_status_paid), __( 'FastConnect: Pagamento aprovado.', 'woocommerce-fastconnect' ) );
+                                                $order->update_status( str_replace('wc-', '', $this->fc_credit_status_paid), __( 'FastConnect: Pagamento aprovado.', 'woocommerce-fastconnect' ) );
                                                 wc_reduce_stock_levels( $order_id );
                                         } else {
                                                 $order->add_order_note( __( 'FastConnect: Pagamento aprovado.', 'woocommerce-fastconnect' ) );
-                                                if( $posted->tipo == 'credito' ) {
-                                                        wc_reduce_stock_levels( $order_id );
-                                                }
+
                                                 // Changing the order for processing and reduces the stock.
                                                 $order->payment_complete( sanitize_text_field( (string) $posted->nu_venda ) );
+
+                                                if( $posted->tipo == 'credito' ) {
+
+                                                        $order->update_status( str_replace('wc-', '', $this->fc_credit_status_paid), __( 'FastConnect: Pagamento aprovado.', 'woocommerce-fastconnect' ) );
+
+                                                } else {
+
+                                                        $order->update_status( str_replace('wc-', '', $this->fc_billet_status_paid), __( 'FastConnect: Pagamento aprovado.', 'woocommerce-fastconnect' ) );
+
+                                                }
+
                                         }
                                 }

fastconnect-woocommerce/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.0
 Tested up to: 5.2
-Stable tag: 2.0.2
+Stable tag: 2.1.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -125 +125 @@
 Sim, o status é alterado automaticamente usando as notifificações da API da FastConnect.
 
-= Funciona com o Sandbox do FastConnect? =
+= Funciona com o Sandbox da FastConnect? =
 
 Sim, funciona e basta você ativar isso nas opções do plugin, além de configurar o seu client_code e client_key de testes.
@@ -151 +151 @@
 
 * Corrigido problema de visualização do checkout
+
+= 2.1.3 - 2020/09/18 =
+
+* Adicionada opção para alterar status de um pagamento efetuado

fastconnect-woocommerce/trunk/woocommerce-fastconnect.php

@@ -6 +6 @@
  * Author:               FastConnect Team
  * Author URI:           https://fastconnect.com.br
- * Version:              2.0.3
+ * Version:              2.1.3
  * License:              GPLv3 or later
  * Text Domain:          woocommerce-fastconnect
@@ -19 +19 @@
 
 // Plugin constants.
-define( 'WC_FASTCONNECT_VERSION', '2.0.3' );
+define( 'WC_FASTCONNECT_VERSION', '2.1.3' );
 define( 'WC_FASTCONNECT_PLUGIN_FILE', __FILE__ );