cats_core 1.3.25 → 1.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b3911b5d99f63d3bf4e2f3b1f6a1a1cf64107affebb1eed6e33c69a51a38d28
-  data.tar.gz: 7be0d6a7f7dfe4e92541d44655a41d35450d9e782dc7b6436b52ecdca20f6647
+  metadata.gz: 80cc6224c33fc3ce6d25d558a188ae7db720f032ae1dd18c39d2f74f67257eab
+  data.tar.gz: d866310b1bc91bc269538f80b9f944e3a2a4e1b6338490c209a74d343d897214
 SHA512:
-  metadata.gz: b828e8e63c64cd816007746b340ca942b875f702026e2d1949e3176f7235c7d373a8aedb782706a2921f1f918fef31ef3dc2df05ab4a80ef2072dd4e32c2d949
-  data.tar.gz: beac85a8bcfad3ab5278f99bcb91eab751ebfb82d7ac10feb00e67e753d4831ed8a8a9f8b49524c65e8f7dc4811bd3c0e0cc2451c65be220c4dea22bef21c511
+  metadata.gz: f79355635f4c3fe924a112d88967a39140c47dd864b6ee3bb565093e8ec6768c8d973695dad89c822a69f2ae1bd5ff77e3650a7a05b4073ebeb73cb60ed04065
+  data.tar.gz: 0c66c37c48a2791a5726b107d840dcaddb6012f79d8998839d7995535cde0e5e89ca0b0198e5d0da5431d8a4e6e6fedd238c244e2816ae6f7ad24e897f3e17cc

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

@@ -14,9 +14,19 @@ module Cats
 
       # Arrival Statuses
       AT_SOURCE = 'At Source'.freeze
-      IN_TRANSIT = 'In Transit'.freeze
+      AT_ORIGIN_PORT = 'At Origin Port'.freeze
+      IN_LOCAL_TRANSIT = 'In Local Transit'.freeze
+      IN_INTERNATIONAL_TRANSIT = 'In International Transit'.freeze
+      AT_DESTINATION_PORT = 'At Destination Port'.freeze
       ARRIVED = 'Arrived'.freeze
-      ARRIVAL_STATUSES = [AT_SOURCE, IN_TRANSIT, ARRIVED].freeze
+      ARRIVAL_STATUSES = [
+        AT_SOURCE,
+        AT_ORIGIN_PORT,
+        IN_LOCAL_TRANSIT,
+        IN_INTERNATIONAL_TRANSIT,
+        AT_DESTINATION_PORT,
+        ARRIVED
+      ].freeze
 
       belongs_to :unit_of_measure
       belongs_to :source, polymorphic: true

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

@@ -11,7 +11,7 @@ module Cats
       belongs_to :commodity_category, optional: true
       belongs_to :unit_of_measure, optional: true
 
-      validates :reference_no, :amount, :donation_type, :donated_on, presence: true
+      validates :reference_no, :amount, :donation_type, :donated_on, :agency, presence: true
       validates :reference_no, uniqueness: true
       validates :donation_type, inclusion: { in: DONATION_TYPES }
       validates :currency, presence: true, if: -> { donation_type == CASH }

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

@@ -4,12 +4,14 @@ module Cats
       belongs_to :donation, optional: true
       belongs_to :commodity_category
       belongs_to :unit_of_measure
+      belongs_to :destination_warehouse, class_name: 'Cats::Core::Location'
 
       validates :reference_no, presence: true, uniqueness: true
-      validates :gift_date, :quantity, presence: true
+      validates :gift_date, :quantity, :requested_by, :request_reference, presence: true
       validates :quantity, numericality: { greater_than: 0 }
 
       delegate(:name, to: :commodity_category, prefix: true)
+      delegate(:name, to: :destination_warehouse, prefix: true)
       delegate(:abbreviation, to: :unit_of_measure, prefix: true)
 
       before_validation :set_commodity_category

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

@@ -15,6 +15,7 @@ module Cats
       validates :quantity, numericality: { greater_than: 0 }
 
       delegate(:name, to: :commodity_category, prefix: true)
+      delegate(:name, to: :unit, prefix: true)
 
       after_create :update_donation
 

data/db/migrate/20210717032330_create_cats_core_donations.rb

@@ -4,7 +4,9 @@ class CreateCatsCoreDonations < ActiveRecord::Migration[6.1]
       t.string :reference_no, unique: true
       t.string :description
       t.string :donation_type, null: false
+      t.string :shipping_reference
       t.date :donated_on, null: false
+      t.string :agency, null: false
       t.references :donor,
                    null: false,
                    index: { name: 'donor_on_donation_indx' },

data/db/migrate/20210717032602_create_cats_core_gift_certificates.rb

@@ -24,8 +24,15 @@ class CreateCatsCoreGiftCertificates < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'uom_on_gc_indx' },
                    foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.references :destination_warehouse,
+                   null: false,
+                   index: { name: 'dw_on_gc_indx' },
+                   foreign_key: { to_table: :cats_core_locations }
       t.float :estimated_price
       t.float :estimated_tax
+      t.string :registration_no
+      t.string :requested_by, null: false
+      t.string :request_reference, null: false
 
       t.timestamps
     end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.3.25'.freeze
+    VERSION = '1.3.29'.freeze
   end
 end

data/spec/factories/cats/core/donations.rb

@@ -3,7 +3,9 @@ FactoryBot.define do
     reference_no { FFaker::Name.name }
     description { FFaker::Name.name }
     donation_type { Cats::Core::Donation::KIND }
+    shipping_reference { FFaker::Name.name }
     donated_on { Date.today }
+    agency { 'WFP' }
     donor
     plan
     amount { 100 }

data/spec/factories/cats/core/gift_certificates.rb

@@ -5,6 +5,7 @@ FactoryBot.define do
     donation
     commodity_category { donation.commodity_category }
     unit_of_measure
+    destination_warehouse factory: :warehouse
     vessel { FFaker::Name.name }
     port { FFaker::Name.name }
     customs_declaration_no { FFaker::Name.name }
@@ -14,5 +15,8 @@ FactoryBot.define do
     quantity { 1.5 }
     estimated_price { 1.5 }
     estimated_tax { 1.5 }
+    registration_no { FFaker::Name.name }
+    requested_by { FFaker::Name.name }
+    request_reference { FFaker::Name.name }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.3.25
+  version: 1.3.29
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers