cats_core 1.5.9 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e361eda6ed26c77f5ada114d02094efb869df744edfcd13391d6562f8309b7fb
-  data.tar.gz: af9aa637888114575260726101e49b7a43b456e23ba1747d21bfddfc43da84ed
+  metadata.gz: '09ce93a7870328f70727526280966e0bde9b89ece1239cb5e1f58eafc63413d1'
+  data.tar.gz: d7aba66726c415bbf63819f989e4913a71c59297f07ef7c2bdeaeed3dee8f4dc
 SHA512:
-  metadata.gz: 378ea3f080575f6cf6253fd92626081ea1e069ebaa9fead9e6f4e9fbbe7f4d39f47405a116b98c230accfb422242a12a1f121437d43de1d51c540082ff02975b
-  data.tar.gz: 68818109735f77c62886c7e4366b9267dc2c61d3ff451a6c9d47d1daa8ea4e76321928001f304278b9ea39e1b22bc0526818d43c288db0ee4100286f19911fb4
+  metadata.gz: be96f20f54abce8196b082bc95fc0408d3fdfdd7e6e88f45e4b8b9f6d03317c7724e3e1eab4f948091d731caa6d0cc3513e3e477c5608105a069ae0b9ae3feb1
+  data.tar.gz: 3766fa26f634d71c0abb1783af2ffe7f34de84b5f6a9efe629ce755d4f744203f3fe05746ba956321209bf335ff71c953856455859bfb10ed9ff5e314a74ef9b

data/app/controllers/cats/core/stacks_controller.rb

@@ -24,6 +24,12 @@ module Cats
         service = StackService.new
         dispatch = Dispatch.find(params[:id])
         stacks = service.dispatch_stacks(dispatch)
+
+        # Filter for current user
+        if current_user.details.key?('stores')
+          stores = current_user.details['stores']
+          stacks = stacks.select { |stack| stores.include?(stack.store_id) }
+        end
         render json: { success: true, data: serialize(stacks) }
       end
 

data/app/services/cats/core/dispatch_plan_service.rb

@@ -87,8 +87,8 @@ module Cats
             woreda: detail.beneficiary_round_plan_item.round_plan_item.woreda.name,
             fdp: detail.beneficiary_round_plan_item.round_plan_item.fdp.name,
             commodity_category: detail.round_ration.commodity_category.name,
-            unit_id: detail.round_ration.unit_of_measure_id,
-            unit: detail.round_ration.unit_of_measure.abbreviation,
+            unit_id: detail.unit_id,
+            unit: detail.unit.abbreviation,
             quantity: detail.quantity,
             source_id: nil,
             destination_id: detail.beneficiary_round_plan_item.round_plan_item.fdp.id,

data/app/services/cats/core/round_plan_service.rb

@@ -19,9 +19,10 @@ module Cats
           round_rations.each do |ration|
             quantity = (no_of_days / ration.no_of_days * ration.quantity) * plan_item.beneficiaries *
                        round_plan.rounds.count
+            quantity = quantity.truncate(2)
             unit = ration.unit
             if ration.unit.abbreviation.downcase != 'pc'
-              quantity = UnitConversion.convert(unit, mt, quantity)
+              quantity = UnitConversion.convert(unit, mt, quantity).truncate(2)
               unit = mt
             end
 

data/app/services/cats/core/stack_service.rb

@@ -48,7 +48,7 @@ module Cats
         stores = Store.where(warehouse: warehouses)
 
         commodity = dispatch.dispatch_plan_item.commodity
-        Stack.where(commodity: commodity, store: stores)
+        Stack.where(commodity: commodity, store: stores, stack_status: Stack::ALLOCATED)
       end
     end
   end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.5.9'.freeze
+    VERSION = '1.5.11'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.5.11
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers