2021-09-27 10:04:21 +00:00
|
|
|
import { BUTTON_SELECTORS } from "../../elements/shared/button-selectors";
|
|
|
|
import { SHARED_ELEMENTS } from "../../elements/shared/sharedElements";
|
|
|
|
import { SHIPPING_RATE_DETAILS } from "../../elements/shipping/shipping-rate-details";
|
|
|
|
import { SHIPPING_ZONE_DETAILS } from "../../elements/shipping/shipping-zone-details";
|
|
|
|
import { SHIPPING_ZONES_LIST } from "../../elements/shipping/shipping-zones-list";
|
2021-04-02 11:01:38 +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 createShippingZone(
|
|
|
|
shippingName,
|
|
|
|
warehouseName,
|
|
|
|
country,
|
|
|
|
channelName
|
|
|
|
) {
|
2022-01-14 10:08:25 +00:00
|
|
|
cy.get(SHIPPING_ZONES_LIST.addShippingZone).click();
|
|
|
|
fillUpShippingZoneData({
|
|
|
|
shippingName,
|
|
|
|
warehouseName,
|
|
|
|
country,
|
|
|
|
channelName
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
export function fillUpShippingZoneData({
|
|
|
|
shippingName,
|
|
|
|
warehouseName,
|
|
|
|
country,
|
|
|
|
channelName
|
|
|
|
}) {
|
|
|
|
cy.get(SHIPPING_ZONE_DETAILS.nameInput)
|
|
|
|
.clearAndType(shippingName)
|
|
|
|
.get(SHIPPING_ZONE_DETAILS.descriptionInput)
|
|
|
|
.clearAndType(shippingName)
|
2022-02-11 11:28:55 +00:00
|
|
|
.get(BUTTON_SELECTORS.confirm)
|
|
|
|
.click()
|
|
|
|
.confirmationMessageShouldDisappear()
|
2021-04-02 11:01:38 +00:00
|
|
|
.get(SHIPPING_ZONE_DETAILS.assignCountryButton)
|
|
|
|
.click()
|
|
|
|
.get(SHIPPING_ZONE_DETAILS.searchInput)
|
|
|
|
.type(country);
|
|
|
|
cy.contains(SHIPPING_ZONE_DETAILS.tableRow, country)
|
|
|
|
.find(BUTTON_SELECTORS.checkbox)
|
|
|
|
.click()
|
|
|
|
.get(SHIPPING_ZONE_DETAILS.submitAssignCountry)
|
|
|
|
.click()
|
|
|
|
.get(BUTTON_SELECTORS.confirm)
|
2021-09-27 10:04:21 +00:00
|
|
|
.click()
|
|
|
|
.confirmationMessageShouldDisappear()
|
|
|
|
.get(SHIPPING_ZONE_DETAILS.warehouseSelector)
|
2021-04-02 11:01:38 +00:00
|
|
|
.click()
|
|
|
|
.get(SHIPPING_ZONE_DETAILS.warehouseSelector)
|
2021-09-10 08:59:46 +00:00
|
|
|
.type(warehouseName)
|
|
|
|
.get(SHIPPING_ZONE_DETAILS.autocompleteContentDialog)
|
|
|
|
.scrollTo("bottom");
|
2022-01-14 10:08:25 +00:00
|
|
|
return cy
|
|
|
|
.contains(SHIPPING_ZONE_DETAILS.option, warehouseName)
|
2021-07-12 08:50:50 +00:00
|
|
|
.click({ force: true })
|
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
|
|
|
.get(SHIPPING_ZONE_DETAILS.channelSelector)
|
|
|
|
.click()
|
|
|
|
.get(SHIPPING_ZONE_DETAILS.option)
|
|
|
|
.contains(channelName)
|
2021-09-27 10:04:21 +00:00
|
|
|
.click()
|
|
|
|
.addAliasToGraphRequest("UpdateShippingZone")
|
|
|
|
.get(BUTTON_SELECTORS.confirm)
|
|
|
|
.click()
|
|
|
|
.confirmationMessageShouldDisappear()
|
|
|
|
.waitForRequestAndCheckIfNoErrors("@UpdateShippingZone");
|
2021-04-02 11:01:38 +00:00
|
|
|
}
|
|
|
|
|
2021-07-12 08:50:50 +00:00
|
|
|
export function changeWeightUnit(weightUnit) {
|
2021-09-27 10:04:21 +00:00
|
|
|
cy.fillBaseSelect(SHIPPING_ZONES_LIST.unitSelect, weightUnit)
|
|
|
|
.addAliasToGraphRequest("UpdateDefaultWeightUnit")
|
|
|
|
.get(SHIPPING_ZONES_LIST.saveUnit)
|
|
|
|
.click()
|
|
|
|
.confirmationMessageShouldDisappear()
|
|
|
|
.waitForRequestAndCheckIfNoErrors("@UpdateDefaultWeightUnit")
|
|
|
|
.wait(5000);
|
2021-07-12 08:50:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
export function createShippingRate({
|
|
|
|
rateName,
|
|
|
|
price,
|
|
|
|
rateOption,
|
|
|
|
weightLimits,
|
2022-02-11 15:08:45 +00:00
|
|
|
deliveryTime,
|
|
|
|
priceLimits
|
2021-07-12 08:50:50 +00:00
|
|
|
}) {
|
|
|
|
enterAndFillUpShippingRate({
|
|
|
|
rateName,
|
|
|
|
price,
|
|
|
|
rateOption,
|
|
|
|
weightLimits,
|
2022-02-11 15:08:45 +00:00
|
|
|
deliveryTime,
|
|
|
|
priceLimits
|
2021-07-12 08:50:50 +00:00
|
|
|
});
|
2021-07-26 09:58:47 +00:00
|
|
|
return saveRate();
|
2021-07-12 08:50:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
export function enterAndFillUpShippingRate({
|
|
|
|
rateName,
|
|
|
|
price,
|
|
|
|
rateOption,
|
|
|
|
weightLimits,
|
2022-02-11 15:08:45 +00:00
|
|
|
priceLimits,
|
2021-07-12 08:50:50 +00:00
|
|
|
deliveryTime
|
|
|
|
}) {
|
2022-01-14 10:08:25 +00:00
|
|
|
cy.get(rateOption).click();
|
|
|
|
fillUpShippingRate({
|
|
|
|
rateName,
|
|
|
|
price,
|
|
|
|
weightLimits,
|
2022-02-11 15:08:45 +00:00
|
|
|
priceLimits,
|
2022-01-14 10:08:25 +00:00
|
|
|
deliveryTime
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
export function fillUpShippingRate({
|
|
|
|
rateName,
|
|
|
|
price,
|
|
|
|
weightLimits,
|
2022-02-11 15:08:45 +00:00
|
|
|
priceLimits,
|
2022-01-14 10:08:25 +00:00
|
|
|
deliveryTime
|
|
|
|
}) {
|
|
|
|
cy.waitForProgressBarToNotBeVisible()
|
2021-09-27 10:04:21 +00:00
|
|
|
.get(SHARED_ELEMENTS.richTextEditor.empty)
|
2021-07-12 08:50:50 +00:00
|
|
|
.should("exist")
|
2021-04-02 11:01:38 +00:00
|
|
|
.get(SHIPPING_RATE_DETAILS.inputName)
|
2022-01-14 10:08:25 +00:00
|
|
|
.clearAndType(rateName);
|
2021-07-12 08:50:50 +00:00
|
|
|
if (deliveryTime) {
|
|
|
|
fillUpDeliveryTime(deliveryTime);
|
|
|
|
}
|
|
|
|
if (weightLimits) {
|
2022-02-11 15:08:45 +00:00
|
|
|
fillUpLimits(weightLimits);
|
|
|
|
}
|
|
|
|
if (priceLimits) {
|
|
|
|
fillUpLimits(priceLimits);
|
2021-07-12 08:50:50 +00:00
|
|
|
}
|
|
|
|
cy.get(SHIPPING_RATE_DETAILS.priceInput).each($priceInput => {
|
2022-01-14 10:08:25 +00:00
|
|
|
cy.wrap($priceInput).clearAndType(price);
|
2021-07-12 08:50:50 +00:00
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
export function createRateWithPostalCode({
|
|
|
|
rateName,
|
|
|
|
price,
|
|
|
|
rateOption = rateOptions.PRICE_OPTION,
|
|
|
|
minPostalCode,
|
|
|
|
maxPostalCode,
|
|
|
|
postalCodeOption
|
|
|
|
}) {
|
|
|
|
enterAndFillUpShippingRate({ rateName, price, rateOption });
|
|
|
|
cy.get(postalCodeOption)
|
|
|
|
.click()
|
|
|
|
.get(SHIPPING_RATE_DETAILS.addPostalCodesButton)
|
|
|
|
.click()
|
|
|
|
.get(SHIPPING_RATE_DETAILS.postalCodesForm.min)
|
|
|
|
.type(minPostalCode)
|
|
|
|
.get(SHIPPING_RATE_DETAILS.postalCodesForm.max)
|
|
|
|
.type(maxPostalCode)
|
|
|
|
.get(BUTTON_SELECTORS.submit)
|
|
|
|
.click();
|
2021-07-26 09:58:47 +00:00
|
|
|
return saveRate();
|
2021-07-12 08:50:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
export function saveRate() {
|
2021-09-27 10:04:21 +00:00
|
|
|
return cy
|
|
|
|
.addAliasToGraphRequest("ShippingMethodChannelListingUpdate")
|
2021-07-12 08:50:50 +00:00
|
|
|
.addAliasToGraphRequest("ShippingZone")
|
|
|
|
.get(BUTTON_SELECTORS.confirm)
|
2021-09-27 10:04:21 +00:00
|
|
|
.click()
|
|
|
|
.confirmationMessageShouldDisappear()
|
|
|
|
.waitForRequestAndCheckIfNoErrors(`@ShippingMethodChannelListingUpdate`)
|
|
|
|
.waitForRequestAndCheckIfNoErrors(`@ShippingZone`)
|
2021-07-26 09:58:47 +00:00
|
|
|
.its("response.body.0.data.shippingZone");
|
2021-07-12 08:50:50 +00:00
|
|
|
}
|
|
|
|
|
2022-01-14 10:08:25 +00:00
|
|
|
export function saveRateAfterUpdate() {
|
|
|
|
return cy
|
|
|
|
.addAliasToGraphRequest("ShippingMethodChannelListingUpdate")
|
|
|
|
.get(BUTTON_SELECTORS.confirm)
|
|
|
|
.click()
|
|
|
|
.confirmationMessageShouldDisappear()
|
|
|
|
.waitForRequestAndCheckIfNoErrors(`@ShippingMethodChannelListingUpdate`);
|
|
|
|
}
|
|
|
|
|
2022-02-11 15:08:45 +00:00
|
|
|
export function fillUpLimits({ max, min }) {
|
|
|
|
cy.get(SHIPPING_RATE_DETAILS.minValueInput)
|
2021-07-12 08:50:50 +00:00
|
|
|
.type(min)
|
2022-02-11 15:08:45 +00:00
|
|
|
.get(SHIPPING_RATE_DETAILS.maxValueInput)
|
2021-07-12 08:50:50 +00:00
|
|
|
.type(max);
|
|
|
|
}
|
|
|
|
|
|
|
|
export function fillUpDeliveryTime({ min, max }) {
|
|
|
|
cy.get(SHIPPING_RATE_DETAILS.minDeliveryTimeInput)
|
2022-01-14 10:08:25 +00:00
|
|
|
.clearAndType(min)
|
2021-07-12 08:50:50 +00:00
|
|
|
.get(SHIPPING_RATE_DETAILS.maxDeliveryTimeInput)
|
2022-01-14 10:08:25 +00:00
|
|
|
.clearAndType(max);
|
2021-04-02 11:01:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
export const rateOptions = {
|
|
|
|
PRICE_OPTION: SHIPPING_ZONE_DETAILS.addPriceRateButton,
|
|
|
|
WEIGHT_OPTION: SHIPPING_ZONE_DETAILS.addWeightRateButton
|
|
|
|
};
|
2021-07-12 08:50:50 +00:00
|
|
|
|
|
|
|
export const postalCodesOptions = {
|
|
|
|
INCLUDE_OPTION: SHIPPING_RATE_DETAILS.includePostalCodesCheckbox,
|
|
|
|
EXCLUDE_OPTION: SHIPPING_RATE_DETAILS.excludePostalCodesCheckbox
|
|
|
|
};
|