cats_core 1.4.25 → 1.4.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad828e18f9f084f3c2e0343af564a1f1cc4832e935c9eec068503f4293442b87
-  data.tar.gz: 8e0520ff2a6df1e2b4dd3f726a60aef02ef45915158c72c73ccbc74a9ae2786d
+  metadata.gz: 67116f414334d42cf370f7a2ec48cf137bd1ac0c8d1345e0ce5c99f8fc87c57c
+  data.tar.gz: 0fc96065462743887b84a6bc750f97d52bd1f047a32c71fa1b70bb3eda9148cb
 SHA512:
-  metadata.gz: cc1d8fc0861a5f8c46734cbbf029608625e8734d31361cf924834769166cc6d429f247b169b299616a5bedcf9dffd0cdc2ad4960e4caa502757a1a98cfd55865
-  data.tar.gz: '0850a3f89b88aea548765a78f46a8d4cac259642dc3f8c15837ab54c1d5c7911b311b8b55719972fe19312cf614d07042652376556a134ea2e20c8b1f7227fc1'
+  metadata.gz: 148225081058c17d1435f7888da4076ecfacb458a37154e64fd5eabe1fb3470cc3ff4fcafa696db893eb3d3a70ad90920cb25b408723fd4140b3a6e1f70d02ea
+  data.tar.gz: a7ee6bc61afe79bfbb22d65a02852ea00a0872971c023fd0783f30de6f33b59eb47a4807887b239aa8e54996eca58924fdae8321c73c1af2db078e193f39067d

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

@@ -17,6 +17,23 @@ module Cats
         render json: { success: false, error: e.message }
       end
 
+      def stack
+        service = AuthorizationService.new
+        authorization = ReceiptAuthorization.find(params[:id])
+        authorization = service.stack(authorization.id)
+        render json: { success: true, data: serialize(authorization) }
+      rescue StandardError => e
+        render json: { success: false, error: e.message }
+      end
+
+      def storekeeper_authorizations
+        storekeeper = User.find(params[:id])
+        status = params[:status]
+        stores = storekeeper.stores
+        authorizations = ReceiptAuthorization.where(store: stores, status: status)
+        render json: { success: true, data: serialize(authorizations) }
+      end
+
       private
 
       def model_params

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

@@ -5,11 +5,10 @@ module Cats
       APPROVED = 'Approved'.freeze
       READY_TO_START = 'Ready to Start'.freeze
       STARTED = 'Started'.freeze
-      ARRIVED = 'Arrived'.freeze
-      UNLOADED = 'Unloaded'.freeze
       RECEIVED = 'Received'.freeze
+      STACKED = 'Stacked'.freeze
 
-      DISPATCH_STATUSES = [DRAFT, APPROVED, READY_TO_START, STARTED, ARRIVED, UNLOADED, RECEIVED].freeze
+      DISPATCH_STATUSES = [DRAFT, APPROVED, READY_TO_START, STARTED, RECEIVED, STACKED].freeze
 
       belongs_to :prepared_by, class_name: 'Cats::Core::User'
       belongs_to :transporter
@@ -73,12 +72,24 @@ module Cats
         save!
       end
 
+      def receive
+        raise(StandardError, 'Dispatch is not started.') unless dispatch_status == Dispatch::STARTED
+
+        self.dispatch_status = RECEIVED
+        save!
+      end
+
+      def stack
+        self.dispatch_status = STACKED
+        save!
+      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]
+                               dispatch_status: [APPROVED, STARTED]
                              )
         dispatches.map do |dispatch|
           {

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

@@ -18,8 +18,28 @@ module Cats
           authorization.save!
           raise(StandardError, 'Pin has expired.')
         end
+
         authorization.driver_confirmed = true
         authorization.save!
+        statuses = authorization.dispatch.receipt_authorizations.map(&:driver_confirmed).uniq
+        authorization.dispatch.receive if statuses.length == 1 && statuses[0]
+
+        authorization
+      end
+
+      def stack(authorization_id)
+        authorization = ReceiptAuthorization.find(authorization_id)
+        unless authorization.dispatch.dispatch_status == Dispatch::RECEIVED
+          raise(StandardError, 'Dispatch is not received.')
+        end
+
+        total = authorization.transactions.sum(:quantity)
+        if total != authorization.received_quantity
+          raise(StandardError, 'Received quantity is not the same as quantity to be stacked.')
+        end
+
+        authorization.transactions.each(&:commit)
+        authorization.dispatch.stack
         authorization
       end
     end

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

@@ -34,13 +34,10 @@ module Cats
         end
       end
 
-      def receipt_stacks(receipt)
-        location = receipt.dispatch.dispatch_plan_item.destination
-        warehouses = location.children
-        stores = Store.where(warehouse: warehouses)
-
-        commodity = receipt.dispatch.dispatch_plan_item.commodity
-        Stack.where(commodity: commodity, store: stores)
+      def receipt_stacks(authorization_id)
+        authorization = ReceiptAuthorization.find(authorization_id)
+        commodity = authorization.dispatch.dispatch_plan_item.commodity
+        Stack.where(commodity: commodity, store_id: authorization.store_id)
       end
 
       def dispatch_stacks(dispatch)

data/config/routes.rb

@@ -119,10 +119,16 @@ Cats::Core::Engine.routes.draw do
   end
 
   get(
-    '/storekeeper/:id/authorizations',
+    '/storekeeper/:id/dispatch_authorizations',
     controller: :dispatch_authorizations,
     action: :storekeeper_authorizations,
-    as: :storekeeper_authorizations
+    as: :storekeeper_dispatch_authorizations
+  )
+  get(
+    '/storekeeper/:id/receipt_authorizations',
+    controller: :receipt_authorizations,
+    action: :storekeeper_authorizations,
+    as: :storekeeper_receipt_authorizations
   )
   resources :receipt_authorizations, except: %i[index destroy] do
     member do
@@ -130,6 +136,7 @@ Cats::Core::Engine.routes.draw do
       get 'lost', controller: :lost_commodities, action: :index
       get 'receipts', controller: :receipts, action: :index
       post 'confirm', controller: :receipt_authorizations, action: :confirm
+      post 'stack'
     end
   end
 

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.25'.freeze
+    VERSION = '1.4.26'.freeze
   end
 end

metadata

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