tappay_ruby 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a31a7dd2dae54e34e6cb67c26d2063bb55ee28a313c87164ff362ff0b3cff405
-  data.tar.gz: 8103f3a1bb11d48a7781a735eeba2afc75bb4a6b1d2d2d590b1bd3dcb211fc63
+  metadata.gz: bc1badbabf5c5def08a9d4083c9d7d5914208a2d9854cabf0281741c386f2ae0
+  data.tar.gz: 82ff98a54ceb603606186c94e7bb6c9dd28173543dabc28e68cf286f84363f55
 SHA512:
-  metadata.gz: d575276fde2cb8fcb25404efb44b504079075243c9c72293825edb967e0f97a418a65928fc94f69a120ae7c664528038e941ad9332d9b7abcee4d3313fbd85e1
-  data.tar.gz: 8f3851d3008f156ecf7c63b9ae4d24ff79604271b2d056d662c24bc4183a7c97187cdb5d4540d16e989789af9e3bf226a63756d8d4b0c750326f3a2586f11891
+  metadata.gz: 7b3a89d63470d95a2d62af9a32b04048c211409a09af1a05e5c5a955a7d059e29f166c512d874a73c7f6b0af94618ed965d8b144b495e8c7df36bb17dfc528b4
+  data.tar.gz: a2f99fbd4e843b457249a455d6e711f4d52deb44469c727df30cd97666c31c64879c20990b1f9e96f395786c749a6f09527590744805568c28ddd2fe6815b5c4

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,15 +17,48 @@ 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]

data/lib/tappay/version.rb

@@ -1,3 +1,3 @@
 module Tappay
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 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.0
 platform: ruby
 authors:
 - Zac