-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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
[Marketplace] Orders line items refund #2590
Merged
Merged
Changes from 172 commits
Commits
Show all changes
174 commits
Select commit
Hold shift + click to select a range
b9a5237
Allow customer to move past validation after one pass
brent-hoover 6917f5c
Silencing needless warning
brent-hoover cca678a
Add missing imports
brent-hoover 433bef6
When we get a "GetTax" error, revert to addressbook
brent-hoover 5b64575
Capture and parse errors
brent-hoover 564dfdf
Creating a "review and fix" address review screen
brent-hoover 7f7a02a
Show highlited diff. Copy over values on click.
brent-hoover 9a56646
Removing "debug" HTML
brent-hoover 28db441
Add "review address" translation
brent-hoover f5c7c9e
Basic "review address" flow working
brent-hoover c5c79a4
Remove console.log
brent-hoover 540c24e
Merge branch 'development' into brent-fix-issue-2104
brent-hoover 9393e16
Fix missing import
brent-hoover 9218f31
Fix import error
brent-hoover 4ac11b2
Return to edit and refresh address when you cancel out of review
brent-hoover 9f8da99
Make edit behave the same as add
brent-hoover 3d972d0
Tweak styling
brent-hoover 5ce8394
Merge branch 'development' into brent-fix-issue-2104
brent-hoover de48f0b
Merge branch 'development' into brent-fix-issue-2104
brent-hoover 7e330d9
More and more style changes
brent-hoover 4729320
Use proper color variables
brent-hoover 31c0349
Create proper behaviors
brent-hoover 62b9c45
Merge branch 'development' into brent-fix-issue-2104
brent-hoover 1de63a3
Fix bad evaluation
brent-hoover e263769
Fix import order
brent-hoover 239680d
Add i18n
brent-hoover c72247a
Don't throwback a step if tax fails
brent-hoover 0d069d7
Make this more of an "exception" flag
brent-hoover c1c4b3f
Adding the license description with link on README (#2365)
rafaelstz df6739d
added Nigerian Naira to currency list in (#2366)
casoetan 5b446c7
CollectionFS cfs:tempstore and cfs:worker to fix concurrency issues …
lcampanis eef7f18
Correct the way we record tax overrides
brent-hoover 9cfe6e8
[WIP] Meteor 1.5 (#2371)
6d88f3c
Declare variable (#2401)
brent-hoover 133e764
Implement missing router functions (#2393)
mikemurray ea5aa34
2332 Fix Improper Cart Merge (#2387)
abdulsemiu-atanda 278756a
Change line width to match GH PR review width (#2407)
brent-hoover bcd7d1d
Orders updates (#2400)
kieckhafer f3ca0d4
use route permissions in register.js files (#2388)
1e4d7fc
Milestone 54 / Convert Navbar to React (#2306)
brent-hoover 6e45ad6
Merge branch 'development' into brent-fix-issue-2104
brent-hoover a0b44da
import order
kieckhafer d202a0a
Merge pull request #2162 from reactioncommerce/brent-fix-issue-2104
kieckhafer 18d45a2
remove duplicate babel preset packages
jshimko 42ffc56
Merge pull request #2415 from reactioncommerce/fix-duplicate-packages
kieckhafer 73274c9
Updated yarn.lock and removed npm-shrinkwrap.json
da41bc0
Admin should be able to invite a user with the same name (#2386)
754e66b
Merge branch 'master' into development
c8409ff
Update version
9858361
switch to Reaction’s new fork of Nodemailer (#2427)
jshimko 4512d75
Added module aliases (#2436)
mikemurray 352c98d
LingoHub Update :rocket: (#2420)
43e0a60
Add css style to differentiate read from unread notifications (#2442)
b2b8e7f
Remove acceptance tests (#2430)
brent-hoover 5d0fc79
Fixed console error when dragging product images (#2443)
rhenshaw56 9a623be
finished up the popover
e4bade3
Add closeOnClick option to DropDownMenu component (#2418)
spencern 6d50cea
add missing "orders not found" text (#2424)
kieckhafer c5ee98a
Merge branch 'development' into Release-1.3.0
f7aa04b
Updated chai package
4efb14e
Merge branch 'Release-1.3.0' into development
dd0a77b
Bunyan and Loggly updates (#2425)
jshimko b64ee84
refactor default admin user creation (#2453)
jshimko 72d1ad3
update memory usage in CircleCI build (#2462)
jshimko 18778df
finished implementing design
25e8942
Navbar hover issue (#2451)
rhenshaw56 cea9557
set css property overflow on horizontal to hidden (#2458)
rhenshaw56 1d0fd64
[WIP] 2452 fix on UI icon toolbar (#2460)
rhenshaw56 1a6a8f3
[WIP] 2356 fix on tag menu-sidebar glitch (#2472)
rhenshaw56 d3e7da5
format price string for invoice details
b59263b
update media gallery new / deleted image indicators (#2469)
kieckhafer c9a0b28
Remove random regex checks on names. Fixes #2461 (#2471)
brent-hoover 670ee6b
remove older Blaze based launchdock plugin (#2467)
jshimko e87ea72
2459 router range error fix (#2476)
prosf c737ac9
2422 Fix on email invite link leading to blank screen (#2437)
rhenshaw56 c27f70e
Update current user's name on Navbar and profile page when address is…
0b97a00
add invoice actions
3144dc3
Updated dependencies (#2463)
3f252fe
Revert minifier to abernix fork (#2486)
jshimko 543ddc0
Fix error when inviting already invited user (#2433)
6c60ea1
Merge branch 'development' of github.com:reactioncommerce/reaction in…
1e11e68
Merge branch 'marketplace' of github.com:reactioncommerce/reaction in…
bef35d9
finish order line item popover functionality
a6c941b
Merge branch 'marketplace' of github.com:reactioncommerce/reaction in…
50c75f1
allow only users with the orders and dashboard/orders permission to v…
9ba4187
New branch for orders refund
joykare 8555f11
Add checkbox functionality
joykare 62b040c
Checkbox changes
joykare 5b5b38a
Prgress on UI
joykare a69f152
Add in permissions
joykare 58fee6d
Refactor and remove redundant code
joykare 3ad51f4
Add line invoice
joykare 9d68fe6
Actual invoice summary passed in
joykare eef7b45
Refactor code
joykare 8dd458b
Design iteration
joykare 1df9c09
Rewrite numberTypeComponent
joykare aa97091
Fix numeric Component
joykare b1daa00
Refactor number component
joykare bcccf44
Fix refunds
joykare 9b0f9d9
Modify refund/createMethod
joykare fcbafdd
Use /refunds/returnItems
joykare f36edc8
Add background color
joykare c097696
Styling iteration
joykare e5e69fa
Pixels right
joykare c2af01f
Move everything to inherit from invoice container
joykare b86d9c8
Fix approve button
joykare 9a13ffb
Convert invoice form to react
joykare 02ae4f4
Completely functioningon the orders workflow
joykare 4511fe7
Add disabling buttons
joykare e92bcc9
Capture transactions when returning line item
joykare 4f3ffdf
Add refunds lists on return items
joykare ff74ac9
Change canMakeAdjustments to include status partial refuns
joykare 0ccc35a
Massive refactor
joykare 11f6a8a
Add all line items on select
joykare 7daaa98
Add all items in all rows when selectAll is true
joykare 035d268
Select process change
joykare 4b49dfe
Refund/return name change
joykare 321591e
Merge Marketplace
joykare b039f87
Fix lint error
joykare b9b125c
Code updates
joykare 4ef6aa5
i18n keys addition
joykare 9c0e11d
Merge branch 'marketplace' into joykare-orders-line-items-refund
joykare e2af30a
Use alerts to stagger calls instead of having several meteor calls in…
joykare e42637e
Add tests for orders method
joykare 6871a61
Remove describe.only in tests
joykare cf8bf8c
Checkbox changes on select/deselect
joykare 3a6acea
Fix spacing and checking capability
joykare 5c365c0
Row resize
joykare fd0ab82
Correct subTotal display
joykare 3e38ac9
Compare against an array of values
joykare 5f9207e
Fix tax display
joykare e409f40
Add 118n translations for alerts
joykare d282b4a
Merge branch 'marketplace' into joykare-orders-line-items-refund
joykare b7c27d5
Remove file accidentally added
joykare 0c16338
Merge branch 'marketplace' into joykare-orders-line-items-refund
joykare 2c1bdf5
Color change during merge
joykare 463531f
Static columns
joykare bc1f6bb
Fix Braintree refund message issue
joykare f4abdde
Clear refunds on cancel or close
joykare cb7d31c
Remove [0]th billing indices on files changed
joykare 2ce6218
Refunds working correctly
joykare 5f4f063
Clean up code remove logs
joykare a037809
Add price format on modals
joykare 9caee44
Code refactor
joykare adcfcd0
Merge branch 'marketplace' into joykare-orders-line-items-refund
joykare b95b7c3
Have for refund screen not show when no returns
joykare 64f2db4
Remove checkmark from ui for the meantime
joykare 58c1079
Center quantity in relation to items
joykare 753fd6d
Fix authnet issue
joykare a86de17
Fix scrollable issue
joykare ab1038d
Tax display
joykare 7ce7322
Add proptypes for orders object
joykare 7f1cf7d
Merge branch 'marketplace' into joykare-orders-line-items-refund
joykare df312d3
Fix lint error
joykare 8619af4
Add comment
joykare 194a7a8
Remove include shipping capabilty
joykare 182d896
Remove Shipping info on line item invoice
joykare 86fa03b
Have long list of refunds not overflow
joykare 744d2bc
Add missing i18next
joykare 94457d8
Add jsdoc
joykare 6911414
Fixes around code comments
joykare e40afb0
Replace old component calls to use reactioncommerce/reaction-components
joykare 90aa8a4
Add i18n translation for order wait
joykare 296d218
add error.error incase error.reason is empty
joykare c887b7d
fix linting
joykare f2d60c9
Rename from refunds to returns
joykare ab007ef
Add TODOs around email
joykare 835ecc2
Change return terminology to refund
joykare 6a01e84
Refund email revamp
joykare 229f82d
Remove email todo
joykare bb9cacb
Rename test methods to refunds
joykare 272c70b
Merge branch 'marketplace' into joykare-orders-line-items-refund
89fa5b1
Merge branch 'marketplace' into joykare-orders-line-items-refund
joykare 6494f1c
Change terms from "return" to "refund" where they still exist
spencern 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
Oops, something went wrong.
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.
While were here let's add docs: https://github.com/reactioncommerce/reaction-jsdoc#documenting-react-components