Merge pull request #22 from heidelpay/develop

Merge develop into master
heidelpay · May 3, 2017 · a74f105 · a74f105
2 parents cb32125 + 6b76eed
commit a74f105
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/Controller/Adminhtml/Order/Shipment/Save.php b/Controller/Adminhtml/Order/Shipment/Save.php
@@ -23,11 +23,6 @@
  */
 class Save extends \Magento\Shipping\Controller\Adminhtml\Order\Shipment\Save
 {
-    /**
-     * @var \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface
-     */
-    protected $shipmentValidator;
-
     /**
      * @var \Magento\Sales\Model\OrderRepository
      */
@@ -55,7 +50,6 @@ class Save extends \Magento\Shipping\Controller\Adminhtml\Order\Shipment\Save
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
      * @param \Magento\Shipping\Model\Shipping\LabelGenerator $labelGenerator
      * @param \Magento\Sales\Model\Order\Email\Sender\ShipmentSender $shipmentSender
-     * @param \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface $shipmentValidator
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Encryption\Encryptor $encryptor
      * @param \Magento\Sales\Model\OrderRepository $orderRepository
@@ -66,13 +60,11 @@ public function __construct(
         \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader,
         \Magento\Shipping\Model\Shipping\LabelGenerator $labelGenerator,
         \Magento\Sales\Model\Order\Email\Sender\ShipmentSender $shipmentSender,
-        \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface $shipmentValidator,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Encryption\Encryptor $encryptor,
         \Magento\Sales\Model\OrderRepository $orderRepository,
         \Heidelpay\Gateway\Helper\Payment $paymentHelper
     ) {
-        $this->shipmentValidator = $shipmentValidator;
         $this->orderResository = $orderRepository;
         $this->logger = $logger;
         $this->encryptor = $encryptor;

diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ All versions greater than 16.10.17 are based on the heidelpay php-api. (https://
 
 ### Install the heidelpay Magento 2 composer package
 
-```composer require "heidelpay/magento2:17.4.16"```
+```composer require "heidelpay/magento2:17.5.3"```
 
 ### Enable the extension in Magento 2