WordPress.org

Plugin Directory

Changeset 1688474


Ignore:
Timestamp:
06/30/17 18:46:07 (7 weeks ago)
Author:
dancameron
Message:

Deploy version 14.0.5

Location:
sprout-invoices
Files:
598 added
1 deleted
8 edited

Legend:

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

    r1678783 r1688474  
    3333     * Current version. Should match sprout-invoices.php plugin version. 
    3434     */ 
    35     const SI_VERSION = '14.0.4'; 
     35    const SI_VERSION = '14.0.5'; 
    3636    /** 
    3737     * DB Version 
  • sprout-invoices/trunk/changelog.txt

    r1678783 r1688474  
     1= 14.0.5 = 
     2 
     3* FIX: Firefox support 
     4* UPDATE: EU Region name update 
     5* FIX: HTML Notifications add-on conflict with Test Notifications 
     6* FEATURE: CA GST Report Support 
     7 
    18= 14.0.4 = 
    29 
  • sprout-invoices/trunk/controllers/_Controller.php

    r1613648 r1688474  
    7676            return $query; 
    7777        } 
    78         if ( is_single() ) { 
     78        if ( $query->is_single() ) { 
    7979            return $query; 
    8080        } 
  • sprout-invoices/trunk/controllers/i18n/Countries_States.php

    r1266169 r1688474  
    395395        'Shropshire' => 'Shropshire', 
    396396        'Somerset' => 'Somerset', 
    397         'South Glamorgan' => 'South Glamorgan', 
     397        'South Glamorgan' => 'Vale of Glamorgan', 
    398398        'South Yorkshire' => 'South Yorkshire', 
    399399        'Staffordshire' => 'Staffordshire', 
     
    546546            'Shropshire' => 'Shropshire', 
    547547            'Somerset' => 'Somerset', 
    548             'South Glamorgan' => 'South Glamorgan', 
     548            'South Glamorgan' => 'Vale of Glamorgan', 
    549549            'South Yorkshire' => 'South Yorkshire', 
    550550            'Staffordshire' => 'Staffordshire', 
     
    595595        return $countries; 
    596596    } 
    597  
    598597} 
  • sprout-invoices/trunk/controllers/notifications/Notifications_Test.php

    r1678783 r1688474  
    3838        $settings = array( 
    3939            'html_notifications' => array( 
    40                 'weight' => 30.1, 
     40                'weight' => 30.2, 
    4141                'tab' => 'settings', 
    4242                'settings' => array( 
    43                     'load_html_templates' => array( 
     43                    'test_notifications' => array( 
    4444                        'label' => __( 'Test Notification', 'sprout-invoices' ), 
    4545                        'option' => array( 
  • sprout-invoices/trunk/readme.txt

    r1678783 r1688474  
    55Requires at least: 3.8 
    66Tested up to: 4.8 
    7 Stable tag: 14.0.4 
     7Stable tag: 14.0.5 
    88License: GPLv2 or later 
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html 
     
    142142 
    143143== Changelog == 
     144 
     145= 14.0.5 = 
     146 
     147* FIX: Firefox support 
     148* UPDATE: EU Region name update 
     149* FIX: HTML Notifications add-on conflict with Test Notifications 
     150* FEATURE: CA GST Report Support 
    144151 
    145152= 14.0.4 = 
  • sprout-invoices/trunk/sprout-invoices.php

    r1678783 r1688474  
    33/** 
    44 * @package Sprout_Invoices 
    5  * @version 14.0.4 
     5 * @version 14.0.5 
    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: 14.0.4 
     13 * Version: 14.0.5 
    1414 * Author URI: https://sproutapps.co 
    1515 * Text Domain: sprout-invoices 
  • sprout-invoices/trunk/views/admin/reports/premium/invoices.php

    r1550009 r1688474  
    2626                    <th><?php _e( 'Paid', 'sprout-invoices' ) ?></th> 
    2727                    <th><?php _e( 'Tax', 'sprout-invoices' ) ?></th> 
     28                    <?php if ( apply_filters( 'si_show_gst_in_reports', class_exists( 'SI_Hearts_Canada' ) ) ) :  ?> 
     29                        <th><?php _e( 'GST', 'sprout-invoices' ) ?></th> 
     30                    <?php endif ?> 
    2831                    <th><?php _e( 'Balance', 'sprout-invoices' ) ?></th> 
    2932                </tr> 
     
    3437                    $table_total_paid = 0; 
    3538                    $table_total_tax = 0; 
     39                    $table_gst_total_tax = 0; 
    3640                    $table_total_balance = 0; 
    3741 
     
    6973                        $table_total_tax += si_get_invoice_taxes_total(); 
    7074                        $table_total_balance += si_get_invoice_balance(); 
    71                         $client_name = ( si_get_invoice_client_id() ) ? sprintf( '<a href="%s">%s</a>', get_edit_post_link( si_get_invoice_client_id() ), get_the_title( si_get_invoice_client_id() ) ) : __( 'N/A', 'sprout-invoices' ); ?> 
     75                        $client_name = ( si_get_invoice_client_id() ) ? sprintf( '<a href="%s">%s</a>', get_edit_post_link( si_get_invoice_client_id() ), get_the_title( si_get_invoice_client_id() ) ) : __( 'N/A', 'sprout-invoices' ); 
     76 
     77                        if ( apply_filters( 'si_show_gst_in_reports', class_exists( 'SI_Hearts_Canada' ) ) ) { 
     78                            $gst_for_line_item = 0; 
     79                            $line_items = si_get_doc_line_items(); 
     80                            if ( ! empty( $line_items ) ) { 
     81                                foreach ( $line_items as $position => $data ) { 
     82                                    if ( isset( $data['tax_gst'] ) && $data['tax_gst'] ) { 
     83                                        $gst_for_line_item = SI_Hearts_Canada::calculate_tax( $data, 'tax_gst' ); 
     84                                        $table_gst_total_tax += $gst_for_line_item; 
     85                                    } 
     86                                } 
     87                            } 
     88                        } ?> 
    7289                        <tr>  
    7390                            <td><?php echo si_get_invoice_id( get_the_id() ) ?></td> 
     
    7996                            <td><?php si_invoice_payments_total() ?></td> 
    8097                            <td><?php sa_formatted_money( si_get_invoice_taxes_total() ) ?></td> 
     98                            <?php if ( apply_filters( 'si_show_gst_in_reports', class_exists( 'SI_Hearts_Canada' ) ) ) :  ?> 
     99                                <th><?php sa_formatted_money( $gst_for_line_item ) ?></th> 
     100                            <?php endif ?> 
    81101                            <td><?php si_invoice_balance() ?></td> 
    82102                        </tr> 
     
    95115                    <th><span id="footer_total_paid"></span>&nbsp;<?php printf( __( '(of %s)', 'sprout-invoices' ), sa_get_formatted_money( $table_total_paid ) ) ?></th> 
    96116                    <th><span id="footer_total_tax"></span>&nbsp;<?php printf( __( '(of %s)', 'sprout-invoices' ), sa_get_formatted_money( $table_total_tax ) ) ?></th> 
     117                    <?php if ( apply_filters( 'si_show_gst_in_reports', class_exists( 'SI_Hearts_Canada' ) ) ) :  ?> 
     118                        <th><span id="footer_total_tax"></span>&nbsp;<?php printf( __( '(of %s)', 'sprout-invoices' ), sa_get_formatted_money( $table_gst_total_tax ) ) ?></th> 
     119                    <?php endif ?> 
    97120                    <th><span id="footer_total_balance"></span>&nbsp;<?php printf( __( '(of %s)', 'sprout-invoices' ), sa_get_formatted_money( $table_total_balance ) ) ?></th> 
    98121                </tr> 
Note: See TracChangeset for help on using the changeset viewer.