-
-
Notifications
You must be signed in to change notification settings - Fork 729
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Autoremove/update item from the cart if stock changed during checkout #13121
Open
rioug
wants to merge
15
commits into
openfoodfoundation:master
Choose a base branch
from
rioug:13054-out-of-stock-autoremove
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
a7cde06
Add Orders::CheckStockService and spec
rioug c73c2dd
Add basic out of stock modal
rioug 7d62a7f
Add CheckStockService#update_line_items
rioug e548e74
Update out stock modal
rioug cdcab7c
Update insufficient stock logic
rioug 08ad2af
Make sure Orders::CheckStockService is only instanciated once
rioug 69abdca
Fix insufficient stock modal styling
rioug c311b8a
Code styling
rioug 851cccb
Fix paypal controller
rioug 90eecc7
Fix stripe controller
rioug 0315fc9
Remove spec namespacing, left over from spree
rioug 8db2445
Add comment to make sure both out of stock modal get updated.
rioug bf72a89
Clean up left over comment
rioug db3534e
Per review, fix memoization
rioug ce47f9e
Fix typo in translation code
rioug File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
# frozen_string_literal: true | ||
|
||
module Orders | ||
class CheckStockService | ||
attr_reader :order | ||
|
||
def initialize(order: ) | ||
@order = order | ||
end | ||
|
||
def sufficient_stock? | ||
@sufficient_stock ||= order.insufficient_stock_lines.blank? | ||
end | ||
end | ||
end |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# frozen_string_literal: true | ||
|
||
require 'spec_helper' | ||
|
||
RSpec.describe Orders::CheckStockService do | ||
subject { described_class.new(order:) } | ||
|
||
let(:order) { create(:order_with_line_items) } | ||
|
||
describe "#sufficient_stock?" do | ||
it "returns true if enough stock" do | ||
expect(subject.sufficient_stock?).to be(true) | ||
end | ||
|
||
context "when one or more item are out of stock" do | ||
it "returns false" do | ||
variant = order.line_items.first.variant | ||
variant.update!(on_demand: false, on_hand: 0) | ||
|
||
expect(subject.sufficient_stock?).to be(false) | ||
end | ||
end | ||
end | ||
end |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This kind of caching doesn't work with boolean values. If the result is false then it gets re-computed on every call. I think that you need to check for
nil
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see that it was just copy and paste and broken before.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now we're checking
if defined?
, the assignment should always apply. So the||
is redundant.Would be nice to see a spec to prove it the fix :P