Skip to content

Commit

Permalink
Merge pull request #63 from buckaroo-it/BP-4215-iDEAL-issuers-still-v…
Browse files Browse the repository at this point in the history
…isible-when-disabled

BP-4215-iDEAL-issuers-still-visible-when-disabled
  • Loading branch information
AlbinaBaraliu authored Mar 11, 2025
2 parents 16c81a3 + 1d32182 commit 8d57d46
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 37 deletions.
10 changes: 9 additions & 1 deletion Magewire/Payment/Method/Ideal.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function updatedIssuer(string $value): ?string
}
public function evaluateCompletion(EvaluationResultFactory $resultFactory): EvaluationResultInterface
{
if ($this->issuer === null) {
if ($this->canShowIssuers() && $this->issuer === null) {
return $resultFactory->createErrorMessageEvent()
->withCustomEvent('payment:method:error')
->withMessage('The bank issuer is required');
Expand Down Expand Up @@ -176,4 +176,12 @@ public function displayAsSelect($storeId = null): bool
$storeId
) === '2';
}

public function canShowIssuers(string $storeId = null): bool {
return $this->scopeConfig->getValue(
MethodIdeal::XPATH_SHOW_ISSUERS,
\Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
) == 1;
}
}
74 changes: 38 additions & 36 deletions view/frontend/templates/component/payment/method/ideal.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -10,46 +10,48 @@ $issuers = $magewire->getIssuers();
?>
<div class="col-span-6">
<div class="flex flex-col gap-y-2">
<?php if ($magewire->displayAsSelect()) { ?>
<label for="buckaroo_magento2_ideal_issuer"><?= $escaper->escapeHtml(__('Select a bank:')); ?></label>
<select name="issuer" id="buckaroo_magento2_ideal_issuer" wire:model="issuer" class="form-select">
<?php if ($magewire->canShowIssuers()) { ?>
<?php if ($magewire->displayAsSelect()) { ?>
<label for="buckaroo_magento2_ideal_issuer"><?= $escaper->escapeHtml(__('Select a bank:')); ?></label>
<select name="issuer" id="buckaroo_magento2_ideal_issuer" wire:model="issuer" class="form-select">
<?php
foreach ($issuers as $issuer) {
?>
<option value="<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>">
<?= $escaper->escapeHtml($issuer["name"]) ?>
</option>
<?php
}
?>
</select>
<?php } else { ?>
<p><?= $escaper->escapeHtml(__('Select a bank:')); ?></p>
<?php
foreach ($issuers as $issuer) {
?>
<option value="<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>">
<?= $escaper->escapeHtml($issuer["name"]) ?>
</option>
<?php
?>
<div class="flex flex-row flex-grow gap-x-2 items-center">
<input
type="radio"
name="issuer"
wire:model="issuer"
id="bk_ideal_issuer_<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>"
value="<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>"
/>
<label
for="bk_ideal_issuer_<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>"
class="flex flex-row flex-grow gap-x-2 items-center">
<img
src="<?= $escaper->escapeUrl($magewire->getImageUrl($issuer["imgName"])) ?>"
alt="<?= $issuer["name"] ?>"
style="max-height:25px;"
/>
<?= $escaper->escapeHtml($issuer["name"]) ?>
</label>
</div>
<?php
}
?>
</select>
<?php } else { ?>
<p><?= $escaper->escapeHtml(__('Select a bank:')); ?></p>
<?php
foreach ($issuers as $issuer) {
?>
<div class="flex flex-row flex-grow gap-x-2 items-center">
<input
type="radio"
name="issuer"
wire:model="issuer"
id="bk_ideal_issuer_<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>"
value="<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>"
/>
<label
for="bk_ideal_issuer_<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>"
class="flex flex-row flex-grow gap-x-2 items-center">
<img
src="<?= $escaper->escapeUrl($magewire->getImageUrl($issuer["imgName"])) ?>"
alt="<?= $issuer["name"] ?>"
style="max-height:25px;"
/>
<?= $escaper->escapeHtml($issuer["name"]) ?>
</label>
</div>
<?php
}
?>
<?php } ?>
<?php } ?>
</div>
</div>

0 comments on commit 8d57d46

Please sign in to comment.