2 0 stable april5 #3
Closed
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
Added column allows users to see the shipping method of each order.
We are using the latest version of the `stripe` gem. We don't depend on any particular version. I'm proposing to drop our dependency declaration on a particular version and just track the current used version in Gemfile.lock. That means fewer code changes when updating, which happens quite frequently with this gem.
…method Add shipping method name to orders detail report
I saw the following error on the 2-0-stable branch: translation missing: en.spree.line_item_adjustments In a pending PR I change all three translations in the view file to use lazy lookup. This commit backports the addition to the locale so that it can be translated via Transifex before we release v2.
…rides-in-inventory-report Test inventory report to use variant overrides
…mand_error Fix nil values in on_hand column
Relax stripe version requirement
…2-translation Add missing translation for order form in v2
Fix outdated db2fog initializer
luisramos0
pushed a commit
that referenced
this pull request
Nov 13, 2020
As an administrator
I want to create and edit orders
as an enterprise manager viewing the edit page with different shipping methods can edit shipping method
Failure/Error: expect(page).to have_content "Shipping: #{different_shipping_method_for_distributor1.name}"
expected to find text "Shipping: Different" in "Logged in as : [email protected] Account Logout Store DASHBOARD PRODUCTS ORDER CYCLES ORDERS REPORTS ENTERPRISES CUSTOMERS Order # R813516688 CANCEL ACTIONS BACK TO ORDER LIST John Doe - ADD PRODUCT NAME OR SKU (ENTER AT LEAST FIRST 4 CHARACTERS OF PRODUCT NAME) Select a variant 100 - PENDING ITEM DESCRIPTION PRICE QUANTITY TOTAL Product #3 - 9924 - 1g, S $10.00 1 x none $10.00 Product #4 - 5548 - 1g, S $10.00 1 x none $10.00 Product #5 - 8080 - 1g, S $10.00 1 x none $10.00 Product #6 - 3591 - 1g, S $10.00 1 x none $10.00 Product #7 - 6461 - 1g, S $10.00 1 x none $10.00 Product #8 - 4071 - 1g, S $110.00 1 x none $110.00 SHIPPING METHOD Different $0.00 Normal $0.00 Different $0.00 Tracking: U10000 LINE ITEM ADJUSTMENTS NAME AMOUNT Tax 1 10.0%: $10.00 ORDER ADJUSTMENTS NAME AMOUNT Transaction fee: $0.00 ORDER TOTAL $160.00 DISTRIBUTION Distributor: Enterprise 4 Order cycle: Order Cycle 2 UPDATE AND RECALCULATE FEES or BACK ORDER INFORMATION STATUS COMPLETE TOTAL : $160.00 SHIPMENT : PENDING PAYMENT : BALANCE DUE DATE COMPLETED : November 08, 2020 1:51 AM ORDER DETAILS CUSTOMER DETAILS ADJUSTMENTS PAYMENTS RETURN AUTHORIZATIONS"
# ./spec/features/admin/order_spec.rb:291:in `block (5 levels) in <top (required)>'
andrewpbrett
pushed a commit
that referenced
this pull request
Nov 20, 2020
As an administrator
I want to create and edit orders
as an enterprise manager viewing the edit page with different shipping methods can edit shipping method
Failure/Error: expect(page).to have_content "Shipping: #{different_shipping_method_for_distributor1.name}"
expected to find text "Shipping: Different" in "Logged in as : [email protected] Account Logout Store DASHBOARD PRODUCTS ORDER CYCLES ORDERS REPORTS ENTERPRISES CUSTOMERS Order # R813516688 CANCEL ACTIONS BACK TO ORDER LIST John Doe - ADD PRODUCT NAME OR SKU (ENTER AT LEAST FIRST 4 CHARACTERS OF PRODUCT NAME) Select a variant 100 - PENDING ITEM DESCRIPTION PRICE QUANTITY TOTAL Product #3 - 9924 - 1g, S $10.00 1 x none $10.00 Product #4 - 5548 - 1g, S $10.00 1 x none $10.00 Product #5 - 8080 - 1g, S $10.00 1 x none $10.00 Product #6 - 3591 - 1g, S $10.00 1 x none $10.00 Product #7 - 6461 - 1g, S $10.00 1 x none $10.00 Product #8 - 4071 - 1g, S $110.00 1 x none $110.00 SHIPPING METHOD Different $0.00 Normal $0.00 Different $0.00 Tracking: U10000 LINE ITEM ADJUSTMENTS NAME AMOUNT Tax 1 10.0%: $10.00 ORDER ADJUSTMENTS NAME AMOUNT Transaction fee: $0.00 ORDER TOTAL $160.00 DISTRIBUTION Distributor: Enterprise 4 Order cycle: Order Cycle 2 UPDATE AND RECALCULATE FEES or BACK ORDER INFORMATION STATUS COMPLETE TOTAL : $160.00 SHIPMENT : PENDING PAYMENT : BALANCE DUE DATE COMPLETED : November 08, 2020 1:51 AM ORDER DETAILS CUSTOMER DETAILS ADJUSTMENTS PAYMENTS RETURN AUTHORIZATIONS"
# ./spec/features/admin/order_spec.rb:291:in `block (5 levels) in <top (required)>'
luisramos0
pushed a commit
that referenced
this pull request
Jul 24, 2021
…ce7b1a99a13ab parent b680697 author Nihal Mohammed <[email protected]> 1621004464 +0530 committer Nihal Mohammed <[email protected]> 1621022463 +0530 # This is a combination of 4 commits. # This is the 1st commit message: Add advanced settings button to incoming and outgoing pages in OC cycle edit # This is the commit message #2: Remove extra header text # This is the commit message #3: Moved repeating code blocks to partial # This is the commit message #4: Refactored code # This is the commit message #5: Delete _advanced_settings_hidden.html.haml
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.
What? Why?
Closes #[the issue number this PR is related to]
What should we test?
Release notes
Changelog Category: Added | Changed | Deprecated | Removed | Fixed | Security
How is this related to the Spree upgrade?
Discourse thread
Dependencies
Documentation updates