veritrans 1.1.3 → 1.2.0

data/lib/generators/install_generator.rb

@@ -8,14 +8,29 @@
 
         desc <<DESC
 Description:
+  Copy veritrans.yml template need for veritrans weblinktype payment:
+  - config/veritrans.yml 
+DESC
+
+        def create_or_update_config_files
+          path = __FILE__.sub(__FILE__.split('/').pop,'templates/config/')
+          create_file("config/veritrans.yml",IO.read("#{path}veritrans.yml"))
+        end
+
+      end
+
+      class SampleGenerator < ::Rails::Generators::Base
+
+        desc <<DESC
+Description:
   Copy templates need for veritrans weblinktype payment:
-  0. app/controllers/merchant_controller.rb + views
-  1. app/controllers/veritrans_controller.rb + views
-  2. config/veritrans.yml 
-  3. config/routes.rb
+  - app/controllers/merchant_controller.rb + views
+  - app/controllers/veritrans_controller.rb + views
+  - config/veritrans.yml 
+  - config/routes.rb
 DESC
         def create_controller_file
-          acts = "app/controllers/"
+          acts = "app/controllers/vtlink/"
           path = __FILE__.sub(__FILE__.split('/').pop,"templates/#{acts}")
           create_file("#{acts}merchant_controller.rb", IO.read("#{path}merchant_controller.rb"))
           create_file("#{acts}veritrans_controller.rb",IO.read("#{path}veritrans_controller.rb"))
@@ -26,11 +41,11 @@ DESC
           path = __FILE__.sub(__FILE__.split('/').pop,"templates/#{acts}")
           create_file("#{acts}layout_auto_post.html.erb",IO.read("#{path}layout_auto_post.html.erb" ))
 
-          acts = "app/views/merchant/"
+          acts = "app/views/vtlink/merchant/"
           path = __FILE__.sub(__FILE__.split('/').pop,"templates/#{acts}")
           create_file("#{acts}checkout.html.erb",IO.read("#{path}checkout.html.erb" ))
 
-          acts = "app/views/veritrans/"
+          acts = "app/views/vtlink/veritrans/"
           path = __FILE__.sub(__FILE__.split('/').pop,"templates/#{acts}")
           create_file("#{acts}confirm.html.erb", IO.read("#{path}confirm.html.erb"))
           create_file("#{acts}cancel.html.erb",  IO.read("#{path}cancel.html.erb" ))
@@ -45,12 +60,14 @@ DESC
         end
 
         def update_routes
-          route("match 'checkout' => 'merchant#checkout', :via => :get  # show checkout form")
-          route("match 'confirm'  => 'veritrans#confirm', :via => :post # pay-confirmation autosubmit to veritrans server")
-          route("match 'cancel'   => 'veritrans#cancel',  :via => :post # canceling transaction redirect back to merchant-web")
-          route("match 'pay'      => 'veritrans#pay',     :via => :post # server to server pay-notification to merchant-web")
-          route("match 'finish'   => 'veritrans#finish',  :via => :post # successfull transaction redirect back to merchant-web")
-          route("match 'error'    => 'veritrans#error',   :via => :post # error transaction redirect back to merchant-web")
+          route("end")
+          route("  match '/' => 'merchant#checkout', :via => :get  # show checkout form")
+          route("  match 'confirm'  => 'veritrans#confirm', :via => :post # pay-confirmation autosubmit to veritrans server")
+          route("  match 'cancel'   => 'veritrans#cancel',  :via => :post # canceling transaction redirect back to merchant-web")
+          route("  match 'pay'      => 'veritrans#pay',     :via => :post # server to server pay-notification to merchant-web")
+          route("  match 'finish'   => 'veritrans#finish',  :via => :post # successfull transaction redirect back to merchant-web")
+          route("  match 'error'    => 'veritrans#error',   :via => :post # error transaction redirect back to merchant-web")
+          route("namespace :vtlink do")
         end
  
         hook_for :test_framework

data/lib/generators/templates/app/controllers/vtlink/merchant_controller.rb

@@ -0,0 +1,7 @@
+class Vtlink::MerchantController < ApplicationController
+
+  # show checkout-form 
+  def checkout
+  end
+  
+end

data/lib/generators/templates/app/controllers/{veritrans_controller.rb → vtlink/veritrans_controller.rb}

@@ -1,4 +1,4 @@
-class VeritransController < ApplicationController
+class Vtlink::VeritransController < ApplicationController
 
   # post action after user submit checkout-form 
   # Ex POST:
@@ -6,14 +6,14 @@ class VeritransController < ApplicationController
   #  "commodity"=>[
   #    {
   #    "COMMODITY_ID"    => "Espirit", 
-  #    "COMMODITY_UNIT"  => "500000",
-  #    "COMMODITY_NUM"   => "4",
+  #    "COMMODITY_QTY"   => "4",
+  #    "COMMODITY_PRICE" => "500000",
   #    "COMMODITY_NAME1" => "Espirit"
   #    },
   #    {
   #    "COMMODITY_ID"    => "Tablet", 
-  #    "COMMODITY_UNIT"  => "2500000",
-  #    "COMMODITY_NUM"   => "2",
+  #    "COMMODITY_QTY"   => "2",
+  #    "COMMODITY_PRICE" => "2500000",
   #    "COMMODITY_NAME1" => "Tablet"
   #    }]}
   # Return from get_keys: 
@@ -27,19 +27,20 @@ class VeritransController < ApplicationController
     client.gross_amount = params["gross_amount"]
     client.commodity    = params["commodity"]
 
-    client.customer_specification_flag = "1" #'1':Different Address with shipping
-    client.shipping_flag = "0"               #'0':Not required shipping address
-
-    client.first_name    = "Sam"
-    client.last_name     = "Anthony"
-    client.address1      = "Buaran I" 
-    client.address2      = "Pulogadung"
-    client.city          = "Jakarta"
-    client.country_code  = "IDN"
-    client.postal_code   = "16954"
-    client.phone         = "0123456789123"
-    client.email         = "sam.anthony@gmail.com" # pay-notification email
-  # client.promo_id      = "PROMO_MERCHANT_NAME" #if there is a join-promo w/ CC issuer
+    client.billing_address_different_with_shipping_address = "1" #'1':Different Address with shipping
+    client.required_shipping_address = "1"                       #'0':Not required shipping address
+
+    client.shipping_first_name   = "Sam"
+    client.shipping_last_name    = "Anthony"
+    client.shipping_address1     = "Buaran I" 
+    client.shipping_address2     = "Pulogadung"
+    client.shipping_city         = "Jakarta"
+    client.shipping_country_code = "IDN"
+    client.shipping_postal_code  = "16954"
+    client.shipping_phone        = "0123456789123"
+
+    client.email    = "sam.anthony@gmail.com" # pay-notification email
+  # client.promo_id = "PROMO_MERCHANT_NAME" #if there is a join-promo w/ CC issuer
 
     client.get_keys
     @client = client

data/lib/generators/templates/app/views/vtlink/merchant/checkout.html.erb

@@ -0,0 +1,43 @@
+<%= form_tag('/vtlink/confirm', :id =>"cart_form") do -%>
+  <table border=1>
+    <tbody>
+      <tr>
+        <th>Product Info</th>
+        <th>Price</th>
+        <th align="center">Qty</th>
+        <th>Total Price</th>
+      </tr>
+      <tr>
+        <td>Red Esprint</td>
+        <td align="right">Rp 500,000</td>
+        <td align="center">4</td>
+        <td align="right">Rp 2,000,000</td>
+      </tr>
+      <tr>
+        <td>Android Tablet</td>
+        <td align="right">Rp 2,500,000</td>
+        <td align="center">2</td>
+        <td align="right">Rp 5,000,000</td>
+      </tr>
+      <tr class="subtotal">
+        <td colspan="2">
+          <input class="checkout" name="commit" type="submit" value="Checkout">
+        </td>
+        <td><strong>Subtotal:</strong></td>
+        <td align="right"><strong>Rp 7,000,000</strong></td>
+      </tr>
+    </tbody>
+  </table>
+
+  <input type="hidden" name="commodity[][COMMODITY_ID]"    value="Espirit"/>
+  <input type="hidden" name="commodity[][COMMODITY_QTY]"   value="1"/>
+  <input type="hidden" name="commodity[][COMMODITY_PRICE]" value="5000"/>
+  <input type="hidden" name="commodity[][COMMODITY_NAME1]" value="Espirit"/>
+
+  <input type="hidden" name="commodity[][COMMODITY_ID]"    value="Tablet"/>
+  <input type="hidden" name="commodity[][COMMODITY_QTY]"   value="2"/>
+  <input type="hidden" name="commodity[][COMMODITY_PRICE]" value="2500"/> 
+  <input type="hidden" name="commodity[][COMMODITY_NAME1]" value="Tablet"/>
+
+  <input type="hidden" name="gross_amount"                 value="10000"/>
+<% end %>

data/lib/generators/templates/config/veritrans.yml

@@ -1,15 +1,13 @@
 development:
   merchant_id: "test_id"
   merchant_hash_key: "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz0123456789012345678901"
-  unfinish_payment_return_url: "http://localhost/cancel"
-  finish_payment_return_url: "http://localhost/finish"
-  error_payment_return_url: "http://localhost/error"
-  # server_host: "http://192.168.10.250:80"
+  unfinish_payment_return_url: "http://path/to/cancel"
+  finish_payment_return_url: "http://path/to/finish"
+  error_payment_return_url: "http://path/to/error"
 
 production:
   merchant_id: "production_id"
   merchant_hash_key: "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz0123456789012345678901"
-  unfinish_payment_return_url: "http://mydomain/cancel"
-  finish_payment_return_url: "http://mydomain/finish"
-  error_payment_return_url: "http://mydomain/error"
-  # server_host: "http://192.168.10.250:80"
+  unfinish_payment_return_url: "http://path/to/cancel"
+  finish_payment_return_url: "http://path/to/finish"
+  error_payment_return_url: "http://path/to/error"

data/lib/veritrans/client.rb

@@ -41,10 +41,22 @@ module Veritrans
     def get_keys
       init_instance
 
+      if customer_specification_flag == "0" && shipping_flag == "0"
+        raise "required_shipping_address must be '1'"
+      end
+
       params = prepare_params(PostData::ServerParam,PostData::PostParam)
 
       if @commodity.class == Array
         commodity = @commodity.collect do |data|
+          if data.keys.index "COMMODITY_QTY"
+            data["COMMODITY_NUM"] = data["COMMODITY_QTY"]
+            data.delete "COMMODITY_QTY"
+          end
+          if data.keys.index "COMMODITY_PRICE"
+            data["COMMODITY_UNIT"] = data["COMMODITY_PRICE"]
+            data.delete "COMMODITY_PRICE"
+          end
           uri = Addressable::URI.new
           uri.query_values = data
           uri.query
@@ -117,6 +129,26 @@ module Veritrans
       return @token
     end
 
+    # :nodoc:
+    def billing_address_different_with_shipping_address
+      @customer_specification_flag
+    end
+
+    # :nodoc:
+    def billing_address_different_with_shipping_address=(flag)
+      @customer_specification_flag = customer_specification_flag
+    end
+
+    # :nodoc:
+    def required_shipping_address
+      @shipping_flag
+    end
+
+    # :nodoc:
+    def required_shipping_address=(flag)
+      @shipping_flag = flag
+    end
+
     private
 
     def merchanthash

data/lib/veritrans/post_data.rb

@@ -55,7 +55,7 @@ module Veritrans
       :postal_code,
       :phone,
       :email,
-      :customer_specification_flag
+      :customer_specification_flag # billing_address_different_with_shipping_address
     ]
 
     # +:shipping_flag,
@@ -69,7 +69,7 @@ module Veritrans
     # +:shipping_phone,
     # +:shipping_method,
     Shipping =[
-      :shipping_flag,
+      :shipping_flag, # required_shipping_address
       :shipping_first_name,
       :shipping_last_name,
       :shipping_address1,
@@ -102,12 +102,17 @@ module Veritrans
     # +:commodity_name2+ 
     PurchaseParam =[
       :commodity_id,
-      :commodity_unit,
-      :commodity_num,
+      :commodity_unit, # commodity_qty
+      :commodity_num,  # commodity_price
       :commodity_name1,
       :commodity_name2 
     ]
 
+    # AliasesParam = {
+    #     :commodity_unit => :commodity_qty,
+    #     :commodity_num  => :commodity_price
+    # }
+
     # +:order_id,+
     # +:session_id,+
     # +:merchanthash,+

data/lib/veritrans/version.rb

@@ -19,12 +19,12 @@ module Veritrans
 
 			# :nodoc:
 			def minor
-				1
+				2
 			end
 
 			# :nodoc:
 			def patch
-				3
+				0
 			end
 
 			# :nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: veritrans
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -77,15 +77,15 @@ files:
 - lib/veritrans/post_data.rb
 - lib/veritrans/version.rb
 - lib/generators/install_generator.rb
-- lib/generators/templates/app/controllers/merchant_controller.rb
-- lib/generators/templates/app/controllers/veritrans_controller.rb
+- lib/generators/templates/app/controllers/vtlink/merchant_controller.rb
+- lib/generators/templates/app/controllers/vtlink/veritrans_controller.rb
 - lib/generators/templates/app/views/layouts/layout_auto_post.html.erb
-- lib/generators/templates/app/views/merchant/checkout.html.erb
-- lib/generators/templates/app/views/veritrans/confirm.html.erb
-- lib/generators/templates/app/views/veritrans/error.html.erb
-- lib/generators/templates/app/views/veritrans/finish.html.erb
-- lib/generators/templates/app/views/veritrans/pay.html.erb
-- lib/generators/templates/app/views/veritrans/cancel.html.erb
+- lib/generators/templates/app/views/vtlink/merchant/checkout.html.erb
+- lib/generators/templates/app/views/vtlink/veritrans/confirm.html.erb
+- lib/generators/templates/app/views/vtlink/veritrans/error.html.erb
+- lib/generators/templates/app/views/vtlink/veritrans/finish.html.erb
+- lib/generators/templates/app/views/vtlink/veritrans/pay.html.erb
+- lib/generators/templates/app/views/vtlink/veritrans/cancel.html.erb
 - lib/generators/templates/config/veritrans.yml
 homepage: http://veritrans.co.id
 licenses: []
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: veritrans
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Veritrans Webclient wrapper

data/lib/generators/templates/app/controllers/merchant_controller.rb

@@ -1,7 +0,0 @@
-class MerchantController < ApplicationController
-
-  # show checkout-form 
-  def checkout
-  end
-  
-end

data/lib/generators/templates/app/views/merchant/checkout.html.erb

@@ -1,46 +0,0 @@
-<%= form_tag('/confirm', :id =>"cart_form") do -%>
-  <table border=1>
-    <tbody>
-      <tr>
-        <th>Product Image</th>
-        <th>Product Info</th>
-        <th>Price</th>
-        <th align="center">Qty</th>
-        <th>Total Price</th>
-      </tr>
-      <tr>
-        <td><img src="/assets/esprit.png" title="Esprit"></td>
-        <td>Red Esprint</td>
-        <td align="right">Rp 500,000</td>
-        <td align="center">4</td>
-        <td align="right">Rp 2,000,000</td>
-      </tr>
-      <tr>
-        <td><img src="/assets/tablet.jpg" title="Tablet"></td>
-        <td>Android Tablet</td>
-        <td align="right">Rp 2,500,000</td>
-        <td align="center">2</td>
-        <td align="right">Rp 5,000,000</td>
-      </tr>
-      <tr class="subtotal">
-        <td colspan="3">
-          <input class="checkout" name="commit" type="submit" value="Checkout">
-        </td>
-        <td><strong>Subtotal:</strong></td>
-        <td align="right"><strong>Rp 7,000,000</strong></td>
-      </tr>
-    </tbody>
-  </table>
-
-	<input type="hidden" name="commodity[][COMMODITY_ID]"    value="Espirit"/>
-	<input type="hidden" name="commodity[][COMMODITY_UNIT]"  value="500000"/>
-	<input type="hidden" name="commodity[][COMMODITY_NUM]"   value="4"/>
-	<input type="hidden" name="commodity[][COMMODITY_NAME1]" value="Espirit"/>
-
-	<input type="hidden" name="commodity[][COMMODITY_ID]"    value="Tablet"/>
-	<input type="hidden" name="commodity[][COMMODITY_UNIT]"  value="2500000"/>
-	<input type="hidden" name="commodity[][COMMODITY_NUM]"   value="2"/>
-	<input type="hidden" name="commodity[][COMMODITY_NAME1]" value="Tablet"/>
-
-	<input type="hidden" name="gross_amount"                 value="7000000"/>
-<% end %>