Code

Feature/order reissue #910

Code

Merged

jwm0 merged 118 commits intomastersaleor/saleor-dashboard:masterfrom feature/order-reissuesaleor/saleor-dashboard:feature/order-reissueCopy head branch name to clipboardJan 20, 2021

+6,818-4,214

Commits

Commits on Dec 7, 2020

• wip

  

  Magdalena Markusik

  committed
  3a91b9a

  Copy full SHA for 3a91b9a

• wip

  

  Magdalena Markusik

  committed
  79f62ee

  Copy full SHA for 79f62ee

Commits on Dec 8, 2020

• wip

  

  Magdalena Markusik

  committed
  7062483

  Copy full SHA for 7062483

• wip

  

  Magdalena Markusik

  committed
  3469020

  Copy full SHA for 3469020

Commits on Dec 9, 2020

• wip

  

  Magdalena Markusik

  committed
  ffff86d

  Copy full SHA for ffff86d

• wip

  

  Magdalena Markusik

  committed
  28e2857

  Copy full SHA for 28e2857

• wip

  

  Magdalena Markusik

  committed
  20daf6a

  Copy full SHA for 20daf6a

Commits on Dec 10, 2020

• wip

  

  Magdalena Markusik

  committed
  862baed

  Copy full SHA for 862baed

• wip

  

  Magdalena Markusik

  committed
  b18ac81

  Copy full SHA for b18ac81

• wip

  

  Magdalena Markusik

  committed
  ee59a05

  Copy full SHA for ee59a05

• Add change to changelog

  

  Magdalena Markusik

  committed
  f59701b

  Copy full SHA for f59701b

• Remove console.log

  

  Magdalena Markusik

  committed
  c242635

  Copy full SHA for c242635

• Update tests

  

  Magdalena Markusik

  committed
  e036eca

  Copy full SHA for e036eca

• Extract messages

  

  Magdalena Markusik

  committed
  da2a817

  Copy full SHA for da2a817

• Add utils functions for selecting only ulfulfilled order lines

  

  Magdalena Markusik

  committed
  f3d48b0

  Copy full SHA for f3d48b0

• Add optional value selection for line item

  

  Magdalena Markusik

  committed
  a65cced

  Copy full SHA for a65cced

• Update

  Show description for bc2a101
  

  Magdalena Markusik

  committed
  bc2a101

  Copy full SHA for bc2a101

• Add optional rendering of unfulfilled items card and refactor a bit

  

  Magdalena Markusik

  committed
  ceb7a23

  Copy full SHA for ceb7a23

Commits on Dec 11, 2020

• Update displaying of items card title when refunded card

  

  Magdalena Markusik

  committed
  cead799

  Copy full SHA for cead799

• UUpdate utils, form data etc. not to include refunded items when calculating replaced items amount

  

  Magdalena Markusik

  committed
  8f2f48b

  Copy full SHA for 8f2f48b

• Uppdate return items card not to display replace buttons for refunded items

  

  Magdalena Markusik

  committed
  9a9f6e4

  Copy full SHA for 9a9f6e4

• Refactor and small fixes after review

  

  Magdalena Markusik

  committed
  4c70923

  Copy full SHA for 4c70923

• Update extracted messages

  

  Magdalena Markusik

  committed
  e541e0e

  Copy full SHA for e541e0e

• Fix card title when no fullfilemtn id

  

  Magdalena Markusik

  committed
  f8c94a9

  Copy full SHA for f8c94a9

• wip

  

  Magdalena Markusik

  committed
  1c95b82

  Copy full SHA for 1c95b82

Commits on Dec 14, 2020

• Initially stitch returns page. Update types, add mutation

  

  Magdalena Markusik

  committed
  73fc831

  Copy full SHA for 73fc831

• remove unnecessary component display names

  

  Magdalena Markusik

  committed
  afbe780

  Copy full SHA for afbe780

• Merge pull request #896 from mirumee/SALEOR-1850/adjust-refund-card-to-fit-returns

  Show description for e785694
  

  mmarkusik

  authored
  e785694

  Copy full SHA for e785694

• Add loading status from form submission & refactor

  

  Magdalena Markusik

  committed
  82a93c8

  Copy full SHA for 82a93c8

• Add errors from response

  

  Magdalena Markusik

  committed
  cb6a799

  Copy full SHA for cb6a799

• Add errors from response and refactor

  

  Magdalena Markusik

  committed
  d89e717

  Copy full SHA for d89e717

• Remove comments

  

  Magdalena Markusik

  committed
  80b2a06

  Copy full SHA for 80b2a06

• Add optional error adding when no data from return create request

  

  Magdalena Markusik

  committed
  2b31de6

  Copy full SHA for 2b31de6

• Update messages

  

  Magdalena Markusik

  committed
  6354324

  Copy full SHA for 6354324

• wip

  

  Magdalena Markusik

  committed
  7123fc0

  Copy full SHA for 7123fc0

• Update snapshots

  

  Magdalena Markusik

  committed
  6a2438a

  Copy full SHA for 6a2438a

• Remove unnecessary console.log

  

  Magdalena Markusik

  committed
  46a1b85

  Copy full SHA for 46a1b85

• Add better typing for getParsedLineData function

  

  Magdalena Markusik

  committed
  c7e89bd

  Copy full SHA for c7e89bd

• Merge pull request #903 from mirumee/SALEOR-1874/stitch-returns-form

  Show description for e95e1d4
  

  mmarkusik

  authored
  e95e1d4

  Copy full SHA for e95e1d4

• Update & refactor card title to match cards both in return and order details

  

  Magdalena Markusik

  committed
  b15b781

  Copy full SHA for b15b781

• Add handling of new statuses to order details cards. Also refactor, and devide order fulfillment card into couple of smaller components

  

  Magdalena Markusik

  committed
  7a2fe19

  Copy full SHA for 7a2fe19

• Update messages

  

  Magdalena Markusik

  committed
  68a4f78

  Copy full SHA for 68a4f78

Commits on Dec 15, 2020

• Update schema to match api

  

  Magdalena Markusik

  committed
  2bec44b

  Copy full SHA for 2bec44b

• Update types

  

  Magdalena Markusik

  committed
  15a66c9

  Copy full SHA for 15a66c9

• Update status label component to match colors with new designs and order details cards

  

  Magdalena Markusik

  committed
  938953e

  Copy full SHA for 938953e

• RUpdate and refactor order fulfillment card components to be reusable. Also add replaced status handling

  

  Magdalena Markusik

  committed
  27110fa

  Copy full SHA for 27110fa

• Updayte card title component to handle all cases and statuses

  

  Magdalena Markusik

  committed
  cc32bfb

  Copy full SHA for cc32bfb

• Update oorder unfulfilled items card and order details page, reduce some of the boilerplate

  

  Magdalena Markusik

  committed
  e79c118

  Copy full SHA for e79c118

• Fix card title types and adjust returns card to match

  

  Magdalena Markusik

  committed
  ea9e785

  Copy full SHA for ea9e785

• Update messages

  

  Magdalena Markusik

  committed
  3a24842

  Copy full SHA for 3a24842

• Update snapshots

  

  Magdalena Markusik

  committed
  7c8d632

  Copy full SHA for 7c8d632

• RUpdate order fulfillment card with subtitles and buttons for returned status

  

  Magdalena Markusik

  committed
  5ead1aa

  Copy full SHA for 5ead1aa

• Add onRefund to order fulfillment card

  

  Magdalena Markusik

  committed
  6975193

  Copy full SHA for 6975193

• Fix typo and wrong message in card title

  

  Magdalena Markusik

  committed
  e7c9226

  Copy full SHA for e7c9226

• Add missing condition in return form submission utils to decice if to refund products

  

  Magdalena Markusik

  committed
  7abe377

  Copy full SHA for 7abe377

• Update fulfillment subtitles row and tests

  

  Magdalena Markusik

  committed
  b415584

  Copy full SHA for b415584

• Update messages

  

  Magdalena Markusik

  committed
  5f7fbcb

  Copy full SHA for 5f7fbcb

Commits on Dec 16, 2020

• Change naming and locations of OrderFulfillment and items card components

  

  Magdalena Markusik

  committed
  122e14f

  Copy full SHA for 122e14f

• Update messages

  

  Magdalena Markusik

  committed
  e1019d8

  Copy full SHA for e1019d8

• U[pdate names of components again to even better ones

  

  Magdalena Markusik

  committed
  9ee78c2

  Copy full SHA for 9ee78c2

• Update messages

  

  Magdalena Markusik

  committed
  32f3e3b

  Copy full SHA for 32f3e3b

• Merge pull request #906 from mirumee/SALEOR-1855/Implement-new-cards-for-return-statuses

  Show description for 2b03f9f
  

  mmarkusik

  authored
  2b03f9f

  Copy full SHA for 2b03f9f

• Merge branch 'master' into feature/order-reissue

  

  mmarkusik

  authored
  289ee7d

  Copy full SHA for 289ee7d

Commits on Dec 18, 2020

• changelog

  

  Magdalena Markusik

  committed
  ac5702d

  Copy full SHA for ac5702d

Commits on Jan 4, 2021

• Merge branch 'master' into feature/order-reissue

  

  Magdalena Markusik

  committed
  c370a66

  Copy full SHA for c370a66

• Update schema and types so that order history event also includes user first and last name

  

  Magdalena Markusik

  committed
  01c4680

  Copy full SHA for 01c4680

• Add extended timeline event and event header components. Move some of the logic to utils and add way to display links in the event header.

  

  Magdalena Markusik

  committed
  f57fee2

  Copy full SHA for f57fee2

• FFix types

  

  Magdalena Markusik

  committed
  56dfbb1

  Copy full SHA for 56dfbb1

• Update messages

  

  Magdalena Markusik

  committed
  44cb1fd

  Copy full SHA for 44cb1fd

• Change naming of isOfType -> isTimelineEventOfType and refactor extended timeline event messages selection to be less complicated

  

  Magdalena Markusik

  committed
  86536b2

  Copy full SHA for 86536b2

• Add ids and update messages

  

  Magdalena Markusik

  committed
  a29aad1

  Copy full SHA for a29aad1

• Add ids and update messages some more

  

  Magdalena Markusik

  committed
  32b708b

  Copy full SHA for 32b708b

• Update storybook decorator to work with react router context in components and tests

  

  Magdalena Markusik

  committed
  f58da2d

  Copy full SHA for f58da2d

Commits on Jan 5, 2021

• Refactor after review

  

  Magdalena Markusik

  committed
  e03633a

  Copy full SHA for e03633a

• Update messages

  

  Magdalena Markusik

  committed
  65974b2

  Copy full SHA for 65974b2

• Add rredirecting to draft order

  

  Magdalena Markusik

  committed
  85dc7dc

  Copy full SHA for 85dc7dc

• Add handling draft creation from replacement

  

  Magdalena Markusik

  committed
  3682a20

  Copy full SHA for 3682a20

• Add related order to order event fragment and update lots and lots of types

  

  Magdalena Markusik

  committed
  3dc27c4

  Copy full SHA for 3dc27c4

• Update extended timeline event to match related order type on order history event

  

  Magdalena Markusik

  committed
  c02f90c

  Copy full SHA for c02f90c

• Update fixtures

  

  Magdalena Markusik

  committed
  08cfe16

  Copy full SHA for 08cfe16

• Refactor ExtendedTimelineEvent

  Show description for 81e9eff
  

  mmarkusik

  and

  jwm0

  authored
  81e9eff

  Copy full SHA for 81e9eff

• Merge pull request #915 from mirumee/SALEOR-1857/update-history-events

  Show description for b57538a
  

  mmarkusik

  authored
  b57538a

  Copy full SHA for b57538a

• Fix typing

  

  Magdalena Markusik

  committed
  43f3456

  Copy full SHA for 43f3456

• Update messages

  

  Magdalena Markusik

  committed
  df6e9ed

  Copy full SHA for df6e9ed

• Fix missing history event for replacement draft created for replaced products

  

  Magdalena Markusik

  committed
  c8074df

  Copy full SHA for c8074df

• Update messages

  

  Magdalena Markusik

  committed
  8154f53

  Copy full SHA for 8154f53

• Handle new statuses for returned and partially returned orders

  

  Magdalena Markusik

  committed
  652efb0

  Copy full SHA for 652efb0

• Update messages

  

  Magdalena Markusik

  committed
  7f64d3a

  Copy full SHA for 7f64d3a

• update snapshots

  

  Magdalena Markusik

  committed
  96289d5

  Copy full SHA for 96289d5

Commits on Jan 8, 2021

• BBump empty line to rebuild ci

  

  Magdalena Markusik

  committed
  7428c79

  Copy full SHA for 7428c79

• Merge pull request #930 from mirumee/SALEOR-1967/handle-creating-draft-from-return

  Show description for 1d51965
  

  mmarkusik

  authored
  1d51965

  Copy full SHA for 1d51965

Commits on Jan 12, 2021

• Change status to proper color

  

  Magdalena Markusik

  committed
  efdebd3

  Copy full SHA for efdebd3

• Merge pull request #933 from mirumee/SALEOR-1860/handle-new-order-statuses-returned-partially-returned

  Show description for 3f79548
  

  mmarkusik

  authored
  3f79548

  Copy full SHA for 3f79548

• Change replaceable items in return for replace to be auto off instead of on

  

  Magdalena Markusik

  committed
  5e91f3d

  Copy full SHA for 5e91f3d

• Add utils functions and make order details menu not show option to return items when there are returnable items in the order

  

  Magdalena Markusik

  committed
  9d99cc9

  Copy full SHA for 9d99cc9

• Fix replace checkbox showing when previously hidden and clicked set maximal quantities

  

  Magdalena Markusik

  committed
  13a6164

  Copy full SHA for 13a6164

• Fix return form invalid money values

  

  Magdalena Markusik

  committed
  cea9386

  Copy full SHA for cea9386

Commits on Jan 13, 2021

• Add default values to avoid returning of NaN in utils for return amount and refactor

  

  Magdalena Markusik

  committed
  82961a7

  Copy full SHA for 82961a7

• Merge pull request #943 from mirumee/SALEOR-1931/fix-return-bugz

  Show description for 099afd3
  

  mmarkusik

  authored
  099afd3

  Copy full SHA for 099afd3

• Add ggeneral error alerts

  

  Magdalena Markusik

  committed
  40f15d8

  Copy full SHA for 40f15d8

• Add eproduct error box component and style. style a lot.

  

  Magdalena Markusik

  committed
  12e546c

  Copy full SHA for 12e546c

• Fixes

  

  Magdalena Markusik

  committed
  549ad5f

  Copy full SHA for 549ad5f

• Fix lint

  

  Magdalena Markusik

  committed
  7e10069

  Copy full SHA for 7e10069

• Add cannot refund error title + description

  

  Magdalena Markusik

  committed
  c3a5120

  Copy full SHA for c3a5120

• Extract messages

  

  Magdalena Markusik

  committed
  4926c90

  Copy full SHA for 4926c90

Commits on Jan 18, 2021

• Refactor after review

  

  Magdalena Markusik

  committed
  bf32186

  Copy full SHA for bf32186

• Add better, nicer and fancier imports to product error cell

  

  Magdalena Markusik

  committed
  2817e3f

  Copy full SHA for 2817e3f

• Use error color from palette in product error cell

  

  Magdalena Markusik

  committed
  01b656c

  Copy full SHA for 01b656c

Commits on Jan 19, 2021

• Merge pull request #945 from mirumee/SALEOR-1861/add-error-handling-to-returns-form

  Show description for 4106f54
  

  mmarkusik

  authored
  4106f54

  Copy full SHA for 4106f54

• Fix max refund when 0 for return

  

  Magdalena Markusik

  committed
  c316dea

  Copy full SHA for c316dea

Commits on Jan 20, 2021

• Add ddisable ability to refund products button so it's disabled when 0 products selected

  

  Magdalena Markusik

  committed
  fd451e7

  Copy full SHA for fd451e7

• Add class for order return form data parsing and add condition to not do refund when total captured on order is 0

  

  Magdalena Markusik

  committed
  9594a59

  Copy full SHA for 9594a59

• Update snapshots

  

  Magdalena Markusik

  committed
  c4eea61

  Copy full SHA for c4eea61

• Merge pull request #952 from mirumee/super-duper-urgent-return-fixes

  Show description for 652d0c6
  

  mmarkusik

  authored
  652d0c6

  Copy full SHA for 652d0c6

• Add condition for order lines quantity in order products table row

  

  Magdalena Markusik

  committed
  41a28e5

  Copy full SHA for 41a28e5

• Fix return amount submit button

  

  Magdalena Markusik

  committed
  3bb3f55

  Copy full SHA for 3bb3f55

• Merge branch 'feature/order-reissue' of https://github.com/mirumee/saleor-dashboard into feature/order-reissue

  

  Magdalena Markusik

  committed
  8355bee

  Copy full SHA for 8355bee

• Add change to changelog

  

  Magdalena Markusik

  committed
  ac69927

  Copy full SHA for ac69927