cats_core 1.4.48 → 1.5.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: 6cd51ff40bb6a3dc2aa226e29abbcec7fe47e833095bfabfefbe6e32d4d15a28
4
- data.tar.gz: 05726c3a11c58983b9360d9ff8cf4384927148cc67d825e9b21114c823c07e78
3
+ metadata.gz: 2e0a949f1d6d4c3fb12100c1e48fe45adf7b9ee162a860e8bddcc1874a2b6d47
4
+ data.tar.gz: 794be08c30582fce8ee799b066e671e4e33c704e471c0488b802dabe9b242cc5
5
5
  SHA512:
6
- metadata.gz: bea7b46396f1f5ab18cb30d0fbacaa2275f72840fd0fa0d27a0e33cab49be523eb2ddcaa5747d15bb3a5a9120987cf59ee2cae402f2d0e282d6fe72d115f7ac3
7
- data.tar.gz: f7a48bf8792e57e5580a44e471a5efbf6e5a66aace12eb5b648685e7105e56b295c218ea6c7f4ad96cb31edadbe568245a3c781b16c1b483a120f777c55bee7b
6
+ metadata.gz: '017227618b009ffc97e886c60db1fd3148a82a78da58953bd6a131eb970b3dc2b3bbfcd01b2a84d893021abcb47b2b544a55f964d5030fc08f7ed8d80a662a7d'
7
+ data.tar.gz: d35ceb6e3605e816725b02a34f2ed888fa7db785e4b3139e3f1b5ae4d53a24b6629905b4c82835c56123e99163aaf5825d6215354e17b78e641543928b489291
@@ -32,6 +32,7 @@ module Cats
32
32
  store_keeper = User.find(params[:id])
33
33
  if store_keeper.details.key?('stores')
34
34
  store_keeper.details['stores'] -= store_params[:store_ids]
35
+ store_keeper.save!
35
36
  render json: { success: true, data: serialize(store_keeper) }
36
37
  else
37
38
  render json: { success: false, error: 'User has no stores assigned.' }
@@ -56,6 +56,12 @@ module Cats
56
56
  def quantity
57
57
  dispatch_plan_items.sum(:quantity)
58
58
  end
59
+
60
+ def region
61
+ return nil if dispatchable.instance_of?(RhnRequest)
62
+
63
+ dispatchable.region.name
64
+ end
59
65
  end
60
66
  end
61
67
  end
@@ -15,10 +15,18 @@ module Cats
15
15
  dispatch_plan_item.commodity.name
16
16
  end
17
17
 
18
- def woreda
18
+ def fdp
19
19
  dispatch_plan_item.destination.name
20
20
  end
21
21
 
22
+ def woreda
23
+ dispatch_plan_item.destination.parent.name
24
+ end
25
+
26
+ def zone
27
+ dispatch_plan_item.destination.parent.parent.name
28
+ end
29
+
22
30
  def region
23
31
  dispatch_plan_item.destination.root.name
24
32
  end
@@ -24,6 +24,8 @@ module Cats
24
24
  round_beneficiaries = []
25
25
  round_plan.round_plan_items.each do |rpi|
26
26
  fdp_beneficiaries = beneficiaries[rpi.fdp_id]
27
+ next unless fdp_beneficiaries
28
+
27
29
  fdp_beneficiaries.each_key do |key|
28
30
  category_rations = rations.select { |r| r.beneficiary_category_id == key }
29
31
  category_rations.each do |ration|
@@ -1,5 +1,5 @@
1
1
  module Cats
2
2
  module Core
3
- VERSION = '1.4.48'.freeze
3
+ VERSION = '1.5.0'.freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cats_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.48
4
+ version: 1.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Henock L.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-06-29 00:00:00.000000000 Z
11
+ date: 2022-07-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: active_model_serializers
@@ -122,6 +122,20 @@ dependencies:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
124
  version: 6.0.0
125
+ - !ruby/object:Gem::Dependency
126
+ name: sablon
127
+ requirement: !ruby/object:Gem::Requirement
128
+ requirements:
129
+ - - ">="
130
+ - !ruby/object:Gem::Version
131
+ version: '0'
132
+ type: :runtime
133
+ prerelease: false
134
+ version_requirements: !ruby/object:Gem::Requirement
135
+ requirements:
136
+ - - ">="
137
+ - !ruby/object:Gem::Version
138
+ version: '0'
125
139
  - !ruby/object:Gem::Dependency
126
140
  name: database_cleaner
127
141
  requirement: !ruby/object:Gem::Requirement