money_s3 2.3.0 → 2.4.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e684ed7fab904743bc20497e24eb0d5912ce2e324cc33f7c2682207dbd9e4a69
4
- data.tar.gz: 5527507f024ac22534bd24fa722007674098218f7e3e5d0f2c8a3bf59139269f
3
+ metadata.gz: 1c7d18e475496bb9a5557afdb5db6beab7d2c79d33ba6f1a51327e1d1aa9076a
4
+ data.tar.gz: 81723dbcd3c9a8f194162c5adde17947149267ba65f389ca5d7646be0c04c990
5
5
  SHA512:
6
- metadata.gz: 5736e0747765260d14c700a5e1bc783709e8218d50ff250e23f56ec64bf92f6da78b0767d879fe237be7a9c26f4c794f9786d7933c781d85f73a708c9379bb2c
7
- data.tar.gz: a35800cb1a25166b5f31906d30aa88512decd57563212df27bc23d41e290f40ce0946a4dfe444330c838d3f37a0d4701a0f9d097b282b73825bf0b4719be0b6e
6
+ metadata.gz: 1be862e0cfcbe4f2b4b82ebd717199acb876d2704ccd4960dc2b30ac370712544a695de7e7751f141832bab2b68c865c80c61847f029aafe847269acdaa89236
7
+ data.tar.gz: 55ef7442f721afaa7adc13cb822b2239f8fcef07f0b651f4845d3e04e382cd159029ff31c0dc2533a8aa9bba25b2ccacf8a7c5d1496fe69a684ccdd3f1d63af6
@@ -37,6 +37,14 @@ module MoneyS3
37
37
  ad_kod: item[:counterparty_bank_code].to_s
38
38
  }
39
39
 
40
+ if item[:rule]
41
+ data.merge!({ pr_kont: item[:rule] })
42
+ end
43
+
44
+ if item[:vat_rule]
45
+ data.merge!({ cleneni: item[:vat_rule] })
46
+ end
47
+
40
48
  if item[:foreign_currency_code]
41
49
  data.merge!({
42
50
  valuty: {
@@ -55,19 +63,23 @@ module MoneyS3
55
63
  fail "Unknown transaction type: #{transaction_type}" unless TRANSACTION_TYPES.include? transaction_type
56
64
 
57
65
  if transaction_type == :credit
58
- data.merge!({
66
+ defaults = {
59
67
  vydej: '0',
60
68
  pr_kont: @credit_transactions_rule,
61
69
  cleneni: @credit_transactions_vat_rule,
62
70
  d_rada: @credit_transactions_series
63
- })
71
+ }
72
+
73
+ data = defaults.merge(data)
64
74
  else
65
- data.merge!({
75
+ defaults = {
66
76
  vydej: '1',
67
77
  pr_kont: @debit_transactions_rule,
68
78
  cleneni: @debit_transactions_vat_rule,
69
79
  d_rada: @debit_transactions_series
70
- })
80
+ }
81
+
82
+ data = defaults.merge(data)
71
83
  end
72
84
 
73
85
  data.delete_if { |_, v| v.nil? || v == '' }
data/money_s3.gemspec CHANGED
@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
3
3
 
4
4
  Gem::Specification.new do |spec|
5
5
  spec.name = 'money_s3'
6
- spec.version = '2.3.0'
6
+ spec.version = '2.4.0'
7
7
  spec.authors = ['Premysl Donat']
8
8
  spec.email = ['pdonat@seznam.cz']
9
9
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: money_s3
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.0
4
+ version: 2.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Premysl Donat
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-06-08 00:00:00.000000000 Z
11
+ date: 2021-03-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: ox
@@ -586,7 +586,7 @@ homepage: https://github.com/Masa331/moneys3
586
586
  licenses:
587
587
  - MIT
588
588
  metadata: {}
589
- post_install_message:
589
+ post_install_message:
590
590
  rdoc_options: []
591
591
  require_paths:
592
592
  - lib
@@ -601,8 +601,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
601
601
  - !ruby/object:Gem::Version
602
602
  version: '0'
603
603
  requirements: []
604
- rubygems_version: 3.1.2
605
- signing_key:
604
+ rubygems_version: 3.1.4
605
+ signing_key:
606
606
  specification_version: 4
607
607
  summary: MoneyS3 XML parser and builder
608
608
  test_files: []