WordPress.org
Get WordPress

Plugin Directory

Changeset 2789478


Ignore:
Timestamp:
09/23/2022 08:19:48 PM (4 years ago)
Author:
sprinque
Message:

1.1.2

Location:
sprinque
Files:
10 edited
1 copied

Legend:

Unmodified
Added
Removed

  • sprinque/tags/1.1.2/assets/js/frontend.js

    r2778366 r2789478  
    274274        $('#billing_company').val(company_name);
    275275        $('#reg_number_pay').val(company_reg_code);
    276         $('#confirm-company-order').prop('disabled', false);
    277 
     276        $('#confirm-company-order').prop('disabled', true);
     277
     278        var confirmBtnText = $('#confirm-company-order').text();
     279        $('#confirm-company-order').html('<div class="wpm-preloader">'+ admin.loading +'</div>');
     280       
    278281        $.ajax({
    279282            url: admin.ajaxurl,
    … …  
    290293                    this_item.html(response.html)
    291294                }
    292             }
     295            },
     296            complete: function () {
     297                $('#confirm-company-order').prop('disabled', false);
     298                $('#confirm-company-order').html(confirmBtnText);
     299            }
    293300        });
    294301    });
    … …  
    365372        var email = $('#billing_email').val();
    366373
     374        // Here the problem on js layer
    367375        $('.error-register-fields').hide();
    368376

  • sprinque/tags/1.1.2/languages/sprinque-nl_NL.po

    r2778366 r2789478  
    136136#: templates/frontend/srinque_pay_modal_form.php:79
    137137msgid "If you have not received the code, please check your spam folder or"
    138 msgstr "Als geen code ontvangen hebt, check alsjeblieft je spam folder of"
     138msgstr "Als je geen code ontvangen hebt, check alsjeblieft je spam folder of"
    139139
    140140#: sprinque.php:444
    … …  
    250250msgstr ""
    251251"Je verzoek om op factuur te betalen wordt behandeld. Dit kan 24 uur duren. "
    252 "Je besetelling is nog niet bevestigd tot beoordeling is afgerond. <br> We "
     252"Je bestelling is nog niet bevestigd tot beoordeling is afgerond. <br> We "
    253253"sturen je een bericht zodra de beoordeling voltooid is."
    254254

  • sprinque/tags/1.1.2/readme.txt

    r2780759 r2789478  
    66Tested up to: 6.0
    77Requires PHP: 5.3
    8 Stable tag: 1.1.1
     8Stable tag: 1.1.2
    99License: GPLv2 or later
    1010License URI: https://www.gnu.org/licenses/gpl-2.0.html
    … …  
    5151== Changelog ==
    5252
     53= 1.1.2 - September 12, 2022 =
     54* Send correct order id to Sprinque
     55* Hide validation error until search return company address
     56* Fixed translation
     57
    5358= 1.1.1 - September 6, 2022 =
    5459* Replaced $order->ID with $order->get_id()

  • sprinque/tags/1.1.2/sprinque.php

    r2780759 r2789478  
    55Description: Sprinque for WordPress is a plugin that allows you to offer your business buyers net payment terms (15, 30, 60, 90 days) and thereby grow conversion and retention.
    66Author: Sprinque
    7 Version: 1.1.1
     7Version: 1.1.2
    88Text Domain: sprinque
    99Domain Path: /languages
    … …  
    267267    public function send_capture_authorized_order( $order_id ) {
    268268        $order = wc_get_order( $order_id );
    269 
    270         $settings = get_option( 'woocommerce_wpm_srinque_pay_settings', true );
     269        $order_id_from_sequential_plugin = $order->get_order_number();
     270
     271        $settings = get_option( 'woocommerce_wpm_srinque_pay_settings', true );
    271272
    272273        // Create PDF Link for Invoice
    … …  
    292293        // Prepare Data to Send
    293294        $data = [
     295            'merchant_order_id' => $order_id_from_sequential_plugin ?: $order_id,
    294296            'invoice'  => [
    295297                'merchant_invoice_id' => $order_id,

  • sprinque/tags/1.1.2/templates/frontend/srinque_pay_modal_form.php

    r2778366 r2789478  
    5050                        <input type="text" id="zip_company_pay" class="required-input" value="<?php if(isset($billing_postcode)) { echo esc_attr($billing_postcode); } ?>">
    5151                    </div>
    52                     <div class="error-register-fields" style="display: none"><?php _e( "Not all fields filled on Billing or Modal", 'sprinque' ); ?></div>
     52                    <div class="error-register-fields" style="display: none">
     53                        <?php
     54                        // Here we're showing error
     55                        if (!isset($billing_address_1, $billing_address_2, $billing_city, $billing_postcode)) {
     56                            _e( "Not all fields filled on Billing or Modal", 'sprinque' );
     57                        }
     58                        ?>
     59                    </div>
    5360                    <div class="pagination-btns">
    5461                        <button type="button" class="wpm-btn wpm-btn_outline-primary white_btn_pay to_select_companies"><?php _e( "Previous step", 'sprinque' ); ?></button>

  • sprinque/trunk/assets/js/frontend.js

    r2778366 r2789478  
    274274        $('#billing_company').val(company_name);
    275275        $('#reg_number_pay').val(company_reg_code);
    276         $('#confirm-company-order').prop('disabled', false);
    277 
     276        $('#confirm-company-order').prop('disabled', true);
     277
     278        var confirmBtnText = $('#confirm-company-order').text();
     279        $('#confirm-company-order').html('<div class="wpm-preloader">'+ admin.loading +'</div>');
     280       
    278281        $.ajax({
    279282            url: admin.ajaxurl,
    … …  
    290293                    this_item.html(response.html)
    291294                }
    292             }
     295            },
     296            complete: function () {
     297                $('#confirm-company-order').prop('disabled', false);
     298                $('#confirm-company-order').html(confirmBtnText);
     299            }
    293300        });
    294301    });
    … …  
    365372        var email = $('#billing_email').val();
    366373
     374        // Here the problem on js layer
    367375        $('.error-register-fields').hide();
    368376

  • sprinque/trunk/languages/sprinque-nl_NL.po

    r2778366 r2789478  
    136136#: templates/frontend/srinque_pay_modal_form.php:79
    137137msgid "If you have not received the code, please check your spam folder or"
    138 msgstr "Als geen code ontvangen hebt, check alsjeblieft je spam folder of"
     138msgstr "Als je geen code ontvangen hebt, check alsjeblieft je spam folder of"
    139139
    140140#: sprinque.php:444
    … …  
    250250msgstr ""
    251251"Je verzoek om op factuur te betalen wordt behandeld. Dit kan 24 uur duren. "
    252 "Je besetelling is nog niet bevestigd tot beoordeling is afgerond. <br> We "
     252"Je bestelling is nog niet bevestigd tot beoordeling is afgerond. <br> We "
    253253"sturen je een bericht zodra de beoordeling voltooid is."
    254254

  • sprinque/trunk/readme.txt

    r2780759 r2789478  
    66Tested up to: 6.0
    77Requires PHP: 5.3
    8 Stable tag: 1.1.1
     8Stable tag: 1.1.2
    99License: GPLv2 or later
    1010License URI: https://www.gnu.org/licenses/gpl-2.0.html
    … …  
    5151== Changelog ==
    5252
     53= 1.1.2 - September 12, 2022 =
     54* Send correct order id to Sprinque
     55* Hide validation error until search return company address
     56* Fixed translation
     57
    5358= 1.1.1 - September 6, 2022 =
    5459* Replaced $order->ID with $order->get_id()

  • sprinque/trunk/sprinque.php

    r2780759 r2789478  
    55Description: Sprinque for WordPress is a plugin that allows you to offer your business buyers net payment terms (15, 30, 60, 90 days) and thereby grow conversion and retention.
    66Author: Sprinque
    7 Version: 1.1.1
     7Version: 1.1.2
    88Text Domain: sprinque
    99Domain Path: /languages
    … …  
    267267    public function send_capture_authorized_order( $order_id ) {
    268268        $order = wc_get_order( $order_id );
    269 
    270         $settings = get_option( 'woocommerce_wpm_srinque_pay_settings', true );
     269        $order_id_from_sequential_plugin = $order->get_order_number();
     270
     271        $settings = get_option( 'woocommerce_wpm_srinque_pay_settings', true );
    271272
    272273        // Create PDF Link for Invoice
    … …  
    292293        // Prepare Data to Send
    293294        $data = [
     295            'merchant_order_id' => $order_id_from_sequential_plugin ?: $order_id,
    294296            'invoice'  => [
    295297                'merchant_invoice_id' => $order_id,

  • sprinque/trunk/templates/frontend/srinque_pay_modal_form.php

    r2778366 r2789478  
    5050                        <input type="text" id="zip_company_pay" class="required-input" value="<?php if(isset($billing_postcode)) { echo esc_attr($billing_postcode); } ?>">
    5151                    </div>
    52                     <div class="error-register-fields" style="display: none"><?php _e( "Not all fields filled on Billing or Modal", 'sprinque' ); ?></div>
     52                    <div class="error-register-fields" style="display: none">
     53                        <?php
     54                        // Here we're showing error
     55                        if (!isset($billing_address_1, $billing_address_2, $billing_city, $billing_postcode)) {
     56                            _e( "Not all fields filled on Billing or Modal", 'sprinque' );
     57                        }
     58                        ?>
     59                    </div>
    5360                    <div class="pagination-btns">
    5461                        <button type="button" class="wpm-btn wpm-btn_outline-primary white_btn_pay to_select_companies"><?php _e( "Previous step", 'sprinque' ); ?></button>
Note: See TracChangeset for help on using the changeset viewer.