assigning status to state on order for stockit orders #964
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@abulsayyad123 I've made this a draft PR |
steveyken
commented
Apr 1, 2020
| @@ -130,6 +130,7 @@ def order_record | |||
| if order_params[:stockit_id] | |||
| @order = Order.accessible_by(current_ability).where(stockit_id: order_params[:stockit_id]).first_or_initialize | |||
| @order.assign_attributes(order_params) | |||
| @order.assign_state(params[:status]) | |||
There was a problem hiding this comment.
@abulsayyad123 does this get run for Stockit requests or also for normal goodcity requests?
There was a problem hiding this comment.
Only for Stockit requests.
steveyken
commented
Apr 1, 2020
app/models/order.rb
Outdated
| @@ -111,6 +111,10 @@ class Order < ActiveRecord::Base | |||
| scope :goodcity_orders, -> { where(detail_type: "GoodCity") } | |||
| scope :shipments, -> { where(detail_type: "Shipment") } | |||
|
|
|||
| def assign_state(status) | |||
| state = SHIPMENT_STATUS_MAP[status] | |||
There was a problem hiding this comment.
Need a default state
Suggested change
| state = SHIPMENT_STATUS_MAP[status] | |
| state = SHIPMENT_STATUS_MAP[status] || 'processing' |
steveyken
commented
Apr 1, 2020
| @@ -130,6 +130,7 @@ def order_record | |||
| if order_params[:stockit_id] | |||
| @order = Order.accessible_by(current_ability).where(stockit_id: order_params[:stockit_id]).first_or_initialize | |||
| @order.assign_attributes(order_params) | |||
| @order.assign_state(params[:status]) | |||
| @order.stockit_activity = stockit_activity | |||
| @order.stockit_contact = stockit_contact | |||
| @order.stockit_organisation = stockit_organisation | |||
There was a problem hiding this comment.
we need to change this code to accept stockit shipments as well as local orders... I wonder if we wait until after we have shutdown stockit then we don't need to do anything
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ticket Link:
NOTE: Specify ticket link
What does this PR do?
FEATURE: Specify feature name
BUG: Specify bug
NOTE: Give a description of what this PR does. If it fixes any bug, specify cause of an issue and approach/solution added to fix that issue.
Impacted Areas
NOTE: List any impacted areas (e.g. Dashboard > My Active Offers > scheduled )
Screenshots
NOTE: Attach screeenshots if PR contains any UI changes
Mockup Link
Note: Specify mockup link
Linked PR's:
NOTE: If these changes are related to some existing PR or fixes any issue from existing PR changes, specify PR links.
Linked Slack conversation:
NOTE: IF there is any conversation happened for current changes in any of the slack channel, mention the slack message link.
Any Open question(s) or challenge(s):