Skip to content

Commit

Permalink
fix(checkout): prevent cart getting stuck on mailbox price (#67)
Browse files Browse the repository at this point in the history
INT-499
  • Loading branch information
joerivanveen authored May 24, 2024
1 parent fb7c8e9 commit 29d4616
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/Service/Config/ConfigGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,14 @@ private function addPriceForSetting(string $salesChannelId, string $field, strin
*/
public function generateConfigForPackage(SalesChannelContext $salesChannelContext, string $locale): array
{
$config = $this->getPackageTypeSettings($salesChannelContext);
$config = array_merge(
$config,
$config = array_merge(
$this->getPackageTypeSettings($salesChannelContext),
$this->getGeneralSettings($salesChannelContext, $locale)
);

/* set the current package type in cart, for correct calculation of shipping costs */
$this->cartService->addData([CartService::PACKAGE_TYPE_CART_DATA_KEY => $config['packageType']], $salesChannelContext);

$config['carrierSettings'] = $this->getCarrierSettings($salesChannelContext->getSalesChannelId());
$config['translationsFromSettings'] = $this->getDeliveryOptionsStrings(
$salesChannelContext->getSalesChannelId()
Expand Down

0 comments on commit 29d4616

Please sign in to comment.