release 2.1.6.1

jigoshop · Sep 21, 2017 · 2a6fe72 · 2a6fe72
1 parent c8caaca
commit 2a6fe72
Show file tree

Hide file tree

Showing 21 changed files with 177 additions and 60 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Changelog
-* 2.1.6 - 2017.09.29:
+* 2.1.6.1 - 2017.09.21:
+    * Fix: Added BN code to paypal plugin.
+* 2.1.6 - 2017.09.20:
     * New: Cron.
     * New: Ability to sort option in attributes.
     * New: Setup wizard.

diff --git a/assets/js/vendors/blueimp.js b/assets/js/vendors/blueimp.js
diff --git a/assets/js/vendors/flot.js b/assets/js/vendors/flot.js
diff --git a/jigoshop.php b/jigoshop.php
@@ -20,7 +20,7 @@
  * Description:         Jigoshop, a WordPress eCommerce plugin that works.
  * Author:              Jigo Ltd
  * Author URI:          http://www.jigoshop.com
- * Version:             2.1.6
+ * Version:             2.1.6.1
  * Requires at least:   4.0
  * Tested up to:        4.8.2
  * Text Domain:         jigoshop

diff --git a/readme.txt b/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.8.2
-Stable tag: 2.1.6
+Stable tag: 2.1.6.1
 
 A feature-packed eCommerce plugin built upon WordPress core functionality ensuring excellent performance, customizability and control - robust Tax Settings, Stock Level Management, Free and Premium Extensions - you name it.
 
@@ -151,7 +151,9 @@ However, if you want priority, dedicated support from Jigoshop staff, we dp offe
 
 == Changelog ==
 
-= 2.1.6 - 2017.09.29 =
+= 2.1.6.1 - 2017.09.21 =
+* Fix: Added BN code to paypal plugin.
+= 2.1.6 - 2017.09.20 =
 * New: Cron.
 * New: Ability to sort option in attributes.
 * New: Setup wizard.

diff --git a/src/Jigoshop/Admin.php b/src/Jigoshop/Admin.php
@@ -167,7 +167,7 @@ public function initDashboards()
         $dashboards = $di->tags->get('jigoshop.admin.dashboard');
         foreach ($dashboards as $dashboard) {
             $class = $di->getServices()->getClassName($dashboard);
-            if($class::SLUG == $_GET['page']) {
+            if(isset($_GET['page']) && $class::SLUG == $_GET['page']) {
                 $dashboard = $di->get($dashboard);
                 add_dashboard_page($dashboard->getTitle(), $dashboard->getTitle(), $dashboard->getCapability(), $dashboard->getMenuSlug());
             }

diff --git a/src/Jigoshop/Core.php b/src/Jigoshop/Core.php
@@ -13,7 +13,7 @@
 
 class Core
 {
-	const VERSION = '2.1.6';
+	const VERSION = '2.1.6.1';
 	const WIDGET_CACHE = 'jigoshop_widget_cache';
 	const TERMS = 'jigoshop_term';
 

diff --git a/src/Jigoshop/Payment/PayPal.php b/src/Jigoshop/Payment/PayPal.php
@@ -292,7 +292,7 @@ public function process($order)
 				'invoice' => $order->getNumber(),
 				'amount' => number_format($order->getTotal(), $this->options->get('general.currency_decimals'), '.', ''),
 				//BN code
-				//'bn' => 'Jigoshop_SP'
+				'bn' => 'JigoLtd_SP'
             ],
 			$phone
 		);

diff --git a/templates/admin/settings/api_users.php b/templates/admin/settings/api_users.php
@@ -15,7 +15,7 @@
                         'name' => $name,
                         'login' => $keyData['login'],
                         'password' => $keyData['password'],
-                        'permissions' => $keyData['permissions'],
+                        'permissions' => isset($keyData['permissions'])?$keyData['permissions']:[],
                         'availablePermissions' => $availablePermissions,
                         'active' => false
                     ]); ?>

diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit9b2ec68055a1d0baa1bf211932c619d4::getLoader();
+return ComposerAutoloaderInitdb47ed9076a8f6aaab5b8e23d72cb895::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit9b2ec68055a1d0baa1bf211932c619d4
+class ComposerAutoloaderInitdb47ed9076a8f6aaab5b8e23d72cb895
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit9b2ec68055a1d0baa1bf211932c619d4', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitdb47ed9076a8f6aaab5b8e23d72cb895', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit9b2ec68055a1d0baa1bf211932c619d4', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitdb47ed9076a8f6aaab5b8e23d72cb895', 'loadClassLoader'));
 
         $map = require __DIR__ . '/autoload_namespaces.php';
         foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@ public static function getLoader()
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire9b2ec68055a1d0baa1bf211932c619d4($fileIdentifier, $file);
+            composerRequiredb47ed9076a8f6aaab5b8e23d72cb895($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire9b2ec68055a1d0baa1bf211932c619d4($fileIdentifier, $file)
+function composerRequiredb47ed9076a8f6aaab5b8e23d72cb895($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -512,23 +512,23 @@
         "source": {
             "type": "git",
             "url": "https://github.com/spatie/array-to-xml.git",
-            "reference": "ceff2641c6f700926bee759647811877f626e994"
+            "reference": "abea6694036ab2d818ceb5c80485a24833a0f9cc"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/ceff2641c6f700926bee759647811877f626e994",
-            "reference": "ceff2641c6f700926bee759647811877f626e994",
+            "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/abea6694036ab2d818ceb5c80485a24833a0f9cc",
+            "reference": "abea6694036ab2d818ceb5c80485a24833a0f9cc",
             "shasum": ""
         },
         "require": {
             "php": "^7.0"
         },
         "require-dev": {
             "mockery/mockery": "0.9.*",
-            "phpunit/phpunit": "^5.7",
-            "spatie/phpunit-snapshot-assertions": "^0.4.1"
+            "phpunit/phpunit": "^6.3",
+            "spatie/phpunit-snapshot-assertions": "^1.0"
         },
-        "time": "2017-08-03 09:23:45",
+        "time": "2017-09-07 17:44:43",
         "type": "library",
         "installation-source": "source",
         "autoload": {
@@ -744,12 +744,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/silexphp/Pimple.git",
-            "reference": "b734609e7928349247a1217c5461c8d41e898d2c"
+            "reference": "b5e5c1809fc323428715aa6a66ddca180e0adc0f"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/silexphp/Pimple/zipball/b734609e7928349247a1217c5461c8d41e898d2c",
-            "reference": "b734609e7928349247a1217c5461c8d41e898d2c",
+            "url": "https://api.github.com/repos/silexphp/Pimple/zipball/b5e5c1809fc323428715aa6a66ddca180e0adc0f",
+            "reference": "b5e5c1809fc323428715aa6a66ddca180e0adc0f",
             "shasum": ""
         },
         "require": {
@@ -759,7 +759,7 @@
         "require-dev": {
             "symfony/phpunit-bridge": "^3.2"
         },
-        "time": "2017-07-23 07:32:49",
+        "time": "2017-08-23 11:42:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -974,12 +974,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/tuupola/slim-basic-auth.git",
-            "reference": "bf24cc029d21d7dc7277a2fad2adf7fd3c91d9da"
+            "reference": "c019be31beadd3b0bd2a2c7d4069e205e1883bd1"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/tuupola/slim-basic-auth/zipball/bf24cc029d21d7dc7277a2fad2adf7fd3c91d9da",
-            "reference": "bf24cc029d21d7dc7277a2fad2adf7fd3c91d9da",
+            "url": "https://api.github.com/repos/tuupola/slim-basic-auth/zipball/c019be31beadd3b0bd2a2c7d4069e205e1883bd1",
+            "reference": "c019be31beadd3b0bd2a2c7d4069e205e1883bd1",
             "shasum": ""
         },
         "require": {
@@ -992,7 +992,7 @@
             "squizlabs/php_codesniffer": "^2.3",
             "zendframework/zend-diactoros": "^1.3"
         },
-        "time": "2017-08-20 18:40:25",
+        "time": "2017-09-19 12:50:35",
         "type": "library",
         "installation-source": "source",
         "autoload": {

diff --git a/vendor/pimple/pimple/README.rst b/vendor/pimple/pimple/README.rst
@@ -108,7 +108,7 @@ If you change the ``session_storage`` service definition like below:
     };
 
 You can now easily change the cookie name by overriding the
-``session_storage_class`` parameter instead of redefining the service
+``cookie_name`` parameter instead of redefining the service
 definition.
 
 Protecting Parameters

diff --git a/vendor/spatie/array-to-xml/CHANGELOG.md b/vendor/spatie/array-to-xml/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to `array-to-xml` will be documented in this file
 
+## 2.7.0 - 2017-09-07
+- allow wrapping data in a CDATA section
+
+## 2.6.1- 2017-08-29
+- add fix for multiple empty/self-closing child elements
+
+## 2.6.0 - 2017-08-25
+- add support for naming a root element and adding properties to it
+
 ## 2.5.2 - 2017-08-03
 - avoid pulling in the snapshot package on install
 

diff --git a/vendor/spatie/array-to-xml/LICENSE.md b/vendor/spatie/array-to-xml/LICENSE.md
@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-Copyright (c) 2017 Spatie bvba <[email protected]>
+Copyright (c) Spatie bvba <[email protected]>
 
 > Permission is hereby granted, free of charge, to any person obtaining a copy
 > of this software and associated documentation files (the "Software"), to deal

diff --git a/vendor/spatie/array-to-xml/README.md b/vendor/spatie/array-to-xml/README.md
@@ -105,8 +105,55 @@ This code will result in:
 </root>
 ```
 
+It is also possible to wrap the value of a node into a CDATA section. This allows you to use reserved characters.
+
+```php
+$array = [
+    'Good guy' => [
+        'name' => [
+            '_cdata' => '<h1>Luke Skywalker</h1>'
+        ],
+        'weapon' => 'Lightsaber'
+    ],
+    'Bad guy' => [
+        'name' => '<h1>Sauron</h1>',
+        'weapon' => 'Evil Eye'
+    ]
+];
+
+$result = ArrayToXml::convert($array);
+```
+
+This code will result in:
+
+```xml
+<?xml version="1.0"?>
+<root>
+    <Good_guy>
+        <name><![CDATA[<h1>Luke Skywalker</h1>]]></name>
+        <weapon>Lightsaber</weapon>
+    </Good_guy>
+    <Bad_guy>
+        <name>&lt;h1&gt;Sauron&lt;/h1&gt;</name>
+        <weapon>Evil Eye</weapon>
+    </Bad_guy>
+</root>
+```
+
 If your input contains something that cannot be parsed a `DOMException` will be thrown.
 
+To add attributes to the root element provide an array with an `_attributes` key as the second argument. 
+The root element name can then be set using the `rootElementName` key.
+
+```php
+$result = ArrayToXml::convert($array, [
+    'rootElementName' => 'helloyouluckpeople',
+    '_attributes' => [
+        'xmlns' => 'https://github.com/spatie/array-to-xml',
+    ],
+]);
+```
+
 ## Testing
 
 ```bash

diff --git a/vendor/spatie/array-to-xml/composer.json b/vendor/spatie/array-to-xml/composer.json
@@ -20,9 +20,9 @@
         "php" : "^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit" : "^5.7",
+        "phpunit/phpunit" : "^6.3",
         "mockery/mockery": "0.9.*",
-        "spatie/phpunit-snapshot-assertions": "^0.4.1"
+        "spatie/phpunit-snapshot-assertions": "^1.0"
     },
     "autoload": {
         "psr-4": {