-
+
+
+
+
+
diff --git a/templates/rzp-dual-checkout-btn.php b/templates/rzp-dual-checkout-btn.php
new file mode 100644
index 00000000..0bc24518
--- /dev/null
+++ b/templates/rzp-dual-checkout-btn.php
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/templates/rzp-mini-checkout-btn.php b/templates/rzp-mini-checkout-btn.php
index f563c402..7da82090 100644
--- a/templates/rzp-mini-checkout-btn.php
+++ b/templates/rzp-mini-checkout-btn.php
@@ -1,10 +1,3 @@
-
-
-
-
+
+ >
diff --git a/templates/rzp-pdp-checkout-btn.php b/templates/rzp-pdp-checkout-btn.php
index 035ffebc..6dab8653 100644
--- a/templates/rzp-pdp-checkout-btn.php
+++ b/templates/rzp-pdp-checkout-btn.php
@@ -2,15 +2,14 @@
global $product;
$productData = wp_json_encode(['id' => $product->get_id(), 'quantity' => 1]);
?>
-
+ pdp_checkout="" >
+
+
+
+
+
+
\ No newline at end of file
diff --git a/woo-razorpay.php b/woo-razorpay.php
index 921dad7a..356bfcca 100644
--- a/woo-razorpay.php
+++ b/woo-razorpay.php
@@ -29,6 +29,7 @@
require_once __DIR__.'/includes/support/cartbounty.php';
require_once __DIR__.'/includes/support/wati.php';
require_once __DIR__.'/includes/razorpay-affordability-widget.php';
+require_once __DIR__.'/includes/stylehandler.php';
require_once __DIR__.'/includes/cron/one-click-checkout/Constants.php';
require_once __DIR__.'/includes/cron/one-click-checkout/one-cc-address-sync.php';
require_once __DIR__.'/includes/cron/cron.php';
@@ -269,6 +270,8 @@ public function __construct($hooks = true)
// 1cc flags should be enabled only if merchant has access to 1cc feature
$is1ccAvailable = false;
$isAccCreationAvailable = false;
+ $isDualCheckoutEnabled = false;
+
$merchantPreferences = [];
$merchantPreferences = get_transient(self::ONE_CC_MERCHANT_PREF);
@@ -295,6 +298,10 @@ public function __construct($hooks = true)
}
}
+ if (!empty($merchantPreferences['features']['one_cc_dual_checkout'])) {
+ $isDualCheckoutEnabled = true;
+ }
+
if (!empty($merchantPreferences['features']['one_click_checkout'])) {
$is1ccAvailable = true;
}
@@ -324,6 +331,14 @@ public function __construct($hooks = true)
));
}
+ if ($isDualCheckoutEnabled) {
+ $this->visibleSettings = array_merge($this->visibleSettings, array(
+ 'enable_dual_checkout_oncart',
+ 'enable_dual_checkout_onpdp',
+ 'enable_dual_checkout_minicart',
+ ));
+ }
+
}
$this->init_form_fields();
@@ -3031,7 +3046,9 @@ function enqueueScriptsFor1cc()
wp_register_script('1cc_razorpay_checkout', RZP_CHECKOUTJS_URL, null, null);
wp_enqueue_script('1cc_razorpay_checkout');
- wp_register_style(RZP_1CC_CSS_SCRIPT, plugin_dir_url(__FILE__) . 'public/css/1cc-product-checkout.css', null, null);
+
+ $themeInfo=styleHandler(wp_get_theme()->name);
+ wp_register_style(RZP_1CC_CSS_SCRIPT,$themeInfo, null, null);
wp_enqueue_style(RZP_1CC_CSS_SCRIPT);
wp_register_script('btn_1cc_checkout', BTN_CHECKOUTJS_URL, null, null);
@@ -3060,14 +3077,18 @@ function addCheckoutButton()
if (isRazorpayPluginEnabled() && is1ccEnabled() )
{
+ if (isDualCartCheckoutEnabled()){
+ $tempTest = RZP_PATH . 'templates/rzp-dual-checkout-btn.php';
+ } else {
+ $tempTest = RZP_PATH . 'templates/rzp-cart-checkout-btn.php';
+ }
+
if (isTestModeEnabled()) {
$current_user = wp_get_current_user();
if ($current_user->has_cap( 'administrator' ) || preg_match( '/@razorpay.com$/i', $current_user->user_email )) {
- $tempTest = RZP_PATH . 'templates/rzp-cart-checkout-btn.php';
load_template( $tempTest, false, array() );
}
} else {
- $tempTest = RZP_PATH . 'templates/rzp-cart-checkout-btn.php';
load_template( $tempTest, false, array() );
}
}
@@ -3084,8 +3105,10 @@ function addCheckoutButton()
add_action( 'woocommerce_widget_shopping_cart_buttons', function()
{
// Removing Buttons
- remove_action( 'woocommerce_widget_shopping_cart_buttons', 'woocommerce_widget_shopping_cart_proceed_to_checkout', 20 );
-
+ if(isDualMiniCartCheckoutEnabled() === false){
+ // Removing Buttons
+ remove_action( 'woocommerce_widget_shopping_cart_buttons', 'woocommerce_widget_shopping_cart_proceed_to_checkout', 20 );
+ }
add_action('woocommerce_cart_updated', 'enqueueScriptsFor1cc', 10);
add_action( 'woocommerce_widget_shopping_cart_buttons', 'addMiniCheckoutButton', 20 );