cats_core 1.0.11 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32c70181bd52a346e553ef01325a87cb1c72ba19d831bc1b9ebe6e735b792a32
-  data.tar.gz: 00f2b8a381e9d969547fe5a16338b8f02ad374f0dfe40db14b1074614877e6bf
+  metadata.gz: 83b352120340d746a9cdd10bb03f065b560d88ec99857b3e4f297c959918b0ac
+  data.tar.gz: 9433d430ece366eaae1a8ccae7ea5b3f2121f1675e96ab7540cb8a48e32a49f9
 SHA512:
-  metadata.gz: 5810cd3ad764b6e64d5ec9ba1a86591b0bd25d26051aea58da57ec8bb2fd768d62566aa08092d82a045b46c6af0327d57a40b2dc4062dae69456686135cb9e35
-  data.tar.gz: d25a81609c51dbce17369920073f40295d88c93f91533199e795fc06362f690d36e3c754d5b86c3b2893fc7212b02334e9a02eea820d5565c8a5dc11b4ba317f
+  metadata.gz: 8019ad075a42c451fb67f96e668a2522ad2d70a37e1359d3d373b939f1f54a81645a411eac0fff361a9815334db2ab6fc659279201239d4e7e1ef9fdddf29898
+  data.tar.gz: c066e25b734a56afe9a7c9558204dcd8b42107ab7e858c74275211ad46439aaee7829f48a2d4941a1f62eaf9f51763b804107c8d40344ab7a92d7433b35edf94

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

@@ -11,7 +11,7 @@ module Cats
       private
 
       def set_role
-        @role = Role.find(params[:id])
+        @role = Role.find_by(name: params[:name])
       end
     end
   end

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

@@ -10,6 +10,7 @@ module Cats
       belongs_to :donor
       belongs_to :program
       belongs_to :unit_of_measure
+      belongs_to :source, polymorphic: true
 
       validates :quantity, presence: true, numericality: { greater_than: 0 }
       validates :volume_per_metric_ton, numericality: { greater_than: 0, allow_nil: true }

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

@@ -0,0 +1,19 @@
+module Cats
+  module Core
+    class CommodityAllocation < ApplicationRecord
+      belongs_to :commodity
+      belongs_to :source, class_name: 'Cats::Core::Location'
+      belongs_to :destination, class_name: 'Cats::Core::Location'
+
+      validates :quantity, :commodity_status, presence: true
+      validates :commodity_status, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
+      validate :validate_source_and_destination
+
+      def validate_source_and_destination
+        return unless source.present? && destination.present?
+
+        errors.add(:base, 'source and destination cannot be the same') if source == destination
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Cats
+  module Core
+    class Dispatch < ApplicationRecord
+      belongs_to :prepared_by, class_name: 'Cats::Core::User'
+      belongs_to :transporter
+      belongs_to :commodity_allocation
+
+      validates :reference_no, :plate_no, :driver_name, :driver_phone, :quantity, :commodity_status, presence: true
+      validates :reference_no, uniqueness: true
+      validates :quantity, numericality: { greater_than: 0 }
+      validates :commodity_status, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Cats
+  module Core
+    class DispatchTransaction < Transaction
+      belongs_to :source, class_name: 'Cats::Core::Stack'
+      belongs_to :destination, class_name: 'Cats::Core::Dispatch'
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Cats
+  module Core
+    class GiftCertificate < ApplicationRecord
+      belongs_to :program
+      belongs_to :donor
+
+      validates :reference_no, presence: true, uniqueness: true
+      validates :gift_date, presence: true
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Cats
       belongs_to :recipient, polymorphic: true
 
       def message
-        { id: id, read: !read_at.nil? }.merge(to_notification.message)
+        { id: id, read: !read_at.nil?, created_at: created_at }.merge(to_notification.message)
       end
 
       def self.messages(notifications)

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

@@ -0,0 +1,19 @@
+module Cats
+  module Core
+    class Receipt < ApplicationRecord
+      # Receipt status
+      DRAFT = 'Draft'.freeze
+      ACCEPTED = 'Accepted'.freeze
+      DECLINED = 'Declined'.freeze
+      RECEIPT_STATUSES = [DRAFT, ACCEPTED, DECLINED].freeze
+
+      belongs_to :dispatch
+      belongs_to :prepared_by, class_name: 'Cats::Core::User'
+
+      validates :quantity, :commodity_status, :status, presence: true
+      validates :quantity, numericality: { greater_than: 0 }
+      validates :status, inclusion: { in: RECEIPT_STATUSES }
+      validates :commodity_status, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Cats
+  module Core
+    class ReceiptTransaction < Transaction
+      belongs_to :source, class_name: 'Cats::Core::Receipt'
+      belongs_to :destination, class_name: 'Cats::Core::Stack'
+    end
+  end
+end

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

@@ -9,8 +9,8 @@ module Cats
 
       belongs_to :commodity
       belongs_to :store
-      has_many :source_transactions, class_name: 'Cats::Core::CommodityTransaction', as: :source
-      has_many :destination_transactions, class_name: 'Cats::Core::CommodityTransaction', as: :destination
+      has_many :dispatch_transactions, foreign_key: :source_id
+      has_many :receipt_transactions, foreign_key: :destination_id
 
       validates :code, :length, :width, :height, :start_x, :start_y, :commodity_status, :stack_status,
                 :quantity, presence: true

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

@@ -0,0 +1,8 @@
+module Cats
+  module Core
+    class StackTransaction < Transaction
+      belongs_to :source, class_name: 'Cats::Core::Stack'
+      belongs_to :destination, class_name: 'Cats::Core::Stack'
+    end
+  end
+end

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

@@ -2,10 +2,10 @@ module Cats
   module Core
     class Store < ApplicationRecord
       belongs_to :warehouse, class_name: 'Cats::Core::Location'
+      belongs_to :store_keeper, class_name: 'Cats::Core::User'
       has_many :stacks
-      has_many :receipt_plans, as: :receivable
 
-      validates :name, :store_keeper_name, :length, :width, :height, presence: true
+      validates :name, :length, :width, :height, presence: true
       validates :length, :width, :height, numericality: { greater_than: 0 }
       validates :gangway_length, :gangway_width, :gangway_corner_dist, presence: true, if: :has_gangway?
       validates :gangway_length,
@@ -15,11 +15,35 @@ module Cats
                 allow_nil: true
       validate :validate_location
 
+      after_save :update_store_keeper
+
       def validate_location
         return if warehouse.nil?
 
         errors.add(:warehouse, 'must be a valid warehouse') unless warehouse.location_type == Location::WAREHOUSE
       end
+
+      def store_keeper_name
+        "#{store_keeper.first_name} #{store_keeper.last_name}"
+      end
+
+      def update_store_keeper
+        return unless store_keeper_id_previously_changed?
+
+        unless id_previously_changed?
+          old_storekeeper = Cats::Core::User.find(store_keeper_id_previously_was)
+          old_storekeeper.details['stores'].delete(id)
+          old_storekeeper.save
+        end
+        if store_keeper.details.key?('stores')
+          store_keeper.details['stores'] << id
+        else
+          store_keeper.details['stores'] = [id]
+        end
+        store_keeper.save
+      end
+
+      delegate(:phone_number, to: :store_keeper, prefix: true)
     end
   end
 end

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

@@ -0,0 +1,32 @@
+module Cats
+  module Core
+    class Transaction < ApplicationRecord
+      self.abstract_class = true
+
+      # Transaction statuses
+      DRAFT = 'Draft'.freeze
+      COMMITTED = 'Committed'.freeze
+      STATUSES = [DRAFT, COMMITTED].freeze
+
+      validates :transaction_date, :quantity, :status, presence: true
+      validates :quantity, numericality: { greater_than: 0 }
+      validates :status, inclusion: { in: STATUSES }
+      validate :validate_quantity
+
+      def validate_quantity
+        return unless quantity.present? && source.present?
+
+        errors.add(:quantity, 'cannot be more than source quantity') if quantity > source.quantity
+      end
+
+      def commit
+        Transaction.transaction do
+          source.quantity -= quantity
+          destination.quantity += quantity
+          source.save
+          destination.save
+        end
+      end
+    end
+  end
+end

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

@@ -8,9 +8,11 @@ module Cats
       has_and_belongs_to_many :roles, join_table: :cats_core_users_cats_core_roles
       has_many :notifications, as: :recipient
 
+      validates :password, length: { minimum: 6 }, if: proc { |u| u.password.present? }, on: :update
       validates :first_name, :last_name, :email, presence: true
-      validates :password, length: { minimum: 6 }
+      validates :password, presence: true, length: { minimum: 6 }, on: :create
       validates :email, uniqueness: true, format: { with: URI::MailTo::EMAIL_REGEXP }
+      validate :validate_phone_number
 
       def warehouses
         return unless details.key?('warehouses')
@@ -23,6 +25,16 @@ module Cats
 
         Cats::Core::Store.where(id: details['stores'])
       end
+
+      def validate_phone_number
+        return unless phone_number.present?
+
+        return if phone_number.length == 10 && /0\d{9}/.match(phone_number)
+
+        return if phone_number.length == 12 && /251\d{9}/.match(phone_number)
+
+        errors.add(:phone_number, 'must be 10 or 12 digits and should match with local phone pattern')
+      end
     end
   end
 end

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

@@ -16,22 +16,19 @@ module Cats
         }
       }.freeze
 
-      def initialize(code, params)
+      def initialize(rules, code, params)
+        @rules = rules
         @code = code
         @params = params
       end
 
-      def notification_rules
-        NOTIFICATION_RULES
-      end
-
       def create_notifier(rule)
         clazz = rule[:notification].constantize
         clazz.with(**@params)
       end
 
       def notify
-        rule = notification_rules[@code]
+        rule = @rules[@code]
         notifier = create_notifier(rule)
         app_code = rule[:application]
         roles = rule[:recipients]

data/config/routes.rb

@@ -10,7 +10,7 @@ Cats::Core::Engine.routes.draw do
       post 'mark_as_unread', controller: :notifications, action: :mark_as_unread
     end
   end
-  resources :roles do
+  resources :roles, param: :name do
     member do
       get 'users', controller: :roles, action: :users
     end

data/db/migrate/20210715114910_create_cats_core_users.rb

@@ -7,6 +7,7 @@ class CreateCatsCoreUsers < ActiveRecord::Migration[6.1]
       t.boolean :active, null: false, default: true
       t.string :password_digest
       t.jsonb :details
+      t.string :phone_number
       t.references :application_module,
                    null: false,
                    index: { name: 'am_on_users_indx' },

data/db/migrate/20210717032602_create_cats_core_gift_certificates.rb

@@ -0,0 +1,27 @@
+class CreateCatsCoreGiftCertificates < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_gift_certificates do |t|
+      t.string :reference_no, unique: true
+      t.date :gift_date, null: false
+      t.references :program,
+                   null: false,
+                   index: { name: 'gc_on_program_indx' },
+                   foreign_key: { to_table: :cats_core_programs }
+      t.references :donor,
+                   null: false,
+                   index: { name: 'gc_on_donor_indx' },
+                   foreign_key: { to_table: :cats_core_donors }
+      t.string :vessel
+      t.string :port
+      t.string :customs_declaration_no
+      t.integer :purchase_year
+      t.date :expiry_date
+      t.string :bill_of_lading_no
+      t.float :amount, null: false
+      t.float :estimated_price
+      t.float :estimated_tax
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210717033223_create_cats_core_commodities.rb

@@ -17,6 +17,7 @@ class CreateCatsCoreCommodities < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'uom_on_commodities_indx' },
                    foreign_key: { to_table: :cats_core_unit_of_measures }
+      t.references :source, polymorphic: true
       t.float :quantity, null: false
       t.string :description
       t.boolean :hazardous, null: false, default: false

data/db/migrate/20210717140855_create_cats_core_stores.rb

@@ -2,8 +2,6 @@ class CreateCatsCoreStores < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_stores do |t|
       t.string :name, null: false
-      t.string :store_keeper_name, null: false
-      t.string :store_keeper_phone
       t.float :length, null: false
       t.float :width, null: false
       t.float :height, null: false
@@ -16,7 +14,10 @@ class CreateCatsCoreStores < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'warehouse_on_stores_indx' },
                    foreign_key: { to_table: :cats_core_locations }
-
+      t.references :store_keeper,
+                   null: false,
+                   index: { name: 'store_keeper_on_store_indx' },
+                   foreign_key: { to_table: :cats_core_users }
       t.timestamps
     end
   end

data/db/migrate/20210718042823_create_cats_core_commodity_allocations.rb

@@ -0,0 +1,23 @@
+class CreateCatsCoreCommodityAllocations < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_commodity_allocations do |t|
+      t.references :commodity,
+                   null: false,
+                   index: { name: 'ca_on_commodity_indx' },
+                   foreign_key: { to_table: :cats_core_commodities }
+      t.references :source,
+                   null: false,
+                   index: { name: 'ca_on_source_indx' },
+                   foreign_key: { to_table: :cats_core_locations }
+      t.references :destination,
+                   null: false,
+                   index: { name: 'ca_on_destination_indx' },
+                   foreign_key: { to_table: :cats_core_locations }
+      t.float :quantity, null: false
+      t.string :commodity_status, null: false, default: 'Good'
+      t.string :remark
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210718045516_create_cats_core_dispatches.rb

@@ -0,0 +1,27 @@
+class CreateCatsCoreDispatches < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_dispatches do |t|
+      t.string :reference_no, unique: true
+      t.references :commodity_allocation,
+                   null: false,
+                   index: { name: 'ca_on_dispatches_indx' },
+                   foreign_key: { to_table: :cats_core_commodity_allocations }
+      t.references :transporter,
+                   null: false,
+                   index: { name: 'transporter_on_dispatches_indx' },
+                   foreign_key: { to_table: :cats_core_transporters }
+      t.string :plate_no, null: false
+      t.string :driver_name, null: false
+      t.string :driver_phone, null: false
+      t.float :quantity, null: false
+      t.string :commodity_status, null: false, default: 'Good'
+      t.string :remark
+      t.references :prepared_by,
+                   null: false,
+                   index: { name: 'pb_on_dispatches_indx' },
+                   foreign_key: { to_table: :cats_core_users }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210718202957_create_cats_core_dispatch_transactions.rb

@@ -0,0 +1,19 @@
+class CreateCatsCoreDispatchTransactions < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_dispatch_transactions do |t|
+      t.references :source,
+                   null: false,
+                   index: { name: 'stack_on_dt_indx' },
+                   foreign_key: { to_table: :cats_core_stacks }
+      t.references :destination,
+                   null: false,
+                   index: { name: 'dispatch_on_dt_indx' },
+                   foreign_key: { to_table: :cats_core_dispatches }
+      t.date :transaction_date, null: false
+      t.float :quantity, null: false
+      t.string :status, null: false, default: 'Draft'
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210727074646_create_cats_core_receipts.rb

@@ -0,0 +1,20 @@
+class CreateCatsCoreReceipts < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_receipts do |t|
+      t.references :dispatch,
+                   null: false,
+                   index: { name: 'dispatch_on_receipts_indx' },
+                   foreign_key: { to_table: :cats_core_dispatches }
+      t.float :quantity, null: false
+      t.string :commodity_status, null: false, default: 'Good'
+      t.string :status, null: false, default: 'Draft'
+      t.string :remark
+      t.references :prepared_by,
+                   null: false,
+                   index: { name: 'pb_on_receipts_indx' },
+                   foreign_key: { to_table: :cats_core_users }
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210814160628_create_cats_core_receipt_transactions.rb

@@ -0,0 +1,19 @@
+class CreateCatsCoreReceiptTransactions < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_receipt_transactions do |t|
+      t.references :source,
+                   null: false,
+                   index: { name: 'receipt_on_rt_indx' },
+                   foreign_key: { to_table: :cats_core_receipts }
+      t.references :destination,
+                   null: false,
+                   index: { name: 'stack_on_rt_indx' },
+                   foreign_key: { to_table: :cats_core_stacks }
+      t.date :transaction_date, null: false
+      t.float :quantity, null: false
+      t.string :status, null: false, default: 'Draft'
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210814175406_create_cats_core_stack_transactions.rb

@@ -0,0 +1,19 @@
+class CreateCatsCoreStackTransactions < ActiveRecord::Migration[6.1]
+  def change
+    create_table :cats_core_stack_transactions do |t|
+      t.references :source,
+                   null: false,
+                   index: { name: 'source_on_st_indx' },
+                   foreign_key: { to_table: :cats_core_stacks }
+      t.references :destination,
+                   null: false,
+                   index: { name: 'destination_on_st_indx' },
+                   foreign_key: { to_table: :cats_core_stacks }
+      t.date :transaction_date, null: false
+      t.float :quantity, null: false
+      t.string :status, null: false, default: 'Draft'
+
+      t.timestamps
+    end
+  end
+end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.11'.freeze
+    VERSION = '1.0.15'.freeze
   end
 end

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

@@ -1,10 +1,11 @@
 FactoryBot.define do
   factory :commodity, class: 'Cats::Core::Commodity' do
-    association :commodity_category
+    commodity_category
     description { FFaker::Name.name }
-    association :donor
-    association :program
-    association :unit_of_measure
+    donor
+    program
+    unit_of_measure
+    source factory: :gift_certificate
     quantity { 100 }
     hazardous { false }
     best_use_before { Date.today + 2.month }

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :commodity_allocation, class: 'Cats::Core::CommodityAllocation' do
+    commodity
+    source factory: :location
+    destination factory: :location
+    quantity { 50 }
+    commodity_status { Cats::Core::Commodity::GOOD }
+    remark { FFaker::Name.name }
+  end
+end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :dispatch_transaction, class: 'Cats::Core::DispatchTransaction' do
+    source factory: :stack
+    destination factory: :dispatch
+    transaction_date { Date.today }
+    quantity { 10 }
+    status { Cats::Core::Transaction::DRAFT }
+  end
+end

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

@@ -0,0 +1,13 @@
+FactoryBot.define do
+  factory :dispatch, class: 'Cats::Core::Dispatch' do
+    reference_no { FFaker::Name.name }
+    commodity_allocation
+    transporter
+    plate_no { FFaker::Name.name }
+    driver_name { FFaker::Name.name }
+    driver_phone { FFaker::Name.name }
+    quantity { 50 }
+    remark { FFaker::Name.name }
+    prepared_by factory: :user
+  end
+end

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

@@ -0,0 +1,17 @@
+FactoryBot.define do
+  factory :gift_certificate, class: 'Cats::Core::GiftCertificate' do
+    reference_no { FFaker::Name.name }
+    gift_date { Date.today - 1.month }
+    program
+    donor
+    vessel { FFaker::Name.name }
+    port { FFaker::Name.name }
+    customs_declaration_no { FFaker::Name.name }
+    purchase_year { 1 }
+    expiry_date { Date.today + 6.month }
+    bill_of_lading_no { FFaker::Name.name }
+    amount { 1.5 }
+    estimated_price { 1.5 }
+    estimated_tax { 1.5 }
+  end
+end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :receipt_transaction do
+    source factory: :receipt
+    destination factory: :stack
+    transaction_date { Date.today }
+    quantity { 10 }
+    status { Cats::Core::Transaction::DRAFT }
+  end
+end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :receipt, class: 'Cats::Core::Receipt' do
+    dispatch
+    quantity { 1.5 }
+    commodity_status { Cats::Core::Commodity::GOOD }
+    status { Cats::Core::Receipt::DRAFT }
+    remark { FFaker::Name.name }
+    prepared_by factory: :user
+  end
+end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :stack_transaction, class: 'Cats::Core::StackTransaction' do
+    source factory: :stack
+    destination factory: :stack
+    transaction_date { Date.today }
+    quantity { 25 }
+    status { Cats::Core::Transaction::DRAFT }
+  end
+end

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

@@ -1,8 +1,6 @@
 FactoryBot.define do
   factory :store, class: 'Cats::Core::Store' do
     name { FFaker::Name.name }
-    store_keeper_name { FFaker::Name.name }
-    store_keeper_phone { FFaker::Name.name }
     length { 50 }
     width { 40 }
     height { 10 }
@@ -12,5 +10,7 @@ FactoryBot.define do
     gangway_width { 4 }
     gangway_corner_dist { 18 }
     warehouse
+    store_keeper factory: :user
+    store_keeper_id { create(:user).id }
   end
 end

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

@@ -3,6 +3,7 @@ FactoryBot.define do
     first_name { FFaker::Name.name }
     last_name { FFaker::Name.name }
     email { FFaker::Internet.email }
+    phone_number { '0913345678' }
     active { true }
     password { FFaker::Internet.password }
     details { {} }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.15
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -226,25 +226,29 @@ files:
 - app/models/cats/core/application_module.rb
 - app/models/cats/core/application_record.rb
 - app/models/cats/core/commodity.rb
+- app/models/cats/core/commodity_allocation.rb
 - app/models/cats/core/commodity_category.rb
-- app/models/cats/core/commodity_transaction.rb
+- app/models/cats/core/dispatch.rb
+- app/models/cats/core/dispatch_transaction.rb
 - app/models/cats/core/donor.rb
+- app/models/cats/core/gift_certificate.rb
 - app/models/cats/core/location.rb
 - app/models/cats/core/menu.rb
 - app/models/cats/core/menu_item.rb
 - app/models/cats/core/notification.rb
 - app/models/cats/core/program.rb
-- app/models/cats/core/receipt_plan.rb
+- app/models/cats/core/receipt.rb
+- app/models/cats/core/receipt_transaction.rb
 - app/models/cats/core/role.rb
 - app/models/cats/core/role_menu.rb
 - app/models/cats/core/stack.rb
+- app/models/cats/core/stack_transaction.rb
 - app/models/cats/core/stacking_rule.rb
 - app/models/cats/core/store.rb
+- app/models/cats/core/transaction.rb
 - app/models/cats/core/transporter.rb
 - app/models/cats/core/unit_of_measure.rb
 - app/models/cats/core/user.rb
-- app/models/cats/core/way_bill.rb
-- app/models/cats/core/way_bill_item.rb
 - app/notifications/cats/core/simple_notification.rb
 - app/serializers/cats/core/role_menu_serializer.rb
 - app/services/cats/core/menu_service.rb
@@ -261,17 +265,20 @@ files:
 - db/migrate/20210716145125_create_cats_core_unit_of_measures.rb
 - db/migrate/20210716151230_create_cats_core_programs.rb
 - db/migrate/20210717031108_create_cats_core_donors.rb
+- db/migrate/20210717032602_create_cats_core_gift_certificates.rb
 - db/migrate/20210717033223_create_cats_core_commodities.rb
 - db/migrate/20210717043620_create_cats_core_locations.rb
 - db/migrate/20210717140855_create_cats_core_stores.rb
 - db/migrate/20210717171101_create_cats_core_stacks.rb
 - db/migrate/20210718042749_create_cats_core_transporters.rb
-- db/migrate/20210718045516_create_cats_core_way_bills.rb
-- db/migrate/20210718050751_create_cats_core_way_bill_items.rb
-- db/migrate/20210718202957_create_cats_core_commodity_transactions.rb
+- db/migrate/20210718042823_create_cats_core_commodity_allocations.rb
+- db/migrate/20210718045516_create_cats_core_dispatches.rb
+- db/migrate/20210718202957_create_cats_core_dispatch_transactions.rb
 - db/migrate/20210719133710_create_cats_core_stacking_rules.rb
 - db/migrate/20210724074657_create_cats_core_notifications.rb
-- db/migrate/20210727074646_create_cats_core_receipt_plans.rb
+- db/migrate/20210727074646_create_cats_core_receipts.rb
+- db/migrate/20210814160628_create_cats_core_receipt_transactions.rb
+- db/migrate/20210814175406_create_cats_core_stack_transactions.rb
 - lib/cats/core.rb
 - lib/cats/core/engine.rb
 - lib/cats/core/version.rb
@@ -279,25 +286,28 @@ files:
 - lib/tasks/cats_core_tasks.rake
 - spec/factories/cats/core/application_modules.rb
 - spec/factories/cats/core/commodities.rb
+- spec/factories/cats/core/commodity_allocations.rb
 - spec/factories/cats/core/commodity_categories.rb
-- spec/factories/cats/core/commodity_transactions.rb
+- spec/factories/cats/core/dispatch_transactions.rb
+- spec/factories/cats/core/dispatches.rb
 - spec/factories/cats/core/donors.rb
+- spec/factories/cats/core/gift_certificates.rb
 - spec/factories/cats/core/locations.rb
 - spec/factories/cats/core/menu_items.rb
 - spec/factories/cats/core/menus.rb
 - spec/factories/cats/core/notifications.rb
 - spec/factories/cats/core/programs.rb
-- spec/factories/cats/core/receipt_plans.rb
+- spec/factories/cats/core/receipt_transactions.rb
+- spec/factories/cats/core/receipts.rb
 - spec/factories/cats/core/role_menus.rb
 - spec/factories/cats/core/roles.rb
+- spec/factories/cats/core/stack_transactions.rb
 - spec/factories/cats/core/stacking_rules.rb
 - spec/factories/cats/core/stacks.rb
 - spec/factories/cats/core/stores.rb
 - spec/factories/cats/core/transporters.rb
 - spec/factories/cats/core/unit_of_measures.rb
 - spec/factories/cats/core/users.rb
-- spec/factories/cats/core/way_bill_items.rb
-- spec/factories/cats/core/way_bills.rb
 homepage: http://cats.ndrmcapps.org
 licenses:
 - MIT

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

@@ -1,55 +0,0 @@
-module Cats
-  module Core
-    class CommodityTransaction < ApplicationRecord
-      # Transaction statuses
-      DRAFT = 'Draft'.freeze
-      COMMITTED = 'Committed'.freeze
-      STATUSES = [DRAFT, COMMITTED].freeze
-
-      # Transaction types
-      STACK_TO_STACK = 'Stack to Stack'.freeze
-      STACK_TO_WAY_BILL = 'Stack to Way Bill'.freeze
-      WAY_BILL_TO_STACK = 'Way Bill to Stack'.freeze
-      TRANSACTION_TYPES = [STACK_TO_STACK, STACK_TO_WAY_BILL, WAY_BILL_TO_STACK].freeze
-
-      belongs_to :source, polymorphic: true
-      belongs_to :destination, polymorphic: true
-
-      validates :transaction_date, :quantity, :status, presence: true
-      validates :quantity, numericality: { greater_than: 0 }
-      validates :status, inclusion: { in: STATUSES }
-      validate :validate_quantity
-
-      before_validation :set_transaction_type
-
-      def validate_quantity
-        return unless quantity.present? && source.present?
-
-        errors.add(:quantity, 'cannot be more than source quantity') if quantity > source.quantity
-      end
-
-      def commit
-        CommodityTransaction.transaction do
-          source.quantity -= quantity
-          destination.quantity += quantity
-          source.save
-          destination.save
-        end
-      end
-
-      private
-
-      def set_transaction_type
-        return unless transaction_type.nil? && source.present? && destination.present?
-
-        if source.instance_of?(Cats::Core::Stack) && destination.instance_of?(Cats::Core::Stack)
-          self.transaction_type = STACK_TO_STACK
-        elsif source.instance_of?(Cats::Core::Stack) && destination.instance_of?(Cats::Core::WayBillItem)
-          self.transaction_type = STACK_TO_WAY_BILL
-        else
-          self.transaction_type = WAY_BILL_TO_STACK
-        end
-      end
-    end
-  end
-end

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

@@ -1,24 +0,0 @@
-module Cats
-  module Core
-    class ReceiptPlan < ApplicationRecord
-      # receipt plan status
-      DRAFT = 'Draft'.freeze
-      ACCEPTED = 'Accepted'.freeze
-      DECLINED = 'Declined'.freeze
-      RECEIPT_PLAN_STATUSES = [DRAFT, ACCEPTED, DECLINED].freeze
-
-      validates :quantity, :status, presence: true
-      belongs_to :commodity
-      belongs_to :plan_recipient, polymorphic: true
-      validates :quantity, numericality: { greater_than: 0 }
-      validates :status, inclusion: { in: RECEIPT_PLAN_STATUSES }
-      validate :validate_reason_for_decline
-
-      def validate_reason_for_decline
-        return unless reason_for_decline.nil? || reason_for_decline == 'Accepted'
-
-        errors.add(:reason_for_decline, 'must be specified')
-      end
-    end
-  end
-end

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

@@ -1,12 +0,0 @@
-module Cats
-  module Core
-    class WayBill < ApplicationRecord
-      belongs_to :source, class_name: 'Cats::Core::Location'
-      belongs_to :destination, class_name: 'Cats::Core::Location'
-      belongs_to :transporter
-
-      validates :ref_no, :plate_no, :driver_name, :driver_phone, :date_prepared, presence: true
-      validates :ref_no, uniqueness: true
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-module Cats
-  module Core
-    class WayBillItem < ApplicationRecord
-      belongs_to :way_bill
-      belongs_to :commodity
-
-      has_many :source_transactions, class_name: 'Cats::Core::CommodityTransaction', as: :source
-      has_many :destination_transactions, class_name: 'Cats::Core::CommodityTransaction', as: :destination
-
-      validates :quantity, :commodity_status, presence: true
-      validates :quantity, numericality: { greater_than: 0 }
-      validates :commodity_status, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
-    end
-  end
-end

data/db/migrate/20210718045516_create_cats_core_way_bills.rb

@@ -1,25 +0,0 @@
-class CreateCatsCoreWayBills < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_way_bills do |t|
-      t.string :ref_no, unique: true
-      t.references :source,
-                   null: false,
-                   index: { name: 'source_on_wb_indx' },
-                   foreign_key: { to_table: :cats_core_locations }
-      t.references :destination,
-                    null: false,
-                    index: { name: 'destination_on_wb_indx' },
-                    foreign_key: { to_table: :cats_core_locations } 
-      t.references :transporter,
-                   null: false,
-                   index: { name: 'transporter_on_wb_indx' },
-                   foreign_key: { to_table: :cats_core_transporters }
-      t.string :plate_no, null: false
-      t.string :driver_name, null: false
-      t.string :driver_phone, null: false
-      t.date :date_prepared, null: false
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20210718050751_create_cats_core_way_bill_items.rb

@@ -1,18 +0,0 @@
-class CreateCatsCoreWayBillItems < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_way_bill_items do |t|
-      t.references :way_bill,
-                   null: false,
-                   index: { name: 'wb_on_wbi_indx' },
-                   foreign_key: { to_table: :cats_core_way_bills }
-      t.references :commodity,
-                   null: false,
-                   index: { name: 'commodity_on_wbi_indx' },
-                   foreign_key: { to_table: :cats_core_commodities }
-      t.float :quantity, null: false
-      t.string :commodity_status, null: false
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20210718202957_create_cats_core_commodity_transactions.rb

@@ -1,14 +0,0 @@
-class CreateCatsCoreCommodityTransactions < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_commodity_transactions do |t|
-      t.references :source, polymorphic: true
-      t.references :destination, polymorphic: true
-      t.date :transaction_date, null: false
-      t.float :quantity, null: false
-      t.string :status, null: false, default: 'Draft'
-      t.string :transaction_type, null: false, default: 'Stack to Stack'
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20210727074646_create_cats_core_receipt_plans.rb

@@ -1,16 +0,0 @@
-class CreateCatsCoreReceiptPlans < ActiveRecord::Migration[6.1]
-  def change
-    create_table :cats_core_receipt_plans do |t|
-      t.float :quantity, null: false
-      t.string :status, default: 'Draft'
-      t.references :commodity,
-        null: false,
-        index: { name: 'commodity_on_receipt_plan_indx' },
-        foreign_key: { to_table: :cats_core_commodities }
-      t.string :reason_for_decline
-      t.references :plan_recipient, polymorphic: true
-
-      t.timestamps
-    end
-  end
-end

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

@@ -1,10 +0,0 @@
-FactoryBot.define do
-  factory :commodity_transaction, class: 'Cats::Core::CommodityTransaction' do
-    source factory: :stack
-    destination factory: :stack
-    transaction_date { Date.today }
-    quantity { 10 }
-    status { Cats::Core::CommodityTransaction::DRAFT }
-    transaction_type { Cats::Core::CommodityTransaction::STACK_TO_STACK }
-  end
-end

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

@@ -1,9 +0,0 @@
-FactoryBot.define do
-  factory :receipt_plan, class: 'Cats::Core::ReceiptPlan' do
-    plan_recipient factory: :store
-    commodity
-    quantity { 1.5 }
-    status { 'Accepted' }
-    reason_for_decline { FFaker::Name.name }
-  end
-end

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

@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :way_bill_item, class: 'Cats::Core::WayBillItem' do
-    way_bill
-    commodity
-    quantity { 20 }
-    commodity_status { Cats::Core::Commodity::GOOD }
-  end
-end

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

@@ -1,12 +0,0 @@
-FactoryBot.define do
-  factory :way_bill, class: 'Cats::Core::WayBill' do
-    ref_no { FFaker::Name.name }
-    source factory: :location
-    destination factory: :location
-    transporter
-    plate_no { FFaker::Name.name }
-    driver_name { FFaker::Name.name }
-    driver_phone { FFaker::Name.name }
-    date_prepared { Date.today }
-  end
-end