rs.ge 0.0.6 → 0.0.7

data/lib/rs/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module RS
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/rs/waybill.rb

@@ -101,11 +101,12 @@ module RS
   class Waybill
     TRANSPORTATION_PAID_BY_BUYER  = 1
     TRANSPORTATION_PAID_BY_SELLER = 2
-    STATUS_DELETED = -1
+    STATUS_DELETED  = -1
+    STATUS_DEACTIVATED = -2
     STATUS_SAVED   =  0
     STATUS_ACTIVE  =  1
     STATUS_CLOSED  =  2
-    attr_accessor :id, :type, :status, :parent_id
+    attr_accessor :id, :type, :status, :parent_id, :number
     attr_accessor :seller_id # გამყიდველის უნიკალური კოდი
     attr_accessor :buyer_tin, :check_buyer_tin, :buyer_name
     attr_accessor :seller_info, :buyer_info # გამყიდველის/მყიდველის თანამდებობა, სახელი და გვარი
@@ -161,6 +162,7 @@ module RS
       waybill.id = hash[:id]
       waybill.type = hash[:type].to_i
       waybill.status = hash[:status].to_i
+      waybill.number = hash[:waybill_number]
       waybill.seller_id = hash[:seler_un_id].to_i
       waybill.buyer_tin = hash[:buyer_tin]
       waybill.check_buyer_tin = hash[:chek_buyer_tin].to_i == 1
@@ -229,7 +231,7 @@ module RS
 
     # მყიდველის შემოწმება
     def validate_buyer
-      if self.buyer_tin.nil?
+      if self.buyer_tin.nil? or self.buyer_tin.strip.empty?
         RS.append_validation_error(@validation_errors, :buyer_tin, 'მყიდველის საიდენტიფიკაციო ნომერი განუსაზღვრელია')
       else
         if self.check_buyer_tin
@@ -396,6 +398,7 @@ module RS
   end
 
   # ზედნადების წაშლა.
+  # ეს მეთოდი არ გამოდგება აქტიური/დასრულებული ზედნადების წასაშლელად.
   #
   # გადაეცემა შემდეგი პარამეტრები:
   # waybill_id -- ზედნადების ID
@@ -413,4 +416,23 @@ module RS
     response.to_hash[:del_waybill_response][:del_waybill_result].to_i == 1
   end
 
+  # აქტიური/დასრულებული ზედნადების გაუქმება.
+  # ეს მეთოდი არ გამოდგება შენახული ზედნადების გასაუქმებლად.
+  #
+  # გადაეცემა შემდეგი პარამეტრები:
+  # waybill_id -- ზედნადების ID
+  # su -- სერვისის მომხმარებელი
+  # sp -- სერვისის მომხმარებლის პაროლი
+  #
+  # აბრუნებს <code>true</code> თუ წაიშალა.
+  def self.deactivate_waybill(params)
+    RS.validate_presence_of(params, 'waybill_id', 'su', 'sp')
+    client = RS.waybill_service
+    response = client.request 'ref_waybill' do |soap|
+      soap.body = params.merge({:order => ['su', 'sp', 'waybill_id']})
+    end
+    #puts response.to_hash
+    response.to_hash[:ref_waybill_response][:ref_waybill_result].to_i == 1
+  end
+
 end

data/spec/rs/waybill_delete_spec.rb

@@ -0,0 +1,63 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+require 'rs'
+
+describe 'create waybill, activate it, then deactivate' do
+  before(:all) do
+    @waybill = waybill_skeleton
+    RS.save_waybill(@waybill, RS.su_params)
+  end
+  subject { @waybill }
+  it { should_not be_nil }
+  its(:id) { should_not be_nil }
+  its(:status) { should == RS::Waybill::STATUS_SAVED }
+  context 'activate waybill' do
+    before(:all) do
+      params = RS.su_params.merge('waybill_id' => @waybill.id)
+      RS.activate_waybill(params)
+      @waybill = RS.get_waybill(params)
+    end
+    subject { @waybill }
+    its(:status) { should == RS::Waybill::STATUS_ACTIVE }
+  end
+  context 'now deactivate waybill' do
+    before(:all) do
+      params = RS.su_params.merge('waybill_id' => @waybill.id)
+      #RS.close_waybill(params)
+      RS.deactivate_waybill(params)
+      @waybill = RS.get_waybill(params)
+    end
+    subject { @waybill }
+    its(:status) { should == RS::Waybill::STATUS_DEACTIVATED }
+  end
+end
+
+describe 'create waybill, activate and close it, then try to deactivate' do
+  before(:all) do
+    @waybill = waybill_skeleton
+    RS.save_waybill(@waybill, RS.su_params)
+  end
+  subject { @waybill }
+  it { should_not be_nil }
+  its(:id) { should_not be_nil }
+  its(:status) { should == RS::Waybill::STATUS_SAVED }
+  context 'activate and close waybill' do
+    before(:all) do
+      params = RS.su_params.merge('waybill_id' => @waybill.id)
+      RS.activate_waybill(params)
+      RS.close_waybill(params)
+      @waybill = RS.get_waybill(params)
+    end
+    subject { @waybill }
+    its(:status) { should == RS::Waybill::STATUS_CLOSED }
+  end
+  context 'could not deactivate closed waybill !!' do
+    before(:all) do
+      params = RS.su_params.merge('waybill_id' => @waybill.id)
+      RS.deactivate_waybill(params)
+      @waybill = RS.get_waybill(params)
+    end
+    subject { @waybill }
+    its(:status) { should == RS::Waybill::STATUS_CLOSED }
+  end
+end

data/spec/rs/waybill_spec.rb

@@ -56,60 +56,6 @@ describe 'Corporate TIN validation' do
   validate_corporate_tin('12345678A',  false)
 end
 
-def waybill_skeleton(params = {})
-  waybill = RS::Waybill.new
-  waybill.id = params[:id]
-  waybill.type = params[:type] || RS::WaybillType::TRANSPORTATION
-  waybill.status = params[:status] || RS::Waybill::STATUS_SAVED
-  waybill.seller_id = params[:seller_id] || 731937
-  waybill.buyer_tin = params[:buyer_tin] || '12345678910'
-  waybill.check_buyer_tin = params[:check_buyer_tin] ? params[:check_buyer_tin] : true
-  waybill.buyer_name = params[:buyer_name] || 'სატესტო მყიდველი'
-  waybill.start_address = params[:start_address] || 'თბილისი'
-  waybill.end_address   = params[:end_address] || 'სოხუმი'
-  waybill.transport_type_id = params[:transport_type] || RS::TransportType::VEHICLE
-  waybill.start_date = params[:start_date] || Time.now
-  waybill.comment = params[:comment] #|| 'comment'
-  if waybill.transport_type_id == RS::TransportType::VEHICLE
-    waybill.car_number  = params[:car_number]  || 'WDW842'
-    waybill.driver_name = params[:driver_name] || 'დიმიტრი ყურაშვილი'
-    waybill.driver_tin  = params[:driver_tin]  || '02001000490'
-    waybill.check_driver_tin = params[:check_driver_tin].nil? ? false : params[:check_driver_tin]
-  else
-    waybill.car_number = params[:car_number]
-    waybill.driver_name = params[:driver_name]
-    waybill.driver_tin = params[:driver_tin]
-    waybill.check_driver_tin = params[:check_driver_tin]
-  end
-  waybill.transportation_cost = params[:transportation_cost] || 0
-
-  if params[:items]
-    items = []
-    params[:items].each do |item|
-      item = RS::WaybillItem.new
-      item.prod_name = item[:name]
-      item.unit_id = item[:unit_id]
-      item.unit_name = item[:unit_name]
-      item.quantity = item[:quantity]
-      item.price = item[:price]
-      item.bar_code = item[:code]
-      items << item
-    end
-  else
-    item = RS::WaybillItem.new
-    item.prod_name = 'სატესტო საქონელი'
-    item.unit_id = 99
-    item.unit_name = 'ერთეული'
-    item.quantity = 2
-    item.price = 5
-    item.bar_code = '123'
-    items = [item]
-  end
-  waybill.items = items
-
-  waybill
-end
-
 describe 'save waybill' do
   before(:all) do
     @waybill = waybill_skeleton

data/spec/spec_helper.rb

@@ -44,3 +44,57 @@ module RS
     {'user_name' => u, 'user_password' => p}
   end
 end
+
+def waybill_skeleton(params = {})
+  waybill = RS::Waybill.new
+  waybill.id = params[:id]
+  waybill.type = params[:type] || RS::WaybillType::TRANSPORTATION
+  waybill.status = params[:status] || RS::Waybill::STATUS_SAVED
+  waybill.seller_id = params[:seller_id] || 731937
+  waybill.buyer_tin = params[:buyer_tin] || '12345678910'
+  waybill.check_buyer_tin = params[:check_buyer_tin] ? params[:check_buyer_tin] : true
+  waybill.buyer_name = params[:buyer_name] || 'სატესტო მყიდველი'
+  waybill.start_address = params[:start_address] || 'თბილისი'
+  waybill.end_address   = params[:end_address] || 'სოხუმი'
+  waybill.transport_type_id = params[:transport_type] || RS::TransportType::VEHICLE
+  waybill.start_date = params[:start_date] || Time.now
+  waybill.comment = params[:comment] #|| 'comment'
+  if waybill.transport_type_id == RS::TransportType::VEHICLE
+    waybill.car_number  = params[:car_number]  || 'WDW842'
+    waybill.driver_name = params[:driver_name] || 'დიმიტრი ყურაშვილი'
+    waybill.driver_tin  = params[:driver_tin]  || '02001000490'
+    waybill.check_driver_tin = params[:check_driver_tin].nil? ? false : params[:check_driver_tin]
+  else
+    waybill.car_number = params[:car_number]
+    waybill.driver_name = params[:driver_name]
+    waybill.driver_tin = params[:driver_tin]
+    waybill.check_driver_tin = params[:check_driver_tin]
+  end
+  waybill.transportation_cost = params[:transportation_cost] || 0
+
+  if params[:items]
+    items = []
+    params[:items].each do |item|
+      item = RS::WaybillItem.new
+      item.prod_name = item[:name]
+      item.unit_id = item[:unit_id]
+      item.unit_name = item[:unit_name]
+      item.quantity = item[:quantity]
+      item.price = item[:price]
+      item.bar_code = item[:code]
+      items << item
+    end
+  else
+    item = RS::WaybillItem.new
+    item.prod_name = 'სატესტო საქონელი'
+    item.unit_id = 99
+    item.unit_name = 'ერთეული'
+    item.quantity = 2
+    item.price = 5
+    item.bar_code = '123'
+    items = [item]
+  end
+  waybill.items = items
+
+  waybill
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rs.ge
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000 Z
+date: 2012-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70270712827600 !ruby/object:Gem::Requirement
+  requirement: &77932080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70270712827600
+  version_requirements: *77932080
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70270712827180 !ruby/object:Gem::Requirement
+  requirement: &77931660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70270712827180
+  version_requirements: *77931660
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70270712826660 !ruby/object:Gem::Requirement
+  requirement: &77931170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70270712826660
+  version_requirements: *77931170
 - !ruby/object:Gem::Dependency
   name: httpi
-  requirement: &70270712826220 !ruby/object:Gem::Requirement
+  requirement: &77930650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70270712826220
+  version_requirements: *77930650
 description: ruby client for rs.ge web services
 email:
 - dimitri@c12.ge
@@ -76,6 +76,7 @@ files:
 - rs.gemspec
 - spec/rs/dict_spec.rb
 - spec/rs/sys_spec.rb
+- spec/rs/waybill_delete_spec.rb
 - spec/rs/waybill_spec.rb
 - spec/rs/waybill_validation_spec.rb
 - spec/spec_helper.rb
@@ -100,14 +101,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rs
-rubygems_version: 1.8.15
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: rs.ge web services
-test_files:
-- spec/rs/dict_spec.rb
-- spec/rs/sys_spec.rb
-- spec/rs/waybill_spec.rb
-- spec/rs/waybill_validation_spec.rb
-- spec/spec_helper.rb
+test_files: []
 has_rdoc: