easypay 0.0.4 → 1.0.0

data/VERSION

@@ -1 +1 @@
-0.0.4
+1.0.0

data/app/controllers/easypay/notifications_controller.rb

@@ -8,7 +8,7 @@ module Easypay
     def simple_notification
       # c=PT&e=10611&r=810302231&v=7&l=PT&t_key=
       @payment_reference = PaymentReference.find_by_ep_reference_and_ep_value(params[:r], params[:v])
-      # preciso de por os dados da morada do cliente, NIF etc
+      @atts = params
       respond_to do |format|
         format.xml
       end
@@ -18,13 +18,15 @@ module Easypay
       # e=10611&r=810302231&v=7&s=ok&k=C36D4995CBF3574ADD8664BA26514181C9EA8737&t_key=CCCSOKCSO
       payment_reference = PaymentReference.find_by_ep_reference_and_ep_key(params[:r], params[:t_key])
       
-      if params[:s].starts_with? "ok" and params[:k].present?
+      if params[:s].starts_with? "ok" and params[:k].present? and payment_reference.present?
         payment_reference.update_attribute(:o_key, params[:k]) unless payment_reference.nil?
         
         payment_detail = Easypay::Client.new.request_payment(params[:e], params[:r], params[:v], params[:k])
 
         payment_reference.update_attributes(:ep_last_status => payment_detail[:ep_status], 
                                             :ep_message => payment_detail[:ep_message]) unless payment_reference.nil?
+      elsif payment_reference.present?
+        payment_reference.update_attribute(:ep_last_status, params[:s])
       end
       
       redirect_to payment_redirect_url(:status => params[:s], :ep_key => params[:t_key])

data/app/models/easypay/payment_reference.rb

@@ -4,13 +4,13 @@ module Easypay
     
     attr_protected
     
-    def process(object)
+    def process(object, options = {})
       @object = object
       
       if compliant?
         self.update_attributes(handle_model_methods)
         
-        payment_reference = Easypay::Client.new.create_reference(self)
+        payment_reference = Easypay::Client.new(options).create_reference(self)
         
         self.update_attributes( :ep_message => payment_reference[:ep_message],
                                 :ep_reference => payment_reference[:ep_reference],
@@ -19,7 +19,9 @@ module Easypay
                                 :ep_entity => payment_reference[:ep_entity],
                                 :ep_link => payment_reference[:payment_link],
                                 :ep_last_status => payment_reference[:ep_status],
-                                :request_log => payment_reference[:raw])
+                                :request_log => payment_reference[:raw],
+                                :item_description => payment_reference[:item_description],
+                                :item_quantity => payment_reference[:item_quantity])
                                 
         return payment_reference
       else
@@ -51,7 +53,9 @@ module Easypay
         :o_description  => @object.easypay_options[:o_description], 
         :o_obs => @object.easypay_options[:o_obs],
         :o_email => @object.easypay_options[:o_email],
-        :o_mobile  => @object.easypay_options[:o_mobile]
+        :o_mobile  => @object.easypay_options[:o_mobile],
+        :item_description => @object.easypay_options[:item_description],
+        :item_quantity => @object.easypay_options[:item_quantity]
       }
     end
     

data/app/views/easypay/notifications/simple_notification.xml.builder

@@ -3,9 +3,9 @@ xml.get_detail do
   if @payment_reference.nil?
     xml.ep_status "err"
     xml.ep_message "error mensage"
-    xml.ep_entity "x1"
-    xml.ep_ref "x2"
-    xml.ep_value "x3"
+    xml.ep_entity @atts[:e] if @atts[:e].present?
+    xml.ep_ref @atts[:r] if @atts[:r].present?
+    xml.ep_value @atts[:v] if @atts[:v].present?
   else
     xml.ep_status "ok"
     xml.ep_message "success message"
@@ -13,30 +13,31 @@ xml.get_detail do
     xml.ep_reference @payment_reference.ep_reference
     xml.ep_value @payment_reference.ep_value
     xml.t_key @payment_reference.ep_key
+    
     xml.order_info do
-      xml.total_taxes "100.00"
+      # xml.total_taxes " "
       xml.total_including_taxes @payment_reference.ep_value
-    
-      xml.bill_fiscal_number "PT123456789"
-      xml.bill_name "Billing Test Name"
-      xml.bill_address_1 "Billing address line 1"
-      xml.bill_address_2 "Billing address line 2"
-      xml.bill_city "Billing city"
-      xml.bill_zip_code "Billing zip code"
-      xml.bill_country "Billing country"
-    
-      xml.ship_fiscal_number "PT123456789"
-      xml.shipp_name "Shipping Test Name"
-      xml.shipp_address_1 "Shipping address line 1"
-      xml.shipp_address_2 "Shipping address line 2"
-      xml.shipp_city "Shipping city"
-      xml.shipp_zip_code "Shipping zip code"
-      xml.shipp_country "Shipping coutry"
+      # TODO - Include this information in future
+      # xml.bill_fiscal_number " "
+      # xml.bill_name " "
+      # xml.bill_address_1 " "
+      # xml.bill_address_2 " "
+      # xml.bill_city " "
+      # xml.bill_zip_code " "
+      # xml.bill_country " "
+      #     
+      # xml.ship_fiscal_number " "
+      # xml.shipp_name " "
+      # xml.shipp_address_1 " "
+      # xml.shipp_address_2 " "
+      # xml.shipp_city " "
+      # xml.shipp_zip_code " "
+      # xml.shipp_country " "
     end
     xml.order_detail do
       xml.item do
-        xml.item_description "description of item 1"
-        xml.item_quantity "5"
+        xml.item_description @payment_reference.item_description
+        xml.item_quantity @payment_reference.item_quantity
         xml.item_total @payment_reference.ep_value
       end
     end

data/easypay.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "easypay"
-  s.version     = "0.0.4"
+  s.version     = "1.0.0"
   s.authors     = ["Guilherme Pereira"]
   s.email       = ["guiferrpereira@gmail.com"]
   s.homepage    = ""

data/lib/acts_as_payable/base.rb

@@ -22,7 +22,9 @@ module Easypay
               :o_description  => args[:description] || "description", 
               :o_obs => args[:obs] || "obs",
               :o_email => args[:email] || "email",
-              :o_mobile  => args[:mobile] || "mobile"
+              :o_mobile => args[:mobile] || "mobile",
+              :item_description => args[:item_description] || "item_description",
+              :item_quantity => args[:item_quantity] || "item_quantity"
             } 
           end
           
@@ -32,8 +34,8 @@ module Easypay
       
       module InstanceMethods
         
-        def create_payment_reference
-          Easypay::PaymentReference.new.process(self)
+        def create_payment_reference(options={})
+          Easypay::PaymentReference.new.process(self, options)
         end
                 
       end # InstanceMethods

data/lib/easypay/client.rb

@@ -32,9 +32,7 @@ module Easypay
     
     # API methods
 
-    # def create_reference(token, value, lang, client_name=nil, client_mobile=nil, client_email=nil, client_observation=nil, item_description=nil)
     def create_reference(object)
-            
       get "01BG",
         :t_key => object.ep_key, 
         :t_value => object.ep_value,
@@ -142,13 +140,11 @@ module Easypay
         result[:payment_link] = doc.at("ep_link").text unless doc.at("ep_link").nil?
         result[:ep_reference] = doc.at("ep_reference").text unless doc.at("ep_reference").nil?
       end
-      
+      # TODO - ugly i know - must create decent Parser
       result[:ep_status] = doc.at("ep_status").text unless doc.at("ep_status").nil?
       result[:ep_cin] = doc.at("ep_cin").text unless doc.at("ep_cin").nil?
       result[:ep_user] = doc.at("ep_user").text unless doc.at("ep_user").nil?
       result[:ep_entity] = doc.at("ep_entity").text unless doc.at("ep_entity").nil?
-      
-      
       result[:t_key] = doc.at("t_key").text unless doc.at("t_key").nil?
       result[:ep_doc] = doc.at("ep_doc").text unless doc.at("ep_doc").nil?
       result[:ep_payment_type] = doc.at("ep_payment_type").text unless doc.at("ep_payment_type").nil?

data/lib/rails/generators/easypay/templates/migration.rb

@@ -33,6 +33,8 @@ class CreateEasypayTables < ActiveRecord::Migration
       t.text      :o_obs
       t.string    :o_email
       t.string    :o_mobile
+      t.string    :item_description
+      t.integer   :item_quantity
       
       t.timestamps
     end

metadata

@@ -4,10 +4,10 @@ version: !ruby/object:Gem::Version
   hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  version: 1.0.0
 platform: ruby
 authors: 
 - Guilherme Pereira
@@ -50,7 +50,7 @@ files:
 - app/controllers/easypay/payments_controller.rb
 - app/models/easypay/log.rb
 - app/models/easypay/payment_reference.rb
-- app/views/easypay/notifications/notification_from_mb_payment.xml.builder
+- app/views/easypay/notifications/notification_from_payment.xml.builder
 - app/views/easypay/notifications/simple_notification.xml.builder
 - app/views/easypay/payments/complete.html.erb
 - config/routes.rb