Merge pull request #438 from OXID-eSales/b-7.0.x-paypal-hint-PSPAYPAL-913

PSPAYPAL-913 Fix Paypal Express hint

Author: mariolorenz

views/smarty/frontend/shared/page/details/inc/details_productmain_tobasket.tpl

@@ -1,6 +1,5 @@
 [{assign var="config" value=$oViewConf->getPayPalCheckoutConfig()}]
-[{$oViewConf->unsetPaypalSessionAndOrderId()}]
-[{if $blCanBuy && !$oDetailsProduct->isNotBuyable() && $config->isActive() && $config->showPayPalProductDetailsButton()}]
+[{if $blCanBuy && !$oDetailsProduct->isNotBuyable() && $config->isActive() && !$oViewConf->isPayPalExpressSessionActive() && $config->showPayPalProductDetailsButton()}]
     [{include file="@osc_paypal/frontend/shared/paymentbuttons.tpl" buttonId="PayPalButtonProductMain" buttonClass="paypal-button-wrapper large" aid=$oDetailsProduct->oxarticles__oxid->value}]
 [{/if}]
 [{include file="@osc_paypal/frontend/shared/paypalexpresshint.tpl" withBreak=false}]

views/twig/extensions/themes/default/page/details/inc/productmain.html.twig

@@ -3,7 +3,7 @@
 {% block details_productmain_tobasket %}
     {{ parent() }}
     {% set config = oViewConf.getPayPalCheckoutConfig() %}
-    {% if blCanBuy and not oDetailsProduct.isNotBuyable() and config.isActive() and config.showPayPalProductDetailsButton() %}
+    {% if blCanBuy and not oDetailsProduct.isNotBuyable() and config.isActive() and not oViewConf.isPayPalExpressSessionActive() and config.showPayPalProductDetailsButton() %}
         {% include "@osc_paypal/frontend/paymentbuttons.html.twig" with {buttonId: "PayPalButtonProductMain", buttonClass: "paypal-button-wrapper", aid: oDetailsProduct.oxarticles__oxid.value} %}
     {% endif %}
     {% include "@osc_paypal/frontend/paypalexpresshint.html.twig" with {withBreak: false} %}