Merge branch 'next-40011/auto-imported-from-github' into 'trunk'

NEXT-40011 - Add created-at colum to manually generated coupon codes See merge request shopware/6/product/platform!15520
pweyck · Dec 11, 2024 · 5bca9e8 · 5bca9e8
2 parents dd343d8 + 3ef28bf
commit 5bca9e8
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 0 deletions.
diff --git a/changelog/_unreleased/2024-12-11-add-created-at-column-to-coupon-codes.md b/changelog/_unreleased/2024-12-11-add-created-at-column-to-coupon-codes.md
@@ -0,0 +1,9 @@
+---
+title: Allow duplicate promotion
+issue: NEXT-40011
+author: Alexander Menk
+author_email: [email protected]
+author_github: amenk
+---
+# Administration
+* Added `createdAt` column in the list of manually generated coupon codes
diff --git a/...promotion-v2/component/promotion-codes/sw-promotion-v2-individual-codes-behavior/index.js b/...promotion-v2/component/promotion-codes/sw-promotion-v2-individual-codes-behavior/index.js
@@ -82,12 +82,20 @@ export default {
                     property: 'payload.customerName',
                     label: this.$tc('sw-promotion-v2.detail.base.codes.individual.columnCustomer'),
                 },
+                {
+                    property: 'createdAt',
+                    label: this.$tc('sw-promotion-v2.detail.base.codes.individual.columnCreatedAt'),
+                },
             ];
         },
 
         assetFilter() {
             return Shopware.Filter.getByName('asset');
         },
+
+        dateFilter() {
+            return Shopware.Filter.getByName('date');
+        },
     },
 
     mounted() {

diff --git a/...romotion-v2-individual-codes-behavior/sw-promotion-v2-individual-codes-behavior.html.twig b/...romotion-v2-individual-codes-behavior/sw-promotion-v2-individual-codes-behavior.html.twig
@@ -122,6 +122,12 @@
                 </template>
                 {% endblock %}
 
+                {% block sw_promotion_v2_individual_codes_behavior_grid_created_at %}
+                <template #column-createdAt="{ item }">
+                    {{ dateFilter(item.createdAt, { hour: '2-digit', minute: '2-digit' }) }}
+                </template>
+                {% endblock %}
+
                 <!-- eslint-disable-next-line sw-deprecation-rules/no-twigjs-blocks -->
                 {% block sw_promotion_v2_individual_codes_behavior_grid_actions %}
                 <template #actions="{ item }">

diff --git a/...Administration/Resources/app/administration/src/module/sw-promotion-v2/snippet/de-DE.json b/...Administration/Resources/app/administration/src/module/sw-promotion-v2/snippet/de-DE.json
@@ -71,6 +71,7 @@
                         "columnCode": "Code",
                         "columnRedeemed": "Eingelöst",
                         "columnCustomer": "Kunde",
+                        "columnCreatedAt": "Erzeugt am",
                         "textDeleteConfirm": "Möchtest Du den Aktionscode \"{code}\" wirklich löschen? | Möchtest Du diese {count} Aktionscodes wirklich löschen?",
                         "openCustomer": "Kunde öffnen",
                         "routingError": "Der Kunde \"{name}\" konnte nicht gefunden werden.",

diff --git a/...Administration/Resources/app/administration/src/module/sw-promotion-v2/snippet/en-GB.json b/...Administration/Resources/app/administration/src/module/sw-promotion-v2/snippet/en-GB.json
@@ -71,6 +71,7 @@
                         "columnCode": "Code",
                         "columnRedeemed": "Redeemed",
                         "columnCustomer": "Customer",
+                        "columnCreatedAt": "Generated at",
                         "textDeleteConfirm": "Are you sure you want to delete the code \"{code}\"? | Are you sure cou want to delete these {count} codes?",
                         "openCustomer": "Open customer",
                         "routingError": "The customer \"{name}\" has not been found.",