account.rb in 360_services-1.0.2

- old
+ new

@@ -1,10 +1,10 @@
 module Sorenson
   module Services
     class Account < Base
       attr_accessor :rate_plan, :username, :status, :customer_id, :id, :rate_plan_expiration_date, :date_last_modified, 
-                    :last_login_time, :date_retrieved, :total_asset_count, :token, :subaccount_id
+                    :last_login_time, :date_retrieved, :total_asset_count, :token, :subaccount_id, :session_id
       cattr_accessor :account_token, :account_id
       
       def self.login(username, password)
         data = JSON.parse(login_no_resource(username, password))
         account = Account.new(data)
@@ -33,11 +33,11 @@
       def empty_trash
         Base.post_to("/accounts/#{account_id}/empty_trash")['status']
       end
       
       def get_subaccounts
-        get_from("/subaccounts")
+        Base.get_from("/subaccounts")
       end
       
       def create_subaccount(username, email, password)
         Base.post_to("/subaccounts", :subaccount => {:username => username, :email => email, :password => password})
       end
@@ -45,10 +45,11 @@
       def initialize(data)
         self.username                  = data['username']
         self.status                    = data['status']
         self.customer_id               = data['id']
         self.id                        = data['id']
-        self.subaccount_id             = data['subaccountId']
+        self.subaccount_id             = data['subaccount_id']
+        self.session_id                = data['session_id']
         self.rate_plan_expiration_date = data['rate_plan_expiration_date']
         self.date_last_modified        = data['date_last_modified']
         self.last_login_time           = data['last_login_time']
         self.date_retrieved            = data['date_retrieved']
         self.total_asset_count         = data['total_asset_count']
\ No newline at end of file