rs.ge 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac581151418ca530b173ecff8ee7c3af51e01403
-  data.tar.gz: 431258966af3e3eaf31c165760ce3245101b9cfb
+  metadata.gz: a7944161b26fa648b4223add24c0993e8b81f33b
+  data.tar.gz: a9bbd3388a369f57c3b4ad00422bfe80befa632c
 SHA512:
-  metadata.gz: 1b1890c28796f8e39db0d5a5fec819451b76b141563c6a256daece716b5a8bb0740e2518d784210879bb763d6dfeaca386d992e593628741ce5e18bada8786ba
-  data.tar.gz: dcc929d4b17105573d407a62c29d4afcea3c2e03bc0c33c211af4cafd63a71be3920d2611e35b749246e6823318c28c978a3867336513f9947680b829b1c1400
+  metadata.gz: 09dcb692438b2b1cd86c462926bc3ea91c0906852a4b626cb6de747d87cd88fac4178c27320d9ea54a88d8b6ec88a6b5becf5e5acbaa9719e89a970cf212a2be
+  data.tar.gz: 1255c4a8131c922c9fc97791ca28e288d0e6b950827dbffaefd662b9e7805f8d8a8413b89ee2e131ca84c35a1c6d50d1ff31dd737d8a9694c3b2c91076b1fc4c

data/lib/rs/models/waybill.rb

@@ -180,17 +180,9 @@ class RS::Waybill < RS::Validable
   # Service user ID, who created this waybill.
   attr_accessor :user_id
 
-  def transport_vehicle?
-    self.transport_type_id == RS::TRANS_VEHICLE || self.transport_type_id == RS::TRANS_VEHICLE_FRGN
-  end
-
-  def buyer_required?
-    self.type != RS::WAYBILL_TYPE_DISTR
-  end
-
-  def seller_required?
-    self.type != RS::WAYBILL_TYPE_SUBWB
-  end
+  def transport_vehicle?; self.transport_type_id == RS::TRANS_VEHICLE || self.transport_type_id == RS::TRANS_VEHICLE_FRGN end
+  def buyer_required?; self.type != RS::WAYBILL_TYPE_DISTR end
+  def seller_required?; self.type != RS::WAYBILL_TYPE_SUBWB end
 
   # Convert this waybill to XML.
   def to_xml(xml)
@@ -203,13 +195,17 @@ class RS::Waybill < RS::Validable
       b.ID (self.id ? self.id : 0)
       b.TYPE self.type
 
-      # buyer not sent for distrib order
-      if buyer_required?
+      if self.type == RS::WAYBILL_TYPE_INNER # inner
+        b.BUYER_TIN ''
+        b.CHEK_BUYER_TIN 1
+        b.BUYER_NAME ''
+        b.END_ADDRESS self.end_address
+      elsif buyer_required? # default
         b.BUYER_TIN self.buyer_tin
         b.CHEK_BUYER_TIN (self.check_buyer_tin ? 1 : 0)
         b.BUYER_NAME self.buyer_name
         b.END_ADDRESS self.end_address
-      else
+      else # distribution
         b.BUYER_TIN ''
         b.CHEK_BUYER_TIN 1
         b.BUYER_NAME ''

data/lib/rs/requests/base.rb

@@ -11,7 +11,7 @@ class RS::BaseRequest
   INVOICE_SERVICE_URL = 'http://www.revenue.mof.ge/ntosservice/ntosservice.asmx?WSDL'
 
   # Defaults
-  DEFAULTS = {su: 'dimitri1979', sp: '123456', payer_id: 731937, user_id: 783}
+  DEFAULTS = {su: 'DIMITRI1979:206322102', sp: '123456', payer_id: 731937, user_id: 783}
 
   # Last error code.
   attr_accessor :last_error_code

data/lib/rs/version.rb

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

data/spec/requests/factura_spec.rb

@@ -66,7 +66,7 @@ describe 'create factura with items' do
       its(:unit) { should == 'kg' }
       its(:quantity) { should == 10 }
       its(:total) { should == 100 }
-      its(:vat) { should == 18 }
+      its(:vat) { should == 15.25 }
       its(:excise) { should == 0 }
       its(:excise_id) { should == 0 }
     end
@@ -125,7 +125,7 @@ describe 'get factura' do
     its(:registration_date) { should_not be_nil }
     its(:seller_id) { should == 731937 }
     #its(:status) { should == RS::Factura::STATUS_START }
-    its(:status) { should == RS::Factura::STATUS_SENT }
+    its(:status) { should == RS::Factura::STATUS_CONFIRMED }
     its(:correction_of) { should be_nil }
   end
   context do

data/spec/requests/invoice_spec.rb

@@ -23,8 +23,9 @@ describe 'Save invoice' do
       @waybill = RS.wb.get_waybill(id: @waybill.id)
     end
     subject { @waybill }
+    specify { @resp.should == -1042 } # cannot update waybill with invoice
     its(:error_code) { should be_nil }
-    its(:total) { should == 50 }
+    its(:total) { should == 1 }
   end
   context 'update invoice' do
     before(:all) do

data/spec/requests/sys_spec.rb

@@ -17,27 +17,24 @@ describe 'working with service user' do
     @password = '123456'
     @new_password = 'new_password_123456'
     @ip = RS.sys.what_is_my_ip
-    # @resp = RS.sys.create_user(USER01.merge(ip: @ip, name: 'test', su: @username, sp: @password))
   end
-  # subject { @resp }
-  # it { should == true }
   describe 'update service user' do
     before(:all) do
-      @resp = RS.sys.update_user(USER01.merge(ip: @ip, name: 'test', su: @username, sp: @new_password))
+      @resp = RS.sys.update_user(USER01.merge(ip: @ip, name: 'test', su: RS.config.su, sp: RS.config.sp))
     end
     subject { @resp }
     it { should == true }
   end
   describe 'check service user: illegal user/password' do
     before(:all) do
-      @resp = RS.sys.check_user(su: @username, sp: @password)
+      @resp = RS.sys.check_user(su: RS.config.su, sp: 'illegal password')
     end
     subject { @resp }
     it { should be_nil }
   end
   describe 'check service user: legal user/password' do
     before(:all) do
-      @resp = RS.sys.check_user(su: @username, sp: @new_password)
+      @resp = RS.sys.check_user(su: RS.config.su, sp: RS.config.sp)
     end
     subject { @resp }
     it { should_not be_nil }
@@ -65,5 +62,5 @@ describe 'get service users list' do
   end
   subject { @users }
   it { should_not be_empty }
-  its(:size) { should == 190 }
+  its(:size) { should > 50 }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rs.ge
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Dimitri Kurashvili
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rs
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: rs.ge web services