Merge pull request #10 from heidelpay/develop

Release Version 1.1.1

.gitignore

@@ -0,0 +1 @@
+.idea

README.md

@@ -12,4 +12,19 @@ Diese Erweiterung integriert die heidelpay Zahlarten in Ihren Plentymarkets Shop
 This extension provides an integration of the heidelpay payment methods for your plentymarkets shop.\
 * [User Guide](meta/documents/user_guide_en.md)
 * [Changelog](meta/documents/changelog_en.md)
-* [Support Contacts](meta/documents/support_contact_en.md)
+* [Support Contacts](meta/documents/support_contact_en.md)
+
+## Support
+For any issues or questions please get in touch with our support.
+
+#### Web page
+https://dev.heidelpay.com/
+
+#### Email
+[email protected]
+
+#### Phone
++49 (0)6221/6471-100
+
+#### Twitter
+@devHeidelpay

meta/documents/changelog_de.md

@@ -1,5 +1,17 @@
 # heidelpay Payment Gateway Changelog
 
+## [1.1.1][1.1.1]
+
+### Change
+- Logos ausgetauscht.
+- Diverse Codingstyle-Fehler behoben.
+- .gitignore aktualisiert
+- Readme um Support Informationen ergänzt
+
+### Fixed
+- Support Telefonnummer korrigiert.
+- MwSt wird nun bei Auslandsgeschäften nicht mit einbezogen
+
 ## [1.1.0][1.1.0]
 
 ### Removed
@@ -20,4 +32,5 @@
 - Erste Implementation.
 - Zahlarten Kreditkarte, Debitkarte, Sofort und Lastschrift hinzugefügt.
 
-[1.1.0]: https://github.com/heidelpay/plentymarkets-gateway/tree/1.1.0
+[1.1.0]: https://github.com/heidelpay/plentymarkets-gateway/tree/1.1.0
+[1.1.1]: https://github.com/heidelpay/plentymarkets-gateway/compare/1.1.0..1.1.1

meta/documents/changelog_en.md

@@ -1,5 +1,17 @@
 # heidelpay Payment Gateway Changelog
 
+## [1.1.1][1.1.1]
+
+### Change
+- Replace images.
+- Resolve codingstyle violations.
+- Update .gitignore
+- Add support information to readme
+
+### Fixed
+- Fix support phone number.
+- Fix incorrect VAT for internaational customer
+
 ## [1.1.0][1.1.0]
 
 ### Removed
@@ -20,4 +32,5 @@
 - Initial implementation.
 - Added payment methods credit card, debit card, Sofort and direct debit.
 
-[1.1.0]: https://github.com/heidelpay/plentymarkets-gateway/tree/1.1.0
+[1.1.0]: https://github.com/heidelpay/plentymarkets-gateway/tree/1.1.0
+[1.1.1]: https://github.com/heidelpay/plentymarkets-gateway/compare/1.1.0..1.1.1

meta/documents/support_contact_en.md

@@ -5,7 +5,7 @@ https://dev.heidelpay.de/plentymarkets/
 [email protected]
 
 ## Phone
-+49 (0)6221/6471-200
++49 (0)6221/6471-100
 
 ## Twitter
 @devHeidelpay

plugin.json

@@ -13,7 +13,7 @@
   },
   "categories": ["3519"],
   "keywords": ["heidelpay", "plentymarkets", "plugin", "payment", "payment method", "credit card", "debit card", "sofort", "direct debit"],
-  "version": "1.1.0",
+  "version": "1.1.1",
   "license": "Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file.",
   "price": 0.00,
   "author": "heidelpay GmbH",

src/Constants/Plugin.php

@@ -18,5 +18,5 @@ class Plugin
 {
     const KEY = 'heidelpay';
     const NAME = 'Heidelpay';
-    const VERSION = '1.1.0';
+    const VERSION = '1.1.1';
 }

src/Services/PaymentService.php

@@ -212,6 +212,7 @@ public function executePayment(string $paymentMethod, ExecutePayment $event): ar
      * @param array $parameters
      *
      * @return array
+     * @throws \RuntimeException
      */
     public function sendPaymentRequest(
         Basket $basket,
@@ -270,7 +271,12 @@ public function getPaymentMethodContent(
 
         if ($methodInstance->hasToBeInitialized()) {
             try {
-                $result = $this->sendPaymentRequest($basket, $paymentMethod, $methodInstance->getTransactionType(), $mopId);
+                $result = $this->sendPaymentRequest(
+                    $basket,
+                    $paymentMethod,
+                    $methodInstance->getTransactionType(),
+                    $mopId
+                );
                 $value = $this->handleSyncResponse($type, $result);
             } catch (\RuntimeException $e) {
                 $this->notification->error($clientErrorMessage, __METHOD__, [$type, $e->getMessage()], true);
@@ -292,9 +298,12 @@ public function getPaymentMethodContent(
      * @param string $paymentMethod
      * @param int $mopId
      * @param string $transactionId
+     * @throws \RuntimeException
      */
     private function prepareRequest(Basket $basket, string $paymentMethod, int $mopId, string $transactionId)
     {
+        $basketArray = $basket->toArray();
+
         /** @var BasketService $basketService */
         $basketService = pluginApp(BasketService::class);
 
@@ -307,7 +316,7 @@ private function prepareRequest(Basket $basket, string $paymentMethod, int $mopI
 
         // set customer personal information & address data
         $addresses = $this->getCustomerAddressData($basket);
-        $this->heidelpayRequest['IDENTIFICATION_SHOPPERID'] = $basket->customerId;
+        $this->heidelpayRequest['IDENTIFICATION_SHOPPERID'] = $basketArray['customerId'];
         $this->heidelpayRequest['NAME_GIVEN'] = $addresses['billing']->firstName;
         $this->heidelpayRequest['NAME_FAMILY'] = $addresses['billing']->lastName;
         $this->heidelpayRequest['CONTACT_EMAIL'] = $addresses['billing']->email;
@@ -325,9 +334,16 @@ private function prepareRequest(Basket $basket, string $paymentMethod, int $mopI
 
         $this->heidelpayRequest['IDENTIFICATION_TRANSACTIONID'] = $transactionId;
 
+        // set amount to net if showNetPrice === true
+        if ($this->sessionStorageFactory->getCustomer()->showNetPrice) {
+            $basketArray['itemSum']        = $basketArray['itemSumNet'];
+            $basketArray['basketAmount']   = $basketArray['basketAmountNet'];
+            $basketArray['shippingAmount'] = $basketArray['shippingAmountNet'];
+        }
+
         // set basket information (amount, currency, orderId, ...)
-        $this->heidelpayRequest['PRESENTATION_AMOUNT'] = $basket->basketAmount;
-        $this->heidelpayRequest['PRESENTATION_CURRENCY'] = $basket->currency;
+        $this->heidelpayRequest['PRESENTATION_AMOUNT'] = $basketArray['basketAmount'];
+        $this->heidelpayRequest['PRESENTATION_CURRENCY'] = $basketArray['currency'];
 
         $this->heidelpayRequest['FRONTEND_ENABLED'] = 'TRUE';
         $this->heidelpayRequest['FRONTEND_LANGUAGE'] = $this->sessionStorageFactory->getLocaleSettings()->language;
@@ -355,9 +371,9 @@ private function prepareRequest(Basket $basket, string $paymentMethod, int $mopI
         $this->heidelpayRequest['CRITERION_MOP'] = $mopId;
         $this->heidelpayRequest['CRITERION_SHOP_TYPE'] = 'plentymarkets 7';
         $this->heidelpayRequest['CRITERION_SHOPMODULE_VERSION'] = Plugin::VERSION;
-        $this->heidelpayRequest['CRITERION_BASKET_ID'] = $basket->id;
-        $this->heidelpayRequest['CRITERION_ORDER_ID'] = $basket->orderId;
-        $this->heidelpayRequest['CRITERION_ORDER_TIMESTAMP'] = $basket->orderTimestamp;
+        $this->heidelpayRequest['CRITERION_BASKET_ID'] = $basketArray['id'];
+        $this->heidelpayRequest['CRITERION_ORDER_ID'] = $basketArray['orderId'];
+        $this->heidelpayRequest['CRITERION_ORDER_TIMESTAMP'] = $basketArray['orderTimestamp'];
         $this->heidelpayRequest['CRITERION_PUSH_URL'] =
             $this->paymentHelper->getDomain() . '/' . Routes::PUSH_NOTIFICATION_URL;
 
@@ -528,6 +544,7 @@ public function createOrGetPlentyPayment(Transaction $txnData): Payment
      *
      * @param Payment $payment
      * @param int $orderId
+     * @throws \RuntimeException
      */
     public function assignPlentyPayment(Payment $payment, int $orderId)
     {