comee_core 0.3.31 → 0.3.33
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 +24 -1
- data/app/models/comee/core/customer_order_item.rb +11 -1
- data/app/models/comee/core/shipment_instruction_item.rb +1 -1
- data/app/services/comee/core/customer_order_service.rb +1 -0
- data/db/migrate/20240716143922_add_customer_item_alias_to_customer_and_sales_order.rb +6 -0
- data/db/migrate/20240718103456_make_delivery_note_no_and_goods_issue_date_optional.rb +6 -0
- data/lib/comee/core/version.rb +1 -1
- data/spec/factories/comee/core/sales_order_items.rb +1 -0
- metadata +4 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e6c589c25e5e2b41ad83a56f366e896c5b7faf3688a83c9f5374fb32da59b627
|
4
|
+
data.tar.gz: 1bf5521076bda84877681a8332fcd2164b3cd44f7b45e06e9cf77e07dcfbfb5d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 638fe7dbf70fff745c9141b57f436788d77ae03d2fd9ae684181504d3e9a5a024c65ce59cc7cbf4d85ba30b1bc3eabc2b2ea3706a00e76619a02f644d756f89a
|
7
|
+
data.tar.gz: f81537b7037404f9ab7d4a911cee199b2909c33d7a021668a44864baa92d2dbbbe1130b1301fab00df96bc7b14b111c3d2d0e8a312c6ffae4baf47a9a7cc6494
|
@@ -10,6 +10,9 @@ module Comee
|
|
10
10
|
:customer_order,
|
11
11
|
:client,
|
12
12
|
:customs_detail,
|
13
|
+
shipment_address: :country,
|
14
|
+
delivery_address: :country,
|
15
|
+
invoice_address: :country,
|
13
16
|
sales_order_items: :unit
|
14
17
|
).order(created_at: :desc)
|
15
18
|
[
|
@@ -20,6 +23,9 @@ module Comee
|
|
20
23
|
"sales_order_items",
|
21
24
|
"sales_order_items.product",
|
22
25
|
"sales_order_items.unit",
|
26
|
+
"shipment_address.country",
|
27
|
+
"delivery_address.country",
|
28
|
+
"invoice_address.country",
|
23
29
|
"customs_detail",
|
24
30
|
"fulfillment_center"
|
25
31
|
]
|
@@ -30,13 +36,24 @@ module Comee
|
|
30
36
|
def show
|
31
37
|
super do
|
32
38
|
[
|
33
|
-
SalesOrder.includes(
|
39
|
+
SalesOrder.includes(
|
40
|
+
:customer_order,
|
41
|
+
:client,
|
42
|
+
:customs_detail,
|
43
|
+
shipment_address: :country,
|
44
|
+
delivery_address: :country,
|
45
|
+
invoice_address: :country,
|
46
|
+
sales_order_items: :unit
|
47
|
+
).find(params[:id]),
|
34
48
|
include: [
|
35
49
|
"client",
|
36
50
|
"customer_order",
|
37
51
|
"sales_order_items",
|
38
52
|
"sales_order_items.product",
|
39
53
|
"sales_order_items.unit",
|
54
|
+
"shipment_address.country",
|
55
|
+
"delivery_address.country",
|
56
|
+
"invoice_address.country",
|
40
57
|
"customs_detail",
|
41
58
|
"fulfillment_center"
|
42
59
|
]
|
@@ -64,6 +81,9 @@ module Comee
|
|
64
81
|
:customer_order,
|
65
82
|
:client,
|
66
83
|
:customs_detail,
|
84
|
+
shipment_address: :country,
|
85
|
+
delivery_address: :country,
|
86
|
+
invoice_address: :country,
|
67
87
|
sales_order_items: %i[unit customer_order_item]
|
68
88
|
).ransack(params[:q]).result
|
69
89
|
render_content(
|
@@ -74,6 +94,9 @@ module Comee
|
|
74
94
|
"sales_order_items.product",
|
75
95
|
"sales_order_items.unit",
|
76
96
|
"sales_order_items.customer_order_item",
|
97
|
+
"shipment_address.country",
|
98
|
+
"delivery_address.country",
|
99
|
+
"invoice_address.country",
|
77
100
|
"customs_detail",
|
78
101
|
"fulfillment_center"
|
79
102
|
]
|
@@ -3,7 +3,7 @@ module Comee
|
|
3
3
|
class CustomerOrderItem < ApplicationRecord
|
4
4
|
default_scope { order(serial_no: :asc) }
|
5
5
|
|
6
|
-
before_save :calculate_total_price
|
6
|
+
before_save :calculate_total_price, :fetch_customer_item_alias
|
7
7
|
|
8
8
|
belongs_to :customer_order
|
9
9
|
belongs_to :product
|
@@ -18,6 +18,16 @@ module Comee
|
|
18
18
|
self.total_price = (price * quantity).round(2)
|
19
19
|
end
|
20
20
|
|
21
|
+
def fetch_customer_item_alias
|
22
|
+
self.customer_item_alias = "" unless customer_order && product_id
|
23
|
+
lookup = ProductLookup.find_by(
|
24
|
+
itemable_id: customer_order.client_id,
|
25
|
+
itemable_type: "Comee::Core::Client",
|
26
|
+
product_id: product_id
|
27
|
+
)
|
28
|
+
self.customer_item_alias = lookup&.aliases
|
29
|
+
end
|
30
|
+
|
21
31
|
def self.ransackable_attributes(_auth_object = nil)
|
22
32
|
%w[id customer_order_id product_id unit_id customer_item_no customer_item_description delivery_date]
|
23
33
|
end
|
@@ -7,7 +7,7 @@ module Comee
|
|
7
7
|
belongs_to :pod, optional: true
|
8
8
|
belongs_to :delivery_note, optional: true
|
9
9
|
|
10
|
-
validates :
|
10
|
+
validates :pallet_no, presence: true
|
11
11
|
validates :length, :width, :height, :weight, :quantity, :price, presence: true, numericality: {greater_than: 0}
|
12
12
|
end
|
13
13
|
end
|
@@ -208,6 +208,7 @@ module Comee
|
|
208
208
|
unit_id: unit_id,
|
209
209
|
serial_no: item.serial_no,
|
210
210
|
customer_item_no: item.customer_item_no,
|
211
|
+
customer_item_alias: item.customer_item_alias,
|
211
212
|
customer_item_description: item.customer_item_description,
|
212
213
|
quantity: quantity,
|
213
214
|
price: price,
|
@@ -0,0 +1,6 @@
|
|
1
|
+
class AddCustomerItemAliasToCustomerAndSalesOrder < ActiveRecord::Migration[7.1]
|
2
|
+
def change
|
3
|
+
add_column :comee_core_customer_order_items, :customer_item_alias, :string, null: true
|
4
|
+
add_column :comee_core_sales_order_items, :customer_item_alias, :string, null: true
|
5
|
+
end
|
6
|
+
end
|
@@ -0,0 +1,6 @@
|
|
1
|
+
class MakeDeliveryNoteNoAndGoodsIssueDateOptional < ActiveRecord::Migration[7.1]
|
2
|
+
def change
|
3
|
+
change_column :comee_core_shipment_instruction_items, :delivery_note_no, :string, null: true
|
4
|
+
change_column :comee_core_shipment_instruction_items, :goods_issue_date, :date, null: true
|
5
|
+
end
|
6
|
+
end
|
data/lib/comee/core/version.rb
CHANGED
@@ -8,6 +8,7 @@ FactoryBot.define do
|
|
8
8
|
unit { customer_order_item.unit }
|
9
9
|
purchase_order_item { nil }
|
10
10
|
customer_item_no { Faker::Alphanumeric.alpha(number: 10) }
|
11
|
+
customer_item_alias { Faker::Alphanumeric.alpha(number: 10) }
|
11
12
|
customer_item_description { Faker::Lorem.sentence }
|
12
13
|
quantity { customer_order_item.quantity }
|
13
14
|
quantity_diff { 0 }
|
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.3.
|
4
|
+
version: 0.3.33
|
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-07-
|
11
|
+
date: 2024-07-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: active_model_serializers
|
@@ -524,6 +524,8 @@ files:
|
|
524
524
|
- db/migrate/20240406162711_create_comee_core_goods_issued_items.rb
|
525
525
|
- db/migrate/20240407083617_create_comee_core_email_settings.rb
|
526
526
|
- db/migrate/20240630122016_create_comee_core_additional_services.rb
|
527
|
+
- db/migrate/20240716143922_add_customer_item_alias_to_customer_and_sales_order.rb
|
528
|
+
- db/migrate/20240718103456_make_delivery_note_no_and_goods_issue_date_optional.rb
|
527
529
|
- lib/comee/core.rb
|
528
530
|
- lib/comee/core/engine.rb
|
529
531
|
- lib/comee/core/version.rb
|