cats_core 1.5.4 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9a6ea1b862a6804a3e215898c7aac9966ffedbdf7aa3c8d9661f9356c4b8a24
-  data.tar.gz: f08e17d946b62d02d148cffbe97ab52c9b1f113245d4dffca6f5d67256ec7ea0
+  metadata.gz: 3cb500b5c99210b40ab7cd416cd861caf4cd61528515e5317ba1abc9690ab2a9
+  data.tar.gz: 4279dca09b00c065f1c4568c12baa404970ce8fa093d0eba4939e232eb849692
 SHA512:
-  metadata.gz: ea2045f6a7a7954a4157952747c932e096f5df6e8ab2a56e888ca1f656a85eb7bd08a572ad0f15a05b53b0defc51354c27755be960c69c4c0ec49b232ad9b5db
-  data.tar.gz: d91d382689b7abab6221e64457123334bc93bc0357ffdf6eb28e71466d46183ba3aeab2b0d01b24abb0184a7b01b06ae5d0e2331220b710b3a193ac751061ad6
+  metadata.gz: e90c5c515b3fdd39a415dd6b174b0dddfac4775b067822aeec0dca3193125857fbc918cc46b04428a70badd5817353b2fd1eded643c387f66f1bbbbabc6014d3
+  data.tar.gz: 86ffddf979ddeead9980606491667acf4837606ef50d631230054c7e4c79180f7a2c6557f4aa747c0aa6ca918325a1045c7ae9a83bc86d8caa467e34284101d9

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

@@ -27,7 +27,7 @@ module Cats
       def model_params
         params.require(:payload).permit(:batch_no, :description, :unit_of_measure_id, :project_id, :commodity_grade,
                                         :source_type, :quantity, :best_use_before, :volume_per_metric_ton,
-                                        :arrival_status, :shipping_reference)
+                                        :arrival_status, :shipping_reference, :package_unit_id)
       end
     end
   end

data/app/models/cats/core/round_ration.rb

@@ -12,6 +12,8 @@ module Cats
       delegate(:name, to: :beneficiary_category, prefix: true)
       delegate(:abbreviation, to: :unit_of_measure, prefix: true)
       delegate(:reference_no, to: :round_plan, prefix: true)
+
+      alias_attribute :unit, :unit_of_measure
     end
   end
 end

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

@@ -13,17 +13,18 @@ module Cats
         rations = round_plan.round_rations
         plan = round_plan.plan
         no_of_days = plan.total_days / plan.rounds
+        mt = UnitOfMeasure.find_by(abbreviation: 'mt')
         round_plan.beneficiary_round_plan_items.each do |plan_item|
           round_rations = rations.select { |r| r.beneficiary_category_id == plan_item.beneficiary_category_id }
           round_rations.each do |ration|
+            quantity = (no_of_days / ration.no_of_days * ration.quantity) * plan_item.beneficiaries *
+                       round_plan.rounds.count
+            quantity = UnitConversion.convert(ration.unit, mt, quantity) if ration.unit.abbreviation.downcase != 'pcs'
+
             details << {
               beneficiary_round_plan_item_id: plan_item.id,
               round_ration_id: ration.id,
-              quantity: (
-                (no_of_days / ration.no_of_days * ration.quantity) *
-                plan_item.beneficiaries *
-                round_plan.rounds.count
-              )
+              quantity: quantity
             }
           end
         end

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

@@ -29,7 +29,9 @@ module Cats
             batch_no: item.commodity.batch_no,
             commodity_id: item.commodity_id,
             commodity_name: item.commodity.name,
-            unit: item.commodity.unit_abbreviation
+            unit: item.commodity.unit_abbreviation,
+            package_unit_id: item.commodity.package_unit_id,
+            package_unit_abbreviation: item.commodity.package_unit_abbreviation
           }
         end
       end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.5.4'.freeze
+    VERSION = '1.5.6'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.6
 platform: ruby
 authors:
 - Henock L.