tfso 0.8.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 580629da3765be6e48e898bf68d9651b57f37e0fa0d56708dd51f324d9321a99
-  data.tar.gz: 941191ba3f192dba0362533cfd3a22e7011ff16c3773b566c6d8b9633fc37cc4
+  metadata.gz: 655776d30e65157f5da6a45cbb25ff130a8e4f4fd4eb1924b8f3b61084270c99
+  data.tar.gz: a547429273d8d60d1f6a771ba8a5b05518ff3eeab26324a8c9cd5dbe14638fcb
 SHA512:
-  metadata.gz: 71c2a1ce1d322a7288146efd09e4654b7a23a0ad6896329f6f037920721488bed49c2029ba58595f75644cd7ff542aad934ae6badfc62387629b19175d291337
-  data.tar.gz: df5bbb911873323fe5f9b2856920d6bdc61313729a2b972f110d74a33dcd2e11fcb35eb8fec36573d3930c93be9c02b17bcc942cc947ec9d28ccf1ca83643017
+  metadata.gz: 174bc898b4f0f6cb434a16c2d6ac73b2bcfbe53202cdaf41f358495f12278319f4cb530b229095ba53b87d08c50aed913d8e3597b49a899ed7880c8f26161c63
+  data.tar.gz: 2d738c2860fe67bf2e579c195b747109b788e41fa8b9a0e546eeb35805ff28fe384e5df5fce77f8f67a2c87bca5f05e76b0924ec963664ec2d283c88b0f91f52

data/lib/tfso.rb

@@ -1,9 +1,11 @@
 require 'savon'
-require "tfso/version"
+require 'tfso/version'
 require 'tfso/helpers'
+require 'tfso/errors'
 require 'tfso/authentication'
 require 'tfso/client'
 require 'tfso/company'
 require 'tfso/invoice'
 require 'tfso/payment'
-require 'tfso/product'
+require 'tfso/product'
+require 'tfso/person'

data/lib/tfso/authentication.rb

@@ -14,17 +14,19 @@ module TFSO
     end
 
     def authenticated?
-      response = savon_client.call(:has_session, cookies: @cookies )
+      response = savon_client.call(:has_session, cookies: @cookies)
+      raise Errors::Authentication, 'Not authenticated' if !response.body[:has_session_response][:has_session_result]
       response.body[:has_session_response][:has_session_result]
     end
 
     def authenticate(username, password, identity_id = nil)
-      response = savon_client.call(:login, message: { credential: {Username: username, Password: password, IdentityId: identity_id, ApplicationId: application_id} })
+      response = savon_client.call(:login, message: { credential: {Username: username, Password: password, IdentityId: identity_id, ApplicationId: application_id}})
+      raise Errors::Authentication, 'Incorrect credentials' if response.body[:login_response][:login_result].blank?
       self.session_id = response.body[:login_response][:login_result]
     end
 
     def identities
-      response = savon_client.call(:get_identities, cookies: @cookies )
+      response = savon_client.call(:get_identities, cookies: @cookies)
       list = response.body[:get_identities_response][:get_identities_result][:identity]
       if list.is_a?(Hash)
         [list]

data/lib/tfso/client.rb

@@ -6,12 +6,13 @@ module TFSO
     URL = 'https://api.24sevenoffice.com/Client/V001/ClientService.asmx?WSDL'
 
     def initialize(auth)
+      ensure_authenticated(auth)
       self.session_id = auth.session_id
       intialize_savon_client
     end
 
     def type_groups(module_type)
-      response = savon_client.call(:get_type_group_list, message: {module_type: module_type }, cookies: @cookies)
+      response = savon_client.call(:get_type_group_list, message: {module_type: module_type}, cookies: @cookies)
       response.body[:get_type_group_list_response][:get_type_group_list_result]
     end
 

data/lib/tfso/company.rb

@@ -6,12 +6,13 @@ module TFSO
     URL = 'https://api.24sevenoffice.com/CRM/Company/V001/CompanyService.asmx?wsdl'
 
     def initialize(auth)
+      ensure_authenticated(auth)
       self.session_id = auth.session_id
       intialize_savon_client
     end
 
     def find(search_params)
-      response = savon_client.call(:get_companies, message: {searchParams: search_params, returnProperties: {string: ['Id', 'OrganizationNumber', 'NickName', 'Country', 'Addresses', 'EmailAddresses', 'PhoneNumbers', 'InvoiceLanguage', 'TypeGroup', 'DistributionMethod', 'Currency'] } }, cookies: @cookies)
+      response = savon_client.call(:get_companies, message: {searchParams: search_params, returnProperties: {string: ['Id', 'OrganizationNumber', 'NickName', 'Country', 'Addresses', 'EmailAddresses', 'PhoneNumbers', 'InvoiceLanguage', 'TypeGroup', 'DistributionMethod', 'Currency']}}, cookies: @cookies)
       result = response.body[:get_companies_response][:get_companies_result]
       if result
         if result[:company].class == Hash
@@ -35,7 +36,7 @@ module TFSO
     end
 
     def create(company_info)
-      response = savon_client.call(:save_companies, message: {companies: [{Company: company_info}] }, cookies: @cookies)
+      response = savon_client.call(:save_companies, message: {companies: [{Company: company_info}]}, cookies: @cookies)
       result = response.body[:save_companies_response][:save_companies_result]
       if result
         if result[:company].class == Hash
@@ -53,6 +54,7 @@ module TFSO
     end
 
     def transform_attributes(company)
+      company.compact!
       company[:EmailAddresses] ||= []
       company[:PhoneNumbers] ||= []
       company[:Addresses] ||= []
@@ -70,24 +72,28 @@ module TFSO
             :Value => company.delete(:billing_email)
           }
         }
+        company.delete(:billing_email)
       end
       if company[:email]
         company[:EmailAddresses] << {:Work => {
             :Value => company.delete(:email)
           }
         }
+        company.delete(:email)
       end
       if company[:phone_number]
         company[:PhoneNumbers] << {:Work => {
             :Value => company.delete(:phone_number)
           }
         }
+        company.delete(:phone_number)
       end
       if company[:mobile_phone_number]
         company[:PhoneNumbers] << {:Mobile => {
             :Value => company.delete(:mobile_phone_number)
           }
         }
+        company.delete(:mobile_phone_number)
       end
       if company[:billing_address]
         address = {
@@ -104,13 +110,13 @@ module TFSO
         company.delete(:billing_address)
       end
       if company[:tfso]
-        company[:tfso].keys.each{|k| company[k] = company[:tfso].delete(k) }
+        company[:tfso].keys.each{|k| company[k] = company[:tfso].delete(k)}
         company.delete(:tfso)
       end
 
       mappings = {:name => :Name, :nickname => :NickName, :gov_no => :OrganizationNumber, :country_code => :Country}
 
-      company.keys.each { |k| company[ mappings[k] ] = company.delete(k) if mappings[k] }
+      company.keys.each {|k| company[ mappings[k] ] = company.delete(k) if mappings[k]}
       company
     end
 

data/lib/tfso/errors.rb

@@ -0,0 +1,5 @@
+module TFSO
+  module Errors
+    class Authentication < StandardError; end
+  end
+end

data/lib/tfso/helpers.rb

@@ -1,15 +1,20 @@
 module TFSO
 
   module Helpers
+
     def intialize_savon_client
       @savon_client = Savon.client(wsdl: self.class::URL, convert_request_keys_to: :none)
-      if defined?(Rails) && Rails.env.development?
+      if ENV['RACK_ENV'] == 'test' || defined?(Rails) && Rails.env.development?
         @savon_client.globals.proxy('http://localhost:8080')
         @savon_client.globals.ssl_verify_mode(:none)
       end
       @savon_client.globals.unwrap(true)
     end
 
+    def ensure_authenticated(auth)
+      auth.authenticated?
+    end
+
     def savon_client
       @savon_client
     end

data/lib/tfso/invoice.rb

@@ -6,6 +6,7 @@ module TFSO
     URL = 'https://api.24sevenoffice.com/Economy/InvoiceOrder/V001/InvoiceService.asmx?wsdl'
 
     def initialize(auth)
+      ensure_authenticated(auth)
       self.session_id = auth.session_id
       intialize_savon_client
     end
@@ -41,11 +42,13 @@ module TFSO
     end
 
     def create(order_attributes)
-      response = savon_client.call(:save_invoices, message: {invoices: [{InvoiceOrder: order_attributes }] }, cookies: @cookies)
+      response = savon_client.call(:save_invoices, message: {invoices: [{InvoiceOrder: order_attributes}] }, cookies: @cookies)
       response.body[:save_invoices_response][:save_invoices_result][:invoice_order]
     end
 
     def transform_attributes(invoice, items)
+      invoice.compact!
+      items.compact!
       state = case invoice[:state]
       when :invoice
         'Invoiced'
@@ -90,14 +93,22 @@ module TFSO
       if items.any?
         invoiceRows = []
         items.each {|item|
-          invoiceRows << {
-            ProductId: item[:product_id],
-            Name: item[:description],
-            Price: item[:price].to_f,
-            Quantity: item[:quantity].to_f
-          }
+          if item[:type] == :text
+            invoiceRows << {:InvoiceRow => {
+              Type: 'Text',
+              Name: item[:name]
+            }}
+          else
+            invoiceRows << {:InvoiceRow => {
+              Type: 'Normal',
+              ProductId: item[:product_id],
+              Name: item[:name],
+              Price: item[:price].to_f,
+              Quantity: item[:quantity].to_f
+            }}
+          end
         }
-        invoice_info[:InvoiceRows] = { :InvoiceRow => invoiceRows }
+        invoice_info[:InvoiceRows] = invoiceRows
       end
       invoice_info
     end

data/lib/tfso/payment.rb

@@ -6,12 +6,13 @@ module TFSO
     URL = 'https://api.24sevenoffice.com/Economy/InvoiceOrder/V001/PaymentService.asmx?WSDL'
 
     def initialize(auth)
+      ensure_authenticated(auth)
       self.session_id = auth.session_id
       intialize_savon_client
     end
 
     def create(payment_info)
-      response = savon_client.call(:register_invoice_payment, message: {payment: payment_info }, cookies: @cookies)
+      response = savon_client.call(:register_invoice_payment, message: {payment: payment_info}, cookies: @cookies)
       response.body[:register_invoice_payment_response][:register_invoice_payment_result]
     end
 

data/lib/tfso/person.rb

@@ -0,0 +1,47 @@
+module TFSO
+  class Person
+
+    include TFSO::Helpers
+
+    URL = 'https://webservices.24sevenoffice.com/CRM/Contact/PersonService.asmx?WSDL'
+
+    def initialize(auth)
+      ensure_authenticated(auth)
+      self.session_id = auth.session_id
+      intialize_savon_client
+    end
+
+    def find(search_params={})
+      response = savon_client.call(:get_persons, message: {personSearch: search_params}, cookies: @cookies)
+      result = response.body[:get_persons_response][:get_persons_result]
+      if result
+        if result[:person_item].class == Hash
+          [result[:person_item]]
+        else
+          result[:person_item]
+        end
+      else
+        []
+      end
+    end
+
+    def create(person_info)
+      response = savon_client.call(:save_person, message: {personItem: person_info}, cookies: @cookies)
+      result = response.body[:save_person_response][:save_person_result]
+      if result
+        if result.class == Hash
+          if result[:api_exception]
+            raise "Error when saving tfso person"
+          else
+            result
+          end
+        else
+          result
+        end
+      else
+        false
+      end
+    end
+
+  end
+end

data/lib/tfso/product.rb

@@ -6,6 +6,7 @@ module TFSO
     URL = 'https://api.24sevenoffice.com/Logistics/Product/V001/ProductService.asmx?WSDL'
 
     def initialize(auth)
+      ensure_authenticated(auth)
       self.session_id = auth.session_id
       intialize_savon_client
     end
@@ -30,6 +31,5 @@ module TFSO
       end
     end
 
-
   end
 end

data/lib/tfso/version.rb

@@ -1,3 +1,3 @@
 module TFSO
-  VERSION = "0.8.0"
+  VERSION = '0.14.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tfso
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Espen Antonsen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - espen@inspired.no
 executables: []
@@ -99,9 +99,11 @@ files:
 - lib/tfso/authentication.rb
 - lib/tfso/client.rb
 - lib/tfso/company.rb
+- lib/tfso/errors.rb
 - lib/tfso/helpers.rb
 - lib/tfso/invoice.rb
 - lib/tfso/payment.rb
+- lib/tfso/person.rb
 - lib/tfso/product.rb
 - lib/tfso/version.rb
 - tfso.gemspec
@@ -109,7 +111,7 @@ homepage: https://github.com/espen/tfso
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,8 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: Ruby API Wrapper for 24SevenOffice.
 test_files: []