tappay_ruby 0.4.2 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a31a7dd2dae54e34e6cb67c26d2063bb55ee28a313c87164ff362ff0b3cff405
-  data.tar.gz: 8103f3a1bb11d48a7781a735eeba2afc75bb4a6b1d2d2d590b1bd3dcb211fc63
+  metadata.gz: 42349c6d543ca1fa3a3bf6ead0e0f6eb9f281c80b28d35811058d2661d084f10
+  data.tar.gz: 82da8ed41bed6cfa50845bf8d9751fb796e8c2373e7978c9e60d35d560c2ccb8
 SHA512:
-  metadata.gz: d575276fde2cb8fcb25404efb44b504079075243c9c72293825edb967e0f97a418a65928fc94f69a120ae7c664528038e941ad9332d9b7abcee4d3313fbd85e1
-  data.tar.gz: 8f3851d3008f156ecf7c63b9ae4d24ff79604271b2d056d662c24bc4183a7c97187cdb5d4540d16e989789af9e3bf226a63756d8d4b0c750326f3a2586f11891
+  metadata.gz: bfd22c013a32a3aa5c13bc28c84d94e21f49cdaf71657b6f7cf39e2c0240cff23fe61db6b396ccbb02cdf0571802318689b022bc796e4253ea799bc3837c1898
+  data.tar.gz: 4878db49a06c88e21fc6a5affa06eed404bf2a90feaaa82921824ad27a280977caafe05d945765a43ca21cba41dba78bf52d6bd7cbdf8d59706a62207accacc3

data/README.md

@@ -52,13 +52,40 @@ Tappay.configure do |config|
   # Common settings
   config.partner_key = 'your_partner_key'.freeze
   config.app_id = 'your_app_id'.freeze
+
+  # Merchant settings (use either merchant_id or merchant_group_id, not both)
   config.merchant_id = 'your_merchant_id'.freeze
+  # OR
+  config.merchant_group_id = 'your_merchant_group_id'.freeze
+
   config.instalment_merchant_id = 'your_instalment_merchant_id'.freeze
   config.currency = 'TWD'.freeze
   config.vat_number = 'your_vat_number'.freeze
 end
 ```
 
+### Merchant ID Configuration
+
+The gem supports two types of merchant identification:
+1. `merchant_id`: Individual merchant ID
+2. `merchant_group_id`: Group merchant ID
+
+Important rules:
+- You can set either `merchant_id` or `merchant_group_id` in the configuration, but not both
+- When making a payment, you can override the configured merchant ID by providing either `merchant_id` or `merchant_group_id` in the payment options
+- If you provide merchant ID in the payment options, it will take precedence over any configuration
+
+Example of overriding merchant ID in payment:
+```ruby
+# Using merchant_group_id in payment options
+result = Tappay::CreditCard::Pay.by_prime(
+  prime: 'prime_from_tappay_sdk',
+  amount: 100,
+  merchant_group_id: 'group_123',  # This will be used instead of configured merchant_id
+  order_number: 'ORDER-123'
+)
+```
+
 ### 2. Using Environment Variables
 
 For better security, you can use environment variables:
@@ -138,6 +165,38 @@ result = Tappay::CreditCard::Pay.by_prime(
 
 Both approaches are valid and will work the same way. The CardHolder object provides a more structured way to handle cardholder information and includes validation.
 
+## Payment URL
+
+When processing payments, the API response may include a `payment_url` field. This URL is used for redirecting users to complete their payment in scenarios such as:
+
+- 3D Secure verification
+- LINE Pay payment page
+- JKO Pay payment page
+
+Note: payment_url is not supported for:
+- Apple Pay
+- Google Pay
+- Samsung Pay
+
+Example of handling payment URL in response:
+```ruby
+result = Tappay::CreditCard::Pay.by_prime(
+  prime: 'prime_from_tappay_sdk',
+  amount: 100,
+  order_number: 'ORDER-123'
+)
+
+if result['status'] == 0
+  if result['payment_url']
+    # Redirect user to payment page for:
+    # - 3D Secure verification
+    # - LINE Pay payment
+    # - JKO Pay payment
+    redirect_to result['payment_url']
+  end
+end
+```
+
 ## Usage
 
 ### Pay by Prime
@@ -165,6 +224,11 @@ if result['status'] == 0
     card_token = result['card_secret']['card_token']
     # Store card_key and card_token securely for future payments
   end
+  
+  # Handle payment URL if present (for 3D Secure, LINE Pay, JKO Pay)
+  if result['payment_url']
+    redirect_to result['payment_url']
+  end
 end
 ```
 
@@ -213,6 +277,11 @@ begin
     number_of_instalments = instalment_info['number_of_instalments']
     first_payment = instalment_info['first_payment']
     each_payment = instalment_info['each_payment']
+
+    # Handle payment URL if present (for 3D Secure)
+    if result['payment_url']
+      redirect_to result['payment_url']
+    end
   end
 rescue Tappay::PaymentError => e
   # Handle payment error

data/lib/tappay/configuration.rb

@@ -1,11 +1,11 @@
 module Tappay
   class Configuration
-    attr_accessor :partner_key, :merchant_id, :instalment_merchant_id, :app_id, :currency, :vat_number
+    attr_accessor :partner_key, :merchant_id, :merchant_group_id, :instalment_merchant_id, :app_id, :currency, :vat_number
     attr_writer :api_version
 
     def initialize
       @mode = :sandbox
-      @api_version = '2'
+      @api_version = '3'
     end
 
     def api_version

data/lib/tappay/credit_card/pay.rb

@@ -17,18 +17,50 @@ module Tappay
       end
 
       def payment_data
+        # Check configuration conflicts first
+        if Tappay.configuration.merchant_group_id && Tappay.configuration.merchant_id
+          raise Tappay::ValidationError, "merchant_group_id and merchant_id cannot be used together"
+        end
+
+        # Get values from options
+        opt_group_id = options[:merchant_group_id]
+        opt_merchant_id = options[:merchant_id]
+
+        # Check for conflicts in options
+        if opt_group_id && opt_merchant_id
+          raise Tappay::ValidationError, "merchant_group_id and merchant_id cannot be used together"
+        end
+
+        # If options has any ID, use it exclusively
+        if opt_group_id || opt_merchant_id
+          merchant_group_id = opt_group_id
+          merchant_id = opt_merchant_id
+        else
+          # If no options, use configuration
+          merchant_group_id = Tappay.configuration.merchant_group_id
+          merchant_id = Tappay.configuration.merchant_id
+        end
+
+        # Check if at least one is provided
+        unless merchant_group_id || merchant_id
+          raise Tappay::ValidationError, "Either merchant_group_id or merchant_id must be provided"
+        end
+
         {
           partner_key: Tappay.configuration.partner_key,
-          merchant_id: options[:merchant_id] || Tappay.configuration.merchant_id,
           amount: options[:amount],
           details: options[:details],
           currency: options[:currency] || 'TWD',
           order_number: options[:order_number],
           three_domain_secure: options[:three_domain_secure] || false
         }.tap do |data|
+          if merchant_group_id
+            data[:merchant_group_id] = merchant_group_id
+          else
+            data[:merchant_id] = merchant_id
+          end
           data[:cardholder] = card_holder_data if options[:cardholder]
           data[:instalment] = options[:instalment] if options[:instalment]
-          data[:payment_url] = options[:payment_url] if options[:payment_url]
         end
       end
 

data/lib/tappay/version.rb

@@ -1,3 +1,3 @@
 module Tappay
-  VERSION = "0.4.2"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tappay_ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.1
 platform: ruby
 authors:
 - Zac