Skip to content

Commit

Permalink
Merge branch 'release/7.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
bporcelli committed Nov 2, 2022
2 parents 8251edc + e0facca commit 33faf58
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 14 deletions.
8 changes: 8 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ Changelog for Simple Sales Tax

Format based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

= [7.0.3] - 2022-11-02 =

Fixed:
- Order exemption certificates by created date in certificate table

Changed:
- Bump tested WooCommerce version to 7.1

= [7.0.2] - 2022-10-14 =

Fixed:
Expand Down
3 changes: 2 additions & 1 deletion cypress/e2e/frontend/coupon-calculations.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ describe('Coupon calculations', () => {

cy.addProductToCart('General Product');
cy.visit('/cart/');
removeCoupon();

cy.get('.shipping-calculator-button').click();
cy.get('#calc_shipping_state').select('NY', {force: true});
Expand All @@ -34,7 +35,7 @@ describe('Coupon calculations', () => {
cy.waitForBlockedElements();
});

beforeEach(() => {
afterEach(() => {
removeCoupon();
});

Expand Down
10 changes: 5 additions & 5 deletions cypress/e2e/rest/create-order.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ describe('REST API order calculations', () => {
};

// Clear out any auth cookies to avoid 401s.
cy.clearCookies();

cy.request(requestOptions).then((response) => {
expect(response.status).to.eq(201);
expect(parseFloat(response.body.total_tax)).to.be.gt(0);
cy.clearCookies().then(() => {
cy.request(requestOptions).then((response) => {
expect(response.status).to.eq(201);
expect(parseFloat(response.body.total_tax)).to.be.gt(0);
});
});
});
});
2 changes: 1 addition & 1 deletion includes/class-simplesalestax.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ final class SimpleSalesTax {
*
* @var string
*/
public $version = '7.0.2';
public $version = '7.0.3';

/**
* The singleton plugin instance.
Expand Down
10 changes: 10 additions & 0 deletions includes/class-sst-certificates.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,16 @@ public static function get_certificates_formatted( $user_id = 0 ) {
$certificates[ $id ] = self::format_certificate( $raw_cert );
}

// Sort by created date ascending.
uasort( $certificates, function( $cert_a, $cert_b ) {
$date_a = $cert_a['CreatedDate'];
$date_b = $cert_b['CreatedDate'];
if ( $date_a === $date_b ) {
return 0;
}
return $date_a < $date_b ? -1 : 1;
} );

return $certificates;
}

Expand Down
4 changes: 2 additions & 2 deletions languages/simple-sales-tax.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# This file is distributed under the same license as the Simple Sales Tax package.
msgid ""
msgstr ""
"Project-Id-Version: Simple Sales Tax 7.0.2\n"
"Project-Id-Version: Simple Sales Tax 7.0.3\n"
"Report-Msgid-Bugs-To: https://github.com/bporcelli/simplesalestax/issues\n"
"POT-Creation-Date: 2022-10-14 15:29:54+00:00\n"
"POT-Creation-Date: 2022-11-02 14:20:28+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simplesalestax",
"version": "7.0.2",
"version": "7.0.3",
"description": "A TaxCloud integration for WooCommerce.",
"scripts": {
"build": "grunt",
Expand Down
2 changes: 1 addition & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributors: taxcloud, bporcelli
Tags: woocommerce, taxcloud, tax, taxes, sales tax, tax calculation, sales tax compliance, sales tax filing, sales tax reporting
Requires at least: 4.5
Tested up to: 6.1
Stable tag: 7.0.2
Stable tag: 7.0.3
Requires PHP: 5.5
License: GPLv2 or later
License URI: https://www.gnu.org/licenses/gpl-2.0.html
Expand Down
4 changes: 2 additions & 2 deletions simple-sales-tax.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
* Author: TaxCloud
* Author URI: https://taxcloud.com
* GitHub Plugin URI: https://github.com/bporcelli/simplesalestax
* Version: 7.0.2
* Version: 7.0.3
* Text Domain: simple-sales-tax
* Domain Path: /languages/
*
* Requires at least: 4.5.0
* Tested up to: 6.1.0
* WC requires at least: 3.0.0
* WC tested up to: 7.0.0
* WC tested up to: 7.1.0
*
* @category Plugin
* @copyright Copyright © 2022 The Federal Tax Authority, LLC
Expand Down

0 comments on commit 33faf58

Please # to comment.