vr-payment/archived-shopware-6
1
0
Fork 0
mirror of https://github.com/vr-payment/shopware-6.git synced 2026-06-04 10:53:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Release 6.1.12

Browse Source
This commit is contained in:
andrewrowanwallee
2025-03-05 12:03:51 +01:00
parent 350057e327
commit 3f291ef7ea
13 changed files with 219 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+7
View File
@@ -1,3 +1,10 @@
# 6.1.12
- Compatibility with 6.6.10.x
- Prevent duplicate transactions being created when the first times out
- Fix for error when changing space credentials
- Payment status now shows refunded/partially refunded
- Order delivery status now shows 'open' instead of 'hold'
# 6.1.11
- Implement payment page integration.
- Fixed bug with duplicate payment methods appearing
CHANGELOG_de-DE.md
+7
View File
@@ -1,3 +1,10 @@
# 6.1.12
- Kompatibilität mit 6.6.10.x
- Verhindern Sie, dass beim ersten Timeout doppelte Transaktionen erstellt werden
- Fehler beim Ändern der Space-Anmeldeinformationen behoben
- Der Zahlungsstatus zeigt jetzt „erstattet/teilweise erstattet“ an
- Der Lieferstatus der Bestellung wird jetzt „Offen“ statt „Halten“ angezeigt.
# 6.1.11
- Integration der Zahlungsseite implementieren.
- Fehler mit doppelten angezeigten Zahlungsmethoden behoben
README.md
+1 -1
View File
@@ -73,7 +73,7 @@ tail -f var/log/vrpayment_payment*.log
## Documentation
[Documentation](https://gateway.vr-payment.de/doc/shopware-6/6.1.11/docs/en/documentation.html)
[Documentation](https://gateway.vr-payment.de/doc/shopware-6/6.1.12/docs/en/documentation.html)
## License
composer.json
+62 -62
View File
@@ -1,63 +1,63 @@
{
"authors": [
{
"homepage": "https://www.vr-payment.de/",
"name": "VRPay"
}
],
"autoload": {
"psr-4": {
"VRPaymentPayment\\": "src/"
}
},
"description": "VRPayment integration for Shopware 6",
"extra": {
"copyright": "(c) by VRPay",
"description": {
"de-DE": "VRPayment integration f\u00fcr Shopware 6",
"en-GB": "VRPayment integration for Shopware 6",
"fr-FR": "Int\u00e9gration de VRPayment pour Shopware 6",
"it-IT": "Integrazione VRPayment per Shopware"
},
"label": {
"de-DE": "VRPayment Produkte f\u00fcr Shopware 6",
"en-GB": "VRPayment Products for Shopware 6",
"fr-FR": "VRPayment Produits for Shopware 6",
"it-IT": "VRPayment Prodotti per Shopware 6"
},
"manufacturerLink": {
"de-DE": "https://www.vr-payment.de/",
"en-GB": "https://www.vr-payment.de/",
"fr-FR": "https://www.vr-payment.de/",
"it-IT": "https://www.vr-payment.de/"
},
"supportLink": {
"de-DE": "https://www.vr-payment.de/hotline",
"en-GB": "https://www.vr-payment.de/hotline",
"fr-FR": "https://www.vr-payment.de/hotline",
"it-IT": "https://www.vr-payment.de/hotline"
},
"shopware-plugin-class": "VRPaymentPayment\\VRPaymentPayment"
},
"homepage": "https://www.vr-payment.de//",
"keywords": [
"VRPay",
"payment",
"php",
"shopware"
],
"license": "Apache-2.0",
"name": "vrpayment/shopware-6",
"require": {
"ext-curl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"php": ">=8.2",
"shopware/core": "6.6.*",
"shopware/administration": "~6.6.0",
"shopware/storefront": "6.6.*",
"vrpayment/sdk": "4.6.0"
},
"type": "shopware-platform-plugin",
"version": "6.1.11"
}
"authors": [
{
"homepage": "https://www.vr-payment.de/",
"name": "VRPay"
}
],
"autoload": {
"psr-4": {
"VRPaymentPayment\\": "src/"
}
},
"description": "VRPayment integration for Shopware 6",
"extra": {
"copyright": "(c) by VRPay",
"description": {
"de-DE": "VRPayment integration für Shopware 6",
"en-GB": "VRPayment integration for Shopware 6",
"fr-FR": "Intégration de VRPayment pour Shopware 6",
"it-IT": "Integrazione VRPayment per Shopware"
},
"label": {
"de-DE": "VRPayment Produkte für Shopware 6",
"en-GB": "VRPayment Products for Shopware 6",
"fr-FR": "VRPayment Produits for Shopware 6",
"it-IT": "VRPayment Prodotti per Shopware 6"
},
"manufacturerLink": {
"de-DE": "https://www.vr-payment.de/",
"en-GB": "https://www.vr-payment.de/",
"fr-FR": "https://www.vr-payment.de/",
"it-IT": "https://www.vr-payment.de/"
},
"supportLink": {
"de-DE": "https://www.vr-payment.de/hotline",
"en-GB": "https://www.vr-payment.de/hotline",
"fr-FR": "https://www.vr-payment.de/hotline",
"it-IT": "https://www.vr-payment.de/hotline"
},
"shopware-plugin-class": "VRPaymentPayment\\VRPaymentPayment"
},
"homepage": "https://www.vr-payment.de//",
"keywords": [
"VRPay",
"payment",
"php",
"shopware"
],
"license": "Apache-2.0",
"name": "vrpayment/shopware-6",
"require": {
"ext-curl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"php": ">=8.2",
"shopware/core": "~6.6.0",
"shopware/administration": "~6.6.0",
"shopware/storefront":"~6.6.0",
"vrpayment/sdk": "^4.0.0"
},
"type": "shopware-platform-plugin",
"version": "6.1.12"
}
docs/en/documentation.html
+1 -1
View File
@@ -23,7 +23,7 @@
</a>
</li>
<li>
<a href="https://github.com/vr-payment/shopware-6/releases/tag/6.1.11/">
<a href="https://github.com/vr-payment/shopware-6/releases/tag/6.1.12/">
Source
</a>
</li>
src/Core/Api/PaymentMethodConfiguration/Service/PaymentMethodConfigurationService.php
+21 -11
View File
@@ -213,8 +213,7 @@ class PaymentMethodConfigurationService {
{
// Configuration
$settings = $this->settingsService->getSettings($this->getSalesChannelId());
$this->setSpaceId($settings->getSpaceId())
->setApiClient($settings->getApiClient());
$this->setSpaceId($settings->getSpaceId())->setApiClient($settings->getApiClient());
$this->disablePaymentMethodConfigurations($context);
$this->enablePaymentMethodConfigurations($context);
@@ -254,9 +253,14 @@ class PaymentMethodConfigurationService {
$paymentMethodData = [];
$salesChannelPaymentMethodData = [];
$criteria = (new Criteria())->addFilter(new EqualsFilter('spaceId', $this->getSpaceId()));
$criteria = (new Criteria())->addFilter(new EqualsFilter('state', 'ACTIVE'));
$paymentMethodConfigurationEntities = $this->vRPaymentPaymentMethodConfigurationRepository
/**
* @var $vRPaymentPMConfigurationRepository
*/
$vRPaymentPMConfigurationRepository = $this->container->get(PaymentMethodConfigurationEntityDefinition::ENTITY_NAME . '.repository');
$paymentMethodConfigurationEntities = $vRPaymentPMConfigurationRepository
->search($criteria, $context)
->getEntities();
@@ -275,16 +279,11 @@ class PaymentMethodConfigurationService {
'id' => $paymentMethodConfigurationEntity->getId(),
'active' => false,
];
$salesChannelPaymentMethodData[] = [
'paymentMethodId' => $paymentMethodConfigurationEntity->getId(),
];
}
try {
$this->vRPaymentPaymentMethodConfigurationRepository->update($data, $context);
$this->paymentMethodRepository->update($paymentMethodData, $context);
$this->salesChannelPaymentRepository->delete($salesChannelPaymentMethodData, $context);
} catch (\Exception $exception) {
$this->logger->critical($exception->getMessage());
}
@@ -369,7 +368,13 @@ class PaymentMethodConfigurationService {
];
$this->upsertPaymentMethod($id, $paymentMethodConfiguration, $context);
$this->vRPaymentPaymentMethodConfigurationRepository->upsert([$data], $context);
try {
$this->container->get(PaymentMethodConfigurationEntityDefinition::ENTITY_NAME . '.repository')->upsert([$data], $context);
} catch (\Exception $e) {
$this->logger->error($e->getMessage(), [$e->getTraceAsString()]);
}
}
}
@@ -500,7 +505,12 @@ class PaymentMethodConfigurationService {
$data = array_filter($data);
$this->paymentMethodRepository->upsert([$data], $context);
try {
$this->paymentMethodRepository->upsert([$data], $context);
} catch (\Exception $e) {
$this->logger->error($e->getMessage(), [$e->getTraceAsString()]);
}
}
/**
src/Core/Api/Transaction/Service/TransactionService.php
+6 -7
View File
@@ -132,13 +132,12 @@ class TransactionService
$settings = $this->settingsService->getSettings($salesChannelId);
$apiClient = $settings->getApiClient();
$failedStates = [
TransactionState::DECLINE,
TransactionState::FAILED,
TransactionState::VOIDED,
];
$pendingTransaction = $this->read($_SESSION['transactionId'], $salesChannelId);
if (in_array($pendingTransaction->getState(), $failedStates)) {
$transactionId = $_SESSION['transactionId'] ?? null;
if ($transactionId !== null) {
$pendingTransaction = $this->read($_SESSION['transactionId'], $salesChannelId);
}
if ($transactionId === null || $pendingTransaction === null || $pendingTransaction->getState() !== TransactionState::PENDING) {
unset($_SESSION['transactionId']);
$pendingTransactionId = $this->createPendingTransaction($salesChannelContext);
$pendingTransaction = $this->read($pendingTransactionId, $salesChannelId);
src/Core/Api/WebHooks/Controller/WebHookController.php
+32 -11
View File
@@ -638,25 +638,46 @@ class WebHookController extends AbstractController {
private function unholdDelivery(string $orderId, Context $context): void
{
try {
/**
* @var OrderDeliveryStateHandler $orderDeliveryStateHandler
*/
$order = $this->getOrderEntity($orderId, $context);
/**
* @var OrderDeliveryEntity $orderDelivery
*/
$criteria = new Criteria([$orderId]);
$criteria->addAssociation('deliveries.stateMachineState');
$order = $this->container->get('order.repository')
->search($criteria, $context)
->first();
if (!$order) {
$this->logger->info('Order not found: ' . $orderId);
return;
}
/** @var OrderDeliveryEntity|null $orderDelivery */
$orderDelivery = $order->getDeliveries()?->last();
if (null === $orderDelivery) {
$this->logger->info('No deliveries found for order: ' . $orderId);
return;
}
if ($orderDelivery->getStateMachineState()?->getTechnicalName() !== OrderDeliveryStateHandler::STATE_HOLD){
$orderDeliveryState = $orderDelivery->getStateMachineState();
if (!$orderDeliveryState) {
$this->logger->info('Order delivery state is null for order: ' . $orderId);
return;
}
$technicalName = $orderDeliveryState->getTechnicalName();
$this->logger->info('Order delivery state: ' . $technicalName);
if ($technicalName !== OrderDeliveryStateHandler::STATE_HOLD) {
$this->logger->info('Order delivery is not on hold, skipping unhold process.');
return;
}
/** @var OrderDeliveryStateHandler $orderDeliveryStateHandler */
$orderDeliveryStateHandler = $this->container->get(OrderDeliveryStateHandler::class);
$orderDeliveryStateHandler->unhold($orderDelivery->getId(), $context);
$this->logger->info('Successfully unheld order delivery for order: ' . $orderId);
} catch (\Exception $exception) {
$this->logger->info($exception->getMessage(), $exception->getTrace());
$this->logger->error('Error unholding order delivery: ' . $exception->getMessage(), $exception->getTrace());
}
}
@@ -689,7 +710,7 @@ class WebHookController extends AbstractController {
* @var OrderDeliveryEntity $orderDelivery
*/
$orderDelivery = $order->getDeliveries()?->last();
if (null === $orderDelivery) {
return;
}
src/Core/Api/WebHooks/Strategy/WebHookRefundStrategy.php
+8 -28
View File
@@ -125,41 +125,21 @@ class WebHookRefundStrategy extends WebHookStrategyBase implements WebhookStrate
$orderId = $this->getOrderIdByTransaction($refund);
if(!empty($orderId)) {
$this->executeLocked($orderId, $context, function () use ($orderId, $refund, $context, $request) {
if ($request->getListenerEntityTechnicalName() == WebHookRequest::REFUND && $request->getState() == RefundState::SUCCESSFUL) {
$this->refundService->upsert($refund, $context);
$orderTransactionId = $refund->getTransaction()->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_TRANSACTION_ID];
$orderTransaction = $this->getOrderTransaction($orderId, $context);
$this->refundService->upsert($refund, $context);
$orderTransactionId = $refund->getTransaction()->getMetaData()[TransactionPayload::VRPAYMENT_METADATA_ORDER_TRANSACTION_ID];
$orderTransaction = $this->getOrderTransaction($orderId, $context);
if (
in_array(
$orderTransaction->getStateMachineState()?->getTechnicalName(),
[
OrderTransactionStates::STATE_PAID,
OrderTransactionStates::STATE_PARTIALLY_PAID,
]
) &&
($request->getState() == RefundState::SUCCESSFUL)
) {
if ($refund->getAmount() == $orderTransaction->getAmount()->getTotalPrice()) {
$this->orderTransactionStateHandler->refund($orderTransactionId, $context);
} else {
if ($refund->getAmount() < $orderTransaction->getAmount()->getTotalPrice()) {
$this->orderTransactionStateHandler->refundPartially($orderTransactionId, $context);
}
}
} elseif ($orderTransaction->getStateMachineState()?->getTechnicalName() ===
OrderTransactionStates::STATE_PARTIALLY_REFUNDED &&
($request->getState() == RefundState::SUCCESSFUL)
) {
$transactionByOrderTransactionId = $this->transactionService->getByOrderTransactionId($orderTransactionId, $context);
$totalRefundedAmount = $this->getTotalRefundedAmount($transactionByOrderTransactionId->getTransactionId(), $context);
if (floatval($orderTransaction->getAmount()->getTotalPrice()) - $totalRefundedAmount <= 0) {
$leftToRefund = floatval($orderTransaction->getAmount()->getTotalPrice()) - $totalRefundedAmount;
if ($leftToRefund > 0) {
$this->orderTransactionStateHandler->refundPartially($orderTransactionId, $context);
} elseif ($leftToRefund === floatval(0)) { // This trick is used, because it's float type and 0 is int
$this->orderTransactionStateHandler->refund($orderTransactionId, $context);
}
}
});
}
src/Core/Api/WebHooks/Strategy/WebHookStrategyBase.php
+40 -8
View File
@@ -306,6 +306,14 @@ abstract class WebHookStrategyBase implements WebHookStrategyInterface {
return $this->getOrderEntity($orderId, $context)->getTransactions()->last();
}
/**
* Unholds the delivery of an order.
*
* This method changes the state of an order's last delivery from 'held' to 'released', allowing further processing like shipping.
*
* @param string $orderId The unique identifier of the order.
* @param Context $context The context of the current operation, including scope and permissions.
*/
/**
* Unholds the delivery of an order.
*
@@ -317,22 +325,46 @@ abstract class WebHookStrategyBase implements WebHookStrategyInterface {
protected function unholdDelivery(string $orderId, Context $context): void
{
try {
$order = $this->getOrderEntity($orderId, $context);
/** @var OrderDeliveryEntity $orderDelivery */
$orderDelivery = $order->getDeliveries()?->last();
if (null === $orderDelivery) {
$criteria = new Criteria([$orderId]);
$criteria->addAssociation('deliveries.stateMachineState');
$order = $this->container->get('order.repository')
->search($criteria, $context)
->first();
if (!$order) {
$this->logger->info('Order not found: ' . $orderId);
return;
}
if ($orderDelivery->getStateMachineState()?->getTechnicalName() !== OrderDeliveryStateHandler::STATE_HOLD){
/** @var OrderDeliveryEntity|null $orderDelivery */
$orderDelivery = $order->getDeliveries()?->last();
if (null === $orderDelivery) {
$this->logger->info('No deliveries found for order: ' . $orderId);
return;
}
$orderDeliveryState = $orderDelivery->getStateMachineState();
if (!$orderDeliveryState) {
$this->logger->info('Order delivery state is null for order: ' . $orderId);
return;
}
$technicalName = $orderDeliveryState->getTechnicalName();
$this->logger->info('Order delivery state: ' . $technicalName);
if ($technicalName !== OrderDeliveryStateHandler::STATE_HOLD) {
$this->logger->info('Order delivery is not on hold, skipping unhold process.');
return;
}
/** @var OrderDeliveryStateHandler $orderDeliveryStateHandler */
$orderDeliveryStateHandler = $this->container->get(OrderDeliveryStateHandler::class);
$orderDeliveryStateHandler->unhold($orderDelivery->getId(), $context);
$this->logger->info('Successfully unheld order delivery for order: ' . $orderId);
} catch (\Exception $exception) {
$this->logger->info($exception->getMessage(), $exception->getTrace());
$this->logger->error('Error unholding order delivery: ' . $exception->getMessage(), $exception->getTrace());
}
}
@@ -362,7 +394,7 @@ abstract class WebHookStrategyBase implements WebHookStrategyInterface {
$orderDeliveryStateHandler = $this->container->get(OrderDeliveryStateHandler::class);
/** @var OrderDeliveryEntity $orderDelivery */
$orderDelivery = $order->getDeliveries()?->last();
if (null === $orderDelivery) {
return;
}
src/Core/Util/Payload/TransactionPayload.php
+32 -29
View File
@@ -209,7 +209,7 @@ class TransactionPayload extends AbstractPayload
return $transactionPayload;
}
/**
* Get transaction line items
*
@@ -220,30 +220,30 @@ class TransactionPayload extends AbstractPayload
{
$lineItems = [];
$items = $this->transaction->getOrder()->getLineItems();
foreach ($items as $shopLineItem) {
if ($this->shouldSkipLineItem($shopLineItem)) {
continue;
}
if ($this->isCustomProductOption($shopLineItem)) {
$shopLineItem = $this->updateCustomProductOptionLabel($shopLineItem);
}
$lineItem = $this->createLineItem($shopLineItem);
$this->validateLineItem($lineItem);
$lineItems[] = $lineItem;
}
$this->processDiscounts($items, $lineItems);
$this->sortLineItemsByName($lineItems);
$this->addOptionalLineItems($lineItems);
return $lineItems;
}
/**
* Determine if a line item should be skipped.
*/
@@ -272,7 +272,7 @@ class TransactionPayload extends AbstractPayload
$shopLineItem->setLabel($customProductOptionParentLabel . ': ' . $shopLineItem->getLabel());
return $shopLineItem;
}
/**
* Validate the created line item.
*/
@@ -283,7 +283,7 @@ class TransactionPayload extends AbstractPayload
throw new InvalidPayloadException('LineItem payload invalid: ' . json_encode($lineItem->listInvalidProperties()));
}
}
/**
* Process discounts from the order items and add them to the line items array.
*/
@@ -293,12 +293,14 @@ class TransactionPayload extends AbstractPayload
$discounts = array_filter($itemsArray, function ($orderItem) {
return $orderItem->getType() === 'promotion';
});
if ($discounts) {
$this->addDiscountLineItem(current($discounts), $lineItems);
foreach ($discounts as $discount) {
$this->addDiscountLineItem($discount, $lineItems);
}
}
}
/**
* Add discount line item.
*/
@@ -306,23 +308,24 @@ class TransactionPayload extends AbstractPayload
{
$calculatedPrice = $discount->getPrice();
$calculatedTaxesCollection = $calculatedPrice->getCalculatedTaxes();
foreach ($calculatedTaxesCollection as $calculatedTax) {
$rate = $calculatedTax->getTaxRate();
$lineItem = new LineItemCreate();
$amount = $this->calculateDiscountAmount($calculatedTax);
$discountName = $discount->getLabel();
$lineItem->setAmountIncludingTax($amount)
->setName(sprintf('DISCOUNT: %s (%s%% tax)', $discount->getLabel(), $rate))
->setQuantity(1)
->setShippingRequired(false)
->setSku('sku-discount-' . $rate, 200)
->setSku('sku-discount-' . $rate . '-' . $discountName, 200)
->setType(LineItemType::DISCOUNT)
->setUniqueId('coupon-sku-discount-' . $rate . '-' . $rate);
->setUniqueId('coupon-sku-discount-' . $rate . '-' . $rate . '-' . $discountName);
$taxRate = new TaxCreate(['title' => 'Discount Tax: ' . $rate, 'rate' => $rate]);
$lineItem->setTaxes([$taxRate]);
$lineItems[] = $lineItem;
}
}
@@ -348,7 +351,7 @@ class TransactionPayload extends AbstractPayload
return strcmp($lineItem1->getName(), $lineItem2->getName());
});
}
/**
* Add optional shipping and adjustment line items.
*/
@@ -363,7 +366,7 @@ class TransactionPayload extends AbstractPayload
$lineItems = array_merge($lineItems, $multipleShippingLineItems);
}
}
if ($adjustmentLineItem = $this->getAdjustmentLineItem($lineItems)) {
$lineItems[] = $adjustmentLineItem;
}
@@ -554,7 +557,7 @@ class TransactionPayload extends AbstractPayload
}
return null;
}
/**
* @return array
*/
@@ -564,9 +567,9 @@ class TransactionPayload extends AbstractPayload
if ($this->transaction->getOrder()->getShippingTotal() > 0) {
$lineItems = [];
$shippingName = $this->salesChannelContext->getShippingMethod()->getName() ?? $this->translator->trans('vrpayment.payload.shipping.name');
$isFirst = true;
foreach ($this->transaction->getOrder()->getShippingCosts()->getCalculatedTaxes() as $taxItem) {
$amount = self::round($taxItem->getPrice());
if ($this->transaction->getOrder()->getTaxStatus() === 'net') {
@@ -576,7 +579,7 @@ class TransactionPayload extends AbstractPayload
$tax = (new TaxCreate())
->setRate($taxRate)
->setTitle('Tax rate: '.$taxRate);
$name = $taxRate . '%-' . $shippingName;
$lineItem = (new LineItemCreate())
->setAmountIncludingTax($amount)
@@ -586,18 +589,18 @@ class TransactionPayload extends AbstractPayload
->setSku($this->fixLength($name . '-Shipping', 200))
->setType($isFirst ? LineItemType::SHIPPING : LineItemType::FEE) // First item as SHIPPING, rest as FEE
->setUniqueId($this->fixLength($name . '-Shipping', 200));
if (!$lineItem->valid()) {
$this->logger->critical('Shipping LineItem payload invalid:', $lineItem->listInvalidProperties());
throw new InvalidPayloadException('Shipping LineItem payload invalid:' . json_encode($lineItem->listInvalidProperties()));
}
$lineItems[] = $lineItem;
$isFirst = false;
}
return $lineItems;
}
} catch (\Exception $exception) {
$this->logger->critical(__CLASS__ . ' : ' . __FUNCTION__ . ' : ' . $exception->getMessage());
}
src/Resources/app/storefront/dist/storefront/js/v-r-payment-payment/v-r-payment-payment.js
Vendored
+1
View File
File diff suppressed because one or more lines are too long
src/Resources/public/administration/js/v-r-payment-payment.js
+1 -1
View File
File diff suppressed because one or more lines are too long