dscf-marketplace 0.4.6 → 0.4.7

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e3d34992026013336d09084b0e2679c7681013c06da1e81e226a17bfcf98c846
4
- data.tar.gz: d8576224a26ec0115c3721f2c924f021bf3f896987b0a55a4785b37c6be6a751
3
+ metadata.gz: 25d9b827c01f994c9b719499de78c8db2a58cc77fa4364f9ce552a9cba8fe8c9
4
+ data.tar.gz: ca3a28c72eba9e913db8ea80de53f0033793da5e64dc218dcfa06962adc40d95
5
5
  SHA512:
6
- metadata.gz: bf9dcac6ea2394f3554d1c927f42a55553fa3fecc5be6408a05126ed4434d5ef5f7889eacac7cd1eaa20f62463a44aceb40dd430372c9ed941f16663c73ed265
7
- data.tar.gz: e319a27d550e95ad2ca44433f2d83410385e0b370706e129a7aa9242ab1616ac5a43e2a4d8c3c0d62cee0ef8d8efe4e9f8a994081040ee54fad377342a37ffc4
6
+ metadata.gz: 4c0bdfe354a71a98de946de8e35dcc38fa67caf55faeefaf79d5d69e8cd5c2781f772a1fd7bc8c66eb868a37cd482491f6cb8db3689985d77420524387bb9dcb
7
+ data.tar.gz: 99e20eb42b14db9b23009b09f957ba131a03859e459519b08aa24fbd55bbf439147524f597b51c9582dbc73da281bd9f740b3117b594324257eeaa035d9dbe8c
@@ -19,9 +19,9 @@ module Dscf
19
19
  description = params[:description]
20
20
 
21
21
  if @obj.report_issue!(issue_type, quantity, description, current_user&.id)
22
- render_success("delivery_order_items.success.issue_reported", data: @obj)
22
+ render_success("delivery_order_items.success.issue_reported", data: @obj.delivery_order)
23
23
  else
24
- render_error("delivery_order_items.errors.report_issue_failed")
24
+ render_error("delivery_order_items.errors.report_issue")
25
25
  end
26
26
  end
27
27
 
@@ -86,7 +86,9 @@ module Dscf::Marketplace
86
86
  end
87
87
 
88
88
  def report_issue!(issue_type, quantity, description, reported_by)
89
- return false unless delivered? || picked_up?
89
+ return false unless delivered? || picked_up? || pending?
90
+ return false unless [ "damaged", "missing" ].include?(issue_type)
91
+ return false if quantity > self.quantity
90
92
 
91
93
  update!(
92
94
  status: issue_type.to_sym, # :damaged or :missing
@@ -1,5 +1,5 @@
1
1
  module Dscf
2
2
  module Marketplace
3
- VERSION = "0.4.6".freeze
3
+ VERSION = "0.4.7".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dscf-marketplace
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.6
4
+ version: 0.4.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Asrat