merge develop into master

.gitignore

@@ -4,4 +4,5 @@ Controller/Test/
 Controller/Adminhtml/Test/
 Build/
 build
+.idea/
 composer.lock

Api/Data/MatrixrateInterface.php

@@ -0,0 +1,150 @@
+<?php
+/**
+ *
+ *          ..::..
+ *     ..::::::::::::..
+ *   ::'''''':''::'''''::
+ *   ::..  ..:  :  ....::
+ *   ::::  :::  :  :   ::
+ *   ::::  :::  :  ''' ::
+ *   ::::..:::..::.....::
+ *     ''::::::::::::''
+ *          ''::''
+ *
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Creative Commons License.
+ * It is available through the world-wide-web at this URL:
+ * http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
+ * If you are unable to obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this module to newer
+ * versions in the future. If you wish to customize this module for your
+ * needs please contact [email protected] for more information.
+ *
+ * @copyright   Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
+ * @license     http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
+ */
+
+namespace TIG\PostNL\Api\Data;
+
+// @codingStandardsIgnoreFile
+interface MatrixrateInterface
+{
+    /**
+     * @return int
+     */
+    public function getEntityId();
+
+    /**
+     * @return int
+     */
+    public function getWebsiteId();
+
+    /**
+     * @param $value
+     *
+     * @return \TIG\PostNL\Api\Data\MatrixrateInterface
+     */
+    public function setWebsiteId($value);
+
+    /**
+     * @return string
+     */
+    public function getDestinyCountryId();
+
+    /**
+     * @param $value
+     *
+     * @return \TIG\PostNL\Api\Data\MatrixrateInterface
+     */
+    public function setDestinyCountryId($value);
+
+    /**
+     * @return int
+     */
+    public function getDestinyRegionId();
+
+    /**
+     * @param $value
+     *
+     * @return \TIG\PostNL\Api\Data\MatrixrateInterface
+     */
+    public function setDestinyRegionId($value);
+
+    /**
+     * @return string
+     */
+    public function getDestinyZipCode();
+
+    /**
+     * @param $value
+     *
+     * @return \TIG\PostNL\Api\Data\MatrixrateInterface
+     */
+    public function setDestinyZipCode($value);
+
+    /**
+     * @return float
+     */
+    public function getWeight();
+
+    /**
+     * @param $value
+     *
+     * @return \TIG\PostNL\Api\Data\MatrixrateInterface
+     */
+    public function setWeight($value);
+
+    /**
+     * @return float
+     */
+    public function getSubtotal();
+
+    /**
+     * @param $value
+     *
+     * @return \TIG\PostNL\Api\Data\MatrixrateInterface
+     */
+    public function setSubtotal($value);
+
+    /**
+     * @return int
+     */
+    public function getQuantity();
+
+    /**
+     * @param $value
+     *
+     * @return \TIG\PostNL\Api\Data\MatrixrateInterface
+     */
+    public function setQuantity($value);
+
+    /**
+     * @return string
+     */
+    public function getParcelType();
+
+    /**
+     * @param $value
+     *
+     * @return \TIG\PostNL\Api\Data\MatrixrateInterface
+     */
+    public function setParcelType($value);
+
+    /**
+     * @return float
+     */
+    public function getPrice();
+
+    /**
+     * @param $value
+     *
+     * @return \TIG\PostNL\Api\Data\MatrixrateInterface
+     */
+    public function setPrice($value);
+}

Api/Data/OrderInterface.php

@@ -198,6 +198,18 @@ public function setShipAt($value);
      */
     public function getShipAt();
 
+    /**
+     * @return mixed
+     */
+    public function getParcelCount();
+
+    /**
+     * @param $value
+     *
+     * @return \TIG\PostNL\Api\Data\OrderInterface
+     */
+    public function setParcelCount($value);
+
     /**
      * @param $value
      *

Api/Data/ShipmentInterface.php

@@ -225,6 +225,11 @@ public function getDeliveryDateFormatted($format = 'd-m-Y');
      */
     public function isExtraCover();
 
+    /**
+     * @return bool
+     */
+    public function isExtraAtHome();
+
     /**
      * @return float
      */

Api/MatrixrateRepositoryInterface.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ *
+ *          ..::..
+ *     ..::::::::::::..
+ *   ::'''''':''::'''''::
+ *   ::..  ..:  :  ....::
+ *   ::::  :::  :  :   ::
+ *   ::::  :::  :  ''' ::
+ *   ::::..:::..::.....::
+ *     ''::::::::::::''
+ *          ''::''
+ *
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Creative Commons License.
+ * It is available through the world-wide-web at this URL:
+ * http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
+ * If you are unable to obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this module to newer
+ * versions in the future. If you wish to customize this module for your
+ * needs please contact [email protected] for more information.
+ *
+ * @copyright   Copyright (c) Total Internet Group B.V. https://tig.nl/copyright
+ * @license     http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
+ */
+namespace TIG\PostNL\Api;
+
+interface MatrixrateRepositoryInterface
+{
+    /**
+     * Save a Matrixrate rule
+     *
+     * @api
+     *
+     * @param \TIG\PostNL\Api\Data\MatrixrateInterface $matrixrate
+     *
+     * @return \TIG\PostNL\Api\Data\MatrixrateInterface
+     */
+    public function save(\TIG\PostNL\Api\Data\MatrixrateInterface $matrixrate);
+
+    /**
+     * Retrieve a list of Matrixrates.
+     *
+     * @api
+     * @param \Magento\Framework\Api\SearchCriteriaInterface $criteria
+     * @return \Magento\Framework\Api\SearchResultsInterface
+     */
+    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria);
+
+    /**
+     * Delete a specific Matrixrate.
+     *
+     * @api
+     *
+     * @param \TIG\PostNL\Api\Data\MatrixrateInterface $matrixrate
+     *
+     * @return bool
+     */
+    public function delete(\TIG\PostNL\Api\Data\MatrixrateInterface $matrixrate);
+
+    /**
+     * Create a Matrixrate rule.
+     *
+     * @api
+     * @return \TIG\PostNL\Api\Data\MatrixrateInterface
+     */
+    public function create();
+
+    /**
+     * @param string $field
+     * @param string $value
+     *
+     * @return \TIG\PostNL\Api\Data\MatrixrateInterface
+     */
+    public function getByFieldWithValue($field, $value);
+
+    /**
+     * @param int $websiteId
+     *
+     * @return \TIG\PostNL\Model\Carrier\ResourceModel\Matrixrate\Collection
+     */
+    public function getByWebsiteId($websiteId);
+}

Api/OrderRepositoryInterface.php

@@ -93,4 +93,19 @@ public function create();
      * @return \TIG\PostNL\Api\Data\OrderInterface
      */
     public function getByFieldWithValue($field, $value);
+
+    /**
+     * @param int $id
+     *
+     * @return \TIG\PostNL\Api\Data\OrderInterface
+     */
+    // @codingStandardsIgnoreLine
+    public function getByOrderId($id);
+
+    /**
+     * @param $quoteId
+     *
+     * @return null|\TIG\PostNL\Api\Data\OrderInterface
+     */
+    public function getByQuoteId($quoteId = null);
 }

Api/ShipmentLabelRepositoryInterface.php

@@ -63,10 +63,9 @@ public function getById($identifier);
      * Return a label that belongs to a shipment.
      *
      * @param \TIG\PostNL\Api\Data\ShipmentInterface $shipment
-     * @param                                        $number
      * @return \TIG\PostNL\Api\Data\ShipmentLabelInterface
      */
-    public function getByShipment(\TIG\PostNL\Api\Data\ShipmentInterface $shipment, $number = 1);
+    public function getByShipment(\TIG\PostNL\Api\Data\ShipmentInterface $shipment);
 
     /**
      * Retrieve a list of PostNL Shipment Labels.