cats_core 1.4.19 → 1.4.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f2cc951417c8b5c1586ad4deb540c51e54177eac53c54a689f31c35bfbfbb67
-  data.tar.gz: f25cbb325f2eb8b8c9081ec0660b3c3028fe45ee0b7f003c40e96c91cdfebd15
+  metadata.gz: d78b456ef9b9082680246207509f81b33ba4c9584136bafc00ac1dd9085e77cb
+  data.tar.gz: f1138cb24c4f94d7c42dd84b15916762c1f27c321531b1057f2b9e96a2da5c75
 SHA512:
-  metadata.gz: 610169114a8fd878d1fd47b771f55a5bfef3e79c3d660b8148642a8fd9def6e018f4cea2b6cda50ee381970f2bee3e9e98ff5d5f0a3f66436d340b8334e4bf75
-  data.tar.gz: b0d90834aba82fd86dfb53bd6b51a875ff1131c4a3096813d6132efc860915e89ea4dd63c7272518158af8c0d21b355557e055b86d08938e82f063ce743a8f0a
+  metadata.gz: 74b5f1fc12c9851dd07224c07b6a00912d44012f2347f87b3264cad20882f5950b9d27d9820c3c0b1526e26f32dfb83ee16263d77b4bcf2efdcd8f5ca30aaef9
+  data.tar.gz: 349b6c6a81040bf195ea723e9920f97711be1dce7c4257a5c7f03459d4b0cebd3d59ae650265ed952791c85330891df00d51c621c81c4948c85819f30ce07903

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

@@ -59,7 +59,7 @@ module Cats
           # Commit transactions
           dispatch_transactions.each(&:commit)
           self.quantity = total_quantity
-          self.dispatch_status = Dispatch::APPROVED
+          self.dispatch_status = APPROVED
           save!
         end
       end
@@ -67,7 +67,7 @@ module Cats
       def start
         raise(StandardError, 'Dispatch has to be approved first.') unless dispatch_status == Dispatch::APPROVED
 
-        self.dispatch_status = Dispatch::STARTED
+        self.dispatch_status = STARTED
         save!
       end
 
@@ -83,12 +83,32 @@ module Cats
         end
 
         Dispatch.transaction do
-          self.dispatch_status = Dispatch::RECEIVED
+          self.dispatch_status = RECEIVED
           receipts.each { |r| r.status = Receipt::CONFIRMED }
           save!
           receipts.each(&:save!)
         end
       end
+
+      def self.search_commodity(batch_no)
+        commodity = Commodity.find_by(batch_no: batch_no)
+        dispatches = Dispatch.includes(:dispatch_transactions)
+                             .joins(:transporter)
+                             .where(
+                               dispatch_status: [APPROVED, STARTED, ARRIVED, UNLOADED]
+                             )
+        dispatches.map do |dispatch|
+          {
+            batch_no: batch_no,
+            commodity_name: commodity.name,
+            quantity: dispatch.total_quantity,
+            unit: commodity.unit_abbreviation,
+            location: dispatch.transporter.name,
+            location_detail: "Plate No.: #{dispatch.plate_no}, Driver: #{dispatch.driver_name}",
+            stack: ''
+          }
+        end
+      end
     end
   end
 end

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

@@ -146,6 +146,25 @@ module Cats
 
         store.save
       end
+
+      def self.search_commodity(batch_no)
+        commodity = Commodity.find_by(batch_no: batch_no)
+        stacks = Stack.joins(:commodity, store: :warehouse).where(
+          commodity: { batch_no: batch_no },
+          stack_status: Stack::ALLOCATED
+        )
+        stacks.map do |stack|
+          {
+            batch_no: batch_no,
+            commodity_name: commodity.name,
+            quantity: stack.quantity,
+            unit: commodity.unit_abbreviation,
+            location: stack.store.warehouse.name,
+            location_detail: stack.store.name,
+            stack: stack.code
+          }
+        end
+      end
     end
   end
 end

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

@@ -36,7 +36,7 @@ module Cats
 
         errors.add(:status, 'cannot be set to "APPROVED" because the order has no items.') if status == APPROVED
       end
-      
+
       def approve(user)
         raise(StandardError, 'Transport order is already approved.') if status == APPROVED
 

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.19'.freeze
+    VERSION = '1.4.20'.freeze
   end
 end

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

@@ -3,6 +3,6 @@ FactoryBot.define do
     region factory: :location
     source factory: :woreda
     destination factory: :woreda
-    name { "#{source.name} - #{destination.name}"}
+    name { "#{source.name} - #{destination.name}" }
   end
 end

metadata

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