From 728cda72746f4191047dd01aaec71b77a792372d Mon Sep 17 00:00:00 2001
From: carmenmaymo <mayen22@gmail.com>
Date: Tue, 7 Mar 2023 16:41:44 +0100
Subject: [PATCH 1/9] remove rewrite rule for apple MOL-850

---
 .idea/php.xml                                 |  2 +-
 resources/js/applepayDirect.js                |  1 +
 src/Activation/ActivationModule.php           | 41 ++++---------------
 .../ApplePayButton/AppleAjaxRequests.php      | 14 +++----
 .../ApplePayButton/ApplePayDataObjectHttp.php | 11 +++--
 5 files changed, 25 insertions(+), 44 deletions(-)

diff --git a/.idea/php.xml b/.idea/php.xml
index 2df240ff7..efd867e3a 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -380,4 +380,4 @@
     <option name="showInfo" value="true" />
     <option name="transferred" value="true" />
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/resources/js/applepayDirect.js b/resources/js/applepayDirect.js
index 789643f50..7a8333f88 100644
--- a/resources/js/applepayDirect.js
+++ b/resources/js/applepayDirect.js
@@ -197,6 +197,7 @@ import {request} from './applePayRequest.js';
             }
         }
         document.querySelector('#mollie_applepay_button').addEventListener('click', (evt) => {
+            evt.preventDefault()
             applePaySession()
         })
     }
diff --git a/src/Activation/ActivationModule.php b/src/Activation/ActivationModule.php
index 4630225db..fd797d7a5 100644
--- a/src/Activation/ActivationModule.php
+++ b/src/Activation/ActivationModule.php
@@ -112,39 +112,14 @@ static function ($value) {
      */
     public function appleValidationFileRewriteRules(): void
     {
-        add_filter(
-            'query_vars',
-            static function ($query_vars) {
-                $query_vars[] = 'appleparam';
-                return $query_vars;
-            }
-        );
-        add_filter(
-            'template_include',
-            static function ($template) {
-                if (
-                    get_query_var('appleparam') === false
-                    || get_query_var('appleparam') === ''
-                ) {
-                    return $template;
-                }
-                header('Content-Type: text/plain; charset=UTF-8', true, 200);
-                echo('7B227073704964223A2244394337463730314338433646324336463344363536433039393434453332323030423137364631353245353844393134304331433533414138323436453630222C2276657273696F6E223A312C22637265617465644F6E223A313536363930343337353936352C227369676E6174757265223A223330383030363039326138363438383666373064303130373032613038303330383030323031303133313066333030643036303936303836343830313635303330343032303130353030333038303036303932613836343838366637306430313037303130303030613038303330383230336533333038323033383861303033303230313032303230383463333034313439353139643534333633303061303630383261383634386365336430343033303233303761333132653330326330363033353530343033306332353431373037303663363532303431373037303663363936333631373436393666366532303439366537343635363737323631373436393666366532303433343132303264323034373333333132363330323430363033353530343062306331643431373037303663363532303433363537323734363936363639363336313734363936663665323034313735373436383666373236393734373933313133333031313036303335353034306130633061343137303730366336353230343936653633326533313062333030393036303335353034303631333032353535333330316531373064333133393330333533313338333033313333333233353337356131373064333233343330333533313336333033313333333233353337356133303566333132353330323330363033353530343033306331633635363336333264373336643730326436323732366636623635373232643733363936373665356635353433333432643530353234663434333131343330313230363033353530343062306330623639346635333230353337393733373436353664373333313133333031313036303335353034306130633061343137303730366336353230343936653633326533313062333030393036303335353034303631333032353535333330353933303133303630373261383634386365336430323031303630383261383634386365336430333031303730333432303030346332313537376564656264366337623232313866363864643730393061313231386463376230626436663263323833643834363039356439346166346135343131623833343230656438313166333430376538333333316631633534633366376562333232306436626164356434656666343932383938393365376330663133613338323032313133303832303230643330306330363033353531643133303130316666303430323330303033303166303630333535316432333034313833303136383031343233663234396334346639336534656632376536633466363238366333666132626266643265346233303435303630383262303630313035303530373031303130343339333033373330333530363038326230363031303530353037333030313836323936383734373437303361326632663666363337333730326536313730373036633635326536333666366432663666363337333730333033343264363137303730366336353631363936333631333333303332333038323031316430363033353531643230303438323031313433303832303131303330383230313063303630393261383634383836663736333634303530313330383166653330383163333036303832623036303130353035303730323032333038316236306338316233353236353663363936313665363336353230366636653230373436383639373332303633363537323734363936363639363336313734363532303632373932303631366537393230373036313732373437393230363137333733373536643635373332303631363336333635373037343631366536333635323036663636323037343638363532303734363836353665323036313730373036633639363336313632366336353230373337343631366536343631373236343230373436353732366437333230363136653634323036333666366536343639373436393666366537333230366636363230373537333635326332303633363537323734363936363639363336313734363532303730366636633639363337393230363136653634323036333635373237343639363636393633363137343639366636653230373037323631363337343639363336353230373337343631373436353664363536653734373332653330333630363038326230363031303530353037303230313136326136383734373437303361326632663737373737373265363137303730366336353265363336663664326636333635373237343639363636393633363137343635363137353734363836663732363937343739326633303334303630333535316431663034326433303262333032396130323761303235383632333638373437343730336132663266363337323663326536313730373036633635326536333666366432663631373037303663363536313639363336313333326536333732366333303164303630333535316430653034313630343134393435376462366664353734383138363839383937363266376535373835303765373962353832343330306530363033353531643066303130316666303430343033303230373830333030663036303932613836343838366637363336343036316430343032303530303330306130363038326138363438636533643034303330323033343930303330343630323231303062653039353731666537316531653733356235356535616661636234633732666562343435663330313835323232633732353130303262363165626436663535303232313030643138623335306135646436646436656231373436303335623131656232636538376366613365366166366362643833383038393064633832636464616136333330383230326565333038323032373561303033303230313032303230383439366432666266336139386461393733303061303630383261383634386365336430343033303233303637333131623330313930363033353530343033306331323431373037303663363532303532366636663734323034333431323032643230343733333331323633303234303630333535303430623063316434313730373036633635323034333635373237343639363636393633363137343639366636653230343137353734363836663732363937343739333131333330313130363033353530343061306330613431373037303663363532303439366536333265333130623330303930363033353530343036313330323535353333303165313730643331333433303335333033363332333333343336333333303561313730643332333933303335333033363332333333343336333333303561333037613331326533303263303630333535303430333063323534313730373036633635323034313730373036633639363336313734363936663665323034393665373436353637373236313734363936663665323034333431323032643230343733333331323633303234303630333535303430623063316434313730373036633635323034333635373237343639363636393633363137343639366636653230343137353734363836663732363937343739333131333330313130363033353530343061306330613431373037303663363532303439366536333265333130623330303930363033353530343036313330323535353333303539333031333036303732613836343863653364303230313036303832613836343863653364303330313037303334323030303466303137313138343139643736343835643531613565323538313037373665383830613265666465376261653464653038646663346239336531333335366435363635623335616532326430393737363064323234653762626130386664373631376365383863623736626236363730626563386538323938346666353434356133383166373330383166343330343630363038326230363031303530353037303130313034336133303338333033363036303832623036303130353035303733303031383632613638373437343730336132663266366636333733373032653631373037303663363532653633366636643266366636333733373033303334326436313730373036633635373236663666373436333631363733333330316430363033353531643065303431363034313432336632343963343466393365346566323765366334663632383663336661326262666432653462333030663036303335353164313330313031666630343035333030333031303166663330316630363033353531643233303431383330313638303134626262306465613135383333383839616134386139396465626562646562616664616362323461623330333730363033353531643166303433303330326533303263613032616130323838363236363837343734373033613266326636333732366332653631373037303663363532653633366636643266363137303730366336353732366636663734363336313637333332653633373236633330306530363033353531643066303130316666303430343033303230313036333031303036306132613836343838366637363336343036303230653034303230353030333030613036303832613836343863653364303430333032303336373030333036343032333033616366373238333531313639396231383666623335633335366361363262666634313765646439306637353464613238656265663139633831356534326237383966383938663739623539396639386435343130643866396465396332666530323330333232646435343432316230613330353737366335646633333833623930363766643137376332633231366439363466633637323639383231323666353466383761376431623939636239623039383932313631303639393066303939323164303030303331383230313863333038323031383830323031303133303831383633303761333132653330326330363033353530343033306332353431373037303663363532303431373037303663363936333631373436393666366532303439366537343635363737323631373436393666366532303433343132303264323034373333333132363330323430363033353530343062306331643431373037303663363532303433363537323734363936363639363336313734363936663665323034313735373436383666373236393734373933313133333031313036303335353034306130633061343137303730366336353230343936653633326533313062333030393036303335353034303631333032353535333032303834633330343134393531396435343336333030643036303936303836343830313635303330343032303130353030613038313935333031383036303932613836343838366637306430313039303333313062303630393261383634383836663730643031303730313330316330363039326138363438383666373064303130393035333130663137306433313339333033383332333733313331333133323335333535613330326130363039326138363438383666373064303130393334333131643330316233303064303630393630383634383031363530333034303230313035303061313061303630383261383634386365336430343033303233303266303630393261383634383836663730643031303930343331323230343230303864323631373363653335643465646134616139623866343763643439336639333034653763366631633866393239393238333361373537373736393438323330306130363038326138363438636533643034303330323034343733303435303232313030613439373261353733346466616362303131343162613366626238663062626665616162626233363161366536613839663666366361373132363165333039303032323032343439396561643530356238376664366331333134656135343963663431316339326632656437323837303533303738636562626638326462306561376633303030303030303030303030227D');
-                exit;
-            },
-            PHP_INT_MIN,
-            1
-        );
-        add_action(
-            'init',
-            static function () {
-                add_rewrite_rule(
-                    '^.well-known/apple-developer-merchantid-domain-association$',
-                    'index.php?appleparam=applepaydirect',
-                    'top'
-                );
-            }
-        );
+        $requestUri = isset($_SERVER['REQUEST_URI'])? filter_var($_SERVER['REQUEST_URI'], FILTER_SANITIZE_URL): '';
+        if (strpos($requestUri, '.well-known/apple-developer-merchantid-domain-association') !== false) {
+            $validationString = '7B227073704964223A2244394337463730314338433646324336463344363536433039393434453332323030423137364631353245353844393134304331433533414138323436453630222C2276657273696F6E223A312C22637265617465644F6E223A313536363930343337353936352C227369676E6174757265223A223330383030363039326138363438383666373064303130373032613038303330383030323031303133313066333030643036303936303836343830313635303330343032303130353030333038303036303932613836343838366637306430313037303130303030613038303330383230336533333038323033383861303033303230313032303230383463333034313439353139643534333633303061303630383261383634386365336430343033303233303761333132653330326330363033353530343033306332353431373037303663363532303431373037303663363936333631373436393666366532303439366537343635363737323631373436393666366532303433343132303264323034373333333132363330323430363033353530343062306331643431373037303663363532303433363537323734363936363639363336313734363936663665323034313735373436383666373236393734373933313133333031313036303335353034306130633061343137303730366336353230343936653633326533313062333030393036303335353034303631333032353535333330316531373064333133393330333533313338333033313333333233353337356131373064333233343330333533313336333033313333333233353337356133303566333132353330323330363033353530343033306331633635363336333264373336643730326436323732366636623635373232643733363936373665356635353433333432643530353234663434333131343330313230363033353530343062306330623639346635333230353337393733373436353664373333313133333031313036303335353034306130633061343137303730366336353230343936653633326533313062333030393036303335353034303631333032353535333330353933303133303630373261383634386365336430323031303630383261383634386365336430333031303730333432303030346332313537376564656264366337623232313866363864643730393061313231386463376230626436663263323833643834363039356439346166346135343131623833343230656438313166333430376538333333316631633534633366376562333232306436626164356434656666343932383938393365376330663133613338323032313133303832303230643330306330363033353531643133303130316666303430323330303033303166303630333535316432333034313833303136383031343233663234396334346639336534656632376536633466363238366333666132626266643265346233303435303630383262303630313035303530373031303130343339333033373330333530363038326230363031303530353037333030313836323936383734373437303361326632663666363337333730326536313730373036633635326536333666366432663666363337333730333033343264363137303730366336353631363936333631333333303332333038323031316430363033353531643230303438323031313433303832303131303330383230313063303630393261383634383836663736333634303530313330383166653330383163333036303832623036303130353035303730323032333038316236306338316233353236353663363936313665363336353230366636653230373436383639373332303633363537323734363936363639363336313734363532303632373932303631366537393230373036313732373437393230363137333733373536643635373332303631363336333635373037343631366536333635323036663636323037343638363532303734363836353665323036313730373036633639363336313632366336353230373337343631366536343631373236343230373436353732366437333230363136653634323036333666366536343639373436393666366537333230366636363230373537333635326332303633363537323734363936363639363336313734363532303730366636633639363337393230363136653634323036333635373237343639363636393633363137343639366636653230373037323631363337343639363336353230373337343631373436353664363536653734373332653330333630363038326230363031303530353037303230313136326136383734373437303361326632663737373737373265363137303730366336353265363336663664326636333635373237343639363636393633363137343635363137353734363836663732363937343739326633303334303630333535316431663034326433303262333032396130323761303235383632333638373437343730336132663266363337323663326536313730373036633635326536333666366432663631373037303663363536313639363336313333326536333732366333303164303630333535316430653034313630343134393435376462366664353734383138363839383937363266376535373835303765373962353832343330306530363033353531643066303130316666303430343033303230373830333030663036303932613836343838366637363336343036316430343032303530303330306130363038326138363438636533643034303330323033343930303330343630323231303062653039353731666537316531653733356235356535616661636234633732666562343435663330313835323232633732353130303262363165626436663535303232313030643138623335306135646436646436656231373436303335623131656232636538376366613365366166366362643833383038393064633832636464616136333330383230326565333038323032373561303033303230313032303230383439366432666266336139386461393733303061303630383261383634386365336430343033303233303637333131623330313930363033353530343033306331323431373037303663363532303532366636663734323034333431323032643230343733333331323633303234303630333535303430623063316434313730373036633635323034333635373237343639363636393633363137343639366636653230343137353734363836663732363937343739333131333330313130363033353530343061306330613431373037303663363532303439366536333265333130623330303930363033353530343036313330323535353333303165313730643331333433303335333033363332333333343336333333303561313730643332333933303335333033363332333333343336333333303561333037613331326533303263303630333535303430333063323534313730373036633635323034313730373036633639363336313734363936663665323034393665373436353637373236313734363936663665323034333431323032643230343733333331323633303234303630333535303430623063316434313730373036633635323034333635373237343639363636393633363137343639366636653230343137353734363836663732363937343739333131333330313130363033353530343061306330613431373037303663363532303439366536333265333130623330303930363033353530343036313330323535353333303539333031333036303732613836343863653364303230313036303832613836343863653364303330313037303334323030303466303137313138343139643736343835643531613565323538313037373665383830613265666465376261653464653038646663346239336531333335366435363635623335616532326430393737363064323234653762626130386664373631376365383863623736626236363730626563386538323938346666353434356133383166373330383166343330343630363038326230363031303530353037303130313034336133303338333033363036303832623036303130353035303733303031383632613638373437343730336132663266366636333733373032653631373037303663363532653633366636643266366636333733373033303334326436313730373036633635373236663666373436333631363733333330316430363033353531643065303431363034313432336632343963343466393365346566323765366334663632383663336661326262666432653462333030663036303335353164313330313031666630343035333030333031303166663330316630363033353531643233303431383330313638303134626262306465613135383333383839616134386139396465626562646562616664616362323461623330333730363033353531643166303433303330326533303263613032616130323838363236363837343734373033613266326636333732366332653631373037303663363532653633366636643266363137303730366336353732366636663734363336313637333332653633373236633330306530363033353531643066303130316666303430343033303230313036333031303036306132613836343838366637363336343036303230653034303230353030333030613036303832613836343863653364303430333032303336373030333036343032333033616366373238333531313639396231383666623335633335366361363262666634313765646439306637353464613238656265663139633831356534326237383966383938663739623539396639386435343130643866396465396332666530323330333232646435343432316230613330353737366335646633333833623930363766643137376332633231366439363466633637323639383231323666353466383761376431623939636239623039383932313631303639393066303939323164303030303331383230313863333038323031383830323031303133303831383633303761333132653330326330363033353530343033306332353431373037303663363532303431373037303663363936333631373436393666366532303439366537343635363737323631373436393666366532303433343132303264323034373333333132363330323430363033353530343062306331643431373037303663363532303433363537323734363936363639363336313734363936663665323034313735373436383666373236393734373933313133333031313036303335353034306130633061343137303730366336353230343936653633326533313062333030393036303335353034303631333032353535333032303834633330343134393531396435343336333030643036303936303836343830313635303330343032303130353030613038313935333031383036303932613836343838366637306430313039303333313062303630393261383634383836663730643031303730313330316330363039326138363438383666373064303130393035333130663137306433313339333033383332333733313331333133323335333535613330326130363039326138363438383666373064303130393334333131643330316233303064303630393630383634383031363530333034303230313035303061313061303630383261383634386365336430343033303233303266303630393261383634383836663730643031303930343331323230343230303864323631373363653335643465646134616139623866343763643439336639333034653763366631633866393239393238333361373537373736393438323330306130363038326138363438636533643034303330323034343733303435303232313030613439373261353733346466616362303131343162613366626238663062626665616162626233363161366536613839663666366361373132363165333039303032323032343439396561643530356238376664366331333134656135343963663431316339326632656437323837303533303738636562626638326462306561376633303030303030303030303030227D';
+            nocache_headers();
+            header('Content-Type: text/plain', true, 200);
+            echo $validationString;
+            exit;
+        }
     }
 
     /**
diff --git a/src/Buttons/ApplePayButton/AppleAjaxRequests.php b/src/Buttons/ApplePayButton/AppleAjaxRequests.php
index 40f33c5c2..ef8d2d603 100644
--- a/src/Buttons/ApplePayButton/AppleAjaxRequests.php
+++ b/src/Buttons/ApplePayButton/AppleAjaxRequests.php
@@ -236,7 +236,7 @@ public function createWcOrder()
 
         $cartItemKey = $cart->add_to_cart(
             filter_input(INPUT_POST, 'productId'),
-            filter_input(INPUT_POST, 'productQuantity')
+            (bool) filter_input(INPUT_POST, 'productQuantity', FILTER_VALIDATE_INT)
         );
         $this->addAddressesToOrder($applePayRequestDataObject);
 
@@ -297,16 +297,16 @@ protected function whichCalculateTotals(
 
         if ($applePayRequestDataObject->callerPage === 'productDetail') {
             return $this->calculateTotalsSingleProduct(
-                $applePayRequestDataObject->productId,
-                $applePayRequestDataObject->productQuantity,
-                $applePayRequestDataObject->simplifiedContact,
-                $applePayRequestDataObject->shippingMethod
+                $applePayRequestDataObject->productId(),
+                $applePayRequestDataObject->productQuantity(),
+                $applePayRequestDataObject->simplifiedContact(),
+                $applePayRequestDataObject->shippingMethod()
             );
         }
         if ($applePayRequestDataObject->callerPage === 'cart') {
             return $this->calculateTotalsCartPage(
-                $applePayRequestDataObject->simplifiedContact,
-                $applePayRequestDataObject->shippingMethod
+                $applePayRequestDataObject->simplifiedContact(),
+                $applePayRequestDataObject->shippingMethod()
             );
         }
         return false;
diff --git a/src/Buttons/ApplePayButton/ApplePayDataObjectHttp.php b/src/Buttons/ApplePayButton/ApplePayDataObjectHttp.php
index aefc67590..db7f6919b 100644
--- a/src/Buttons/ApplePayButton/ApplePayDataObjectHttp.php
+++ b/src/Buttons/ApplePayButton/ApplePayDataObjectHttp.php
@@ -36,7 +36,7 @@ class ApplePayDataObjectHttp
     /**
      * @var array|mixed
      */
-    protected $shippingMethod;
+    protected $shippingMethod = [];
     /**
      * @var string[]
      */
@@ -241,7 +241,7 @@ protected function hasRequiredFieldsValuesOrError(array $data, array $required)
                 $this->errors[] = ['errorCode' => 'unknown'];
                 continue;
             }
-            if (!$data[$requiredField]) {
+            if ($data[$requiredField] === null || $data[$requiredField] === '') {
                 $this->logger->debug(
                     sprintf('ApplePay Data Error: Missing value for %s', $requiredField)
                 );
@@ -442,7 +442,7 @@ public function shippingAddress(): array
 
     public function shippingMethod(): array
     {
-        return $this->shippingMethod;
+        return $this->shippingMethod ?? [];
     }
 
     public function needShipping(): bool
@@ -455,6 +455,11 @@ public function productId(): string
         return $this->productId;
     }
 
+    public function productQuantity(): string
+    {
+        return $this->productQuantity;
+    }
+
     public function nonce()
     {
         return $this->nonce;

From baece916cc620b3d0b71456a89d73cb9cf3cda85 Mon Sep 17 00:00:00 2001
From: carmenmaymo <mayen22@gmail.com>
Date: Fri, 10 Mar 2023 16:16:12 +0100
Subject: [PATCH 2/9] fix apple button variation MOL-850

---
 resources/js/applepayDirect.js                | 24 +++++++++++++++----
 resources/js/applepayDirectCart.js            |  4 +++-
 .../ApplePayButton/ResponsesToApple.php       |  8 +++----
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/resources/js/applepayDirect.js b/resources/js/applepayDirect.js
index 7a8333f88..f0d979071 100644
--- a/resources/js/applepayDirect.js
+++ b/resources/js/applepayDirect.js
@@ -27,19 +27,35 @@ import {request} from './applePayRequest.js';
             productQuantity = event.currentTarget.value
         })
 
+        function disableButton(appleButton) {
+            appleButton.disabled = true;
+            appleButton.classList.add("buttonDisabled");
+        }
+
+        function enableButton(appleButton) {
+            appleButton.disabled = false;
+            appleButton.classList.remove("buttonDisabled");
+        }
+
         if (isVariation) {
             let appleButton = document.querySelector('#mollie_applepay_button');
+            jQuery('.single_variation_wrap').on('hide_variation', function (event, variation) {
+                disableButton(appleButton);
+                return;
+            });
             jQuery('.single_variation_wrap').on('show_variation', function (event, variation) {
                 // Fired when the user selects all the required dropdowns / attributes
                 // and a final variation is selected / shown
+                if (!variation.is_in_stock) {
+                    disableButton(appleButton);
+                    return;
+                }
                 if (variation.variation_id) {
                     productId = variation.variation_id
                 }
-                appleButton.disabled = false;
-                appleButton.classList.remove("buttonDisabled");
+                enableButton(appleButton);
             });
-            appleButton.disabled = true;
-            appleButton.classList.add("buttonDisabled");
+            disableButton(appleButton);
         }
         const amountWithoutTax = productQuantity * price
         let applePaySession = () => {
diff --git a/resources/js/applepayDirectCart.js b/resources/js/applepayDirectCart.js
index fce030824..9b3d84842 100644
--- a/resources/js/applepayDirectCart.js
+++ b/resources/js/applepayDirectCart.js
@@ -19,7 +19,7 @@ import {maybeShowButton} from './maybeShowApplePayButton.js';
         let selectedShippingMethod = []
         let redirectionUrl = ''
         let applePaySession = () => {
-            const session = new ApplePaySession(3, request(countryCode, currencyCode, totalLabel, subtotal))
+            const session = new ApplePaySession(3, request(countryCode, currencyCode, totalLabel, Math.round(subtotal)))
             session.begin()
             session.onshippingmethodselected = function (event) {
                 jQuery.ajax({
@@ -172,11 +172,13 @@ import {maybeShowButton} from './maybeShowApplePayButton.js';
         jQuery(document.body).on('updated_cart_totals', function (event) {
             maybeShowButton()
             document.querySelector('#mollie_applepay_button').addEventListener('click', (evt) => {
+                evt.preventDefault()
                 applePaySession()
             })
         })
 
         document.querySelector('#mollie_applepay_button').addEventListener('click', (evt) => {
+            evt.preventDefault()
             applePaySession()
         })
     }
diff --git a/src/Buttons/ApplePayButton/ResponsesToApple.php b/src/Buttons/ApplePayButton/ResponsesToApple.php
index 3858ac320..b4b580c2b 100644
--- a/src/Buttons/ApplePayButton/ResponsesToApple.php
+++ b/src/Buttons/ApplePayButton/ResponsesToApple.php
@@ -179,14 +179,14 @@ protected function appleNewLineItemsResponse(array $paymentDetails): array
         $response = [];
         $response[] =  $this->appleItemFormat(
             'Subtotal',
-            $paymentDetails['subtotal'],
+            round(floatval($paymentDetails['subtotal']), 2),
             $type
         );
 
         if ($paymentDetails['shipping']['amount']) {
             $response[] = $this->appleItemFormat(
                 $paymentDetails['shipping']['label'] ?: '',
-                $paymentDetails['shipping']['amount'],
+                round(floatval($paymentDetails['shipping']['amount']), 2),
                 $type
             );
         }
@@ -194,11 +194,11 @@ protected function appleNewLineItemsResponse(array $paymentDetails): array
         if ($issetFeeAmount) {
             $response[] = $this->appleItemFormat(
                 $paymentDetails['fee']['label'] ?: '',
-                $paymentDetails['fee']['amount'],
+                round(floatval($paymentDetails['fee']['amount']), 2),
                 $type
             );
         }
-        $response[] = $this->appleItemFormat('Estimated Tax', $paymentDetails['taxes'], $type);
+        $response[] = $this->appleItemFormat('Estimated Tax', round(floatval($paymentDetails['taxes']), 2), $type);
         return $response;
     }
 

From df11a70bc58a78b49f597d6a565c7ba5c283b796 Mon Sep 17 00:00:00 2001
From: carmenmaymo <mayen22@gmail.com>
Date: Mon, 13 Mar 2023 13:51:46 +0100
Subject: [PATCH 3/9] hide button if outofstock MOL-850

---
 resources/js/applepayDirect.js                          | 5 +++--
 src/Buttons/ApplePayButton/DataToAppleButtonScripts.php | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/js/applepayDirect.js b/resources/js/applepayDirect.js
index f0d979071..65ea1679f 100644
--- a/resources/js/applepayDirect.js
+++ b/resources/js/applepayDirect.js
@@ -8,12 +8,13 @@ import {request} from './applePayRequest.js';
             return
         }
 
-        const {product: {id, needShipping = true, isVariation = false, price}, shop: {countryCode, currencyCode = 'EUR', totalLabel = ''}, ajaxUrl} = mollieApplePayDirectData
+        const {product: {id, needShipping = true, isVariation = false, price, stock}, shop: {countryCode, currencyCode = 'EUR', totalLabel = ''}, ajaxUrl} = mollieApplePayDirectData
 
         if (!id || !price || !countryCode || !ajaxUrl) {
             return
         }
-        if(!maybeShowButton()){
+        let outOfStock = stock === 'outofstock'
+        if (outOfStock || !maybeShowButton()){
             return
         }
 
diff --git a/src/Buttons/ApplePayButton/DataToAppleButtonScripts.php b/src/Buttons/ApplePayButton/DataToAppleButtonScripts.php
index 630326e61..a574e6825 100644
--- a/src/Buttons/ApplePayButton/DataToAppleButtonScripts.php
+++ b/src/Buttons/ApplePayButton/DataToAppleButtonScripts.php
@@ -85,6 +85,7 @@ protected function dataForProductPage(
         $productNeedShipping = $this->checkIfNeedShipping($product);
         $productId = get_the_id();
         $productPrice = $product->get_price();
+        $productStock = $product->get_stock_status();
 
         return [
             'product' => [
@@ -92,6 +93,7 @@ protected function dataForProductPage(
                 'id' => $productId,
                 'price' => $productPrice,
                 'isVariation' => $isVariation,
+                'stock' => $productStock,
             ],
             'shop' => [
                 'countryCode' => $shopCountryCode,

From 014e567712b3c68ebed8548251f8c706b3740ce8 Mon Sep 17 00:00:00 2001
From: carmenmaymo <mayen22@gmail.com>
Date: Mon, 13 Mar 2023 14:08:56 +0100
Subject: [PATCH 4/9] check variable subscription MOL-850

---
 src/Buttons/ApplePayButton/DataToAppleButtonScripts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Buttons/ApplePayButton/DataToAppleButtonScripts.php b/src/Buttons/ApplePayButton/DataToAppleButtonScripts.php
index a574e6825..b6e551b25 100644
--- a/src/Buttons/ApplePayButton/DataToAppleButtonScripts.php
+++ b/src/Buttons/ApplePayButton/DataToAppleButtonScripts.php
@@ -79,7 +79,7 @@ protected function dataForProductPage(
             return [];
         }
         $isVariation = false;
-        if ($product->get_type() === 'variable') {
+        if ($product->get_type() === 'variable' || $product->get_type() === 'variable-subscription') {
             $isVariation = true;
         }
         $productNeedShipping = $this->checkIfNeedShipping($product);

From 4abd7d5978e6b16f8c0489b3b06514643a3f41ab Mon Sep 17 00:00:00 2001
From: carmenmaymo <mayen22@gmail.com>
Date: Mon, 20 Mar 2023 10:34:50 +0100
Subject: [PATCH 5/9] hide button if logged out subscription -850

---
 src/Assets/AssetsModule.php | 46 +++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/Assets/AssetsModule.php b/src/Assets/AssetsModule.php
index f888bb72f..aa5bc07f3 100644
--- a/src/Assets/AssetsModule.php
+++ b/src/Assets/AssetsModule.php
@@ -19,8 +19,6 @@
 use Mollie\WooCommerce\Shared\Data;
 use Psr\Container\ContainerInterface;
 
-use function Psalm\getPsalmHelpText;
-
 class AssetsModule implements ExecutableModule
 {
     use ModuleClassNameIdTrait;
@@ -111,6 +109,15 @@ public function registerButtonsBlockScripts(string $pluginUrl, string $pluginPat
     public function enqueueApplePayDirectScripts(): void
     {
         if (mollieWooCommerceIsApplePayDirectEnabled('product') && is_product()) {
+            $product = wc_get_product(get_the_id());
+            if (!$product) {
+                return;
+            }
+
+            if ($product->is_type('subscription') && !is_user_logged_in()) {
+                return;
+            }
+
             $dataToScripts = new DataToAppleButtonScripts();
             wp_enqueue_style('mollie-applepaydirect');
             wp_enqueue_script('mollie_applepaydirect');
@@ -121,6 +128,10 @@ public function enqueueApplePayDirectScripts(): void
             );
         }
         if (mollieWooCommerceIsApplePayDirectEnabled('cart') && is_cart()) {
+            $cart = WC()->cart;
+            if ($this->cartHasSubscription($cart) && !is_user_logged_in()) {
+                return;
+            }
             $dataToScripts = new DataToAppleButtonScripts();
             wp_enqueue_style('mollie-applepaydirect');
             wp_enqueue_script('mollie_applepaydirectCart');
@@ -143,25 +154,23 @@ public function enqueuePayPalButtonScripts(string $pluginUrl): void
                 return;
             }
             $productNeedShipping = mollieWooCommerceCheckIfNeedShipping($product);
-            if (!$productNeedShipping) {
-                $dataToScripts = new DataToPayPal($pluginUrl);
-                wp_enqueue_style('unabledButton');
-                wp_enqueue_script('mollie_paypalButton');
-                wp_localize_script(
-                    'mollie_paypalButton',
-                    'molliepaypalbutton',
-                    $dataToScripts->paypalbuttonScriptData()
-                );
+            if ($productNeedShipping) {
+                return;
             }
+            $dataToScripts = new DataToPayPal($pluginUrl);
+            wp_enqueue_style('unabledButton');
+            wp_enqueue_script('mollie_paypalButton');
+            wp_localize_script(
+                'mollie_paypalButton',
+                'molliepaypalbutton',
+                $dataToScripts->paypalbuttonScriptData()
+            );
         }
         if (mollieWooCommerceIsPayPalButtonEnabled('cart') && is_cart()) {
             $cart = WC()->cart;
-            foreach ($cart->get_cart_contents() as $product) {
-                if ($product['data']->is_type('subscription')) {
-                    return;
-                }
+            if ($this->cartHasSubscription($cart)) {
+                return;
             }
-
             $dataToScripts = new DataToPayPal($pluginUrl);
             wp_enqueue_style('unabledButton');
             wp_enqueue_script('mollie_paypalButtonCart');
@@ -565,7 +574,10 @@ public function enqueueAdvancedSettingsJS($ar)
     protected function cartHasSubscription(\WC_Cart $cart): bool
     {
         foreach ($cart->cart_contents as $cart_content) {
-            if ($cart_content['data'] instanceof \WC_Product_Subscription_Variation) {
+            if (
+                $cart_content['data'] instanceof \WC_Product_Subscription
+                || $cart_content['data'] instanceof \WC_Product_Subscription_Variation
+            ) {
                 return true;
             }
         }

From 06dafe1b41e5b3e4da85a9214badec955631d939 Mon Sep 17 00:00:00 2001
From: carmenmaymo <mayen22@gmail.com>
Date: Mon, 27 Mar 2023 08:42:02 +0200
Subject: [PATCH 6/9] remove ddev folder from build -850

---
 gulpfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gulpfile.js b/gulpfile.js
index 5a1f63410..bd3565166 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -162,7 +162,7 @@ function _clean({baseDir, buildDir}) {
 function _copy({baseDir, buildDir, distDir}) {
     return function copy(done) {
         pump(
-            src([`**/*.*`, `!${buildDir}/**/*.*`, `!${distDir}/**/*.*`, '!.git/**/*.*', '!vendor/**/*.*', '!node_modules/**/*.*'], {base: baseDir, cwd: baseDir, dot: true}),
+            src([`**/*.*`, `!${buildDir}/**/*.*`, `!${distDir}/**/*.*`, '!.git/**/*.*', '!vendor/**/*.*', '!node_modules/**/*.*', '!.ddev/**/*.*', '!.github/**/*.*', '!.psalm/**/*.*'], {base: baseDir, cwd: baseDir, dot: true}),
             dest(buildDir),
             done
         )

From 76c0b2534b4c30371c1a59f1cf488c1dee4449ca Mon Sep 17 00:00:00 2001
From: carmenmaymo <mayen22@gmail.com>
Date: Mon, 27 Mar 2023 09:00:36 +0200
Subject: [PATCH 7/9] update test apple -850

---
 .../Functional/ApplePayButton/DataToAppleButtonScriptsTest.php | 3 +++
 tests/php/Stubs/woocommerce.php                                | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/tests/php/Functional/ApplePayButton/DataToAppleButtonScriptsTest.php b/tests/php/Functional/ApplePayButton/DataToAppleButtonScriptsTest.php
index 0e8644c3b..0638a28d1 100644
--- a/tests/php/Functional/ApplePayButton/DataToAppleButtonScriptsTest.php
+++ b/tests/php/Functional/ApplePayButton/DataToAppleButtonScriptsTest.php
@@ -30,6 +30,7 @@ public function testApplePayScriptDataOnProduct()
                 'id' => $postDummyData->productId,
                 'price' => '1',
                 'isVariation' => false,
+                'stock' => 'instock',
             ],
             'shop' => [
                 'countryCode' => 'IT',
@@ -123,6 +124,8 @@ private function wcProduct()
                 'get_price' => '1',
                 'get_type' => 'simple',
                 'needs_shipping' => true,
+                'get_stock_status' => 'instock',
+
             ]
         );
 
diff --git a/tests/php/Stubs/woocommerce.php b/tests/php/Stubs/woocommerce.php
index 86ae04b78..13a2d4cd9 100644
--- a/tests/php/Stubs/woocommerce.php
+++ b/tests/php/Stubs/woocommerce.php
@@ -312,6 +312,9 @@ public function is_taxable()
     public function is_type($type){
     }
 
+    public function get_stock_status()
+    {
+    }
 
 }
 

From e575bf1af2cd9748325dec2d4a0dc197223da1cf Mon Sep 17 00:00:00 2001
From: carmenmaymo <mayen22@gmail.com>
Date: Mon, 27 Mar 2023 09:15:57 +0200
Subject: [PATCH 8/9] fix cs -850

---
 src/Activation/ActivationModule.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Activation/ActivationModule.php b/src/Activation/ActivationModule.php
index fd797d7a5..9d225c4ac 100644
--- a/src/Activation/ActivationModule.php
+++ b/src/Activation/ActivationModule.php
@@ -112,12 +112,15 @@ static function ($value) {
      */
     public function appleValidationFileRewriteRules(): void
     {
-        $requestUri = isset($_SERVER['REQUEST_URI'])? filter_var($_SERVER['REQUEST_URI'], FILTER_SANITIZE_URL): '';
+        if (!isset($_SERVER['REQUEST_URI'])) {
+            return;
+        }
+        $requestUri =  (string) filter_var(wp_unslash($_SERVER['REQUEST_URI']), FILTER_SANITIZE_URL);
         if (strpos($requestUri, '.well-known/apple-developer-merchantid-domain-association') !== false) {
             $validationString = '7B227073704964223A2244394337463730314338433646324336463344363536433039393434453332323030423137364631353245353844393134304331433533414138323436453630222C2276657273696F6E223A312C22637265617465644F6E223A313536363930343337353936352C227369676E6174757265223A223330383030363039326138363438383666373064303130373032613038303330383030323031303133313066333030643036303936303836343830313635303330343032303130353030333038303036303932613836343838366637306430313037303130303030613038303330383230336533333038323033383861303033303230313032303230383463333034313439353139643534333633303061303630383261383634386365336430343033303233303761333132653330326330363033353530343033306332353431373037303663363532303431373037303663363936333631373436393666366532303439366537343635363737323631373436393666366532303433343132303264323034373333333132363330323430363033353530343062306331643431373037303663363532303433363537323734363936363639363336313734363936663665323034313735373436383666373236393734373933313133333031313036303335353034306130633061343137303730366336353230343936653633326533313062333030393036303335353034303631333032353535333330316531373064333133393330333533313338333033313333333233353337356131373064333233343330333533313336333033313333333233353337356133303566333132353330323330363033353530343033306331633635363336333264373336643730326436323732366636623635373232643733363936373665356635353433333432643530353234663434333131343330313230363033353530343062306330623639346635333230353337393733373436353664373333313133333031313036303335353034306130633061343137303730366336353230343936653633326533313062333030393036303335353034303631333032353535333330353933303133303630373261383634386365336430323031303630383261383634386365336430333031303730333432303030346332313537376564656264366337623232313866363864643730393061313231386463376230626436663263323833643834363039356439346166346135343131623833343230656438313166333430376538333333316631633534633366376562333232306436626164356434656666343932383938393365376330663133613338323032313133303832303230643330306330363033353531643133303130316666303430323330303033303166303630333535316432333034313833303136383031343233663234396334346639336534656632376536633466363238366333666132626266643265346233303435303630383262303630313035303530373031303130343339333033373330333530363038326230363031303530353037333030313836323936383734373437303361326632663666363337333730326536313730373036633635326536333666366432663666363337333730333033343264363137303730366336353631363936333631333333303332333038323031316430363033353531643230303438323031313433303832303131303330383230313063303630393261383634383836663736333634303530313330383166653330383163333036303832623036303130353035303730323032333038316236306338316233353236353663363936313665363336353230366636653230373436383639373332303633363537323734363936363639363336313734363532303632373932303631366537393230373036313732373437393230363137333733373536643635373332303631363336333635373037343631366536333635323036663636323037343638363532303734363836353665323036313730373036633639363336313632366336353230373337343631366536343631373236343230373436353732366437333230363136653634323036333666366536343639373436393666366537333230366636363230373537333635326332303633363537323734363936363639363336313734363532303730366636633639363337393230363136653634323036333635373237343639363636393633363137343639366636653230373037323631363337343639363336353230373337343631373436353664363536653734373332653330333630363038326230363031303530353037303230313136326136383734373437303361326632663737373737373265363137303730366336353265363336663664326636333635373237343639363636393633363137343635363137353734363836663732363937343739326633303334303630333535316431663034326433303262333032396130323761303235383632333638373437343730336132663266363337323663326536313730373036633635326536333666366432663631373037303663363536313639363336313333326536333732366333303164303630333535316430653034313630343134393435376462366664353734383138363839383937363266376535373835303765373962353832343330306530363033353531643066303130316666303430343033303230373830333030663036303932613836343838366637363336343036316430343032303530303330306130363038326138363438636533643034303330323033343930303330343630323231303062653039353731666537316531653733356235356535616661636234633732666562343435663330313835323232633732353130303262363165626436663535303232313030643138623335306135646436646436656231373436303335623131656232636538376366613365366166366362643833383038393064633832636464616136333330383230326565333038323032373561303033303230313032303230383439366432666266336139386461393733303061303630383261383634386365336430343033303233303637333131623330313930363033353530343033306331323431373037303663363532303532366636663734323034333431323032643230343733333331323633303234303630333535303430623063316434313730373036633635323034333635373237343639363636393633363137343639366636653230343137353734363836663732363937343739333131333330313130363033353530343061306330613431373037303663363532303439366536333265333130623330303930363033353530343036313330323535353333303165313730643331333433303335333033363332333333343336333333303561313730643332333933303335333033363332333333343336333333303561333037613331326533303263303630333535303430333063323534313730373036633635323034313730373036633639363336313734363936663665323034393665373436353637373236313734363936663665323034333431323032643230343733333331323633303234303630333535303430623063316434313730373036633635323034333635373237343639363636393633363137343639366636653230343137353734363836663732363937343739333131333330313130363033353530343061306330613431373037303663363532303439366536333265333130623330303930363033353530343036313330323535353333303539333031333036303732613836343863653364303230313036303832613836343863653364303330313037303334323030303466303137313138343139643736343835643531613565323538313037373665383830613265666465376261653464653038646663346239336531333335366435363635623335616532326430393737363064323234653762626130386664373631376365383863623736626236363730626563386538323938346666353434356133383166373330383166343330343630363038326230363031303530353037303130313034336133303338333033363036303832623036303130353035303733303031383632613638373437343730336132663266366636333733373032653631373037303663363532653633366636643266366636333733373033303334326436313730373036633635373236663666373436333631363733333330316430363033353531643065303431363034313432336632343963343466393365346566323765366334663632383663336661326262666432653462333030663036303335353164313330313031666630343035333030333031303166663330316630363033353531643233303431383330313638303134626262306465613135383333383839616134386139396465626562646562616664616362323461623330333730363033353531643166303433303330326533303263613032616130323838363236363837343734373033613266326636333732366332653631373037303663363532653633366636643266363137303730366336353732366636663734363336313637333332653633373236633330306530363033353531643066303130316666303430343033303230313036333031303036306132613836343838366637363336343036303230653034303230353030333030613036303832613836343863653364303430333032303336373030333036343032333033616366373238333531313639396231383666623335633335366361363262666634313765646439306637353464613238656265663139633831356534326237383966383938663739623539396639386435343130643866396465396332666530323330333232646435343432316230613330353737366335646633333833623930363766643137376332633231366439363466633637323639383231323666353466383761376431623939636239623039383932313631303639393066303939323164303030303331383230313863333038323031383830323031303133303831383633303761333132653330326330363033353530343033306332353431373037303663363532303431373037303663363936333631373436393666366532303439366537343635363737323631373436393666366532303433343132303264323034373333333132363330323430363033353530343062306331643431373037303663363532303433363537323734363936363639363336313734363936663665323034313735373436383666373236393734373933313133333031313036303335353034306130633061343137303730366336353230343936653633326533313062333030393036303335353034303631333032353535333032303834633330343134393531396435343336333030643036303936303836343830313635303330343032303130353030613038313935333031383036303932613836343838366637306430313039303333313062303630393261383634383836663730643031303730313330316330363039326138363438383666373064303130393035333130663137306433313339333033383332333733313331333133323335333535613330326130363039326138363438383666373064303130393334333131643330316233303064303630393630383634383031363530333034303230313035303061313061303630383261383634386365336430343033303233303266303630393261383634383836663730643031303930343331323230343230303864323631373363653335643465646134616139623866343763643439336639333034653763366631633866393239393238333361373537373736393438323330306130363038326138363438636533643034303330323034343733303435303232313030613439373261353733346466616362303131343162613366626238663062626665616162626233363161366536613839663666366361373132363165333039303032323032343439396561643530356238376664366331333134656135343963663431316339326632656437323837303533303738636562626638326462306561376633303030303030303030303030227D';
             nocache_headers();
             header('Content-Type: text/plain', true, 200);
-            echo $validationString;
+            echo $validationString;// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
             exit;
         }
     }

From 67943a7f61d7ca5a1d84663a1c047d1b4e9cd4b6 Mon Sep 17 00:00:00 2001
From: carmenmaymo <mayen22@gmail.com>
Date: Mon, 27 Mar 2023 09:29:02 +0200
Subject: [PATCH 9/9] update version number beta2 -1026

---
 mollie-payments-for-woocommerce.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mollie-payments-for-woocommerce.php b/mollie-payments-for-woocommerce.php
index 50d6291fb..5a78f65a4 100644
--- a/mollie-payments-for-woocommerce.php
+++ b/mollie-payments-for-woocommerce.php
@@ -3,7 +3,7 @@
  * Plugin Name: Mollie Payments for WooCommerce
  * Plugin URI: https://www.mollie.com
  * Description: Accept payments in WooCommerce with the official Mollie plugin
- * Version: 7.3.6-beta
+ * Version: 7.3.6-beta2
  * Author: Mollie
  * Author URI: https://www.mollie.com
  * Requires at least: 5.0