comee_core 0.1.85 → 0.1.86
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/products_controller.rb +2 -1
- data/app/controllers/comee/core/sales_orders_controller.rb +1 -1
- data/app/models/comee/core/proof_of_delivery.rb +9 -0
- data/app/services/comee/core/customer_order_service.rb +6 -1
- data/db/migrate/20240110074619_create_comee_core_proof_of_deliveries.rb +13 -0
- data/lib/comee/core/version.rb +1 -1
- data/spec/factories/comee/core/proof_of_deliveries.rb +9 -0
- metadata +4 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d65b99689edf889ecb6989545c88f1260ccecdea8f645fc1978fbebc945a8290
|
4
|
+
data.tar.gz: 418de27bfd37fe7a5021aa4984083254e1b74298b665b9d0e43438fb321b0c95
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9500aada926628c911f6d385620e1d65f609e8ef84f1d85aa3797a5e4272d90cc37da473a865d85c235ab3b3215829b75930e20efb471425363a4dfe057cf226
|
7
|
+
data.tar.gz: 10ccb38fd0821b0f9e56c94b27dfef547845593d33d23a8e19fe23cb691341e23c638d6b65cfe9c2185b7b592a4e2877b5c12469725af398ae102f183c503110
|
@@ -18,7 +18,8 @@ module Comee
|
|
18
18
|
end
|
19
19
|
|
20
20
|
def master_prices
|
21
|
-
data = MasterPrice.
|
21
|
+
data = MasterPrice.includes(:product_lookup, :supplier, :product)
|
22
|
+
.where(product_id: price_params[:product_ids])
|
22
23
|
render json: {success: true, data: serialize(data)}
|
23
24
|
end
|
24
25
|
|
@@ -8,7 +8,7 @@ module Comee
|
|
8
8
|
super do
|
9
9
|
[
|
10
10
|
Comee::Core::SalesOrder.includes(:customer_order, :fulfillment_center, :sales_order_items).all,
|
11
|
-
include: ["sales_order_items", "sales_order_items.product", "sales_order_items.unit"]
|
11
|
+
include: ["customer_order", "sales_order_items", "sales_order_items.product", "sales_order_items.unit"]
|
12
12
|
]
|
13
13
|
end
|
14
14
|
end
|
@@ -138,7 +138,12 @@ module Comee
|
|
138
138
|
status: SalesOrder.statuses[:draft]
|
139
139
|
)
|
140
140
|
order_items = order.customer_order_items.includes(:product, :unit)
|
141
|
-
|
141
|
+
client_id = order.client.parent_id || order.client_id
|
142
|
+
client_prices = ClientPrice.where(
|
143
|
+
client_id: client_id,
|
144
|
+
product_id: order_items.map(&:product_id),
|
145
|
+
status: ClientPrice.statuses[:current]
|
146
|
+
)
|
142
147
|
master_prices = MasterPrice.where(primary: true, status: Price.statuses[:current], product: order_items.map(&:product))
|
143
148
|
items = order_items.each_with_object([]) do |item, res|
|
144
149
|
next if item.canceled?
|
@@ -0,0 +1,13 @@
|
|
1
|
+
class CreateComeeCoreProofOfDeliveries < ActiveRecord::Migration[7.1]
|
2
|
+
def change
|
3
|
+
create_table :comee_core_proof_of_deliveries do |t|
|
4
|
+
t.string :reference_no, null: false
|
5
|
+
t.string :status, null: false, default: 0
|
6
|
+
t.string :driver
|
7
|
+
t.string :truck
|
8
|
+
t.string :plate_no
|
9
|
+
|
10
|
+
t.timestamps
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
data/lib/comee/core/version.rb
CHANGED
@@ -0,0 +1,9 @@
|
|
1
|
+
FactoryBot.define do
|
2
|
+
factory :proof_of_delivery, class: "Comee::Core::ProofOfDelivery" do
|
3
|
+
reference_no { Faker::Alphanumeric.alpha(number: 10) }
|
4
|
+
status { Comee::Core::ProofOfDelivery.statuses[:draft] }
|
5
|
+
driver { Faker::Name.name }
|
6
|
+
truck { Faker::Alphanumeric.alpha(number: 6) }
|
7
|
+
plate_no { Faker::Alphanumeric.alpha(number: 8) }
|
8
|
+
end
|
9
|
+
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: comee_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.86
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Henock L.
|
@@ -334,6 +334,7 @@ files:
|
|
334
334
|
- app/models/comee/core/price.rb
|
335
335
|
- app/models/comee/core/product.rb
|
336
336
|
- app/models/comee/core/product_lookup.rb
|
337
|
+
- app/models/comee/core/proof_of_delivery.rb
|
337
338
|
- app/models/comee/core/purchase_order.rb
|
338
339
|
- app/models/comee/core/purchase_order_item.rb
|
339
340
|
- app/models/comee/core/quotation_request.rb
|
@@ -431,6 +432,7 @@ files:
|
|
431
432
|
- db/migrate/20240104143246_create_comee_core_shipment_instruction_items.rb
|
432
433
|
- db/migrate/20240109185749_create_comee_core_transport_availability.rb
|
433
434
|
- db/migrate/20240109185931_create_comee_core_time_slots.rb
|
435
|
+
- db/migrate/20240110074619_create_comee_core_proof_of_deliveries.rb
|
434
436
|
- lib/comee/core.rb
|
435
437
|
- lib/comee/core/engine.rb
|
436
438
|
- lib/comee/core/version.rb
|
@@ -458,6 +460,7 @@ files:
|
|
458
460
|
- spec/factories/comee/core/order_sources.rb
|
459
461
|
- spec/factories/comee/core/product_lookups.rb
|
460
462
|
- spec/factories/comee/core/products.rb
|
463
|
+
- spec/factories/comee/core/proof_of_deliveries.rb
|
461
464
|
- spec/factories/comee/core/purchase_order_items.rb
|
462
465
|
- spec/factories/comee/core/purchase_orders.rb
|
463
466
|
- spec/factories/comee/core/quotation_request_items.rb
|