comee_core 0.2.0 → 0.2.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/comee/core/sales_orders_controller.rb +1 -1
- data/app/controllers/comee/core/shipment_items_controller.rb +1 -1
- data/app/models/comee/core/item_status.rb +1 -1
- data/app/models/comee/core/shipment_item.rb +1 -1
- data/app/serializers/comee/core/sales_order_serializer.rb +1 -1
- data/app/serializers/comee/core/shipment_item_serializer.rb +2 -1
- data/app/services/comee/core/customer_order_service.rb +1 -0
- data/db/migrate/20230812190652_create_comee_core_sales_orders.rb +1 -0
- data/db/migrate/20231207153420_create_comee_core_shipment_items.rb +2 -0
- data/lib/comee/core/version.rb +1 -1
- data/spec/factories/comee/core/sales_orders.rb +1 -0
- data/spec/factories/comee/core/shipment_items.rb +2 -0
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2d7cf157e4f4751fc575616de0c6828c89b2fff51cf7dcd28347feb7f668ad6b
|
4
|
+
data.tar.gz: 1dac2167d8e7419c2312ec89cf8e8276f56ed1ca6ef0ac6a71e24ec432cec1bf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 88c434b7eb17e6dba7c24911369d03128f0eaeed66409a5e6c1bce86b1648948ce07d6e4472c12c2bc3ada0aad59c79c8a9644921cb977c873c48b8aaab2bbec
|
7
|
+
data.tar.gz: 6307f0083025d5473b9a7bf14a1f43070bf4590e8a2c890070e203cc64842fc8c692dc721ea248aed3c606321962df6bf372269aabbf4e9bb6a7a8adcdca1367
|
@@ -60,7 +60,7 @@ module Comee
|
|
60
60
|
def model_params
|
61
61
|
params.require(:payload).permit(:order_number, :customer_order_id, :payment_penalty, :payment_term, :delivery_term, :status,
|
62
62
|
:fulfillment_center_id, :total_price, :amount_paid, :pallete_note, :handover_date, :remark,
|
63
|
-
:client_id, files: [])
|
63
|
+
:consignee, :client_id, files: [])
|
64
64
|
end
|
65
65
|
|
66
66
|
def back_order_params
|
@@ -2,7 +2,7 @@ module Comee
|
|
2
2
|
module Core
|
3
3
|
class ItemStatus < ApplicationRecord
|
4
4
|
INITIALIZED = "Initialized".freeze
|
5
|
-
DELIVERY_NOTE_CREATED = "Delivery
|
5
|
+
DELIVERY_NOTE_CREATED = "Delivery Note Created".freeze
|
6
6
|
COMPLETELY_PICKED_AND_PACKED = "Completely Picked & Packed".freeze
|
7
7
|
PARTIALLY_PICKED_AND_PACKED = "Partially Picked & Packed".freeze
|
8
8
|
|
@@ -6,7 +6,7 @@ module Comee
|
|
6
6
|
belongs_to :sales_order_item
|
7
7
|
has_many :item_statuses
|
8
8
|
|
9
|
-
validates :handover_date, :delivery_date, :shipment_status, :status, presence: true
|
9
|
+
validates :handover_date, :delivery_date, :shipment_status, :status, :order_number, presence: true
|
10
10
|
validates :quantity, presence: true, numericality: {greater_than: 0}
|
11
11
|
|
12
12
|
def self.ransackable_attributes(_auth_object = nil)
|
@@ -2,7 +2,7 @@ module Comee
|
|
2
2
|
module Core
|
3
3
|
class SalesOrderSerializer < ActiveModel::Serializer
|
4
4
|
attributes :id, :order_number, :payment_penalty, :status, :total_price, :payment_term, :delivery_term, :amount_paid,
|
5
|
-
:pallete_note, :handover_date, :remark, :parent_client_name, :created_by, :files_url, :customs_detail
|
5
|
+
:pallete_note, :handover_date, :remark, :parent_client_name, :created_by, :files_url, :customs_detail, :consignee
|
6
6
|
belongs_to :customer_order
|
7
7
|
belongs_to :client
|
8
8
|
belongs_to :fulfillment_center
|
@@ -1,7 +1,8 @@
|
|
1
1
|
module Comee
|
2
2
|
module Core
|
3
3
|
class ShipmentItemSerializer < ActiveModel::Serializer
|
4
|
-
attributes :id, :quantity, :shipment_status, :status, :handover_date, :delivery_date, :pallet_no
|
4
|
+
attributes :id, :quantity, :shipment_status, :status, :handover_date, :delivery_date, :pallet_no, :consignee,
|
5
|
+
:order_number
|
5
6
|
belongs_to :sales_order_item
|
6
7
|
end
|
7
8
|
end
|
@@ -14,6 +14,7 @@ class CreateComeeCoreSalesOrders < ActiveRecord::Migration[7.0]
|
|
14
14
|
null: false,
|
15
15
|
index: {name: "client_on_ccso_indx"},
|
16
16
|
foreign_key: {to_table: :comee_core_clients}
|
17
|
+
t.string :consignee
|
17
18
|
t.string :parent_client_name
|
18
19
|
t.string :payment_term
|
19
20
|
t.string :delivery_term
|
data/lib/comee/core/version.rb
CHANGED
@@ -11,6 +11,7 @@ FactoryBot.define do
|
|
11
11
|
amount_paid { 0 }
|
12
12
|
status { Comee::Core::SalesOrder.statuses[:draft] }
|
13
13
|
pallete_note { Faker::Lorem.sentence }
|
14
|
+
consignee { Faker::Name.name }
|
14
15
|
remark { Faker::Lorem.sentence }
|
15
16
|
parent_client_name { Faker::Name.name }
|
16
17
|
created_by { Faker::Name.name }
|
@@ -7,5 +7,7 @@ FactoryBot.define do
|
|
7
7
|
handover_date { Date.current.advance(days: 3) }
|
8
8
|
delivery_date { Date.current.advance(days: 6) }
|
9
9
|
pallet_no { Faker::Alphanumeric.alpha(number: 10) }
|
10
|
+
consignee { Faker::Name.name }
|
11
|
+
order_number { sales_order_item.sales_order.order_number }
|
10
12
|
end
|
11
13
|
end
|