Skip to content

Commit

Permalink
release 2.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
kkasowski committed Dec 28, 2016
1 parent 46eff87 commit 88dada2
Show file tree
Hide file tree
Showing 30 changed files with 551 additions and 263 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
## Changelog

* 2.0.7 - 2016.12.28:
* Fix: Downloadable email link.
* Fix: Updating shipping methods in checkout.
* Fix: Order link in my account.
* Fix: Fatal error on product page.
* 2.0.6 - 2016.12.2:
* Fix: Do not allow to add external products to cart.
* Fix: Fix external product url.
Expand Down
2 changes: 1 addition & 1 deletion assets/js/shop/checkout.js

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

2 changes: 1 addition & 1 deletion jigoshop.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* Description: Jigoshop, a WordPress eCommerce plugin that works.
* Author: Jigoshop
* Author URI: http://www.jigoshop.com
* Version: 2.0.6
* Version: 2.0.7
* Requires at least: 4.0
* Tested up to: 4.6.1
* Text Domain: jigoshop
Expand Down
9 changes: 7 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Tags: ecommerce, wordpress ecommerce, store, shop, shopping, cart, checkout, wid
Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XTG9C24KAA7VA

Requires at least: 4.0
Tested up to: 4.6.1
Stable tag: 2.0.6
Tested up to: 4.7
Stable tag: 2.0.7

A feature-packed eCommerce plugin built upon WordPress core functionality ensuring excellent performance and customizability.

Expand Down Expand Up @@ -104,6 +104,11 @@ However, if you want priority, dedicated support from Jigoshop staff, we dp offe

== Changelog ==

= 2.0.7 - 2016.12.28 =
* Fix: Downloadable email link.
* Fix: Updating shipping methods in checkout.
* Fix: Order link in my account.
* Fix: Fatal error on product page.
= 2.0.6 - 2016.12.2 =
* Fix: Do not allow to add external products to cart.
* Fix: Fix external product url.
Expand Down
2 changes: 1 addition & 1 deletion src/Jigoshop/Core.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

class Core
{
const VERSION = '2.0.6';
const VERSION = '2.0.7';
const WIDGET_CACHE = 'jigoshop_widget_cache';
const TERMS = 'jigoshop_term';

Expand Down
3 changes: 1 addition & 2 deletions src/Jigoshop/Core/Types/Product/Downloadable.php
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,7 @@ public function emailLink($result, $item, $order)
{
$product = $item->getProduct();
if ($product instanceof Product\Downloadable && in_array($order->getStatus(), array(Order\Status::COMPLETED, Order\Status::PROCESSING))) {
$url = $this->wp->getHelpers()->addQueryArg(array('file' => $order->getKey().'.'.$order->getId().'.'.$item->getKey(), Api::getUrl(DownloadFile::NAME)));

$url = $this->wp->getHelpers()->addQueryArg(array('file' => $order->getKey().'.'.$order->getId().'.'.$item->getKey()), Api::getUrl(DownloadFile::NAME));
$result .= PHP_EOL.__('Your download link for this file is:', 'jigoshop');
$result .= PHP_EOL.' - '.$url;
}
Expand Down
9 changes: 8 additions & 1 deletion src/Jigoshop/Entity/Product/Variable.php
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,14 @@ public function getAssignedVariableAttributes()
'options' => []
];
}
$attributes[$attribute->getAttribute()->getId()]['options'][$attribute->getValue()] = $attribute->getAttribute()->getOption($attribute->getValue())->getLabel();

if($attribute->getValue()) {
$attributes[$attribute->getAttribute()->getId()]['options'][$attribute->getValue()] = $attribute->getAttribute()->getOption($attribute->getValue())->getLabel();
} else {
foreach($attribute->getAttribute()->getOptions() as $option) {
$attributes[$attribute->getAttribute()->getId()]['options'][$option->getId()] = $option->getLabel();
}
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion templates/user/account/orders.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<?php if ($unpaid): ?>
<a href="<?php echo Order::getPayLink($order); ?>" class="btn btn-success pull-right"><?php _e('Pay', 'jigoshop'); ?></a>
<?php endif; ?>
<a href="<?php echo Api::getEndpointUrl('orders', $order->getId()); ?>" class="btn btn-primary pull-right"><?php _e('View', 'jigoshop'); ?></span></a>
<a href="<?php echo Api::getEndpointUrl('orders', $order->getId(), get_permalink()); ?>" class="btn btn-primary pull-right"><?php _e('View', 'jigoshop'); ?></span></a>
</h4>
<dl class="dl-horizontal list-group-item-text">
<dt><?php _e('Date', 'jigoshop'); ?></dt>
Expand Down
2 changes: 1 addition & 1 deletion vendor/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

require_once __DIR__ . '/composer' . '/autoload_real.php';

return ComposerAutoloaderInit686ddfe1d7d54e7df1ed9e5a204f1480::getLoader();
return ComposerAutoloaderInit0c98a2e8ea41c94cdcaded652ea9cb22::getLoader();
6 changes: 3 additions & 3 deletions vendor/composer/autoload_real.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInit686ddfe1d7d54e7df1ed9e5a204f1480
class ComposerAutoloaderInit0c98a2e8ea41c94cdcaded652ea9cb22
{
private static $loader;

Expand All @@ -19,9 +19,9 @@ public static function getLoader()
return self::$loader;
}

spl_autoload_register(array('ComposerAutoloaderInit686ddfe1d7d54e7df1ed9e5a204f1480', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit0c98a2e8ea41c94cdcaded652ea9cb22', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit686ddfe1d7d54e7df1ed9e5a204f1480', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit0c98a2e8ea41c94cdcaded652ea9cb22', 'loadClassLoader'));

$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
Expand Down
Loading

0 comments on commit 88dada2

Please sign in to comment.