diff --git a/CHANGELOG.md b/CHANGELOG.md index 17877979..d955c1bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# CHANGE LOG (v1.4.15-beta.1) - 1.9.4 +# CHANGE LOG (1.4.15-beta.2) - 1.9.4 ## Application Client @@ -2051,7 +2051,8 @@ #### updatePriceAdjustment - ##### What's New - - [Added] properties data.value, data.message, data.restrictions, data.id, data.collection, data.type, data.meta, data.applyExpiry, data.articleLevelDistribution, data.allowedRefund, data.isAuthenticated, data.articleIds, data.cartId in response with status code 200 + - [Added] property autoRemove of schema PriceAdjustmentUpdate in request body + - [Added] properties data.value, data.message, data.restrictions, data.id, data.collection, data.type, data.meta, data.applyExpiry, data.articleLevelDistribution, data.allowedRefund, data.isAuthenticated, data.articleIds, data.autoRemove, data.cartId in response with status code 200 - [Added] data.article_ids, data.article_level_distribution, data.cart_id, data.collection, data.is_authenticated, data.message, data.type, data.value made required in response with status code 200 - ##### What's Deprecated @@ -2064,7 +2065,8 @@ #### addPriceAdjustment - ##### What's New - - [Added] properties data.value, data.message, data.restrictions, data.id, data.collection, data.type, data.meta, data.applyExpiry, data.articleLevelDistribution, data.allowedRefund, data.isAuthenticated, data.articleIds, data.cartId in response with status code 201 + - [Added] property autoRemove of schema PriceAdjustmentAdd in request body + - [Added] properties data.value, data.message, data.restrictions, data.id, data.collection, data.type, data.meta, data.applyExpiry, data.articleLevelDistribution, data.allowedRefund, data.isAuthenticated, data.articleIds, data.autoRemove, data.cartId in response with status code 201 - [Added] data.article_ids, data.article_level_distribution, data.cart_id, data.collection, data.is_authenticated, data.message, data.type, data.value made required in response with status code 201 - ##### What's Deprecated @@ -2074,6 +2076,12 @@ - [Breaking] [Changed] Type from array to object of property data of schema GetPriceAdjustmentResult in response with status code 201 +#### getPriceAdjustments + +- ##### What's New + - [Added] property data[].autoRemove of schema PriceAdjustment in response with status code 200 + + #### fetchAndvalidateCartItems - ##### What's Deprecated @@ -5207,8 +5215,43 @@ #### createZone - ##### What's New + - [Added] property mapping[].regions of schema ZoneMappingType in request body + - [Breaking] [Added] mapping[].regions made required in request body + - [Added] property product of schema CreateZoneData in request body - [Breaking] [Added] store_ids made required in request body +- ##### What's Deprecated + - [Breaking] [Deleted] property mapping[].pincode of schema ZoneMappingType in request body + - [Breaking] [Deleted] property mapping[].state of schema ZoneMappingType in request body + - [Breaking] [Deleted] property assignmentPreference of schema CreateZoneData in request body + + +#### updateZoneById + +- ##### What's New + - [Added] property mapping[].regions of schema ZoneMappingType in request body + - [Breaking] [Added] mapping[].regions made required in request body + +- ##### What's Deprecated + - [Breaking] [Deleted] property mapping[].pincode of schema ZoneMappingType in request body + - [Breaking] [Deleted] property mapping[].state of schema ZoneMappingType in request body + - [Breaking] [Deleted] property assignmentPreference of schema UpdateZoneData in request body + + +#### getZoneById + +- ##### What's New + - [Added] property mapping[].regions of schema ZoneMappingDetailType in response with status code 200 + +- ##### What's Deprecated + - [Breaking] [Deleted] property mapping[].pincode of schema ZoneMappingType in response with status code 200 + - [Breaking] [Deleted] property mapping[].state of schema ZoneMappingType in response with status code 200 + - [Breaking] [Deleted] property assignmentPreference of schema GetZoneByIdSchema in response with status code 200 + - [Breaking] [Deleted] property storesCount of schema GetZoneByIdSchema in response with status code 200 + +- ##### What's Changed + - [Breaking] [Changed] stores_count made optional in response with status code 200 + #### getAllStores diff --git a/README.md b/README.md index 312737b6..e02b2205 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Get started with the Kotlin Development SDK for Fynd Platform # Usage -1. Add the dependency in your app build.gradle `implementation 'com.github.gofynd:fdk-client-kotlin:v1.4.15-beta.1'` in your app build.gradle +1. Add the dependency in your app build.gradle `implementation 'com.github.gofynd:fdk-client-kotlin:1.4.15-beta.2'` in your app build.gradle 2. Add it in your root build.gradle at the end of repositories: allprojects { repositories { diff --git a/build.gradle b/build.gradle index 628fa213..ca83825c 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ android { minSdkVersion 21 targetSdkVersion 31 versionCode 2 - versionName "v1.4.15-beta.1" + versionName "1.4.15-beta.2" multiDexEnabled true vectorDrawables.useSupportLibrary = true diff --git a/src/main/java/com/sdk/common/AccessTokenInterceptor.kt b/src/main/java/com/sdk/common/AccessTokenInterceptor.kt index bc8828af..9b3e0959 100644 --- a/src/main/java/com/sdk/common/AccessTokenInterceptor.kt +++ b/src/main/java/com/sdk/common/AccessTokenInterceptor.kt @@ -20,7 +20,7 @@ class AccessTokenInterceptor( } if (!original.headers.names().contains("x-fp-sdk-version")) { - header("x-fp-sdk-version", "v1.4.15-beta.1") + header("x-fp-sdk-version", "1.4.15-beta.2") } if (!original.headers.names().contains("x-currency-code")) { diff --git a/src/main/java/com/sdk/common/ApplicationHeaderInterceptor.kt b/src/main/java/com/sdk/common/ApplicationHeaderInterceptor.kt index 99f9de81..d27f481e 100644 --- a/src/main/java/com/sdk/common/ApplicationHeaderInterceptor.kt +++ b/src/main/java/com/sdk/common/ApplicationHeaderInterceptor.kt @@ -35,7 +35,7 @@ class ApplicationHeaderInterceptor( header("x-currency-code", currencyCode) } if (!original.headers.names().contains("x-fp-sdk-version")) { - header("x-fp-sdk-version", "v1.4.15-beta.1") + header("x-fp-sdk-version", "1.4.15-beta.2") } val bearerToken = Base64.encodeToString( diff --git a/src/main/java/com/sdk/common/PublicHeaderInterceptor.kt b/src/main/java/com/sdk/common/PublicHeaderInterceptor.kt index e8eb9460..b21b971e 100644 --- a/src/main/java/com/sdk/common/PublicHeaderInterceptor.kt +++ b/src/main/java/com/sdk/common/PublicHeaderInterceptor.kt @@ -11,7 +11,7 @@ class PublicHeaderInterceptor( val original = chain.request() val builder = original.newBuilder() - .header("x-fp-sdk-version", "v1.4.15-beta.1") + .header("x-fp-sdk-version", "1.4.15-beta.2") publicConfig?.extraHeaders?.let { for ((key, value) in it) { builder.header(key,value) diff --git a/src/main/java/com/sdk/platform/cart/CartModels.kt b/src/main/java/com/sdk/platform/cart/CartModels.kt index fad70308..ea7c387f 100644 --- a/src/main/java/com/sdk/platform/cart/CartModels.kt +++ b/src/main/java/com/sdk/platform/cart/CartModels.kt @@ -2702,6 +2702,9 @@ data class PriceAdjustmentUpdate( @SerializedName("article_ids") var articleIds: ArrayList
?=null, + @SerializedName("auto_remove") + var autoRemove: Boolean?=null, + @SerializedName("meta") var meta: @RawValue HashMap?=null, @@ -2735,6 +2738,8 @@ data class PriceAdjustmentUpdate( + + @@ -2784,6 +2789,9 @@ data class PriceAdjustment( @SerializedName("article_ids") var articleIds: ArrayList
?=null, + @SerializedName("auto_remove") + var autoRemove: Boolean?=null, + @SerializedName("meta") var meta: @RawValue HashMap?=null, @@ -2817,6 +2825,8 @@ data class PriceAdjustment( + + @@ -2914,7 +2924,10 @@ data class PriceAdjustmentAdd( var meta: @RawValue HashMap?=null, @SerializedName("cart_id") - var cartId: String?=null + var cartId: String?=null, + + @SerializedName("auto_remove") + var autoRemove: Boolean?=null ): Parcelable { @@ -2943,6 +2956,8 @@ data class PriceAdjustmentAdd( + + diff --git a/src/main/java/com/sdk/platform/serviceability/ServiceabilityModels.kt b/src/main/java/com/sdk/platform/serviceability/ServiceabilityModels.kt index adbd9ee3..1a443375 100644 --- a/src/main/java/com/sdk/platform/serviceability/ServiceabilityModels.kt +++ b/src/main/java/com/sdk/platform/serviceability/ServiceabilityModels.kt @@ -705,6 +705,33 @@ data class ZoneProductTypes( +} + + + + +/* + Model: ZoneMappingDetailType +*/ +@Parcelize +data class ZoneMappingDetailType( + + + + @SerializedName("country") + var country: String?=null, + + @SerializedName("regions") + var regions: ArrayList?=null + +): Parcelable { + + + + + + + } @@ -721,11 +748,44 @@ data class ZoneMappingType( @SerializedName("country") var country: String?=null, - @SerializedName("pincode") - var pincode: ArrayList?=null, + @SerializedName("regions") + var regions: ArrayList?=null + +): Parcelable { + + + + + + + +} + + + + +/* + Model: ZoneMappingRegions +*/ +@Parcelize +data class ZoneMappingRegions( - @SerializedName("state") - var state: ArrayList?=null + + + @SerializedName("display_name") + var displayName: String?=null, + + @SerializedName("parent_id") + var parentId: ArrayList?=null, + + @SerializedName("parent_uid") + var parentUid: String?=null, + + @SerializedName("sub_type") + var subType: String?=null, + + @SerializedName("uid") + var uid: String?=null ): Parcelable { @@ -737,6 +797,10 @@ data class ZoneMappingType( + + + + } @@ -778,10 +842,7 @@ data class UpdateZoneData( var regionType: String?=null, @SerializedName("mapping") - var mapping: ArrayList?=null, - - @SerializedName("assignment_preference") - var assignmentPreference: String?=null + var mapping: ArrayList?=null ): Parcelable { @@ -804,8 +865,6 @@ data class UpdateZoneData( - - @@ -906,9 +965,6 @@ data class GetZoneDataViewItems( @SerializedName("mapping") var mapping: ArrayList?=null, - @SerializedName("assignment_preference") - var assignmentPreference: String?=null, - @SerializedName("stores_count") var storesCount: Int?=null @@ -935,8 +991,6 @@ data class GetZoneDataViewItems( - - @@ -1003,13 +1057,7 @@ data class GetZoneByIdSchema( var regionType: String?=null, @SerializedName("mapping") - var mapping: ArrayList?=null, - - @SerializedName("assignment_preference") - var assignmentPreference: String?=null, - - @SerializedName("stores_count") - var storesCount: Int?=null + var mapping: ArrayList?=null ): Parcelable { @@ -1030,10 +1078,6 @@ data class GetZoneByIdSchema( - - - - @@ -1070,14 +1114,14 @@ data class CreateZoneData( @SerializedName("store_ids") var storeIds: ArrayList?=null, + @SerializedName("product") + var product: ZoneProductTypes?=null, + @SerializedName("region_type") var regionType: String?=null, @SerializedName("mapping") - var mapping: ArrayList?=null, - - @SerializedName("assignment_preference") - var assignmentPreference: String?=null + var mapping: ArrayList?=null ): Parcelable { @@ -1192,10 +1236,7 @@ data class Zone( var isActive: Boolean?=null, @SerializedName("store_ids") - var storeIds: ArrayList?=null, - - @SerializedName("assignment_preference") - var assignmentPreference: String?=null + var storeIds: ArrayList?=null ): Parcelable { @@ -1215,8 +1256,6 @@ data class Zone( - - }