37282 shipping cost

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 3.2.1
+- Shipping cost as separated parameter
+
 # 3.2.0
 - New payment methods: Bank Transfer, P24, Twint, Carte Bancaire, PostFinane
 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "mediaopt/worldline",
     "description": "Worldline Online Payments",
-    "version": "3.2.0",
+    "version": "3.2.1",
     "type": "shopware-platform-plugin",
     "license": "proprietary",
     "config": {

src/Adapter/WorldlineSDKAdapter.php

@@ -39,6 +39,7 @@
 use OnlinePayments\Sdk\Domain\MerchantAction;
 use OnlinePayments\Sdk\Domain\Order;
 use OnlinePayments\Sdk\Domain\OrderLineDetails;
+use OnlinePayments\Sdk\Domain\OrderReferences;
 use OnlinePayments\Sdk\Domain\PaymentDetailsResponse;
 use OnlinePayments\Sdk\Domain\PaymentProductFilter;
 use OnlinePayments\Sdk\Domain\PaymentProductFiltersHostedCheckout;
@@ -52,6 +53,7 @@
 use OnlinePayments\Sdk\Domain\RefundResponse;
 use OnlinePayments\Sdk\Domain\Shipping;
 use OnlinePayments\Sdk\Domain\ShoppingCart;
+use OnlinePayments\Sdk\Domain\ShoppingCartExtension;
 use OnlinePayments\Sdk\Domain\ThreeDSecure;
 use OnlinePayments\Sdk\Merchant\MerchantClient;
 use Shopware\Core\Checkout\Cart\Price\Struct\CalculatedPrice;
@@ -121,6 +123,13 @@ public function getMerchantClient(array $credentials = []): MerchantClient
             $credentials = $this->getCredentials();
         }
 
+        $shoppingCartExtension = new ShoppingCartExtension(
+            MoptWorldline::PLUGIN_CREATOR,
+            MoptWorldline::PLUGIN_NAME,
+            MoptWorldline::PLUGIN_VERSION,
+            MoptWorldline::PLUGIN_ID
+        );
+
         $communicatorConfiguration = new CommunicatorConfiguration(
             $credentials['apiKey'],
             $credentials['apiSecret'],
@@ -129,6 +138,8 @@ public function getMerchantClient(array $credentials = []): MerchantClient
             null
         );
 
+        $communicatorConfiguration->setShoppingCartExtension($shoppingCartExtension);
+
         $connection = new DefaultConnection();
         $communicator = new Communicator($connection, $communicatorConfiguration);
         $client = new Client($communicator);
@@ -192,6 +203,9 @@ public function createPayment(
 
         $order = new Order();
         $order->setAmountOfMoney($amountOfMoney);
+        $orderRef = new OrderReferences();
+        $orderRef->setMerchantReference($orderEntity->getOrderNumber());
+        $order->setReferences($orderRef);
 
         $hostedCheckoutSpecificInput = new HostedCheckoutSpecificInput();
         $ReturnUrlController = new ReturnUrlController($this->systemConfigService);
@@ -376,7 +390,7 @@ public function createHostedTokenization(array $iframeData): GetHostedTokenizati
      * @param string $currencyISO
      * @param array $iframeData
      * @param GetHostedTokenizationResponse $hostedTokenization
-     * @param OrderEntity $orderEntity
+     * @param ?OrderEntity $orderEntity
      * @return CreatePaymentResponse
      * @throws \Exception
      */
@@ -385,7 +399,7 @@ public function createHostedTokenizationPayment(
         string                        $currencyISO,
         array                         $iframeData,
         GetHostedTokenizationResponse $hostedTokenization,
-        OrderEntity                   $orderEntity
+        ?OrderEntity                   $orderEntity
     ): CreatePaymentResponse
     {
         $token = $hostedTokenization->getToken()->getId();
@@ -702,6 +716,7 @@ private function addCartToRequest(
                 $isNetPrice
             )
         );
+        $shipping->setShippingCost($orderEntity->getShippingCosts()->getTotalPrice() * 100);
 
         $order->setShoppingCart($shoppingCart);
         $order->setShipping($shipping);
@@ -806,12 +821,6 @@ private function createRequestLineItems(
         if ($shippingPrice > 0) {
             $grandPrice += $shippingPrice;
             $grandCount++;
-            $shippingElementId = 'shipping_element';
-            if ($maxPrices['unit']['price'] < $shippingPrice) {
-                $maxPrices['unit']['price'] = $shippingPrice;
-                $maxPrices['unit']['id'] = $shippingElementId;
-            }
-            $requestLineItems[$shippingElementId] = self::createLineItem(self::SHIPPING_LABEL, $currencyISO, $shippingPrice, $shippingPrice, 1);
         }
 
         if ($discount > 0) {

src/MoptWorldline.php

@@ -22,7 +22,9 @@
 class MoptWorldline extends Plugin
 {
     const PLUGIN_NAME = 'MoptWorldline';
-    const PLUGIN_VERSION = '3.2.0';
+    const PLUGIN_VERSION = '3.2.1';
+    const PLUGIN_ID = 'MoptWorldline';
+    const PLUGIN_CREATOR = 'Mediaopt GmbH';
 
     /**
      * @param InstallContext $installContext

src/Service/PaymentHandler.php

@@ -245,7 +245,7 @@ public function capturePayment(string $hostedCheckoutId, int $amount, array $ite
         $amounts = [];
         $log = [];
         $isFinal = ($amount == $customFields[Form::CUSTOM_FIELD_WORLDLINE_PAYMENT_TRANSACTION_CAPTURE_AMOUNT]);
-       /* if ($amount != 0 && !OrderHelper::isOrderLocked($customFields)) {
+        if ($amount != 0 && !OrderHelper::isOrderLocked($customFields)) {
             $captureResponse = $this->adapter->capturePayment($hostedCheckoutId, $amount, $isFinal);
             $this->logger->paymentLog($this->order->getOrderNumber(), 'capturePayment', 0, $captureResponse->toJson());
             $newStatus = $captureResponse->getStatusOutput()->getStatusCode();
@@ -264,14 +264,14 @@ public function capturePayment(string $hostedCheckoutId, int $amount, array $ite
             $log,
             $orderItemsStatus
         );
-        $this->updateOrderTransactionState($newStatus, $hostedCheckoutId, $isFinal);*/
+        $this->updateOrderTransactionState($newStatus, $hostedCheckoutId, $isFinal);
         $message = $this->getSuccessMessage($isFinal, $hostedCheckoutId, 'capturePayment');
 
-        /*if ((!in_array($newStatus, Payment::STATUS_CAPTURE_REQUESTED)
+        if ((!in_array($newStatus, Payment::STATUS_CAPTURE_REQUESTED)
             && !in_array($newStatus, Payment::STATUS_CAPTURED))
             && $amount > 0) {
             return [false, 'failed'];
-        }*/
+        }
         return [true, $message];
     }
 

src/Subscriber/CheckoutSubscriber.php

@@ -59,7 +59,7 @@ public function storefrontRenderEvent(StorefrontRenderEvent $event): void
     private function isCheckoutPage($event): bool
     {
         $route = $event->getRequest()->attributes->get('_route');
-        if (in_array($route, ['frontend.checkout.confirm.page', 'frontend.checkout.cart.page'])) {
+        if (in_array($route, ['frontend.checkout.confirm.page', 'frontend.checkout.cart.page',  'frontend.account.edit-order.page'])) {
             return true;
         }
         return false;