Skip to content

Commit

Permalink
Merge pull request #134 from OXID-eSales/AM-151
Browse files Browse the repository at this point in the history
Apple payment method not listed when not on apple machine
  • Loading branch information
mariolorenz authored Nov 15, 2024
2 parents cc662ea + f5f4914 commit df48330
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [1.1.8] - 2024-??-??

- use Adyen assets on the payment page again so that ApplePay is hidden if necessary. Was accidentally removed in release v1.1.7

## [1.1.7] - 2024-10-18

### NEW
Expand Down
2 changes: 2 additions & 0 deletions views/frontend/blocks/page/checkout/select_payment.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
[{* We include it as template, so that it can be modified in custom themes *}]
[{include file="modules/osc/adyen/payment/adyen_payment_inauthorisation.tpl"}]
[{else}]
[{* We include it as template, so that it can be modified in custom themes *}]
[{include file="modules/osc/adyen/payment/adyen_assets.tpl"}]
[{$smarty.block.parent}]
[{/if}]

0 comments on commit df48330

Please sign in to comment.