rs.ge 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7546bf9f1d2d511ed338bc862dd77c8d10e99b04
-  data.tar.gz: 69662fd8244f94fdd104b983d7810f0aa486d064
+  metadata.gz: 7cbef5c1a418b73e5e5ad907d96f8df8f7baf14e
+  data.tar.gz: 24e83d6a07bf96835bf75ef1eb768f4c880f9347
 SHA512:
-  metadata.gz: 447892ce8317a536843abf69cf2eb4aad5e9603dc21121c59e1596c79eb551a82e5d7ea1b1fdb8f15029b03257340b0e523b6c457cda78f16b070eebfed80301
-  data.tar.gz: d96847c6ff14c964d904210af20a1069eaae2d82b83ab1d837ddeb2e18781c43e8a01ad5bed168ef610634af5d0b12143af3f4e71b96f2cdfe42ed38c8b174c2
+  metadata.gz: b963482f324fda9ec7159cafdcf6292fe99a894da6871d1794a67aab186ec72878666776f4e24cc3b7ca01ccf48164f01053cd1cacaa61995f9466d01527610c
+  data.tar.gz: 8d11ea84b08172274404c2c35580140aa6e4764f6e6e0f5b8611b3dffb2283f4bdbfaf532290d0227358b26167c43bc4ec676dc34637388f0a9b39a51edc1fb8

data/lib/rs/models/waybill.rb

@@ -246,13 +246,15 @@ class RS::Waybill < RS::Validable
 
   # Initialize this waybill from given hash.
   def init_from_hash(hash)
-    items_hash = hash[:goods_list][:goods]
-    items_hash = [items_hash] if items_hash.instance_of? Hash
     self.items = []
-    items_hash.each do |item_hash|
-      item = RS::WaybillItem.new
-      item.init_from_hash(item_hash)
-      self.items << item
+    if hash[:goods_list].present?
+      items_hash = hash[:goods_list][:goods]
+      items_hash = [items_hash] if items_hash.instance_of? Hash
+      items_hash.each do |item_hash|
+        item = RS::WaybillItem.new
+        item.init_from_hash(item_hash)
+        self.items << item
+      end
     end
     self.id = hash[:id].to_i
     self.type = hash[:type].to_i
@@ -271,6 +273,8 @@ class RS::Waybill < RS::Validable
     self.delivery_date = hash[:delivery_date] # delivery date
     self.status = hash[:status].to_i
     self.seller_id = hash[:seler_un_id].to_i
+    self.seller_tin = hash[:seller_tin]
+    self.seller_name = hash[:seller_name]
     self.activate_date = hash[:activate_date]
     self.parent_id = hash[:par_id] ? hash[:par_id].to_i : nil
     self.total = hash[:full_amount].to_f

data/lib/rs/requests/waybill.rb

@@ -2,7 +2,6 @@
 require 'singleton'
 
 module RS
-
   class WaybillRequest < BaseRequest
     include Singleton
 
@@ -43,6 +42,64 @@ module RS
       wb.init_from_hash(response.to_hash[:get_waybill_response][:get_waybill_result][:waybill])
     end
 
+    # Get waybills (seller's point of view).
+    def get_waybills(opts = {})
+      validate_presence_of(opts, :su, :sp)
+      message = { 'su' => opts[:su], 'sp' => opts[:sp] }
+      waybill_search_params(opts, message)
+      response = waybill_client.request 'get_waybills' do
+        soap.body = message
+      end
+      waybill_data = response.to_hash[:get_waybills_response][:get_waybills_result][:waybill_list][:waybill]
+      extract_waybills(waybill_data)
+    end
+
+    # Get waybills (buyer's point of view).
+    def get_buyer_waybills(opts = {})
+      validate_presence_of(opts, :su, :sp)
+      message = { 'su' => opts[:su], 'sp' => opts[:sp] }
+      waybill_search_params(opts, message)
+      response = waybill_client.request 'get_buyer_waybills' do
+        soap.body = message
+      end
+      waybill_data = response.to_hash[:get_buyer_waybills_response][:get_buyer_waybills_result][:waybill_list][:waybill]
+      extract_waybills(waybill_data)
+    end
+
+    def extract_waybills(waybill_data)
+      waybills = []
+      if waybill_data.is_a?(Array)
+        waybill_data.each do |data|
+          wb = RS::Waybill.new
+          wb.init_from_hash(data)
+          waybills << wb
+        end
+      elsif waybill_data.is_a?(Hash)
+        wb = RS::Waybill.new
+        wb.init_from_hash(waybill_data)
+        waybills << wb
+      end
+      waybills
+    end
+
+    def waybill_search_params(opts, message)
+      message['itypes'] = opts[:types].join(',') if opts[:types].present?
+      message['buyer_tin'] = opts[:buyer_tin] if opts[:buyer_tin].present?
+      message['statuses'] = opts[:statuses].join(',') if opts[:statuses].present?
+      message['car_number'] = opts[:vehicle] if opts[:vehicle].present?
+      message['begin_date_s'] = opts[:begin_date_1] if opts[:begin_date_1].present?
+      message['begin_date_e'] = opts[:begin_date_2] if opts[:begin_date_2].present?
+      message['create_date_s'] = opts[:create_date_1] if opts[:create_date_1].present?
+      message['create_date_e'] = opts[:create_date_2] if opts[:create_date_2].present?
+      message['driver_tin'] = opts[:driver_tin] if opts[:driver_tin].present?
+      message['delivery_date_s'] = opts[:delivery_date_1] if opts[:delivery_date_1].present?
+      message['delivery_date_e'] = opts[:delivery_date_2] if opts[:delivery_date_2].present?
+      message['full_amount'] = opts[:amount] if opts[:amount].present?
+      message['waybill_number'] = opts[:number] if opts[:number].present?
+      message['close_date_s'] = opts[:close_date_1] if opts[:close_date_1]
+      message['close_date_e'] = opts[:close_date_2] if opts[:close_date_2]
+    end
+
     # Activate waybill.
     def activate_waybill(opts)
       validate_presence_of(opts, :id, :su, :sp)
@@ -110,7 +167,6 @@ module RS
         nil
       end
     end
-
   end
 
   class << self
@@ -122,5 +178,4 @@ module RS
       RS::WaybillRequest.instance
     end
   end
-
 end

data/lib/rs/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module RS
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rs.ge
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Dimitri Kurashvili
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-05 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec