RATESWSX-332: refactor admin order component to be compatible with sw6.7

Author: LeandraMasi

src/Resources/app/administration/src/component/ratepay/ratepay-admin-create-order-form/index.js

@@ -25,7 +25,8 @@ Component.register('ratepay-admin-create-order-form', {
     data() {
         return {
             loading: false,
-            salesChannels: null,
+            salesChannels: [],
+            salesChannelDomains: [],
 
             selectedSalesChannelId: null,
             selectedSalesChannelDomainId: null,
@@ -39,26 +40,26 @@ Component.register('ratepay-admin-create-order-form', {
         this.salesChannelRepository = this.repositoryFactory.create('sales_channel');
         this.salesChannelDomainRepository = this.repositoryFactory.create('sales_channel_domain');
 
-        let criteria = new Criteria();
+        const criteria = new Criteria();
         criteria.addFilter(Criteria.not('AND', [Criteria.equals('domains.url', null)]));
         criteria.addFilter(Criteria.equals('active', true));
-        criteria.addAssociation('domains');
+        criteria.addAssociation('domains'); // optional, can prefill domains
 
         this.loading = true;
-        this.salesChannelRepository
-            .search(criteria, Shopware.Context.api)
-            .then((result) => {
-                this.salesChannels = result.filter((item) => {
-                    return item.domains.length > 0;
-                });
-                this.loading = false;
-            });
+        this.salesChannelRepository.search(criteria, Shopware.Context.api).then((result) => {
+            this.salesChannels = result.filter(item => item.domains.length > 0);
+            this.loading = false;
+        });
     },
 
     computed: {
-        salesChannelDomains() {
-            return this.selectedSalesChannelId ? this.salesChannels.get(this.selectedSalesChannelId)?.domains ?? [] : [];
-        },
+        domainCriteria() {
+            const criteria = new Criteria();
+            if (this.selectedSalesChannelId) {
+                criteria.addFilter(Criteria.equals('salesChannelId', this.selectedSalesChannelId));
+            }
+            return criteria;
+        }
     },
 
     methods: {

src/Resources/app/administration/src/component/ratepay/ratepay-admin-create-order-form/ratepay-admin-create-order-form.twig

@@ -1,32 +1,28 @@
 {#
-  ~ Copyright (c) Ratepay GmbH
-  ~
-  ~ For the full copyright and license information, please view the LICENSE
-  ~ file that was distributed with this source code.
+~ Copyright (c) 2020 Ratepay GmbH
+~
+~ For the full copyright and license information, please view the LICENSE
+~ file that was distributed with this source code.
 #}
-<div>
-    <sw-select-field v-model:value="selectedSalesChannelId"
-                     :label="$tc('ratepay.admin.create-order.modal.labels.salesChannel')"
-                     @update:value="selectedSalesChannelDomainId = null">
-        <option>{{ $t('ratepay.admin.create-order.modal.please-select') }}</option>
-        <option v-for="salesChannel in salesChannels"
-                :value="salesChannel.id"
-                :selected="salesChannel === selectedSalesChannelId">
-            {{ salesChannel.translated.name }}
-        </option>
-    </sw-select-field>
 
+<div>
+    <sw-entity-single-select
+            v-model:value="selectedSalesChannelId"
+            class="sw-cms-layout-assignment-modal__sales-channel-select"
+            entity="sales_channel"
+            :label="$tc('ratepay.admin.create-order.modal.labels.salesChannel')"
+            @update:value="selectedSalesChannelDomainId = null"
+    />
 
-    <sw-select-field v-model:value="selectedSalesChannelDomainId"
-                     :label="$tc('ratepay.admin.create-order.modal.labels.salesChannelDomain')"
-                     v-if="salesChannelDomains.length">
-        <option>{{ $t('ratepay.admin.create-order.modal.please-select') }}</option>
-        <option v-for="salesChannelDomain in salesChannelDomains"
-                :value="salesChannelDomain.id"
-                :selected="salesChannelDomain.id === selectedSalesChannelDomainId">
-            {{ salesChannelDomain.url }}
-        </option>
-    </sw-select-field>
+    <sw-entity-single-select
+            v-model:value="selectedSalesChannelDomainId"
+            class="sw-cms-layout-assignment-modal__sales-channel-domain-select"
+            entity="sales_channel_domain"
+            :label="$tc('ratepay.admin.create-order.modal.labels.salesChannelDomain')"
+            label-property="url"
+            :criteria="domainCriteria"
+            :disabled="!selectedSalesChannelId"
+    />
 
     <sw-button @click="navigateToFrontend" class="sw-button--primary" v-if="selectedSalesChannelDomainId">
         {{ $t('ratepay.admin.create-order.modal.start-session') }}

src/Resources/app/administration/src/module/sw-order/page/sw-order-list/index.js

@@ -5,13 +5,16 @@ const {Component} = Shopware;
 Component.override('sw-order-list', {
   template,
 
+  inject: ['repositoryFactory'],
+
   data() {
     return {
       ratepayCreateOrderModal: false,
       salesChannels: null
     };
   },
 
+
   methods: {
     openRatepayCreateOrderModal() {
       this.ratepayCreateOrderModal = true

src/Resources/app/administration/src/module/sw-order/page/sw-order-list/sw-order-list.html.twig

@@ -4,6 +4,7 @@
   ~ For the full copyright and license information, please view the LICENSE
   ~ file that was distributed with this source code.
 #}
+
 {% block sw_order_list_smart_bar_actions_add %}
     {% parent %}
 
@@ -15,11 +16,14 @@
 {% endblock %}
 
 {% block sw_order_list_content_slot %}
-     {% parent %}
+    {% parent %}
     <sw-modal :title="$tc('order.ratepay.create-order.newButtonText')"
               v-if="ratepayCreateOrderModal"
-              @modal-close="ratepayCreateOrderModal = null">
-        <ratepay-admin-create-order-form></ratepay-admin-create-order-form>
+              @modal-close="ratepayCreateOrderModal = false"> <!-- ⚠️ geändert -->
+        <ratepay-admin-create-order-form
+                :sales-channels="salesChannels"
+            @close="ratepayCreateOrderModal = false"> <!-- ⚠️ neu -->
+        </ratepay-admin-create-order-form>
     </sw-modal>
 {% endblock %}
 
@@ -33,8 +37,8 @@
 {% endblock %}
 
 {% block sw_order_list_delete_modal_confirm %}
-    <sw-button @click="onConfirmDelete(item.id)" :disabled="item.extensions.ratepayData !== undefined" variant="danger" size="small">
+    <mt-button @click="onConfirmDelete(item.id)" :disabled="item.extensions.ratepayData !== undefined" variant="danger" size="small">
         {{ $tc('sw-order.list.buttonDelete') }}
-    </sw-button>
+    </mt-button>
 {% endblock %}