Skip to content

Commit

Permalink
Merge pull request #3 from dingo-d/develop
Browse files Browse the repository at this point in the history
Update version to 1.4
  • Loading branch information
dingo-d authored Feb 27, 2018
2 parents aea7a3e + d6bc60d commit a4e868d
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 deletions.
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
**Requires at least**: 4.4
**Requires PHP**: 5.6
**Tested up to**: 4.9.4
**Stable tag**: 1.3
**Stable tag**: 1.4
**WC requires at least**: 3.0.0
**WC tested up to**: 3.3.3
**License**: GPLv2 or later
Expand Down Expand Up @@ -59,6 +59,12 @@ Be sure you have WooCommerce plugin installed first, otherwise you'll get an err

## Changelog

### 1.4

* Added automatic conversion rate from Croatian National Bank (https://www.hnb.hr/temeljne-funkcije/monetarna-politika/tecajna-lista/tecajna-lista)
* Add a fix for duplicated orders - you can now choose if you want to make SOLO API call on the checkout or when changing order status manually
* Fix for taxes rounding error on shipping

### 1.3

* Add additional debug methods
Expand All @@ -85,6 +91,11 @@ Be sure you have WooCommerce plugin installed first, otherwise you'll get an err

## Additional notes

The 1.4 update fixed a lot of issues with the taxes, and tax rates. Although this has been fixed, the taxes probably wont't be picked up by the SOLO API if you set the option in the WooCommerce to include taxes in the price of the product. This is why you should separate the two. Also when creating a shipping tax class, be sure to create it as aseparate class, and leave the standard tax class for the product. So for instance the product will have a standard tax of 5%, and the shipping can have a separate class with tax rate of 25% (be sure to tick the shipping checkbox in this class).
The including prices will be fixed in the next update.

----

The 1.3 update removed the predefined tax rates from the plugin, and is instead using WooCommerce taxes.
This means that you can have different tax for the item, and different for the shipping. Word of caution though, the Croatian law has predefined taxes of 0, 5, 13 or 25%. So in case you put the tax for the item and shipping anything other than that, the tax rate will be sent as 0 - so that your SOLO invoice or offer will pass, but with 0 tax rate.

Expand Down
12 changes: 11 additions & 1 deletion README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Tags: woocommerce, api, solo api, solo, api integration, shop, payment, woo
Requires at least: 4.4
Requires PHP: 5.6
Tested up to: 4.9.4
Stable tag: 1.3
Stable tag: 1.4
WC requires at least: 3.0.0
WC tested up to: 3.3.3
License: GPLv2 or later
Expand Down Expand Up @@ -65,6 +65,11 @@ Be sure you have WooCommerce plugin installed first, otherwise you'll get an err

== Changelog ==

= 1.4 =
* Added automatic conversion rate from Croatian National Bank (https://www.hnb.hr/temeljne-funkcije/monetarna-politika/tecajna-lista/tecajna-lista)
* Add a fix for duplicated orders - you can now choose if you want to make SOLO API call on the checkout or when changing order status manually
* Fix for taxes rounding error on shipping

= 1.3 =
* Add additional debug methods
* Code sniffer fixes
Expand All @@ -90,6 +95,11 @@ Be sure you have WooCommerce plugin installed first, otherwise you'll get an err

== Additional notes ==

The 1.4 update fixed a lot of issues with the taxes, and tax rates. Although this has been fixed, the taxes probably wont't be picked up by the SOLO API if you set the option in the WooCommerce to include taxes in the price of the product. This is why you should separate the two. Also when creating a shipping tax class, be sure to create it as aseparate class, and leave the standard tax class for the product. So for instance the product will have a standard tax of 5%, and the shipping can have a separate class with tax rate of 25% (be sure to tick the shipping checkbox in this class).
The including prices will be fixed in the next update.

----

The 1.3 update removed the predefined tax rates from the plugin, and is instead using WooCommerce taxes.
This means that you can have different tax for the item, and different for the shipping. Word of caution though, the Croatian law has predefined taxes of 0, 5, 13 or 25%. So in case you put the tax for the item and shipping anything other than that, the tax rate will be sent as 0 - so that your SOLO invoice or offer will pass, but with 0 tax rate.

Expand Down
2 changes: 1 addition & 1 deletion includes/class-woo-solo-api.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function __construct() {
if ( defined( 'SAWI_PLUGIN_VERSION' ) ) {
$this->version = SAWI_PLUGIN_VERSION;
} else {
$this->version = '1.3';
$this->version = '1.4';
}

if ( defined( 'SAWI_PLUGIN_NAME' ) ) {
Expand Down
4 changes: 2 additions & 2 deletions woo-solo-api.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Plugin Name: Woo Solo Api
* Plugin URI: https://madebydenis.com/woo-solo-api
* Description: This plugin provides integration of the SOLO API service with WooCommerce.
* Version: 1.3
* Version: 1.4
* Author: Denis Žoljom
* Author URI: https://madebydenis.com
* License: GPL-2.0+
Expand All @@ -30,7 +30,7 @@
die;
}

define( 'SAWI_PLUGIN_VERSION', '1.3' );
define( 'SAWI_PLUGIN_VERSION', '1.4' );
define( 'SAWI_PLUGIN_NAME', 'woo-solo-api' );

// Include the autoloader so we can dynamically include the rest of the classes.
Expand Down

0 comments on commit a4e868d

Please sign in to comment.