sellsy-client 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 165af8ae3b65cccc9b2034b90bb589fb7f0161341bb4ef37f66def892cbb01c4
-  data.tar.gz: 6e64eebc0fc8c72c15a762ac87f5b3f810c419a59900195b80e295f148b7c373
+  metadata.gz: 51a9e7f54826cc77b1784e91113329ea52380c9379a9fcf7a5b425a97fb2e952
+  data.tar.gz: 7060b5b64cd943c26d916eb87ce09e8fdeb76e48ac7b83b128982c2a87415a2b
 SHA512:
-  metadata.gz: 77a2821b78be6529a6fdd1ebc03d359874f9f3fb6a0209f99395bb6ccaf7c3f4ec81f8b3e8f2c40b2491755db86e2dd2de07f2c89214b484d202bb61ae243234
-  data.tar.gz: 7c9a532fd7e3d50d61c90132c0ac35b19fb631aca78bba4aa9c7998848d35591850ff8210965aa7fdbbc1c1dfb4d7089944a537c4ebf61a46c8cd974fd6f9e58
+  metadata.gz: 3379c071310f46fb48bd06a0e1a7bd51c26108f4b54e3f09e9a5944ceb68eae009eaef2fdde0179c813d973d75339bd6d9de47bdd0c93e98027376431b71559a
+  data.tar.gz: 4d91ace6f38ddfe6d23b0dfa22fee7239b7b47729cef31d0cc00abf27905181af4c01dbf544df98213875d05a0bed79b259254b9b474570cef49b88125394dc2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sellsy-client (0.1.0)
+    sellsy-client (0.2.0)
       multi_json (~> 1.11)
       rest-client (~> 2.0, >= 2.0.2)
 

data/lib/sellsy/address.rb

@@ -2,23 +2,12 @@ require 'multi_json'
 
 module Sellsy
   class Address
-    attr_accessor :id
-    attr_accessor :part1, :town, :country_code, :linkedid, :linkedtype, :zip, :name
+    attr_accessor :id, :name, :address, :postal_code, :town, :country, :linkedid, :linkedtype
 
     def create
-      params = {
-          "name" => name,
-          "linkedtype" => linkedtype,
-          "linkedid" => linkedid,
-          "part1" => part1,
-          "zip" => zip,
-          "town" => town,
-          "countrycode" => country_code,
-      }
-
       command = {
           'method' => 'Addresses.create',
-          'params' => params
+          'params' => to_params
       }
 
       response = MultiJson.load(Sellsy::Api.request command)
@@ -42,12 +31,12 @@ module Sellsy
       if response['response']
         value = response['response']
         address.id = key
-        address.part1 = value['part1']
+        address.address = [value['part1'], value['part2'] || ''].select {|p| !p.blank?}.join("\n")
         address.town = value['town']
-        address.country_code = value['countrycode']
+        address.country = value['countrycode'].downcase unless value['countrycode'].blank?
         address.linkedid = value['linkedid']
         address.linkedtype = value['linkedtype']
-        address.zip = value['zip']
+        address.postal_code = value['zip']
       end
 
       address
@@ -67,17 +56,30 @@ module Sellsy
         response['response']['result'].each do |key, value|
           address = Address.new
           address.id = key
-          address.part1 = value['part1']
+          address.address = [value['part1'] || '', value['part2'] || ''].select {|p| !p.blank?}.join("\n")
           address.town = value['town']
-          address.country_code = value['countrycode']
+          address.country = value['countrycode'].downcase unless value['countrycode'].blank?
           address.linkedid = value['linkedid']
           address.linkedtype = value['linkedtype']
-          address.zip = value['zip']
+          address.postal_code = value['zip']
           addresses << address
         end
       end
 
       addresses
     end
+
+    def to_params
+      {
+        'name' => 'Adresse principale',
+        'part1' => @address.split(/(\r\n?)/)[0],
+        'part2' => @address.split(/(\r\n?)/)[1],
+        'zip' => @postal_code,
+        'town' => @town,
+        'countrycode' => @country.upcase,
+        "linkedtype" => linkedtype,
+        "linkedid" => linkedid
+      }
+    end
   end
 end

data/lib/sellsy/contact.rb

@@ -2,20 +2,14 @@ require 'multi_json'
 
 module Sellsy
   class Contact
-    attr_accessor :id
-    attr_accessor :name, :thirdid, :forename, :email, :position
+    attr_accessor :id, :title, :name, :first_name, :last_name, :third_id, :email, :telephone, :mobile, :fax, :website,
+                  :role, :birth_date
 
     def create
       command = {
           'method' => 'Peoples.create',
           'params' => {
-              'people' => {
-                  'name' => @name,
-                  'forename' => @forename,
-                  'email' => @email,
-                  'position' => @position,
-                  'thirdids' => [@thirdid]
-              }
+              'people' => to_params
           }
       }
 
@@ -26,11 +20,11 @@ module Sellsy
       response['status'] == 'success'
     end
 
-    def self.find(id)
+    def self.find(people_id)
       command = {
           'method' => 'Peoples.getOne',
           'params' => {
-              'id' => id
+              'id' => people_id
           }
       }
 
@@ -45,6 +39,41 @@ module Sellsy
       contact
     end
 
+    def self.find_by_contact(contact_id)
+      command = {
+          'method' => 'Peoples.getOne',
+          'params' => {
+              'thirdcontactid' => contact_id
+          }
+      }
+
+      response = MultiJson.load(Sellsy::Api.request command)
+      contact = Contact.new
+
+      if response['response']
+        value = response['response']
+        contact.id = value['id']
+      end
+
+      contact
+    end
+
+    def to_params
+      {
+        'civil' => civil_enum(@title),
+        'name' => @last_name || @name,
+        'forename' => @first_name,
+        'email' => @email,
+        'tel' => @telephone,
+        'fax' => @fax,
+        'mobile' => @mobile,
+        'web' => @website,
+        'position' => @role,
+        'birthdate' => @birth_date.blank? ? '' : Date.parse(@birth_date).to_datetime.to_i,
+        'thirdids' => @third_id.blank? ? nil : [@third_id]
+      }
+    end
+
     def get_addresses
       command = {
           'method' => 'Peoples.getAddresses',
@@ -63,5 +92,18 @@ module Sellsy
 
       client
     end
+
+    private
+
+    def civil_enum(val)
+      case val
+      when 'M.'
+        'man'
+      when 'Mme'
+        'woman'
+      else
+        nil
+      end
+    end
   end
 end

data/lib/sellsy/custom_field.rb

@@ -15,7 +15,7 @@ module Sellsy
           'params' => {
               'linkedtype' => linked_type(entity),
               'linkedid' => entity.id,
-              'values' => custom_fields.select {|cf| !cf.value.blank?}.map {|cf| {'cfid' => cf.id, 'value' => cf.value}}
+              'values' => custom_fields.select {|cf| !cf.nil? && !cf.value.blank?}.map {|cf| {'cfid' => cf.id, 'value' => cf.value}}
           }
       }
 
@@ -40,5 +40,19 @@ module Sellsy
         nil
       end
     end
+
+    def self.all
+      command = {
+          'method' => 'CustomFields.getList',
+          'params' => {
+              'pagination' => {
+                  'nbperpage' => 30
+              }
+          }
+      }
+      response = MultiJson.load(Sellsy::Api.request command)
+
+      response['status'] == 'success' ? response['response']['result'] : {}
+    end
   end
 end

data/lib/sellsy/customer.rb

@@ -2,14 +2,14 @@ require 'multi_json'
 
 module Sellsy
   class Customer
-    attr_accessor :id, :title, :name, :first_name, :last_name, :structure_name, :category, :college_type, :siret,
-                  :ape, :legal_type, :role, :birth_date, :address, :postal_code, :town, :country, :telephone, :email,
-                  :website, :payment_method, :person_type, :apidae_member_id, :main_contact_id
+    attr_accessor :id, :name, :structure_name, :category, :college_type, :siret, :ape, :legal_type, :email,
+                  :website, :payment_method, :person_type, :apidae_member_id, :main_contact_id, :contact, :address,
+                  :contacts
 
     def create
       command = {
           'method' => 'Client.create',
-          'params' => api_params
+          'params' => to_params
       }
 
       response = MultiJson.load(Sellsy::Api.request command)
@@ -20,14 +20,14 @@ module Sellsy
     def update
       command = {
           'method' => 'Client.update',
-          'params' => api_params
+          'params' => to_params
       }
 
       response = MultiJson.load(Sellsy::Api.request command)
       response['status'] == 'success'
     end
 
-    def api_params
+    def to_params
       {
           'id' => @id,
           'third' => {
@@ -40,23 +40,8 @@ module Sellsy
               'corpType' => @legal_type,
               'apenaf' => @ape
           },
-          'contact' => {
-              'civil' => civil_enum(@title),
-              'name' => @last_name || @name,
-              'forename' => @first_name,
-              'email' => @email,
-              'tel' => @telephone,
-              'mobile' => @telephone,
-              'position' => @role,
-          },
-          'address' => {
-              'name' => 'Adresse principale',
-              'part1' => @address.split(/(\r\n?)/)[0],
-              'part2' => @address.split(/(\r\n?)/)[0],
-              'zip' => @postal_code,
-              'town' => @town,
-              'countrycode' => @country.upcase
-          }
+          'contact' => contact ? contact.to_params : {},
+          'address' => address ? address.to_params : {}
       }
     end
 
@@ -76,9 +61,8 @@ module Sellsy
         value = response['response']['client']
         client.id = value['id']
         client.name = value['name']
-        client.joindate = value['joindate']
         client.type = value['type']
-        client.main_contact_id = value['maincontactid']
+        client.contacts = response['response']['contacts']
       end
 
       client
@@ -125,18 +109,5 @@ module Sellsy
 
       clients
     end
-
-    private
-
-    def civil_enum(val)
-      case val
-      when 'M.'
-        'man'
-      when 'Mme'
-        'woman'
-      else
-        nil
-      end
-    end
   end
 end

data/lib/sellsy/opportunity.rb

@@ -65,6 +65,7 @@ module Sellsy
       source = get_source
       if funnel && step && source
         {
+            'id' => @id,
             'opportunity' => {
                 'linkedtype' => @entity_type,
                 'linkedid' => @entity_id,
@@ -95,7 +96,7 @@ module Sellsy
       opportunity = Opportunity.new
 
       if response['response']
-        value = response['response']['opportunity']
+        value = response['response']
         opportunity.id = value['id']
         opportunity.name = value['name']
       end

data/lib/sellsy/prospect.rb

@@ -2,14 +2,14 @@ require 'multi_json'
 
 module Sellsy
   class Prospect
-    attr_accessor :id, :title, :name, :first_name, :last_name, :structure_name, :category, :college_type, :siret,
-                  :ape, :legal_type, :role, :birth_date, :address, :postal_code, :town, :country, :telephone, :email,
-                  :website, :payment_method, :person_type, :apidae_member_id, :main_contact_id
+    attr_accessor :id, :name, :structure_name, :category, :college_type, :siret, :ape, :legal_type, :email,
+                  :website, :payment_method, :person_type, :apidae_member_id, :main_contact_id, :contact, :address,
+                  :contacts
 
     def create
       command = {
           'method' => 'Prospects.create',
-          'params' => api_params
+          'params' => to_params
       }
 
       response = MultiJson.load(Sellsy::Api.request command)
@@ -20,14 +20,14 @@ module Sellsy
     def update
       command = {
           'method' => 'Prospects.update',
-          'params' => api_params
+          'params' => to_params
       }
 
       response = MultiJson.load(Sellsy::Api.request command)
       response['status'] == 'success'
     end
 
-    def api_params
+    def to_params
       {
           'id' => @id,
           'third' => {
@@ -39,24 +39,8 @@ module Sellsy
               'corpType' => @legal_type,
               'apenaf' => @ape
           },
-          'contact' => {
-              'civil' => civil_enum(@title),
-              'name' => @last_name || @name,
-              'forename' => @first_name,
-              'email' => @email,
-              'tel' => @telephone,
-              'mobile' => @telephone,
-              'position' => @role,
-              'birthdate' => @birth_date.blank? ? '' : Date.parse(@birth_date).to_datetime.to_i
-          },
-          'address' => {
-              'name' => 'Adresse principale',
-              'part1' => @address.split(/(\r\n?)/)[0],
-              'part2' => @address.split(/(\r\n?)/)[1],
-              'zip' => @postal_code,
-              'town' => @town,
-              'countrycode' => @country.upcase
-          }
+          'contact' => contact ? contact.to_params : {},
+          'address' => address ? address.to_params : {}
       }
     end
 
@@ -76,7 +60,7 @@ module Sellsy
         value = response['response']['client']
         prospect.id = value['id']
         prospect.name = value['name']
-        prospect.main_contact_id = value['maincontactid']
+        prospect.contacts = response['response']['contacts']
       end
 
       return prospect
@@ -123,18 +107,5 @@ module Sellsy
 
       prospects
     end
-
-    private
-
-    def civil_enum(val)
-      case val
-      when 'M.'
-        'man'
-      when 'Mme'
-        'woman'
-      else
-        nil
-      end
-    end
   end
 end

data/lib/sellsy/version.rb

@@ -1,3 +1,3 @@
 module Sellsy
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sellsy-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jens Stammers
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json