cats_core 1.1.6 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc868538b2dd7c7fc157b0fd2c78c79a38b868c60a12e0e1ce6662a7dac01e3a
-  data.tar.gz: d20518593e2a0bc565a47d2b426794c16790bf45f1650feb2c3a7550fb610637
+  metadata.gz: ad7b5e46d923da177a938b7b5728a731a9ce0dc5368bd3c9acae0670a713cbab
+  data.tar.gz: 07b751a5a1eb18a7a3f9e4f4893ea1b21a9ac74c99c4e975c6fb132861e322b3
 SHA512:
-  metadata.gz: 5447be874ddfaa36956f09550a313ce4078440e0b0be91ceb0cc5d8f035236c71f823ce6f4adf88efba0e4db44a047595e9a56fa84032fe3f3b7c14f9b602126
-  data.tar.gz: 44ab9de9141a4957e53f7739a761e1127940b0dfa813ea8503a579a4036b71a6e522a86b029facf406354d0d826e007d1260023ea4daa99e5531a15407288567
+  metadata.gz: ca48a9753bfcaabe058712978d76f725502f89b3f4cdff386739dc881e3c737dcda23715b0dbb1cbdb7734c85275c5c0c135bb5a53e844a2eb61b4e3a17757eb
+  data.tar.gz: 2f0626ceca03fd6203818f948b5c98ee94161aa6014df76de98836d1a5d8be6c1939df2b23dc0ae7c8f9a9cd9fc6f59c1e5791f0bc6f776ff35e53494dd547f2

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

@@ -3,6 +3,11 @@ module Cats
     class DispatchTransactionsController < ApplicationController
       include Common
 
+      def index
+        transactions = Cats::Core::DispatchTransaction.where(destination_id: params[:id])
+        render json: { success: true, data: serialize(transactions) }
+      end
+
       private
 
       def model_params

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

@@ -13,6 +13,11 @@ module Cats
         render json: { success: true, data: serialize(parent.children) }
       end
 
+      def filter
+        query = Cats::Core::Location.ransack(params[:q])
+        render json: { success: true, data: serialize(query.result) }
+      end
+
       private
 
       def model_params

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

@@ -3,6 +3,11 @@ module Cats
     class ReceiptTransactionsController < ApplicationController
       include Common
 
+      def index
+        transactions = Cats::Core::ReceiptTransaction.where(source_id: params[:id])
+        render json: { success: true, data: serialize(transactions) }
+      end
+
       private
 
       def model_params

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

@@ -23,6 +23,8 @@ Cats::Core::Engine.routes.draw do
       get 'warehouses', controller: :users, action: :warehouses
     end
   end
+
+  post '/locations/filter', controller: :locations, action: :filter
   resources :locations, except: %i[destroy] do
     member do
       get 'children'
@@ -59,6 +61,7 @@ Cats::Core::Engine.routes.draw do
   get '/dispatches/search', controller: :dispatches, action: :search, as: :search_dispatches
   resources :dispatches, except: %i[index destroy] do
     member do
+      get 'transactions', controller: :dispatch_transactions, action: :index
       get 'receipts', controller: :receipts, action: :index
       get 'commodity'
       post 'approve'
@@ -66,12 +69,13 @@ Cats::Core::Engine.routes.draw do
       post 'confirm'
     end
   end
-  resources :dispatch_transactions, except: %i[new edit destroy]
+  resources :dispatch_transactions, except: %i[index new edit destroy]
   resources :receipts, except: %i[index new edit destroy] do
     member do
+      get 'transactions', controller: :receipt_transactions, action: :index
       post 'start_stacking'
-      post 'stack'
+      post 'finish_stacking'
     end
   end
-  resources :receipt_transactions, except: %i[new edit destroy]
+  resources :receipt_transactions, except: %i[index new edit destroy]
 end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.6'.freeze
+    VERSION = '1.1.10'.freeze
   end
 end

data/lib/cats_core.rb

@@ -5,3 +5,4 @@ require 'rolify'
 require 'jwt'
 require 'noticed'
 require 'active_model_serializers'
+require 'ransack'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.10
 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
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.1.4
+- !ruby/object:Gem::Dependency
+  name: ransack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: rolify
   requirement: !ruby/object:Gem::Requirement
@@ -273,6 +287,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