cats_core 1.4.18 → 1.4.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e9cb9c40a02753dac38f29bc222ca8f49af59d44f952126919be10544c4fe30
-  data.tar.gz: 6c96f5a25060732795cd874c04d8f41f711597015e0d49586bbbcf91b171a72f
+  metadata.gz: 88b37ea0943ecb3db77fd873889665d4a58f990cb712a75ca258897cc448bc6c
+  data.tar.gz: c4f897f6a36c0a5ce076d5ed144d342b82ef57ac8f3e226df6de84efa4f71daa
 SHA512:
-  metadata.gz: 28a2461af42fd0325081029bd524488716f838e4574ae2bec6589f328b2731189b0b108d9909e426734b502608c7a02de1cc3c1ab7514c12dd97c1a9b2a08a25
-  data.tar.gz: 7a9f3d7e2f05170d74387a034e2ef0c9205c9e1f1bc0d95dcb470fb29099e64a002d250d126f5cd098b1d01af8d7f5cd41d38f239e62bb66c1156107e6b1a2b0
+  metadata.gz: 3c706230ac9911c572bdb611f18a65f7e61afaf01f94c4a901298391c7f54b7637be9b9b54b02a63e817e621916931fffe7eca14481ecca649fc21af0f1f553a
+  data.tar.gz: c90b1ec96db1ccc7f20fae099366a4f1f5660905234a287ee7a6ccf7de16602e21c8dc653df35d1cfc5b1b722e8d2deace2374685a2c42b08263d3b113790c48

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

@@ -15,6 +15,7 @@ module Cats
       belongs_to :dispatch_plan_item
       has_many :receipts
       has_many :dispatch_transactions
+      has_many :receipt_transactions, through: :receipts
       has_many :lost_commodities
 
       validates :reference_no, :plate_no, :driver_name, :driver_phone, :quantity, :commodity_status, presence: true
@@ -59,7 +60,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 +68,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 +84,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

@@ -13,7 +13,7 @@ module Cats
 
       validates :status, presence: true, inclusion: { in: STATUSES }
       validates :order_date, presence: true
-      validate :validate_against_requisition
+      validate :validate_against_requisition, :validate_status
 
       delegate(:full_name, to: :prepared_by, prefix: true)
       delegate(:full_name, to: :approved_by, prefix: true, allow_nil: true)
@@ -26,6 +26,30 @@ module Cats
 
         errors.add(:transport_requisition, 'is not approved.')
       end
+
+      def validate_status
+        return unless status
+
+        return if status == DRAFT
+
+        return if transport_order_items.count.positive?
+
+        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
+
+        begin
+          self.status = APPROVED
+          self.approved_by = user
+          save!
+          self
+        rescue ActiveRecord::RecordInvalid => e
+          error = e.record.errors.full_messages_for(:status)[0]
+          raise(StandardError, error)
+        end
+      end
     end
   end
 end

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

@@ -26,11 +26,12 @@ module Cats
         quantities.sum
       end
 
-      def approve
+      def approve(user)
         raise(StandardError, 'Transport requisition is already approved.') if status == APPROVED
 
         begin
           self.status = APPROVED
+          self.approved_by = user
           save!
           self
         rescue ActiveRecord::RecordInvalid => e

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.18'.freeze
+    VERSION = '1.4.21'.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

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

@@ -9,8 +9,9 @@ FactoryBot.define do
 
     trait :approved do
       after(:create) do |requisition|
+        user = create(:user)
         create(:transport_requisition_item, transport_requisition: requisition)
-        requisition.approve
+        requisition.approve(user)
       end
     end
   end

metadata

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