veritrans 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 94a85d7ba51b28218640ca1b7c1cdc0f693832fa
-  data.tar.gz: 6c3d583110c07af03ccf8f36d86f054729684c53
+  metadata.gz: 4a017d4aab2833fbc4ba25a649fe9a00d93eec35
+  data.tar.gz: bafcedb6c0a86d539747f90596e51a11766bb431
 !binary "U0hBNTEy":
-  metadata.gz: 4348ab2ea7d56a63a402f8b810b8e825c9a11859003d79e45a54d217a584467f5fb2fb965eb82c295572a299a5f50a64cfac5e6a812291c308a1e608b95dfe82
-  data.tar.gz: 59477c929e6df819d8794d628a8c956e378bcae3e95df8842e3d7327cde58ccbed92e065901e236ccbdf92ddc6d8dbc54f6d525b14411725a3148b4f8ddd1f21
+  metadata.gz: f4e0013cacbaabe14522d6e111982c6171d4955e7c25fe8b281a79096f0998f660fa20fc257d02dd626bf68837373df3daf021f382dce58ccc2477d54d90c6b5
+  data.tar.gz: 75430bc2305e45fb21c423d7ac8017456b54214bc305b83f9dd397180389e2aafcb59f5b4f236f9836879b3284584a5edd89abaf2149e90f6cb6910f59e7a476

data/lib/veritrans/client.rb

@@ -117,7 +117,11 @@ module Veritrans
       delete_keys
       @resp[:url] = @resp[:url].to_s
 
-      @token = parse_body(@resp[:body])
+      if version.to_i == 1
+        @token = JSON.parse(@resp[:body])
+      else        
+        @token = parse_body(@resp[:body])
+      end
     end
 
     # :nodoc:
@@ -194,12 +198,16 @@ module Veritrans
     end
 
     private
-
+    # Generate merchant hash code
     def merchanthash
-      # Generate merchant hash code
-      return HashGenerator::generate(merchant_id, merchant_hash_key, settlement_type, order_id);
+      if version.to_i == 1    
+        return HashGenerator::generate(merchant_hash_key, merchant_id, order_id);
+      else
+        return Digest::SHA512.hexdigest("#{merchant_hash_key},#{merchant_id},01,#{order_id},#{gross_amount}")
+      end
     end
 
+    # deprecated
     def parse_body(body)
       arrs = body.split("\r\n")
       arrs = arrs[-2,2] if arrs.length > 1

data/lib/veritrans/hash_generator.rb

@@ -3,17 +3,17 @@ module Veritrans
 
   # :nodoc:
   module HashGenerator
-
     # Generate hash using SHA-512.
     #
     # Parameters:
-    # * <tt>[String]merchant_id</tt> - Merchant ID
-    # * <tt>[String]merchant_hash_key</tt> - Merchant Hash key
+    # * <tt>[String]merchant_hash_key</tt> - Merchant Hash key    
+    # * <tt>[String]merchant_id</tt> - Merchant ID  
     # * <tt>[String]settlement_method</tt> - '01' Credit Card
     # * <tt>[String]order_id</tt> 
     # * <tt>[String]amount</tt> 
-    def self.generate(merchant_id, merchant_hash_key, settlement_method, order_id)
-      Digest::SHA512.hexdigest("#{merchant_hash_key},#{merchant_id},#{settlement_method},#{order_id}")
+    def self.generate(merchant_hash_key, merchant_id, order_id)
+      return Digest::SHA512.hexdigest("#{merchant_hash_key},#{merchant_id},#{order_id}")
     end
+
   end
 end

data/lib/veritrans/post_data.rb

@@ -134,7 +134,8 @@ module Veritrans
       :promo_id,
       :promo_bins,
       :enable_3d_secure,
-      :bank
+      :bank,
+      :version
     ]
 
     # +:merchant_id,+ 
@@ -147,8 +148,7 @@ module Veritrans
       :merchanthash,
       :finish_payment_return_url,
       :unfinish_payment_return_url,
-      :error_payment_return_url,
-      :new_api
+      :error_payment_return_url
     ]
 
     # Params are the combination of this group:

data/lib/veritrans/version.rb

@@ -24,7 +24,7 @@ module Veritrans
 
 			# :nodoc:
 			def patch
-				5
+				6
 			end
 
 			# :nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: veritrans
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Veritrans Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: veritrans
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Veritrans Webclient wrapper