lib/nitro_pay/transaction.rb in nitro_pay-1.0.9 vs lib/nitro_pay/transaction.rb in nitro_pay-1.0.10

@@ -60,12 +60,11 @@
       self.resp
     end
 
     # Update the recurrence amount
     def update_subscription(tid=nil, full_resp=false)
-      # SetUp
-      self.recurrent_tid = tid if tid
+      setup_tid(tid)
       self.path = "transactions/#{self.recurrent_tid}/subscription"
 
       # Perform the request
       full_resp ? self.resp = self.put_request : self.resp = self.put_json_request
 
@@ -73,12 +72,11 @@
       self.resp
     end
 
     # Stop a recurrence based on it transaction tid
     def unsubscribe(tid=nil, full_resp=false)
-      # SetUp
-      self.recurrent_tid = tid if tid
+      setup_tid(tid)
       self.path = "transactions/#{self.recurrent_tid}/subscription/unsubscribe"
 
       # Perform the request
       full_resp ? self.resp = self.delete_request : self.resp = self.delete_json_request
 
@@ -86,12 +84,11 @@
       self.resp
     end
 
     # Return the payments executed for the purchase passed
     def payment_history(tid=nil, full_resp=false)
-      # SetUp
-      self.recurrent_tid = tid if tid
+      setup_tid(tid)
       self.path = "transactions/#{self.recurrent_tid}/subscription/payment_history"
       self.path = "#{self.path}#{self.request_params.it_keys_to_get_param}"
 
       # Perform the request
       full_resp ? self.resp = self.get_request : self.resp = self.get_json_request
@@ -100,12 +97,11 @@
       self.resp
     end
 
     # Check if a subscription is up-to-date or have any pending
     def up_to_date(tid=nil, full_resp=false)
-      # SetUp
-      self.recurrent_tid = tid if tid
+      setup_tid(tid)
 
       # Create/customize the path & add the auth as param
       self.path = "transactions/#{self.recurrent_tid}/subscription/up-to-date"
       self.path = "#{self.path}#{self.request_params.it_keys_to_get_param}"
 
@@ -117,9 +113,14 @@
     end
 
     # return it hash resp when resp is a string
     def hash_resp
       self.resp.is_a?(String) ? JSON.parse(self.resp).it_keys_to_sym : self.resp
+    end
+
+    # Set it TID up
+    def setup_tid(tid)
+      tid ? self.recurrent_tid = tid : self.recurrent_tid = get_global_subscription[:tid]
     end
 
     # ================ STATIC methods ================
     # GET /api/transactions/:tid by the tid passed
     def self.find(tid)
\ No newline at end of file