rs.ge 0.1.0.rc2 → 0.1.0

data/.gitignore

@@ -5,3 +5,5 @@ pkg/*
 coverage/*
 tmp/*
 *.swp
+
+spec/requests/factura_experimental_spec.rb

data/README.md

@@ -22,7 +22,7 @@ which indicates if TIN numbers are validated remotely when a waybill is validate
 RS.config.validate_remote = true
 ```
 
-It's recommended to have this flag on `true`, unless performance considerations require the oposite.
+It's recommended to have this flag on `true`, unless performance considerations require the opposite.
 
 ## System methods
 

data/lib/rs.rb

@@ -3,7 +3,9 @@ require 'savon'
 require 'rs/version'
 
 # models
+require 'rs/models/initializable'
 require 'rs/models/waybill'
+require 'rs/models/factura'
 
 # requests
 require 'rs/requests/config'
@@ -11,6 +13,7 @@ require 'rs/requests/base'
 require 'rs/requests/dict'
 require 'rs/requests/sys'
 require 'rs/requests/waybill'
+require 'rs/requests/factura'
 
 module RS
   # This constant indicates 18% vat tariff.

data/lib/rs/models/factura.rb

@@ -0,0 +1,34 @@
+# -*- encoding : utf-8 -*-
+
+class RS::Factura
+  include RS::Initializable
+
+  # Source invoice -- პირველადი ა/ფ
+  STATUS_START = 0
+  STATUS_SENT  = 1
+  STATUS_CONFIRMED = 2
+  STATUS_CORRECTED = 3
+  # Correction invoice -- კორექტირებული ა/ფ
+  STATUS_CORR_START = 4
+  STATUS_CORR_SENT = 5
+  STATUS_CORR_CONFIRMED = 8
+  # Canceled -- გაუქმებულია
+  STATUS_CANCELED = 6
+  STATUS_CONFIRMED_CANCELED = 7
+
+  attr_accessor :id
+  attr_accessor :index, :number
+  attr_accessor :operation_date, :registration_date
+  attr_accessor :seller_id, :buyer_id, :buyer_su_id
+  attr_accessor :status
+  attr_accessor :waybill_number, :waybill_date
+  attr_accessor :correction_of, :correction_type
+end
+
+class RS::FacturaItem
+  include RS::Initializable
+
+  attr_accessor :id, :factura_id
+  attr_accessor :name, :unit
+  attr_accessor :quantity, :total, :vat, :excise, :excise_id
+end

data/lib/rs/models/initializable.rb

@@ -0,0 +1,7 @@
+module RS::Initializable
+  def initialize(opts = {})
+    opts.each do |k, v|
+      instance_variable_set("@#{k}", v) unless v.nil?
+    end
+  end
+end

data/lib/rs/models/waybill.rb

@@ -5,12 +5,6 @@ require 'active_support/all'
 class RS::Validable
   attr_accessor :errors, :warnings
 
-  def initialize(opts = {})
-    opts.each do |k, v|
-      instance_variable_set("@#{k}", v) unless v.nil?
-    end
-  end
-
   # Add error to the specified field.
   def add_error(fld, msg)
     self.errors = {} unless self.errors
@@ -31,6 +25,8 @@ end
 
 # Waybill item class.
 class RS::WaybillItem < RS::Validable
+  include RS::Initializable
+
   # Item ID.
   attr_accessor :id
   # Barcode for the production in this item,
@@ -95,6 +91,8 @@ end
 
 # Waybill class.
 class RS::Waybill < RS::Validable
+  include RS::Initializable
+
   # Constant, which indicates, that transportation cost is paid by buyer.
   TRANSPORTATION_PAID_BY_BUYER  = 1
   # Constant, which indicates, that transportation cost is paid by seller.
@@ -167,7 +165,8 @@ class RS::Waybill < RS::Validable
   attr_accessor :transport_type_name
   # Vehicle number.
   attr_accessor :car_number
-  # ==> XXX: there should be some flag which indicates whether vehicle number should be checked but documentation given no answer on this
+  # Vehicle number: trailer's number.
+  attr_accessor :car_number_trailer
   # Comment on this waybill.
   attr_accessor :comment
   # Waybill items.
@@ -181,6 +180,18 @@ 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
+
   # Convert this waybill to XML.
   def to_xml(xml)
     xml.WAYBILL do |b|
@@ -191,11 +202,25 @@ class RS::Waybill < RS::Validable
       end
       b.ID (self.id ? self.id : 0)
       b.TYPE self.type
-      b.BUYER_TIN self.buyer_tin
-      b.CHEK_BUYER_TIN (self.check_buyer_tin ? 1 : 0)
-      b.BUYER_NAME self.buyer_name
+
+      # buyer not sent for distrib order
+      if buyer_required?
+        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
+        b.BUYER_TIN ''
+        b.CHEK_BUYER_TIN 0
+        b.BUYER_NAME ''
+        b.END_ADDRESS ''
+      end
+
+      # seller main info
+      b.SELER_UN_ID self.seller_id
+      b.PAR_ID (self.parent_id ? self.parent_id : '')
       b.START_ADDRESS self.start_address
-      b.END_ADDRESS self.end_address
+
       b.DRIVER_TIN self.driver_tin
       b.CHEK_DRIVER_TIN (self.check_driver_tin ? 1 : 0)
       b.DRIVER_NAME self.driver_name
@@ -204,15 +229,17 @@ class RS::Waybill < RS::Validable
       b.RECEIVER_INFO self.buyer_info
       b.DELIVERY_DATE (self.delivery_date ? self.delivery_date.strftime('%Y-%m-%dT%H:%M:%S') : '')
       b.STATUS self.status
-      b.SELER_UN_ID self.seller_id
-      b.PAR_ID (self.parent_id ? self.parent_id : '')
       b.CAR_NUMBER self.car_number
       b.WAYBILL_NUMBER (self.number ? self.number : '')
       ## XXX: b.S_USER_ID
       b.BEGIN_DATE (self.activate_date ? self.activate_date.strftime('%Y-%m-%dT%H:%M:%S') : '')
-      b.TRAN_COST_PAYER (self.transportation_cost_payer ? self.transportation_cost_payer : Waybill::TRANSPORTATION_PAID_BY_BUYER)
+      b.TRAN_COST_PAYER (self.transportation_cost_payer ? self.transportation_cost_payer : RS::Waybill::TRANSPORTATION_PAID_BY_BUYER)
       b.TRANS_ID self.transport_type_id
-      b.TRANS_TXT self.transport_type_name
+      if self.transport_vehicle?
+        b.TRANS_TXT self.car_number_trailer
+      else
+        b.TRANS_TXT self.transport_type_name
+      end
       b.COMMENT self.comment
     end
   end
@@ -245,7 +272,7 @@ class RS::Waybill < RS::Validable
     self.status = hash[:status].to_i
     self.seller_id = hash[:seler_un_id].to_i
     self.activate_date = hash[:activate_date]
-    self.parent_id = hash[:par_id]
+    self.parent_id = hash[:par_id] ? hash[:par_id].to_i : nil
     self.total = hash[:full_amount].to_f
     self.car_number = hash[:car_number]
     self.number = hash[:waybill_number]
@@ -254,7 +281,11 @@ class RS::Waybill < RS::Validable
     self.activate_date = hash[:begin_date]
     self.transportation_cost_payer = hash[:tran_cost_payer] ? hash[:tran_cost_payer].to_i : nil
     self.transport_type_id = hash[:trans_id].to_i
-    self.transport_type_name = hash[:trans_txt]
+    if self.transport_type_id == RS::TRANS_VEHICLE
+      self.car_number_trailer = hash[:trans_txt]
+    else
+      self.transport_type_name = hash[:trans_txt]
+    end
     self.comment = hash[:comment]
     self
   end
@@ -265,17 +296,19 @@ class RS::Waybill < RS::Validable
     validate_buyer
     validate_transport
     validate_addresses
+    validate_parent
     validate_remote if RS.config.validate_remote
   end
 
   def valid?
     self.items.each { |it| return false unless it.valid? }
-    super.valid?
+    super
   end
 
   private
 
   def validate_buyer
+    return if not buyer_required?
     if self.buyer_tin.blank?
       add_error(:buyer_tin, 'მყიდველის საიდენტიფიკაციო ნომერი განუსაზღვრელია')
     else
@@ -288,7 +321,7 @@ class RS::Waybill < RS::Validable
   end
 
   def validate_transport
-    if self.transport_type_id == RS::TRANS_VEHICLE
+    if self.transport_vehicle?
       add_error(:car_number, 'მიუთითეთ სატრანსპორტო საშუალების სახელმწიფო ნომერი') if self.car_number.blank?
       add_error(:driver_tin, 'მძღოლის პირადი ნომერი უნდა იყოს მითითებული') if self.driver_tin.blank?
       if self.check_driver_tin
@@ -305,8 +338,8 @@ class RS::Waybill < RS::Validable
   end
 
   def validate_addresses
-    add_error(:start_address, 'საწყისი მისამართი განუსაზღვრელია') if self.start_address.blank?
-    add_error(:end_address,   'საბოლოო მისამართი განუსაზღვრელია') if self.end_address.blank?
+    add_error(:start_address, 'საწყისი მისამართი განუსაზღვრელია') if self.start_address.blank? and self.seller_required?
+    add_error(:end_address,   'საბოლოო მისამართი განუსაზღვრელია') if self.end_address.blank? and self.buyer_required?
     if not self.start_address.blank? and not self.end_address.blank? and
       self.start_address.strip != self.end_address.strip and
       self.type == RS::WAYBILL_TYPE_WITHOUT_TRANS
@@ -322,7 +355,8 @@ class RS::Waybill < RS::Validable
         add_error(:driver_tin, "საიდ. ნომერი ვერ მოიძებნა: #{self.driver_tin}") if driver_name.nil?
         add_error(:driver_name, "მძღოლის სახელია: #{driver_name}") if driver_name and driver_name.split.join(' ') != self.driver_name.split.join(' ')
       else
-        add_error(:driver_tin, "მძღოლის პირადი ნომერი არაა მითითებული.")
+        # IMPORTANT! this validation is not "remote", so it's moved into non-remote part
+        # add_error(:driver_tin, "მძღოლის პირადი ნომერი არაა მითითებული.")
       end
     end
     # buyer
@@ -332,9 +366,16 @@ class RS::Waybill < RS::Validable
         add_error(:buyer_tin, "საიდ. ნომერი ვერ მოიძებნა: #{self.buyer_tin}") if buyer_name.nil?
         add_error(:buyer_name, "მყიდველის სახელია: #{buyer_name}") if buyer_name and buyer_name.split.join(' ') != self.buyer_name.split.join(' ')
       else
-        add_error(:buyer_tin, "მყიდველის პირადი ნომერი არაა მითითებული.")
+        # IMPORTANT! this validation is not "remote", so it's moved into non-remote part
+        # add_error(:buyer_tin, "მყიდველის პირადი ნომერი არაა მითითებული.")
       end
     end
   end
 
+  def validate_parent
+    if self.type == RS::WAYBILL_TYPE_SUBWB and self.parent_id.blank?
+      add_error(:parent_id, 'მთავარი ზედნადები განუსაზღვრელია ან არაა გაგზავნილი.')
+    end
+  end
+
 end

data/lib/rs/requests/base.rb

@@ -7,21 +7,29 @@ class RS::BaseRequest
   # Waybill service WSDL location.
   WAYBILL_SERVICE_URL = 'http://services.rs.ge/WayBillService/WayBillService.asmx?WSDL'
 
+  # Invoice service WSDL location.
+  INVOICE_SERVICE_URL = 'http://www.revenue.mof.ge/ntosservice/ntosservice.asmx?WSDL'
+
   # Defaults
-  DEFAULTS = {su: 'dimitri1979', sp: '123456'}
+  DEFAULTS = {su: 'dimitri1979', sp: '123456', payer_id: 731937, user_id: 783}
 
   # Last error code.
   attr_accessor :last_error_code
 
-  # Getting Savon client.
+  # Getting waybill SOAP client.
   def waybill_client
     Savon::Client.new { wsdl.document = WAYBILL_SERVICE_URL }
   end
 
+  # Getting waybill SOAP client.
+  def invoice_client
+    Savon::Client.new { wsdl.document = INVOICE_SERVICE_URL }
+  end
+
   # Validates presence of specified keys in the #{params} hash.
   def validate_presence_of(params, *keys)
     # XXX: do we always need this replacement???
-    [:su, :sp].each do |sym|
+    [:su, :sp, :user_id, :payer_id].each do |sym|
       if keys.include?(sym) and params[sym].blank?
         params[sym] = RS.config.send(sym)
       end
@@ -30,4 +38,9 @@ class RS::BaseRequest
     diff = keys - params.keys
     raise ArgumentError, "The following parameter(s) not specified: #{diff.to_s[1..-2]}" unless diff.empty?
   end
+
+  def format_date(dt)
+    dt.strftime('%Y-%m-%dT%H:%M:%S')
+  end
+
 end

data/lib/rs/requests/config.rb

@@ -7,7 +7,7 @@ module RS
   class Config
     include Singleton
 
-    attr_accessor :sp, :su, :validate_remote
+    attr_accessor :sp, :su, :validate_remote, :user_id, :payer_id
   end
 
   class << self

data/lib/rs/requests/dict.rb

@@ -81,6 +81,27 @@ module RS
       types
     end
 
+    # Returns user_id for the service users's payer.
+    def payer_user_id(params = {})
+      validate_presence_of(params, :su, :sp)
+      response = invoice_client.request 'chek' do
+        soap.body = {'su' => params[:su], 'sp' => params[:sp]}
+      end
+      response.to_hash[:chek_response][:user_id].to_i
+    end
+
+    # Returns information about payer (name, id) from it's TIN number.
+    def get_payer_info(params = {})
+      validate_presence_of(params, :su, :sp, :tin)
+      user_id = params[:user_id] || payer_user_id(params)
+      response = invoice_client.request 'get_un_id_from_tin' do
+        soap.body = {'user_id' => user_id, 'tin' => params[:tin], 'su' => params[:su], 'sp' => params[:sp]}
+      end.to_hash
+      p_id = response[:get_un_id_from_tin_response][:get_un_id_from_tin_result].to_i
+      name = response[:get_un_id_from_tin_response][:name]
+      {payer_id: p_id, name: name}
+    end
+
     # Returns name by given TIN number.
     def get_name_from_tin(params = {})
       validate_presence_of(params, :su, :sp, :tin)
@@ -106,6 +127,10 @@ module RS
     def dict
       RS::DictionaryRequest.instance
     end
+
+    def dictionary
+      RS::DictionaryRequest.instance
+    end
   end
 
 end

data/lib/rs/requests/factura.rb

@@ -0,0 +1,132 @@
+# -*- encoding : utf-8 -*-
+require 'singleton'
+
+module RS
+
+  # Factura requests.
+  class InvoiceRequest < BaseRequest
+    include Singleton
+
+    def save_factura(factura, opts = {})
+      validate_presence_of(opts, :user_id, :su, :sp)
+      response = invoice_client.request 'save_invoice' do
+        soap.body = {
+          'user_id' => opts[:user_id],
+          'invois_id' => factura.id || 0,
+          'operation_date' => format_date(factura.operation_date || Time.now),
+          'seller_un_id' => factura.seller_id || 0,
+          'buyer_un_id' => factura.buyer_id || 0,
+          'overhead_no' => '', 'overhead_dt' => format_date(Time.now), # this 2 parameters are not USED actually!!
+          'b_s_user_id' => factura.buyer_su_id || 0,
+          'su' => opts[:su], 'sp' => opts[:sp]}
+      end.to_hash
+      resp = response[:save_invoice_response][:save_invoice_result]
+      factura.id = response[:save_invoice_response][:invois_id].to_i if resp
+      resp
+    end
+
+    def save_factura_item(item, opts = {})
+      validate_presence_of(opts, :user_id, :su, :sp)
+      response = invoice_client.request 'save_invoice_desc' do
+        soap.body = {
+          'user_id' => opts[:user_id],
+          'id' => item.id || 0,
+          'su' => opts[:su], 'sp' => opts[:sp],
+          'invois_id' => item.factura_id,
+          'goods' => item.name,
+          'g_unit' => item.unit,
+          'g_number' => item.quantity || 1,
+          'full_amount' => item.total || 0,
+          'drg_amount' => item.vat || 0,
+          'aqcizi_amount' => item.excise || 0,
+          'akciz_id' => item.excise_id || 0
+        }
+      end.to_hash
+      resp = response[:save_invoice_desc_response][:save_invoice_desc_result]
+      item.id = response[:save_invoice_desc_response][:id].to_i if resp
+      resp
+    end
+
+    def get_factura(opts = {})
+      validate_presence_of(opts, :id, :user_id, :su, :sp)
+      response = invoice_client.request 'get_invoice' do
+        soap.body = {'user_id' => opts[:user_id], 'invois_id' => opts[:id], 'su' => opts[:su], 'sp' => opts[:sp]}
+      end.to_hash
+      if response[:get_invoice_response][:get_invoice_result]
+        hash = response[:get_invoice_response]
+        factura = RS::Factura.new
+        factura.id = opts[:id]
+        factura.index = hash[:f_series]
+        factura.number = hash[:f_number].to_i unless hash[:f_number].to_i == -1
+        factura.operation_date = hash[:operation_dt]
+        factura.registration_date = hash[:reg_dt]
+        factura.seller_id = hash[:seller_un_id].to_i unless hash[:seller_un_id] == -1
+        factura.buyer_id = hash[:buyer_un_id].to_i unless hash[:buyer_un_id] == -1
+        factura.status = hash[:status].to_i
+        factura.waybill_number = hash[:overhead_no]
+        factura.waybill_date = hash[:overhead_dt]
+        factura.correction_of = hash[:k_id].to_i unless hash[:k_id].to_i == -1
+        factura.correction_type = hash[:k_type].to_i unless hash[:k_type].to_i == -1
+        factura
+      end
+    end
+
+    def get_factura_items(opts = {})
+      validate_presence_of(opts, :id, :user_id, :su, :sp)
+      response = invoice_client.request 'get_invoice_desc' do
+        soap.body = { 'user_id' => opts[:user_id], 'invois_id' => opts[:id], 'su' => opts[:su], 'sp' => opts[:sp] }
+      end.to_hash
+      h_items = response[:get_invoice_desc_response][:get_invoice_desc_result][:diffgram][:document_element][:invoices_descs]
+      items = []
+      if h_items.kind_of?(Array)
+        h_items.each do |item|          
+          items << factura_item_from_hash(item)
+        end
+      elsif h_items.kind_of?(Hash)
+        items << factura_item_from_hash(h_items)
+      end
+      items
+    end
+
+    def delete_factura_item(opts = {})
+      validate_presence_of(opts, :id, :factura_id, :su, :sp, :user_id)
+      response = invoice_client.request 'delete_invoice_desc' do
+        soap.body = { 'user_id' => opts[:user_id], 'id' => opts[:id], 'inv_id' => opts[:factura_id], 'su' => opts[:su], 'sp' => opts[:sp] }
+      end.to_hash
+      response[:delete_invoice_desc_response][:delete_invoice_desc_result]
+    end
+
+    def send_factura(opts = {})
+      # XXX: check status before send
+      change_factura_status(RS::Factura::STATUS_SENT, opts)
+    end
+
+    private
+
+    def factura_item_from_hash(hash)
+      RS::FacturaItem.new(id: hash[:id].to_i, factura_id: hash[:inv_id].to_i, name: hash[:goods], unit: hash[:g_unit],
+        quantity: hash[:g_number].to_f, total: hash[:full_amount].to_f, vat: hash[:drg_amount].to_f,
+        excise: hash[:aqcizi_amount].to_f, excise_id: hash[:akcis_id].to_i)
+    end
+
+    def change_factura_status(status, opts)
+      validate_presence_of(opts, :user_id, :id, :su, :sp)
+      response = invoice_client.request 'change_invoice_status' do
+        soap.body = { 'user_id' => opts[:user_id], 'inv_id' => opts[:id], 'status' => status, 'su' => opts[:su], 'sp' => opts[:sp] }
+      end
+      response[:change_invoice_status_response][:change_invoice_status_result]
+    end
+
+  end
+
+  class << self
+    def fact
+      RS::InvoiceRequest.instance
+    end
+
+    def factura
+      RS::InvoiceRequest.instance
+    end
+  end
+
+end

data/lib/rs/requests/sys.rb

@@ -87,6 +87,10 @@ module RS
     def sys
       RS::SysRequest.instance
     end
+
+    def system
+      RS::SysRequest.instance
+    end
   end
 
 end

data/lib/rs/requests/waybill.rb

@@ -40,7 +40,6 @@ module RS
         soap.body = {'su' => opts[:su], 'sp' => opts[:sp], 'waybill_id' => opts[:id]}
       end
       wb = RS::Waybill.new
-      #puts response.to_hash
       wb.init_from_hash(response.to_hash[:get_waybill_response][:get_waybill_result][:waybill])
     end
 
@@ -49,7 +48,7 @@ module RS
       validate_presence_of(opts, :id, :su, :sp)
       if opts[:date]
         response = waybill_client.request 'send_waybil_vd' do
-          soap.body = { 'su' => opts[:su], 'sp' => opts[:sp], 'begin_date' => opts[:date].strftime('%Y-%m-%dT%H:%M:%S'), 'waybill_id' => opts[:id] }
+          soap.body = { 'su' => opts[:su], 'sp' => opts[:sp], 'begin_date' => format_date(opts[:date]), 'waybill_id' => opts[:id] }
         end
         response.to_hash[:send_waybil_vd_response][:send_waybil_vd_result]
       else
@@ -65,7 +64,7 @@ module RS
       validate_presence_of(opts, :su, :sp, :id)
       if opts[:date]
         response = waybill_client.request 'close_waybill_vd' do
-          soap.body = { 'su' => opts[:su], 'sp' => opts[:sp], 'delivery_date' => opts[:date].strftime('%Y-%m-%dT%H:%M:%S'), 'waybill_id' => opts[:id] }
+          soap.body = { 'su' => opts[:su], 'sp' => opts[:sp], 'delivery_date' => format_date(opts[:date]), 'waybill_id' => opts[:id] }
         end
         response.to_hash[:close_waybill_vd_response][:close_waybill_vd_result].to_i == 1
       else
@@ -118,6 +117,10 @@ module RS
     def wb
       RS::WaybillRequest.instance
     end
+
+    def waybill
+      RS::WaybillRequest.instance
+    end
   end
 
 end

data/lib/rs/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module RS
-  VERSION = '0.1.0.rc2'
+  VERSION = '0.1.0'
 end

data/spec/helpers.rb

@@ -22,8 +22,10 @@ def create_waybill(opts = {})
     transportation_cost_payer: opts[:transportation_cost_payer] || 1,
     transport_type_id: opts[:transport_type_id] || RS::TRANS_VEHICLE,
     car_number: opts[:car_number] || 'wdw842',
+    car_number_trailer: opts[:car_number_trailer] || '',
     comment: opts[:comment], user_id: USER01[:id],
-    items: opts[:items]
+    items: opts[:items],
+    parent_id: opts[:parent_id]
   )
 end
 

data/spec/requests/dict_spec.rb

@@ -46,6 +46,22 @@ describe 'getting payer name from tin' do
   it { should == 'დიმიტრი ყურაშვილი' }
 end
 
+describe 'payer_user_id testing' do
+  before(:all) do
+    @user_id = RS.dict.payer_user_id
+  end
+  subject { @user_id }
+  it { should == RS.config.user_id }
+end
+
+describe 'getting payer information by its TIN number' do
+  before(:all) do
+    @info = RS.dict.get_payer_info(tin: '422430239')
+  end
+  subject { @info }
+  it { should_not be_nil }
+end
+
 RSpec::Matchers.define :be_personal_tin do
   match { |actual| RS.dict.personal_tin?(actual) }
 end

data/spec/requests/factura_spec.rb

@@ -0,0 +1,172 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+seller_id = RS.config.payer_id
+factura_buyer_id = RS.dict.get_payer_info(tin: '12345678910')[:payer_id]
+
+describe 'create factura with items' do
+  before(:all) do
+    @factura = RS::Factura.new(seller_id: seller_id, buyer_id: factura_buyer_id)
+    RS.fact.save_factura(@factura)
+    @factura = RS.fact.get_factura(id: @factura.id)
+  end
+  context 'test header' do
+    subject { @factura }
+    its(:id) { should_not be_nil }
+    its(:id) { should > 0 }
+    its(:index) { should == 'ეა-36'}
+    its(:number) { should be_nil }
+    its(:operation_date) { should_not be_nil }
+    its(:registration_date) { should_not be_nil }
+    its(:seller_id) { should == 731937 }
+    its(:buyer_id) { should_not be_nil }
+    its(:buyer_id) { should == 1149251 }
+    its(:status) { should == RS::Factura::STATUS_START }
+    its(:waybill_number) { should be_nil }
+    its(:waybill_date) { should_not be_nil }
+    its(:correction_of) { should be_nil }
+  end
+  context 'add item 1' do
+    before(:all) do
+      @item = RS::FacturaItem.new(factura_id: @factura.id, name: 'tomato', unit: 'kg', quantity: 10, total: 100, vat: 18)
+      RS.fact.save_factura_item(@item)
+    end
+    subject { @item }
+    it { should_not be_nil }
+    its(:id) { should_not be_nil }
+    its(:id) { should > 0 }
+    its(:id) { should be_instance_of Fixnum }
+  end
+  context 'add item 2' do
+    before(:all) do
+      @item = RS::FacturaItem.new(factura_id: @factura.id, name: 'cucumber', unit: 'kg', quantity: 8, total: 80, vat: 14.4)
+      RS.fact.save_factura_item(@item)
+    end
+    subject { @item }
+    it { should_not be_nil }
+    its(:id) { should_not be_nil }
+    its(:id) { should > 0 }
+    its(:id) { should be_instance_of Fixnum }
+  end
+  context 'get factura items' do
+    before(:all) do
+      @items = RS.fact.get_factura_items(id: @factura.id)
+    end
+    context 'all items' do
+      subject { @items }
+      it { should_not be_nil }
+      its(:size) { should == 2 }
+    end
+    context 'first item' do
+      subject { @items[0] }
+      it { should_not be_nil }
+      its(:id) { should > 0 }
+      its(:factura_id) { should == @factura.id }
+      its(:name) { should == 'tomato' }
+      its(:unit) { should == 'kg' }
+      its(:quantity) { should == 10 }
+      its(:total) { should == 100 }
+      its(:vat) { should == 18 }
+      its(:excise) { should == 0 }
+      its(:excise_id) { should == 0 }
+    end
+  end
+  context 'delete first item' do
+    before(:all) do
+      @items = RS.fact.get_factura_items(id: @factura.id)
+      @resp  = RS.fact.delete_factura_item(id: @items.first.id, factura_id: @factura.id)
+      @items = RS.fact.get_factura_items(id: @factura.id)
+    end
+    context do
+      subject { @resp }
+      it { should == true }
+    end
+    context do
+      subject { @items }
+      its(:size) { should == 1 }
+    end
+  end
+end
+
+describe 'get factura' do
+  context 'new factura' do
+    before(:all) do
+      @factura = RS::Factura.new(seller_id: RS.config.payer_id, buyer_id: factura_buyer_id)
+      RS.fact.save_factura(@factura)
+      @factura = RS.fact.get_factura(id: @factura.id)
+    end
+    subject { @factura }
+    its(:id) { should_not be_nil }
+    its(:id) { should > 0 }
+    its(:index) { should == 'ეა-36'}
+    its(:number) { should be_nil }
+    its(:operation_date) { should_not be_nil }
+    its(:registration_date) { should_not be_nil }
+    its(:seller_id) { should == 731937 }
+    its(:buyer_id) { should_not be_nil }
+    its(:buyer_id) { should == 1149251 }
+    its(:status) { should == RS::Factura::STATUS_START }
+    its(:waybill_number) { should be_nil }
+    its(:waybill_date) { should_not be_nil }
+    its(:correction_of) { should be_nil }
+  end
+  context do
+    before(:all) do
+      @id = 16953719
+      @factura = RS.fact.get_factura(id: @id)
+    end
+    subject { @factura }
+    it { should_not be_nil }
+    its(:id) { should == @id }
+    its(:index) { should == 'ეა-36'}
+    its(:number) { should == 269554 }
+    its(:operation_date) { should_not be_nil }
+    its(:registration_date) { should_not be_nil }
+    its(:seller_id) { should == 731937 }
+    its(:status) { should == RS::Factura::STATUS_SENT }
+    its(:correction_of) { should be_nil }
+  end
+  context do
+    before(:all) do
+      @id = 16166575
+      @factura = RS.fact.get_factura(id: @id)
+    end
+    subject { @factura }
+    it { should_not be_nil }
+    its(:id) { should == @id }
+    its(:index) { should == 'ეა-05'}
+    its(:number) { should == 6413864 }
+    its(:operation_date) { should_not be_nil }
+    its(:registration_date) { should_not be_nil }
+    its(:seller_id) { should == 1149251 }
+    its(:buyer_id) { should == 731937 }
+    its(:status) { should == RS::Factura::STATUS_CORRECTED }
+    its(:correction_of) { should be_nil }
+  end
+end
+
+describe 'change factura statuses' do
+  before(:all) do
+    @factura = RS::Factura.new(seller_id: seller_id, buyer_id: factura_buyer_id)
+    RS.fact.save_factura(@factura)
+    @item = RS::FacturaItem.new(factura_id: @factura.id, name: 'tomato', unit: 'kg', quantity: 10, total: 100, vat: 18)
+    RS.fact.save_factura_item(@item)
+  end
+  context 'send factura' do
+    before(:all) do
+      @resp = RS.fact.send_factura(id: @factura.id)
+      @factura = RS.fact.get_factura(id: @factura.id)
+    end
+    context do
+      subject { @resp }
+      it { should == true }
+    end
+    context do
+      subject { @factura }
+      it { should_not be_nil }
+      its(:status) { should == RS::Factura::STATUS_SENT }
+      its(:index) { should_not be_blank }
+      its(:number) { should_not be_blank }
+    end
+  end
+end

data/spec/requests/waybill_driver_spec.rb

@@ -0,0 +1,27 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe 'Save waybill: without driver name' do
+  before(:all) do
+    items = [create_item(bar_code: '001', prod_name: 'პამიდორი', price: 2, quantity: 5), create_item(bar_code: '002', prod_name: 'კიტრი', price: 3, quantity: 10)]
+    @waybill = create_waybill(items: items)
+    @waybill.driver_name = nil
+    RS.wb.save_waybill(@waybill)
+  end
+  subject { @waybill }
+  its(:id) { should_not be_nil }
+  its(:error_code) { should == 0 }
+end
+
+describe 'Save waybill: without driver name (and buyer is foreigner)' do
+  before(:all) do
+    items = [create_item(bar_code: '001', prod_name: 'პამიდორი', price: 2, quantity: 5), create_item(bar_code: '002', prod_name: 'კიტრი', price: 3, quantity: 10)]
+    @waybill = create_waybill(items: items)
+    @waybill.driver_name = nil
+    @waybill.check_buyer_tin = false
+    RS.wb.save_waybill(@waybill)
+  end
+  subject { @waybill }
+  its(:id) { should == 0 }
+  its(:error_code) { should == -1013 }
+end

data/spec/requests/waybill_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe 'Save waybill' do
   before(:all) do
     items = [create_item(bar_code: '001', prod_name: 'პამიდორი', price: 2, quantity: 5), create_item(bar_code: '002', prod_name: 'კიტრი', price: 3, quantity: 10)]
-    @waybill = create_waybill(items: items)
+    @waybill = create_waybill(transport_type_id: RS::TRANS_VEHICLE, car_number: 'abc123', car_number_trailer: 'de45', items: items)
     RS.wb.save_waybill(@waybill)
   end
   context 'waybill' do
@@ -33,6 +33,8 @@ describe 'Save waybill' do
     its(:activate_date) { should be_nil }
     its(:close_date) { should be_nil }
     its(:delivery_date) { should be_nil }
+    its(:car_number) { should == 'abc123' }
+    its(:car_number_trailer) { should == 'de45' }
   end
 end
 
@@ -63,7 +65,7 @@ describe 'Resave waybill' do
     specify { subject.items.size.should == 1 }
   end
 end
-
+ 
 describe 'Activate waybill' do
   context 'with begin_date' do
     before(:all) do
@@ -73,7 +75,7 @@ describe 'Activate waybill' do
       ]
       @waybill = create_waybill(items: items)
       RS.wb.save_waybill(@waybill)
-      @resp = RS.wb.activate_waybill(id: @waybill.id, date: Time.now)
+      @resp = RS.wb.activate_waybill(id: @waybill.id, date: Time.now + 1800)
       @waybill = RS.wb.get_waybill(id: @waybill.id)
     end
     subject { @waybill }
@@ -131,20 +133,20 @@ describe 'Close waybill' do
         create_item(bar_code: '001', prod_name: 'iPhone 4S 3G/32GB', price: 1800, quantity: 2),
         create_item(bar_code: '002', prod_name: 'The New iPad 3G/16GB', price: 1200, quantity: 1)
       ]
-      @waybill = create_waybill(items: items)
-      RS.wb.save_waybill(@waybill)
-      RS.wb.activate_waybill(id: @waybill.id, date: Time.now)
-      @resp = RS.wb.close_waybill(id: @waybill.id, date: Time.now)
-      @waybill = RS.wb.get_waybill(id: @waybill.id)
+      waybill = create_waybill(items: items)
+      RS.wb.save_waybill(waybill)
+      RS.wb.activate_waybill(id: waybill.id, date: Time.now + 1800)
+      @resp = RS.wb.close_waybill(id: waybill.id, date: Time.now + 3600)
+      @waybill = RS.wb.get_waybill(id: waybill.id)
     end
     subject { @waybill }
     its(:id) { should_not be_nil }
     its(:total) { should == 4800 }
     its(:number) { should_not be_nil }
-    specify { @resp.should == true }
     its(:status) { should == RS::Waybill::STATUS_CLOSED }
     its(:activate_date) { should_not be_nil }
     its(:delivery_date) { should_not be_nil }
+    specify { @resp.should == true }
   end
   context 'without delivery_date' do
     before(:all) do
@@ -209,3 +211,72 @@ describe 'Deactivate waybill' do
     its(:status) { should == RS::Waybill::STATUS_DEACTIVATED }
   end
 end
+
+describe 'Distrib waybill -> sub waybill' do
+  before(:all) do
+    items = [create_item(bar_code: '001', prod_name: 'პამიდორი', price: 2, quantity: 5), create_item(bar_code: '002', prod_name: 'კიტრი', price: 3, quantity: 10)]
+    @waybill = create_waybill(type: RS::WAYBILL_TYPE_DISTR, transport_type_id: RS::TRANS_VEHICLE, car_number: 'abc123', car_number_trailer: 'de45', items: items)
+    RS.wb.save_waybill(@waybill)
+    RS.wb.activate_waybill(id: @waybill.id)
+    @waybill = RS.wb.get_waybill(id: @waybill.id)
+  end
+  context 'waybill' do
+    subject { @waybill }
+    its(:id) { should_not be_nil }
+    its(:id) { should > 0 }
+    its(:type) { should == RS::WAYBILL_TYPE_DISTR }
+    its(:buyer_tin) { should == nil }
+    its(:status) { should == RS::Waybill::STATUS_ACTIVE }
+  end
+  context 'create sub-waybill' do
+    before(:all) do
+      items = [create_item(bar_code: '001', prod_name: 'პამიდორი', price: 2, quantity: 2), create_item(bar_code: '002', prod_name: 'კიტრი', price: 3, quantity: 5)]
+      @sub_waybill = create_waybill(type: RS::WAYBILL_TYPE_SUBWB, parent_id: @waybill.id, items: items)
+      RS.wb.save_waybill(@sub_waybill)
+      RS.wb.activate_waybill(id: @sub_waybill.id)
+      @sub_waybill = RS.wb.get_waybill(id: @sub_waybill.id)
+    end
+    context do
+      subject { @sub_waybill }
+      its(:id) { should_not be_nil }
+      its(:id) { should > 0 }
+      its(:type) { should == RS::WAYBILL_TYPE_SUBWB }
+      its(:seller_id) { should == @waybill.seller_id }
+      its(:status) { should == RS::Waybill::STATUS_ACTIVE }
+      its(:parent_id) { should == @waybill.id }
+    end
+    context 'update sub-waybill (correct quantities)' do
+      before(:all) do
+        @sub_waybill.items[0].quantity = 5
+        RS.wb.save_waybill(@sub_waybill)
+      end
+      subject { @sub_waybill }
+      its(:error_code) { should == 0 }
+      specify { subject.items.first.quantity.should == 5 }
+    end
+    context 'update sub-waybill (incorrect quantities)' do
+      before(:all) do
+        @sub_waybill.items[0].quantity = 100
+        RS.wb.save_waybill(@sub_waybill)
+      end
+      subject { @sub_waybill }
+      # XXX: ეს ძალიან ცუდია! rs.ge სერვისი არ ამოწმებს ნაშთების უარყოფითობას
+      its(:error_code) { should == 0 }
+    end
+  end
+end
+
+describe 'Return waybill' do
+  before(:all) do
+    items = [create_item(bar_code: '001', prod_name: 'პამიდორი', price: 2, quantity: 5), create_item(bar_code: '002', prod_name: 'კიტრი', price: 3, quantity: 10)]
+    @waybill = create_waybill(type: RS::WAYBILL_TYPE_RETRN, transport_type_id: RS::TRANS_VEHICLE, car_number: 'abc123', items: items)
+    RS.wb.save_waybill(@waybill)
+    RS.wb.activate_waybill(id: @waybill.id)
+    @waybill = RS.wb.get_waybill(id: @waybill.id)
+  end
+  subject { @waybill }
+  its(:type) { should == RS::WAYBILL_TYPE_RETRN }
+  its(:id) { should_not be_nil }
+  its(:id) { should > 0 }
+  its(:number) { should_not be_nil }
+end

data/spec/spec_helper.rb

@@ -11,7 +11,6 @@ end
 
 # RSpec
 
-require 'rs'
 require 'rspec'
 
 RSpec.configure do |config|
@@ -20,7 +19,16 @@ end
 
 # Test options.
 
+require 'rs'
 require 'helpers'
 
-RS.config.su = 'dimtiri1979'
-RS.config.sp = '123456'
+TEST_USERNAME = 'tbilisi'
+TEST_PASSWORD = '123456'
+RS.config.su = RS::BaseRequest::DEFAULTS[:su]
+RS.config.sp = RS::BaseRequest::DEFAULTS[:sp]
+RS.config.user_id = RS::BaseRequest::DEFAULTS[:user_id]
+RS.config.payer_id = RS::BaseRequest::DEFAULTS[:payer_id]
+
+# ეს განახლება საჭიროა, რათა სატესტო მომხმარებელი მუშაობდეს იგივე IP მისამართიდან, საიდანაც ეშვება ეს ტესტები.
+# IP მისამართით შეზღუდვა მნიშვნელვანია ანგარიშ-ფაქტურის სერვისებისთვის!
+RS.sys.update_user(username: TEST_USERNAME, password: TEST_PASSWORD, ip: RS.sys.what_is_my_ip, name: 'invoice.ge', su: RS.config.su, sp: RS.config.sp)

metadata

@@ -1,98 +1,84 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rs.ge
-version: !ruby/object:Gem::Version
-  version: 0.1.0.rc2
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 0.1.0
 platform: ruby
-authors:
+authors: 
 - Dimitri Kurashvili
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-23 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        version: "2"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: savon
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: prawn
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.12'
+      - !ruby/object:Gem::Version 
+        version: "1.0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: prawn
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.12'
-- !ruby/object:Gem::Dependency
-  name: c12-commons
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.5
+      - !ruby/object:Gem::Version 
+        version: "0.12"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: c12-commons
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.0.5
+  type: :runtime
+  version_requirements: *id004
 description: Ruby client for rs.ge web services
-email:
+email: 
 - dimitri@c12.ge
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
-- .project
 - .rspec
 - Gemfile
 - README.md
 - Rakefile
 - lib/rs.rb
+- lib/rs/models/factura.rb
+- lib/rs/models/initializable.rb
 - lib/rs/models/waybill.rb
 - lib/rs/requests/base.rb
 - lib/rs/requests/config.rb
 - lib/rs/requests/dict.rb
+- lib/rs/requests/factura.rb
 - lib/rs/requests/sys.rb
 - lib/rs/requests/waybill.rb
 - lib/rs/version.rb
@@ -100,39 +86,46 @@ files:
 - spec/helpers.rb
 - spec/models/waybill_spec.rb
 - spec/requests/dict_spec.rb
+- spec/requests/factura_spec.rb
 - spec/requests/invoice_spec.rb
 - spec/requests/sys_spec.rb
+- spec/requests/waybill_driver_spec.rb
 - spec/requests/waybill_spec.rb
 - spec/spec_helper.rb
 homepage: http://c12.ge
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
-      version: 1.3.1
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: rs
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: rs.ge web services
-test_files:
+test_files: 
 - spec/helpers.rb
 - spec/models/waybill_spec.rb
 - spec/requests/dict_spec.rb
+- spec/requests/factura_spec.rb
 - spec/requests/invoice_spec.rb
 - spec/requests/sys_spec.rb
+- spec/requests/waybill_driver_spec.rb
 - spec/requests/waybill_spec.rb
 - spec/spec_helper.rb

data/.project

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>rs.ge</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>