2021-06-30 23:14:25 +00:00
|
|
|
import { getValueWithDefault } from "./utils/Utils";
|
|
|
|
|
2021-07-12 08:50:50 +00:00
|
|
|
export function createShippingRate({
|
|
|
|
name,
|
|
|
|
shippingZone,
|
|
|
|
type = "PRICE",
|
|
|
|
maxWeight,
|
2022-07-29 06:35:55 +00:00
|
|
|
minWeight,
|
2023-01-09 09:55:12 +00:00
|
|
|
taxClassId,
|
2021-07-12 08:50:50 +00:00
|
|
|
}) {
|
|
|
|
const maxOrderWeight = getValueWithDefault(
|
|
|
|
maxWeight,
|
2022-07-29 06:35:55 +00:00
|
|
|
`maximumOrderWeight: ${maxWeight}`,
|
2021-07-12 08:50:50 +00:00
|
|
|
);
|
|
|
|
const minOrderWeight = getValueWithDefault(
|
|
|
|
minWeight,
|
2022-07-29 06:35:55 +00:00
|
|
|
`minimumOrderWeight: ${minWeight}`,
|
2021-07-12 08:50:50 +00:00
|
|
|
);
|
|
|
|
|
2023-01-09 09:55:12 +00:00
|
|
|
const selectedTaxClass = getValueWithDefault(
|
|
|
|
taxClassId,
|
|
|
|
`taxClass: "${taxClassId}"`,
|
|
|
|
`taxClass: ""`,
|
|
|
|
);
|
|
|
|
|
2021-03-12 14:57:02 +00:00
|
|
|
const mutation = `mutation{
|
|
|
|
shippingPriceCreate(input:{
|
|
|
|
name: "${name}"
|
2021-07-12 08:50:50 +00:00
|
|
|
shippingZone: "${shippingZone}"
|
|
|
|
type: ${type}
|
|
|
|
${minOrderWeight}
|
|
|
|
${maxOrderWeight}
|
2023-01-09 09:55:12 +00:00
|
|
|
${selectedTaxClass}
|
2021-03-12 14:57:02 +00:00
|
|
|
}){
|
|
|
|
shippingMethod{
|
|
|
|
id
|
2021-12-15 12:17:35 +00:00
|
|
|
name
|
2021-03-12 14:57:02 +00:00
|
|
|
}
|
2021-07-06 10:33:04 +00:00
|
|
|
errors{
|
|
|
|
field
|
|
|
|
message
|
|
|
|
}
|
2021-03-12 14:57:02 +00:00
|
|
|
}
|
|
|
|
}`;
|
2021-07-12 08:50:50 +00:00
|
|
|
return cy.sendRequestWithQuery(mutation).its("body.data.shippingPriceCreate");
|
2021-03-12 12:14:18 +00:00
|
|
|
}
|
2021-01-27 09:41:55 +00:00
|
|
|
|
2022-07-29 06:35:55 +00:00
|
|
|
export function createShippingZone(name, country, channelId, warehouseId) {
|
2021-06-30 23:14:25 +00:00
|
|
|
const channelsLines = getValueWithDefault(
|
|
|
|
channelId,
|
2022-07-29 06:35:55 +00:00
|
|
|
`addChannels:["${channelId}"]`,
|
|
|
|
);
|
|
|
|
const mutation = `mutation{
|
|
|
|
shippingZoneCreate(input:{
|
|
|
|
name: "${name}"
|
|
|
|
countries: "${country}"
|
|
|
|
${channelsLines}
|
|
|
|
addWarehouses: ["${warehouseId}"]
|
|
|
|
}){
|
|
|
|
shippingZone{
|
|
|
|
id
|
|
|
|
name
|
|
|
|
}
|
|
|
|
errors{
|
|
|
|
field
|
|
|
|
message
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}`;
|
|
|
|
return cy
|
|
|
|
.sendRequestWithQuery(mutation)
|
|
|
|
.its("body.data.shippingZoneCreate.shippingZone");
|
|
|
|
}
|
|
|
|
|
|
|
|
export function createShippingZoneWithoutWarehouse(name, country, channelId) {
|
|
|
|
const channelsLines = getValueWithDefault(
|
|
|
|
channelId,
|
|
|
|
`addChannels:["${channelId}"]`,
|
2021-06-30 23:14:25 +00:00
|
|
|
);
|
2021-03-12 14:57:02 +00:00
|
|
|
const mutation = `mutation{
|
|
|
|
shippingZoneCreate(input:{
|
|
|
|
name: "${name}"
|
|
|
|
countries: "${country}"
|
2021-06-30 23:14:25 +00:00
|
|
|
${channelsLines}
|
2021-03-12 14:57:02 +00:00
|
|
|
}){
|
|
|
|
shippingZone{
|
|
|
|
id
|
2021-04-02 11:01:38 +00:00
|
|
|
name
|
2021-03-12 14:57:02 +00:00
|
|
|
}
|
2021-06-30 23:14:25 +00:00
|
|
|
errors{
|
|
|
|
field
|
2021-07-06 10:33:04 +00:00
|
|
|
message
|
2021-06-30 23:14:25 +00:00
|
|
|
}
|
2021-03-12 14:57:02 +00:00
|
|
|
}
|
|
|
|
}`;
|
2021-04-28 13:10:47 +00:00
|
|
|
return cy
|
|
|
|
.sendRequestWithQuery(mutation)
|
|
|
|
.its("body.data.shippingZoneCreate.shippingZone");
|
2021-03-12 12:14:18 +00:00
|
|
|
}
|
2021-07-26 09:58:47 +00:00
|
|
|
|
Add channel shipping zones (#1015)
* Add naked input option to SingleAutocompleteSelectField and update it's stories
* Add new icons - chevron up, down & trash
* Add deletable item component and stories
* Add card add items footer component to be used in warehouses and product stocks assign
* Update schema and types
* Add shipping zones card components
* Update channel details page form to also include shipping zones
* Update makeTopLevelSearch hook files directory and add getSearchFetchMoreProps function to avoid extracting it manually every time
* Update channels types & fragments
* Move getDefaultNotifierSuccessErrorData function to useNotifier utils, update dir etc., also make order discount provider use it from the new dir
* Add shippinh zone to channel update and create and add shipping zone search
* Update messages
* Fix types
* Fix lint, types etc
* Small refactor from review and quick fix styles of shipping zones card
* Refactor a bit and update snapshots
* Refactor a bit and update snapshots
* Addd / refactor channels availability components
* Add useChannelsWithProductVariants hook with utils and types
* Add / refactor more channels availability components
* Move avatar from table cell avatar to separate component for it to be usable outside of tables
* Add channels with variants logic to product create and update pages & views
* Refactor components to use updated channels availability components
* Remove unnecessary comments
* Update storybook
* Update types
* Update messages
* Fix prices for variants / simple product not uodating properly
* Post merge cleanup, update schema, types, etc.
* Change shipping zone details warehouses card into settings card and add ability to assign channels to shipping zone
* Update types
* Update snapshots
* Fix selecting / deselecting all channels in channels with variants modal
* Fixes after review, some types changes etc.
* Update snapshots
* Small types fixes
* Make price rates views use parent shipping method channels instead of all
* Make price rates views use parent shipping method channels instead of all
* Update types
* Fix bugs
* Fixes after review
* Fix channels availability data submission
* Fix lint
* Fix variant pricing card showing not related channels
* Fixes after review
* Fix types
* Hide unaviable variants in add products to draft order dialog
* Fix channels with variants availability modal showing confirm button as enabled when it shouldn't
* Fix types
* Update semi checked icon to match old designs
* Update types
* Update channels icon in channels with variants availability
* Fix product cypress test after product channels mutation changed
* Fix trash and chevron down colors in dark mode
* Fix shipping zones card footer not updating query after click away
* Fix types in schema, add condition not to display shipping zones select in channel details if all zones have already been selected
* Fix products adding in order draft dialog
* Fix simple productupdate
* Update snapshots after merge with master
* Update messages
* Fix product api request for cypress
* Add missing test id
* Fix selecting if product is simple -> form being submitted with empty data sometimes
* Update snapshots, messages and add fix for invalid date at product update
* Remove unnecessary imports
* Fix failing test in saleor 2552 (#1061)
* fix
* fix
* fix
Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>
Co-authored-by: Karolina <rakoczy.karolina@gmail.com>
2021-04-14 13:44:25 +00:00
|
|
|
export function addChannelToShippingZone(shippingZoneId, channelId) {
|
|
|
|
const mutation = `mutation addCh{
|
|
|
|
shippingZoneUpdate(id:"${shippingZoneId}", input:{
|
|
|
|
addChannels:["${channelId}"]
|
|
|
|
}){
|
2022-06-06 08:47:39 +00:00
|
|
|
errors{
|
Add channel shipping zones (#1015)
* Add naked input option to SingleAutocompleteSelectField and update it's stories
* Add new icons - chevron up, down & trash
* Add deletable item component and stories
* Add card add items footer component to be used in warehouses and product stocks assign
* Update schema and types
* Add shipping zones card components
* Update channel details page form to also include shipping zones
* Update makeTopLevelSearch hook files directory and add getSearchFetchMoreProps function to avoid extracting it manually every time
* Update channels types & fragments
* Move getDefaultNotifierSuccessErrorData function to useNotifier utils, update dir etc., also make order discount provider use it from the new dir
* Add shippinh zone to channel update and create and add shipping zone search
* Update messages
* Fix types
* Fix lint, types etc
* Small refactor from review and quick fix styles of shipping zones card
* Refactor a bit and update snapshots
* Refactor a bit and update snapshots
* Addd / refactor channels availability components
* Add useChannelsWithProductVariants hook with utils and types
* Add / refactor more channels availability components
* Move avatar from table cell avatar to separate component for it to be usable outside of tables
* Add channels with variants logic to product create and update pages & views
* Refactor components to use updated channels availability components
* Remove unnecessary comments
* Update storybook
* Update types
* Update messages
* Fix prices for variants / simple product not uodating properly
* Post merge cleanup, update schema, types, etc.
* Change shipping zone details warehouses card into settings card and add ability to assign channels to shipping zone
* Update types
* Update snapshots
* Fix selecting / deselecting all channels in channels with variants modal
* Fixes after review, some types changes etc.
* Update snapshots
* Small types fixes
* Make price rates views use parent shipping method channels instead of all
* Make price rates views use parent shipping method channels instead of all
* Update types
* Fix bugs
* Fixes after review
* Fix channels availability data submission
* Fix lint
* Fix variant pricing card showing not related channels
* Fixes after review
* Fix types
* Hide unaviable variants in add products to draft order dialog
* Fix channels with variants availability modal showing confirm button as enabled when it shouldn't
* Fix types
* Update semi checked icon to match old designs
* Update types
* Update channels icon in channels with variants availability
* Fix product cypress test after product channels mutation changed
* Fix trash and chevron down colors in dark mode
* Fix shipping zones card footer not updating query after click away
* Fix types in schema, add condition not to display shipping zones select in channel details if all zones have already been selected
* Fix products adding in order draft dialog
* Fix simple productupdate
* Update snapshots after merge with master
* Update messages
* Fix product api request for cypress
* Add missing test id
* Fix selecting if product is simple -> form being submitted with empty data sometimes
* Update snapshots, messages and add fix for invalid date at product update
* Remove unnecessary imports
* Fix failing test in saleor 2552 (#1061)
* fix
* fix
* fix
Co-authored-by: Jakub Majorek <majorek.jakub@gmail.com>
Co-authored-by: Karolina <rakoczy.karolina@gmail.com>
2021-04-14 13:44:25 +00:00
|
|
|
field
|
|
|
|
message
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}`;
|
|
|
|
return cy.sendRequestWithQuery(mutation);
|
|
|
|
}
|
2021-07-26 09:58:47 +00:00
|
|
|
|
2021-07-06 10:33:04 +00:00
|
|
|
export function addChannelToShippingMethod(
|
|
|
|
shippingRateId,
|
|
|
|
channelId,
|
|
|
|
price,
|
2022-07-29 06:35:55 +00:00
|
|
|
minProductPrice = 0,
|
2021-07-06 10:33:04 +00:00
|
|
|
) {
|
2021-03-12 14:57:02 +00:00
|
|
|
const mutation = `mutation{
|
|
|
|
shippingMethodChannelListingUpdate(id:"${shippingRateId}", input:{
|
|
|
|
addChannels: {
|
|
|
|
channelId:"${channelId}"
|
|
|
|
price: ${price}
|
2021-07-06 10:33:04 +00:00
|
|
|
minimumOrderPrice:${minProductPrice}
|
2021-03-12 14:57:02 +00:00
|
|
|
}
|
|
|
|
}){
|
|
|
|
shippingMethod{
|
|
|
|
id
|
2022-10-25 11:44:10 +00:00
|
|
|
channelListings{
|
|
|
|
price{
|
|
|
|
amount
|
|
|
|
}
|
|
|
|
channel{
|
|
|
|
slug
|
|
|
|
}
|
|
|
|
}
|
2021-03-12 14:57:02 +00:00
|
|
|
}
|
2021-07-06 10:33:04 +00:00
|
|
|
errors{
|
2021-03-12 14:57:02 +00:00
|
|
|
code
|
|
|
|
message
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}`;
|
2021-03-12 12:14:18 +00:00
|
|
|
return cy.sendRequestWithQuery(mutation);
|
|
|
|
}
|
2021-01-27 09:41:55 +00:00
|
|
|
|
2021-03-12 12:14:18 +00:00
|
|
|
export function deleteShippingZone(shippingZoneId) {
|
|
|
|
const mutation = `mutation{
|
2021-01-27 09:41:55 +00:00
|
|
|
shippingZoneDelete(id:"${shippingZoneId}"){
|
2022-06-06 08:47:39 +00:00
|
|
|
errors{
|
2021-01-27 09:41:55 +00:00
|
|
|
message
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
`;
|
2021-03-12 12:14:18 +00:00
|
|
|
return cy.sendRequestWithQuery(mutation);
|
|
|
|
}
|
2021-01-27 09:41:55 +00:00
|
|
|
|
2021-03-12 12:14:18 +00:00
|
|
|
export function getShippingZones() {
|
|
|
|
const query = `query{
|
2021-06-30 23:14:25 +00:00
|
|
|
shippingZones(first:100){
|
|
|
|
edges{
|
|
|
|
node{
|
|
|
|
name
|
|
|
|
id
|
2021-01-27 09:41:55 +00:00
|
|
|
}
|
2021-06-30 23:14:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
`;
|
2021-03-12 12:14:18 +00:00
|
|
|
return cy
|
|
|
|
.sendRequestWithQuery(query)
|
|
|
|
.then(resp => resp.body.data.shippingZones.edges);
|
2021-01-27 09:41:55 +00:00
|
|
|
}
|
2021-06-30 23:14:25 +00:00
|
|
|
|
|
|
|
export function getShippingZone(shippingZoneId) {
|
|
|
|
const query = `query{
|
|
|
|
shippingZone(id:"${shippingZoneId}"){
|
|
|
|
id
|
|
|
|
name
|
2022-01-14 10:08:25 +00:00
|
|
|
description
|
|
|
|
warehouses{
|
|
|
|
name
|
|
|
|
id
|
|
|
|
}
|
|
|
|
countries{
|
|
|
|
code
|
|
|
|
}
|
2021-06-30 23:14:25 +00:00
|
|
|
channels{
|
|
|
|
name
|
|
|
|
id
|
|
|
|
}
|
2021-07-26 09:58:47 +00:00
|
|
|
shippingMethods{
|
|
|
|
id
|
|
|
|
name
|
2022-01-14 10:08:25 +00:00
|
|
|
minimumDeliveryDays
|
|
|
|
maximumDeliveryDays
|
|
|
|
minimumOrderWeight{
|
|
|
|
value
|
|
|
|
}
|
|
|
|
maximumOrderWeight{
|
|
|
|
value
|
|
|
|
}
|
|
|
|
channelListings{
|
|
|
|
price{
|
|
|
|
amount
|
|
|
|
}
|
|
|
|
minimumOrderPrice{
|
|
|
|
amount
|
|
|
|
}
|
|
|
|
maximumOrderPrice{
|
|
|
|
amount
|
|
|
|
}
|
|
|
|
}
|
2021-07-26 09:58:47 +00:00
|
|
|
}
|
2021-06-30 23:14:25 +00:00
|
|
|
}
|
2021-07-26 09:58:47 +00:00
|
|
|
}`;
|
2021-06-30 23:14:25 +00:00
|
|
|
return cy
|
|
|
|
.sendRequestWithQuery(query)
|
|
|
|
.then(resp => resp.body.data.shippingZone);
|
|
|
|
}
|