rs.ge 0.0.16 → 0.0.17
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/rs/dict.rb +2 -1
- data/lib/rs/version.rb +1 -1
- data/lib/rs/waybill.rb +12 -12
- data/spec/rs/dict_spec.rb +1 -0
- data/spec/rs/sys_spec.rb +1 -1
- metadata +4 -14
data/lib/rs/dict.rb
CHANGED
@@ -48,8 +48,9 @@ module RS
|
|
48
48
|
VEHICLE = 1
|
49
49
|
RAILWAY = 2
|
50
50
|
AIR = 3
|
51
|
+
TRAILER = 5
|
51
52
|
OTHERS = 4
|
52
|
-
NAMES = { VEHICLE => 'საავტომობილო', RAILWAY => 'სარკინიგზო', AIR => 'საავიაციო', OTHERS => 'სხვა' }
|
53
|
+
NAMES = { VEHICLE => 'საავტომობილო', RAILWAY => 'სარკინიგზო', AIR => 'საავიაციო', TRAILER => 'მისაბმელი', OTHERS => 'სხვა' }
|
53
54
|
|
54
55
|
attr_accessor :id, :name
|
55
56
|
|
data/lib/rs/version.rb
CHANGED
data/lib/rs/waybill.rb
CHANGED
@@ -308,22 +308,22 @@ module RS
|
|
308
308
|
RS.append_validation_error(@validation_errors, :items, 'ერთი საქონელი მაინც უნდა იყოს განსაზღვრული')
|
309
309
|
return
|
310
310
|
end
|
311
|
-
bar_codes = []
|
312
|
-
repeated_bar_codes = []
|
311
|
+
#bar_codes = []
|
312
|
+
#repeated_bar_codes = []
|
313
313
|
self.items.each do |item|
|
314
314
|
item.validate
|
315
315
|
@items_valid = false unless item.valid?
|
316
|
-
if not item.bar_code.nil? and not item.bar_code.strip.empty?
|
317
|
-
|
318
|
-
|
319
|
-
|
320
|
-
|
321
|
-
|
322
|
-
end
|
323
|
-
end
|
324
|
-
unless repeated_bar_codes.empty?
|
325
|
-
RS.append_validation_error(@validation_errors, :items, "დუბლირებული შტრიხ-კოდები: #{repeated_bar_codes.join(', ')}")
|
316
|
+
#if not item.bar_code.nil? and not item.bar_code.strip.empty?
|
317
|
+
# if bar_codes.include?(item.bar_code)
|
318
|
+
# repeated_bar_codes << item.bar_code unless repeated_bar_codes.include?(item.bar_code)
|
319
|
+
# else
|
320
|
+
# bar_codes << item.bar_code
|
321
|
+
# end
|
322
|
+
#end
|
326
323
|
end
|
324
|
+
#unless repeated_bar_codes.empty?
|
325
|
+
# RS.append_validation_error(@validation_errors, :items, "დუბლირებული შტრიხ-კოდები: #{repeated_bar_codes.join(', ')}")
|
326
|
+
#end
|
327
327
|
end
|
328
328
|
|
329
329
|
# ამოწმებს მყიდველის და მძღოლის შესაბამისობას მათ საიდენტიფიკაციო კოდებთან.
|
data/spec/rs/dict_spec.rb
CHANGED
data/spec/rs/sys_spec.rb
CHANGED
@@ -31,7 +31,7 @@ describe 'get service users' do
|
|
31
31
|
it('should not have empty ID') { subject.id.should_not be_nil }
|
32
32
|
it('should not have empty USER_NAME') { subject.user_name.should_not be_nil }
|
33
33
|
it('should not have empty PAYER_ID') { subject.payer_id.should_not be_nil }
|
34
|
-
it('should have correct IP') { subject.ip.should match IP_PATTERN }
|
34
|
+
#it('should have correct IP') { subject.ip.should match IP_PATTERN }
|
35
35
|
it('should have some NAME') { subject.name.should_not be_nil }
|
36
36
|
end
|
37
37
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rs.ge
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.17
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-
|
12
|
+
date: 2012-04-02 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rspec
|
@@ -161,19 +161,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
161
161
|
version: '0'
|
162
162
|
requirements: []
|
163
163
|
rubyforge_project: rs
|
164
|
-
rubygems_version: 1.8.
|
164
|
+
rubygems_version: 1.8.19
|
165
165
|
signing_key:
|
166
166
|
specification_version: 3
|
167
167
|
summary: rs.ge web services
|
168
|
-
test_files:
|
169
|
-
- spec/rs/car_spec.rb
|
170
|
-
- spec/rs/dict_spec.rb
|
171
|
-
- spec/rs/open_user.rb
|
172
|
-
- spec/rs/pdf_spec.rb
|
173
|
-
- spec/rs/sys_spec.rb
|
174
|
-
- spec/rs/waybill_delete_spec.rb
|
175
|
-
- spec/rs/waybill_invoice_spec.rb
|
176
|
-
- spec/rs/waybill_spec.rb
|
177
|
-
- spec/rs/waybill_validation_spec.rb
|
178
|
-
- spec/spec_helper.rb
|
168
|
+
test_files: []
|
179
169
|
has_rdoc:
|