Skip to content

Commit

Permalink
Merge pull request #21 from Fyntasia/develop
Browse files Browse the repository at this point in the history
Namespace update
  • Loading branch information
Fyntasia authored Aug 23, 2018
2 parents e129e0c + cdf998a commit 94d3525
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 56 deletions.
2 changes: 1 addition & 1 deletion EffectConnectSDK/ApiCall.php
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ final public function setMethod($method)
}

/**
* @param \EffectConnectSDK\Core\Abstracts\ApiModel $payload
* @param \EffectConnect\PHPSdk\Core\Abstracts\ApiModel $payload
*
* @return $this
* @throws InvalidPropertyException
Expand Down
2 changes: 1 addition & 1 deletion EffectConnectSDK/Core.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ final public function __call($name, $arguments)
{
try
{
$reflection = new \ReflectionClass('EffectConnectSDK\Core\CallType\\'.$name);
$reflection = new \ReflectionClass('EffectConnect\PHPSdk\Core\CallType\\'.$name);

return $reflection->newInstanceArgs([$this->_keychain]);
} catch (\Exception $exception)
Expand Down
4 changes: 2 additions & 2 deletions examples/base.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
$publicKey = 'PutYourSuppliedPublicKey';
$secretKey = 'FillInYourOwnSecretKeyAsSupplied';
// 3. Create a Keychain object.
$keychain = new EffectConnectSDK\Core\Helper\Keychain();
$keychain = new EffectConnect\PHPSdk\Core\Helper\Keychain();
try
{
// 4. Add your keys to the keychain.
Expand All @@ -21,7 +21,7 @@
// 5. Instantiate the SDK
try
{
$effectConnectSDK = new EffectConnectSDK\Core($keychain);
$effectConnectSDK = new EffectConnect\PHPSdk\Core($keychain);
} catch (Exception $exception)
{
echo sprintf('Could not create SDK. `%s`', $exception->getMessage());
Expand Down
26 changes: 13 additions & 13 deletions examples/order/create_order.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
require_once(realpath(__DIR__.'/..').'/base.php');

/**
* @var \EffectConnectSDK\Core $effectConnectSDK
* @var \EffectConnectSDK\Core\CallType\OrderCall $orderCallType
* @var \EffectConnect\PHPSdk\Core $effectConnectSDK
* @var \EffectConnect\PHPSdk\Core\CallType\OrderCall $orderCallType
*
* 2. Get the Order call type.
*/
Expand All @@ -17,27 +17,27 @@
die();
}
/**
* 3. Create an EffectConnectSDK\Core\Model\Order object and populate it with all required information
* 3. Create an EffectConnect\PHPSdk\Core\Model\Order object and populate it with all required information
*/
$orderNumber = '1323';
$orderStatus = \EffectConnectSDK\Core\Model\Order::STATUS_NEW;
$orderStatus = \EffectConnect\PHPSdk\Core\Model\Order::STATUS_NEW;
$currency = 'EUR';
$date = new \DateTime('now', new \DateTimeZone('Europe/Amsterdam'));
$shippingCost = 0;
$handlingCost = 0;
try
{
$order = (new \EffectConnectSDK\Core\Model\Order())
$order = (new \EffectConnect\PHPSdk\Core\Model\Order())
->setNumber($orderNumber)
->setStatus($orderStatus)
->setCurrency($currency)
->setDate($date)
->setShippingCost($shippingCost)
->setHandlingCost($handlingCost)
;
$shippingAddress = (new \EffectConnectSDK\Core\Model\OrderAddress())
->setType(\EffectConnectSDK\Core\Model\OrderAddress::TYPE_SHIPPING)
->setSalutation(\EffectConnectSDK\Core\Model\OrderAddress::SALUTATION_MALE)
$shippingAddress = (new \EffectConnect\PHPSdk\Core\Model\OrderAddress())
->setType(\EffectConnect\PHPSdk\Core\Model\OrderAddress::TYPE_SHIPPING)
->setSalutation(\EffectConnect\PHPSdk\Core\Model\OrderAddress::SALUTATION_MALE)
->setFirstName('Stefan')
->setLastName('Van den Heuvel')
->setCompany('Koek & Peer')
Expand All @@ -52,9 +52,9 @@
->setPhone('0123456789')
->setEmail('[email protected]')
;
$billingAddress = (new \EffectConnectSDK\Core\Model\OrderAddress())
->setType(\EffectConnectSDK\Core\Model\OrderAddress::TYPE_BILLING)
->setSalutation(\EffectConnectSDK\Core\Model\OrderAddress::SALUTATION_MALE)
$billingAddress = (new \EffectConnect\PHPSdk\Core\Model\OrderAddress())
->setType(\EffectConnect\PHPSdk\Core\Model\OrderAddress::TYPE_BILLING)
->setSalutation(\EffectConnect\PHPSdk\Core\Model\OrderAddress::SALUTATION_MALE)
->setFirstName('Stefan')
->setLastName('Van den Heuvel')
->setCompany('EffectConnect')
Expand All @@ -69,14 +69,14 @@
->setEmail('[email protected]')
;

$firstOrderLine = (new \EffectConnectSDK\Core\Model\OrderLine())
$firstOrderLine = (new \EffectConnect\PHPSdk\Core\Model\OrderLine())
->setId('1232456-1')
->setOptionId(902)
->setAmount(1)
->setPrice(16000)
->setTransactionFee(230)
;
$secondOrderLine = (new \EffectConnectSDK\Core\Model\OrderLine())
$secondOrderLine = (new \EffectConnect\PHPSdk\Core\Model\OrderLine())
->setId('1232456-2')
->setOptionId(357)
->setAmount(3)
Expand Down
10 changes: 5 additions & 5 deletions examples/order/read_order.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
require_once(realpath(__DIR__.'/..').'/base.php');

/**
* @var \EffectConnectSDK\Core $effectConnectSDK
* @var \EffectConnectSDK\Core\CallType\OrderCall $orderCallType
* @var \EffectConnect\PHPSdk\Core $effectConnectSDK
* @var \EffectConnect\PHPSdk\Core\CallType\OrderCall $orderCallType
*
* 2. Get the Order call type.
*/
Expand All @@ -17,10 +17,10 @@
die();
}
/**
* 3. Create an EffectConnectSDK\Core\Model\Order object and populate it with the order number
* 3. Create an EffectConnect\PHPSdk\Core\Model\Order object and populate it with the order number
*/
$order = (new \EffectConnectSDK\Core\Model\OrderReadRequest())
->setIdentifierType(\EffectConnectSDK\Core\Model\OrderReadRequest::TYPE_EFFECTCONNECT_NUMBER)
$order = (new \EffectConnect\PHPSdk\Core\Model\OrderReadRequest())
->setIdentifierType(\EffectConnect\PHPSdk\Core\Model\OrderReadRequest::TYPE_EFFECTCONNECT_NUMBER)
->setIdentifier('TEST_ORDER_1')
;
/**
Expand Down
20 changes: 10 additions & 10 deletions examples/order/update_order.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
require_once(realpath(__DIR__.'/..').'/base.php');

/**
* @var EffectConnectSDK\Core\CallType\OrderCall $orderCallType
* @var EffectConnect\PHPSdk\Core\CallType\OrderCall $orderCallType
*
* 2. Get the Order call type.
*/
try
{
$orderCallType = $effectConnectSDK->OrderCall();
$orderCallType
->setResponseType(EffectConnectSDK\Core\Interfaces\CallTypeInterface::RESPONSE_TYPE_XML)
->setResponseType(EffectConnect\PHPSdk\Core\Interfaces\CallTypeInterface::RESPONSE_TYPE_XML)
->setResponseLanguage('en')
;
} catch (Exception $exception)
Expand All @@ -20,33 +20,33 @@
die();
}
/**
* 3. Create an EffectConnectSDK\Core\Model\Order object containing all orderlines you're trying to update.
* 3. Create an EffectConnect\PHPSdk\Core\Model\Order object containing all orderlines you're trying to update.
*/

try
{
$orderAddTag = (new \EffectConnectSDK\Core\Model\OrderUpdate())
->setOrderIdentifierType(\EffectConnectSDK\Core\Model\OrderUpdate::TYPE_CHANNEL_NUMBER)
$orderAddTag = (new \EffectConnect\PHPSdk\Core\Model\OrderUpdate())
->setOrderIdentifierType(\EffectConnect\PHPSdk\Core\Model\OrderUpdate::TYPE_CHANNEL_NUMBER)
->setOrderIdentifier('TEST-ORDER-1')
->addTag('CustomTag')
->addTag('Test')
->removeTag('RemovableTag')
;
$firstUpdatableOrderline = (new \EffectConnectSDK\Core\Model\OrderLineUpdate())
->setOrderlineIdentifierType(\EffectConnectSDK\Core\Model\OrderLineUpdate::TYPE_CHANNEL_LINE_ID)
$firstUpdatableOrderline = (new \EffectConnect\PHPSdk\Core\Model\OrderLineUpdate())
->setOrderlineIdentifierType(\EffectConnect\PHPSdk\Core\Model\OrderLineUpdate::TYPE_CHANNEL_LINE_ID)
->setOrderlineIdentifier('test_order3_1.2')
->setTrackingNumber('TEST-TRACK-1234')
->setTrackingUrl('https://test-update.test')
->setCarrier('NOT A CARRIER')
;
$secondUpdatableOrderline = (new \EffectConnectSDK\Core\Model\OrderLineUpdate())
->setOrderlineIdentifierType(\EffectConnectSDK\Core\Model\OrderLineUpdate::TYPE_CHANNEL_LINE_ID)
$secondUpdatableOrderline = (new \EffectConnect\PHPSdk\Core\Model\OrderLineUpdate())
->setOrderlineIdentifierType(\EffectConnect\PHPSdk\Core\Model\OrderLineUpdate::TYPE_CHANNEL_LINE_ID)
->setOrderlineIdentifier('test_order3_1.1')
->setTrackingNumber('TEST-TRACK-1234')
->setTrackingUrl('https://test-update.test')
->setCarrier('NOT A CARRIER')
;
$orderUpdate = (new EffectConnectSDK\Core\Model\OrderUpdateRequest())
$orderUpdate = (new EffectConnect\PHPSdk\Core\Model\OrderUpdateRequest())
->addLineUpdate($firstUpdatableOrderline)
->addLineUpdate($secondUpdatableOrderline)
->addOrderUpdate($orderAddTag)
Expand Down
24 changes: 12 additions & 12 deletions examples/orderlist/read_orderlist.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// 1. Require the SDK base file.
require_once(realpath(__DIR__.'/..').'/base.php');
/**
* @var \EffectConnectSDK\Core $effectConnectSDK
* @var \EffectConnectSDK\Core\CallType\OrderListCall $orderListCallType
* @var \EffectConnect\PHPSdk\Core $effectConnectSDK
* @var \EffectConnect\PHPSdk\Core\CallType\OrderListCall $orderListCallType
*
* 2. Get the OrderList call type.
*/
Expand All @@ -14,45 +14,45 @@
die();
}
/**
* 3. Create an EffectConnectSDK\Core\Model\OrderList object and populate it with the type and values
* 3. Create an EffectConnect\PHPSdk\Core\Model\OrderList object and populate it with the type and values
*/
$fromDateExampleFilter = new \EffectConnectSDK\Core\Model\Filter\FromDateFilter();
$fromDateExampleFilter = new \EffectConnect\PHPSdk\Core\Model\Filter\FromDateFilter();
/**
* Example: Retrieve all orders placed AFTER 01-04-2018 at 04:00:00
*/
$fromDateExampleFilter->setFilterValue(new DateTime('2018-04-01 04:00:00', new DateTimeZone('Europe/Amsterdam')));
$toDateExampleFilter = new \EffectConnectSDK\Core\Model\Filter\ToDateFilter();
$toDateExampleFilter = new \EffectConnect\PHPSdk\Core\Model\Filter\ToDateFilter();
/**
* Example: Retrieve all orders placed BEFORE today
*/
$toDateExampleFilter->setFilterValue(new DateTime('now', new DateTimeZone('Europe/Amsterdam')));

$statusExampleFilter = new \EffectConnectSDK\Core\Model\Filter\HasStatusFilter();
$statusExampleFilter = new \EffectConnect\PHPSdk\Core\Model\Filter\HasStatusFilter();
/**
* Example: Retrieve all orders having either "Paid" or "Cancelled" status.
*/
$statusExampleFilter->setFilterValue([
\EffectConnectSDK\Core\Model\Filter\HasStatusFilter::STATUS_PAID,
\EffectConnectSDK\Core\Model\Filter\HasStatusFilter::STATUS_CANCELLED
\EffectConnect\PHPSdk\Core\Model\Filter\HasStatusFilter::STATUS_PAID,
\EffectConnect\PHPSdk\Core\Model\Filter\HasStatusFilter::STATUS_CANCELLED
]);
$tagExampleFilter = new \EffectConnectSDK\Core\Model\Filter\HasTagFilter();
$tagExampleFilter = new \EffectConnect\PHPSdk\Core\Model\Filter\HasTagFilter();
/**
* Example: Retrieve all orders NOT containing the "Test" tag.
*/
$tagExampleFilter->setFilterValue([
(new \EffectConnectSDK\Core\Model\Filter\TagFilterValue())
(new \EffectConnect\PHPSdk\Core\Model\Filter\TagFilterValue())
->setTagName('Test')
->setExclude(true)
]);
/**
* Example: Retrieve all orders containgin the "CustomTest" tag.
*/
$tagExampleFilter->setFilterValue([
(new \EffectConnectSDK\Core\Model\Filter\TagFilterValue())
(new \EffectConnect\PHPSdk\Core\Model\Filter\TagFilterValue())
->setTagName('CustomTest')
]);

$orderList = (new \EffectConnectSDK\Core\Model\OrderList())
$orderList = (new \EffectConnect\PHPSdk\Core\Model\OrderList())
->addFilter($fromDateExampleFilter)
->addFilter($toDateExampleFilter)
->addFilter($statusExampleFilter)
Expand Down
8 changes: 4 additions & 4 deletions examples/process/read_process.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// 1. Require the SDK base file.
require_once(realpath(__DIR__.'/..').'/base.php');
/**
* @var \EffectConnectSDK\Core $effectConnectSDK
* @var \EffectConnectSDK\Core\CallType\ProcessCall $processCallType
* @var \EffectConnect\PHPSdk\Core $effectConnectSDK
* @var \EffectConnect\PHPSdk\Core\CallType\ProcessCall $processCallType
*
* 2. Get the Process call type.
*/
Expand All @@ -16,12 +16,12 @@
die();
}
/**
* 3. Create an EffectConnectSDK\Core\Model\ProcessReadRequest object and populate it with the process ID you want to retrieve
* 3. Create an EffectConnect\PHPSdk\Core\Model\ProcessReadRequest object and populate it with the process ID you want to retrieve
*/

try
{
$processReadRequest = (new \EffectConnectSDK\Core\Model\ProcessReadRequest())
$processReadRequest = (new \EffectConnect\PHPSdk\Core\Model\ProcessReadRequest())
->setID('Vqs2PqP985p4r1rG')
;
} catch (Exception $exception)
Expand Down
4 changes: 2 additions & 2 deletions examples/product/create_product.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
require_once(realpath(__DIR__.'/..').'/base.php');

/**
* @var \EffectConnectSDK\Core $effectConnectSDK
* @var \EffectConnectSDK\Core\CallType\ProductsCall $productCallType
* @var \EffectConnect\PHPSdk\Core $effectConnectSDK
* @var \EffectConnect\PHPSdk\Core\CallType\ProductsCall $productCallType
*
* 2. Get the Product call type.
*/
Expand Down
4 changes: 2 additions & 2 deletions examples/product/update_product.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
require_once(realpath(__DIR__.'/..').'/base.php');

/**
* @var \EffectConnectSDK\Core $effectConnectSDK
* @var \EffectConnectSDK\Core\CallType\ProductsCall $productCallType
* @var \EffectConnect\PHPSdk\Core $effectConnectSDK
* @var \EffectConnect\PHPSdk\Core\CallType\ProductsCall $productCallType
*
* 2. Get the Product call type.
*/
Expand Down
8 changes: 4 additions & 4 deletions examples/report/read_report.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// 1. Require the SDK base file.
require_once(realpath(__DIR__.'/..').'/base.php');
/**
* @var \EffectConnectSDK\Core $effectConnectSDK
* @var \EffectConnectSDK\Core\CallType\ReportCall $reportCallType
* @var \EffectConnect\PHPSdk\Core $effectConnectSDK
* @var \EffectConnect\PHPSdk\Core\CallType\ReportCall $reportCallType
*
* 2. Get the Process call type.
*/
Expand All @@ -16,12 +16,12 @@
die();
}
/**
* 3. Create an EffectConnectSDK\Core\Model\ReportReadRequest object and populate it with the process ID you want to retrieve
* 3. Create an EffectConnect\PHPSdk\Core\Model\ReportReadRequest object and populate it with the process ID you want to retrieve
*/

try
{
$reportReadRequest = (new \EffectConnectSDK\Core\Model\ReportReadRequest())
$reportReadRequest = (new \EffectConnect\PHPSdk\Core\Model\ReportReadRequest())
->setID('Vqs2PqP985p4r1rG')
;
} catch (Exception $exception)
Expand Down

0 comments on commit 94d3525

Please sign in to comment.