cats_core 1.4.43 → 1.4.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6e5cfab401c5346af868d378d9a068b2cef5a154e803d5fd940f2d9bebdd8ff
-  data.tar.gz: de1ea59da4f3e9a283685e84813e2285202d707d9d5bac98d26abc4d87820ac5
+  metadata.gz: 35e8eb4c24f3e5499dae203f071d84e56efc538665557820ebb0c0c4b56a8d8e
+  data.tar.gz: fe6f7c522a28fcbdc53c0f61dfc7b0844970564de93952c134965055c0501cb3
 SHA512:
-  metadata.gz: 1d1ad46c73a7f35f1916fd9328dbef03cfeb3b6736566eac0c44ef2372bcea6dc6b804e313396c8ed7abe05a17ff2ae2f865a6b091337cbbab0e53f075938ac1
-  data.tar.gz: f9f9633161e3578d49ea763e6254cd18706ce7fb0abaf3673d8321e21399a16f4cc3aac607106117901eee84a15fd44e95ed8faffa56454786d51575d926f5c3
+  metadata.gz: 5fad95b3e3b72ab44e84cb72954d9f825a2ff40be3c615685be577fd49e54fb123f6e6b4be4ad42ea1008bd9f64c2e42091666fad8f1c7e6546cb6368e1ae83b
+  data.tar.gz: 385a523e608cf19f3871495b94d0b3c52621bb14caaaf164daf13c08509e24a64b3fe4a044443d0cef1952a6899ce1e760c9dcfbe04cae29265bb9f8819fd1f3

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

@@ -61,7 +61,7 @@ module Cats
           :dispatchable_type,
           items: %i[
             reference_no region zone woreda fdp commodity_category unit_id unit quantity source_id destination_id
-            commodity_id
+            commodity_id commodity_status
           ]
         )
       end

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

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

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

@@ -12,8 +12,8 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:reference_no, :lender, :agreement_date, :repayment_date, :quantity, :unit_id,
-                                        :commodity_category_id)
+        params.require(:payload).permit(:reference_no, :description, :lender, :agreement_date, :repayment_date,
+                                        :quantity, :unit_id, :commodity_category_id)
       end
     end
   end

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

@@ -17,7 +17,7 @@ module Cats
       def model_params
         params.require(:payload).permit(:reference_no, :order_date, :requisition_no, :supplier, :cash_donation_id,
                                         :commodity_category_id, :quantity, :purchase_type, :unit_id, :price,
-                                        :currency_id)
+                                        :currency_id, :description)
       end
     end
   end

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

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

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

@@ -12,9 +12,9 @@ module Cats
       private
 
       def model_params
-        params.require(:payload).permit(:reference_no, :swapper, :agreement_date, :issued_commodity_id,
-                                        :issued_quantity, :received_commodity_id, :received_quantity,
-                                        :issued_unit_id, :received_unit_id)
+        params.require(:payload).permit(:reference_no, :swapper, :agreement_date, :issued_commodity_id, :description,
+                                        :issued_quantity, :received_commodity_id, :received_quantity, :issued_unit_id,
+                                        :received_unit_id)
       end
     end
   end

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

@@ -60,7 +60,7 @@ module Cats
       def name
         # For this to be efficient, our query should use includes like
         # Commodity.includes(project: { source: commodity_category })
-        project.source.commodity_category.name
+        project.source.commodity_name
       end
 
       def validate_updateability

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

@@ -10,6 +10,10 @@ module Cats
       delegate(:reference_no, to: :plan, prefix: true, allow_nil: true)
       delegate(:name, to: :commodity_category, prefix: true)
       delegate(:abbreviation, to: :unit, prefix: true)
+
+      def commodity_name
+        commodity_category.name
+      end
     end
   end
 end

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

@@ -10,6 +10,10 @@ module Cats
 
       delegate(:name, to: :commodity_category, prefix: true)
       delegate(:abbreviation, to: :unit, prefix: true)
+
+      def commodity_name
+        commodity_category.name
+      end
     end
   end
 end

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

@@ -18,6 +18,10 @@ module Cats
       delegate(:name, to: :commodity_category, prefix: true)
       delegate(:name, to: :unit, prefix: true)
       delegate(:code, to: :currency, prefix: true)
+
+      def commodity_name
+        commodity_category.name
+      end
     end
   end
 end

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

@@ -21,7 +21,8 @@ module Cats
       validates :stack_status, inclusion: { in: STACK_STATUSES }
       validate :validate_coordinates, :validate_dimensions, :validate_distance_from_wall, :validate_overlap,
                :validate_space_between_stack, :validate_max_height, :validate_max_length, :validate_max_width,
-               :validate_distance_from_ceiling, unless: -> { store && store.code == 'SUP-STORE' }
+               :validate_distance_from_ceiling,
+               unless: -> { store && (store.code == 'SUP-STORE' || store.code.start_with?('FDP;')) }
 
       delegate :batch_no, to: :commodity, prefix: true
 

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

@@ -14,6 +14,10 @@ module Cats
       delegate(:name, to: :received_commodity, prefix: true)
       delegate(:abbreviation, to: :issued_unit, prefix: true)
       delegate(:abbreviation, to: :received_unit, prefix: true)
+
+      def commodity_name
+        received_commodity.name
+      end
     end
   end
 end

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

@@ -43,6 +43,23 @@ module Cats
         authorization.dispatch.stack
         authorization
       end
+
+      def receipt_authorization(id)
+        item = DispatchPlanItem.find(id).includes(
+          :destination,
+          :unit,
+          commodity: { project: :source }
+        )
+        {
+          date: Date.today,
+          reference_no: item.reference_no,
+          destination: item.destination.name,
+          source: item.commodity.project.source.description,
+          commodity: "#{item.commodity.project.source.commodity_name} (#{item.commodity.batch_no})",
+          unit: item.unit.abbreviation,
+          quantity: item.quantity
+        }
+      end
     end
   end
 end

data/config/routes.rb

@@ -167,7 +167,9 @@ Cats::Core::Engine.routes.draw do
     action: :create_allocation,
     as: :allocation_transaction
   )
+  post '/dispatch_transactions/filter', controller: :dispatch_transactions, action: :filter
   resources :dispatch_transactions, except: %i[index new edit destroy]
+  post '/receipt_transactions/filter', controller: :receipt_transactions, action: :filter
   resources :receipt_transactions, except: %i[index new edit destroy]
   resources :lost_commodities, except: %i[index destroy]
   get '/plans/:id/round_plans', controller: :round_plans, action: :index, as: :round_plans_plan

data/db/migrate/20210717032855_create_cats_core_purchase_orders.rb

@@ -2,6 +2,7 @@ class CreateCatsCorePurchaseOrders < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_purchase_orders do |t|
       t.string :reference_no, unique: true
+      t.string :description
       t.date :order_date, null: false
       t.string :requisition_no
       t.string :supplier, null: false

data/db/migrate/20220626063501_create_cats_core_loans.rb

@@ -2,6 +2,7 @@ class CreateCatsCoreLoans < ActiveRecord::Migration[7.0]
   def change
     create_table :cats_core_loans do |t|
       t.string :reference_no, unique: true
+      t.string :description
       t.string :lender, null: false
       t.date :agreement_date, null: false
       t.date :repayment_date

data/db/migrate/20220626063757_create_cats_core_swaps.rb

@@ -2,6 +2,7 @@ class CreateCatsCoreSwaps < ActiveRecord::Migration[7.0]
   def change
     create_table :cats_core_swaps do |t|
       t.string :reference_no, unique: true
+      t.string :description
       t.string :swapper, null: false
       t.date :agreement_date, null: false
       t.float :issued_quantity, null: false

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.4.43'.freeze
+    VERSION = '1.4.46'.freeze
   end
 end

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

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :dispatch_plan_item, class: 'Cats::Core::DispatchPlanItem' do
     reference_no { FFaker::Name.name }
     source factory: :location
-    destination factory: :location
+    destination factory: :woreda
     dispatch_plan
     quantity { 100 }
     unit factory: :unit_of_measure

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

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :loan, class: 'Cats::Core::Loan' do
     reference_no { FFaker::Name.name }
+    description { FFaker::Name.name }
     lender { FFaker::Name.name }
     agreement_date { Date.today }
     repayment_date { agreement_date.next_month }

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

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :purchase_order, class: 'Cats::Core::PurchaseOrder' do
     reference_no { FFaker::Name.name }
+    description { FFaker::Name.name }
     order_date { Date.today }
     requisition_no { FFaker::Name.name }
     supplier { FFaker::Name.name }

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

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :swap, class: 'Cats::Core::Swap' do
     reference_no { FFaker::Name.name }
+    description { FFaker::Name.name }
     swapper { FFaker::Name.name }
     agreement_date { Date.yesterday }
     issued_commodity factory: :commodity_category

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.4.43
+  version: 1.4.46
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-26 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers