Plugin Directory

Changeset 2552949


Ignore:
Timestamp:
06/23/2021 06:24:25 PM (5 years ago)
Author:
ipag
Message:

Nova versão 2.1.3 (Fix: Informações duplicadas no painel administrativo)

Location:
ipag-woocommerce/trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • ipag-woocommerce/trunk/classes/gateway_loader.php

    r2479292 r2552949  
    6565    }
    6666
    67     public function orderInfo()
    68     {
    69         $method = get_post_meta($_REQUEST['post'], '_payment_method', true);
    70         if (!empty($_REQUEST['post']) && (strpos($method, 'ipag') !== false)):
     67    public function order_info()
     68    {
     69        if (!empty($_REQUEST['post'])):
     70            $order_id = $_REQUEST['post'];
     71            $order = new WC_Order($order_id);
     72            $method = is_callable(array($order, 'get_payment_method')) ? $order->get_payment_method() : $order->payment_method;
     73
    7174            $t_id = get_post_meta($_REQUEST['post'], '_transaction_id', true);
    7275            $t_msg = get_post_meta($_REQUEST['post'], '_transaction_message', true);
     
    7881            $billet_url = get_post_meta($_REQUEST['post'], '_billet_url', true);
    7982            $lp_sub = get_post_meta($_REQUEST['post'], '_last_payment_sub', true);
     83
     84            $ipagMethods = array('ipag-gateway_boleto', 'ipag-gateway-double-card', 'ipag-gateway', 'ipag-gateway_debito', 'ipag-gateway_itaushopline', 'ipag-gateway_pix');
     85            if(in_array($method, $ipagMethods)) :
    8086            ?>
    8187                    <h4><?php _e('Payment Details', 'ipag-gateway');?></h4>
     
    127133                </div>
    128134            <?php endif;
     135            endif;
    129136    }
    130137
     
    142149            if (!empty($t_id)):
    143150            ?>
    144                             <h4><?php _e('Payment Details', 'ipag-gateway-double-card');?></h4>
     151                            <h4><?php _e('Payment Details', 'ipag-gateway');?></h4>
    145152                            <div class="payment">
    146153                                <p>
    147                                     <strong><?php _e('Transaction ID:', 'ipag-gateway-double-card');?></strong><br>
     154                                    <strong><?php _e('Transaction ID:', 'ipag-gateway');?></strong><br>
    148155                                    <?php echo '<span style="word-wrap:break-word;">'.$t_id.'</span>'; ?>
    149156                                    <br>
     
    972979    public function getIpagLogo($class)
    973980    {
    974         if (get_class($class) == 'WC_Gateway_iPag_Credito') {
    975             if ($class->get_option('brand') == 'yes') {
    976                 return apply_filters('woocommerce_ipag_icon', plugins_url('images/ipag.png', plugin_dir_path(__FILE__)));
    977             }
    978         } else {
    979             $instance = new WC_Gateway_iPag_Credito;
    980             if ($instance->get_option('brand') == 'yes') {
    981                 return apply_filters('woocommerce_ipag_icon', plugins_url('images/ipag.png', plugin_dir_path(__FILE__)));
    982             }
    983         }
    984         return null;
     981        $option = get_option('woocommerce_ipag-gateway_settings');
     982        if ($option['brand'] == 'yes') {
     983            return apply_filters('woocommerce_ipag_icon', plugins_url('images/ipag.png', plugin_dir_path(__FILE__)));
     984        }
     985        return false;
    985986    }
    986987}
  • ipag-woocommerce/trunk/classes/ipag-gateway-boleto.php

    r2479292 r2552949  
    3737        add_action('wp_enqueue_scripts', array($this, 'checkout_scripts'));
    3838
     39        add_action('woocommerce_admin_order_data_after_shipping_address', array($this, 'orderInfo'));
    3940        add_action('woocommerce_update_options_payment_gateways_'.$this->id, array($this, 'process_admin_options'));
    4041        add_action('woocommerce_thankyou_'.$this->id, array($this, 'order_received'));
     
    159160        <?php
    160161}
     162
     163    public function orderInfo()
     164    {
     165        $order_id = $_REQUEST['post'];
     166        $order = new WC_Order($order_id);
     167        $method = is_callable(array($order, 'get_payment_method')) ? $order->get_payment_method() : $order->payment_method;
     168        if ($method === 'ipag-gateway_boleto') {
     169            $this->order_info();
     170        }
     171    }
    161172
    162173    public function order_received($order_id)
  • ipag-woocommerce/trunk/classes/ipag-gateway-cartaoduplo.php

    r2479292 r2552949  
    4141
    4242        add_action('woocommerce_update_options_payment_gateways_'.$this->id, array($this, 'process_admin_options'));
     43        add_action('woocommerce_admin_order_data_after_shipping_address', array($this, 'orderInfo'));
    4344        add_action('woocommerce_admin_order_data_after_shipping_address', array($this, 'orderInfoSecondCard'));
    4445        add_action('wp_enqueue_scripts', array($this, 'checkout_scripts'));
     
    206207            ),
    207208        );
     209    }
     210
     211    public function orderInfo()
     212    {
     213        $order_id = $_REQUEST['post'];
     214        $order = new WC_Order($order_id);
     215        $method = is_callable(array($order, 'get_payment_method')) ? $order->get_payment_method() : $order->payment_method;
     216        if ($method === 'ipag-gateway-double-card') {
     217            $this->order_info();
     218        }
    208219    }
    209220
  • ipag-woocommerce/trunk/classes/ipag-gateway-credito.php

    r2479292 r2552949  
    244244                ),
    245245            );
     246        }
     247
     248        public function orderInfo()
     249        {
     250            $order_id = $_REQUEST['post'];
     251            $order = new WC_Order($order_id);
     252            $method = is_callable(array($order, 'get_payment_method')) ? $order->get_payment_method() : $order->payment_method;
     253            if ($method === 'ipag-gateway') {
     254                $this->order_info();
     255            }
    246256        }
    247257
  • ipag-woocommerce/trunk/classes/ipag-gateway-debito.php

    r2479292 r2552949  
    2929        $this->test_url = 'https://sandbox.ipag.com.br/';
    3030
     31        add_action('woocommerce_admin_order_data_after_shipping_address', array($this, 'orderInfo'));
    3132        add_action('wp_enqueue_scripts', array($this, 'checkout_scripts'));
    3233        add_action('woocommerce_update_options_payment_gateways_'.$this->id, array($this, 'process_admin_options'));
     
    101102        $this->generate_settings_html();
    102103        echo '</table>';
     104    }
     105   
     106    public function orderInfo()
     107    {
     108        $order_id = $_REQUEST['post'];
     109        $order = new WC_Order($order_id);
     110        $method = is_callable(array($order, 'get_payment_method')) ? $order->get_payment_method() : $order->payment_method;
     111        if ($method === 'ipag-gateway_debito') {
     112            $this->order_info();
     113        }
    103114    }
    104115
  • ipag-woocommerce/trunk/classes/ipag-gateway-itaushopline.php

    r2479292 r2552949  
    3030
    3131            add_action('woocommerce_update_options_payment_gateways_'.$this->id, array($this, 'process_admin_options'));
     32            add_action('woocommerce_admin_order_data_after_shipping_address', array($this, 'orderInfo'));
    3233            add_action('woocommerce_thankyou_'.$this->id, array($this, 'order_received'));
    3334            add_action('woocommerce_view_order', array($this, 'order_received'), 1);
     
    9697                ),
    9798            );
     99        }
     100
     101        public function orderInfo()
     102        {
     103            $order_id = $_REQUEST['post'];
     104            $order = new WC_Order($order_id);
     105            $method = is_callable(array($order, 'get_payment_method')) ? $order->get_payment_method() : $order->payment_method;
     106            if ($method === 'ipag-gateway_itaushopline') {
     107                $this->order_info();
     108            }
    98109        }
    99110
  • ipag-woocommerce/trunk/classes/ipag-gateway-pix.php

    r2486768 r2552949  
    3939        add_action('wp_enqueue_scripts', array($this, 'checkout_scripts'));
    4040
     41        add_action('woocommerce_admin_order_data_after_shipping_address', array($this, 'orderInfo'));
    4142        add_action('woocommerce_update_options_payment_gateways_'.$this->id, array($this, 'process_admin_options'));
    4243        add_action('woocommerce_thankyou_'.$this->id, array($this, 'order_received'));
     
    9899            ),
    99100        );
     101    }
     102
     103    public function orderInfo()
     104    {
     105        $order_id = $_REQUEST['post'];
     106        $order = new WC_Order($order_id);
     107        $method = is_callable(array($order, 'get_payment_method')) ? $order->get_payment_method() : $order->payment_method;
     108        if ($method === 'ipag-gateway_pix') {
     109            $this->order_info();
     110        }
    100111    }
    101112
  • ipag-woocommerce/trunk/css/custom-style.css

    r1900788 r2552949  
    22 * Você pode adicionar estilos personalizados aqui
    33*/
     4
     5/* ocultar list-style das bandeiras */
     6#payment .payment_methods li { list-style: none!important; }
     7/* tamanho da bandeira ao lado do número do cartão */
     8​#payment .payment_methods li img { max-height: 1.618em; }
    49
    510/**
  • ipag-woocommerce/trunk/css/ipag.css

    r2480737 r2552949  
    4747    height: 390px;
    4848    z-index: 50;
     49}
     50
     51.card_container1 {
     52    background-image: url('../images/credit-card1.png') !important;
     53}
     54
     55.card_container2 {
     56    background-image: url('../images/credit-card2.png') !important;
    4957}
    5058
     
    131139    position: relative;
    132140}
    133     </style>
  • ipag-woocommerce/trunk/ipag-gateway.php

    r2486768 r2552949  
    66 * Author URI:     mailto:suporte@ipag.com.br
    77 * Plugin URI:     http://www.ipag.com.br/
    8  * Version:     2.1.2
     8 * Version:     2.1.3
    99 * Text Domain: ipag-woocommerce
    1010 * Domain Path: /languages/
     
    2121{
    2222
    23         const IPAG_VERSION = '2.1.2';
     23        const IPAG_VERSION = '2.1.3';
    2424        protected static $instance = null;
    2525
  • ipag-woocommerce/trunk/languages/ipag-gateway-pt_BR.po

    r2479292 r2552949  
    22msgstr ""
    33"Project-Id-Version: iPag Payment Gateway\n"
    4 "POT-Creation-Date: 2021-02-22 10:30-0300\n"
    5 "PO-Revision-Date: 2021-02-22 10:30-0300\n"
     4"POT-Creation-Date: 2021-06-18 15:30-0300\n"
     5"PO-Revision-Date: 2021-06-18 15:30-0300\n"
    66"Last-Translator: \n"
    77"Language-Team: Guilherme Motta <guifmotta@weblibre.com.br>\n"
     
    1717"X-Poedit-SearchPath-0: .\n"
    1818
    19 #: classes/gateway_loader.php:81 classes/gateway_loader.php:144
     19#: classes/gateway_loader.php:87 classes/gateway_loader.php:151
    2020msgid "Payment Details"
    2121msgstr "Detalhes do Pagamento"
    2222
    23 #: classes/gateway_loader.php:84 classes/gateway_loader.php:147
     23#: classes/gateway_loader.php:90 classes/gateway_loader.php:154
    2424msgid "Transaction ID:"
    2525msgstr "ID da Transação:"
    2626
    27 #: classes/gateway_loader.php:87 classes/gateway_loader.php:150
     27#: classes/gateway_loader.php:93 classes/gateway_loader.php:157
    2828msgid "Transaction Message:"
    2929msgstr "Mensagem da Transação:"
    3030
    31 #: classes/gateway_loader.php:90 classes/gateway_loader.php:153
     31#: classes/gateway_loader.php:96 classes/gateway_loader.php:160
    3232msgid "Operator Message:"
    3333msgstr "Mensagem da Operadora:"
    3434
    35 #: classes/gateway_loader.php:94 classes/gateway_loader.php:157
     35#: classes/gateway_loader.php:100 classes/gateway_loader.php:164
    3636#: templates/ipag-gateway-template-cartaoduplo.php:110
    3737#: templates/ipag-gateway-template-cartaoduplo.php:171
     
    4040msgstr "Número de parcelas:"
    4141
    42 #: classes/gateway_loader.php:99 classes/gateway_loader.php:162
     42#: classes/gateway_loader.php:105 classes/gateway_loader.php:169
    4343msgid "Card Brand:"
    4444msgstr "Bandeira do Cartão:"
    4545
    46 #: classes/gateway_loader.php:105 classes/gateway_loader.php:168
     46#: classes/gateway_loader.php:111 classes/gateway_loader.php:175
    4747msgid "Subscription"
    4848msgstr "Assinatura"
    4949
    50 #: classes/gateway_loader.php:107 classes/gateway_loader.php:170
     50#: classes/gateway_loader.php:113 classes/gateway_loader.php:177
    5151msgid "Last Payment:"
    5252msgstr "Último Pagamento:"
    5353
    54 #: classes/gateway_loader.php:112 classes/gateway_loader.php:114
    55 #: classes/gateway_loader.php:175
     54#: classes/gateway_loader.php:118 classes/gateway_loader.php:120
     55#: classes/gateway_loader.php:182
    5656msgid "Capture"
    5757msgstr "Capturar"
    5858
    59 #: classes/gateway_loader.php:117 classes/gateway_loader.php:178
     59#: classes/gateway_loader.php:123 classes/gateway_loader.php:185
    6060#: classes/ipag-gateway-boleto.php:171 classes/ipag-gateway-boleto.php:437
    6161msgid "Imprimir Boleto"
    6262msgstr "Imprimir Boleto"
    6363
    64 #: classes/gateway_loader.php:120 classes/ipag-gateway-pix.php:155
    65 #: classes/ipag-gateway-pix.php:349
     64#: classes/gateway_loader.php:126 classes/ipag-gateway-pix.php:157
     65#: classes/ipag-gateway-pix.php:351
    6666msgid "Visualizar QRCode"
    6767msgstr "Visualizar QRCode"
    6868
    69 #: classes/gateway_loader.php:123 classes/gateway_loader.php:181
     69#: classes/gateway_loader.php:129 classes/gateway_loader.php:188
    7070msgid "Consult"
    7171msgstr "Consultar"
    7272
    73 #: classes/gateway_loader.php:217
     73#: classes/gateway_loader.php:224
    7474msgid "Transaction Initiated"
    7575msgstr "Transação Iniciada"
    7676
    77 #: classes/gateway_loader.php:218
     77#: classes/gateway_loader.php:225
    7878msgid "Printed Billet"
    7979msgstr "Boleto Impresso"
    8080
    81 #: classes/gateway_loader.php:219
     81#: classes/gateway_loader.php:226
    8282msgid "Transaction Canceled"
    8383msgstr "Transação Cancelada"
    8484
    85 #: classes/gateway_loader.php:220
     85#: classes/gateway_loader.php:227
    8686msgid "Transaction In Analysis"
    8787msgstr "Transação em Análise"
    8888
    89 #: classes/gateway_loader.php:221
     89#: classes/gateway_loader.php:228
    9090msgid "Transaction Approved"
    9191msgstr "Transação Aprovada"
    9292
    93 #: classes/gateway_loader.php:222
     93#: classes/gateway_loader.php:229
    9494msgid "Transaction Approved Partial Value"
    9595msgstr "Transação Aprovada com Valor Parcial"
    9696
    97 #: classes/gateway_loader.php:223
     97#: classes/gateway_loader.php:230
    9898msgid "Transaction Refused"
    9999msgstr "Transação Recusada"
    100100
    101 #: classes/gateway_loader.php:224
     101#: classes/gateway_loader.php:231
    102102msgid "Transaction Approved & Captured"
    103103msgstr "Transação Aprovada e Capturada"
    104104
    105 #: classes/gateway_loader.php:467
     105#: classes/gateway_loader.php:474
    106106msgid "Waiting Payment"
    107107msgstr "Aguardando Pagamento"
    108108
    109 #: classes/gateway_loader.php:809 classes/gateway_loader.php:839
     109#: classes/gateway_loader.php:816 classes/gateway_loader.php:846
    110110msgid "Consulting..."
    111111msgstr "Consultando ..."
    112112
    113 #: classes/gateway_loader.php:822 classes/gateway_loader.php:852
     113#: classes/gateway_loader.php:829 classes/gateway_loader.php:859
    114114msgid "Consulted"
    115115msgstr "Consultado"
     
    293293#: classes/ipag-gateway-debito.php:284 classes/ipag-gateway-debito.php:287
    294294#: classes/ipag-gateway-debito.php:391 classes/ipag-gateway-debito.php:434
    295 #: classes/ipag-gateway-itaushopline.php:273 classes/ipag-gateway-pix.php:325
     295#: classes/ipag-gateway-itaushopline.php:273 classes/ipag-gateway-pix.php:327
    296296msgid "Payment error:"
    297297msgstr "Erro no Pagamento:"
     
    301301#: classes/ipag-gateway-credito.php:284 classes/ipag-gateway-credito.php:311
    302302#: classes/ipag-gateway-debito.php:126 classes/ipag-gateway-debito.php:150
    303 #: classes/ipag-gateway-pix.php:261
     303#: classes/ipag-gateway-pix.php:263
    304304msgid "Invalid credit card number."
    305305msgstr "Número do Cartão de Crédito inválido."
     
    309309#: classes/ipag-gateway-credito.php:285 classes/ipag-gateway-credito.php:312
    310310#: classes/ipag-gateway-debito.php:127 classes/ipag-gateway-debito.php:151
    311 #: classes/ipag-gateway-pix.php:262
     311#: classes/ipag-gateway-pix.php:264
    312312msgid "Invalid CVV."
    313313msgstr "CVV inválido."
     
    317317#: classes/ipag-gateway-credito.php:286 classes/ipag-gateway-credito.php:313
    318318#: classes/ipag-gateway-debito.php:128 classes/ipag-gateway-debito.php:152
    319 #: classes/ipag-gateway-pix.php:263
     319#: classes/ipag-gateway-pix.php:265
    320320msgid "Invalid name."
    321321msgstr "Nome inválido."
     
    325325#: classes/ipag-gateway-credito.php:287 classes/ipag-gateway-credito.php:314
    326326#: classes/ipag-gateway-debito.php:129 classes/ipag-gateway-debito.php:153
    327 #: classes/ipag-gateway-pix.php:264
     327#: classes/ipag-gateway-pix.php:266
    328328msgid "Invalid expiry date."
    329329msgstr "Data de vencimento inválida."
     
    333333#: classes/ipag-gateway-credito.php:288 classes/ipag-gateway-credito.php:315
    334334#: classes/ipag-gateway-debito.php:130 classes/ipag-gateway-debito.php:154
    335 #: classes/ipag-gateway-pix.php:265
     335#: classes/ipag-gateway-pix.php:267
    336336msgid "Expired card."
    337337msgstr "Cartão expirado."
     
    340340#: classes/ipag-gateway-cartaoduplo.php:600
    341341#: classes/ipag-gateway-credito.php:289 classes/ipag-gateway-credito.php:316
    342 #: classes/ipag-gateway-debito.php:155 classes/ipag-gateway-pix.php:266
     342#: classes/ipag-gateway-debito.php:155 classes/ipag-gateway-pix.php:268
    343343msgid "Invalid CPF."
    344344msgstr "CPF inválido."
     
    347347#: classes/ipag-gateway-cartaoduplo.php:601
    348348#: classes/ipag-gateway-credito.php:290 classes/ipag-gateway-credito.php:317
    349 #: classes/ipag-gateway-debito.php:156 classes/ipag-gateway-pix.php:267
     349#: classes/ipag-gateway-debito.php:156 classes/ipag-gateway-pix.php:269
    350350msgid "Please choose an installment option."
    351351msgstr "Por favor, escolha uma opção de parcelamento."
     
    652652msgstr "Método de Pagamento iPag - Pix"
    653653
    654 #: classes/ipag-gateway-pix.php:156
     654#: classes/ipag-gateway-pix.php:158
    655655msgid ""
    656656"Clique no link ao lado para visualizar o QRCode ou escaneie a imagem acima."
     
    658658"Clique no link ao lado para visualizar o QRCode ou escaneie a imagem acima."
    659659
    660 #: classes/ipag-gateway-pix.php:324
     660#: classes/ipag-gateway-pix.php:326
    661661msgid " Error processing payment."
    662662msgstr " Erro ao processar pagamento."
    663663
    664 #: classes/ipag-gateway-pix.php:326
     664#: classes/ipag-gateway-pix.php:328
    665665msgid "Invalid payment data."
    666666msgstr "Dados de pagamento inválidos."
    667667
    668 #: classes/ipag-gateway-pix.php:351
     668#: classes/ipag-gateway-pix.php:353
    669669msgid "Clique no link ao lado para visualizar o QRCode."
    670670msgstr "Clique no link ao lado para visualizar o QRCode."
  • ipag-woocommerce/trunk/readme.txt

    r2486768 r2552949  
    55Tested up to: 5.6
    66Requires PHP: 7.0
    7 Stable tag: 2.1.2
     7Stable tag: 2.1.3
    88License: GPLv2 or later
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
     
    2727
    2828== Changelog ==
     29= 2.1.3 =
     30* Fix: Informações duplicadas no painel administrativo
     31
    2932= 2.1.2 =
    3033* Fix: Endroid autoload
  • ipag-woocommerce/trunk/templates/ipag-gateway-template-cartaoduplo.php

    r2480737 r2552949  
    6161    <div id="ipag-duplo1-payment-form">
    6262        <div id="credit1_wrapper" class="card_wrapper nofloat">
    63             <div id="credit1_container" class="card_container">
     63            <div id="credit1_container" class="card_container card_container1">
    6464                <div class="ipag-card-number anonymous">••••&nbsp; ••••&nbsp; ••••&nbsp; ••••</div>
    6565                <div class="ipag-card-name">TITULAR DO CARTÃO</div>
     
    123123    <div id="ipag-duplo2-payment-form">
    124124        <div id="credit2_wrapper" class="card_wrapper nofloat">
    125             <div id="credit2_container" class="card_container">
     125            <div id="credit2_container" class="card_container card_container2">
    126126                <div class="ipag-card-number anonymous">••••&nbsp; ••••&nbsp; ••••&nbsp; ••••</div>
    127127                <div class="ipag-card-name">TITULAR DO CARTÃO</div>
Note: See TracChangeset for help on using the changeset viewer.