tappay_ruby 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e47e2732e236d1bca9d0daa16466fbff08b9c43e044ccb9020e2a505632fcf2a
-  data.tar.gz: af086bf4adf1a925fc1beb1cfc25dc3903421592b80c73e3efc8007c8a463d75
+  metadata.gz: 4ce90cd2b717fd362fe27f9823797cbda3d53aaf94edae8d57ec012d4bcceaea
+  data.tar.gz: 550b70b62f2c0d02414cbbce136900610badb978cec8b68ee36511daa4f23255
 SHA512:
-  metadata.gz: 93ab78ddbcbd031929a051fe085cd7c8b63d289e88f0defc9eb5299924795692b35145680e373c87503f893403077d0e439339cdec4b50efb9ca9d339f9e9fc9
-  data.tar.gz: 94023de9c35c2ac47265f3abf9f2beeee0659fd2c977a5ce7cc3962cdc55867b5313c115327b3f2a2b17340f737c59d42f08747e5dd722f3ad4ef5f9c0e6adf4
+  metadata.gz: c66bade29b78ca9518fd519d4cbcf91916af5d9cd20c04e96294ea6ad9967f409199b1af700e0e8011490a05cce4056d25c9ce1c351bd3b327acc6713b8bf7f5
+  data.tar.gz: eb409d49cab817ad4cb31af5fc63184ee4c6458b817026d1953ef71a71e43fd8eefd2086c269393c3f6338a3bf4dda70021be74250ef0cf377d763620fbdc4ba

data/README.md

@@ -10,9 +10,12 @@ A Ruby library for integrating with TapPay payment services. This gem provides a
 
 - Multiple payment methods:
   - Credit card payments (one-time and tokenized)
-  - Instalment payments (3 to 24 months)
+  - Instalment payments (3, 6, 12, 24 and 36 months)
   - Line Pay
   - JKO Pay
+- Flexible merchant identification:
+  - Support for both `merchant_id` and `merchant_group_id`
+  - Automatic fallback handling
 - Refund processing
 - Transaction status queries
 - Comprehensive error handling
@@ -72,6 +75,8 @@ Tappay.configure do |config|
 end
 ```
 
+Note: When both `merchant_id` and `merchant_group_id` are provided, `merchant_group_id` will be used for payment processing.
+
 ### Merchant ID Configuration
 
 The gem supports flexible merchant ID configuration:
@@ -186,6 +191,7 @@ result = Tappay::LinePay::Pay.new(
 Tappay.configure do |config|
   config.partner_key = 'YOUR_PARTNER_KEY'
   config.merchant_id = 'YOUR_MERCHANT_ID'
+  config.merchant_group_id = 'YOUR_MERCHANT_GROUP_ID' # Optional, mutually exclusive with merchant_id
   config.jko_pay_merchant_id = 'YOUR_JKO_PAY_MERCHANT_ID' # Optional, falls back to merchant_id if not set
   config.sandbox = true # Set to false for production
 end

data/lib/tappay/configuration.rb

@@ -36,7 +36,7 @@ module Tappay
 
     def validate!
       raise ValidationError, 'partner_key is required' if partner_key.nil?
-      raise ValidationError, 'merchant_id is required' if merchant_id.nil?
+      raise ValidationError, 'Either merchant_id or merchant_group_id is required' if merchant_id.nil? && merchant_group_id.nil?
     end
   end
 end

data/lib/tappay/payment_base.rb

@@ -20,48 +20,26 @@ 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
+      # Prioritize merchant_group_id from options, then configuration
+      merchant_group_id = options[:merchant_group_id] || Tappay.configuration.merchant_group_id
+      merchant_id = options[:merchant_id] || get_merchant_id
+      
+      # Determine which identifier to use
+      identifier = if merchant_group_id
+        { merchant_group_id: merchant_group_id }
       else
-        # If no options, use configuration
-        merchant_group_id = Tappay.configuration.merchant_group_id
-        merchant_id = get_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"
+        raise Tappay::ValidationError, "Either merchant_group_id or merchant_id must be provided" unless merchant_id
+        { merchant_id: merchant_id }
       end
 
-      {
+      identifier.merge({
         partner_key: Tappay.configuration.partner_key,
         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
+      }).tap do |data|
         data[:cardholder] = card_holder_data if options[:cardholder]
         data[:result_url] = options[:result_url] if options[:result_url]
         data[:instalment] = options[:instalment] || 0

data/lib/tappay/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tappay
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

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