Skip to content

Commit

Permalink
Merge pull request #1198 from plentymarkets/feat/return_btn_display_o…
Browse files Browse the repository at this point in the history
…n_route_switch_off

Feat/return btn display on route switch off
  • Loading branch information
ivladu-plenty authored Jul 1, 2024
2 parents 41450c4 + e470f00 commit 0d37648
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
6 changes: 6 additions & 0 deletions meta/documents/changelog_de.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Release Notes für IO

## v5.0.63 (2024-xx-xx) <a href="https://github.com/plentymarkets/plugin-io/compare/5.0.62...5.0.63" target="_blank" rel="noopener"><b>Übersicht aller Änderungen</b></a>

### Geändert

- Der Status der `order-return`-Route wird jetzt für die Bestellbestätigung für Gastbestellungen abgefragt.

## v5.0.62 (2024-04-03) <a href="https://github.com/plentymarkets/plugin-io/compare/5.0.61...5.0.62" target="_blank" rel="noopener"><b>Übersicht aller Änderungen</b></a>

### Behoben
Expand Down
6 changes: 6 additions & 0 deletions meta/documents/changelog_en.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Release Notes for IO

## v5.0.63 (2024-xx-xx) <a href="https://github.com/plentymarkets/plugin-io/compare/5.0.62...5.0.63" target="_blank" rel="noopener"><b>Overview of all changes</b></a>

### Changed

- The status of `order-return` route is now checked on the order confirmation page for a guest users.

## v5.0.62 (2024-04-03) <a href="https://github.com/plentymarkets/plugin-io/compare/5.0.61...5.0.62" target="_blank" rel="noopener"><b>Overview of all changes</b></a>

### Fixed
Expand Down
4 changes: 4 additions & 0 deletions src/Controllers/ConfirmationController.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@ public function showConfirmation(int $orderId = 0, $orderAccesskey = '', $catego
'category' => $category,
'data' => $order,
'showAdditionalPaymentInformation' => true,
'isReturnEnabled' => in_array(
RouteConfig::ORDER_RETURN,
RouteConfig::getEnabledRoutes(true)
),
"isOrderValid" => $orderAccessStatus === ConfirmationRepositoryContract::STATUS_ORDER_CONFIRMATION_SOFTLOGIN ? true : false
],
false
Expand Down

0 comments on commit 0d37648

Please sign in to comment.