From 43f938f0a48cb89c92a9e3fb8baa3fa85637e860 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 21 May 2024 20:48:13 +0400
Subject: [PATCH] Fix payment with standard card button gateway + shipping
 callback

---
 .../ppcp-button/resources/js/modules/Renderer/Renderer.js    | 5 +----
 modules/ppcp-button/src/Assets/SmartButton.php               | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js b/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
index bea1f98da..5c0461e57 100644
--- a/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
+++ b/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
@@ -94,10 +94,7 @@ class Renderer {
             return {
                 style,
                 ...contextConfig,
-                onClick: (data, actions) => {
-                    venmoButtonClicked = data.fundingSource === 'venmo'
-                    this.onSmartButtonClick
-                },
+                onClick:  this.onSmartButtonClick,
                 onInit: (data, actions) => {
                     if (this.onSmartButtonsInit) {
                         this.onSmartButtonsInit(data, actions);
diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index 8c0a569e3..7d6909c2e 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -1361,7 +1361,7 @@ document.querySelector("#payment").before(document.querySelector(".ppcp-messages
 			'integration-date' => PAYPAL_INTEGRATION_DATE,
 			'components'       => implode( ',', $this->components() ),
 			'vault'            => ( $this->can_save_vault_token() || $this->subscription_helper->need_subscription_intent( $subscription_mode ) ) ? 'true' : 'false',
-			'commit'           => 'false',
+			'commit'           => in_array( $context, $this->pay_now_contexts, true ) ? 'true' : 'false',
 			'intent'           => $intent,
 		);