Skip to content

Commit

Permalink
Add v1.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jreinke committed Apr 6, 2022
1 parent f7a9e8f commit d0ef11b
Show file tree
Hide file tree
Showing 83 changed files with 1,755 additions and 197 deletions.
27 changes: 24 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,29 @@
# Changelog

## v1.13.6 - 2021-08-12
### Fixes
- Fix parameter order_tax_mode not working in GetOrdersRequest.php
## v1.14.0 - 2021-12-23
### Features
- Add product feeds APIs (PF01, PF02, PF03 and PF11)
- Add API A02 to update shop information
- Open RE01 to shops and deprecate RE02
- Add API OF04 for operator and shop roles
- Add OR06 API to confirm orders taxes
- Add 'operator_format' parameter to API P41
- Add fulfillment center code in API (offer)
- Add measurement field to OF51
- Add applicable_taxes in A01 and S20 output
- Add the PAY_ON_SHIPMENT order workflow
- Add offers shipping prices by type and zone to P11 and OF51
- Add commissionnable flag and filter in OR11 / P11 / OF51
- Add API OR04 for the shop role + order references in API OR01, OR04 and OR11
- Add mandatoryTracking clickAndCollect and deliveryByOperator in SH12
- Add suspension_type in A01, S20, S06 and S07 APIs
- Add createDate and lastUpdatedDate on ST01 & ST11
- Support UK bank format for seller payout
- Add customer organization & additional contacts in OR01, OR11, OR04, M11, M10

## v1.13.7 - 2021-10-26
### Fixes
- Fix parameter order_tax_mode not working in GetHierarchiesRequest when calling OR11 API

## v1.13.6 - 2021-08-12
### Fixes
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "mirakl/sdk-php-shop",
"description": "Mirakl provides a PHP SDK that wraps the Mirakl REST APIs in a lightweight library. This enables you to develop a fast, flexible and custom integration for your existing e-commerce solution.",
"type": "library",
"version": "1.13.7",
"version": "1.14.0",
"license": "proprietary",
"authors": [
{
Expand Down
78 changes: 42 additions & 36 deletions src/Mirakl/MCI/Common/Domain/Attribute.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,51 @@

use Mirakl\Core\Domain\MiraklObject;
use Mirakl\MCI\Common\Domain\Collection\AttributeParameterCollection;
use Mirakl\MCI\Common\Domain\Collection\AttributeProductFeedCollection;
use Mirakl\MCI\Common\Domain\Collection\AttributeRoleCollection;
use Mirakl\MCI\Common\Domain\Collection\ValueTranslationCollection;

/**
* @method string getCode()
* @method $this setCode(string $code)
* @method string getDefaultValue() @deprecated Please use getTypeParameters() instead.
* @method $this setDefaultValue(string $defaultValue) @deprecated Please use setTypeParameters() instead.
* @method string getDescription()
* @method $this setDescription(string $description)
* @method ValueTranslationCollection getDescriptionTranslations()
* @method string getExample()
* @method $this setExample(string $example)
* @method string getHierarchyCode()
* @method $this setHierarchyCode(string $hierarchyCode)
* @method string getLabel()
* @method $this setLabel(string $label)
* @method ValueTranslationCollection getLabelTranslations()
* @method bool getRequired()
* @method $this setRequired(bool $required)
* @method string getRequirementLevel()
* @method $this setRequirementLevel(bool $requirementLevel)
* @method bool isRequired()
* @method AttributeRoleCollection getRoles()
* @method $this setRoles(AttributeRoleCollection $roles)
* @method string getType()
* @method $this setType(string $type)
* @method string getTypeParameter() @deprecated Please use getTypeParameters() instead.
* @method $this setTypeParameter(string $typeParameter) @deprecated Please use setTypeParameters() instead.
* @method AttributeParameterCollection getTypeParameters()
* @method $this setTypeParameters(AttributeParameterCollection $typeParameters)
* @method string getTransformations()
* @method $this setTransformations(string $transformations)
* @method string getUniqueCode()
* @method $this setUniqueCode(string $uniqueCode)
* @method string getValidations()
* @method $this setValidations(string $validations)
* @method bool getVariant()
* @method $this setVariant(bool $variant)
* @method bool isVariant()
* @method string getCode()
* @method $this setCode(string $code)
* @method string getDefaultValue() @deprecated Please use getTypeParameters() instead.
* @method $this setDefaultValue(string $defaultValue) @deprecated Please use setTypeParameters() instead.
* @method string getDescription()
* @method $this setDescription(string $description)
* @method ValueTranslationCollection getDescriptionTranslations()
* @method $this setDescriptionTranslations(ValueTranslationCollection $descriptionTranslations)
* @method string getExample()
* @method $this setExample(string $example)
* @method string getHierarchyCode()
* @method $this setHierarchyCode(string $hierarchyCode)
* @method string getLabel()
* @method $this setLabel(string $label)
* @method ValueTranslationCollection getLabelTranslations()
* @method $this setLabelTranslations(ValueTranslationCollection $labelTranslations)
* @method AttributeProductFeedCollection getProductFeeds()
* @method $this setProductFeeds(AttributeProductFeedCollection $productFeeds)
* @method bool getRequired()
* @method $this setRequired(bool $required)
* @method string getRequirementLevel()
* @method $this setRequirementLevel(bool $requirementLevel)
* @method bool isRequired()
* @method AttributeRoleCollection getRoles()
* @method $this setRoles(AttributeRoleCollection $roles)
* @method string getType()
* @method $this setType(string $type)
* @method string getTypeParameter() @deprecated Please use getTypeParameters() instead.
* @method $this setTypeParameter(string $typeParameter) @deprecated Please use setTypeParameters() instead.
* @method AttributeParameterCollection getTypeParameters()
* @method $this setTypeParameters(AttributeParameterCollection $typeParameters)
* @method string getTransformations()
* @method $this setTransformations(string $transformations)
* @method string getUniqueCode()
* @method $this setUniqueCode(string $uniqueCode)
* @method string getValidations()
* @method $this setValidations(string $validations)
* @method bool getVariant()
* @method $this setVariant(bool $variant)
* @method bool isVariant()
*/
class Attribute extends MiraklObject
{
Expand All @@ -54,5 +59,6 @@ class Attribute extends MiraklObject
'label_translations' => [ValueTranslationCollection::class, 'create'],
'roles' => [AttributeRoleCollection::class, 'create'],
'type_parameters' => [AttributeParameterCollection::class, 'create'],
'product_feeds' => [AttributeProductFeedCollection::class, 'create'],
];
}
11 changes: 11 additions & 0 deletions src/Mirakl/MCI/Common/Domain/AttributeProductFeed.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php
namespace Mirakl\MCI\Common\Domain;

use Mirakl\Core\Domain\MiraklObject;

/**
* @method string getCode()
* @method $this setCode(string $code)
*/
class AttributeProductFeed extends MiraklObject
{}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php
namespace Mirakl\MCI\Common\Domain\Collection;

use Mirakl\Core\Domain\Collection\MiraklCollection;
use Mirakl\MCI\Common\Domain\AttributeProductFeed;

/**
* @method AttributeProductFeed current()
* @method AttributeProductFeed first()
* @method AttributeProductFeed get($offset)
* @method AttributeProductFeed offsetGet($offset)
* @method AttributeProductFeed last()
*/
class AttributeProductFeedCollection extends MiraklCollection
{
/**
* @var string
*/
protected $itemClass = AttributeProductFeed::class;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php
namespace Mirakl\MCI\Common\Domain\Collection\Product;

use Mirakl\Core\Domain\Collection\MiraklCollection;
use Mirakl\MCI\Common\Domain\Product\ProductDataSheetProductFeedValidationStatus;

/**
* @method ProductDataSheetProductFeedValidationStatus current()
* @method ProductDataSheetProductFeedValidationStatus first()
* @method ProductDataSheetProductFeedValidationStatus get($offset)
* @method ProductDataSheetProductFeedValidationStatus offsetGet($offset)
* @method ProductDataSheetProductFeedValidationStatus last()
*/
class ProductDataSheetProductFeedValidationStatusCollection extends MiraklCollection
{
/**
* @var string
*/
protected $itemClass = ProductDataSheetProductFeedValidationStatus::class;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php
namespace Mirakl\MCI\Common\Domain\Collection\ProductFeed;

use Mirakl\Core\Domain\Collection\MiraklCollection;
use Mirakl\MCI\Common\Domain\ProductFeed\Channel;

/**
* @method Channel current()
* @method Channel first()
* @method Channel get($offset)
* @method Channel offsetGet($offset)
* @method Channel last()
*/
class ChannelCollection extends MiraklCollection
{
/**
* @var string
*/
protected $itemClass = Channel::class;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php
namespace Mirakl\MCI\Common\Domain\Collection\ProductFeed;

use Mirakl\Core\Domain\Collection\MiraklCollection;
use Mirakl\MCI\Common\Domain\ProductFeed\ProductFeed;

/**
* @method ProductFeed current()
* @method ProductFeed first()
* @method ProductFeed get($offset)
* @method ProductFeed offsetGet($offset)
* @method ProductFeed last()
*/
class ProductFeedCollection extends MiraklCollection
{
/**
* @var string
*/
protected $itemClass = ProductFeed::class;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php
namespace Mirakl\MCI\Common\Domain\Collection\ProductFeed;

use Mirakl\Core\Domain\Collection\MiraklCollection;
use Mirakl\MCI\Common\Domain\ProductFeed\ProductFeedImportError;

/**
* @method ProductFeedImportError current()
* @method ProductFeedImportError first()
* @method ProductFeedImportError get($offset)
* @method ProductFeedImportError offsetGet($offset)
* @method ProductFeedImportError last()
*/
class ProductFeedImportErrorCollection extends MiraklCollection
{
/**
* @var string
*/
protected $itemClass = ProductFeedImportError::class;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php
namespace Mirakl\MCI\Common\Domain\Collection\ProductFeed;

use Mirakl\Core\Domain\Collection\MiraklCollection;
use Mirakl\MCI\Common\Domain\ProductFeed\ProductFeedImportGlobalError;

/**
* @method ProductFeedImportGlobalError current()
* @method ProductFeedImportGlobalError first()
* @method ProductFeedImportGlobalError get($offset)
* @method ProductFeedImportGlobalError offsetGet($offset)
* @method ProductFeedImportGlobalError last()
*/
class ProductFeedImportGlobalErrorCollection extends MiraklCollection
{
/**
* @var string
*/
protected $itemClass = ProductFeedImportGlobalError::class;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php
namespace Mirakl\MCI\Common\Domain\Collection\ProductFeed;

use Mirakl\Core\Domain\Collection\MiraklCollection;
use Mirakl\MCI\Common\Domain\ProductFeed\ProductFeedImportItem;

/**
* @method ProductFeedImportItem current()
* @method ProductFeedImportItem first()
* @method ProductFeedImportItem get($offset)
* @method ProductFeedImportItem offsetGet($offset)
* @method ProductFeedImportItem last()
*/
class ProductFeedImportItemCollection extends MiraklCollection
{
/**
* @var string
*/
protected $itemClass = ProductFeedImportItem::class;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php
namespace Mirakl\MCI\Common\Domain\Collection\ProductFeed;

use Mirakl\Core\Domain\Collection\MiraklCollection;
use Mirakl\MCI\Common\Domain\ProductFeed\ProductFeedImportReportItem;

/**
* @method ProductFeedImportReportItem current()
* @method ProductFeedImportReportItem first()
* @method ProductFeedImportReportItem get($offset)
* @method ProductFeedImportReportItem offsetGet($offset)
* @method ProductFeedImportReportItem last()
*/
class ProductFeedImportReportItemCollection extends MiraklCollection
{
/**
* @var string
*/
protected $itemClass = ProductFeedImportReportItem::class;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php
namespace Mirakl\MCI\Common\Domain\Product;

use Mirakl\Core\Domain\MiraklObject;

/**
* @method string getCode()
* @method $this setCode(string $code)
* @method string getStatus()
* @method $this setStatus(string $status) One of \Mirakl\MCI\Common\Domain\Product\ProductDataSheetValidationStatus
*/
class ProductDataSheetProductFeedValidationStatus extends MiraklObject
{}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php
namespace Mirakl\MCI\Common\Domain\Product;

use Mirakl\Core\Domain\MiraklObject;
use Mirakl\MCI\Common\Domain\Collection\Product\ProductDataSheetProductFeedValidationStatusCollection as ProductFeeds;

/**
* @method ProductFeeds getProductFeeds()
* @method $this setProductFeeds(ProductFeeds $productFeeds)
* @method string getStatus()
* @method $this setStatus(string $status) One of \Mirakl\MCI\Common\Domain\Product\ProductDataSheetValidationStatus
*/
class ProductDataSheetValidation extends MiraklObject
{
/**
* @var array
*/
protected static $dataTypes = [
'product_feeds' => [ProductFeeds::class, 'create'],
];
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php
namespace Mirakl\MCI\Common\Domain\Product;

class ProductDataSheetValidationStatus
{
const VALID = 'VALID';
const INVALID = 'INVALID';
const NOT_ANALYZED = 'NOT_ANALYZED';
}
15 changes: 7 additions & 8 deletions src/Mirakl/MCI/Common/Domain/Product/ProductImportStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@

class ProductImportStatus
{
/**
* Represents a complete integration of the import with or without errors
*/
const COMPLETE = 'COMPLETE';
// Represents a complete integration of the import with or without errors
const COMPLETE = 'COMPLETE';

/**
* Represents a failed integration of the import
*/
const FAILED = 'FAILED';
// Represents a failed integration of the import
const FAILED = 'FAILED';

/** @deprecated */
const QUEUED = 'QUEUED';
}
Loading

0 comments on commit d0ef11b

Please sign in to comment.