MahoCommerce · mageaustralia · Jun 25, 2026 · Jun 25, 2026 · Jun 25, 2026 · Jun 25, 2026
diff --git a/app/code/core/Mage/Checkout/controllers/CartController.php b/app/code/core/Mage/Checkout/controllers/CartController.php
@@ -855,7 +855,7 @@ protected function _tryApplyGiftcard(string $code): array
 
             // Check website validity
             $websiteId = (int) $quote->getStore()->getWebsiteId();
-            if ((int) $giftcard->getWebsiteId() !== $websiteId) {
+            if (!in_array($websiteId, $giftcard->getWebsiteIds(), true)) {
                 return ['success' => false, 'message' => ''];
             }
 

diff --git a/app/code/core/Maho/Giftcard/Api/GiftCard.php b/app/code/core/Maho/Giftcard/Api/GiftCard.php
@@ -69,7 +69,7 @@
                 'senderName' => ['type' => 'String', 'description' => 'Sender name'],
                 'senderEmail' => ['type' => 'String', 'description' => 'Sender email'],
                 'message' => ['type' => 'String', 'description' => 'Gift card message'],
-                'websiteId' => ['type' => 'Int', 'description' => 'Website ID (defaults to current)'],
+                'websiteIds' => ['type' => '[Int!]', 'description' => 'Website IDs the card is valid on (defaults to current website)'],
                 'expiresAt' => ['type' => 'String', 'description' => 'Expiration date (YYYY-MM-DD)'],
             ],
             description: 'Create a new gift card',
@@ -120,4 +120,22 @@ class GiftCard extends CrudResource
     public ?string $senderName = null;
     public ?string $senderEmail = null;
     public ?string $message = null;
+
+    /**
+     * Websites the card is valid on (giftcard_website junction). Maps to the
+     * model's `website_ids` pending-change key, so applyToModel() feeds the
+     * junction sync; omitting it on create falls back to the current website.
+     *
+     * @var int[]|null
+     */
+    public ?array $websiteIds = null;
+
+    public static function afterLoad(self $dto, object $model): void
+    {
+        // The junction is lazy-loaded, never present in the model's data
+        // array, so fromModel()'s convention mapping leaves this null.
+        if ($model instanceof \Maho_Giftcard_Model_Giftcard && $model->getId()) {
+            $dto->websiteIds = $model->getWebsiteIds();
+        }
+    }
 }
diff --git a/app/code/core/Maho/Giftcard/Api/GiftCardProcessor.php b/app/code/core/Maho/Giftcard/Api/GiftCardProcessor.php
@@ -95,9 +95,11 @@ private function createGiftcardFromGraphQl(array $context): GiftCard
             'sender_name' => $args['senderName'] ?? null,
             'sender_email' => $args['senderEmail'] ?? null,
             'message' => $args['message'] ?? null,
-            'website_id' => isset($args['websiteId']) ? (int) $args['websiteId'] : null,
             'expires_at' => $args['expiresAt'] ?? null,
         ]);
+        if (!empty($args['websiteIds'])) {
+            $giftcard->setWebsiteIds(array_map('intval', (array) $args['websiteIds']));
+        }
         $giftcard->save();
         $this->sendEmailToRecipient($giftcard);
 

diff --git a/app/code/core/Maho/Giftcard/Block/Adminhtml/Giftcard/Edit/Form.php b/app/code/core/Maho/Giftcard/Block/Adminhtml/Giftcard/Edit/Form.php
@@ -8,266 +8,28 @@
 
 declare(strict_types=1);
 
+/**
+ * Empty `<form id="edit_form">` wrapper auto-resolved by the Edit
+ * Form_Container as its `form` child. The actual fields live in the
+ * Edit/Tab/Form.php block (registered as the General tab in the
+ * adminhtml_giftcard_edit layout handle) and are injected into this
+ * wrapper by the Mage tabs JavaScript via the `destElementId` hook.
+ *
+ * Mirrors the canonical Mage_Adminhtml_Block_Cms_Page_Edit_Form pattern.
+ */
 class Maho_Giftcard_Block_Adminhtml_Giftcard_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
 {
     #[\Override]
     protected function _prepareForm()
     {
-        $model = Mage::registry('current_giftcard');
-
-        $form = new Maho\Data\Form([
-            'id' => 'edit_form',
-            'action' => $this->getUrl('*/*/save', ['id' => $this->getRequest()->getParam('id')]),
-            'method' => 'post',
+        $form = new \Maho\Data\Form([
+            'id'      => 'edit_form',
+            'action'  => $this->getUrl('*/*/save', ['id' => $this->getRequest()->getParam('id')]),
+            'method'  => 'post',
             'enctype' => 'multipart/form-data',
         ]);
-
         $form->setUseContainer(true);
-
-        $fieldset = $form->addFieldset('base_fieldset', ['legend' => Mage::helper('giftcard')->__('Gift Card Information')]);
-
-        if ($model->getId()) {
-            $fieldset->addField('giftcard_id', 'hidden', [
-                'name' => 'giftcard_id',
-            ]);
-        }
-
-        $fieldset->addField('code', 'text', [
-            'name'     => 'code',
-            'label'    => Mage::helper('giftcard')->__('Code'),
-            'title'    => Mage::helper('giftcard')->__('Code'),
-            'required' => false,
-            'note'     => 'Leave empty to auto-generate',
-            'disabled' => $model->getId() ? true : false,
-        ]);
-
-        $fieldset->addField('status', 'select', [
-            'label'    => Mage::helper('giftcard')->__('Status'),
-            'title'    => Mage::helper('giftcard')->__('Status'),
-            'name'     => 'status',
-            'required' => true,
-            'options'  => [
-                Maho_Giftcard_Model_Giftcard::STATUS_ACTIVE => 'Active',
-                Maho_Giftcard_Model_Giftcard::STATUS_DISABLED => 'Disabled',
-                Maho_Giftcard_Model_Giftcard::STATUS_USED => 'Used',
-                Maho_Giftcard_Model_Giftcard::STATUS_EXPIRED => 'Expired',
-            ],
-        ]);
-
-        // Website selector with currency mapping
-        $websites = Mage::app()->getWebsites();
-        $websiteCurrencies = [];
-        $websiteValues = [];
-        foreach ($websites as $website) {
-            $websiteValues[$website->getId()] = $website->getName();
-            $websiteCurrencies[$website->getId()] = $website->getBaseCurrencyCode();
-        }
-
-        if (!$model->getId()) {
-            $defaultWebsiteId = $model->getWebsiteId() ?: (int) array_key_first($websiteCurrencies);
-            $defaultCurrency = $websiteCurrencies[$defaultWebsiteId] ?? '';
-
-            $fieldset->addField('website_id', 'select', [
-                'name'     => 'website_id',
-                'label'    => Mage::helper('giftcard')->__('Website'),
-                'title'    => Mage::helper('giftcard')->__('Website'),
-                'required' => true,
-                'values'   => $websiteValues,
-                'value'    => $defaultWebsiteId,
-                'after_element_html' => $this->_getWebsiteCurrencyScript($websiteCurrencies),
-            ]);
-            $currencyNote = '<span class="giftcard-currency-note">[' . $defaultCurrency . ']</span>';
-        } else {
-            // Show website as read-only for existing gift cards
-            $website = Mage::app()->getWebsite($model->getWebsiteId());
-            $fieldset->addField('website_display', 'note', [
-                'label' => Mage::helper('giftcard')->__('Website'),
-                'text'  => $website->getName() . ' (Base Currency: ' . $model->getCurrencyCode() . ')',
-            ]);
-            $fieldset->addField('website_id', 'hidden', [
-                'name' => 'website_id',
-            ]);
-            $currencyNote = '[' . $model->getCurrencyCode() . ']';
-        }
-
-        if (!$model->getId()) {
-            $fieldset->addField('balance', 'text', [
-                'name'     => 'balance',
-                'label'    => Mage::helper('giftcard')->__('Amount'),
-                'title'    => Mage::helper('giftcard')->__('Amount'),
-                'required' => true,
-                'class'    => 'validate-number validate-greater-than-zero',
-                'note'     => $currencyNote,
-            ]);
-
-            // Hidden field to sync initial_balance with balance on create
-            $fieldset->addField('initial_balance', 'hidden', [
-                'name'  => 'initial_balance',
-            ]);
-        } else {
-            // Existing gift card - show initial balance as read-only reference
-            $website = Mage::app()->getWebsite($model->getWebsiteId());
-            $formattedInitialBalance = $website->getBaseCurrency()->formatPrecision(
-                $model->getInitialBalance(),
-                2,
-                [],
-                false,
-            );
-
-            $fieldset->addField('initial_balance_display', 'note', [
-                'label' => Mage::helper('giftcard')->__('Initial Balance'),
-                'text'  => $formattedInitialBalance,
-            ]);
-
-            // Current balance is editable for manual adjustments
-            $fieldset->addField('balance', 'text', [
-                'name'     => 'balance',
-                'label'    => Mage::helper('giftcard')->__('Current Balance'),
-                'title'    => Mage::helper('giftcard')->__('Current Balance'),
-                'required' => true,
-                'class'    => 'validate-number',
-                'note'     => $currencyNote . '<br>' . Mage::helper('giftcard')->__('Edit this to manually adjust the balance. Use "Admin Comment" to explain the adjustment.'),
-            ]);
-        }
-
-        $fieldset->addField('expires_at', 'date', [
-            'name'   => 'expires_at',
-            'label'  => Mage::helper('giftcard')->__('Expires At'),
-            'title'  => Mage::helper('giftcard')->__('Expires At'),
-            'image'  => $this->getSkinUrl('images/grid-cal.gif'),
-            'format' => 'yyyy-MM-dd',
-            'note'   => 'Leave empty for no expiration',
-        ]);
-
-        $fieldset->addField('recipient_name', 'text', [
-            'name'  => 'recipient_name',
-            'label' => Mage::helper('giftcard')->__('Recipient Name'),
-            'title' => Mage::helper('giftcard')->__('Recipient Name'),
-        ]);
-
-        $fieldset->addField('recipient_email', 'text', [
-            'name'  => 'recipient_email',
-            'label' => Mage::helper('giftcard')->__('Recipient Email'),
-            'title' => Mage::helper('giftcard')->__('Recipient Email'),
-            'class' => 'validate-email',
-        ]);
-
-        $fieldset->addField('sender_name', 'text', [
-            'name'  => 'sender_name',
-            'label' => Mage::helper('giftcard')->__('Sender Name'),
-            'title' => Mage::helper('giftcard')->__('Sender Name'),
-        ]);
-
-        $fieldset->addField('sender_email', 'text', [
-            'name'  => 'sender_email',
-            'label' => Mage::helper('giftcard')->__('Sender Email'),
-            'title' => Mage::helper('giftcard')->__('Sender Email'),
-            'class' => 'validate-email',
-        ]);
-
-        $fieldset->addField('message', 'textarea', [
-            'name'  => 'message',
-            'label' => Mage::helper('giftcard')->__('Message'),
-            'title' => Mage::helper('giftcard')->__('Message'),
-        ]);
-
-        $fieldset->addField('comment', 'textarea', [
-            'name'  => 'comment',
-            'label' => Mage::helper('giftcard')->__('Admin Comment'),
-            'title' => Mage::helper('giftcard')->__('Admin Comment'),
-            'note'  => 'For admin records (balance adjustments)',
-        ]);
-
-        // Show QR code and barcode for existing gift cards
-        if ($model->getId()) {
-            $helper = Mage::helper('giftcard');
-
-            $fieldset->addField('qr_barcode_display', 'note', [
-                'label' => Mage::helper('giftcard')->__('QR Code & Barcode'),
-                'text'  => $this->_getQrBarcodeHtml($model, $helper),
-            ]);
-        }
-
-        $form->setValues($model->getData());
         $this->setForm($form);
-
         return parent::_prepareForm();
     }
-
-    /**
-     * Get JavaScript for updating currency display when website changes
-     *
-     * @param array<int, string> $websiteCurrencies
-     */
-    protected function _getWebsiteCurrencyScript(array $websiteCurrencies): string
-    {
-        $currenciesJson = Mage::helper('core')->jsonEncode($websiteCurrencies);
-
-        return <<<HTML
-<script>
-(function() {
-    const websiteCurrencies = {$currenciesJson};
-
-    function updateCurrencyDisplay() {
-        const websiteSelect = document.getElementById('website_id');
-        if (!websiteSelect) return;
-
-        const websiteId = websiteSelect.value;
-        const currency = websiteCurrencies[websiteId] || '';
-        const currencyText = '[' + currency + ']';
-
-        document.querySelectorAll('.giftcard-currency-note').forEach(function(el) {
-            el.textContent = currencyText;
-        });
-    }
-
-    function init() {
-        const websiteSelect = document.getElementById('website_id');
-        if (websiteSelect) {
-            websiteSelect.addEventListener('change', updateCurrencyDisplay);
-        }
-    }
-
-    if (document.readyState === 'loading') {
-        document.addEventListener('DOMContentLoaded', init);
-    } else {
-        init();
-    }
-})();
-</script>
-HTML;
-    }
-
-    /**
-     * Get QR code and barcode HTML
-     *
-     * @param Maho_Giftcard_Model_Giftcard $model
-     * @param Maho_Giftcard_Helper_Data $helper
-     */
-    protected function _getQrBarcodeHtml($model, $helper): string
-    {
-        $html = '<div style="display: flex; gap: 20px; align-items: flex-start;">';
-
-        if ($helper->isQrCodeEnabled()) {
-            $qrUrl = $helper->getQrCodeDataUrl($model->getCode(), 200);
-            $html .= '<div style="text-align: center;">';
-            $html .= '<div style="margin-bottom: 5px;"><strong>QR Code (Scannable)</strong></div>';
-            $html .= '<img src="' . htmlspecialchars($qrUrl) . '" alt="QR Code" style="border: 1px solid #ccc; padding: 5px; background: white;">';
-            $html .= '<div style="margin-top: 5px; font-family: monospace;">' . htmlspecialchars($model->getCode()) . '</div>';
-            $html .= '</div>';
-        }
-
-        if ($helper->isBarcodeEnabled()) {
-            $barcodeUrl = $helper->getBarcodeDataUrl($model->getCode());
-            $html .= '<div style="text-align: center;">';
-            $html .= '<div style="margin-bottom: 5px;"><strong>Barcode (Code128)</strong></div>';
-            $html .= '<img src="' . htmlspecialchars($barcodeUrl) . '" alt="Barcode" style="border: 1px solid #ccc; padding: 5px; background: white; max-width: 300px;">';
-            $html .= '<div style="margin-top: 5px; font-family: monospace;">' . htmlspecialchars($model->getCode()) . '</div>';
-            $html .= '</div>';
-        }
-
-        $html .= '</div>';
-
-        return $html;
-    }
 }