Merge pull request #448 from OXID-eSales/PSPAYPAL920_ButtonConditions

Pspaypal920 button conditions

Author: mariolorenz

src/Controller/OrderController.php

@@ -390,6 +390,13 @@ public function captureAcdcOrder(): void
 
         $this->outputJson($result);
     }
+
+    public function isPayPalCheckoutPayment(): bool
+    {
+        $payment = $this->getPayment();
+        return $payment && PayPalDefinitions::isPayPalPayment($payment->getId());
+    }
+
     public function createApplePayOrder(): void
     {
         try {

views/blocks/layout/base_js.tpl

@@ -1,4 +1,6 @@
 [{$smarty.block.parent}]
-[{include file='modules/osc/paypal/base_paypal_payment_controller_config.tpl'}]
-[{include file='modules/osc/paypal/base_paypal_button_config.tpl'}]
 [{include file='modules/osc/paypal/base_js.tpl'}]
+[{if method_exists($oView, 'getPayment') && $oView->isPayPalCheckoutPayment()}]
+    [{include file='modules/osc/paypal/base_paypal_payment_controller_config.tpl'}]
+    [{include file='modules/osc/paypal/base_paypal_button_config.tpl'}]
+[{/if}]

views/blocks/page/checkout/checkout_order_btn_submit_bottom.tpl

@@ -2,20 +2,21 @@
 [{assign var="paymentId" value=$payment->getId()}]
 
 [{if "oscpaypal" == $paymentId}]
-    <div id="[{$paymentId}]" class="paypal-button-container [{$buttonClass}]"></div>
+    [{$oViewConf->setSDKIsNecessary()}]
+    <div id="[{$paymentId}]" class="paypal-button-container [{$buttonClass}] float-right pull-right"></div>
 [{/if}]
 
 [{if "oscpaypal_pui" == $paymentId}]
     [{if $oViewConf->isFlowCompatibleTheme()}]
-    [{include file="modules/osc/paypal/checkout_order_btn_submit_bottom_flow.tpl"}]
+        [{include file="modules/osc/paypal/checkout_order_btn_submit_bottom_flow.tpl"}]
     [{else}]
-    [{include file="modules/osc/paypal/checkout_order_btn_submit_bottom_wave.tpl"}]
-    [{/if}]
+        [{include file="modules/osc/paypal/checkout_order_btn_submit_bottom_wave.tpl"}]
     [{/if}]
+[{/if}]
 
 [{if "oscpaypal_googlepay" == $paymentId}]
     [{include file="modules/osc/paypal/googlepay.tpl" buttonClass="paypal-button-wrapper large"}]
-    [{elseif "oscpaypal_applepay" == $paymentId}]
+[{elseif "oscpaypal_applepay" == $paymentId}]
     [{include file="modules/osc/paypal/applepay.tpl" paymentId=$paymentId buttonClass="paypal-button-wrapper large"}]
     <div id="applepay-container" class="paypal-button-container paypal-button-wrapper paypal-button-right large"></div>
 [{elseif "oscpaypal" != $paymentId}]