Skip to content

Commit

Permalink
Merge branch 'freerunningtech-return-image-data'
Browse files Browse the repository at this point in the history
  • Loading branch information
mattsears committed Jun 8, 2014
2 parents 3547329 + 46159a0 commit 5c40b23
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions lib/stamps/mapping.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ class Credentials < Hashie::Trash
property :Username, :from => :username
property :Password, :from => :password
end

class PostageBalance < Hashie::Trash
property :AvailablePostage, :from => :available_postage
property :ControlTotal, :from => :control_total
property :ControlTotal, :from => :control_total
end

class GetPostageStatus < Hashie::Trash
property :TransactionID, :from => :transaction_id
end
Expand Down Expand Up @@ -134,6 +134,7 @@ class Stamp < Hashie::Trash
property :rotationDegrees, :from => :rotation
property :printMemo, :from => :print_memo
property :nonDeliveryOption, :from => :non_delivery_option
property :ReturnImageData, :from => :return_image_data

# Maps :from to Address map
def from=(val)
Expand Down Expand Up @@ -206,7 +207,7 @@ class PurchasePostage < Hashie::Trash
property :PurchaseAmount, :from => :amount
property :ControlTotal, :from => :control_total
end

class GetPurchaseStatus < Hashie::Trash
property :Authenticator, :from => :authenticator
property :TransactionID, :from => :transaction_id
Expand Down

0 comments on commit 5c40b23

Please sign in to comment.