spree_razorpay_checkout 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 210a8729bc5810c991d970ad880aa0a0ac8570e9eccfd0de194e13cb600d0136
-  data.tar.gz: 2198af0c4bdf320756d3ca5a197a53b7f34892332f649e284ad98892355aeadd
+  metadata.gz: c4200b3ff85e0fea3d0c4412d81dd7af4cf4a66cdb5d582b871b88a8ac6bc2fc
+  data.tar.gz: d142c51d56ba5b2f1eb445780fc887012e1e199abb767f5edaf85f8badc8ce17
 SHA512:
-  metadata.gz: 5fc643f93e86598dbf6586e333a54af34ceb300b523c3a6168bedb2164ed1112adb53707c9ac22637b54f1a1c77c1f44edbd1a96a81cda28de9147fbe7aee4eb
-  data.tar.gz: 1df23f297c1a5629721d24d6db194a2b1ae2a8b6adf3b4eacd46ec658e8d4791637ec0d4282aff14876c9d1bf120621b238ad99f5cc618598f508e679cb4a497
+  metadata.gz: 48701e4dda07a8fa192f320981418ae79c5b744bff3e650935a4fac1485c66878bd19414bc4ca72d7411b5ad829bcbf2b0161ed214818057a459630e76cc267d
+  data.tar.gz: 800b0a224a91684f8f7072adc953665091702bda9aafba80f6898bc009cf466300567a579707f53fba9ab855218e76da543beafacc24c562c6a8f3dd6b77eee5

data/app/controllers/spree/products_controller_decorator.rb

@@ -1,17 +1,16 @@
 module Spree
-    module ProductsControllerDecorator
-      def self.prepended(base)
-        base.before_action :force_razorpay_view_priority
-      end
-  
-      private
-  
-      def force_razorpay_view_priority
-        plugin_theme_path = SpreeRazorpayCheckout::Engine.root.join('app', 'views', 'themes', 'default')
-        prepend_view_path(plugin_theme_path)
+  module ProductsControllerDecorator
+    def self.prepended(base)
+      base.before_action :force_razorpay_view_priority
+    end
+
+    private
 
-      end
+    def force_razorpay_view_priority
+      plugin_theme_path = SpreeRazorpayCheckout::Engine.root.join('app', 'views', 'themes', 'default')
+      prepend_view_path(plugin_theme_path)
     end
   end
-  
-  ::Spree::ProductsController.prepend(Spree::ProductsControllerDecorator)
+end
+
+::Spree::ProductsController.prepend(Spree::ProductsControllerDecorator) if defined?(::Spree::ProductsController)

data/app/controllers/spree/razorpay/webhooks_controller.rb

@@ -1,35 +1,72 @@
 module Spree
-    module Razorpay
-      class WebhooksController < ActionController::API
-        skip_before_action :verify_authenticity_token, raise: false
-  
-        def create
-          payload = request.body.read
-          signature = request.headers['X-Razorpay-Signature']
+  module Razorpay
+    class WebhooksController < ActionController::API
+      skip_before_action :verify_authenticity_token, raise: false
+
+      # Handles asynchronous background webhooks directly from Razorpay's servers
+      def create
+        payload = request.body.read
+        signature = request.headers['X-Razorpay-Signature']
+        
+        gateway = Spree::Gateway::RazorpayGateway.active.first
+        return head :not_found unless gateway && gateway.preferred_webhook_secret.present?
+
+        begin
+          ::Razorpay::Utility.verify_webhook_signature(
+            payload, 
+            signature, 
+            gateway.preferred_webhook_secret
+          )
+        rescue ::Razorpay::Errors::SignatureVerificationError => e
+          Rails.logger.error("Razorpay Webhook Verification Failed: #{e.message}")
+          return head :unauthorized
+        end
+
+        event = JSON.parse(payload)
+
+        # Listen for 'payment.authorized' which fires immediately after OTP!
+        if ['order.paid', 'payment.captured', 'payment.authorized'].include?(event['event'])
+          ::SpreeRazorpayCheckout::HandleWebhookEventJob.perform_later(event)
+        end
+
+        head :ok
+      end
+
+      # Handles synchronous frontend verification from Next.js Storefront
+      def verify
+        razorpay_order_id = params[:razorpay_order_id]
+        razorpay_payment_id = params[:razorpay_payment_id]
+        razorpay_signature = params[:razorpay_signature]
+
+        session = Spree::PaymentSession.find_by(external_id: razorpay_order_id)
+        return head :not_found unless session
+        
+        # Initialize the Razorpay gem with your active API keys
+        gateway = Spree::Gateway::RazorpayGateway.active.first
+        return render json: { success: false, error: 'Gateway not configured' }, status: :internal_server_error unless gateway
+        gateway.provider 
+
+        begin
+          # 1. Verify the signature securely on the server
+          ::Razorpay::Utility.verify_payment_signature(
+            razorpay_order_id: razorpay_order_id,
+            razorpay_payment_id: razorpay_payment_id,
+            razorpay_signature: razorpay_signature
+          )
           
-          gateway = Spree::Gateway::RazorpayGateway.active.first
-          return head :not_found unless gateway && gateway.preferred_webhook_secret.present?
-  
-          begin
-            ::Razorpay::Utility.verify_webhook_signature(
-              payload, 
-              signature, 
-              gateway.preferred_webhook_secret
-            )
-          rescue ::Razorpay::Errors::SignatureVerificationError => e
-            Rails.logger.error("Razorpay Webhook Verification Failed: #{e.message}")
-            return head :unauthorized
-          end
-  
-          event = JSON.parse(payload)
-  
-          # Listen for 'payment.authorized' which fires immediately after OTP!
-          if ['order.paid', 'payment.captured', 'payment.authorized'].include?(event['event'])
-            ::SpreeRazorpayCheckout::HandleWebhookEventJob.perform_later(event)
-          end
-  
-          head :ok
+          # 2. Inject the signatures into the session's external_data
+          session.external_data ||= {}
+          session.external_data['razorpay_payment_id'] = razorpay_payment_id
+          session.external_data['razorpay_signature'] = razorpay_signature
+          session.save!
+
+          render json: { success: true }
+        rescue ::Razorpay::Errors::SignatureVerificationError => e
+          Rails.logger.error("Razorpay Frontend Verification Failed: #{e.message}")
+          render json: { success: false, error: e.message }, status: :unprocessable_entity
         end
       end
+
     end
-  end
+  end
+end

data/app/javascript/spree_razorpay/application.js

@@ -9,4 +9,4 @@ if (typeof window.Stimulus === "undefined") {
   application = window.Stimulus
 }
 
-application.register('checkout-razorpay', CheckoutRazorpayController)
+application.register('checkout-razorpay', CheckoutRazorpayController)

data/app/javascript/spree_razorpay/controllers/checkout_razorpay_controller.js

@@ -105,4 +105,4 @@ export default class extends Controller {
       this.submitBtn.innerHTML = 'Save and Continue'; 
     }
   }
-}
+}

data/app/jobs/spree_razorpay_checkout/handle_webhook_event_job.rb

@@ -29,6 +29,7 @@ module SpreeRazorpayCheckout
             end
           rescue StandardError => e
             Rails.logger.error("Webhook Razorpay Capture Failed: #{e.message}")
+            return
           end
   
           checkout_record.update!(
@@ -61,4 +62,4 @@ module SpreeRazorpayCheckout
         end
       end
     end
-  end
+  end

data/app/models/spree/gateway/razorpay_gateway.rb

@@ -1,29 +1,19 @@
 require 'razorpay'
+require 'active_merchant'
 
 module Spree
   class Gateway::RazorpayGateway < Gateway
-    preference :webhook_secret, :password
-    preference :key_id, :string
-    preference :key_secret, :password
-    preference :test_key_id, :string
-    preference :test_key_secret, :password
+    preference :webhook_secret, :password, default: ''
+    preference :key_id, :string, default: ''
+    preference :key_secret, :password, default: ''
+    preference :test_key_id, :string, default: ''
+    preference :test_key_secret, :password, default: ''
     preference :test_mode, :boolean, default: false
     preference :merchant_name, :string, default: 'Razorpay'
     preference :merchant_description, :text, default: 'Razorpay Payment Gateway'
     preference :merchant_address, :string, default: 'Razorpay, Bangalore, India'
     preference :theme_color, :string, default: '#2e5bff'
-
-    def supports?(_source)
-      true
-    end
-
-    def source_required?
-      true
-    end
-
-    def payment_source_class
-      Spree::RazorpayCheckout
-    end
+    preference :headless_api_mode, :boolean, default: false
 
     def name
       'Razorpay Secure (UPI, Wallets, Cards & Netbanking)'
@@ -81,9 +71,160 @@ module Spree
       payment.state != 'void'
     end
 
-    # -------------------------------------------------------------------------
-    # PURCHASE (Happy Path & Webhook Recovery)
-    # -------------------------------------------------------------------------
+    def supports?(_source)
+      true
+    end
+
+    def session_required?
+      preferred_headless_api_mode
+    end
+
+    def source_required?
+      !preferred_headless_api_mode
+    end
+
+    def setup_session_supported?
+      false
+    end
+
+    def payment_source_class
+      Spree::RazorpayCheckout
+    end
+
+    def payment_session_class
+      Spree::PaymentSessions::Razorpay if defined?(Spree::PaymentSession)
+    end
+
+    # SPREE 5.4+ HEADLESS API FLOW (Protected by defined? check)
+
+    if defined?(Spree::PaymentSession)
+      def create_payment_session(order:, amount: nil, external_data: {})
+        provider
+        total = amount || order.total_minus_store_credits
+        amount_in_cents = (total.to_f * 100).to_i
+
+        rzp_order = ::Razorpay::Order.create(
+          amount: amount_in_cents,
+          currency: order.currency || 'INR',
+          receipt: order.number,
+          payment_capture: 1,
+          notes: { spree_order_number: order.number, email: order.email }
+        )
+
+        unless rzp_order && rzp_order.attributes.key?('id')
+          raise Spree::Core::GatewayError, 'Failed to create Razorpay session'
+        end
+
+        payment_sessions.create!(
+          type: 'Spree::PaymentSessions::Razorpay',
+          order: order,
+          amount: total,
+          currency: order.currency || 'INR',
+          external_id: rzp_order.id,
+          external_data: { client_key: current_key_id },
+          customer: order.user,
+          status: 'pending'
+        )
+      rescue StandardError => e
+        Rails.logger.error("Razorpay Session Creation Failed: #{e.message}")
+        raise Spree::Core::GatewayError, e.message
+      end
+
+      def update_payment_session(payment_session:, amount: nil, external_data: {})
+        provider
+        
+        if amount.present? && payment_session.amount != amount
+          amount_in_cents = (amount.to_f * 100).to_i
+          
+          new_rzp_order = ::Razorpay::Order.create(
+            amount: amount_in_cents,
+            currency: payment_session.currency,
+            receipt: payment_session.order.number,
+            payment_capture: 1
+          )
+          
+          payment_session.update!(amount: amount, external_id: new_rzp_order.id)
+        end
+        payment_session
+      end
+
+      def complete_payment_session(payment_session:, params: {})
+        provider
+        
+        ext_data = params[:external_data] || params['external_data'] || {}
+        rzp_payment_id = ext_data[:razorpay_payment_id] || ext_data['razorpay_payment_id'] || payment_session.external_data['razorpay_payment_id']
+        rzp_signature  = ext_data[:razorpay_signature] || ext_data['razorpay_signature'] || payment_session.external_data['razorpay_signature']
+
+        begin
+          ::Razorpay::Utility.verify_payment_signature(
+            razorpay_order_id: payment_session.external_id,
+            razorpay_payment_id: rzp_payment_id,
+            razorpay_signature: rzp_signature
+          )
+
+          # Lock the order database row to prevent race conditions with Webhooks
+          payment_session.order.with_lock do
+            
+            # Save the verified IDs into the session so the new Session Class can read them
+            session_data = payment_session.external_data || {}
+            session_data['razorpay_payment_id'] = rzp_payment_id
+            session_data['razorpay_signature'] = rzp_signature
+            payment_session.update!(external_data: session_data)
+
+            # Capture the payment
+            rzp_payment = ::Razorpay::Payment.fetch(rzp_payment_id)
+            if rzp_payment.status == 'authorized'
+              rzp_payment.capture({ amount: (payment_session.amount.to_f * 100).to_i }) 
+            end
+
+            # Process and Create Payment
+            payment_session.process! if payment_session.can_process?
+            
+            # This safely calls your new Spree::PaymentSessions::Razorpay class!
+            payment = payment_session.find_or_create_payment!
+            
+            if payment.present? && !payment.completed?
+              payment.started_processing! if payment.checkout?
+              payment.complete! if payment.can_complete?
+            end
+
+            payment_session.complete! if payment_session.can_complete?
+          end
+
+        rescue StandardError => e
+          Rails.logger.error("Razorpay 5.4 API Completion Failed: #{e.message}")
+          payment_session.fail! if payment_session.can_fail?
+          raise Spree::Core::GatewayError, e.message
+        end
+      end
+
+      def parse_webhook_event(raw_body, headers)
+        provider
+        signature = headers['HTTP_X_RAZORPAY_SIGNATURE'] || headers['X-Razorpay-Signature']
+
+        unless ::Razorpay::Utility.verify_webhook_signature(raw_body, signature, preferred_webhook_secret)
+          raise Spree::PaymentMethod::WebhookSignatureError
+        end
+
+        event = JSON.parse(raw_body)
+        payment_entity = event.dig('payload', 'payment', 'entity') || event.dig('payload', 'order', 'entity')
+        
+        session = Spree::PaymentSession.find_by(external_id: payment_entity['order_id'])
+        return nil unless session
+
+        case event['event']
+        when 'payment.captured', 'payment.authorized'
+          { action: :captured, payment_session: session }
+        when 'payment.failed'
+          { action: :failed, payment_session: session }
+        else
+          nil
+        end
+      rescue ::Razorpay::Errors::SignatureVerificationError
+        raise Spree::PaymentMethod::WebhookSignatureError
+      end
+    end
+
     def purchase(_amount, source, _gateway_options = {})
       provider
 
@@ -92,14 +233,12 @@ module Spree
            return ActiveMerchant::Billing::Response.new(false, 'Payment was not completed. Please try again.', {}, test: preferred_test_mode)
         end
 
-        # 1. Verify the signature
         ::Razorpay::Utility.verify_payment_signature(
           razorpay_order_id: source.razorpay_order_id,
           razorpay_payment_id: source.razorpay_payment_id,
           razorpay_signature: source.razorpay_signature
         )
 
-        # 2. Safely ensure it is captured!
         rzp_payment = ::Razorpay::Payment.fetch(source.razorpay_payment_id)
         if rzp_payment.status == 'authorized'
           rzp_payment.capture({ amount: _amount })
@@ -107,13 +246,7 @@ module Spree
 
         source.update!(status: 'captured')
         
-        ActiveMerchant::Billing::Response.new(
-          true, 
-          'Razorpay Payment Successful', 
-          {}, 
-          test: preferred_test_mode, 
-          authorization: source.razorpay_payment_id
-        )
+        ActiveMerchant::Billing::Response.new(true, 'Razorpay Payment Successful', {}, test: preferred_test_mode, authorization: source.razorpay_payment_id)
         
       rescue StandardError => e
         Rails.logger.error("Razorpay Verification/Capture Failed: #{e.message}")
@@ -121,64 +254,64 @@ module Spree
       end
     end
 
+    def resolve_razorpay_payment_id(response_code)
+      return nil if response_code.blank?
+
+      if response_code.to_s.start_with?('order_')
+        rzp_order = ::Razorpay::Order.fetch(response_code)
+        payments = rzp_order.payments
+        
+        captured_payment = payments.items.find { |p| p.status == 'captured' } || payments.items.first
+        
+        raise StandardError, "No captured payment found for Razorpay Order #{response_code}" unless captured_payment
+        
+        captured_payment.id
+      else
+        response_code
+      end
+    end
+
     def capture(*args)
-      # We already auto-capture via the frontend/webhook, so we return true to keep Spree happy
       ActiveMerchant::Billing::Response.new(true, 'Already Captured', {}, test: preferred_test_mode)
     end
 
-    # -------------------------------------------------------------------------
-    # REFUNDS & CANCELLATIONS
-    # -------------------------------------------------------------------------
-
-    # Triggered when you click "Refund" in the Spree Admin
     def credit(credit_cents, response_code, _gateway_options = {})
       provider
-
       begin
-        # Fetch the original payment from Razorpay using the saved payment ID
-        rzp_payment = ::Razorpay::Payment.fetch(response_code)
+        rzp_payment_id = resolve_razorpay_payment_id(response_code)
         
-        # Issue the refund via Razorpay API (amount must be in paise/cents)
-        refund = rzp_payment.refund(amount: credit_cents)
-
-        ActiveMerchant::Billing::Response.new(
-          true, 
-          'Razorpay Refund Successful', 
-          { refund_id: refund.id }, 
-          test: preferred_test_mode, 
-          authorization: refund.id
-        )
+        if rzp_payment_id.blank?
+          raise StandardError, "Missing Razorpay Payment ID. Cannot process refund."
+        end
+        
+        refund = ::Razorpay::Refund.create(payment_id: rzp_payment_id, amount: credit_cents.to_i)
+        
+        ActiveMerchant::Billing::Response.new(true, 'Razorpay Refund Successful', { refund_id: refund.id }, test: preferred_test_mode, authorization: refund.id)
       rescue StandardError => e
         Rails.logger.error("Razorpay Refund Failed: #{e.message}")
         ActiveMerchant::Billing::Response.new(false, "Refund failed: #{e.message}", {}, test: preferred_test_mode)
       end
     end
 
-    # Triggered if you explicitly "Void" a payment in Spree
     def void(response_code, _gateway_options = {})
       provider
-
       begin
-        # Razorpay doesn't have a concept of "Voiding" a captured payment, 
-        # so we just issue a full refund instead.
-        rzp_payment = ::Razorpay::Payment.fetch(response_code)
-        refund = rzp_payment.refund
-
-        ActiveMerchant::Billing::Response.new(
-          true, 
-          'Razorpay Void/Refund Successful', 
-          { refund_id: refund.id }, 
-          test: preferred_test_mode, 
-          authorization: refund.id
-        )
+        rzp_payment_id = resolve_razorpay_payment_id(response_code)
+
+        if rzp_payment_id.blank?
+          raise StandardError, "Missing Razorpay Payment ID. Cannot process void."
+        end
+
+        refund = ::Razorpay::Refund.create(payment_id: rzp_payment_id)
+        
+        ActiveMerchant::Billing::Response.new(true, 'Razorpay Void/Refund Successful', { refund_id: refund.id }, test: preferred_test_mode, authorization: refund.id)
       rescue StandardError => e
         Rails.logger.error("Razorpay Void Failed: #{e.message}")
         ActiveMerchant::Billing::Response.new(false, "Void failed: #{e.message}", {}, test: preferred_test_mode)
       end
     end
 
-    # Triggered if the entire Order is Cancelled in the Spree Admin
-    def cancel(response_code)
+    def cancel(response_code, _source = nil, _options = {})
       void(response_code)
     end
   end

data/app/models/spree/page_sections/product_details_decorator.rb

@@ -1,17 +1,15 @@
 module Spree
-    module PageSections
-      module ProductDetailsDecorator
-        def default_blocks
-          super + [Spree::PageBlocks::Products::RazorpayAffordability.new]
-        end
-  
-        def available_blocks_to_add
-          super + [Spree::PageBlocks::Products::RazorpayAffordability]
-        end
+  module PageSections
+    module ProductDetailsDecorator
+      def default_blocks
+        super + [Spree::PageBlocks::Products::RazorpayAffordability.new]
+      end
+
+      def available_blocks_to_add
+        super + [Spree::PageBlocks::Products::RazorpayAffordability]
       end
     end
   end
-  
-  Spree::PageSections::ProductDetails.prepend(
-    Spree::PageSections::ProductDetailsDecorator
-  )
+end
+
+Spree::PageSections::ProductDetails.prepend(Spree::PageSections::ProductDetailsDecorator) if defined?(Spree::PageSections::ProductDetails)

data/app/models/spree/payment_sessions/razorpay.rb

@@ -1,43 +1,53 @@
 module Spree
-    module PaymentSessions
-      class Razorpay < PaymentSession
-        # external_id will store the razorpay_order_id
-        def razorpay_order_id
-          external_id
-        end
-  
-        # Helper to extract the signature if we need it later
-        def razorpay_signature
-          external_data&.dig('razorpay_signature')
-        end
-  
-        # Mirrors Stripe's approach to safely generate the Spree::Payment
-        def find_or_create_payment!(razorpay_payment_id)
-          return unless persisted?
-          return payment if payment.present?
-  
-          # Create the Spree::Payment record in the checkout state
-          order.payments.create!(
-            amount: amount,
+  module PaymentSessions
+    class Razorpay < Spree::PaymentSession
+
+      def client_key
+        external_data['client_key']
+      end
+      
+      def razorpay_order_id
+        external_id
+      end
+
+      # Required for Headless API V3 to properly create the source and prevent double-charges
+      def find_or_create_payment!(metadata = {})
+        return unless persisted?
+        return payment if payment.present?
+
+        # 1. Lock the order to prevent race conditions from Webhooks
+        order.with_lock do
+          rzp_payment_id = external_data['razorpay_payment_id']
+          
+          # 2. Check if the webhook already created this payment
+          existing_payment = order.payments.where(
             payment_method: payment_method,
-            response_code: razorpay_payment_id,
-            source: create_source(razorpay_payment_id), # Optional: if you still use a source model
-            state: 'checkout'
-          )
-        end
-  
-        private
-  
-        # Optional: Only needed if you want to keep using your custom source model
-        def create_source(payment_id)
-          ::Spree::RazorpayCheckout.create!(
+            response_code: rzp_payment_id || external_id
+          ).first
+
+          return existing_payment if existing_payment.present?
+
+          # 3. Create your custom RazorpayCheckout source record for Headless!
+          source = ::Spree::RazorpayCheckout.create!(
             order_id: order.id,
-            razorpay_order_id: razorpay_order_id,
-            razorpay_payment_id: payment_id,
-            payment_method: payment_method.name,
-            status: 'captured'
+            razorpay_payment_id: rzp_payment_id,
+            razorpay_order_id: external_id,
+            razorpay_signature: external_data['razorpay_signature'],
+            status: 'captured',
+            payment_method: payment_method.name
+          )
+
+          # 4. Create the actual Spree::Payment
+          order.payments.create!(
+            payment_method: payment_method,
+            amount: amount,
+            response_code: rzp_payment_id || external_id,
+            source: source,
+            skip_source_requirement: true
           )
         end
       end
+
     end
-  end
+  end
+end

data/app/models/spree/razorpay_checkout.rb

@@ -20,5 +20,10 @@ module Spree
     def order_id
       self.razorpay_order_id
     end
+
+    def gateway_payment_profile_id
+      self.razorpay_payment_id
+    end
+    
   end
 end

data/app/models/spree_razorpay_checkout/spree/order_decorator.rb

@@ -2,6 +2,10 @@ module SpreeRazorpayCheckout
   module Spree
     module OrderDecorator
       
+      def self.prepended(base)
+        base.has_many :razorpay_checkouts, class_name: 'Spree::RazorpayCheckout', dependent: :destroy
+      end
+      
       def inr_amt_in_paise
         payments.reload 
 
@@ -53,8 +57,8 @@ module SpreeRazorpayCheckout
 
         payment
       end
-
-      ::Spree::Order.prepend SpreeRazorpayCheckout::Spree::OrderDecorator
     end
   end
 end
+
+::Spree::Order.prepend SpreeRazorpayCheckout::Spree::OrderDecorator if defined?(::Spree::Order)

data/app/views/spree/admin/payment_methods/configuration_guides/_razorpay.html.erb

@@ -1,6 +1,104 @@
-<div class="alert alert-info">
-  <p class="mb-0">
-    To find your <strong>Key</strong> and <strong>Key Secret</strong>, go to the 
-    <%= external_link_to 'Razorpay dashboard', 'https://dashboard.razorpay.com/app/website-app-settings/api-keys', class: 'alert-link' %><br><%= external_link_to 'Create Webhook', 'https://dashboard.razorpay.com/app/website-app-settings/webhooks', class: 'alert-link' %> and mark all checkboxes in <strong>Active Events.</strong>
-  </p>
+<%
+  base_url = current_store.url_or_custom_domain.to_s
+  base_url = "https://#{base_url}" unless base_url.start_with?("http")
+  base_url = base_url.chomp('/')
+%>
+
+<style>
+  .razorpay-premium-ui .badge-event {
+    font-weight: 500;
+    background-color: #f3f4f6;
+    border: 1px solid #e5e7eb;
+    color: #4b5563;
+    padding: 0.35em 0.75em;
+    border-radius: 0.375rem;
+    font-size: 0.8rem;
+  }
+</style>
+
+<div class="razorpay-premium-ui">
+  <div class="card mb-3 border shadow-sm" style="border-radius: 0.5rem;">
+    <div class="card-body d-flex align-items-center py-3 px-4">
+      <div class="mr-3 text-muted d-flex align-items-center">
+        <%= icon 'key', width: 20, height: 20 %>
+      </div>
+      <p class="mb-0 text-dark" style="font-size: 0.95rem;">
+        Find your 'Key ID' and 'Key Secret' in the
+        <strong><%= external_link_to 'Razorpay Dashboard API Keys', 'https://dashboard.razorpay.com/app/website-app-settings/api-keys', target: '_blank', class: 'alert-link font-weight-bold text-primary' %></strong>
+      </p>
+    </div>
+  </div>
+
+  <% if @payment_method.persisted? %>
+    <div class="card mb-4 border shadow-sm" style="border-radius: 0.5rem;">
+      
+      <div class="card-body d-flex align-items-center py-3 px-4 border-bottom">
+        <div class="mr-3 text-muted d-flex align-items-center">
+          <%= icon 'link', width: 20, height: 20 %>
+        </div>
+        <p class="mb-0 text-dark" style="font-size: 0.95rem;">
+          Add the following webhooks in your <strong><%= external_link_to 'Razorpay Settings', 'https://dashboard.razorpay.com/app/website-app-settings/webhooks', target: '_blank', class: 'alert-link text-primary font-weight-bold' %></strong>
+        </p>
+      </div>
+
+      <div class="card-body py-4 px-4">
+        
+        <div class="mb-4 pb-2">
+          <h6 class="font-weight-bold text-dark mb-2" style="font-size: 0.95rem;">Next.js Storefront</h6>
+          
+          <div class="input-group bg-gray-25 border border-gray-100 mb-3 d-flex align-items-center rounded" data-controller="clipboard" data-clipboard-success-content-value="Copied!">
+            <input type="text" readonly value="<%= base_url %>/api/v3/webhooks/payments/<%= @payment_method.prefixed_id %>" class="text-gray-600 py-2 grow pl-3 border-0 bg-transparent shadow-none" style="font-family: monospace; font-size: 0.85rem; outline: none; min-width: 0;" data-clipboard-target="source">
+            <button type="button" class="btn btn-sm btn-light mr-1 d-flex align-items-center justify-content-center p-1" title="Copy to clipboard" data-action="clipboard#copy" data-clipboard-target="button">
+              <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="none" viewBox="0 0 24 24" class="text-muted">
+                <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 4h3a1 1 0 0 1 1 1v15a1 1 0 0 1-1 1H6a1 1 0 0 1-1-1V5a1 1 0 0 1 1-1h3m0 3h6m-6 5h6m-6 4h6M10 3v4h4V3h-4Z"/>
+              </svg>
+            </button>
+          </div>
+
+          <div class="d-flex align-items-center flex-wrap">
+            <span class="text-dark font-weight-bold mr-3" style="font-size: 0.85rem;">Active Events:</span>
+            <span class="badge badge-event mr-2 mb-1">payment.authorized</span>
+            <span class="badge badge-event mr-2 mb-1">payment.captured</span>
+            <span class="badge badge-event mb-1">payment.failed</span>
+          </div>
+        </div>
+
+        <hr class="border-light my-4">
+
+        <div class="pt-2">
+          <h6 class="font-weight-bold text-dark mb-2" style="font-size: 0.95rem;">Legacy Rails Storefront</h6>
+          
+          <div class="input-group bg-gray-25 border border-gray-100 mb-3 d-flex align-items-center rounded" data-controller="clipboard" data-clipboard-success-content-value="Copied!">
+            <input type="text" readonly value="<%= base_url %>/razorpay/webhooks" class="text-gray-600 py-2 grow pl-3 border-0 bg-transparent shadow-none" style="font-family: monospace; font-size: 0.85rem; outline: none; min-width: 0;" data-clipboard-target="source">
+            <button type="button" class="btn btn-sm btn-light mr-1 d-flex align-items-center justify-content-center p-1" title="Copy to clipboard" data-action="clipboard#copy" data-clipboard-target="button">
+              <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="none" viewBox="0 0 24 24" class="text-muted">
+                <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 4h3a1 1 0 0 1 1 1v15a1 1 0 0 1-1 1H6a1 1 0 0 1-1-1V5a1 1 0 0 1 1-1h3m0 3h6m-6 5h6m-6 4h6M10 3v4h4V3h-4Z"/>
+              </svg>
+            </button>
+          </div>
+
+          <div class="d-flex align-items-center flex-wrap">
+            <span class="text-dark font-weight-bold mr-3" style="font-size: 0.85rem;">Active Events:</span>
+            <span class="badge badge-event mr-2 mb-1">payment.authorized</span>
+            <span class="badge badge-event mr-2 mb-1">payment.pending</span>
+            <span class="badge badge-event mr-2 mb-1">payment.captured</span>
+            <span class="badge badge-event mr-2 mb-1">payment.failed</span>
+            <span class="badge badge-event mb-1">order.paid</span>
+          </div>
+        </div>
+
+      </div>
+    </div>
+  <% else %>
+    <div class="card mb-4 border shadow-sm" style="border-radius: 0.5rem; border-left: 4px solid #0ea5e9 !important;">
+      <div class="card-body d-flex align-items-center py-3 px-4">
+        <div class="mr-3 text-info d-flex align-items-center">
+          <%= icon 'info-circle', width: 22, height: 22 %>
+        </div>
+        <p class="mb-0 text-dark" style="font-size: 0.95rem;">
+          <strong>Webhook Generation Pending:</strong> You must click <strong>Create</strong> to save this payment method before secure Webhook URLs can be generated.
+        </p>
+      </div>
+    </div>
+  <% end %>
 </div>

data/app/views/spree/checkout/payment/_razorpay.html.erb

@@ -140,4 +140,4 @@
   <div class="alert alert-danger">
     Unable to initialize Razorpay session. Please try again.
   </div>
-<% end %>
+<% end %>

data/config/routes.rb

@@ -2,5 +2,6 @@ Spree::Core::Engine.add_routes do
   
   namespace :razorpay do
     post :webhooks, to: 'webhooks#create'
+    post :verify, to: 'webhooks#verify'
   end
-end
+end

data/lib/spree_razorpay_checkout/engine.rb

@@ -46,4 +46,4 @@ module SpreeRazorpayCheckout
       ::SpreeRazorpayCheckout::Engine.activate
     end
   end
-end
+end

data/lib/spree_razorpay_checkout/version.rb

@@ -1,5 +1,5 @@
 module SpreeRazorpayCheckout
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.1'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_razorpay_checkout
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Umesh Ravani
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: spree_extension
   requirement: !ruby/object:Gem::Requirement
@@ -65,7 +65,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Seamless Razorpay checkout integration for Spree 5.x. Features include
+- !ruby/object:Gem::Dependency
+  name: activemerchant
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Seamless Razorpay checkout integration for Spree 5.4. Features include
   Hotwire/Turbo compatibility, Zero Drop-off Webhook captures, native Spree Dashboard
   refunds, and the Affordability Widget.
 email:
@@ -93,7 +107,6 @@ files:
 - app/models/spree/razorpay_checkout.rb
 - app/models/spree_razorpay_checkout/configuration.rb
 - app/models/spree_razorpay_checkout/spree/order_decorator.rb
-- app/models/spree_razorpay_checkout/spree/refund_decorator.rb
 - app/services/razorpay/base.rb
 - app/services/razorpay/rp_order/api.rb
 - app/services/razorpay_refund.rb
@@ -134,5 +147,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.9
 specification_version: 4
-summary: Production-grade Razorpay integration for Spree Commerce 5.3+
+summary: Production-grade Razorpay integration for Spree Commerce 5.4
 test_files: []

data/app/models/spree_razorpay_checkout/spree/refund_decorator.rb

@@ -1,36 +0,0 @@
-module SpreeRazorpayCheckout
-  module Spree
-    module RefundDecorator
-      def process!(credit_cents)
-  response = if payment.payment_method.payment_profiles_supported?
-               payment.payment_method.credit(
-                 credit_cents,
-                 payment.source,
-                 payment.transaction_id,
-                 originator: self
-               )
-             else
-               razorpay_payment_id = payment.source&.razorpay_payment_id || payment.transaction_id
-               payment.payment_method.credit(
-                 credit_cents,
-                 razorpay_payment_id,
-                 originator: self
-               )
-             end
-
-  unless response.success?
-    Rails.logger.error(Spree.t(:gateway_error) + "  #{response.to_yaml}")
-    text = response.params['message'] || response.params['response_reason_text'] || response.message
-    raise Core::GatewayError, text
-  end
-
-  response
-rescue ActiveMerchant::ConnectionError => e
-  Rails.logger.error(Spree.t(:gateway_error) + "  #{e.inspect}")
-  raise Core::GatewayError, Spree.t(:unable_to_connect_to_gateway)
-end
-
-      ::Spree::Refund.prepend SpreeRazorpayCheckout::Spree::RefundDecorator
-    end
-  end
-end