comee_core 0.2.72 → 0.2.74
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/customer_order_items_controller.rb +1 -0
- data/app/controllers/comee/core/customer_orders_controller.rb +1 -1
- data/app/controllers/comee/core/sales_order_items_controller.rb +1 -1
- data/app/controllers/comee/core/sales_orders_controller.rb +7 -6
- data/app/models/comee/core/customer_order_item.rb +2 -1
- data/app/models/comee/core/sales_order_item.rb +2 -1
- data/app/serializers/comee/core/customer_order_item_serializer.rb +1 -1
- data/app/serializers/comee/core/sales_order_item_serializer.rb +1 -1
- data/app/services/comee/core/customer_order_service.rb +1 -0
- data/db/migrate/20240515173010_add_serial_no_to_line_items.rb +6 -0
- data/lib/comee/core/version.rb +1 -1
- data/spec/factories/comee/core/customer_order_items.rb +1 -0
- data/spec/factories/comee/core/sales_order_items.rb +1 -0
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e7637cf6daeec977e6222697ac258f13cdcb33798d78fc31fe111233e16dc4cd
|
4
|
+
data.tar.gz: febca6c6cbbae3250e1d52159aff0a17e16c3cb28f3a5cb1ed01db51a8976ba7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a48d13cc574afa60e54d5bb4485cc98662a03e66b8d5701dc3a7baadd304c280699f888e6f7318e138d8935d00bc8c00df1987f2a6c95ddca6b0642ccdf08b2a
|
7
|
+
data.tar.gz: 42978d335f03b548bc112a18ff510cb5796a6985296bd977339de6d4258f30717319379af523818c903297c1699d53c971634e2d0129bc371932910e253f40ba
|
@@ -77,7 +77,7 @@ module Comee
|
|
77
77
|
.permit(
|
78
78
|
:order_number, :order_date, :order_terms, :consignee, :shipment_address, :final_destination,
|
79
79
|
:final_delivery_date, :handover_date, :shipping_date, :delivery_address, :invoice_address, :status, :client_id,
|
80
|
-
items: %i[customer_item_no customer_item_description product_id quantity price total_price unit_id delivery_date]
|
80
|
+
items: %i[serial_no customer_item_no customer_item_description product_id quantity price total_price unit_id delivery_date]
|
81
81
|
)
|
82
82
|
end
|
83
83
|
|
@@ -94,7 +94,7 @@ module Comee
|
|
94
94
|
def model_params
|
95
95
|
params.require(:payload)
|
96
96
|
.permit(:sales_order_id, :customer_order_item_id, :product_id, :unit_id, :quantity, :quantity_delivered,
|
97
|
-
:quantity_canceled, :customer_item_no, :customer_item_description, :price, :handover_date,
|
97
|
+
:serial_no, :quantity_canceled, :customer_item_no, :customer_item_description, :price, :handover_date,
|
98
98
|
:delivery_date, :eb_number, :lead_time, :comment, :action_note, :purchase_order_item_id, :pallet_no,
|
99
99
|
:source_id, :processing_status)
|
100
100
|
end
|
@@ -64,7 +64,7 @@ module Comee
|
|
64
64
|
:customer_order,
|
65
65
|
:client,
|
66
66
|
:customs_detail,
|
67
|
-
sales_order_items:
|
67
|
+
sales_order_items: %i[unit customer_order_item]
|
68
68
|
).ransack(params[:q]).result
|
69
69
|
render_content(
|
70
70
|
data,
|
@@ -73,6 +73,7 @@ module Comee
|
|
73
73
|
"customer_order",
|
74
74
|
"sales_order_items.product",
|
75
75
|
"sales_order_items.unit",
|
76
|
+
"sales_order_items.customer_order_item",
|
76
77
|
"customs_detail",
|
77
78
|
"fulfillment_center"
|
78
79
|
]
|
@@ -120,11 +121,11 @@ module Comee
|
|
120
121
|
private
|
121
122
|
|
122
123
|
def model_params
|
123
|
-
params.require(:payload).permit(:order_number, :order_date, :customer_order_id, :fulfillment_center_id,
|
124
|
-
:order_terms, :shipment_address, :delivery_address, :invoice_address,
|
125
|
-
:handover_date, :shipping_date, :delivery_date, :consignee, :payment_term,
|
126
|
-
:payment_penalty, :status, :purchase_status, :total_price, :amount_paid,
|
127
|
-
files: [])
|
124
|
+
params.require(:payload).permit(:order_number, :order_date, :customer_order_id, :fulfillment_center_id,
|
125
|
+
:client_id, :order_terms, :shipment_address, :delivery_address, :invoice_address,
|
126
|
+
:destination, :handover_date, :shipping_date, :delivery_date, :consignee, :payment_term,
|
127
|
+
:delivery_term, :payment_penalty, :status, :purchase_status, :total_price, :amount_paid,
|
128
|
+
:pallete_note, :remark, files: [])
|
128
129
|
end
|
129
130
|
|
130
131
|
def back_order_params
|
@@ -7,9 +7,10 @@ module Comee
|
|
7
7
|
belongs_to :product
|
8
8
|
belongs_to :unit
|
9
9
|
|
10
|
-
validates :customer_item_no, :customer_item_description, :quantity, :price, :delivery_date, presence: true
|
10
|
+
validates :serial_no, :customer_item_no, :customer_item_description, :quantity, :price, :delivery_date, presence: true
|
11
11
|
validates :quantity, :price, numericality: {greater_than_or_equal_to: 0}
|
12
12
|
validates :total_price, numericality: {greater_than_or_equal_to: 0}, allow_nil: true
|
13
|
+
validates :serial_no, numericality: {greater_than: 0, only_integer: true}
|
13
14
|
|
14
15
|
def calculate_total_price
|
15
16
|
self.total_price = price * quantity
|
@@ -15,9 +15,10 @@ module Comee
|
|
15
15
|
belongs_to :purchase_order_item, optional: true
|
16
16
|
has_many :shipment_items
|
17
17
|
|
18
|
-
validates :customer_item_no, :customer_item_description, :delivery_date, :processing_status, presence: true
|
18
|
+
validates :serial_no, :customer_item_no, :customer_item_description, :delivery_date, :processing_status, presence: true
|
19
19
|
validates :quantity, :price, presence: true, numericality: {greater_than: 0}
|
20
20
|
validates :quantity_delivered, :quantity_canceled, numericality: {greater_than_or_equal_to: 0}
|
21
|
+
validates :serial_no, numericality: {greater_than: 0, only_integer: true}
|
21
22
|
|
22
23
|
delegate(:po_number, to: :purchase_order_item, prefix: false, allow_nil: true)
|
23
24
|
|
@@ -1,7 +1,7 @@
|
|
1
1
|
module Comee
|
2
2
|
module Core
|
3
3
|
class CustomerOrderItemSerializer < ActiveModel::Serializer
|
4
|
-
attributes :id, :customer_item_no, :customer_item_description, :quantity, :price, :total_price, :delivery_date,
|
4
|
+
attributes :id, :serial_no, :customer_item_no, :customer_item_description, :quantity, :price, :total_price, :delivery_date,
|
5
5
|
:canceled, :customer_order_id, :product_id, :unit_id
|
6
6
|
belongs_to :product
|
7
7
|
belongs_to :unit
|
@@ -1,7 +1,7 @@
|
|
1
1
|
module Comee
|
2
2
|
module Core
|
3
3
|
class SalesOrderItemSerializer < ActiveModel::Serializer
|
4
|
-
attributes :id, :customer_item_no, :customer_item_description, :quantity, :quantity_delivered, :quantity_canceled,
|
4
|
+
attributes :id, :serial_no, :customer_item_no, :customer_item_description, :quantity, :quantity_delivered, :quantity_canceled,
|
5
5
|
:price, :handover_date, :delivery_date, :eb_number, :lead_time, :comment, :action_note, :purchase_order_item_id,
|
6
6
|
:total_price, :canceled, :processing_status
|
7
7
|
belongs_to :sales_order
|
@@ -184,6 +184,7 @@ module Comee
|
|
184
184
|
customer_order_item_id: item.id,
|
185
185
|
product_id: item.product_id,
|
186
186
|
unit_id: unit_id,
|
187
|
+
serial_no: item.serial_no,
|
187
188
|
customer_item_no: item.customer_item_no,
|
188
189
|
customer_item_description: item.customer_item_description,
|
189
190
|
quantity: quantity,
|
data/lib/comee/core/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: comee_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.74
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Henock L.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-05-
|
11
|
+
date: 2024-05-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: active_model_serializers
|
@@ -469,6 +469,7 @@ files:
|
|
469
469
|
- db/migrate/20240407083617_create_comee_core_email_settings.rb
|
470
470
|
- db/migrate/20240425121701_add_purchase_status_to_sales_order_and_purchase_requisition.rb
|
471
471
|
- db/migrate/20240503040722_create_comee_core_client_addresses.rb
|
472
|
+
- db/migrate/20240515173010_add_serial_no_to_line_items.rb
|
472
473
|
- lib/comee/core.rb
|
473
474
|
- lib/comee/core/engine.rb
|
474
475
|
- lib/comee/core/version.rb
|