Skip to content

Commit

Permalink
Add dist files for shopware 6.4 and 6.5
Browse files Browse the repository at this point in the history
ISSUE: AD4CR22I-20
  • Loading branch information
filipkojic committed Jan 14, 2025
1 parent b874c9c commit 85ff35c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/Service/ExpressCheckoutService.php
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,12 @@ public function createCart(
->getPaymentMethodByFormattedHandler($formattedHandlerIdentifier, $salesChannelContext->getContext());
}

// Resolving shipping location
$country = $this->expressCheckoutRepository->resolveCountry($salesChannelContext, $newAddress);
$shippingLocation = ShippingLocation::createFromCountry($country);
$shippingLocation = $salesChannelContext->getShippingLocation();

if ($this->isLoggedIn) {
$shippingLocation = $salesChannelContext->getShippingLocation();
// Resolving shipping location for guest
if(!$this->isLoggedIn) {
$country = $this->expressCheckoutRepository->resolveCountry($salesChannelContext, $newAddress);
$shippingLocation = ShippingLocation::createFromCountry($country);
}

// Check Shopware version and create context accordingly
Expand Down

0 comments on commit 85ff35c

Please sign in to comment.