2023-01-16 09:45:12 +00:00
|
|
|
import { Button } from "@dashboard/components/Button";
|
|
|
|
import CardTitle from "@dashboard/components/CardTitle";
|
2023-04-28 11:24:10 +00:00
|
|
|
import {
|
|
|
|
ChannelUsabilityDataQuery,
|
|
|
|
OrderDetailsFragment,
|
|
|
|
OrderErrorFragment,
|
|
|
|
OrderLineInput,
|
|
|
|
} from "@dashboard/graphql";
|
Saleor 1856/implement discount modal 2 (#978)
* Add currency to orderline unitprice and update hella lots of types
* wip
* Add diiscount modal component
* Refactor action dialog - move buttons to separate component so they can be reused
* Add discount provider to keep logic of discounts separated and wrap proper components
* Add discount ccalculator util class, and make draft details summary use it, along with discounts data, modal etc
* UUpdate lots of types, fragments, schema etc
* Update quries and mutations
* ARename OrderLineDiscountModal -> OrderDiscountCommonModal, add types etc
* Add order line discount provider + consumer, same for order discount
* Fix ts wip
* Update schema and types
* Update order discount provider
* Add nnetto price to order details fragment and update lots of types
* Adjust fixtures to order details containing net total
* Move both order and order line provider to same dir to make types and utils more accessible
* Update schema to match master
* Update schema and types
* Update order history, add some related components, add events etc.
* Fix types
* Fix schema to match master
* Update messages
* Update changelog
* Retrigger build
* Add stories and update common modal to display floats properly
* Add and update stories and tests
* Add optional displaying of reason in case it's empty
* Make user name label for history events return email if last name and first name are absent
* Update schema, types, and mutations to properly refresh
* Remove unnecessary imports
* Add discounts decorator to draft details page storybook
* Fixs after review
* Update messages
* Small fixes to timeline events
* Update types for order shipping price to use net as well, fix labels in draft summary and add colors to theme palette
* Updaste tests, messages
* Fixs after review
* Add theme highlighted active and inactive color text, add valuue conversion to discount modal when changing calculation mode
* Add change to changelog
* Add extra options to select employee display name for order event when some data is missing. Also add filtering null elements in event header when data missing alltogether and element is null
* Refactor selecting employee name in utils
* Add conditional to extended timeline event when orderline is null
2021-03-05 14:52:02 +00:00
|
|
|
import {
|
|
|
|
OrderDiscountContext,
|
2022-06-21 09:36:55 +00:00
|
|
|
OrderDiscountContextConsumerProps,
|
2023-01-16 09:45:12 +00:00
|
|
|
} from "@dashboard/products/components/OrderDiscountProviders/OrderDiscountProvider";
|
|
|
|
import { Card, CardContent } from "@material-ui/core";
|
2019-08-09 10:26:22 +00:00
|
|
|
import React from "react";
|
2019-08-26 17:44:42 +00:00
|
|
|
import { FormattedMessage, useIntl } from "react-intl";
|
2019-06-19 14:40:52 +00:00
|
|
|
|
|
|
|
import { maybe } from "../../../misc";
|
2022-07-07 15:31:26 +00:00
|
|
|
import OrderDraftDetailsProducts from "../OrderDraftDetailsProducts";
|
Saleor 1856/implement discount modal 2 (#978)
* Add currency to orderline unitprice and update hella lots of types
* wip
* Add diiscount modal component
* Refactor action dialog - move buttons to separate component so they can be reused
* Add discount provider to keep logic of discounts separated and wrap proper components
* Add discount ccalculator util class, and make draft details summary use it, along with discounts data, modal etc
* UUpdate lots of types, fragments, schema etc
* Update quries and mutations
* ARename OrderLineDiscountModal -> OrderDiscountCommonModal, add types etc
* Add order line discount provider + consumer, same for order discount
* Fix ts wip
* Update schema and types
* Update order discount provider
* Add nnetto price to order details fragment and update lots of types
* Adjust fixtures to order details containing net total
* Move both order and order line provider to same dir to make types and utils more accessible
* Update schema to match master
* Update schema and types
* Update order history, add some related components, add events etc.
* Fix types
* Fix schema to match master
* Update messages
* Update changelog
* Retrigger build
* Add stories and update common modal to display floats properly
* Add and update stories and tests
* Add optional displaying of reason in case it's empty
* Make user name label for history events return email if last name and first name are absent
* Update schema, types, and mutations to properly refresh
* Remove unnecessary imports
* Add discounts decorator to draft details page storybook
* Fixs after review
* Update messages
* Small fixes to timeline events
* Update types for order shipping price to use net as well, fix labels in draft summary and add colors to theme palette
* Updaste tests, messages
* Fixs after review
* Add theme highlighted active and inactive color text, add valuue conversion to discount modal when changing calculation mode
* Add change to changelog
* Add extra options to select employee display name for order event when some data is missing. Also add filtering null elements in event header when data missing alltogether and element is null
* Refactor selecting employee name in utils
* Add conditional to extended timeline event when orderline is null
2021-03-05 14:52:02 +00:00
|
|
|
import OrderDraftDetailsSummary from "../OrderDraftDetailsSummary";
|
2019-06-19 14:40:52 +00:00
|
|
|
|
|
|
|
interface OrderDraftDetailsProps {
|
2023-04-28 11:24:10 +00:00
|
|
|
order: OrderDetailsFragment;
|
2022-08-10 09:11:32 +00:00
|
|
|
channelUsabilityData?: ChannelUsabilityDataQuery;
|
|
|
|
errors: OrderErrorFragment[];
|
Order details datagrid (#3325)
* Show available channels
* Add price and updatedAt columns
* Fix sorting, only sort on selected columns
* Sort by channel
* Allow delete name and product type
* Fix show not product found
* Extract mssages
* Product datagrid custom column picker
* Column picker in data grid in dirty hack for bug
* fix storybook props
* Restore Datagrid defalt column picker with custom render
* Add sort by attributes
* Use datagrid loading cells
* Fix product searching
* Show attributes before last updated
* Readonly all fields in datagrid
* Fix creating new datagrid row
* Remove add new procut button from datagrid
* Show only active sorted column
* Temp fix for column filter
* Fix column mismatch
* Add comments and spred props to ColumnPicker
* Cleanup
* Update avatar size and styles
* On row click with hover on row styles
* Use new theme
* Change placeholder image
* Draw rounded image with border
* Readonly product datagrid
* Use new theme colors in datagrid
* Add vertical borders control to datagrid
* Add empty column to add padding
* Add coursor to datagrid
* Restore vertical borders, fix cursor pointer
* Add custom freezed column
* Initial tooltip for column
* Move tooltip to datagrid
* Adjust datagrid colors style, add possibility to select column
* Change datagrid selected cells colors
* Fix typo and extract messages
* Base order datagrid
* Cleanup Datagrid component
* Cleanup and code refactor
* Remove cursor pointer props from readonlyCell
* Use money cell for total column
* Add custom cell renderers and fix types
* Simple tags implemenrtion for status and payment col
* Add colors from theme
* Make tagCell more dynamic
* Refactor Datagrid file structure
* Add loading indicators
* Selecting column without cells in readonly
* Add sort icons to orders list
* Refactor after CR. fix typos
* Change color of selected colum cell on hover
* Improve selected header text contrast
* Move useColumnPickerColumns to hooks dir with tests
* Add less padding to column picker button
* Remove double border top
* Fix cursor pointer for tagCell and moneyCell
* useGetCellContent hook
* On loading show only one row
* Add missing darkmod color for warning tag
* Refactor columns in datagrid
* Add new macaw theme provider to storybook
* Fix passing props in datagrid
* Trigger deployment
* Fix column picker in products
* useDatagridColumns
* Fix one more time
* Add column picker with default columns
* Change color for selected header change to textBrandDefault
* Remove unused code, move attributes colums as last
* Cleanup useDatagridColumns
* Improve DatagridProps
* Static datagrid for products (#3144)
* Migrate top nav of product list page to new MacawUI (#3290)
* feat: migrate top nav of product page
* feat: add proper deprecation links
---------
Co-authored-by: Michał Droń <dron.official@yahoo.com>
* Datagrin on order details intial
* Adjust ExtraInfoLines
* Remove padding on datagrid card content
* Remove datagrid card paddding (#3310)
* Disable column icon when no rows in orders
* Datagrid row hover show only when readonly and row clickable
* Implement card view for product list (#3292)
* Add temporary view switcher
* Add basic product tile view
* Bump macaw-ui
* Add ellipsis
* Bump macaw-ui
* Add status dot & fix non-rectangular thumbnails
* Bump macaw-ui
* Add variable size placeholder icon
* Improve loader
* Fix top nav menu key error
* Add pagination
* Add unit tests
* Extract messages
* Extract status color to function
* CR Refactor
* Hold product view state in local storage (#3315)
* Remember view state for product list
* Use util status function for status dots
* Datagrin in orderDraftDetails
* Remove not used components
* Fix for empty column and hover in datagrid for product (#3324)
* Remove datagrid card paddding (#3310)
* Fix for empty column and hover in datagrid for product (#3324)
* Use themeValues from macaw (#3326)
* Upgrade macaw
* Use themeValues
* Use themeValues from macaw (#3326)
* Upgrade macaw
* Use themeValues
* Add empty column from datagrid, improve theme types
* Use theme type from typeof
* Use empty column and themeValues
* Filter empty column from default
* New product header (#3346)
* Extraxt messages
* Remve title left padding
* Fix switching view
* Add margin right to nav button
* Improve view switch
* Update switch view icons
* Add spacing to switch
* Add more space
* Add new filterbar to order list
* Code refactor and tests
* Refactor OrderDraftDetailsDatagrid
* Extract messages
* Refactor OrderDraftDetailsDatagrid
* Update alert messages
* Extract messages
* Write unit tests
* Improve switch component
* Overwrite Pill styles
* Common method to get status color for pills
* Local Pill component POC
* Add ThemeProvider to test wrapper
* Extract messages
* Refactor Pill
* Fix Pill path
* Fix tests mocks
* Remove scrollbar and border bottom
* Add custom border to to datagrid
* Fix borders
* Fix border bottom
* Refactor and cleanup
* Remove not needed selectionActions code
* Move logic code t misc
* Fix scrollbar and zindex datagrid borders
* Fix product tiles condition
* Use utils functions, remove not used code
* Refactor to hooks
* Loading prps instead of disabled
* use getStatusColor
* Move getMenuItems to separate function
* Fix loading props
* Use empty colum hook in OrderDetailsDatagrid
* Fix empty column when save column change
* Fix bottom line in layout overlap
* Show moneCell with discounted price
* Make quantity ediable in order draft datagrid
* Readonly datagrid cells
* Update onyl when column is quantity
* Fix message
* Keep first column in datagrid not removable
* Fix for not existing column
* Add loader over datagrid, fix problem with border top when empty text in variants
* Fix error color and change color in datagrid
* Use formatMoneyAmount
* Fix remove order draft product with discount
* Extract messages
* Add product sku to order draft details datagrid
* Fix loading state and change cell color
* Add MoneyDiscuntedCell
* Use MoneyDiscuntedCell in order draft details datagrid
* Add trash bin icon
* Restor discount modal for order draft summary
* Fix problem with deleting quantity
* Improve await for promises and handler zero quantity error
* Fix column order issue
* Add discount modal box shadow
* Allow decimal as percentage value for discount
* Fix max fixed value
* Remove double border
* Fix z-index issue on discount modal
* Remove padding on order details datagrid
* Add proper error message to common discount modal
* Fix is submit disabled
* Move status as last column in datagrid
* Add padding to money discount cell editor
* Make quantity column smaller
* Fix recalculating disount value
* Fix calculate change discount type
* Store calculated value without triming decimal, trim decimal in input
* Refactor money cells
* markCellsDirty rename to areCellsDirty
* Remove discount from MoneyCell
* Use const to store row height in discount editor
* Fix copy in discount modal
* Remove past on money discount cell
* Remove locale in product varaints
* Fix nullable sku
* Extract messages
* Fix keeping always first column
* Remove padding on tracking info
* Fix story
* Fix render 0 money amount
* Fix displaying not empty string money
* adding new tests: add new product, change quantity, add inline discount, delete product for grid - on orders details view (#3652)
* adding new e2e for grid on orders details view
* merging conflicts fix - and adding new TC numbers to new tests
* trigger tests
* failing tests fixes
---------
Co-authored-by: Michał Droń <dron.official@yahoo.com>
Co-authored-by: Krzysztof Żuraw <9116238+krzysztofzuraw@users.noreply.github.com>
Co-authored-by: Michał Droń <droniu@droniu.dev>
Co-authored-by: wojteknowacki <124166231+wojteknowacki@users.noreply.github.com>
Co-authored-by: wojteknowacki <wojciech.nowacki@saleor.io>
2023-05-18 07:52:13 +00:00
|
|
|
loading: boolean;
|
2019-06-19 14:40:52 +00:00
|
|
|
onOrderLineAdd: () => void;
|
2022-07-07 15:31:26 +00:00
|
|
|
onOrderLineChange: (id: string, data: OrderLineInput) => void;
|
2019-06-19 14:40:52 +00:00
|
|
|
onOrderLineRemove: (id: string) => void;
|
|
|
|
onShippingMethodEdit: () => void;
|
|
|
|
}
|
|
|
|
|
2019-11-07 11:34:54 +00:00
|
|
|
const OrderDraftDetails: React.FC<OrderDraftDetailsProps> = ({
|
2019-06-19 14:40:52 +00:00
|
|
|
order,
|
2022-08-10 09:11:32 +00:00
|
|
|
channelUsabilityData,
|
|
|
|
errors,
|
Order details datagrid (#3325)
* Show available channels
* Add price and updatedAt columns
* Fix sorting, only sort on selected columns
* Sort by channel
* Allow delete name and product type
* Fix show not product found
* Extract mssages
* Product datagrid custom column picker
* Column picker in data grid in dirty hack for bug
* fix storybook props
* Restore Datagrid defalt column picker with custom render
* Add sort by attributes
* Use datagrid loading cells
* Fix product searching
* Show attributes before last updated
* Readonly all fields in datagrid
* Fix creating new datagrid row
* Remove add new procut button from datagrid
* Show only active sorted column
* Temp fix for column filter
* Fix column mismatch
* Add comments and spred props to ColumnPicker
* Cleanup
* Update avatar size and styles
* On row click with hover on row styles
* Use new theme
* Change placeholder image
* Draw rounded image with border
* Readonly product datagrid
* Use new theme colors in datagrid
* Add vertical borders control to datagrid
* Add empty column to add padding
* Add coursor to datagrid
* Restore vertical borders, fix cursor pointer
* Add custom freezed column
* Initial tooltip for column
* Move tooltip to datagrid
* Adjust datagrid colors style, add possibility to select column
* Change datagrid selected cells colors
* Fix typo and extract messages
* Base order datagrid
* Cleanup Datagrid component
* Cleanup and code refactor
* Remove cursor pointer props from readonlyCell
* Use money cell for total column
* Add custom cell renderers and fix types
* Simple tags implemenrtion for status and payment col
* Add colors from theme
* Make tagCell more dynamic
* Refactor Datagrid file structure
* Add loading indicators
* Selecting column without cells in readonly
* Add sort icons to orders list
* Refactor after CR. fix typos
* Change color of selected colum cell on hover
* Improve selected header text contrast
* Move useColumnPickerColumns to hooks dir with tests
* Add less padding to column picker button
* Remove double border top
* Fix cursor pointer for tagCell and moneyCell
* useGetCellContent hook
* On loading show only one row
* Add missing darkmod color for warning tag
* Refactor columns in datagrid
* Add new macaw theme provider to storybook
* Fix passing props in datagrid
* Trigger deployment
* Fix column picker in products
* useDatagridColumns
* Fix one more time
* Add column picker with default columns
* Change color for selected header change to textBrandDefault
* Remove unused code, move attributes colums as last
* Cleanup useDatagridColumns
* Improve DatagridProps
* Static datagrid for products (#3144)
* Migrate top nav of product list page to new MacawUI (#3290)
* feat: migrate top nav of product page
* feat: add proper deprecation links
---------
Co-authored-by: Michał Droń <dron.official@yahoo.com>
* Datagrin on order details intial
* Adjust ExtraInfoLines
* Remove padding on datagrid card content
* Remove datagrid card paddding (#3310)
* Disable column icon when no rows in orders
* Datagrid row hover show only when readonly and row clickable
* Implement card view for product list (#3292)
* Add temporary view switcher
* Add basic product tile view
* Bump macaw-ui
* Add ellipsis
* Bump macaw-ui
* Add status dot & fix non-rectangular thumbnails
* Bump macaw-ui
* Add variable size placeholder icon
* Improve loader
* Fix top nav menu key error
* Add pagination
* Add unit tests
* Extract messages
* Extract status color to function
* CR Refactor
* Hold product view state in local storage (#3315)
* Remember view state for product list
* Use util status function for status dots
* Datagrin in orderDraftDetails
* Remove not used components
* Fix for empty column and hover in datagrid for product (#3324)
* Remove datagrid card paddding (#3310)
* Fix for empty column and hover in datagrid for product (#3324)
* Use themeValues from macaw (#3326)
* Upgrade macaw
* Use themeValues
* Use themeValues from macaw (#3326)
* Upgrade macaw
* Use themeValues
* Add empty column from datagrid, improve theme types
* Use theme type from typeof
* Use empty column and themeValues
* Filter empty column from default
* New product header (#3346)
* Extraxt messages
* Remve title left padding
* Fix switching view
* Add margin right to nav button
* Improve view switch
* Update switch view icons
* Add spacing to switch
* Add more space
* Add new filterbar to order list
* Code refactor and tests
* Refactor OrderDraftDetailsDatagrid
* Extract messages
* Refactor OrderDraftDetailsDatagrid
* Update alert messages
* Extract messages
* Write unit tests
* Improve switch component
* Overwrite Pill styles
* Common method to get status color for pills
* Local Pill component POC
* Add ThemeProvider to test wrapper
* Extract messages
* Refactor Pill
* Fix Pill path
* Fix tests mocks
* Remove scrollbar and border bottom
* Add custom border to to datagrid
* Fix borders
* Fix border bottom
* Refactor and cleanup
* Remove not needed selectionActions code
* Move logic code t misc
* Fix scrollbar and zindex datagrid borders
* Fix product tiles condition
* Use utils functions, remove not used code
* Refactor to hooks
* Loading prps instead of disabled
* use getStatusColor
* Move getMenuItems to separate function
* Fix loading props
* Use empty colum hook in OrderDetailsDatagrid
* Fix empty column when save column change
* Fix bottom line in layout overlap
* Show moneCell with discounted price
* Make quantity ediable in order draft datagrid
* Readonly datagrid cells
* Update onyl when column is quantity
* Fix message
* Keep first column in datagrid not removable
* Fix for not existing column
* Add loader over datagrid, fix problem with border top when empty text in variants
* Fix error color and change color in datagrid
* Use formatMoneyAmount
* Fix remove order draft product with discount
* Extract messages
* Add product sku to order draft details datagrid
* Fix loading state and change cell color
* Add MoneyDiscuntedCell
* Use MoneyDiscuntedCell in order draft details datagrid
* Add trash bin icon
* Restor discount modal for order draft summary
* Fix problem with deleting quantity
* Improve await for promises and handler zero quantity error
* Fix column order issue
* Add discount modal box shadow
* Allow decimal as percentage value for discount
* Fix max fixed value
* Remove double border
* Fix z-index issue on discount modal
* Remove padding on order details datagrid
* Add proper error message to common discount modal
* Fix is submit disabled
* Move status as last column in datagrid
* Add padding to money discount cell editor
* Make quantity column smaller
* Fix recalculating disount value
* Fix calculate change discount type
* Store calculated value without triming decimal, trim decimal in input
* Refactor money cells
* markCellsDirty rename to areCellsDirty
* Remove discount from MoneyCell
* Use const to store row height in discount editor
* Fix copy in discount modal
* Remove past on money discount cell
* Remove locale in product varaints
* Fix nullable sku
* Extract messages
* Fix keeping always first column
* Remove padding on tracking info
* Fix story
* Fix render 0 money amount
* Fix displaying not empty string money
* adding new tests: add new product, change quantity, add inline discount, delete product for grid - on orders details view (#3652)
* adding new e2e for grid on orders details view
* merging conflicts fix - and adding new TC numbers to new tests
* trigger tests
* failing tests fixes
---------
Co-authored-by: Michał Droń <dron.official@yahoo.com>
Co-authored-by: Krzysztof Żuraw <9116238+krzysztofzuraw@users.noreply.github.com>
Co-authored-by: Michał Droń <droniu@droniu.dev>
Co-authored-by: wojteknowacki <124166231+wojteknowacki@users.noreply.github.com>
Co-authored-by: wojteknowacki <wojciech.nowacki@saleor.io>
2023-05-18 07:52:13 +00:00
|
|
|
loading,
|
2019-06-19 14:40:52 +00:00
|
|
|
onOrderLineAdd,
|
|
|
|
onOrderLineChange,
|
|
|
|
onOrderLineRemove,
|
2022-06-21 09:36:55 +00:00
|
|
|
onShippingMethodEdit,
|
2019-08-26 17:44:42 +00:00
|
|
|
}) => {
|
|
|
|
const intl = useIntl();
|
|
|
|
|
2022-08-10 09:11:32 +00:00
|
|
|
const isChannelActive = order?.channel.isActive;
|
|
|
|
const areProductsInChannel = !!channelUsabilityData?.products.totalCount;
|
|
|
|
|
2019-08-26 17:44:42 +00:00
|
|
|
return (
|
|
|
|
<Card>
|
|
|
|
<CardTitle
|
|
|
|
title={intl.formatMessage({
|
2022-05-05 07:54:28 +00:00
|
|
|
id: "18wvf7",
|
2019-08-26 17:44:42 +00:00
|
|
|
defaultMessage: "Order Details",
|
2022-06-21 09:36:55 +00:00
|
|
|
description: "section header",
|
2019-08-26 17:44:42 +00:00
|
|
|
})}
|
|
|
|
toolbar={
|
2022-08-10 09:11:32 +00:00
|
|
|
isChannelActive &&
|
|
|
|
areProductsInChannel && (
|
2021-01-26 10:21:54 +00:00
|
|
|
<Button
|
2022-01-28 12:34:20 +00:00
|
|
|
variant="tertiary"
|
2021-01-26 10:21:54 +00:00
|
|
|
onClick={onOrderLineAdd}
|
|
|
|
data-test-id="add-products-button"
|
|
|
|
>
|
Multichannel (#833)
* add multichannel to configuration view
* create multichannels list view
* create multichannels list view
* add ChannelsCreate view
* update channels in configuration
* add stories
* update default messages
* fix ChannelForm props
* update channels list styles
* update snapshots
* update channel form currency input
* update Channels fragments
* extract messages
* remove tabs from channelsList
* channel details, channel delete modal (#598)
* create Channel details view
* create ChannelDeleteDialog
* add channels delete dialog to channels list
* update messages and types
* fixes after review
* channels availability (#609)
* create Channel details view
* update messages and types
* create ChannelsAvailability component
* create more product channels components
* create channels stories, update fixtures, types
* update product views with channels data
* update schema and snapshots
* update defaultMessages
* update ProductUpdate view
* create ChannelsAvailabilityDropdown component
* add product channels to local storage
* update globalTypes
* Update to new schema and resolve issues
* Update messages
* create deleteChannel mutation
* add channels availability component to product create view
* refactor ProductCreate and ProductUpdate views
* CollectionProducts view cleanup
* add disabled prop to ActionDialog
* use updateChannels mutation in ProductCreate view
* ProductCreate - update submit function
* fixes after review
* update snapshots and messages
Co-authored-by: Krzysztof Wolski <krzysztof.k.wolski@gmail.com>
* channels shipping components (#655)
* create PricingCard, OrderValue and OrderWeight components
* create ShippingZoneRatesPage and DeleteShippingRateDialog
* update ChannelsAvailability component
* updates after review
* channels shipping views (#662)
* update ChannelsAvailability component
* updates after review
* create PriceRate views, update types
* create weight rates views
* update shipping views, stories, messages
* update snapshots
* update snapshots
* update useChannels hook
* orders channels components (#698)
* create OrderChannelSectionCard component
* update OrderDetailsPage
* update DraftOrderChannelCard
* update snapshots
* update fixtures
* small change after review, update snapshots
* product pricing (#702)
* update product types
* update Pricing in simple product view
* use productVariantCreate mutation in simple product view
* update snapshots and messages
* handle create variant (#715)
* update product types
* update Pricing in simple product view
* handle product create and update errors
* update snapshots and messages
* fix update and create product handlers
* update pricing types
* channels modal - new styles, search input (#717)
* update product types
* update Pricing in simple product view
* handle product create and update errors
* update pricing types
* add search input in ChannelsAvailabilityDialog
* update ChannelsAvailabilityDialog in all views
* update snapshots
* fix search input label styles
* update toggleAllChannels function
* update variant creator (#724)
* update product types
* update Pricing in simple product view
* handle product create and update errors
* update pricing types
* add search input in ChannelsAvailabilityDialog
* update ChannelsAvailabilityDialog in all views
* update snapshots
* add channelLisitngs to variant creator
* update variant creator price styles
* update product variant creator reducer tests
* update createVariants tests
* update error handling in product variant creator
* add Skip pricing for now option
* use PriceField instead of TextField in ProductVariantCreatorSummary
* create price validation function
* fix errors handling in ProductVariantPrice component
* fixes after review
* Product List - remove publish/unpublish buttons (#727)
* ProductList - remove publish and unpublish buttons
* update messages
* update snapshots, messages
* revert changes in ChannelsAvailabilityDropdown
* products/shipping/discount list settings (#739)
* create ChannelSettingsDialog component
* update snapshots
* ProductList - open settings modal when there is no selected channel
* add settings modal to vouchers list
* add settings dialog to sales list
* add setting modal to shipping list
* update shipping
* update snapshots, messages
* useChannelsSettings - remove selectedChannelSlug
* fix channels update handler in product and shipping view
* messages update in ChannelSettingsDialog
* handle product/discount list when there is no channels
* update onSettingsOpen prop
* collection availability dropdown (#743)
* add availability dropdown to collection products list
* update channelListingProduct fragment name
* update voucher view/components with channels (#746)
* update voucher view/components with channels
* update VoucherSummary, remove defaultCurrency from voucher components
* update snapshots
* move getChannelsVariables func to discounts handlers
* update voucher messages
* sale view/components with channels (#750)
* update sale views with channels
* small fixes in discounts
* order views with channels (#752)
* update draft orders with channels
* add channel activate/deactivate mutations
* remove sort by total in orders list
* add error notification on channel activate/deactivate
* product variants channel select (#755)
* add channels selector to ProductVariants component
* remove selectedChannel from ProductUpdate, update messages and snapshots
* update product fragments
* update translations (#762)
* update translations
* fix translation types
* update messages
* update Availability component (#766)
* update ChannelsAvailability component
* update product fixtures
* update collection and channel fixtures
* ChannelsAvailability - handle errors
* update product handlers
* update ChannelsAvailability styles
* update ProductVariant
* update snapshots
* fix missing things in multichannel (#785)
* add availability dropdown to discount products list
* fix error handling in shipping components
* update product views and components
* update messages
* update category view/components
* update CategoryProducts styles
* remove defaultCurrency from shipping components
* create ChannelsSelect component
* update channels error handling after review
* another fixes after review
* Add channels to collection views/components (#791)
** update collection components and views
* update create collection view
* update error handling in collection
* remove filter bar from collection list
* update products fragments
* small fix in collection create view
* use collectionFragment in useCatalogSearch
* update defaultMessages and snapshots
* update homepage view/drop defaultCurrency (#801)
* update homepage view
* drop defaultCurrency prop
* fix onChannelChange function in home view
* remove visibility from product list filters
* update export products with channels (#803)
* update ProductExportDialog with channels
* add new channel error code
* remover VISIBLE from product export dialog Financial information
* fix input size in ProductVariantCreatorSummary (#804)
* channels currency code select (#806)
* create select with currency codes
* fix ChannelDeleteDialog
* update defaultMessages, remove unneeded ChannelDetails handlers
* fixes after rebase
* replace channelListing with channelListings
* [multichannel] Update schema]
* Fix product create test
Co-authored-by: AlicjaSzu <alicja.szukuc@gmail.com>
Co-authored-by: Krzysztof Wolski <krzysztof.k.wolski@gmail.com>
Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>
2020-11-17 16:10:42 +00:00
|
|
|
<FormattedMessage
|
2022-05-05 07:54:28 +00:00
|
|
|
id="C50ahv"
|
Multichannel (#833)
* add multichannel to configuration view
* create multichannels list view
* create multichannels list view
* add ChannelsCreate view
* update channels in configuration
* add stories
* update default messages
* fix ChannelForm props
* update channels list styles
* update snapshots
* update channel form currency input
* update Channels fragments
* extract messages
* remove tabs from channelsList
* channel details, channel delete modal (#598)
* create Channel details view
* create ChannelDeleteDialog
* add channels delete dialog to channels list
* update messages and types
* fixes after review
* channels availability (#609)
* create Channel details view
* update messages and types
* create ChannelsAvailability component
* create more product channels components
* create channels stories, update fixtures, types
* update product views with channels data
* update schema and snapshots
* update defaultMessages
* update ProductUpdate view
* create ChannelsAvailabilityDropdown component
* add product channels to local storage
* update globalTypes
* Update to new schema and resolve issues
* Update messages
* create deleteChannel mutation
* add channels availability component to product create view
* refactor ProductCreate and ProductUpdate views
* CollectionProducts view cleanup
* add disabled prop to ActionDialog
* use updateChannels mutation in ProductCreate view
* ProductCreate - update submit function
* fixes after review
* update snapshots and messages
Co-authored-by: Krzysztof Wolski <krzysztof.k.wolski@gmail.com>
* channels shipping components (#655)
* create PricingCard, OrderValue and OrderWeight components
* create ShippingZoneRatesPage and DeleteShippingRateDialog
* update ChannelsAvailability component
* updates after review
* channels shipping views (#662)
* update ChannelsAvailability component
* updates after review
* create PriceRate views, update types
* create weight rates views
* update shipping views, stories, messages
* update snapshots
* update snapshots
* update useChannels hook
* orders channels components (#698)
* create OrderChannelSectionCard component
* update OrderDetailsPage
* update DraftOrderChannelCard
* update snapshots
* update fixtures
* small change after review, update snapshots
* product pricing (#702)
* update product types
* update Pricing in simple product view
* use productVariantCreate mutation in simple product view
* update snapshots and messages
* handle create variant (#715)
* update product types
* update Pricing in simple product view
* handle product create and update errors
* update snapshots and messages
* fix update and create product handlers
* update pricing types
* channels modal - new styles, search input (#717)
* update product types
* update Pricing in simple product view
* handle product create and update errors
* update pricing types
* add search input in ChannelsAvailabilityDialog
* update ChannelsAvailabilityDialog in all views
* update snapshots
* fix search input label styles
* update toggleAllChannels function
* update variant creator (#724)
* update product types
* update Pricing in simple product view
* handle product create and update errors
* update pricing types
* add search input in ChannelsAvailabilityDialog
* update ChannelsAvailabilityDialog in all views
* update snapshots
* add channelLisitngs to variant creator
* update variant creator price styles
* update product variant creator reducer tests
* update createVariants tests
* update error handling in product variant creator
* add Skip pricing for now option
* use PriceField instead of TextField in ProductVariantCreatorSummary
* create price validation function
* fix errors handling in ProductVariantPrice component
* fixes after review
* Product List - remove publish/unpublish buttons (#727)
* ProductList - remove publish and unpublish buttons
* update messages
* update snapshots, messages
* revert changes in ChannelsAvailabilityDropdown
* products/shipping/discount list settings (#739)
* create ChannelSettingsDialog component
* update snapshots
* ProductList - open settings modal when there is no selected channel
* add settings modal to vouchers list
* add settings dialog to sales list
* add setting modal to shipping list
* update shipping
* update snapshots, messages
* useChannelsSettings - remove selectedChannelSlug
* fix channels update handler in product and shipping view
* messages update in ChannelSettingsDialog
* handle product/discount list when there is no channels
* update onSettingsOpen prop
* collection availability dropdown (#743)
* add availability dropdown to collection products list
* update channelListingProduct fragment name
* update voucher view/components with channels (#746)
* update voucher view/components with channels
* update VoucherSummary, remove defaultCurrency from voucher components
* update snapshots
* move getChannelsVariables func to discounts handlers
* update voucher messages
* sale view/components with channels (#750)
* update sale views with channels
* small fixes in discounts
* order views with channels (#752)
* update draft orders with channels
* add channel activate/deactivate mutations
* remove sort by total in orders list
* add error notification on channel activate/deactivate
* product variants channel select (#755)
* add channels selector to ProductVariants component
* remove selectedChannel from ProductUpdate, update messages and snapshots
* update product fragments
* update translations (#762)
* update translations
* fix translation types
* update messages
* update Availability component (#766)
* update ChannelsAvailability component
* update product fixtures
* update collection and channel fixtures
* ChannelsAvailability - handle errors
* update product handlers
* update ChannelsAvailability styles
* update ProductVariant
* update snapshots
* fix missing things in multichannel (#785)
* add availability dropdown to discount products list
* fix error handling in shipping components
* update product views and components
* update messages
* update category view/components
* update CategoryProducts styles
* remove defaultCurrency from shipping components
* create ChannelsSelect component
* update channels error handling after review
* another fixes after review
* Add channels to collection views/components (#791)
** update collection components and views
* update create collection view
* update error handling in collection
* remove filter bar from collection list
* update products fragments
* small fix in collection create view
* use collectionFragment in useCatalogSearch
* update defaultMessages and snapshots
* update homepage view/drop defaultCurrency (#801)
* update homepage view
* drop defaultCurrency prop
* fix onChannelChange function in home view
* remove visibility from product list filters
* update export products with channels (#803)
* update ProductExportDialog with channels
* add new channel error code
* remover VISIBLE from product export dialog Financial information
* fix input size in ProductVariantCreatorSummary (#804)
* channels currency code select (#806)
* create select with currency codes
* fix ChannelDeleteDialog
* update defaultMessages, remove unneeded ChannelDetails handlers
* fixes after rebase
* replace channelListing with channelListings
* [multichannel] Update schema]
* Fix product create test
Co-authored-by: AlicjaSzu <alicja.szukuc@gmail.com>
Co-authored-by: Krzysztof Wolski <krzysztof.k.wolski@gmail.com>
Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>
2020-11-17 16:10:42 +00:00
|
|
|
defaultMessage="Add products"
|
|
|
|
description="button"
|
|
|
|
/>
|
|
|
|
</Button>
|
|
|
|
)
|
2019-08-26 17:44:42 +00:00
|
|
|
}
|
|
|
|
/>
|
|
|
|
<OrderDraftDetailsProducts
|
2022-08-10 09:11:32 +00:00
|
|
|
order={order}
|
|
|
|
errors={errors}
|
Order details datagrid (#3325)
* Show available channels
* Add price and updatedAt columns
* Fix sorting, only sort on selected columns
* Sort by channel
* Allow delete name and product type
* Fix show not product found
* Extract mssages
* Product datagrid custom column picker
* Column picker in data grid in dirty hack for bug
* fix storybook props
* Restore Datagrid defalt column picker with custom render
* Add sort by attributes
* Use datagrid loading cells
* Fix product searching
* Show attributes before last updated
* Readonly all fields in datagrid
* Fix creating new datagrid row
* Remove add new procut button from datagrid
* Show only active sorted column
* Temp fix for column filter
* Fix column mismatch
* Add comments and spred props to ColumnPicker
* Cleanup
* Update avatar size and styles
* On row click with hover on row styles
* Use new theme
* Change placeholder image
* Draw rounded image with border
* Readonly product datagrid
* Use new theme colors in datagrid
* Add vertical borders control to datagrid
* Add empty column to add padding
* Add coursor to datagrid
* Restore vertical borders, fix cursor pointer
* Add custom freezed column
* Initial tooltip for column
* Move tooltip to datagrid
* Adjust datagrid colors style, add possibility to select column
* Change datagrid selected cells colors
* Fix typo and extract messages
* Base order datagrid
* Cleanup Datagrid component
* Cleanup and code refactor
* Remove cursor pointer props from readonlyCell
* Use money cell for total column
* Add custom cell renderers and fix types
* Simple tags implemenrtion for status and payment col
* Add colors from theme
* Make tagCell more dynamic
* Refactor Datagrid file structure
* Add loading indicators
* Selecting column without cells in readonly
* Add sort icons to orders list
* Refactor after CR. fix typos
* Change color of selected colum cell on hover
* Improve selected header text contrast
* Move useColumnPickerColumns to hooks dir with tests
* Add less padding to column picker button
* Remove double border top
* Fix cursor pointer for tagCell and moneyCell
* useGetCellContent hook
* On loading show only one row
* Add missing darkmod color for warning tag
* Refactor columns in datagrid
* Add new macaw theme provider to storybook
* Fix passing props in datagrid
* Trigger deployment
* Fix column picker in products
* useDatagridColumns
* Fix one more time
* Add column picker with default columns
* Change color for selected header change to textBrandDefault
* Remove unused code, move attributes colums as last
* Cleanup useDatagridColumns
* Improve DatagridProps
* Static datagrid for products (#3144)
* Migrate top nav of product list page to new MacawUI (#3290)
* feat: migrate top nav of product page
* feat: add proper deprecation links
---------
Co-authored-by: Michał Droń <dron.official@yahoo.com>
* Datagrin on order details intial
* Adjust ExtraInfoLines
* Remove padding on datagrid card content
* Remove datagrid card paddding (#3310)
* Disable column icon when no rows in orders
* Datagrid row hover show only when readonly and row clickable
* Implement card view for product list (#3292)
* Add temporary view switcher
* Add basic product tile view
* Bump macaw-ui
* Add ellipsis
* Bump macaw-ui
* Add status dot & fix non-rectangular thumbnails
* Bump macaw-ui
* Add variable size placeholder icon
* Improve loader
* Fix top nav menu key error
* Add pagination
* Add unit tests
* Extract messages
* Extract status color to function
* CR Refactor
* Hold product view state in local storage (#3315)
* Remember view state for product list
* Use util status function for status dots
* Datagrin in orderDraftDetails
* Remove not used components
* Fix for empty column and hover in datagrid for product (#3324)
* Remove datagrid card paddding (#3310)
* Fix for empty column and hover in datagrid for product (#3324)
* Use themeValues from macaw (#3326)
* Upgrade macaw
* Use themeValues
* Use themeValues from macaw (#3326)
* Upgrade macaw
* Use themeValues
* Add empty column from datagrid, improve theme types
* Use theme type from typeof
* Use empty column and themeValues
* Filter empty column from default
* New product header (#3346)
* Extraxt messages
* Remve title left padding
* Fix switching view
* Add margin right to nav button
* Improve view switch
* Update switch view icons
* Add spacing to switch
* Add more space
* Add new filterbar to order list
* Code refactor and tests
* Refactor OrderDraftDetailsDatagrid
* Extract messages
* Refactor OrderDraftDetailsDatagrid
* Update alert messages
* Extract messages
* Write unit tests
* Improve switch component
* Overwrite Pill styles
* Common method to get status color for pills
* Local Pill component POC
* Add ThemeProvider to test wrapper
* Extract messages
* Refactor Pill
* Fix Pill path
* Fix tests mocks
* Remove scrollbar and border bottom
* Add custom border to to datagrid
* Fix borders
* Fix border bottom
* Refactor and cleanup
* Remove not needed selectionActions code
* Move logic code t misc
* Fix scrollbar and zindex datagrid borders
* Fix product tiles condition
* Use utils functions, remove not used code
* Refactor to hooks
* Loading prps instead of disabled
* use getStatusColor
* Move getMenuItems to separate function
* Fix loading props
* Use empty colum hook in OrderDetailsDatagrid
* Fix empty column when save column change
* Fix bottom line in layout overlap
* Show moneCell with discounted price
* Make quantity ediable in order draft datagrid
* Readonly datagrid cells
* Update onyl when column is quantity
* Fix message
* Keep first column in datagrid not removable
* Fix for not existing column
* Add loader over datagrid, fix problem with border top when empty text in variants
* Fix error color and change color in datagrid
* Use formatMoneyAmount
* Fix remove order draft product with discount
* Extract messages
* Add product sku to order draft details datagrid
* Fix loading state and change cell color
* Add MoneyDiscuntedCell
* Use MoneyDiscuntedCell in order draft details datagrid
* Add trash bin icon
* Restor discount modal for order draft summary
* Fix problem with deleting quantity
* Improve await for promises and handler zero quantity error
* Fix column order issue
* Add discount modal box shadow
* Allow decimal as percentage value for discount
* Fix max fixed value
* Remove double border
* Fix z-index issue on discount modal
* Remove padding on order details datagrid
* Add proper error message to common discount modal
* Fix is submit disabled
* Move status as last column in datagrid
* Add padding to money discount cell editor
* Make quantity column smaller
* Fix recalculating disount value
* Fix calculate change discount type
* Store calculated value without triming decimal, trim decimal in input
* Refactor money cells
* markCellsDirty rename to areCellsDirty
* Remove discount from MoneyCell
* Use const to store row height in discount editor
* Fix copy in discount modal
* Remove past on money discount cell
* Remove locale in product varaints
* Fix nullable sku
* Extract messages
* Fix keeping always first column
* Remove padding on tracking info
* Fix story
* Fix render 0 money amount
* Fix displaying not empty string money
* adding new tests: add new product, change quantity, add inline discount, delete product for grid - on orders details view (#3652)
* adding new e2e for grid on orders details view
* merging conflicts fix - and adding new TC numbers to new tests
* trigger tests
* failing tests fixes
---------
Co-authored-by: Michał Droń <dron.official@yahoo.com>
Co-authored-by: Krzysztof Żuraw <9116238+krzysztofzuraw@users.noreply.github.com>
Co-authored-by: Michał Droń <droniu@droniu.dev>
Co-authored-by: wojteknowacki <124166231+wojteknowacki@users.noreply.github.com>
Co-authored-by: wojteknowacki <wojciech.nowacki@saleor.io>
2023-05-18 07:52:13 +00:00
|
|
|
loading={loading}
|
2019-08-26 17:44:42 +00:00
|
|
|
onOrderLineChange={onOrderLineChange}
|
|
|
|
onOrderLineRemove={onOrderLineRemove}
|
|
|
|
/>
|
|
|
|
{maybe(() => order.lines.length) !== 0 && (
|
|
|
|
<CardContent>
|
Saleor 1856/implement discount modal 2 (#978)
* Add currency to orderline unitprice and update hella lots of types
* wip
* Add diiscount modal component
* Refactor action dialog - move buttons to separate component so they can be reused
* Add discount provider to keep logic of discounts separated and wrap proper components
* Add discount ccalculator util class, and make draft details summary use it, along with discounts data, modal etc
* UUpdate lots of types, fragments, schema etc
* Update quries and mutations
* ARename OrderLineDiscountModal -> OrderDiscountCommonModal, add types etc
* Add order line discount provider + consumer, same for order discount
* Fix ts wip
* Update schema and types
* Update order discount provider
* Add nnetto price to order details fragment and update lots of types
* Adjust fixtures to order details containing net total
* Move both order and order line provider to same dir to make types and utils more accessible
* Update schema to match master
* Update schema and types
* Update order history, add some related components, add events etc.
* Fix types
* Fix schema to match master
* Update messages
* Update changelog
* Retrigger build
* Add stories and update common modal to display floats properly
* Add and update stories and tests
* Add optional displaying of reason in case it's empty
* Make user name label for history events return email if last name and first name are absent
* Update schema, types, and mutations to properly refresh
* Remove unnecessary imports
* Add discounts decorator to draft details page storybook
* Fixs after review
* Update messages
* Small fixes to timeline events
* Update types for order shipping price to use net as well, fix labels in draft summary and add colors to theme palette
* Updaste tests, messages
* Fixs after review
* Add theme highlighted active and inactive color text, add valuue conversion to discount modal when changing calculation mode
* Add change to changelog
* Add extra options to select employee display name for order event when some data is missing. Also add filtering null elements in event header when data missing alltogether and element is null
* Refactor selecting employee name in utils
* Add conditional to extended timeline event when orderline is null
2021-03-05 14:52:02 +00:00
|
|
|
<OrderDiscountContext.Consumer>
|
|
|
|
{(orderDiscountProps: OrderDiscountContextConsumerProps) => (
|
|
|
|
<OrderDraftDetailsSummary
|
|
|
|
order={order}
|
2022-08-10 09:11:32 +00:00
|
|
|
errors={errors}
|
Saleor 1856/implement discount modal 2 (#978)
* Add currency to orderline unitprice and update hella lots of types
* wip
* Add diiscount modal component
* Refactor action dialog - move buttons to separate component so they can be reused
* Add discount provider to keep logic of discounts separated and wrap proper components
* Add discount ccalculator util class, and make draft details summary use it, along with discounts data, modal etc
* UUpdate lots of types, fragments, schema etc
* Update quries and mutations
* ARename OrderLineDiscountModal -> OrderDiscountCommonModal, add types etc
* Add order line discount provider + consumer, same for order discount
* Fix ts wip
* Update schema and types
* Update order discount provider
* Add nnetto price to order details fragment and update lots of types
* Adjust fixtures to order details containing net total
* Move both order and order line provider to same dir to make types and utils more accessible
* Update schema to match master
* Update schema and types
* Update order history, add some related components, add events etc.
* Fix types
* Fix schema to match master
* Update messages
* Update changelog
* Retrigger build
* Add stories and update common modal to display floats properly
* Add and update stories and tests
* Add optional displaying of reason in case it's empty
* Make user name label for history events return email if last name and first name are absent
* Update schema, types, and mutations to properly refresh
* Remove unnecessary imports
* Add discounts decorator to draft details page storybook
* Fixs after review
* Update messages
* Small fixes to timeline events
* Update types for order shipping price to use net as well, fix labels in draft summary and add colors to theme palette
* Updaste tests, messages
* Fixs after review
* Add theme highlighted active and inactive color text, add valuue conversion to discount modal when changing calculation mode
* Add change to changelog
* Add extra options to select employee display name for order event when some data is missing. Also add filtering null elements in event header when data missing alltogether and element is null
* Refactor selecting employee name in utils
* Add conditional to extended timeline event when orderline is null
2021-03-05 14:52:02 +00:00
|
|
|
onShippingMethodEdit={onShippingMethodEdit}
|
|
|
|
{...orderDiscountProps}
|
|
|
|
/>
|
|
|
|
)}
|
|
|
|
</OrderDiscountContext.Consumer>
|
2019-08-26 17:44:42 +00:00
|
|
|
</CardContent>
|
|
|
|
)}
|
|
|
|
</Card>
|
|
|
|
);
|
|
|
|
};
|
2019-06-19 14:40:52 +00:00
|
|
|
OrderDraftDetails.displayName = "OrderDraftDetails";
|
|
|
|
export default OrderDraftDetails;
|