dscf-marketplace 0.6.2 → 0.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/dscf/marketplace/listings_controller.rb +1 -1
- data/app/controllers/dscf/marketplace/quotations_controller.rb +3 -3
- data/app/models/dscf/marketplace/delivery_order_item.rb +1 -1
- data/config/locales/en.yml +4 -0
- data/lib/dscf/marketplace/version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 87c9e26ee1a03d60a892a9959d1beefd2287039c433c173bf896ea0e9a44a409
|
|
4
|
+
data.tar.gz: 6da6652ed712f8e1d5c617e61ff95c72c181148fbb219f800da503dc12a4f645
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d39c8853dc117c49f980f458e4b25d6e9666f6a51ce6894d5078bb27133569fbf0cf3abd84ce76f977d4df6a6b81762073e77e0edb2acfac694eca3c53cfcc79
|
|
7
|
+
data.tar.gz: 92d80800e80f81ea590c8c4cd4c2ca0d64e43540c2f7d12a7796e6891d359cd74e25b5266fcbadd7f3511a6a5aa723a88cee64c0706b305f5c0a71b2199cd139
|
|
@@ -47,7 +47,7 @@ module Dscf
|
|
|
47
47
|
|
|
48
48
|
# Validate supplier exists
|
|
49
49
|
supplier = Dscf::Core::Business.find_by(id: supplier_id)
|
|
50
|
-
return render_error("
|
|
50
|
+
return render_error("listings.errors.supplier_not_found") unless supplier
|
|
51
51
|
|
|
52
52
|
service = MyResourceService.new(current_user)
|
|
53
53
|
listings = service.listings_by_supplier(supplier_id, params)
|
|
@@ -30,7 +30,7 @@ module Dscf
|
|
|
30
30
|
|
|
31
31
|
# Validate fulfillment_type
|
|
32
32
|
unless fulfillment_type.present? && Dscf::Marketplace::Order.fulfillment_types.keys.include?(fulfillment_type)
|
|
33
|
-
render_error("
|
|
33
|
+
render_error("quotations.errors.invalid_fulfillment_type", status: :unprocessable_entity)
|
|
34
34
|
return
|
|
35
35
|
end
|
|
36
36
|
|
|
@@ -38,13 +38,13 @@ module Dscf
|
|
|
38
38
|
if dropoff_address_id.present?
|
|
39
39
|
dropoff_address = Dscf::Core::Address.find_by(id: dropoff_address_id) if defined?(Dscf::Core::Address)
|
|
40
40
|
unless dropoff_address && dropoff_address.user_id == current_user.id
|
|
41
|
-
render_error("
|
|
41
|
+
render_error("quotations.errors.invalid_dropoff_address", status: :unprocessable_entity)
|
|
42
42
|
return
|
|
43
43
|
end
|
|
44
44
|
end
|
|
45
45
|
|
|
46
46
|
if fulfillment_type == "delivery" && dropoff_address.nil?
|
|
47
|
-
render_error("
|
|
47
|
+
render_error("quotations.errors.dropoff_address_required", status: :unprocessable_entity)
|
|
48
48
|
return
|
|
49
49
|
end
|
|
50
50
|
|
|
@@ -71,7 +71,7 @@ module Dscf::Marketplace
|
|
|
71
71
|
|
|
72
72
|
# Handoff workflow methods
|
|
73
73
|
def receiver_confirm!(confirmed_quantity, notes = nil, confirmed_by = nil)
|
|
74
|
-
return false unless
|
|
74
|
+
return false unless picked_up? || pending?
|
|
75
75
|
|
|
76
76
|
update!(
|
|
77
77
|
status: :receiver_confirmed,
|
data/config/locales/en.yml
CHANGED
|
@@ -104,6 +104,7 @@ en:
|
|
|
104
104
|
create: "Failed to create listing"
|
|
105
105
|
update: "Failed to update listing"
|
|
106
106
|
destroy: "Failed to delete listing"
|
|
107
|
+
supplier_not_found: "Supplier not found"
|
|
107
108
|
|
|
108
109
|
request_for_quotations:
|
|
109
110
|
success:
|
|
@@ -180,6 +181,9 @@ en:
|
|
|
180
181
|
reject: "Failed to reject quotation"
|
|
181
182
|
send_quotation: "Failed to send quotation"
|
|
182
183
|
sent: "Failed to send quotation"
|
|
184
|
+
invalid_fulfillment_type: "Invalid or missing fulfillment_type"
|
|
185
|
+
invalid_dropoff_address: "Invalid dropoff_address_id"
|
|
186
|
+
dropoff_address_required: "dropoff_address_id required for delivery"
|
|
183
187
|
|
|
184
188
|
quotation_item:
|
|
185
189
|
success:
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dscf-marketplace
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.6.
|
|
4
|
+
version: 0.6.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Asrat
|
|
8
8
|
bindir: bin
|
|
9
9
|
cert_chain: []
|
|
10
|
-
date: 2025-
|
|
10
|
+
date: 2025-11-28 00:00:00.000000000 Z
|
|
11
11
|
dependencies:
|
|
12
12
|
- !ruby/object:Gem::Dependency
|
|
13
13
|
name: rails
|
|
@@ -35,14 +35,14 @@ dependencies:
|
|
|
35
35
|
requirements:
|
|
36
36
|
- - "~>"
|
|
37
37
|
- !ruby/object:Gem::Version
|
|
38
|
-
version: 0.2.
|
|
38
|
+
version: 0.2.8
|
|
39
39
|
type: :runtime
|
|
40
40
|
prerelease: false
|
|
41
41
|
version_requirements: !ruby/object:Gem::Requirement
|
|
42
42
|
requirements:
|
|
43
43
|
- - "~>"
|
|
44
44
|
- !ruby/object:Gem::Version
|
|
45
|
-
version: 0.2.
|
|
45
|
+
version: 0.2.8
|
|
46
46
|
- !ruby/object:Gem::Dependency
|
|
47
47
|
name: active_model_serializers
|
|
48
48
|
requirement: !ruby/object:Gem::Requirement
|