Merge pull request #20 from heidelpay/bugfix/HEIDELPAYSUPPORT-11

[HEIDELPAYSUPPORT-11] Fix order creation in administration
heidelpay · Jul 23, 2020 · 88aaedd · 88aaedd
2 parents 73c8d94 + b789d05
commit 88aaedd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...dministration/src/module/heidel-payment/extension/sw-order-create-details-footer/index.js b/...dministration/src/module/heidel-payment/extension/sw-order-create-details-footer/index.js
@@ -10,15 +10,19 @@ Component.override('sw-order-create-details-footer', {
     computed: {
         paymentMethodCriteria() {
             /** @var {Criteria} paymentCriteria */
-            const paymentCriteria = this.salesChannelCriteria;
+            const criteria = new Criteria();
 
-            paymentCriteria.addFilter(
+            if (this.salesChannelId) {
+                criteria.addFilter(Criteria.equals('salesChannels.id', this.salesChannelId));
+            }
+
+            criteria.addFilter(
                 Criteria.not('AND', [
                     Criteria.contains('handlerIdentifier', heidelPaymentHandler)
                 ])
             );
 
-            return paymentCriteria;
+            return criteria;
         }
     }
 });