Release 4.0.2

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 4.0.2
+- Fixed shipping line item name
+
 # 4.0.1
 - Fixed tax calculation for custom products
 

CHANGELOG_de-DE.md

@@ -1,3 +1,6 @@
+# 4.0.2
+- Der Name der Versand-Einzelposten wurde korrigiert
+
 # 4.0.1
 - Feste Steuerberechnung für kundenspezifische Produkte
 

README.md

@@ -61,7 +61,7 @@ tail -f var/log/postfinancecheckout_payment*.log
 
 ## Documentation
 
-[Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/shopware-6/4.0.1/docs/en/documentation.html)
+[Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/shopware-6/4.0.2/docs/en/documentation.html)
 
 ## License
 

composer.json

@@ -54,5 +54,5 @@
         "postfinancecheckout/sdk": "3.0.0"
     },
     "type": "shopware-platform-plugin",
-    "version": "4.0.1"
+    "version": "4.0.2"
 }

docs/en/documentation.html

@@ -22,7 +22,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/pfpayments/shopware-6/releases/tag/4.0.1/">
+		<a href="https://github.com/pfpayments/shopware-6/releases/tag/4.0.2/">
 			Source
 		</a>
 	</li>

src/Core/Api/WebHooks/Controller/WebHookController.php

@@ -15,6 +15,7 @@
 	Checkout\Order\SalesChannel\OrderService,
 	Framework\Context,
 	Framework\DataAbstractionLayer\Search\Criteria,
+	Framework\DataAbstractionLayer\Search\Sorting\FieldSorting,
 	Framework\Routing\Annotation\RouteScope,
 	System\StateMachine\Aggregation\StateMachineTransition\StateMachineTransitionActions,
 	System\StateMachine\Exception\IllegalTransitionException};
@@ -362,7 +363,9 @@ private function getOrderTransaction(String $orderId, Context $context): OrderTr
 	private function getOrderEntity(string $orderId, Context $context): OrderEntity
 	{
 		if (is_null($this->orderEntity)) {
-			$criteria = (new Criteria([$orderId]))->addAssociations(['deliveries', 'transactions',]);
+			$criteria = (new Criteria([$orderId]))
+				->addAssociations(['deliveries', 'transactions',])
+				->addSorting(new FieldSorting('createdAt'));
 
 			try {
 				$this->orderEntity = $this->container->get('order.repository')->search(

src/Core/Util/Payload/TransactionPayload.php

@@ -363,10 +363,10 @@ protected function getShippingLineItem(): ?LineItemCreate
 					->setName($this->fixLength($shippingName . ' ' . $this->translator->trans('postfinancecheckout.payload.shipping.lineItem'), 150))
 					->setQuantity($this->transaction->getOrder()->getShippingCosts()->getQuantity() ?? 1)
 					->setTaxes($taxes)
-					->setSku($this->fixLength($shippingName . '-Shipping-Line-Item', 200))
+					->setSku($this->fixLength($shippingName . '-Shipping', 200))
 					/** @noinspection PhpParamsInspection */
 					->setType(LineItemType::SHIPPING)
-					->setUniqueId($this->fixLength($shippingName . '-Shipping-Line-Item', 200));
+					->setUniqueId($this->fixLength($shippingName . '-Shipping', 200));
 
 				if (!$lineItem->valid()) {
 					$this->logger->critical('Shipping LineItem payload invalid:', $lineItem->listInvalidProperties());

src/Resources/app/administration/src/module/postfinancecheckout-order/page/postfinancecheckout-order-detail/index.js

@@ -167,6 +167,7 @@ Component.register('postfinancecheckout-order-detail', {
 			const orderRepository = this.repositoryFactory.create('order');
 			const orderCriteria = new Criteria(1, 1);
 			orderCriteria.addAssociation('transactions');
+			orderCriteria.getAssociation('transactions').addSorting(Criteria.sort('createdAt', 'DESC'));
 
 			orderRepository.get(this.orderId, Context.api, orderCriteria).then((order) => {
 				this.order = order;

src/Resources/snippet/storefront/postfinancecheckout.de-DE.json

@@ -15,7 +15,7 @@
     "payload": {
       "adjustmentLineItem": "Anpassung Einzelposten",
       "shipping": {
-        "lineItem": "Versand-Einzelposten",
+        "lineItem": "Versand",
         "name": "Versand"
       },
       "taxes": "Steuern"

src/Resources/snippet/storefront/postfinancecheckout.en-GB.json

@@ -15,7 +15,7 @@
     "payload": {
       "adjustmentLineItem": "Adjustment Line Item",
       "shipping": {
-        "lineItem": "Shipping Line Item",
+        "lineItem": "Shipping",
         "name": "Shipping"
       },
       "taxes": "Taxes"