WordPress.org

Plugin Directory

Changeset 1590354


Ignore:
Timestamp:
02/06/17 23:57:30 (6 months ago)
Author:
dancameron
Message:

Deploy version 12.1

Location:
sprout-invoices
Files:
596 added
13 edited

Legend:

Unmodified
Added
Removed
  • sprout-invoices/trunk/Sprout_Invoices.class.php

    r1578992 r1590354  
    3333     * Current version. Should match sprout-invoices.php plugin version. 
    3434     */ 
    35     const SI_VERSION = '12.0.3'; 
     35    const SI_VERSION = '12.1'; 
    3636    /** 
    3737     * DB Version 
  • sprout-invoices/trunk/changelog.txt

    r1578992 r1590354  
    1 = 12.0.3 = 
     1= 12.1 = 
     2 
     3* NEW: New PO processor 
     4 
     5= 12.0.2 = 
    26 
    37* FIX: Select2 Compat issues with themes and other plugins 
  • sprout-invoices/trunk/controllers/checkout/Checkouts.php

    r1550009 r1590354  
    439439 
    440440        // Messaging 
    441         if ( $invoice->get_balance() < 0.01 ) { 
    442             self::set_message( __( 'Payment Received & Invoice Paid!', 'sprout-invoices' ), self::MESSAGE_STATUS_INFO ); 
     441        if ( $payment->get_status() === SI_Payment::STATUS_PENDING ) { 
     442            if ( $invoice->get_balance() < 0.01 ) { 
     443                self::set_message( __( 'Payment Pending', 'sprout-invoices' ), self::MESSAGE_STATUS_INFO ); 
     444            } else { 
     445                self::set_message( sprintf( __( 'Pending Payment Received. Current Balance: %s', 'sprout-invoices' ), sa_get_formatted_money( $invoice->get_balance() ) ), self::MESSAGE_STATUS_INFO ); 
     446            } 
    443447        } else { 
    444             self::set_message( sprintf( __( 'Partial Payment Received. Current Balance: %s', 'sprout-invoices' ), sa_get_formatted_money( $invoice->get_balance() ) ), self::MESSAGE_STATUS_INFO ); 
     448            if ( $invoice->get_balance() < 0.01 ) { 
     449                self::set_message( __( 'Payment Received & Invoice Paid!', 'sprout-invoices' ), self::MESSAGE_STATUS_INFO ); 
     450            } else { 
     451                self::set_message( sprintf( __( 'Partial Payment Received. Current Balance: %s', 'sprout-invoices' ), sa_get_formatted_money( $invoice->get_balance() ) ), self::MESSAGE_STATUS_INFO ); 
     452            } 
    445453        } 
    446454 
  • sprout-invoices/trunk/controllers/payment-processing/processors/SI_Checks.php

    r1550009 r1590354  
    4141 
    4242    public static function register() { 
    43         self::add_payment_processor( __CLASS__, __( 'Check/PO Payment', 'sprout-invoices' ) ); 
     43        self::add_payment_processor( __CLASS__, __( 'Check (onsite submission)', 'sprout-invoices' ) ); 
    4444    } 
    4545 
    4646    public static function public_name() { 
    47         return __( 'Check/PO', 'sprout-invoices' ); 
     47        return __( 'Check', 'sprout-invoices' ); 
    4848    } 
    4949 
    5050    public static function checkout_options() { 
    5151        $option = array( 
    52             'icons' => array( SI_URL . '/resources/front-end/img/check.png', SI_URL . '/resources/front-end/img/po.png' ), 
     52            'icons' => array( SI_URL . '/resources/front-end/img/check.png' ), 
    5353            'label' => __( 'Check', 'sprout-invoices' ), 
    5454            'cc' => array(), 
     
    116116                'type' => 'text', 
    117117                'weight' => 5, 
    118                 'label' => __( 'Check/PO Number', 'sprout-invoices' ), 
     118                'label' => __( 'Check Number', 'sprout-invoices' ), 
    119119                'attributes' => array( 
    120120                    //'autocomplete' => 'off', 
  • sprout-invoices/trunk/importers/CSV.php

    r1586829 r1590354  
    202202    public static function import_authentication() { 
    203203 
    204         $error = get_option( self::UPLOAD_ERROR_OPTION ); 
     204        $error = get_option( self::UPLOAD_ERROR_OPTION, '' ); 
    205205        if ( '' !== $error ) { 
    206206            delete_option( self::UPLOAD_ERROR_OPTION ); 
  • sprout-invoices/trunk/load.php

    r1550009 r1590354  
    131131    } 
    132132    require_once SI_PATH.'/controllers/payment-processing/processors/SI_Checks.php'; 
     133    require_once SI_PATH.'/controllers/payment-processing/processors/SI_PO.php'; 
    133134    require_once SI_PATH.'/controllers/payment-processing/processors/SI_BACS.php'; 
    134135    require_once SI_PATH.'/controllers/payment-processing/processors/SI_Admin_Payment.php'; 
  • sprout-invoices/trunk/readme.txt

    r1578992 r1590354  
    55Requires at least: 3.8 
    66Tested up to: 4.7 
    7 Stable tag: 12.0.3 
     7Stable tag: 12.1 
    88License: GPLv2 or later 
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html 
     
    126126== Changelog == 
    127127 
    128 = 12.0.3 = 
     128= 12.1 = 
     129 
     130* NEW: New PO processor 
     131* IMPROVED: CSV Importer error messaging 
     132* FIX: CSV importer fix 
     133 
     134= 12.0.2 = 
    129135 
    130136* FIX: Select2 Compat issues with themes and other plugins 
  • sprout-invoices/trunk/resources/admin/js/sprout_invoice.js

    r1370384 r1590354  
    1 jQuery.noConflict(); 
     1var $ = jQuery.noConflict(); 
    22 
    33function si_format_money ( value ) { 
  • sprout-invoices/trunk/resources/front-end/css/sprout-invoices.style.css

    r1550009 r1590354  
    991991#credit_card_checkout_wrap, 
    992992#check_info_checkout_wrap, 
     993#popayment_info_checkout_wrap, 
    993994#bacs_info_checkout_wrap { 
    994995    background-color: #FFF; 
     
    10621063} 
    10631064 
    1064 #checks_fields .required { 
     1065#popayment_fields .required, 
     1066#checks_fields .required, 
     1067#bacs_fields .required  { 
    10651068    display: none; 
    10661069} 
    10671070 
     1071 
     1072#bacs_fields input, 
     1073#bacs_fields textarea, 
     1074#popayment_fields input, 
     1075#popayment_fields textarea, 
    10681076#checks_fields input, 
    10691077#checks_fields textarea { 
     
    10711079} 
    10721080 
     1081#checks_fields input#sa_popayments_mailed, 
    10731082#checks_fields input#sa_checks_mailed { 
    10741083    width: auto; 
     
    10971106} 
    10981107 
    1099 #check_info_checkout_wrap .button-primary { 
     1108#check_info_checkout_wrap .button-primary, 
     1109#popayment_info_checkout_wrap .button-primary, 
     1110#bacs_info_checkout_wrap .button-primary { 
    11001111    float: none; 
    11011112    margin-left: 12em; 
  • sprout-invoices/trunk/resources/front-end/js/sprout-invoices.js

    r1550009 r1590354  
    1 jQuery.noConflict(); 
    2  
     1var $ = jQuery.noConflict(); 
    32jQuery(function($) { 
    43     
     
    5958        $('#check_info_checkout_wrap').slideUp('fast'); 
    6059        $('#bacs_info_checkout_wrap').slideUp('fast'); 
     60        $('#popayment_info_checkout_wrap').slideUp('fast'); 
    6161        $('#credit_card_checkout_wrap').slideDown(); 
    6262    }); 
     
    6666        $('#credit_card_checkout_wrap').slideUp('fast'); 
    6767        $('#bacs_info_checkout_wrap').slideUp('fast'); 
     68        $('#popayment_info_checkout_wrap').slideUp('fast'); 
    6869        $('#check_info_checkout_wrap').slideDown(); 
    6970    }); 
    7071 
    71     jQuery("#doc_actions a.bacs").on('click', function(e) { 
     72    jQuery("#doc_actions a.popayment").on('click', function(e) { 
    7273        e.preventDefault(); 
    7374        $('#credit_card_checkout_wrap').slideUp('fast'); 
    7475        $('#check_info_checkout_wrap').slideUp('fast'); 
     76        $('#bacs_info_checkout_wrap').slideUp('fast'); 
     77        $('#popayment_info_checkout_wrap').slideDown(); 
     78    }); 
     79 
     80    jQuery("#doc_actions a.bacs").on('click', function(e) { 
     81        e.preventDefault(); 
     82        $('#credit_card_checkout_wrap').slideUp('fast'); 
     83        $('#check_info_checkout_wrap').slideUp('fast'); 
     84        $('#popayment_info_checkout_wrap').slideUp('fast'); 
    7585        $('#bacs_info_checkout_wrap').slideDown(); 
    7686    }); 
  • sprout-invoices/trunk/sprout-invoices.php

    r1578992 r1590354  
    33/** 
    44 * @package Sprout_Invoices 
    5  * @version 12.0.3 
     5 * @version 12.1 
    66 */ 
    77 
     
    1111 * Description: App allows for any WordPress site to accept estimates, create invoices and receive invoice payments. Learn more at <a href="https://sproutapps.co">Sprout Apps</a>. 
    1212 * Author: Sprout Apps 
    13  * Version: 12.0.3 
     13 * Version: 12.1 
    1414 * Author URI: https://sproutapps.co 
    1515 * Text Domain: sprout-invoices 
  • sprout-invoices/trunk/views/templates/estimate/estimate.php

    r1550009 r1590354  
    238238    <?php do_action( 'si_document_footer' ) ?> 
    239239    <?php si_footer() ?> 
    240     <!-- Template Version 12 --> 
     240    <?php printf( '<!-- Template Version v%s -->', Sprout_Invoices::SI_VERSION ); ?> 
     241     
    241242</html> 
    242243<?php do_action( 'estimate_viewed' ) ?> 
  • sprout-invoices/trunk/views/templates/invoice/invoice.php

    r1550009 r1590354  
    272272    <?php do_action( 'si_document_footer' ) ?> 
    273273    <?php si_footer() ?> 
    274     <!-- Template Version 12 --> 
     274    <?php printf( '<!-- Template Version v%s -->', Sprout_Invoices::SI_VERSION ); ?> 
    275275</html> 
    276276<?php do_action( 'invoice_viewed' ) ?> 
Note: See TracChangeset for help on using the changeset viewer.