cats_core 1.0.46 → 1.0.47
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/cats/core/allocation.rb +6 -1
- data/app/models/cats/core/dispatch.rb +15 -1
- data/app/models/cats/core/store.rb +2 -1
- data/db/migrate/20210717140855_create_cats_core_stores.rb +1 -0
- data/db/migrate/20210718042823_create_cats_core_allocations.rb +1 -0
- data/lib/cats/core/version.rb +1 -1
- data/spec/factories/cats/core/allocations.rb +1 -0
- data/spec/factories/cats/core/stores.rb +1 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: efb65bb9da37fbd6070d5844cdcd48c9c7c7e6a5b264c41e2103593e309838bd
|
4
|
+
data.tar.gz: 512001fdb9ddb2fa71fac19683b105632926a4cf75857b44a1a267c8710d02d9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9f5188e5b7fbd88a26db6ee14473b199994b07fe42e475fea3b49fcb3dd63efe8beb07ad285733c9a9fcd14d1ef63740454905b4bd505c1217a02d7c3bb851b2
|
7
|
+
data.tar.gz: '082ab5a2755af2ce386e8c8636d1ae022fa6c486cd83d7da7410d74b26653d03f1d21f8ff5c79b936546f92bfc65c013fe781f5613e3ac8ae0c2ba895fbb7da0'
|
@@ -1,14 +1,19 @@
|
|
1
1
|
module Cats
|
2
2
|
module Core
|
3
3
|
class Allocation < ApplicationRecord
|
4
|
+
DRAFT = 'Draft'.freeze
|
5
|
+
APPROVED = 'Approved'.freeze
|
6
|
+
ALLOCATION_STATUSES = [DRAFT, APPROVED].freeze
|
7
|
+
|
4
8
|
belongs_to :rhn_request, optional: true
|
5
9
|
belongs_to :commodity
|
6
10
|
belongs_to :source, class_name: 'Cats::Core::Location'
|
7
11
|
|
8
|
-
validates :commodity_status, presence: true
|
12
|
+
validates :commodity_status, :allocation_status, presence: true
|
9
13
|
validates :reference_no, presence: true, uniqueness: true
|
10
14
|
validates :quantity, presence: true, numericality: { greater_than: 0 }
|
11
15
|
validates :commodity_status, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
|
16
|
+
validates :allocation_status, inclusion: { in: ALLOCATION_STATUSES }
|
12
17
|
|
13
18
|
delegate(:reference_no, to: :rhn_request, prefix: :rhn, allow_nil: true)
|
14
19
|
delegate(:batch_no, to: :commodity, prefix: true)
|
@@ -4,8 +4,11 @@ module Cats
|
|
4
4
|
DRAFT = 'Draft'.freeze
|
5
5
|
APPROVED = 'Approved'.freeze
|
6
6
|
STARTED = 'Started'.freeze
|
7
|
+
ARRIVED = 'Arrived'.freeze
|
8
|
+
UNLOADED = 'Unloaded'.freeze
|
9
|
+
RECEIVED = 'Received'.freeze
|
7
10
|
|
8
|
-
DISPATCH_STATUSES = [DRAFT, APPROVED, STARTED].freeze
|
11
|
+
DISPATCH_STATUSES = [DRAFT, APPROVED, STARTED, ARRIVED, UNLOADED, RECEIVED].freeze
|
9
12
|
|
10
13
|
belongs_to :prepared_by, class_name: 'Cats::Core::User'
|
11
14
|
belongs_to :transporter
|
@@ -16,9 +19,20 @@ module Cats
|
|
16
19
|
validates :reference_no, uniqueness: true
|
17
20
|
validates :quantity, numericality: { greater_than: 0 }
|
18
21
|
validates :commodity_status, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
|
22
|
+
validate :validate_quantity
|
19
23
|
|
20
24
|
delegate(:name, to: :transporter, prefix: true)
|
21
25
|
delegate(:email, to: :prepared_by, prefix: true)
|
26
|
+
|
27
|
+
def validate_quantity
|
28
|
+
return unless quantity && allocation_item
|
29
|
+
|
30
|
+
return unless quantity_changed?
|
31
|
+
|
32
|
+
dispatched = Dispatch.where(allocation_item: allocation_item).sum(:quantity)
|
33
|
+
remaining = allocation_item.quantity - dispatched
|
34
|
+
errors.add(:quantity, "exceeds allocated quantity. Maximum allowed is #{remaining}") if quantity > remaining
|
35
|
+
end
|
22
36
|
end
|
23
37
|
end
|
24
38
|
end
|
@@ -5,7 +5,8 @@ module Cats
|
|
5
5
|
belongs_to :store_keeper, class_name: 'Cats::Core::User'
|
6
6
|
has_many :stacks
|
7
7
|
|
8
|
-
validates :name, :length, :width, :height, presence: true
|
8
|
+
validates :code, :name, :length, :width, :height, presence: true
|
9
|
+
validates :code, uniqueness: true
|
9
10
|
validates :length, :width, :height, numericality: { greater_than: 0 }
|
10
11
|
validates :gangway_length, :gangway_width, :gangway_corner_dist, presence: true, if: :has_gangway?
|
11
12
|
validates :gangway_length,
|
@@ -16,6 +16,7 @@ class CreateCatsCoreAllocations < ActiveRecord::Migration[6.1]
|
|
16
16
|
foreign_key: { to_table: :cats_core_locations }
|
17
17
|
t.float :quantity, null: false
|
18
18
|
t.string :commodity_status, null: false, default: 'Good'
|
19
|
+
t.string :allocation_status, null: false, default: 'Draft'
|
19
20
|
t.string :remark
|
20
21
|
|
21
22
|
t.timestamps
|
data/lib/cats/core/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cats_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.47
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Henock L.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-09-
|
11
|
+
date: 2021-09-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: active_model_serializers
|