fix: refund modal

Author: cyl3x

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 9.7.4
+- Fixes an issue, where input fields of the refund modal could be missing
+
 # 9.7.3
 - Fixes an issue, where card fields were not displayed in the after order payment process (shopware/shopware#7643)
 

CHANGELOG_de-DE.md

@@ -1,3 +1,6 @@
+# 9.7.4
+- Behebt ein Problem, bei dem die Eingabefelder des Modals für Rückerstattungen fehlen konnten
+
 # 9.7.3
 - Behebt ein Problem, bei dem Kartenfelder im Zahlungsprozess nach einer Bestellung nicht angezeigt wurden (shopware/shopware#7643)
 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "swag/paypal",
     "description": "PayPal integration for Shopware 6",
-    "version": "9.7.3",
+    "version": "9.7.4",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "authors": [

src/Resources/app/administration/src/module/swag-paypal-payment/component/swag-paypal-text-field/index.js

@@ -3,13 +3,51 @@ import template from './swag-paypal-text-field.html.twig';
 const { Component } = Shopware;
 
 /**
- * @protected
+ * @deprecated tag:v10.0.0 - Will be removed, use `max-length` of mt-text-field
+ *
  * @description Simple text field. But this one allows attribute downpassing to the input field instead of the block.
- * @status ready
- * @example-type dynamic
- * @component-example
- * <swag-paypal-text-field label="Name" placeholder="placeholder goes here..."></swag-paypal-text-field>
  */
-Component.extend('swag-paypal-text-field', 'sw-text-field', {
+Component.register('swag-paypal-text-field', {
     template,
+
+    emits: ['update:value'],
+
+    props: {
+        value: {
+            type: String,
+            required: false,
+            default: null,
+        },
+        maxLength: {
+            type: [String, Number],
+            required: false,
+            default: null,
+        },
+    },
+
+    computed: {
+        allowedLength() {
+            return this.maxLength ? Number(this.maxLength) : null;
+        },
+
+        currentLength() {
+            return this.maxLength ? (this.value ?? '').length : null;
+        },
+
+        hintText() {
+            return this.allowedLength
+                ? `${this.currentLength}/${this.allowedLength}`
+                : null;
+        },
+    },
+
+    methods: {
+        updateValue(value) {
+            if (this.allowedLength && (value ?? '').length > this.allowedLength) {
+                value = (value ?? '').substring(0, this.allowedLength);
+            }
+
+            this.$emit('update:value', value);
+        },
+    },
 });

src/Resources/app/administration/src/module/swag-paypal-payment/component/swag-paypal-text-field/swag-paypal-text-field.html.twig

@@ -1,41 +1,9 @@
 {% block sw_text_field %}
-<sw-contextual-field
+<sw-text-field
+    ref="field"
     v-bind="$attrs"
-    class="sw-field--text"
-    :name="formFieldName"
-    @inheritance-restore="$emit('inheritance-restore', $event)"
-    @inheritance-remove="$emit('inheritance-remove', $event)"
->
-
-    <template v-if="hasPrefix" #sw-contextual-field-prefix="{ disabled, identification }">
-        <slot name="prefix" v-bind="{disabled, identification}" />
-    </template>
-
-    <template #sw-field-input="{ identification, error, disabled, size, setFocusClass, removeFocusClass, hasSuffix, hasPrefix }">
-        <input
-            v-bind="$attrs"
-            :id="identification"
-            type="text"
-            :name="identification"
-            :disabled="disabled"
-            :value="currentValue"
-            :placeHolder="placeholder"
-            v-on="additionalListeners"
-            @input="onInput"
-            @change="onChange"
-            @focus="setFocusClass"
-            @blur="removeFocusClass"
-        >
-    </template>
-
-    <template v-if="copyable || hasSuffix" #sw-contextual-field-suffix="{disabled, identification}">
-        <slot name="suffix" v-bind="{ identification }" />
-        <sw-field-copyable
-            v-if="copyable"
-            :displayName="identification"
-            :copyableText="currentValue"
-            :tooltip="copyableTooltip"
-        />
-    </template>
-</sw-contextual-field>
+    :value="value"
+    :hint="hintText"
+    @update:value="updateValue"
+/>
 {% endblock %}

src/Resources/app/administration/src/module/swag-paypal-payment/component/swag-paypal-textarea-field/index.js

@@ -3,13 +3,51 @@ import template from './swag-paypal-textarea-field.html.twig';
 const { Component } = Shopware;
 
 /**
- * @protected
+ * @deprecated tag:v10.0.0 - Will be removed, use `max-length` of mt-textarea
+ *
  * @description textarea input field. But this one allows attribute downpassing to the input field instead of the block.
- * @status ready
- * @example-type static
- * @component-example
- * <swag-paypal-textarea-field label="Name" placeholder="placeholder goes here..."></swag-paypal-textarea-field>
  */
-Component.extend('swag-paypal-textarea-field', 'sw-textarea-field', {
+Component.register('swag-paypal-textarea-field', {
     template,
+
+    emits: ['update:value'],
+
+    props: {
+        value: {
+            type: String,
+            required: false,
+            default: null,
+        },
+        maxLength: {
+            type: [String, Number],
+            required: false,
+            default: null,
+        },
+    },
+
+    computed: {
+        allowedLength() {
+            return this.maxLength ? Number(this.maxLength) : null;
+        },
+
+        currentLength() {
+            return this.maxLength ? (this.value ?? '').length : null;
+        },
+
+        hintText() {
+            return this.allowedLength
+                ? `${this.currentLength}/${this.allowedLength}`
+                : null;
+        },
+    },
+
+    methods: {
+        updateValue(value) {
+            if (this.allowedLength && (value ?? '').length > this.allowedLength) {
+                value = (value ?? '').substring(0, this.allowedLength);
+            }
+
+            this.$emit('update:value', value);
+        },
+    },
 });

src/Resources/app/administration/src/module/swag-paypal-payment/component/swag-paypal-textarea-field/swag-paypal-textarea-field.html.twig

@@ -1,23 +1,8 @@
 {% block sw_block_field %}
-<sw-block-field
+<sw-textarea-field
     v-bind="$attrs"
-    class="sw-field--textarea"
-    :name="formFieldName"
->
-
-    <template #sw-field-input="{identification, helpText, error, disabled, setFocusClass, removeFocusClass }">
-        <textarea
-            v-bind="$attrs"
-            :id="identification"
-            :name="identification"
-            :placeholder="placeholder"
-            :disabled="disabled"
-            :value="currentValue"
-            @change="onChange"
-            @input="onInput"
-            @focus="setFocusClass"
-            @blur="removeFocusClass"
-        />
-    </template>
-</sw-block-field>
+    :value="value"
+    :hint="hintText"
+    @update:value="updateValue"
+/>
 {% endblock %}