Skip to content

Commit

Permalink
20.3.0 SHQ16-2938 option to not modify carrier, SHQ16-2434 add IP to …
Browse files Browse the repository at this point in the history
…request, SHQ16-2489 handle empty street
  • Loading branch information
wsajason committed Dec 20, 2017
1 parent e524b13 commit cd6f9a9
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 11 deletions.
17 changes: 12 additions & 5 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
# Change Log

## [20.0.15](https://github.com/webshopapps/library-ws/tree/20.0.15) (2017-05-09)
[Full Changelog](https://github.com/webshopapps/library-ws/compare/20.1.0...20.0.15)
## [20.3.0](https://github.com/webshopapps/library-ws/tree/20.3.0) (2017-12-19)
[Full Changelog](https://github.com/webshopapps/library-ws/compare/20.0.15...20.3.0)

## [20.1.0](https://github.com/webshopapps/library-ws/tree/20.1.0) (2017-05-09)
[Full Changelog](https://github.com/webshopapps/library-ws/compare/20.2.0...20.1.0)
**Merged pull requests:**

- SHQ16-2434 add IP address to site details in request [\#7](https://github.com/webshopapps/library-ws/pull/7) ([wsagen](https://github.com/wsagen))

## [20.0.15](https://github.com/webshopapps/library-ws/tree/20.0.15) (2017-05-09)
[Full Changelog](https://github.com/webshopapps/library-ws/compare/20.2.0...20.0.15)

## [20.2.0](https://github.com/webshopapps/library-ws/tree/20.2.0) (2017-05-09)
[Full Changelog](https://github.com/webshopapps/library-ws/compare/20.0.18...20.2.0)
[Full Changelog](https://github.com/webshopapps/library-ws/compare/20.1.0...20.2.0)

## [20.1.0](https://github.com/webshopapps/library-ws/tree/20.1.0) (2017-05-09)
[Full Changelog](https://github.com/webshopapps/library-ws/compare/20.0.18...20.1.0)

## [20.0.18](https://github.com/webshopapps/library-ws/tree/20.0.18) (2017-05-09)
[Full Changelog](https://github.com/webshopapps/library-ws/compare/20.0.17...20.0.18)
Expand Down
35 changes: 29 additions & 6 deletions src/Shared/SiteDetails.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,29 +41,36 @@ class SiteDetails
public $websiteUrl;
public $environmentScope;
public $appVersion;
public $ipAddress;

const LIVE = 'LIVE';
const DEV = 'DEVELOPMENT';
const TEST = 'TEST';
const INTEGRATION = 'INTEGRATION';

/**
* @param null $ecommerceCart
* @param null $ecommerceVersion
* @param null $websiteUrl
*/
/**
* SiteDetails constructor.
* @param $ecommerceCart
* @param $ecommerceVersion
* @param $websiteUrl
* @param $environmentScope
* @param $appVersion
* @param $ipAddress
*/
public function __construct(
$ecommerceCart = null,
$ecommerceVersion = null,
$websiteUrl = null,
$environmentScope = null,
$appVersion = null
$appVersion = null,
$ipAddress = null
) {
$this->ecommerceCart = $ecommerceCart;
$this->ecommerceVersion = $ecommerceVersion;
$this->websiteUrl = $websiteUrl;
$this->environmentScope = $environmentScope;
$this->appVersion = $appVersion;
$this->ipAddress = $ipAddress;
}

/**
Expand Down Expand Up @@ -133,4 +140,20 @@ public function getAppVersion()
{
return $this->appVersion;
}

/**
* @return null
*/
public function getIpAddress()
{
return $this->ipAddress;
}

/**
* @param null $ipAddress
*/
public function setIpAddress($ipAddress)
{
$this->ipAddress = $ipAddress;
}
}

2 comments on commit cd6f9a9

@samtroll
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit breaks compatibility with dev-api.shipperhq.com as it does not recognise the ipAddress-field.

@wsajason
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @samtroll
We will be updating the dev API - we don't have a specific timescale for this as yet - but in the meantime you can comment out the instance variable for ipAddress around line 44, and the associated getter and setter methods in library-ws/src/Shared/SiteDetails.php

Please sign in to comment.