opay 1.0.6 → 1.0.7

data/app/models/opay/payment.rb

@@ -1,7 +1,20 @@
 module Opay
   class Payment < ActiveRecord::Base
     belongs_to :payable, polymorphic: true
-    attr_accessible :provider, :amount, :finished, :session_id
-    validates :payable, :provider, :amount, :session_id, presence: true
+    attr_accessible :provider, :amount, :finished, :session_id, :status
+    validates :payable, :provider, :amount, presence: true
+
+    before_create do |p|
+      p.session_id = Payment.generate_session_id
+    end
+
+    def self.generate_session_id
+      # Generate a token by looping and ensuring does not already exist.
+      loop do
+        token = SecureRandom.base64(15).tr('+/=lIO0', 'pqrsxyz')
+        break token unless Payment.where(session_id: token).first
+      end
+    end
+
   end
 end

data/db/migrate/20130321114023_create_opay_payments.rb

@@ -2,13 +2,15 @@ class CreateOpayPayments < ActiveRecord::Migration
   def change
     create_table :opay_payments do |t|
       t.references :payable, polymorphic: true
-      t.string :session_id
-      t.string :provider
-      t.integer :amount
+      t.string :session_id, null: false
+      t.string :provider, null: false
+      t.integer :amount, null: false
       t.boolean :finished, null: false, default: false
+      t.string :status
 
       t.timestamps
     end
     add_index :opay_payments, [:payable_id, :payable_type]
+    add_index :opay_payments, :session_id, unique: true
   end
 end

data/lib/opay/form_builder.rb

@@ -1,5 +1,6 @@
 module Opay
   class FormBuilder < ActionView::Helpers::FormBuilder
+    include Opay::Helpers::FormHelper
     include Opay::Helpers::PayuHelper
   end
 end

data/lib/opay/helpers/form_helper.rb

@@ -8,6 +8,10 @@ module Opay
         payu_form_for(record, options, &block)
       end
 
+      def payment_info(options = {})
+        payu_payment_info(options)
+      end
+
     end
 
   end

data/lib/opay/helpers/payu_helper.rb

@@ -9,12 +9,13 @@ module Opay
         options[:url]  = Opay::Providers::Payu.url(:new_payment)
         options[:html] = { id: "payu_payment_form_#{record.id}", class: 'payu_payment_form' }
 
-        record.create_payment!(session_id: record.payment_session_id, provider: 'payu', amount: record.amount) if record.payment.blank?
+        record.prepare_payment
+        # record.create_payment!(session_id: record.payment_session_id, provider: 'payu', amount: record.amount) if record.payment.blank?
 
         form_for(record, options, &block)
       end
 
-      def payment_info(options = {})
+      def payu_payment_info(options = {})
         options[:first_name]   ||= object.first_name
         options[:last_name]    ||= object.last_name
         options[:email]        ||= object.email

data/lib/opay/payable.rb

@@ -18,9 +18,18 @@ module Opay
       end
     end
 
+    def prepare_payment
+      if payment.blank?
+        create_payment!(provider: 'payu', amount: amount)
+      else
+        payment.update_attribute(:session_id, Payment.generate_session_id)
+        payment
+      end
+    end
+
     def payment_session_id
-      raise 'Resource must be saved before payment' if id.nil?
-      Digest::MD5.hexdigest(self.class.name + id.to_s)
+      raise 'Resource must be prepared before payment' if payment.blank?
+      payment.session_id
     end
 
     module ClassMethods

data/lib/opay/version.rb

@@ -1,3 +1,3 @@
 module Opay
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end