Merge remote-tracking branch 'origin/master'

Author: mamirovlspeed

src/main/kotlin/com/ecwid/apiclient/v3/OrdersApiClient.kt

@@ -23,6 +23,7 @@ interface OrdersApiClient {
 	fun deleteOrderItemOptionFiles(request: OrderItemOptionFilesDeleteRequest): OrderItemOptionFileDeleteResult
 	fun searchDeletedOrders(request: DeletedOrdersSearchRequest): DeletedOrdersSearchResult
 	fun searchDeletedOrdersAsSequence(request: DeletedOrdersSearchRequest): Sequence<DeletedOrder>
+	fun previewOrdersTaxInvoice(request: OrderTaxInvoicePreviewRequest): String
 }
 
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")

src/main/kotlin/com/ecwid/apiclient/v3/converter/FetchedStoreProfile.kt

@@ -18,6 +18,7 @@ fun FetchedStoreProfile.toUpdated(): UpdatedStoreProfile {
 		zones = zones?.map(FetchedStoreProfile.Zone::toUpdated),
 		businessRegistrationID = businessRegistrationID?.toUpdated(),
 		legalPagesSettings = legalPagesSettings?.toUpdated(),
+		designSettings = designSettings?.toUpdated(),
 		productFiltersSettings = productFiltersSettings.toUpdated(),
 		orderInvoiceSettings = orderInvoiceSettings?.toUpdated()
 	)
@@ -315,6 +316,143 @@ fun FetchedStoreProfile.LegalPagesSettingsDetails.toUpdated(): UpdatedStoreProfi
 	)
 }
 
+@Suppress("LongMethod")
+fun FetchedStoreProfile.DesignSettings.toUpdated(): UpdatedStoreProfile.DesignSettings {
+	return UpdatedStoreProfile.DesignSettings(
+		breadcrumbsHaveHomeItem = breadcrumbsHaveHomeItem,
+		breadcrumbsHomeUrl = breadcrumbsHomeUrl,
+		breadcrumbsSeparator = breadcrumbsSeparator,
+		cartWidgetFixed = cartWidgetFixed,
+		cartWidgetFixedPosition = cartWidgetFixedPosition,
+		cartWidgetFixedShape = cartWidgetFixedShape,
+		cartWidgetHorizontalIndent = cartWidgetHorizontalIndent,
+		cartWidgetIcon = cartWidgetIcon,
+		cartWidgetIsResponsive = cartWidgetIsResponsive,
+		cartWidgetLayout = cartWidgetLayout,
+		cartWidgetShowBuyAnimation = cartWidgetShowBuyAnimation,
+		cartWidgetShowEmptyCart = cartWidgetShowEmptyCart,
+		cartWidgetStoreCustomIconUrl = cartWidgetStoreCustomIconUrl,
+		cartWidgetVerticalIndent = cartWidgetVerticalIndent,
+		checkoutProductsCollapsedOnDesktop = checkoutProductsCollapsedOnDesktop,
+		checkoutProductsCollapsedOnMobile = checkoutProductsCollapsedOnMobile,
+		checkoutShowAddressLine2 = checkoutShowAddressLine2,
+		checkoutShowStateInput = checkoutShowStateInput,
+		enableCatalogOnOnePage = enableCatalogOnOnePage,
+		enableCatalogSeamlessProductListView = enableCatalogSeamlessProductListView,
+		enablePageTransitions = enablePageTransitions,
+		enableSimpleCategoryList = enableSimpleCategoryList,
+		feedbackMessagePosition = feedbackMessagePosition,
+		hideCategoryBlockShowAllEnabledProducts = hideCategoryBlockShowAllEnabledProducts,
+		legalPagesShowPageLinks = legalPagesShowPageLinks,
+		productDetailsAdditionalImagesHasShadow = productDetailsAdditionalImagesHasShadow,
+		productDetailsAdditionalImagesPreviewOnClick = productDetailsAdditionalImagesPreviewOnClick,
+		productDetailsCutProductDescriptionInSidebar = productDetailsCutProductDescriptionInSidebar,
+		productDetailsGalleryLayout = productDetailsGalleryLayout,
+		productDetailsHidePriceModifiers = productDetailsHidePriceModifiers,
+		productDetailsImageCarousel = productDetailsImageCarousel,
+		productDetailsLayout = productDetailsLayout,
+		productDetailsPositionBreadcrumbs = productDetailsPositionBreadcrumbs,
+		productDetailsPositionBuyButton = productDetailsPositionBuyButton,
+		productDetailsPositionDeliveryTime = productDetailsPositionDeliveryTime,
+		productDetailsPositionProductDescription = productDetailsPositionProductDescription,
+		productDetailsPositionProductName = productDetailsPositionProductName,
+		productDetailsPositionProductOptions = productDetailsPositionProductOptions,
+		productDetailsPositionProductPrice = productDetailsPositionProductPrice,
+		productDetailsPositionProductLoyalty = productDetailsPositionProductLoyalty,
+		productDetailsPositionProductSku = productDetailsPositionProductSku,
+		productDetailsPositionReviewSection = productDetailsPositionReviewSection,
+		productDetailsPositionSaveForLater = productDetailsPositionSaveForLater,
+		productDetailsPositionShareButtons = productDetailsPositionShareButtons,
+		productDetailsPositionSubtitle = productDetailsPositionSubtitle,
+		productDetailsPositionWholesalePrices = productDetailsPositionWholesalePrices,
+		productDetailsShowAttributes = productDetailsShowAttributes,
+		productDetailsShowBreadcrumbs = productDetailsShowBreadcrumbs,
+		productDetailsShowBreadcrumbsPosition = productDetailsShowBreadcrumbsPosition,
+		productDetailsShowBuyButton = productDetailsShowBuyButton,
+		productDetailsShowDeliveryTime = productDetailsShowDeliveryTime,
+		productDetailsShowFacebookShareButton = productDetailsShowFacebookShareButton,
+		productDetailsShowInStockLabel = productDetailsShowInStockLabel,
+		productDetailsShowNavigationArrows = productDetailsShowNavigationArrows,
+		productDetailsShowNumberOfItemsInStock = productDetailsShowNumberOfItemsInStock,
+		productDetailsShowPinterestShareButton = productDetailsShowPinterestShareButton,
+		productDetailsShowPricePerUnit = productDetailsShowPricePerUnit,
+		productDetailsShowProductDescription = productDetailsShowProductDescription,
+		productDetailsShowProductName = productDetailsShowProductName,
+		productDetailsShowProductNameAlwaysFirstOnMobile = productDetailsShowProductNameAlwaysFirstOnMobile,
+		productDetailsShowProductOptions = productDetailsShowProductOptions,
+		productDetailsShowProductPhotoZoom = productDetailsShowProductPhotoZoom,
+		productDetailsShowProductPrice = productDetailsShowProductPrice,
+		productDetailsShowProductLoyalty = productDetailsShowProductLoyalty,
+		productDetailsShowProductSku = productDetailsShowProductSku,
+		productDetailsShowQty = productDetailsShowQty,
+		productDetailsShowRatingSection = productDetailsShowRatingSection,
+		productDetailsShowReviewsSection = productDetailsShowReviewsSection,
+		productDetailsShowReviewsSectionInOneCardView = productDetailsShowReviewsSectionInOneCardView,
+		productDetailsShowSalePrice = productDetailsShowSalePrice,
+		productDetailsShowSaveForLater = productDetailsShowSaveForLater,
+		productDetailsShowShareButtons = productDetailsShowShareButtons,
+		productDetailsShowSubtitle = productDetailsShowSubtitle,
+		productDetailsShowTax = productDetailsShowTax,
+		productDetailsShowTwitterShareButton = productDetailsShowTwitterShareButton,
+		productDetailsShowVkShareButton = productDetailsShowVkShareButton,
+		productDetailsShowWeight = productDetailsShowWeight,
+		productDetailsShowWholesalePrices = productDetailsShowWholesalePrices,
+		productDetailsShowZoomedImageInGallery = productDetailsShowZoomedImageInGallery,
+		productDetailsThumbnailsAspectRatio = productDetailsThumbnailsAspectRatio,
+		productDetailsTwoColumnsWithLeftSidebarShowProductDescriptionOnSidebar = productDetailsTwoColumnsWithLeftSidebarShowProductDescriptionOnSidebar,
+		productDetailsTwoColumnsWithRightSidebarShowProductDescriptionOnSidebar = productDetailsTwoColumnsWithRightSidebarShowProductDescriptionOnSidebar,
+		productFiltersOpenedByDefaultOnCatalogPages = productFiltersOpenedByDefaultOnCatalogPages,
+		productFiltersOpenedByDefaultOnCategoryPage = productFiltersOpenedByDefaultOnCategoryPage,
+		productFiltersPositionCategoryPage = productFiltersPositionCategoryPage,
+		productFiltersPositionOnCatalogPages = productFiltersPositionOnCatalogPages,
+		productFiltersPositionSearchPage = productFiltersPositionSearchPage,
+		productFiltersVisibleOnCatalogPages = productFiltersVisibleOnCatalogPages,
+		productListBuyNowBehaviour = productListBuyNowBehaviour,
+		productListCardLayout = productListCardLayout,
+		productListCategoryCellSpacing = productListCategoryCellSpacing,
+		productListCategoryImageLayout = productListCategoryImageLayout,
+		productListCategoryImagePosition = productListCategoryImagePosition,
+		productListCategoryImageSize = productListCategoryImageSize,
+		productListCategoryNameBehaviour = productListCategoryNameBehaviour,
+		productListCellSpacing = productListCellSpacing,
+		productListImageHasShadow = productListImageHasShadow,
+		productListImageLayout = productListImageLayout,
+		productListImagePosition = productListImagePosition,
+		productListImageSize = productListImageSize,
+		productListNameBehaviour = productListNameBehaviour,
+		productListPriceBehaviour = productListPriceBehaviour,
+		productListRatingSectionBehavior = productListRatingSectionBehavior,
+		productListSKUBehaviour = productListSKUBehaviour,
+		productListShowAdditionalImage = productListShowAdditionalImage,
+		productListShowBreadcrumbs = productListShowBreadcrumbs,
+		productListShowCardFrame = productListShowCardFrame,
+		productListShowFooterMenu = productListShowFooterMenu,
+		productListShowOnSaleLabel = productListShowOnSaleLabel,
+		productListShowPayWhatYouWantLabel = productListShowPayWhatYouWantLabel,
+		productListShowProductImages = productListShowProductImages,
+		productListShowRatingInOneStar = productListShowRatingInOneStar,
+		productListShowRatingNumberInFiveStarsView = productListShowRatingNumberInFiveStarsView,
+		productListShowReviewsCountInFiveStarsView = productListShowReviewsCountInFiveStarsView,
+		productListShowSignInLink = productListShowSignInLink,
+		productListShowSoldOutLabel = productListShowSoldOutLabel,
+		productListShowSortViewAsOptions = productListShowSortViewAsOptions,
+		productListSubtitlesBehavior = productListSubtitlesBehavior,
+		shoppingCartProductsCollapsedOnDesktop = shoppingCartProductsCollapsedOnDesktop,
+		shoppingCartProductsCollapsedOnMobile = shoppingCartProductsCollapsedOnMobile,
+		shoppingCartShowSku = shoppingCartShowSku,
+		shoppingCartShowQtyInputs = shoppingCartShowQtyInputs,
+		shoppingCartShowWeight = shoppingCartShowWeight,
+		showCartWidget = showCartWidget,
+		showRootCategories = showRootCategories,
+		showSigninLinkWithUnifiedAccountPage = showSigninLinkWithUnifiedAccountPage,
+		swatchesProductOptionShape = swatchesProductOptionShape,
+		swatchesProductOptionSize = swatchesProductOptionSize,
+		productDetailsShowAltTextAsVisibleAsDescription = productDetailsShowAltTextAsVisibleAsDescription,
+		productFiltersOrientation = productFiltersOrientation,
+		productListSwatchesProductOptionBehavior = productListSwatchesProductOptionBehavior,
+	)
+}
+
 fun FetchedStoreProfile.LegalPagesInfo.toUpdated(): UpdatedStoreProfile.LegalPagesInfo {
 	return UpdatedStoreProfile.LegalPagesInfo(
 		type = type?.toUpdated(),

src/main/kotlin/com/ecwid/apiclient/v3/dto/order/request/OrderTaxInvoicePreviewRequest.kt

@@ -0,0 +1,19 @@
+package com.ecwid.apiclient.v3.dto.order.request
+
+import com.ecwid.apiclient.v3.dto.ApiRequest
+import com.ecwid.apiclient.v3.httptransport.HttpBody
+import com.ecwid.apiclient.v3.impl.RequestInfo
+
+data class OrderTaxInvoicePreviewRequest(
+	val order: UpdatedOrder = UpdatedOrder()
+) : ApiRequest {
+	override fun toRequestInfo() = RequestInfo.createPostRequest(
+		pathSegments = listOf(
+			"orders",
+			"tax-invoice-preview",
+		),
+		httpBody = HttpBody.JsonBody(
+			obj = order
+		)
+	)
+}

src/main/kotlin/com/ecwid/apiclient/v3/dto/producttype/enums/AttributeType.kt

@@ -11,5 +11,10 @@ enum class AttributeType {
 	EBAY,
 	EBAY_REQUIRED,
 	PRICE_PER_UNIT,
-	UNITS_IN_PRODUCT
+	UNITS_IN_PRODUCT,
+	EXTERNAL_EAN,
+	EXTERNAL_ISBN,
+	EXTERNAL_ITF,
+	EXTERNAL_JAN,
+	EXTERNAL_CUSTOM
 }