spree_razorpay_checkout 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2ae9eca9f07041baff888721f0da631374e73925e8237eeafe32ccfe5185298
-  data.tar.gz: b087fa0f6961cc60c77c38cef002566104a19f6a3a87519658d69c2eb0174ec0
+  metadata.gz: c4200b3ff85e0fea3d0c4412d81dd7af4cf4a66cdb5d582b871b88a8ac6bc2fc
+  data.tar.gz: d142c51d56ba5b2f1eb445780fc887012e1e199abb767f5edaf85f8badc8ce17
 SHA512:
-  metadata.gz: 4262af60d12805b8d7ee60cae23b03f95d9211a806bc39d88d8a4cbe556e280428921d1c9c14b940f56d92128b1e952e7ea99f0d69436bb00071b16c425b83e5
-  data.tar.gz: bf60c0322601d7dfed075e214828ab5fabf98f55a57760ab3f7b73c9b40edc3c3da7a19ac04ac5ff267b23f8130171332c4a522da996533832d1568e23f0652d
+  metadata.gz: 48701e4dda07a8fa192f320981418ae79c5b744bff3e650935a4fac1485c66878bd19414bc4ca72d7411b5ad829bcbf2b0161ed214818057a459630e76cc267d
+  data.tar.gz: 800b0a224a91684f8f7072adc953665091702bda9aafba80f6898bc009cf466300567a579707f53fba9ab855218e76da543beafacc24c562c6a8f3dd6b77eee5

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

@@ -162,21 +162,35 @@ module Spree
             razorpay_signature: rzp_signature
           )
 
-          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 }) 
+          # 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
 
-          payment_session.process! if payment_session.can_process?
-          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?
-
         rescue StandardError => e
           Rails.logger.error("Razorpay 5.4 API Completion Failed: #{e.message}")
           payment_session.fail! if payment_session.can_fail?
@@ -240,7 +254,7 @@ module Spree
       end
     end
 
-def resolve_razorpay_payment_id(response_code)
+    def resolve_razorpay_payment_id(response_code)
       return nil if response_code.blank?
 
       if response_code.to_s.start_with?('order_')
@@ -301,4 +315,4 @@ def resolve_razorpay_payment_id(response_code)
       void(response_code)
     end
   end
-end
+end

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

@@ -9,6 +9,45 @@ module Spree
       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: 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_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/views/spree/admin/payment_methods/configuration_guides/_razorpay.html.erb

@@ -47,7 +47,7 @@
           <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.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">
+            <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"/>

data/lib/spree_razorpay_checkout/version.rb

@@ -1,5 +1,5 @@
 module SpreeRazorpayCheckout
-  VERSION = '0.3.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.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Umesh Ravani