Merge branch 'craft-4' of https://github.com/verbb/gift-voucher into …

…craft-5

# Conflicts:
#	CHANGELOG.md
#	composer.json
#	src/GiftVoucher.php

CHANGELOG.md

@@ -1,10 +1,14 @@
 # Changelog
 
-## Unreleased
+## 4.0.3 - 2024-09-07
 
-### Fixed
+### Changed
+- Change “Share” button to “View” for vouchers, for consistency with Craft/Commerce.
 
-- Fixed saving a code with a decimal value being cast to an int ([#131](https://github.com/verbb/gift-voucher/issues/131))
+### Fixed
+- Fix missing `product` variable when previewing a voucher.
+- Fix an error when duplicating a voucher.
+- Fix saving a code with a decimal value being cast to an int.
 
 ## 4.0.2 - 2024-07-21
 
@@ -32,6 +36,16 @@
 - Now requires Craft `5.0.0+`.
 - Now requires Craft Commerce `5.0.0+`.
 
+## 3.0.14 - 2024-09-07
+
+### Changed
+- Change “Share” button to “View” for vouchers, for consistency with Craft/Commerce.
+
+### Fixed
+- Fix missing `product` variable when previewing a voucher.
+- Fix an error when duplicating a voucher.
+- Fix saving a code with a decimal value being cast to an int.
+
 ## 3.0.13 - 2024-07-10
 
 ### Added

composer.json

@@ -2,7 +2,7 @@
     "name": "verbb/gift-voucher",
     "description": "Sell and redeem digital gift vouchers for Craft Commerce.",
     "type": "craft-plugin",
-    "version": "4.0.2",
+    "version": "4.0.3",
     "keywords": [
         "craft",
         "cms",

src/GiftVoucher.php

@@ -59,7 +59,7 @@ class GiftVoucher extends Plugin
 
     public bool $hasCpSection = true;
     public bool $hasCpSettings = true;
-    public string $schemaVersion = '3.0.0';
+    public string $schemaVersion = '3.0.1';
     public string $minVersionRequired = '2.4.1';
 
 

src/controllers/VouchersPreviewController.php

@@ -157,6 +157,7 @@ private function _showVoucher(Voucher $voucher): Response
 
         return $this->renderTemplate($siteSettings[$voucher->siteId]->template, [
             'voucher' => $voucher,
+            'product' => $voucher,
         ]);
     }
 

src/migrations/Install.php

@@ -122,7 +122,7 @@ public function createIndexes(): void
         $this->createIndex(null, '{{%giftvoucher_redemptions}}', 'codeId', false);
         $this->createIndex(null, '{{%giftvoucher_redemptions}}', 'orderId', false);
 
-        $this->createIndex(null, '{{%giftvoucher_vouchers}}', 'sku', true);
+        $this->createIndex(null, '{{%giftvoucher_vouchers}}', 'sku', false);
         $this->createIndex(null, '{{%giftvoucher_vouchers}}', 'typeId', false);
         $this->createIndex(null, '{{%giftvoucher_vouchers}}', 'taxCategoryId', false);
         $this->createIndex(null, '{{%giftvoucher_vouchers}}', 'shippingCategoryId', false);

src/migrations/m240814_000000_sku_index.php

@@ -0,0 +1,23 @@
+<?php
+namespace verbb\giftvoucher\migrations;
+
+use craft\db\Migration;
+use craft\helpers\MigrationHelper;
+
+class m240814_000000_sku_index extends Migration
+{
+    public function safeUp(): bool
+    {
+        $this->dropIndexIfExists('{{%giftvoucher_vouchers}}', 'sku', true);
+        $this->createIndex(null, '{{%giftvoucher_vouchers}}', 'sku', false);
+
+        return true;
+    }
+
+    public function safeDown(): bool
+    {
+        echo "m240814_000000_sku_index cannot be reverted.\n";
+        return false;
+    }
+}
+

src/templates/vouchers/_edit.html

@@ -26,7 +26,7 @@
                 {% endif %}
 
                 {% if shareUrl is defined %}
-                    <a id="share-btn" href="{{ shareUrl }}" class="btn sharebtn" target="_blank">{{ 'Share' | t('app') }}</a>
+                    <a id="share-btn" href="{{ shareUrl }}" class="btn sharebtn" target="_blank">{{ 'View' | t('app') }}</a>
                 {% endif %}
             </div>
         {% endif %}