Skip to content

Commit

Permalink
Merge pull request #29 from wuunder/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
TimD90 authored Oct 1, 2019
2 parents 6629e5f + accf0eb commit ef5c7b3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).

## Released

## [2.7.5](https://github.com/kabisa/wuunder-webshopplugin-woocommerce/tag/2.7.4) - 2019-09-30

### Fixed
- Parcelshop locator wuunder production settings


## [2.7.4](https://github.com/kabisa/wuunder-webshopplugin-woocommerce/tag/2.7.4) - 2019-09-27

### Added
Expand Down
6 changes: 2 additions & 4 deletions includes/parcelshop.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
function wcwp_parcelShopLocator()
{
include_once( 'wcwuunder-shipping-method.php' );
// error_reporting(E_ALL);
// ini_set('display_errors', 1);
$status = get_option( 'wc_wuunder_api_status' );
$apiKey = ( 'productie' == $status ? get_option( 'wc_wuunder_api' ) : get_option( 'wc_wuunder_test_api' ) );

Expand All @@ -18,7 +16,7 @@ function wcwp_parcelShopLocator()
$shipping_address .= ( ! empty(WC()->customer->get_shipping_country() ) ? WC()->customer->get_shipping_country() . ' ' : '' );
}

$connector = new Wuunder\Connector( $apiKey );
$connector = new Wuunder\Connector( $apiKey, $status == 'productie' ? false : true);
$connector->setLanguage( 'NL' );
$parcelshopsRequest = $connector->getParcelshopsByAddress();
$parcelshopsConfig = new \Wuunder\Api\Config\ParcelshopsConfig();
Expand Down Expand Up @@ -67,7 +65,7 @@ function wcwp_getParcelshopAddress() {
$status = get_option('wc_wuunder_api_status');
$apiKey = ($status == 'productie' ? get_option('wc_wuunder_api') : get_option('wc_wuunder_test_api'));

$connector = new Wuunder\Connector($apiKey);
$connector = new Wuunder\Connector($apiKey, $status == 'productie' ? false : true);
$connector->setLanguage("NL");
$parcelshopRequest = $connector->getParcelshopById();
$parcelshopConfig = new \Wuunder\Api\Config\ParcelshopConfig();
Expand Down
4 changes: 2 additions & 2 deletions woocommerce-wuunder.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: WooCommerce Wuunder
* Plugin URI: https://wearewuunder.com/wuunder-voor-webshops/
* Description: Wuunder shipping plugin
* Version: 2.7.4
* Version: 2.7.5
* Author: Wuunder
* Author URI: http://wearewuunder.com
*/
Expand Down Expand Up @@ -57,7 +57,7 @@ class Woocommerce_Wuunder {
public static $plugin_path;
public static $plugin_basename;

const VERSION = '2.7.4';
const VERSION = '2.7.5';

public function __construct() {

Expand Down

0 comments on commit ef5c7b3

Please sign in to comment.