cats_core 1.1.5 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1edf27e2257545cf71d59da4348838a7d413911a3977e505e9ea38788bbf6bc0
-  data.tar.gz: 7b11450abaf98eed4cde168465e0f778be42026895d52883760bbe5cb0b571ae
+  metadata.gz: 1b8d65c21644b9d88b01ded686a1432c9f0ce96dc23dd302aa805de663396ab8
+  data.tar.gz: 654f7d01bc1134e647dae493931faf648083f2b27cffe6504d94a3775b121794
 SHA512:
-  metadata.gz: 26de9f25dc8533a8ad33089cedacf51feff5b7ecfba6c08bfa55d811e7672cd4892955bccdd853a7281ec677a31478c9e3f8ecc2e421c79cbdeb34559b15c7d2
-  data.tar.gz: 26c4b80b13de8a60a02545382205877c8a252beebf2943ca990860a5bd32652d1152b865a90940dc0a55eebfca1c3bde974bfb6dfa07addaf174c59a5e74674a
+  metadata.gz: c449b005efda44f929ca5ae00dc151b0824fd26d80abb01e8c64cb1e43ff7034139e2dee0aa7881306d9a42453b213a56cf54aaed153c7e282e7727ef1bbeab4
+  data.tar.gz: 8d846dccda8765c35d2a68f8bff83a6ea56aa6ffb992f7af2028ed9d2de5116d14c1ebc5e6f496934a803a65118c0c0bf6fd98061d1a220e0abe3bcced66ca06

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

@@ -4,7 +4,7 @@ module Cats
       include Common
 
       before_action :set_service, only: %i[create_receipt_authorization approve start search confirm]
-      before_action :set_dispatch, only: %i[approve start confirm]
+      before_action :set_dispatch, only: %i[approve start confirm commodity]
 
       def index
         dispatches = Cats::Core::Dispatch.where(allocation_item_id: params[:id])
@@ -56,6 +56,11 @@ module Cats
         render json: { success: true, data: serialize(data) }
       end
 
+      def commodity
+        data = @dispatch.allocation_item.allocation.commodity
+        render json: { success: true, data: serialize(data) }
+      end
+
       private
 
       def set_service

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

@@ -17,10 +17,10 @@ module Cats
         render json: { success: false, error: e.message }
       end
 
-      def stack
+      def finish_stacking
         receipt = Cats::Core::Receipt.find(params[:id])
         service = ReceiptService.new
-        result = service.stack(receipt)
+        result = service.finish_stacking(receipt)
         render json: { success: true, data: serialize(result) }
       rescue StandardError => e
         render json: { success: false, error: e.message }

data/app/serializers/cats/core/commodity_serializer.rb

@@ -0,0 +1,9 @@
+module Cats
+  module Core
+    class CommoditySerializer < ActiveModel::Serializer
+      attributes :id, :batch_no, :description, :unit_of_measure_id, :unit_of_measure_abbreviation, :source_id,
+                 :source_type, :source_reference_no, :quantity, :best_use_before, :volume_per_metric_ton,
+                 :commodity_category_id, :commodity_category_name, :arrival_status, :approved
+    end
+  end
+end

data/app/serializers/cats/core/location_serializer.rb

@@ -1,3 +1,3 @@
 class LocationSerializer < ActiveModel::Serializer
-  attributes :id, :name, :location_type, :description, :parent_id
+  attributes :id, :code, :name, :location_type, :description, :parent_id
 end

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

@@ -11,7 +11,7 @@ module Cats
         receipt
       end
 
-      def stack(receipt)
+      def finish_stacking(receipt)
         unless receipt.status == Cats::Core::Receipt::STACKING
           raise(StandardError, 'Receipt should be in stacking state.')
         end

data/config/routes.rb

@@ -60,6 +60,7 @@ Cats::Core::Engine.routes.draw do
   resources :dispatches, except: %i[index destroy] do
     member do
       get 'receipts', controller: :receipts, action: :index
+      get 'commodity'
       post 'approve'
       post 'start'
       post 'confirm'
@@ -69,7 +70,7 @@ Cats::Core::Engine.routes.draw do
   resources :receipts, except: %i[index new edit destroy] do
     member do
       post 'start_stacking'
-      post 'stack'
+      post 'finish_stacking'
     end
   end
   resources :receipt_transactions, except: %i[new edit destroy]

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.5'.freeze
+    VERSION = '1.1.9'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.9
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-26 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -273,6 +273,7 @@ files:
 - app/models/cats/core/user.rb
 - app/notifications/cats/core/simple_notification.rb
 - app/serializers/cats/core/commodity_category_serializer.rb
+- app/serializers/cats/core/commodity_serializer.rb
 - app/serializers/cats/core/currency_serializer.rb
 - app/serializers/cats/core/dispatch_serializer.rb
 - app/serializers/cats/core/dispatch_transaction_serializer.rb