release 2.0.4.1

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## Changelog
 
+* 2.0.4.1 - 2016.11.23:
+    * Fix: Tax calculation.
 * 2.0.4 - 2016.11.23:
     * Fix: Display dates in dashboard report chart.
     * Fix: Allow to recalculate taxes for existing order.

jigoshop.php

@@ -20,7 +20,7 @@
  * Description:         Jigoshop, a WordPress eCommerce plugin that works.
  * Author:              Jigoshop
  * Author URI:          http://www.jigoshop.com
- * Version:             2.0.4
+ * Version:             2.0.4.1
  * Requires at least:   4.0
  * Tested up to:        4.6.1
  * Text Domain:         jigoshop

readme.txt

@@ -5,7 +5,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 
 Requires at least: 4.0
 Tested up to: 4.6.1
-Stable tag: 2.0.4
+Stable tag: 2.0.4.1
 
 A feature-packed eCommerce plugin built upon WordPress core functionality ensuring excellent performance and customizability.
 
@@ -104,6 +104,8 @@ However, if you want priority, dedicated support from Jigoshop staff, we dp offe
 
 == Changelog ==
 
+= 2.0.4.1 - 2016.11.23 =
+* Fix: Tax calculation.
 = 2.0.4 - 2016.11.23 =
 * Fix: Display dates in dashboard report chart.
 * Fix: Allow to recalculate taxes for existing order.

src/Jigoshop/Core.php

@@ -13,7 +13,7 @@
 
 class Core
 {
-	const VERSION = '2.0.4';
+	const VERSION = '2.0.4.1';
 	const WIDGET_CACHE = 'jigoshop_widget_cache';
 	const TERMS = 'jigoshop_term';
 

src/Jigoshop/Factory/Order.php

@@ -252,7 +252,11 @@ public function fill(OrderInterface $order, array $data)
                 $customer->setShippingAddress($this->createAddress($data['shipping_address']));
             }
 
+            $order->setCustomer($data['customer']);
+            unset($data['customer']);
         }
+        /** @var OrderInterface $order */
+        $order = $this->wp->applyFilters('jigoshop\factory\order\fetch\after_customer', $order);
 
         if (isset($data['items'])) {
             $order->removeItems();
@@ -271,8 +275,7 @@ public function fill(OrderInterface $order, array $data)
 
         $order->restoreState($data);
 
-        /** @var OrderInterface $order */
-        $order = $this->wp->applyFilters('jigoshop\factory\order\fetch\after_customer', $order);
+
 
         if ($coupons) {
             $coupons = $this->wp->getHelpers()->maybeUnserialize($coupons);

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit4de7de9d50c47c473a7d437728bdb238::getLoader();
+return ComposerAutoloaderInit27a999c48a1e56921aeb59eabeb0a85d::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit4de7de9d50c47c473a7d437728bdb238
+class ComposerAutoloaderInit27a999c48a1e56921aeb59eabeb0a85d
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit4de7de9d50c47c473a7d437728bdb238', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit27a999c48a1e56921aeb59eabeb0a85d', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit4de7de9d50c47c473a7d437728bdb238', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit27a999c48a1e56921aeb59eabeb0a85d', 'loadClassLoader'));
 
         $map = require __DIR__ . '/autoload_namespaces.php';
         foreach ($map as $namespace => $path) {

vendor/composer/installed.json

@@ -308,12 +308,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/nrk/predis.git",
-            "reference": "6ab10b2b705ea5121f2c1ea87a290f6871c32ebd"
+            "reference": "98ec0cc27efc1efab32b369962f97e29ecc0464a"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/nrk/predis/zipball/6ab10b2b705ea5121f2c1ea87a290f6871c32ebd",
-            "reference": "6ab10b2b705ea5121f2c1ea87a290f6871c32ebd",
+            "url": "https://api.github.com/repos/nrk/predis/zipball/98ec0cc27efc1efab32b369962f97e29ecc0464a",
+            "reference": "98ec0cc27efc1efab32b369962f97e29ecc0464a",
             "shasum": ""
         },
         "require": {
@@ -326,7 +326,7 @@
             "ext-curl": "Allows access to Webdis when paired with phpiredis",
             "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol"
         },
-        "time": "2016-06-18 19:51:10",
+        "time": "2016-11-22 14:32:30",
         "type": "library",
         "installation-source": "source",
         "autoload": {
@@ -408,12 +408,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/PHPSocialNetwork/phpfastcache.git",
-            "reference": "5c8cc0d8f661bafe97c50a794509ed72dee97fab"
+            "reference": "768f69b6b3c0362159050317b78b30af37b5f3d0"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/PHPSocialNetwork/phpfastcache/zipball/5c8cc0d8f661bafe97c50a794509ed72dee97fab",
-            "reference": "5c8cc0d8f661bafe97c50a794509ed72dee97fab",
+            "url": "https://api.github.com/repos/PHPSocialNetwork/phpfastcache/zipball/768f69b6b3c0362159050317b78b30af37b5f3d0",
+            "reference": "768f69b6b3c0362159050317b78b30af37b5f3d0",
             "shasum": ""
         },
         "require": {
@@ -433,7 +433,7 @@
             "ext-redis": "*",
             "ext-sqlite": "*"
         },
-        "time": "2016-11-14 21:56:47",
+        "time": "2016-11-19 20:43:20",
         "type": "library",
         "installation-source": "source",
         "autoload": {

vendor/phpfastcache/phpfastcache/src/phpFastCache/Core/Pool/IO/IOHelperTrait.php

@@ -90,17 +90,16 @@ public function getPath($readonly = false)
                 if (!@file_exists($full_path)) {
                     @mkdir($full_path, $this->setChmodAuto(), true);
                 }else if (!@is_writable($full_path)) {
-                    @chmod($full_path, $this->setChmodAuto());
-                }
-
-                if ($this->config[ 'autoTmpFallback' ] && !@is_writable($full_path)) {
-                    /**
-                     * Switch back to tmp dir
-                     * again if the path is not writable
-                     */
-                    $full_path = $full_path_tmp;
-                    if (!@file_exists($full_path)) {
-                        @mkdir($full_path, $this->setChmodAuto(), true);
+                    if (!@chmod($full_path, $this->setChmodAuto()) && $this->config[ 'autoTmpFallback' ])
+                    {
+                        /**
+                         * Switch back to tmp dir
+                         * again if the path is not writable
+                         */
+                        $full_path = $full_path_tmp;
+                        if (!@file_exists($full_path)) {
+                            @mkdir($full_path, $this->setChmodAuto(), true);
+                        }
                     }
                 }
 

vendor/predis/predis/README.md

@@ -108,7 +108,7 @@ of suitable [options](http://php.net/manual/context.ssl.php) passed via the `ssl
 $client = new Predis\Client([
   'scheme' => 'tls',
   'ssl'    => ['cafile' => 'private.pem', 'verify_peer' => true],
-]
+]);
 
 // Same set of parameters, but using an URI string:
 $client = new Predis\Client('tls://127.0.0.1?ssl[cafile]=private.pem&ssl[verify_peer]=1');

vendor/predis/predis/src/Connection/Aggregate/SentinelReplication.php

@@ -515,8 +515,10 @@ private function getConnectionInternal(CommandInterface $command)
     /**
      * Asserts that the specified connection matches an expected role.
      *
-     * @param NodeConnectionInterface $sentinel Connection to a redis server.
-     * @param string                  $role     Expected role of the server ("master", "slave" or "sentinel").
+     * @param NodeConnectionInterface $connection Connection to a redis server.
+     * @param string                  $role       Expected role of the server ("master", "slave" or "sentinel").
+     *
+     * @throws RoleException
      */
     protected function assertConnectionRole(NodeConnectionInterface $connection, $role)
     {