diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
deleted file mode 100644
index 3b1a2fa8..00000000
--- a/.github/workflows/security.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: SecurityChecks
-on:
-  pull_request: {}
-  push:
-    branches: ["master"]
-  schedule:
-    - cron: '30 20 * * *'  
-jobs:
-  semgrep:
-    name: Scan
-    runs-on: [ubuntu-latest]                               # nosemgrep : semgrep.dev/s/swati31196:github_provided_runner
-    steps:
-      - uses: actions/checkout@v2
-      - uses: returntocorp/semgrep-action@v1
-        with:
-          publishToken: ${{ secrets.SEMGREP_APP_TOKEN }}
-          publishDeployment: 339
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  workflow_status:
-    runs-on: [ ubuntu-latest ]                               # nosemgrep : semgrep.dev/s/swati31196:github_provided_runner
-    name: Update Status Check
-    needs: [ semgrep ]
-    if: always()
-    env:
-      githubCommit: ${{ github.event.pull_request.head.sha }}
-    steps:
-      - name: Set github commit id
-        run: |
-          if [ "${{ github.event_name }}" = "push" ] || [ "${{ github.event_name }}" = "schedule" ]; then
-            echo "githubCommit=${{ github.sha }}" >> $GITHUB_ENV
-          fi
-          exit 0
-      - name: Failed
-        id: failed
-        if: (contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')) && github.ref != 'refs/heads/master'
-        run: |
-          echo 'Failing the workflow for github security status check.'
-          curl -X POST -H "Content-Type: application/json" -H "Authorization: token ${{ github.token }}" \
-          -d '{ "state" : "failure" , "context" : "github/security-status-check" , "description" : "github/security-status-check", "target_url" : "https://github.com/${{ github.repository }}" }' \
-          https://api.github.com/repos/${{ github.repository }}/statuses/${{ env.githubCommit }}
-          exit 1
-      - name: Success
-        if: steps.failed.conclusion == 'skipped' || github.ref != 'refs/heads/master'
-        run: |
-          echo 'Status check has passed!'
-          curl -X POST -H "Content-Type: application/json" -H "Authorization: token ${{ github.token }}" \
-          -d '{ "state" : "success" , "context" : "github/security-status-check" , "description" : "github/security-status-check", "target_url" : "https://github.com/${{ github.repository }}" }' \
-          https://api.github.com/repos/${{ github.repository }}/statuses/${{ env.githubCommit }}
-          exit 0
\ No newline at end of file
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 62209693..dc923b6e 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -12,7 +12,7 @@ jobs:
         env:
           MYSQL_ROOT_PASSWORD: root
         # Ensure docker waits for mariadb to start
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+        options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
diff --git a/checkout-block.php b/checkout-block.php
new file mode 100644
index 00000000..94d239df
--- /dev/null
+++ b/checkout-block.php
@@ -0,0 +1,45 @@
+<?php
+
+use Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType;
+
+final class WC_Razorpay_Blocks extends AbstractPaymentMethodType 
+{
+    protected $name = 'razorpay';
+
+    public function initialize()
+    {
+        $this->settings = get_option('woocommerce_razorpay_settings', []);
+    }
+
+    public function get_payment_method_script_handles()
+    {
+        wp_register_script(
+            'razorpay-blocks-integration',
+            plugin_dir_url(__FILE__) . 'checkout_block.js',
+            [
+                'wc-blocks-registry',
+                'wc-settings',
+                'wp-element',
+                'wp-html-entities',
+                'wp-i18n',
+            ],
+            null,
+            true
+        );
+
+        if (function_exists('wp_set_script_translations')) 
+        {
+            wp_set_script_translations('razorpay-blocks-integration');
+        }
+
+        return ['razorpay-blocks-integration'];
+    }
+
+    public function get_payment_method_data()
+    {
+        return [
+            'title' => 'Pay by Razorpay',
+            'description' => $this->settings['description'],
+        ]; 
+    }
+}
diff --git a/checkout_block.js b/checkout_block.js
new file mode 100644
index 00000000..2054aec2
--- /dev/null
+++ b/checkout_block.js
@@ -0,0 +1,18 @@
+const settings = window.wc.wcSettings.getSetting('razorpay_data', {});
+const label = window.wp.htmlEntities.decodeEntities(settings.title) || window.wp.i18n.__('Razorpay for woocommerce', 'razorpay');
+const Content = () => {
+    return window.wp.htmlEntities.decodeEntities(settings.description || '');
+};
+const Block_Gateway = {
+    name: 'razorpay',
+    label: label,
+    content: Object(window.wp.element.createElement)(Content, null ),
+    edit: Object(window.wp.element.createElement)(Content, null ),
+    canMakePayment: () => true,
+    ariaLabel: label,
+    supports: {
+        features: settings.supports,
+    },
+};
+window.wc.wcBlocksRegistry.registerPaymentMethod( Block_Gateway );
+ 
\ No newline at end of file
diff --git a/includes/api/cart.php b/includes/api/cart.php
index c3c70d33..e09986d8 100644
--- a/includes/api/cart.php
+++ b/includes/api/cart.php
@@ -5,7 +5,7 @@
 
 // Fetch cart data on cart and mini cart page
 
-use Automattic\WooCommerce\Utilities\OrderUtil; 
+use Automattic\WooCommerce\Utilities\OrderUtil;
 
 function fetchCartData(WP_REST_Request $request)
 {
@@ -39,6 +39,10 @@ function fetchCartData(WP_REST_Request $request)
 
     $response = cartResponse($couponCode);
 
+    $response['user'] = getCartUserObject();
+
+    $response['plugins'] = getPluginsDetails();
+
     return new WP_REST_Response($response, 200);
 }
 
@@ -90,9 +94,34 @@ function createCartData(WP_REST_Request $request)
 
     $response = cartResponse($couponCode);
 
+    $response['user'] = getCartUserObject();
+
+    $response['plugins'] = getPluginsDetails();
+
     return new WP_REST_Response($response, 200);
 }
 
+function getCartUserObject(): array {
+    $user = [
+        "logged_in" => false,
+    ];
+    if (is_user_logged_in()) {
+        $current_user = wp_get_current_user();
+        $user['logged_in'] = true;
+        $user['email'] = $current_user->user_email;
+    }
+    return $user;
+}
+
+function getPluginsDetails(): array {
+    $pluginData = [];
+    if (is_plugin_active('woo-wallet/woo-wallet.php'))
+    {
+        $pluginData['terra-wallet'] = ['active' => true];
+    }
+    return $pluginData;
+}
+
 /**
  * Create the cart object for the line items exist in order
  */
@@ -134,8 +163,8 @@ function getCartLineItem()
     $cart = WC()->cart->get_cart();
     $i = 0;
 
-    foreach($cart as $item_id => $item) { 
-        $product =  wc_get_product( $item['product_id']); 
+    foreach($cart as $item_id => $item) {
+        $product =  wc_get_product( $item['product_id']);
         $price = round($item['line_subtotal']*100) + round($item['line_subtotal_tax']*100);
 
         $type = "e-commerce";
@@ -146,7 +175,7 @@ function getCartLineItem()
            if($product->is_type('variation')){
                 $parentProductId = $product->get_parent_id();
                 $parentProduct = wc_get_product($parentProductId);
-             
+
                 if($parentProduct->get_type() == 'pw-gift-card' || $parentProduct->get_type() == 'gift-card'){
                     $type = 'gift_card';
                 }
@@ -154,7 +183,7 @@ function getCartLineItem()
            }else{
 
                if($product->get_type() == 'pw-gift-card' || $product->get_type() == 'gift-card'){
-                      $type = 'gift_card'; 
+                      $type = 'gift_card';
                }
            }
        }
@@ -172,7 +201,7 @@ function getCartLineItem()
        $data[$i]['variant_id'] = $item['variation_id'];
        $data[$i]['offer_price'] = (empty($productDetails['sale_price'])=== false) ? (int) $productDetails['sale_price']*100 : $price/$item['quantity'];
        $i++;
-    } 
+    }
 
     return $data;
 }
@@ -220,7 +249,7 @@ function cartResponse($couponCode){
 
     $response['enable_ga_analytics'] = get_option('woocommerce_razorpay_settings')['enable_1cc_ga_analytics'] === 'yes' ? true : false;
     $response['enable_fb_analytics'] = get_option('woocommerce_razorpay_settings')['enable_1cc_fb_analytics'] === 'yes' ? true : false;
-    
+
     $response += ['redirect' => true, 'one_click_checkout' => true, 'mandatory_login' => false, 'key' => get_option('woocommerce_razorpay_settings')['key_id'], 'name' => html_entity_decode(get_bloginfo('name'), ENT_QUOTES), 'currency' => 'INR'];
 
     return $response;
diff --git a/includes/cron/one-click-checkout/one-cc-address-sync.php b/includes/cron/one-click-checkout/one-cc-address-sync.php
index 74ebb9ad..babc3fae 100644
--- a/includes/cron/one-click-checkout/one-cc-address-sync.php
+++ b/includes/cron/one-click-checkout/one-cc-address-sync.php
@@ -426,7 +426,7 @@ function createOneCCAddressSyncCron()
         rzpLogInfo("createOneCCAddressSyncCron:426 - Adding option: ONE_CC_ADDRESS_SYNC_CRON_HOOK");
         add_option(
             Constants::ONE_CC_ADDRESS_SYNC_CRON_HOOK,
-            $data,
+            $data
         );
         rzpLogInfo("createOneCCAddressSyncCron:432 - Successfully Added option: ONE_CC_ADDRESS_SYNC_CRON_HOOK");
     }
diff --git a/includes/razorpay-affordability-widget.php b/includes/razorpay-affordability-widget.php
index e4e5deb2..2f8cbd94 100644
--- a/includes/razorpay-affordability-widget.php
+++ b/includes/razorpay-affordability-widget.php
@@ -5,9 +5,9 @@
 function addAffordabilityWidgetHTML()
 {
     $current_user = wp_get_current_user();
-    if ((isAffordabilityWidgetTestModeEnabled() === false) or 
+    if ((isAffordabilityWidgetTestModeEnabled() === false) or
         (isAffordabilityWidgetTestModeEnabled() and
-        ($current_user->has_cap('administrator') or 
+        ($current_user->has_cap('administrator') or
         preg_match('/@razorpay.com$/i', $current_user->user_email))))
     {
         echo '<div id="razorpay-affordability-widget" style="display: block;"></div>
@@ -17,7 +17,7 @@ function addAffordabilityWidgetHTML()
         <script>
             const key = "'.getKeyId().'";
             const amount = parseFloat("'.getPrice().'s") * 100;
-            addEventListener("load", 
+            addEventListener("load",
             function() {
                 const widgetConfig = {
                     "key": key,
@@ -62,14 +62,14 @@ function() {
                 rzpAffordabilitySuite.render();
             });
 
-            jQuery(function($) { 
+            jQuery(function($) {
 
                 $.fn.myFunction = function()
                 {
                     var variants = (document.querySelector("form.variations_form").dataset.product_variations);
                     var selectedVariantID = document.querySelector("input.variation_id").value;
                     var selectedVariant = JSON.parse(variants).filter( variant => variant.variation_id === parseInt(selectedVariantID));
-                    
+
                     if(typeof(selectedVariant[0]) != "undefined")
                     {
                         amt = selectedVariant[0].display_price * 100;
@@ -138,7 +138,7 @@ function getPrice()
     global $product;
     if ($product->is_type('simple') === true)
     {
-        if ($product->is_on_sale()) 
+        if ($product->is_on_sale())
         {
             $price = $product->get_sale_price();
         }
@@ -149,7 +149,7 @@ function getPrice()
     }
     else
     {
-        $price = $product->get_price(); 
+        $price = $product->get_price();
     }
 
     return $price;
@@ -158,8 +158,8 @@ function getPrice()
 function getOffers()
 {
     $offers = isEnabled('rzp_afd_enable_offers');
-    
-    if (empty(get_option('rzp_afd_limited_offers')) === false and 
+
+    if (empty(get_option('rzp_afd_limited_offers')) === false and
         $offers != 'false')
     {
         $offers = '{ "offerIds": [';
@@ -167,17 +167,17 @@ function getOffers()
         {
             $offers = $offers.'"'.$provider.'"';
             $offers = $offers.',';
-        }	
+        }
         $offers = $offers.']';
     }
-    if (empty(get_option('rzp_afd_show_discount_amount')) === false and 
+    if (empty(get_option('rzp_afd_show_discount_amount')) === false and
         $offers != 'false')
     {
         if ($offers != 'true')
         {
             $offers = $offers.',';
         }
-        else 
+        else
         {
             $offers = '{';
         }
@@ -193,7 +193,7 @@ function getOffers()
 function getAdditionalOffers()
 {
     $additionalOffers = '[]';
-    if (empty(get_option('rzp_afd_additional_offers')) === false and 
+    if (empty(get_option('rzp_afd_additional_offers')) === false and
         getOffers() != 'false')
     {
         $additionalOffers = '[';
@@ -201,7 +201,7 @@ function getAdditionalOffers()
         {
             $additionalOffers = $additionalOffers.'"'.$provider.'"';
             $additionalOffers = $additionalOffers.',';
-        }	
+        }
         $additionalOffers = $additionalOffers.']';
     }
 
@@ -211,8 +211,8 @@ function getAdditionalOffers()
 function getEmi()
 {
     $emi = isEnabled('rzp_afd_enable_emi');
-    
-    if (empty(get_option('rzp_afd_limited_emi_providers')) === false and 
+
+    if (empty(get_option('rzp_afd_limited_emi_providers')) === false and
         $emi != 'false')
     {
         $emi = '{ "issuers": [';
@@ -220,7 +220,7 @@ function getEmi()
         {
             $emi = $emi.'"'.$provider.'"';
             $emi = $emi.',';
-        }	
+        }
         $emi = $emi.'] }';
     }
 
@@ -230,8 +230,8 @@ function getEmi()
 function getCardlessEmi()
 {
     $cardlessEmi = isEnabled('rzp_afd_enable_cardless_emi');
-    
-    if (empty(get_option('rzp_afd_limited_cardless_emi_providers')) === false and 
+
+    if (empty(get_option('rzp_afd_limited_cardless_emi_providers')) === false and
         $cardlessEmi != 'false')
     {
         $cardlessEmi = '{ "providers": [';
@@ -239,7 +239,7 @@ function getCardlessEmi()
         {
             $cardlessEmi = $cardlessEmi.'"'.$provider.'"';
             $cardlessEmi = $cardlessEmi.',';
-        }	
+        }
         $cardlessEmi = $cardlessEmi.'] }';
     }
 
@@ -249,8 +249,8 @@ function getCardlessEmi()
 function getPayLater()
 {
     $payLater = isEnabled('rzp_afd_enable_pay_later');
-    
-    if (empty(get_option('rzp_afd_limited_pay_later_providers')) === false and 
+
+    if (empty(get_option('rzp_afd_limited_pay_later_providers')) === false and
         $payLater != 'false')
     {
         $payLater = '{ "providers": [';
@@ -258,7 +258,7 @@ function getPayLater()
         {
             $payLater = $payLater.'"'.$provider.'"';
             $payLater = $payLater.',';
-        }	
+        }
         $payLater = $payLater.'] }';
     }
 
@@ -313,11 +313,11 @@ function getFooterFontSize()
 function getFooterDarkLogo()
 {
     $footerDarkLogo = isEnabled('rzp_afd_enable_dark_logo');
-    
+
     return $footerDarkLogo;
 }
 
-function addSubSection() 
+function addSubSection()
 {
     global $current_section;
 
@@ -332,9 +332,9 @@ function addSubSection()
 
     $array_keys = array_keys($sections);
 
-    foreach ($sections as $id => $label) 
+    foreach ($sections as $id => $label)
     {
-        if ($current_section === 'razorpay' or 
+        if ($current_section === 'razorpay' or
             $current_section === 'affordability-widget')
         {
             echo '<li><a href="'.admin_url('admin.php?page=wc-settings&tab='.$tab_id.
@@ -342,16 +342,16 @@ function addSubSection()
             $label.'</a> '.(end($array_keys) === $id ? '' : '|').' </li>';
         }
     }
-   
+
     echo '</ul><br class="clear" />';
 }
 
-function getAffordabilityWidgetSettings() 
+function getAffordabilityWidgetSettings()
 {
     global $current_section;
     $settings = array();
 
-    if ($current_section === 'affordability-widget') 
+    if ($current_section === 'affordability-widget')
     {
         $settings = array(
             'section_title' => array(
@@ -505,17 +505,23 @@ function getAffordabilityWidgetSettings()
                  'id'                   => 'wc_settings_tab_demo_section_end'
             ),
         );
-    } 
+    }
 
     return apply_filters('wc_affordability_widget_settings', $settings);
 }
 
-function displayAffordabilityWidgetSettings() 
+function displayAffordabilityWidgetSettings()
 {
-    woocommerce_admin_fields(getAffordabilityWidgetSettings()); 
+    if (function_exists('woocommerce_admin_fields') === false)
+    {
+        if (defined('WC_ABSPATH')) {
+            include_once WC_ABSPATH . 'includes/admin/wc-admin-functions.php';
+        }
+    }
+    woocommerce_admin_fields(getAffordabilityWidgetSettings());
 }
 
-function updateAffordabilityWidgetSettings() 
+function updateAffordabilityWidgetSettings()
 {
     woocommerce_update_options(getAffordabilityWidgetSettings());
     try
@@ -531,9 +537,9 @@ function updateAffordabilityWidgetSettings()
         {
             $api = new Api(get_option('woocommerce_razorpay_settings')['key_id'],get_option('woocommerce_razorpay_settings')['key_secret']);
         }
-        
+
         $merchantPreferences = $api->request->request('GET', 'accounts/me/features');
-        
+
         if (isset($merchantPreferences) === false or
             isset($merchantPreferences['assigned_features']) === false)
         {
@@ -550,7 +556,7 @@ function updateAffordabilityWidgetSettings()
                 break;
             }
         }
-        
+
     }
     catch (\Exception $e)
     {
@@ -567,12 +573,12 @@ function isEnabled($feature)
     }
     $value = 'false';
 
-    if (empty(get_option($feature)) === false and 
+    if (empty(get_option($feature)) === false and
         get_option($feature) === 'yes')
     {
         $value = 'true';
     }
-    
+
     return $value;
 }
 
@@ -595,7 +601,7 @@ function getCustomisation($customisation)
     {
         $customisationValue = get_option($customisation);
     }
-    
+
     return $customisationValue;
 }
 
@@ -609,4 +615,4 @@ function isAffordabilityWidgetTestModeEnabled()
         empty(get_option('rzp_afd_enable_test_mode')) === false and
         get_option('rzp_afd_enable_test_mode') === 'yes'
     );
-}	
+}
diff --git a/includes/razorpay-webhook.php b/includes/razorpay-webhook.php
index ae836493..ce969c48 100644
--- a/includes/razorpay-webhook.php
+++ b/includes/razorpay-webhook.php
@@ -12,12 +12,12 @@ class RZP_Webhook
     /**
      * @var HTTP CONFLICT Request
      */
-    protected const HTTP_CONFLICT_STATUS = 409;
+    const HTTP_CONFLICT_STATUS = 409;
 
     /**
      * @var Webhook Notify Wait Time
      */
-    protected const WEBHOOK_NOTIFY_WAIT_TIME = (5 * 60);
+    const WEBHOOK_NOTIFY_WAIT_TIME = (5 * 60);
 
     /**
      * Instance of the razorpay payments class
@@ -56,6 +56,13 @@ class RZP_Webhook
         self::SUBSCRIPTION_CHARGED,
     ];
 
+    protected $subscriptionEvents = [
+        self::SUBSCRIPTION_CANCELLED,
+        self::SUBSCRIPTION_PAUSED,
+        self::SUBSCRIPTION_RESUMED,
+        self::SUBSCRIPTION_CHARGED,
+    ];
+
     public function __construct()
     {
         $this->razorpay = new WC_Razorpay(false);
@@ -94,6 +101,13 @@ public function process()
             $orderId = $data['payload']['payment']['entity']['notes']['woocommerce_order_number'];
             $razorpayOrderId = $data['payload']['payment']['entity']['order_id'];
 
+            if (in_array($data['event'], $this->subscriptionEvents) === true)
+            {
+                $orderId = $data['payload']['subscription']['entity']['notes']['woocommerce_order_id'];
+                $razorpayOrderId = ($data['event'] == self::SUBSCRIPTION_CHARGED) ? $razorpayOrderId : "No payment id in subscription event";
+            }
+
+
             // Skip the webhook if not the valid data and event
             if ($this->shouldConsumeWebhook($data) === false) {
                 rzpLogInfo("Woocommerce orderId: $orderId webhook process exited in shouldConsumeWebhook function");
@@ -136,43 +150,45 @@ public function process()
                     return;
                 }
 
-                if ($this->razorpay->isHposEnabled) 
-                {
-                    $order = wc_get_order($orderId);
-                    $rzpWebhookNotifiedAt = $order->get_meta('rzp_webhook_notified_at');
-                }
-                else 
-                {
-                    $rzpWebhookNotifiedAt = get_post_meta($orderId, "rzp_webhook_notified_at", true);
-                }
-
-                
-                if ($rzpWebhookNotifiedAt === '')
+                if (in_array($data['event'], $this->subscriptionEvents) === false)
                 {
                     if ($this->razorpay->isHposEnabled) 
                     {
-                        $order->update_meta_data('rzp_webhook_notified_at', time());
-                        $order->save();
+                        $order = wc_get_order($orderId);
+                        $rzpWebhookNotifiedAt = $order->get_meta('rzp_webhook_notified_at');
                     }
                     else 
                     {
-                        update_post_meta($orderId, "rzp_webhook_notified_at", time());
+                        $rzpWebhookNotifiedAt = get_post_meta($orderId, "rzp_webhook_notified_at", true);
                     }
 
-                    error_log("ORDER NUMBER $orderId:webhook conflict due to early execution for razorpay order: $razorpayOrderId ");
-                    header('Status: ' . static::HTTP_CONFLICT_STATUS . ' Webhook conflicts due to early execution.', true, static::HTTP_CONFLICT_STATUS);// nosemgrep : php.lang.security.non-literal-header.non-literal-header
-                    return;
-                }
-                elseif ((time() - $rzpWebhookNotifiedAt) < static::WEBHOOK_NOTIFY_WAIT_TIME)
-                {
-                    error_log("ORDER NUMBER $orderId:webhook conflict due to early execution for razorpay order: $razorpayOrderId ");
-                    header('Status: ' . static::HTTP_CONFLICT_STATUS . ' Webhook conflicts due to early execution.', true, static::HTTP_CONFLICT_STATUS);// nosemgrep : php.lang.security.non-literal-header.non-literal-header
-                    return;
-                }
+                    if ($rzpWebhookNotifiedAt === '')
+                    {
+                        if ($this->razorpay->isHposEnabled) 
+                        {
+                            $order->update_meta_data('rzp_webhook_notified_at', time());
+                            $order->save();
+                        }
+                        else 
+                        {
+                            update_post_meta($orderId, "rzp_webhook_notified_at", time());
+                        }
+
+                        rzpLogInfo("ORDER NUMBER $orderId:webhook conflict due to early execution for razorpay order: $razorpayOrderId ");
+                        header('Status: ' . static::HTTP_CONFLICT_STATUS . ' Webhook conflicts due to early execution.', true, static::HTTP_CONFLICT_STATUS);// nosemgrep : php.lang.security.non-literal-header.non-literal-header
+                        return;
+                    }
+                    elseif ((time() - $rzpWebhookNotifiedAt) < static::WEBHOOK_NOTIFY_WAIT_TIME)
+                    {
+                        rzpLogInfo("ORDER NUMBER $orderId:webhook conflict due to early execution for razorpay order: $razorpayOrderId ");
+                        header('Status: ' . static::HTTP_CONFLICT_STATUS . ' Webhook conflicts due to early execution.', true, static::HTTP_CONFLICT_STATUS);// nosemgrep : php.lang.security.non-literal-header.non-literal-header
+                        return;
+                    }
 
-                error_log("ORDER NUMBER $orderId:webhook conflict over for razorpay order: $razorpayOrderId");
+                    rzpLogInfo("ORDER NUMBER $orderId:webhook conflict over for razorpay order: $razorpayOrderId");
+                }
 
-                rzpLogInfo("Woocommerce orderId: $orderId webhook process intitiated");
+                rzpLogInfo("Woocommerce orderId: $orderId webhook process intitiated for event: ". $data['event']);
 
                 switch ($data['event']) {
                     case self::PAYMENT_AUTHORIZED:
diff --git a/public/js/admin-rzp-settings.js b/public/js/admin-rzp-settings.js
index 0454577a..56b9ac8f 100644
--- a/public/js/admin-rzp-settings.js
+++ b/public/js/admin-rzp-settings.js
@@ -41,6 +41,11 @@ window.onload = function() {
 	{
 		var rzpElement = document.getElementById(item);
 
+		if (rzpElement == null)
+		{
+			return;
+		}
+		
 		var data = {
 			'action' : 'rzpInstrumentation',
 			'event' : 'formfield.interacted',
diff --git a/readme.txt b/readme.txt
index 80d38614..4a41e190 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,8 @@
 Contributors: razorpay
 Tags: razorpay, payments, india, woocommerce, curlec, malaysia, ecommerce, international, cross border
 Requires at least: 3.9.2
-Tested up to: 6.3.1
-Stable tag: 4.5.7
+Tested up to: 6.6
+Stable tag: 4.6.7
 Requires PHP: 7.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -17,7 +17,7 @@ Allows you to accept credit cards, debit cards, netbanking, wallet, and UPI paym
 This is the official Razorpay payment gateway plugin for WooCommerce. A system designed to handle end-to-end payments. Accept payments via 100+ payment modes - domestic & international credit & debit cards, EMIs, paylater, net banking, UPI & mobile wallets  including JioMoney, Mobikwik, Airtel Money, FreeCharge, Ola Money and PayZapp  in India, and FPX, Duitnow and eWallets including GrabPay, Touch N Go, Boost in Malaysia, with the WooCommerce plugin.
 Get a feature-filled and easy to integrate checkout with cards (Visa, MasterCard, American Express, UnionPay etc) saved across businesses so that customers can pay seamlessly everywhere, both domestic and international. This plugin allows for refunds, works across all browsers, and is compatible with the latest WooCommerce. Boost conversions with international customers paying in their local currency. Keep your data safe with robust security that comes with PCI DSS Level 1 compliance.
 
-This is compatible with WooCommerce>=4.0, including the new 8.0 release. It has been tested up to the 8.0.3 WooCommerce release.
+This is compatible with WooCommerce>=4.0, including the new 9.0 release. It has been tested up to the 9.1.2 WooCommerce release.
 
 BENEFITS OF USING RAZORPAY
 
@@ -69,6 +69,47 @@ Razorpay is available for Store Owners and Merchants in
 
 == Changelog ==
 
+= 4.6.7 =
+* Fixed, Reduced 1cc preferences API features check.
+
+= 4.6.6 =
+* Added, UT fixes.
+* Fixed, Reduced 1cc preferences API calls.
+* ( Bug present, for 1cc settings, please use 4.6.7)
+
+= 4.6.5 =
+* Added, UT to SVN ignore list.
+
+= 4.6.4 =
+* Reverted, Magic checkout banner on woocommerce dashboard.
+
+= 4.6.3 =
+* Added, Magic checkout banner on woocommerce dashboard.
+* Reverted, Instand Refund.
+
+= 4.6.2 =
+* Fixed, Subscription events webhook bug.
+* Fixed, console errors due to instrumentation.
+* Added Shipping Method Name for Shipping Engine support.
+
+= 4.6.1 =
+* Added support for Checkout Blocks on Woocommerce.
+* Added instant refund with fallback.
+* Removed RTB widget ineligibility message.
+* Fixed RTB widget eligibility check.
+
+= 4.6.0 =
+* Support for Tera Wallet.
+* Added RTB widget.
+
+= 4.5.9 =
+* Plugin name and description updated.
+
+= 4.5.8 =
+* Bug fix, plugin not activating in php 7.0.
+* Add option fix for 1cc address pull cron job script.
+* Webhook conflict error message as info
+
 = 4.5.7 =
 * Added nonce and user capability check for route
 * Blocked currencies KWD, OMR, BHD.
diff --git a/release.sh b/release.sh
index f881cb34..5d2a2b2f 100755
--- a/release.sh
+++ b/release.sh
@@ -49,6 +49,7 @@ git checkout-index -a -f --prefix=$SVNPATH/trunk/
 
 echo "Ignoring github specific & deployment script"
 svn propset svn:ignore "release.sh
+tests
 .git
 .gitignore" "$SVNPATH/trunk/"
 
diff --git a/templates/rzp-cart-checkout-btn.php b/templates/rzp-cart-checkout-btn.php
index 8cd28701..376c607e 100644
--- a/templates/rzp-cart-checkout-btn.php
+++ b/templates/rzp-cart-checkout-btn.php
@@ -1,9 +1,3 @@
-<style type="text/css">
-.checkout-button {
-  display: none !important;
-}
-</style>
-
 <div id="btn-1cc">
   <magic-checkout-btn page-type="cart"></magic-checkout-btn>
 </div>
diff --git a/tests/phpunit/tests/test-affordabilitywidget.php b/tests/phpunit/tests/test-affordabilitywidget.php
index 14fa3653..525059ef 100644
--- a/tests/phpunit/tests/test-affordabilitywidget.php
+++ b/tests/phpunit/tests/test-affordabilitywidget.php
@@ -40,7 +40,7 @@ public function setup(): void
 
         $_POST = array();
     }
-    
+
     public function testaddAffordabilityWidgetHTML()
     {
         $current_user = wp_get_current_user();
@@ -48,13 +48,13 @@ public function testaddAffordabilityWidgetHTML()
         $current_user->add_cap('administrator');
 
         update_option('woocommerce_razorpay_settings', array('key_id' => 'key_id_2', 'key_secret' => 'key_secret2'));
-        
+
         global $product;
         $product = new WC_Product_Simple();
         $product->set_regular_price(15);
         $product->set_sale_price(10);
         $product->save();
-       
+
         add_option('rzp_afd_limited_offers', "offer_ABC,offer_XYZ");
         add_option('rzp_afd_show_discount_amount', 'yes');
 
@@ -93,7 +93,7 @@ public function testaddAffordabilityWidgetHTML()
         delete_option('rzp_afd_limited_cardless_emi_providers');
         delete_option('rzp_afd_limited_pay_later_providers');
     }
-    
+
     public function testgetThemeColor()
     {
         $response = getThemeColor();
@@ -160,7 +160,7 @@ public function testgetFooterFontSize()
     public function testgetCustomisation()
     {
         add_option('rzp_afd_theme_color', '#8BBFFF');
-        
+
         $response = getCustomisation('rzp_afd_theme_color');
 
         $this->assertSame('#8BBFFF', $response);
@@ -171,7 +171,7 @@ public function testgetKeyID()
         update_option('woocommerce_razorpay_settings', array('key_id' => 'key_id_2', 'key_secret' => 'key_secret2'));
 
         $this->assertSame('key_id_2', getKeyId());
-        
+
         delete_option('woocommerce_razorpay_settings');
     }
 
@@ -190,7 +190,7 @@ public function testgetPriceSimpleProduct()
     public function testgetPriceVariableProduct()
     {
         global $product;
-        
+
         $product = new WC_Product_Variable();
         $product->set_price(20);
         $product->save();
@@ -229,7 +229,7 @@ public function testisAffordabilityWidgetTestModeEnabledYes()
     }
 
     public function testisAffordabilityWidgetTestModeEnabledNo()
-    {   
+    {
         update_option('rzp_afd_enable_test_mode', 'no');
 
         $this->assertFalse(isAffordabilityWidgetTestModeEnabled());
@@ -238,14 +238,14 @@ public function testisAffordabilityWidgetTestModeEnabledNo()
     public function testisAffordabilityWidgetTestModeNotEnabled()
     {
         delete_option('rzp_afd_enable_test_mode');
-        
+
         $this->assertFalse(isAffordabilityWidgetTestModeEnabled());
     }
-    
+
     public function testisEnabledYes()
     {
         add_option('rzp_afd_enable_dark_logo', 'yes');
-        
+
         $this->assertSame('true', isEnabled('rzp_afd_enable_dark_logo'));
 
         delete_option('rzp_afd_enable_dark_logo');
@@ -254,7 +254,7 @@ public function testisEnabledYes()
     public function testisEnabledNo()
     {
         add_option('rzp_afd_enable_dark_logo', 'no');
-        
+
         $this->assertSame('false', isEnabled('rzp_afd_enable_dark_logo'));
 
         delete_option('rzp_afd_enable_dark_logo');
@@ -402,7 +402,7 @@ public function testgetAffordabilityWidgetSettings()
         $current_section = 'affordability-widget';
 
         $response = getAffordabilityWidgetSettings();
-        
+
         $this->assertSame('rzp_afd_section_title', $response['section_title']['id']);
 
         $this->assertSame('rzp_afd_enable', $response['enable']['id']);
@@ -458,7 +458,7 @@ public function testdisplayAffordabilityWidgetSettings()
         displayAffordabilityWidgetSettings();
         $result = ob_get_contents();
         ob_end_clean();
-    
+
         $response = getAffordabilityWidgetSettings();
 
         ob_start();
diff --git a/tests/phpunit/tests/test-instrumentation.php b/tests/phpunit/tests/test-instrumentation.php
index 19ba5ff5..a50f3bb5 100644
--- a/tests/phpunit/tests/test-instrumentation.php
+++ b/tests/phpunit/tests/test-instrumentation.php
@@ -85,9 +85,9 @@ function () {
     public function testUpdateCurrentVersion()
     {
         $this->expectNotToPerformAssertions();
-        
+
         add_option('rzp_woocommerce_current_version', get_plugin_data(__FILE__)['Version']);
-        
+
         $_POST['woocommerce_razorpay_key_id'] = 'key_id';
         $_POST['woocommerce_razorpay_key_secret'] = 'key_secret';
         $_POST['woocommerce_razorpay_enabled'] = 'yes';
@@ -248,7 +248,7 @@ public function testInstrumentationDataLakeEmptyProperties()
         $this->assertSame('error', $response['status']);
         $this->assertSame('properties given as input is not valid', $response['message']);
     }
-    
+
     public function testGetDefaultPropertiesWithTimeStamp()
     {
         $response = $this->instrumentationMock->getDefaultProperties();
@@ -256,7 +256,7 @@ public function testGetDefaultPropertiesWithTimeStamp()
         $this->assertSame('WordPress', $response['platform']);
         $this->assertNotNull($response['platform_version']);
         $this->assertNotNull($response['woocommerce_version']);
-        $this->assertSame('Razorpay for WooCommerce', $response['plugin_name']);
+        $this->assertSame('1 Razorpay: Signup for FREE PG', $response['plugin_name']);
         $this->assertNotNull($response['plugin_version']);
         $this->assertNotNull($response['unique_id']);
         $this->assertNotNull($response['event_timestamp']);
diff --git a/tests/phpunit/tests/test-metadata.php b/tests/phpunit/tests/test-metadata.php
index f26d40da..8b42f591 100644
--- a/tests/phpunit/tests/test-metadata.php
+++ b/tests/phpunit/tests/test-metadata.php
@@ -6,7 +6,7 @@ public function testMetadata()
     {
         $pluginData = get_plugin_data(PLUGIN_DIR . '/woo-razorpay.php');
 
-        $this->assertSame('Razorpay for WooCommerce', $pluginData['Name']);
+        $this->assertSame('1 Razorpay: Signup for FREE PG', $pluginData['Name']);
 
         $version = $pluginData['Version'];
         $v = explode(".", $version);
@@ -18,7 +18,7 @@ public function testMetadata()
 
         $this->assertSame('https://razorpay.com', $pluginData['PluginURI']);
 
-        $this->assertSame('Razorpay Payment Gateway Integration for WooCommerce <cite>By <a href="https://razorpay.com">Team Razorpay</a>.</cite>', $pluginData['Description']);
+        $this->assertSame('Razorpay Payment Gateway Integration for WooCommerce.Razorpay Welcome Back Offer: New to Razorpay? Sign up to enjoy FREE payments* of INR 2 lakh till March 31st! Transact before January 10th to grab the offer. <cite>By <a href="https://razorpay.com">Team Razorpay</a>.</cite>', $pluginData['Description']);
     }
 }
 
diff --git a/tests/phpunit/tests/test-methods.php b/tests/phpunit/tests/test-methods.php
index 50bf01d5..ae8fbd48 100755
--- a/tests/phpunit/tests/test-methods.php
+++ b/tests/phpunit/tests/test-methods.php
@@ -102,7 +102,8 @@ public function testReceiptPage()
         $orderId = $order->get_id();
 
         $this->instance->shouldReceive('autoEnableWebhook');
-        $this->instance->shouldReceive('createOrGetRazorpayOrderId')->with($orderId)->andReturn('order_test');
+        $razorpayOrderId = $this->instance->shouldReceive('createOrGetRazorpayOrderId')->andReturn('order_test');
+
         $this->instance->shouldReceive('getRazorpayApiPublicInstance')->andReturnUsing(function () {
             return new MockApi('key_id', '');
         });
@@ -122,7 +123,7 @@ public function testReceiptPage()
         $this->assertStringContainsString('<button id="btn-razorpay">Pay Now</button>', $result);
         $this->assertStringContainsString('<button id="btn-razorpay-cancel" onclick="document.razorpayform.submit()">Cancel</button>', $result);
     }
-    
+
     public function testCreateRazorpayOrderId()
     {
         $order = wc_create_order();
@@ -133,7 +134,7 @@ public function testCreateRazorpayOrderId()
         });
         $this->instance->shouldReceive('autoEnableWebhook');
 
-        $response = $this->instance->createOrGetRazorpayOrderId($orderId);
+        $response = $this->instance->createOrGetRazorpayOrderId($order, $orderId);
         $this->assertStringContainsString('razorpay_test_id', $response);
     }
 
@@ -148,10 +149,10 @@ public function testCreateRazorpayOrderIdwitwebhooktime()
         $this->instance->shouldReceive('autoEnableWebhook');
 
         add_option('webhook_enable_flag', 2400);
-        $response = $this->instance->createOrGetRazorpayOrderId($orderId);
+        $response = $this->instance->createOrGetRazorpayOrderId($order, $orderId);
         $this->assertStringContainsString('razorpay_test_id', $response );
     }
-    
+
     public function testGetRazorpayOrderId()
     {
         $order = wc_create_order();
@@ -164,7 +165,7 @@ public function testGetRazorpayOrderId()
         });
         $this->instance->shouldReceive('autoEnableWebhook');
 
-        $response = $this->instance->createOrGetRazorpayOrderId($orderId);
+        $response = $this->instance->createOrGetRazorpayOrderId($order, $orderId);
         $this->assertStringContainsString('razorpay_test_id', $response);
     }
 
@@ -236,7 +237,7 @@ function () {
         $this->assertStringContainsString("<input type='hidden' name='_[integration_type]' value='plugin'>", $response);
         $this->assertStringContainsString("</form>", $response);
     }
- 
+
     public function testGetShippingZone()
     {
         $response = $this->instance->getShippingZone(0);
diff --git a/tests/phpunit/tests/test-order-methods.php b/tests/phpunit/tests/test-order-methods.php
index e7e6940e..ef982abc 100644
--- a/tests/phpunit/tests/test-order-methods.php
+++ b/tests/phpunit/tests/test-order-methods.php
@@ -18,7 +18,7 @@ class Test_OrderMethods extends WP_UnitTestCase
 {
     private $instance;
     private $rzpPaymentObj;
-    
+
     public function setup(): void
     {
         parent::setup();
@@ -29,11 +29,11 @@ public function setup(): void
 
         $_POST = array();
     }
-    
+
     public function testGetRazorpayPaymentParams()
-    {    
+    {
         global $woocommerce;
-        
+
         $order = wc_create_order();
 
         $wcOrderId = $order->get_id();
@@ -45,13 +45,13 @@ function () {
 
         $this->instance->shouldReceive('autoEnableWebhook');
 
-        $razorpayOrderId = $this->instance->shouldReceive('createOrGetRazorpayOrderId')->with($wcOrderId)->andReturn('order_test');
+        $razorpayOrderId = $this->instance->shouldReceive('createOrGetRazorpayOrderId')->with($order, $wcOrderId)->andReturn('order_test');
 
-        $this->assertEquals(['order_id' => 'order_test'], $this->instance->getRazorpayPaymentParams($wcOrderId));
+        $this->assertEquals(['order_id' => 'order_test'], $this->instance->getRazorpayPaymentParams($order, $wcOrderId));
 
         //After the webhook flag is set
 
-        $this->assertEquals(['order_id' => 'order_test'], $this->instance->getRazorpayPaymentParams($wcOrderId));
+        $this->assertEquals(['order_id' => 'order_test'], $this->instance->getRazorpayPaymentParams($order, $wcOrderId));
 
 
     }
@@ -67,20 +67,20 @@ function () {
         });
         $this->instance->shouldReceive('autoEnableWebhook');
 
-        $razorpayOrderId=$this->instance->shouldReceive('createOrGetRazorpayOrderId')->with($wcOrderId)->andReturn(null);
+        $razorpayOrderId = $this->instance->shouldReceive('createOrGetRazorpayOrderId')->with($order, $wcOrderId)->andReturn(null);
 
         $message = 'RAZORPAY ERROR: Razorpay API could not be reached';
 
-        try 
+        try
         {
-            $this->instance->getRazorpayPaymentParams($wcOrderId);
+            $this->instance->getRazorpayPaymentParams($order, $wcOrderId);
 
             $this->fail("Expected Exception has not been raised.");
         }
-        catch (Exception $ex) 
+        catch (Exception $ex)
         {
             $this->assertEquals($message, $ex->getMessage());
-        }  
+        }
     }
 
     public function testGetCustomOrderCreationMessage()
@@ -103,11 +103,11 @@ public function testGetDefaultCustomOrderCreationMessage()
         $order = wc_create_order();
 
         $defaultmessage = 'Thank you for shopping with us. Your account has been charged and your transaction is successful. We will be processing your order soon.';
-        
+
         $this->instance->shouldReceive('getSetting')->with('order_success_message');
-        
+
         $response = $this->instance->getCustomOrdercreationMessage("", $order);
-        
+
         $this->assertSame($defaultmessage, $response);
     }
 
@@ -148,7 +148,7 @@ public function testGetDefaultCheckoutArguments()
             'email'   => $order->get_billing_email(),
             'contact' => $order->get_billing_phone(),
         );
-        
+
         $this->instance->shouldReceive('getOrderSessionKey')->with($orderId)->andReturn($sessionKey);
 
         $response = $this->instance->getDefaultCheckoutArguments($order);
@@ -167,7 +167,7 @@ public function testGetDefaultCheckoutArguments()
 
         $this->assertSame($args, $response['prefill']);
     }
-    
+
     public function testUpdateOrder()
     {
         global $woocommerce;
@@ -278,6 +278,8 @@ public function testWoocommerceRazorpayInit()
     public function testProcessRefund()
     {
         $order = wc_create_order();
+        $order->set_transaction_id('1236');
+        $order->save();
 
         $wcOrderId = $order->get_id();
 
@@ -345,7 +347,7 @@ public function testCheckRazorpayResponse()
         $wpdb->insert($wpdb->posts, array('post_status' => 'Pending', 'post_type' => 'shop_order', 'ID' => 22));
 
         $this->instance->shouldReceive('verifySignature');
-        
+
         $this->instance->shouldReceive('redirectUser');
 
         $this->instance->shouldReceive('updateOrder');
diff --git a/woo-razorpay.php b/woo-razorpay.php
index 2d438f5e..356bfcca 100644
--- a/woo-razorpay.php
+++ b/woo-razorpay.php
@@ -1,12 +1,12 @@
 <?php
 /*
- * Plugin Name: Razorpay for WooCommerce
+ * Plugin Name: 1 Razorpay: Signup for FREE PG
  * Plugin URI: https://razorpay.com
- * Description: Razorpay Payment Gateway Integration for WooCommerce
- * Version: 4.5.7
- * Stable tag: 4.5.7
+ * Description: Razorpay Payment Gateway Integration for WooCommerce.Razorpay Welcome Back Offer: New to Razorpay? Sign up to enjoy FREE payments* of INR 2 lakh till March 31st! Transact before January 10th to grab the offer.
+ * Version: 4.6.7
+ * Stable tag: 4.6.7
  * Author: Team Razorpay
- * WC tested up to: 7.9.0
+ * WC tested up to: 9.1.2
  * Author URI: https://razorpay.com
 */
 
@@ -38,6 +38,7 @@
 use Razorpay\Api\Api;
 use Razorpay\Api\Errors;
 use Automattic\WooCommerce\Utilities\OrderUtil;
+use Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry;
 
 add_action('plugins_loaded', 'woocommerce_razorpay_init', 0);
 add_action('admin_post_nopriv_rzp_wc_webhook', 'razorpay_webhook_init', 10);
@@ -48,11 +49,41 @@
 	}
 });
 
-function woocommerce_razorpay_init()
+add_action('before_woocommerce_init', function() {
+    if (class_exists('\Automattic\WooCommerce\Utilities\FeaturesUtil'))
+    {
+        \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility('cart_checkout_blocks', __FILE__, true);
+    }
+});
+
+add_action('woocommerce_blocks_loaded', 'razorpay_woocommerce_block_support');
+
+function razorpay_woocommerce_block_support()
 {
-    add_action("woocommerce_update_options_advanced", 'hposInstrumentation');
+    if (class_exists('Automattic\WooCommerce\Blocks\Payments\Integrations\AbstractPaymentMethodType'))
+    {
+        require_once dirname( __FILE__ ) . '/checkout-block.php';
+
+        add_action(
+          'woocommerce_blocks_payment_method_type_registration',
+          function(PaymentMethodRegistry $payment_method_registry) {
+            $container = Automattic\WooCommerce\Blocks\Package::container();
+            $container->register(
+                WC_Razorpay_Blocks::class,
+                function() {
+                    return new WC_Razorpay_Blocks();
+                }
+            );
+            $payment_method_registry->register($container->get(WC_Razorpay_Blocks::class));
+          },
+          5
+        );
+    }
+}
 
-    function hposInstrumentation()
+function woocommerce_razorpay_init()
+{
+    add_action("woocommerce_update_options_advanced", function()
     {
         $rzp = new WC_Razorpay();
 
@@ -87,7 +118,7 @@ function hposInstrumentation()
 
             update_option('rzp_hpos', 'no');
         }
-    }
+    });
 
     if (!class_exists('WC_Payment_Gateway') || class_exists('WC_Razorpay'))
     {
@@ -115,6 +146,7 @@ class WC_Razorpay extends WC_Payment_Gateway
         const DEFAULT_SUCCESS_MESSAGE        = 'Thank you for shopping with us. Your account has been charged and your transaction is successful. We will be processing your order soon.';
 
         const PREPAY_COD_URL = '1cc/orders/cod/convert';
+        const ONE_CC_MERCHANT_PREF = 'one_cc_merchant_preference';
 
         protected $supportedWebhookEvents = array(
             'payment.authorized',
@@ -229,7 +261,7 @@ public function __construct($hooks = true)
 
             // file added in woocommerce v7.1.0, maybe removed later
             if (class_exists('Automattic\WooCommerce\Utilities\OrderUtil') and
-                OrderUtil::custom_orders_table_usage_is_enabled()) 
+                OrderUtil::custom_orders_table_usage_is_enabled())
             {
                 $this->isHposEnabled = true;
             }
@@ -240,8 +272,17 @@ public function __construct($hooks = true)
             $isAccCreationAvailable = false;
             $isDualCheckoutEnabled = false;
 
-            // Load preference API call only for administrative interface page.
-            if (current_user_can('administrator'))
+            $merchantPreferences = [];
+
+            $merchantPreferences = get_transient(self::ONE_CC_MERCHANT_PREF);
+
+            // Load preference API call only for administrative interface + razorpay payment settings page.
+            if (current_user_can('administrator') &&
+                (empty($merchantPreferences['features']['one_click_checkout']) === true) &&
+                (isset($_GET['tab']) === true) &&
+                ($_GET['tab'] === 'checkout') &&
+                (isset($_GET['section']) === true) &&
+                ($_GET['section'] === 'razorpay'))
             {
                 if (!empty($this->getSetting('key_id')) && !empty($this->getSetting('key_secret')))
                 {
@@ -249,27 +290,27 @@ public function __construct($hooks = true)
 
                       $api = $this->getRazorpayApiInstance();
                       $merchantPreferences = $api->request->request('GET', 'merchant/1cc_preferences');
-
-                      if (!empty($merchantPreferences['features']['one_click_checkout'])) {
-                        $is1ccAvailable = true;
-                      }
-
-                      if (!empty($merchantPreferences['features']['one_cc_store_account'])) {
-                        $isAccCreationAvailable = true;
-                      }
-
-                      if (!empty($merchantPreferences['features']['one_cc_dual_checkout'])) {
-                        $isDualCheckoutEnabled = true;
-                      }
-
+                      set_transient( self::ONE_CC_MERCHANT_PREF, $merchantPreferences, 7200 );
 
                     } catch (\Exception $e) {
                       rzpLogError($e->getMessage());
                     }
-
                 }
             }
 
+            if (!empty($merchantPreferences['features']['one_cc_dual_checkout'])) {
+                $isDualCheckoutEnabled = true;
+            }
+
+            if (!empty($merchantPreferences['features']['one_click_checkout'])) {
+                $is1ccAvailable = true;
+            }
+
+            if (!empty($merchantPreferences['features']['one_cc_store_account'])) {
+                $isAccCreationAvailable = true;
+            }
+
+
             if ($is1ccAvailable) {
               $this->visibleSettings = array_merge($this->visibleSettings, array(
                 'enable_1cc',
@@ -421,10 +462,12 @@ public function init_form_fields()
                         isset($_POST['woocommerce_razorpay_key_secret']) and
                         empty($_POST['woocommerce_razorpay_key_secret']) === false)
                     {
+                        $key_id = $_POST['woocommerce_razorpay_key_id'];
                         $api = new Api($_POST['woocommerce_razorpay_key_id'], $_POST['woocommerce_razorpay_key_secret']);
                     }
                     else
                     {
+                        $key_id = $this->getSetting('key_id');
                         $api = $this->getRazorpayApiInstance();
                     }
 
@@ -436,6 +479,8 @@ public function init_form_fields()
                     }
 
                     update_option('rzp_afd_enable', 'no');
+                    update_option('rzp_rtb_enable', 'no');
+
                     foreach ($merchantPreferences['assigned_features'] as $preference)
                     {
                         if ($preference['name'] === 'affordability_widget' or
@@ -449,7 +494,28 @@ public function init_form_fields()
                         }
                     }
 
+                    $rtbActivationStatus = $api->request->request('GET', 'rtb?key_id=' . $key_id);
+
+                    if (isset($rtbActivationStatus['widget_enabled']) and
+                        $rtbActivationStatus['widget_enabled'] === true)
+                    {
+                        $this->form_fields['rtb_widget_title'] =  array(
+                            'title' => '<span style="font-size: 20px;">' . __('Razorpay Trusted Business'). '</span>',
+                            'type' => 'title'
+                        );
+
+                        $this->form_fields['enable_rtb_widget'] =  array(
+                            'title'                 => __('RTB Widget Enable/Disable'),
+                            'type'                  => 'checkbox',
+                            'desc'                  => __('Enable RTB Widget?'),
+                            'default'               => 'no',
+                            'id'                    => 'rzp_rtb_enable'
+                        );
+                        update_option('rzp_rtb_enable', 'yes');
+                    }
+
                     update_option('rzp_afd_feature_checked', 'yes');
+                    update_option('rzp_rtb_feature_checked', 'yes');
                 }
                 catch (\Exception $e)
                 {
@@ -488,7 +554,9 @@ public function autoEnableWebhook()
             $key_id      = $this->getSetting('key_id');
             $key_secret  = $this->getSetting('key_secret');
             $enabled     = true;
-            $secret = empty($this->getSetting('webhook_secret')) ? $this->generateSecret() : $this->getSetting('webhook_secret');
+            $secret = (empty($this->getSetting('webhook_secret')) === true) ? get_option('webhook_secret') : $this->getSetting('webhook_secret');
+
+            $secret = (empty($secret) === false) ? $secret : $this->generateSecret();
 
             update_option('webhook_secret', $secret);
             $getWebhookFlag =  get_option('webhook_enable_flag');
@@ -688,15 +756,15 @@ public function pluginInstrumentation()
 
                 $orderTable = $wpdb->prefix . 'wc_orders';
 
-                if($this->isHposEnabled) 
+                if($this->isHposEnabled)
                 {
                     $rzpTrancationData = $wpdb->get_row($wpdb->prepare("SELECT id FROM $orderTable AS P WHERE payment_method = %s", "razorpay"));
-                } 
-                else 
+                }
+                else
                 {
                     $rzpTrancationData = $wpdb->get_row($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta AS P WHERE meta_key = %s AND meta_value = %s", "_payment_method", "razorpay"));
-                }              
-                
+                }
+
                 $arrayPost = json_decode(json_encode($rzpTrancationData), true);
 
                 if (empty($arrayPost) === false and
@@ -1109,6 +1177,11 @@ private function getCheckoutArguments($order, $params)
 
             $currency = $this->getOrderCurrency($order);
 
+            if (empty($currency) === false)
+            {
+                $args['currency'] = $currency;
+            }
+
             // The list of valid currencies is at https://razorpay.freshdesk.com/support/solutions/articles/11000065530-what-currencies-does-razorpay-support-
 
             $args = array_merge($args, $params);
@@ -1159,7 +1232,7 @@ protected function createRazorpayOrderId($orderId, $sessionKey)
                 {
                     throw new Exception($data['currency'] . " currency is not supported at the moment.");
                 }
-                
+
                 $razorpayOrder = $api->order->create($data);
             }
             catch (Exception $e)
@@ -1249,7 +1322,7 @@ protected function verifyOrderAmount($razorpayOrderId, $orderId, $is1ccCheckout
         private function getOrderCreationData($orderId)
         {
             global $wpdb;
-            
+
             rzpLogInfo("Called getOrderCreationData with params orderId $orderId");
             $order = wc_get_order($orderId);
 
@@ -1333,7 +1406,13 @@ public function orderArg1CC($data, $order)
                $data['line_items'][$i]['type'] =  $type;
                $data['line_items'][$i]['sku'] = $product->get_sku();
                $data['line_items'][$i]['variant_id'] = (string)$item->get_variation_id();
-               $data['line_items'][$i]['product_id'] = (string)$product->get_parent_id();
+               $product_id = $product->get_id();
+               if (is_a($product, 'WC_Product_Variation')) {
+                   $product_id = $product->get_parent_id();
+               }
+               $data['line_items'][$i]['product_id'] = (string)$product_id;
+               // wc_get_weight is a woocommerce function which will help us to get weight in desired metric
+               $data['line_items'][$i]['weight'] = round(wc_get_weight($product->get_weight(), 'g', get_option( 'woocommerce_weight_unit', 'g')));
                $data['line_items'][$i]['price'] = (empty($productDetails['price'])=== false) ? round(wc_get_price_excluding_tax($product)*100) + round($item->get_subtotal_tax()*100 / $item->get_quantity()) : 0;
                $data['line_items'][$i]['offer_price'] = (empty($productDetails['sale_price'])=== false) ? (int) $productDetails['sale_price']*100 : $productDetails['price']*100;
                $data['line_items'][$i]['quantity'] = (int)$item->get_quantity();
@@ -1491,16 +1570,23 @@ public function process_refund($orderId, $amount = null, $reason = '')
             try
             {
                 $refund = $client->payment
-                    ->fetch( $paymentId )
-                    ->refund( $data );
+                    ->fetch($paymentId)
+                    ->refund($data);
 
-                $order->add_order_note( __( 'Refund Id: ' . $refund->id, 'woocommerce' ) );
-                /**
-                 * @var $refund ->id -- Provides the RazorPay Refund ID
-                 * @var $orderId -> Refunded Order ID
-                 * @var $refund -> WooCommerce Refund Instance.
-                 */
-                do_action( 'woo_razorpay_refund_success', $refund->id, $orderId, $refund );
+                if (isset($refund) === true)
+                {
+                    $order->add_order_note(__('Refund Id: ' . $refund->id, 'woocommerce'));
+                    /**
+                     * @var $refund ->id -- Provides the RazorPay Refund ID
+                     * @var $orderId -> Refunded Order ID
+                     * @var $refund -> WooCommerce Refund Instance.
+                     */
+                    do_action('woo_razorpay_refund_success', $refund->id, $orderId, $refund);
+
+                    rzpLogInfo('Refund ID = ' . $refund->id .
+                                ' , Refund speed requested = ' . $refund->speed_requested .
+                                ' , Refund speed processed = ' . $refund->speed_processed);
+                }
 
                 return true;
             }
@@ -1510,8 +1596,8 @@ public function process_refund($orderId, $amount = null, $reason = '')
             }
         }
 
-        // process refund for gift card
-        function processGiftCardRefund($orderId, $razorpayPaymentId, $amount = null, $reason = '')
+        // process refund for rzp payment and WC gift card
+        function processRefundForOrdersWithGiftCard($orderId, $razorpayPaymentId, $amount = null, $reason = '')
         {
             $order = wc_get_order($orderId);
 
@@ -1647,27 +1733,27 @@ function check_razorpay_response()
             $orderOperationalDataTable = $wpdb->prefix . 'wc_order_operational_data';
             $orderTable = $wpdb->prefix . 'wc_orders';
 
-            if ($this->isHposEnabled) 
+            if ($this->isHposEnabled)
             {
                 $orderOperationalData = $wpdb->get_row($wpdb->prepare("SELECT order_id FROM $orderOperationalDataTable AS P WHERE order_key = %s", $post_password));
-            
+
                 $orderData = $wpdb->get_row($wpdb->prepare("SELECT status FROM $orderTable AS P WHERE id = %s", $orderOperationalData->order_id));
-            } else 
+            } else
             {
                 $orderOperationalData = $wpdb->get_row($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta AS P WHERE meta_key = %s AND meta_value = %s", $meta_key, $post_password));
 
                 $orderData = $wpdb->get_row($wpdb->prepare("SELECT post_status FROM $wpdb->posts AS P WHERE post_type=%s and ID=%s", $post_type, $orderOperationalData->post_id));
             }
-            
+
             $arrayPost = json_decode(json_encode($orderOperationalData), true);
 
             if (!empty($arrayPost) and
                 $arrayPost != null)
             {
-                if ($this->isHposEnabled) 
+                if ($this->isHposEnabled)
                 {
                     $orderId = $orderOperationalData->order_id;
-                    
+
                     $order = wc_get_order($orderId);
 
                     if ($orderData->status === 'wc-checkout-draft')
@@ -1677,7 +1763,7 @@ function check_razorpay_response()
                     }
                     $orderStatus = $order->get_status();
                     rzpLogInfo("HPOS is enabled and order status: $orderStatus");
-                } 
+                }
                 else
                 {
                     $orderId = $orderOperationalData->post_id;
@@ -1691,7 +1777,7 @@ function check_razorpay_response()
                     $orderStatus = $order->get_status();
                     rzpLogInfo("HPOS is disabled and order status: $orderStatus");
                 }
-                
+
                 rzpLogInfo("Get order id in check_razorpay_response: orderId $orderId");
             }
 
@@ -1712,12 +1798,12 @@ function check_razorpay_response()
 
             // If the order has already been paid for
             // redirect user to success page
-            if (($order->needs_payment() === false) and 
-                ($orderStatus != 'draft') and 
+            if (($order->needs_payment() === false) and
+                ($orderStatus != 'draft') and
                 ($orderStatus != 'wc-checkout-draft'))
             {
                 rzpLogInfo("Order payment is already done for the orderId: " . $orderId . " order status " . $orderStatus);
-                
+
                 $cartHash = get_transient(RZP_1CC_CART_HASH.$orderId);
 
                 if ($cartHash != false)
@@ -2039,9 +2125,6 @@ public function update1ccOrderWC(& $order, $wcOrderId, $razorpayPaymentId)
                 $order->add_order_note( "Order Instructions: ". $orderInstructions);
             }
 
-            // update gift card and coupons
-            $rzpPromotionAmount = $this->updateGiftAndCoupon($razorpayData, $order, $wcOrderId, $razorpayPaymentId);
-
             //Apply shipping charges to woo-order
             if(isset($razorpayData['shipping_fee']) === true)
             {
@@ -2064,11 +2147,15 @@ public function update1ccOrderWC(& $order, $wcOrderId, $razorpayPaymentId)
                 if($razorpayData['shipping_fee'] == 0)
                 {
                     $item->set_method_title( 'Free Shipping' );
+                    if(isset($razorpayData['notes']) && isset($razorpayData['notes']['shipping_method_name']))
+                    {
+                        $item->set_method_title($razorpayData['notes']['shipping_method_name']);
+                    }
                 }
                 else
                 {
                     $isStoreShippingEnabled = "";
-                    if ($this->isHposEnabled) 
+                    if ($this->isHposEnabled)
                     {
                          $shippingData = $order->get_meta('1cc_shippinginfo');
 
@@ -2135,6 +2222,11 @@ public function update1ccOrderWC(& $order, $wcOrderId, $razorpayPaymentId)
                         // $item->set_method_id( "flat_rate:1" );
                         $item->set_total( $razorpayData['shipping_fee']/100 );
 
+                        if(isset($razorpayData['notes']) && isset($razorpayData['notes']['shipping_method_name']))
+                        {
+                            $item->set_method_title($razorpayData['notes']['shipping_method_name']);
+                        }
+
                         $order->add_item( $item );
 
                         $item->save();
@@ -2154,7 +2246,7 @@ public function update1ccOrderWC(& $order, $wcOrderId, $razorpayPaymentId)
 
             $paymentDoneBy = $razorpayPaymentData['method'];
 
-            $codFee = 0;  
+            $codFee = 0;
             if (($paymentDoneBy === 'cod') && isset($razorpayData['cod_fee']) == true)
             {
                 $codFee = $razorpayData['cod_fee']/100;
@@ -2187,7 +2279,10 @@ public function update1ccOrderWC(& $order, $wcOrderId, $razorpayPaymentId)
                 $order->save();
             }
 
-           if(!empty($razorpayData['offers']))
+            // handle promotions in order which include handling coupons, gift cards and terra wallet if applicable
+            $rzpPromotionAmount = $this->handlePromotions($razorpayData, $order, $wcOrderId, $razorpayPaymentId);
+
+            if(!empty($razorpayData['offers']))
             {
                 $offerDiff = $razorpayData['line_items_total'] + $razorpayData['shipping_fee'] + $codFee*100 - $razorpayPaymentData['amount'] - $rzpPromotionAmount;
 
@@ -2228,7 +2323,7 @@ public function update1ccOrderWC(& $order, $wcOrderId, $razorpayPaymentId)
             }
         }
 
-        public function updateGiftAndCoupon($razorpayData, $order, $orderId, $razorpayPaymentId)
+        public function handlePromotions($razorpayData, $order, $orderId, $razorpayPaymentId)
         {
             global $woocommerce;
             global $wpdb;
@@ -2253,7 +2348,7 @@ public function updateGiftAndCoupon($razorpayData, $order, $orderId, $razorpayPa
 
                         if($giftCardBalance == null && $giftCardBalance >= 0 && $usedAmt > $giftCardBalance && 'trash' == $status && !$yithCard->exists()){
                             // initiate refund in case gift card faliure
-                            $this->processGiftCardRefund($orderId, $razorpayPaymentId, $razorpayData['amount_paid'], $reason = '');
+                            $this->processRefundForOrdersWithGiftCard($orderId, $razorpayPaymentId, $razorpayData['amount_paid'], $reason = '');
                         }else{
                             //Deduct amount of gift card
                             $yithCard->update_balance( $yithCard->get_balance() - $usedAmt );
@@ -2289,21 +2384,55 @@ public function updateGiftAndCoupon($razorpayData, $order, $orderId, $razorpayPa
 
                             if($balance == null && $balance >= 0 && $usedAmt > $balance ){
                                 // initiate refund in case gift card faliure
-                                $this->processGiftCardRefund($orderId, $razorpayPaymentId, $razorpayData['amount_paid'], $reason = '');
+                                $this->processRefundForOrdersWithGiftCard($orderId, $razorpayPaymentId, $razorpayData['amount_paid'], $reason = '');
                             }else{
                                 //Deduct amount of gift card
                                $this->debitGiftCards($orderId, $order, "order_id: $orderId checkout_update_order_meta", $usedAmt, $giftCode);
                             }
 
                         }else{
-                            $this->processGiftCardRefund($orderId, $razorpayPaymentId, $razorpayData['amount_paid'], $reason = '');
+                            $this->processRefundForOrdersWithGiftCard($orderId, $razorpayPaymentId, $razorpayData['amount_paid'], $reason = '');
                         }
 
                     }else{
-                       $this->processGiftCardRefund($orderId,  $razorpayPaymentId, $razorpayData['amount_paid'], $reason = '');
+                       $this->processRefundForOrdersWithGiftCard($orderId,  $razorpayPaymentId, $razorpayData['amount_paid'], $reason = '');
                     }
 
-                }else{
+                }else if($promotion['type'] == 'terra_wallet') {
+                    if (!is_plugin_active('woo-wallet/woo-wallet.php')) {
+                        $this->processRefundForOrdersWithGiftCard(
+                            $orderId,
+                            $razorpayPaymentId,
+                            $razorpayData['amount_paid'],
+                            'Terra Wallet Plugin is not active');
+                        continue;
+                    }
+                    $viaWalletAmount = $promotion['value'] / 100;
+                    $walletBalance = woo_wallet()->wallet->get_wallet_balance($order->get_user_id(), 'edit');
+                    if ($walletBalance < $viaWalletAmount)
+                    {
+                            $this->processRefundForOrdersWithGiftCard(
+                                $orderId,
+                                $razorpayPaymentId,
+                                $razorpayData['amount_paid'],
+                                'Terra Wallet Insufficient Balance');
+                            continue;
+                    }
+                    $this->addTerraWalletAmountAsPartialPaymentFee($viaWalletAmount, $order);
+                    woo_wallet()->wallet->wallet_partial_payment($orderId);
+                    $terraWalletTransactionID = get_post_meta($orderId, '_partial_pay_through_wallet_compleate', true);
+                    if (!$terraWalletTransactionID) {
+                        $this->processRefundForOrdersWithGiftCard(
+                            $orderId,
+                            $razorpayPaymentId,
+                            $razorpayData['amount_paid'],
+                            'Terra Wallet Transaction Failed');
+                    } else {
+                        rzpLogInfo("TerraWallet TransactionID for order id $orderId is $terraWalletTransactionID");
+                    }
+                }
+                else{
+
 
                     $couponKey = $promotion['code'];
 
@@ -2318,6 +2447,20 @@ public function updateGiftAndCoupon($razorpayData, $order, $orderId, $razorpayPa
             return $rzpGiftAndCouponAmount;
         }
 
+        private function addTerraWalletAmountAsPartialPaymentFee($amount, $order) {
+            if ( $amount > 0 ) {
+				$walletAmount = -1.0 * $amount;
+                $itemFee = new WC_Order_Item_Fee();
+                $itemFee->set_name(__( 'Via wallet', 'woo-wallet' ));
+                $itemFee->set_amount($walletAmount);
+                $itemFee->set_tax_status('none');
+                $itemFee->set_total($walletAmount);
+                $order->add_item($itemFee);
+				$order->set_total($order->get_total() - $amount);
+				$order->save();
+            }
+        }
+
         protected function debitGiftCards( $orderId, $order, $note, $usedAmt, $giftCardNo) {
 
             global $woocommerce;
@@ -2557,7 +2700,7 @@ protected function updateRecoverCartInfo($wcOrderId)
                 }else{
                   $userId = get_post_meta($wcOrderId, 'abandoned_user_id', true);
                 }
-                
+
             }
 
             $results = $wpdb->get_results( // phpcs:ignore
@@ -2579,7 +2722,7 @@ protected function updateRecoverCartInfo($wcOrderId)
             }
 
             $abandonedOrderId    = wcal_common::wcal_get_cart_session('abandoned_cart_id_lite');
-            
+
             if ($this->isHposEnabled) {
                 $order->update_meta_data( 'abandoned_id', $abandonedOrderId);
                 $order->save();
@@ -2775,6 +2918,8 @@ function razorpay_woo_plugin_links($links)
 
     add_action( 'woocommerce_before_single_product', 'trigger_affordability_widget', 10 );
 
+    add_action( 'woocommerce_after_add_to_cart_button', 'trigger_rtb_widget', 10 );
+
     function trigger_affordability_widget()
     {
         if (empty(get_option('rzp_afd_enable')) === false and
@@ -2820,6 +2965,51 @@ function trigger_affordability_widget()
             }
         }
     }
+
+    function trigger_rtb_widget()
+    {
+        if (empty(get_option('rzp_rtb_feature_checked')) === true or
+            get_option('rzp_rtb_feature_checked') === 'no')
+        {
+            try
+            {
+                $api = new Api(get_option('woocommerce_razorpay_settings')['key_id'], get_option('woocommerce_razorpay_settings')['key_secret']);
+
+                update_option('rzp_rtb_enable', 'no');
+
+                $rtbActivationStatus = $api->request->request('GET', 'rtb?key_id=' . get_option('woocommerce_razorpay_settings')['key_id']);
+
+                if (isset($rtbActivationStatus['widget_enabled']) and
+                    $rtbActivationStatus['widget_enabled'] === true)
+                {
+                    update_option('rzp_rtb_enable', 'yes');
+                }
+
+                update_option('rzp_rtb_feature_checked', 'yes');
+            }
+            catch(\Exception $e)
+            {
+                rzpLogError($e->getMessage());
+                return;
+            }
+        }
+
+        if (empty(get_option('woocommerce_razorpay_settings')) === false and
+            isset(get_option('woocommerce_razorpay_settings')['enable_rtb_widget']) === true and
+            get_option('woocommerce_razorpay_settings')['enable_rtb_widget'] === 'yes' and
+            empty(get_option('rzp_rtb_enable')) === false and
+            get_option('rzp_rtb_enable') === 'yes')
+        {
+            $key_id = get_option('woocommerce_razorpay_settings')['key_id'];
+            echo '<script async src="https://cdn.razorpay.com/widgets/trusted-badge.js" type="text/javascript"></script>
+
+            <div style="padding-top: 60px; word-break: keep-all; " id="app">
+                <razorpay-trusted-business key="' . $key_id . '">
+                </razorpay-trusted-business>
+            </div>';
+
+        }
+    }
 }
 
 // This is set to a priority of 10