Merge pull request #23 from heidelpay/develop

PayPal Registration & Admin-Orders
heidelpay · Aug 6, 2020 · 8c28ba5 · 8c28ba5
2 parents a101317 + 2f400fc
commit 8c28ba5
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "heidelpay/shopware-6",
     "description": "Heidelpay payment integration for Shopware 6",
-    "version": "v0.0.1",
+    "version": "0.0.1.1",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "minimum-stability": "dev",
@@ -18,7 +18,7 @@
     },
     "require": {
         "php": "^7.2",
-        "heidelpay/heidelpay-php": "~1.2.0",
+        "heidelpay/heidelpay-php": "~1.2.8.0",
         "shopware/core": "*",
         "shopware/administration": "*",
         "shopware/storefront": "*"

diff --git a/composer.lock b/composer.lock
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;
         }
     }
 });
diff --git a/src/Resources/app/storefront/dist/storefront/js/heidel-payment6.js b/src/Resources/app/storefront/dist/storefront/js/heidel-payment6.js
diff --git a/src/Resources/public/administration/js/heidel-payment6.js b/src/Resources/public/administration/js/heidel-payment6.js
diff --git a/src/Resources/views/storefront/component/heidelpay/frames/paypal.html.twig b/src/Resources/views/storefront/component/heidelpay/frames/paypal.html.twig
@@ -1,4 +1,5 @@
 {% block heidelpay_frame_paypal_account %}
+    {# PayPal with stored account #}
     {% if page.extensions.heidelpayPayPal.displayPayPalAccountSelection and page.extensions.heidelpayPayPal.payPalAccounts|length > 0 %}
         {% block heidelpay_checkout_confirm_frame_card_body_title %}
             <div class="card-title">
@@ -9,7 +10,7 @@
         <div class="heidelpay-paypal-account-wrapper"
              data-heidelpay-paypal="true"
              data-heidelpay-paypal-options='{
-                "hasSavedAccounts": {% if page.extensions.heidelpayPayPal.payPalAccounts|length > 0 %}true{% else %}false{% endif %}
+                "hasSavedAccounts": true
              }'>
             <div class="heidelpay-saved-accounts-wrapper">
                 <div class="heidelpay-saved-accounts--message">
@@ -42,5 +43,13 @@
                 {% endblock %}
             </div>
         </div>
+    {% else %}
+        {# PayPal without stored accounts #}
+        <div class="heidelpay-paypal-account-wrapper"
+             data-heidelpay-paypal="true"
+             data-heidelpay-paypal-options='{
+                "hasSavedAccounts": false
+             }'>
+        </div>
     {% endif %}
 {% endblock %}