OX6-164 - Fixed some remaining issues

FatchipRobert · Nov 13, 2024 · 8351b1d · 8351b1d
1 parent 4d1f7cf
commit 8351b1d
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/application/helper/fcpopaypalhelper.php b/application/helper/fcpopaypalhelper.php
@@ -60,7 +60,7 @@ public static function destroyInstance()
     /**
      * @return bool
      */
-    protected function showBNPLButton()
+    public function showBNPLButton()
     {
         $blReturn = false;
         if ((bool)$this->getMainHelper()->fcpoGetConfig()->getConfigParam('blFCPOPayPalV2BNPL') === true) {
@@ -138,7 +138,7 @@ protected function getLocale()
      */
     public function getJavascriptUrl()
     {
-        $sUrl = "https://www.paypal.com/sdk/js?client-id=".$this->getClientId()."&merchant-id=".$this->getMerchantId()."&currency=".$this->getCurrency()."&intent=".$this->getIntent()."&locale=".$this->getLocale()."&commit=true&vault=false&disable-funding=card,sepa,bancontact";
+        $sUrl = "https://www.paypal.com/sdk/js?client-id=".$this->getClientId()."&merchant-id=".$this->getMerchantId()."&currency=".$this->getCurrency()."&intent=".$this->getIntent()."&locale=".$this->getLocale()."&commit=false&vault=false&disable-funding=card,sepa,bancontact";
         if ($this->showBNPLButton() === true) {
             $sUrl .= "&enable-funding=paylater";
         }

diff --git a/application/views/frontend/tpl/fcpo_paypal_express_v2.tpl b/application/views/frontend/tpl/fcpo_paypal_express_v2.tpl
@@ -1,4 +1,4 @@
-[{assign var="buttonId" value='fcpoPayPalExpressV2'|cat:$_payone_position}]
+[{assign var="buttonId" value=$oViewConf->fcpoGetPayPalExpressV2GetButtonId($_payone_position)}]
 
 <div id="[{$buttonId}]"></div>
 

diff --git a/extend/application/models/fcPayOneOrder.php b/extend/application/models/fcPayOneOrder.php
@@ -1260,6 +1260,8 @@ public function isDetailedProductInfoNeeded()
             'fcpopl_secinvoice',
             'fcpopl_secinstallment',
             'fcpopl_secdebitnote',
+            'fcpopl_secdebitnote',
+            fcpopaypalhelper::PPE_V2_EXPRESS,
         ])) {
             return true;
         }

diff --git a/extend/core/fcPayOneViewConf.php b/extend/core/fcPayOneViewConf.php
@@ -327,6 +327,20 @@ public function fcpoCanDisplayPayPalExpressV2Button()
         return fcpopaymenthelper::getInstance()->isPaymentMethodActive(fcpopaypalhelper::PPE_V2_EXPRESS);
     }
 
+    /**
+     * Returns PayPal V2 Express Button ID
+     *
+     * @return string
+     */
+    public function fcpoGetPayPalExpressV2GetButtonId($sPosition)
+    {
+        $sButtonId = "fcpoPayPalExpressV2";
+        if (fcpopaypalhelper::getInstance()->showBNPLButton() === true) {
+            $sButtonId .= "PayLater";
+        }
+        return $sButtonId.$sPosition;
+    }
+
     /**
      * Returns PayPal V2 Express Button Javascript URL
      *

diff --git a/lib/fcporequest.php b/lib/fcporequest.php
@@ -2394,9 +2394,7 @@ public function sendRequestGenericPayment($sPaymentType, $sWorkorderId = false)
             }
             $this->addParameter('add_paydata[payment_action]', $sPaymentAction);
 
-            if ((bool)$this->_oFcpoHelper->fcpoGetConfig()->getConfigParam('blFCPOSendArticlelist') === true) {
-                $this->_fcpoAddBasketItemsFromSession();
-            }
+            $this->_fcpoAddBasketItemsFromSession();
         }
 
         $this->_addRedirectUrls('basket', false, 'fcpoHandlePayPalExpress');

diff --git a/out/src/css/fcpopaypalexpress.css b/out/src/css/fcpopaypalexpress.css
@@ -2,4 +2,10 @@
     width: 217px;
     float: right;
     padding-right: 12px;
+}
+
+#fcpoPayPalExpressV2PayLaterBasketTop, #fcpoPayPalExpressV2PayLaterBasketBottom {
+    width: 444px;
+    float: right;
+    padding-right: 4px;
 }