From cb80c9091ba4dec65aeef88149930780a1859fba Mon Sep 17 00:00:00 2001 From: Jigar Dafda Date: Thu, 7 Sep 2023 14:11:20 +0000 Subject: [PATCH] [Auto Generated] 1.3.2 --- CHANGELOG.md | 213 ++++++- build.gradle | 2 +- documentation/platform/ORDER.md | 8 +- documentation/platform/PAYMENT.md | 35 +- documentation/platform/THEME.md | 226 ------- documentation/platform/WEBHOOK.md | 26 +- .../com/sdk/common/AccessTokenInterceptor.kt | 2 +- .../common/ApplicationHeaderInterceptor.kt | 2 +- .../com/sdk/common/PublicHeaderInterceptor.kt | 2 +- .../com/sdk/platform/order/OrderModels.kt | 8 +- .../sdk/platform/payment/PaymentApiList.kt | 2 +- .../payment/PaymentDataManagerClass.kt | 4 +- .../com/sdk/platform/payment/PaymentModels.kt | 69 +++ .../com/sdk/platform/theme/ThemeModels.kt | 569 ------------------ .../com/sdk/platform/webhook/WebhookModels.kt | 31 +- 15 files changed, 383 insertions(+), 816 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f9fe2bb..73bc8cff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,215 @@ -# CHANGE LOG (1.3.0) +# CHANGE LOG (1.3.2) FP-v1.8.1 + + +## Application Client + + + +### Cart + + + +#### getCart + +- ##### What's New + - [Added] property `breakupValues.raw.mopTotal` of schema `RawBreakup` in response with status code 200 + + +#### addItems + +- ##### What's New + - [Added] property `cart.breakupValues.raw.mopTotal` of schema `RawBreakup` in response with status code 200 + + +#### updateCart + +- ##### What's New + - [Added] property `cart.breakupValues.raw.mopTotal` of schema `RawBreakup` in response with status code 200 + + +#### applyCoupon + +- ##### What's New + - [Added] property `breakupValues.raw.mopTotal` of schema `RawBreakup` in response with status code 201 + + +#### removeCoupon + +- ##### What's New + - [Added] property `breakupValues.raw.mopTotal` of schema `RawBreakup` in response with status code 200 + + +#### applyRewardPoints + +- ##### What's New + - [Added] property `breakupValues.raw.mopTotal` of schema `RawBreakup` in response with status code 200 + + +#### selectAddress + +- ##### What's New + - [Added] property `breakupValues.raw.mopTotal` of schema `RawBreakup` in response with status code 201 + + +#### selectPaymentMode + +- ##### What's New + - [Added] property `breakupValues.raw.mopTotal` of schema `RawBreakup` in response with status code 200 + + +#### getShipments + +- ##### What's New + - [Added] property `breakupValues.raw.mopTotal` of schema `RawBreakup` in response with status code 200 + + +#### checkoutCart + +- ##### What's New + - [Added] property `cart.breakupValues.raw.mopTotal` of schema `RawBreakup` in response with status code 200 + + +#### getCartSharedItems + +- ##### What's New + - [Added] property `cart.breakupValues.raw.mopTotal` of schema `RawBreakup` in response with status code 200 + - [Added] property `cart.breakupValues.raw.mopTotal` of schema `RawBreakup` in response with status code 404 + + +#### updateCartWithSharedItems + +- ##### What's New + - [Added] property `cart.breakupValues.raw.mopTotal` of schema `RawBreakup` in response with status code 200 + + +#### checkoutCartV2 + +- ##### What's New + - [Added] property `cart.breakupValues.raw.mopTotal` of schema `RawBreakup` in response with status code 200 + + +## Platform Client + + + +### Order + + + +#### getShipments + +- ##### What's Changed + - [Breaking] [Changed] Type from `string` to `number` of property `items[].bags[].gst.igstGstFee` of schema `GSTDetailsData` in response with status code 200 + - [Breaking] [Changed] Type from `string` to `number` of property `items[].bags[].gst.sgstGstFee` of schema `GSTDetailsData` in response with status code 200 + - [Breaking] [Changed] Type from `string` to `number` of property `items[].bags[].gst.cgstGstFee` of schema `GSTDetailsData` in response with status code 200 + + +#### getShipmentById + +- ##### What's Changed + - [Breaking] [Changed] Type from `string` to `number` of property `shipments[].gstDetails.igstGstFee` of schema `GSTDetailsData` in response with status code 200 + - [Breaking] [Changed] Type from `string` to `number` of property `shipments[].gstDetails.sgstGstFee` of schema `GSTDetailsData` in response with status code 200 + - [Breaking] [Changed] Type from `string` to `number` of property `shipments[].gstDetails.cgstGstFee` of schema `GSTDetailsData` in response with status code 200 + + +#### getOrderById + +- ##### What's Changed + - [Breaking] [Changed] Type from `integer` to `string` of property `order.meta.employeeId` of schema `OrderMeta` in response with status code 200 + - [Breaking] [Changed] Type from `string` to `number` of property `shipments[].gstDetails.igstGstFee` of schema `GSTDetailsData` in response with status code 200 + - [Breaking] [Changed] Type from `string` to `number` of property `shipments[].gstDetails.sgstGstFee` of schema `GSTDetailsData` in response with status code 200 + - [Breaking] [Changed] Type from `string` to `number` of property `shipments[].gstDetails.cgstGstFee` of schema `GSTDetailsData` in response with status code 200 + + +#### getOrders + +- ##### What's Changed + - [Breaking] [Changed] Type from `string` to `number` of property `items[].shipments[].gstDetails.igstGstFee` of schema `GSTDetailsData` in response with status code 200 + - [Breaking] [Changed] Type from `string` to `number` of property `items[].shipments[].gstDetails.sgstGstFee` of schema `GSTDetailsData` in response with status code 200 + - [Breaking] [Changed] Type from `string` to `number` of property `items[].shipments[].gstDetails.cgstGstFee` of schema `GSTDetailsData` in response with status code 200 + + +### Payment + + + +#### getBrandPaymentGatewayConfig + +- ##### What's New + - [Added] `query` parameter `aggregator` (type: `string`) + + - [Added] `query` parameter `configType` (type: `string`) + + + +### Theme + + + +#### getCompanyLevelThemes + +- ##### What's New + - [Added] Content in Response 401 + + +#### addMarketplaceThemeToCompany + +- ##### What's New + - [Added] Content in Response 401 + + +### Webhook + + + +#### getSubscribersByCompany + +- ##### What's Deprecated + - [Breaking] [Deleted] Possible values from `active` from property `status` of schema `SubscriberResponse` in response with status code 200 + - [Breaking] [Deleted] Possible values from `inactive` from property `status` of schema `SubscriberResponse` in response with status code 200 + - [Breaking] [Deleted] Possible values from `blocked` from property `status` of schema `SubscriberResponse` in response with status code 200 + + +#### registerSubscriberToEvent + +- ##### What's Deprecated + - [Breaking] [Deleted] Possible values from `active` from property `status` of schema `SubscriberConfig` in request body + - [Breaking] [Deleted] Possible values from `inactive` from property `status` of schema `SubscriberConfig` in request body + - [Breaking] [Deleted] Possible values from `blocked` from property `status` of schema `SubscriberConfig` in request body + - [Breaking] [Deleted] Possible values from `active` from property `status` of schema `SubscriberConfig` in response with status code 200 + - [Breaking] [Deleted] Possible values from `inactive` from property `status` of schema `SubscriberConfig` in response with status code 200 + - [Breaking] [Deleted] Possible values from `blocked` from property `status` of schema `SubscriberConfig` in response with status code 200 + + +#### updateSubscriberConfig + +- ##### What's Deprecated + - [Breaking] [Deleted] Possible values from `active` from property `status` of schema `SubscriberConfig` in request body + - [Breaking] [Deleted] Possible values from `inactive` from property `status` of schema `SubscriberConfig` in request body + - [Breaking] [Deleted] Possible values from `blocked` from property `status` of schema `SubscriberConfig` in request body + - [Breaking] [Deleted] Possible values from `active` from property `status` of schema `SubscriberConfig` in response with status code 200 + - [Breaking] [Deleted] Possible values from `inactive` from property `status` of schema `SubscriberConfig` in response with status code 200 + - [Breaking] [Deleted] Possible values from `blocked` from property `status` of schema `SubscriberConfig` in response with status code 200 + + +#### getSubscriberById + +- ##### What's Deprecated + - [Breaking] [Deleted] Possible values from `active` from property `status` of schema `SubscriberResponse` in response with status code 200 + - [Breaking] [Deleted] Possible values from `inactive` from property `status` of schema `SubscriberResponse` in response with status code 200 + - [Breaking] [Deleted] Possible values from `blocked` from property `status` of schema `SubscriberResponse` in response with status code 200 + + +#### getSubscribersByExtensionId + +- ##### What's Deprecated + - [Breaking] [Deleted] Possible values from `active` from property `items[].status` of schema `SubscriberResponse` in response with status code 200 + - [Breaking] [Deleted] Possible values from `inactive` from property `items[].status` of schema `SubscriberResponse` in response with status code 200 + - [Breaking] [Deleted] Possible values from `blocked` from property `items[].status` of schema `SubscriberResponse` in response with status code 200 + + + +# CHANGE LOG (1.3.0) FP-v1.8.0 ## Application Client diff --git a/build.gradle b/build.gradle index c52a4628..dbb6fa8d 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ android { minSdkVersion 21 targetSdkVersion 31 versionCode 2 - versionName "1.3.1" + versionName "1.3.2" multiDexEnabled true vectorDrawables.useSupportLibrary = true diff --git a/documentation/platform/ORDER.md b/documentation/platform/ORDER.md index c9a06fb4..eb76db9c 100644 --- a/documentation/platform/ORDER.md +++ b/documentation/platform/ORDER.md @@ -6989,12 +6989,12 @@ We are processing the request! | igstTaxPercentage | Double? | yes | | | gstTaxPercentage | Double? | yes | | | hsnCodeId | String? | yes | | - | igstGstFee | String? | yes | | + | igstGstFee | Double? | yes | | | isDefaultHsnCode | Boolean? | yes | | - | sgstGstFee | String? | yes | | + | sgstGstFee | Double? | yes | | | taxCollectedAtSource | Double | no | | | brandCalculatedAmount | Double | no | | - | cgstGstFee | String? | yes | | + | cgstGstFee | Double? | yes | | | gstTag | String? | yes | | | sgstTaxPercentage | Double? | yes | | | hsnCode | String? | yes | | @@ -8311,7 +8311,7 @@ We are processing the request! | orderChildEntities | ArrayList? | yes | | | orderType | String? | yes | | | orderPlatform | String? | yes | | - | employeeId | Int? | yes | | + | employeeId | String? | yes | | | orderTags | ArrayList>? | yes | | | customerNote | String? | yes | | | staff | HashMap? | yes | | diff --git a/documentation/platform/PAYMENT.md b/documentation/platform/PAYMENT.md index b8bf1626..0698fba0 100644 --- a/documentation/platform/PAYMENT.md +++ b/documentation/platform/PAYMENT.md @@ -68,7 +68,7 @@ Get All Brand Payment Gateway Config Secret ```kotlin -platformClient.application("").payment.getBrandPaymentGatewayConfig().safeAwait{ response, error-> +platformClient.application("").payment.getBrandPaymentGatewayConfig(aggregator: aggregator, configType: configType).safeAwait{ response, error-> response?.let{ // Use response } -> @@ -82,6 +82,12 @@ platformClient.application("").payment.getBrandPaymentGatewayCon +| Argument | Type | Required | Description | +| --------- | ----- | -------- | ----------- | +| aggregator | String? | no | aggregator slug | +| configType | String? | no | | + + Get All Brand Payment Gateway Config Secret @@ -6372,6 +6378,31 @@ Success. + #### [ProductCODData](#ProductCODData) + + | Properties | Type | Nullable | Description | + | ---------- | ---- | -------- | ----------- | + | items | HashMap? | yes | item id with its cod availability. | + | codCharges | HashMap? | yes | cod charges and its allowed limits. | + +--- + + + + + #### [CODChargesLimitsResponse](#CODChargesLimitsResponse) + + | Properties | Type | Nullable | Description | + | ---------- | ---- | -------- | ----------- | + | maxCartValue | Double? | yes | max allowed cart value for cod order. | + | minCartValue | Double? | yes | min allowed cart value for cod order. | + | codCharge | Double? | yes | cod charges to be applied on order. | + +--- + + + + #### [PaymentModeLogo](#PaymentModeLogo) | Properties | Type | Nullable | Description | @@ -6428,6 +6459,8 @@ Success. | logoUrl | HashMap? | yes | Logo | | cardToken | String? | yes | card_token | | aggregatorName | String | no | aggregator_name | + | codCharges | Double? | yes | cod charges to be applied on order. | + | productCodData | HashMap? | yes | product cod configurations. | | codLimit | Double? | yes | cod limit | | intentApp | ArrayList<[IntentApp](#IntentApp)>? | yes | intent_app | | nickname | String? | yes | nickname | diff --git a/documentation/platform/THEME.md b/documentation/platform/THEME.md index 6adf2cda..810888db 100644 --- a/documentation/platform/THEME.md +++ b/documentation/platform/THEME.md @@ -43990,29 +43990,6 @@ Successful upgrade - #### [GlobalConfig](#GlobalConfig) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | statics | [StaticConfig](#StaticConfig)? | yes | | - | custom | [CustomConfig](#CustomConfig)? | yes | | - ---- - - - - - #### [StaticConfig](#StaticConfig) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | props | [StaticProps](#StaticProps)? | yes | | - ---- - - - - #### [CustomConfig](#CustomConfig) | Properties | Type | Nullable | Description | @@ -44065,209 +44042,6 @@ Successful upgrade - #### [StaticProps](#StaticProps) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | colors | [Colors](#Colors)? | yes | | - | auth | [AuthConfig](#AuthConfig)? | yes | | - | palette | [PaletteConfig](#PaletteConfig)? | yes | | - ---- - - - - - #### [Colors](#Colors) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | primaryColor | String? | yes | The primary color | - | secondaryColor | String? | yes | The secondary color | - | accentColor | String? | yes | The accent color | - | linkColor | String? | yes | The link color | - | buttonSecondaryColor | String? | yes | The secondary button color | - | bgColor | String? | yes | The background color | - ---- - - - - - #### [AuthConfig](#AuthConfig) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | showHeaderAuth | Boolean? | yes | Whether to show header authentication or not | - | showFooterAuth | Boolean? | yes | Whether to show footer authentication or not | - ---- - - - - - #### [PaletteConfig](#PaletteConfig) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | generalSetting | [GeneralSetting](#GeneralSetting)? | yes | | - | advanceSetting | [AdvanceSetting](#AdvanceSetting)? | yes | | - ---- - - - - - #### [GeneralSetting](#GeneralSetting) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | theme | [ThemeSetting](#ThemeSetting)? | yes | | - | text | [TextSetting](#TextSetting)? | yes | | - | button | [ButtonSetting](#ButtonSetting)? | yes | | - | saleDiscount | [SaleDiscountSetting](#SaleDiscountSetting)? | yes | | - | header | [HeaderSetting](#HeaderSetting)? | yes | | - | footer | [FooterSetting](#FooterSetting)? | yes | | - ---- - - - - - #### [AdvanceSetting](#AdvanceSetting) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | overlayPopup | [OverlayPopupSetting](#OverlayPopupSetting)? | yes | | - | dividerStrokeHighlight | [DividerStrokeHighlightSetting](#DividerStrokeHighlightSetting)? | yes | | - | userAlerts | [UserAlertsSetting](#UserAlertsSetting)? | yes | | - ---- - - - - - #### [ThemeSetting](#ThemeSetting) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | pageBackground | String? | yes | The page background color | - | themeAccent | String? | yes | The theme accent color | - ---- - - - - - #### [TextSetting](#TextSetting) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | textHeading | String? | yes | The text heading color | - | textBody | String? | yes | The text body color | - | textLabel | String? | yes | The text label color | - | textSecondary | String? | yes | The secondary text color | - ---- - - - - - #### [ButtonSetting](#ButtonSetting) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | buttonPrimary | String? | yes | The primary button color | - | buttonSecondary | String? | yes | The secondary button color | - | buttonLink | String? | yes | The button link color | - ---- - - - - - #### [SaleDiscountSetting](#SaleDiscountSetting) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | saleBadgeBackground | String? | yes | The sale badge background color | - | saleBadgeText | String? | yes | The sale badge text color | - | saleDiscountText | String? | yes | The sale discount text color | - | saleTimer | String? | yes | The sale timer color | - ---- - - - - - #### [HeaderSetting](#HeaderSetting) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | headerBackground | String? | yes | The header background color | - | headerNav | String? | yes | The header navigation color | - | headerIcon | String? | yes | The header icon color | - ---- - - - - - #### [FooterSetting](#FooterSetting) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | footerBackground | String? | yes | The footer background color | - | footerBottomBackground | String? | yes | The footer bottom background color | - | footerHeadingText | String? | yes | The footer heading text color | - | footerBodyText | String? | yes | The footer body text color | - | footerIcon | String? | yes | The footer icon color | - ---- - - - - - #### [OverlayPopupSetting](#OverlayPopupSetting) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | dialogBackgroung | String? | yes | The dialog background color | - | overlay | String? | yes | The overlay color | - ---- - - - - - #### [DividerStrokeHighlightSetting](#DividerStrokeHighlightSetting) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | dividerStrokes | String? | yes | The divider strokes color | - | highlight | String? | yes | The highlight color | - ---- - - - - - #### [UserAlertsSetting](#UserAlertsSetting) - - | Properties | Type | Nullable | Description | - | ---------- | ---- | -------- | ----------- | - | successBackground | String? | yes | The success background color | - | successText | String? | yes | The success text color | - | errorBackground | String? | yes | The error background color | - | errorText | String? | yes | The error text color | - | infoBackground | String? | yes | The info background color | - | infoText | String? | yes | The info text color | - ---- - - - - #### [CustomProps](#CustomProps) | Properties | Type | Nullable | Description | diff --git a/documentation/platform/WEBHOOK.md b/documentation/platform/WEBHOOK.md index 9ea59056..caa73f61 100644 --- a/documentation/platform/WEBHOOK.md +++ b/documentation/platform/WEBHOOK.md @@ -2029,7 +2029,7 @@ Success | association | [Association](#Association)? | yes | | | customHeaders | HashMap? | yes | | | emailId | String? | yes | | - | status | String? | yes | active: Status is active inactive: Status is inactive blocked: Subscriber is blocked by system due to multiple failed delivery attempts. | + | status | [SubscriberStatus](#SubscriberStatus)? | yes | | | authMeta | [AuthMeta](#AuthMeta)? | yes | | | createdOn | String? | yes | | | updatedOn | String? | yes | | @@ -2075,7 +2075,7 @@ Success | webhookUrl | String? | yes | | | association | [Association](#Association)? | yes | | | customHeaders | HashMap? | yes | | - | status | String? | yes | active: Status is active inactive: Status is inactive blocked: Subscriber is blocked by system due to multiple failed delivery attempts. | + | status | [SubscriberStatus](#SubscriberStatus)? | yes | | | emailId | String? | yes | | | authMeta | [AuthMeta](#AuthMeta)? | yes | | | eventId | ArrayList? | yes | | @@ -2096,3 +2096,25 @@ Success + +### Enums + + + + + + #### [SubscriberStatus](#SubscriberStatus) + Type : string + + | Name | Value | Description | + | ---- | ----- | ----------- | + | active | active | Status is active | + | inactive | inactive | Status is inactive | + | blocked | blocked | Subscriber is blocked by system due to multiple failed delivery attempts. | + +--- + + + + + diff --git a/src/main/java/com/sdk/common/AccessTokenInterceptor.kt b/src/main/java/com/sdk/common/AccessTokenInterceptor.kt index 0f1fe919..6f9d0ee6 100644 --- a/src/main/java/com/sdk/common/AccessTokenInterceptor.kt +++ b/src/main/java/com/sdk/common/AccessTokenInterceptor.kt @@ -13,7 +13,7 @@ class AccessTokenInterceptor( val builder = original.newBuilder() .header("User-Agent", platformConfig?.userAgent ?: "") .header("Authorization", "Bearer ${platformConfig?.oauthClient?.token?.token}") - .header("x-fp-sdk-version", "1.3.1") + .header("x-fp-sdk-version", "1.3.2") platformConfig?.extraHeaders?.let { for ((key, value) in it) { builder.header(key,value) diff --git a/src/main/java/com/sdk/common/ApplicationHeaderInterceptor.kt b/src/main/java/com/sdk/common/ApplicationHeaderInterceptor.kt index 864386e6..c9ce5af2 100644 --- a/src/main/java/com/sdk/common/ApplicationHeaderInterceptor.kt +++ b/src/main/java/com/sdk/common/ApplicationHeaderInterceptor.kt @@ -24,7 +24,7 @@ class ApplicationHeaderInterceptor( } header("Accept-Language", languageCode) header("x-currency-code", currencyCode) - header("x-fp-sdk-version", "1.3.1") + header("x-fp-sdk-version", "1.3.2") val bearerToken = Base64.encodeToString( "$applicationId:$applicationToken".toByteArray(), diff --git a/src/main/java/com/sdk/common/PublicHeaderInterceptor.kt b/src/main/java/com/sdk/common/PublicHeaderInterceptor.kt index 47953206..a4f0cc66 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", "1.3.1") + .header("x-fp-sdk-version", "1.3.2") publicConfig?.extraHeaders?.let { for ((key, value) in it) { builder.header(key,value) diff --git a/src/main/java/com/sdk/platform/order/OrderModels.kt b/src/main/java/com/sdk/platform/order/OrderModels.kt index 1633a565..74b1747e 100644 --- a/src/main/java/com/sdk/platform/order/OrderModels.kt +++ b/src/main/java/com/sdk/platform/order/OrderModels.kt @@ -5550,13 +5550,13 @@ data class GSTDetailsData( var hsnCodeId: String?=null, @SerializedName("igst_gst_fee") - var igstGstFee: String?=null, + var igstGstFee: Double?=null, @SerializedName("is_default_hsn_code") var isDefaultHsnCode: Boolean?=null, @SerializedName("sgst_gst_fee") - var sgstGstFee: String?=null, + var sgstGstFee: Double?=null, @SerializedName("tax_collected_at_source") var taxCollectedAtSource: Double?=null, @@ -5565,7 +5565,7 @@ data class GSTDetailsData( var brandCalculatedAmount: Double?=null, @SerializedName("cgst_gst_fee") - var cgstGstFee: String?=null, + var cgstGstFee: Double?=null, @SerializedName("gst_tag") var gstTag: String?=null, @@ -9874,7 +9874,7 @@ data class OrderMeta( var orderPlatform: String?=null, @SerializedName("employee_id") - var employeeId: Int?=null, + var employeeId: String?=null, @SerializedName("order_tags") var orderTags: @RawValue ArrayList>?=null, diff --git a/src/main/java/com/sdk/platform/payment/PaymentApiList.kt b/src/main/java/com/sdk/platform/payment/PaymentApiList.kt index ffe7797b..d93a45cb 100644 --- a/src/main/java/com/sdk/platform/payment/PaymentApiList.kt +++ b/src/main/java/com/sdk/platform/payment/PaymentApiList.kt @@ -9,7 +9,7 @@ import com.sdk.platform.* interface PaymentApiList { @GET ("/service/platform/payment/v1.0/company/{company_id}/application/{application_id}/aggregator/request") - suspend fun getBrandPaymentGatewayConfig(@Path("company_id") companyId: String, @Path("application_id") applicationId: String) + suspend fun getBrandPaymentGatewayConfig(@Path("company_id") companyId: String, @Path("application_id") applicationId: String, @Query("aggregator") aggregator: String?, @Query("config_type") configType: String?) : Response @POST ("/service/platform/payment/v1.0/company/{company_id}/application/{application_id}/aggregator/request") diff --git a/src/main/java/com/sdk/platform/payment/PaymentDataManagerClass.kt b/src/main/java/com/sdk/platform/payment/PaymentDataManagerClass.kt index e5bfd855..982c047b 100644 --- a/src/main/java/com/sdk/platform/payment/PaymentDataManagerClass.kt +++ b/src/main/java/com/sdk/platform/payment/PaymentDataManagerClass.kt @@ -207,10 +207,10 @@ inner class ApplicationClient(val applicationId:String,val config: PlatformConfi - suspend fun getBrandPaymentGatewayConfig() + suspend fun getBrandPaymentGatewayConfig(aggregator: String?=null, configType: String?=null) : Response? { return if (config.oauthClient.isAccessTokenValid()) { - paymentApiList?.getBrandPaymentGatewayConfig(companyId = config.companyId , applicationId = applicationId ) + paymentApiList?.getBrandPaymentGatewayConfig(companyId = config.companyId , applicationId = applicationId , aggregator = aggregator, configType = configType ) } else { null } diff --git a/src/main/java/com/sdk/platform/payment/PaymentModels.kt b/src/main/java/com/sdk/platform/payment/PaymentModels.kt index 2e9a7165..da16c4ad 100644 --- a/src/main/java/com/sdk/platform/payment/PaymentModels.kt +++ b/src/main/java/com/sdk/platform/payment/PaymentModels.kt @@ -269,6 +269,65 @@ data class IntentAppErrorList( +} + + + + +/* + Model: ProductCODData +*/ +@Parcelize +data class ProductCODData( + + + + @SerializedName("items") + var items: @RawValue HashMap?=null, + + @SerializedName("cod_charges") + var codCharges: @RawValue HashMap?=null + +): Parcelable { + + + + + + + +} + + + + +/* + Model: CODChargesLimitsResponse +*/ +@Parcelize +data class CODChargesLimitsResponse( + + + + @SerializedName("max_cart_value") + var maxCartValue: Double?=null, + + @SerializedName("min_cart_value") + var minCartValue: Double?=null, + + @SerializedName("cod_charge") + var codCharge: Double?=null + +): Parcelable { + + + + + + + + + } @@ -424,6 +483,12 @@ data class PaymentModeList( @SerializedName("aggregator_name") var aggregatorName: String?=null, + @SerializedName("cod_charges") + var codCharges: Double?=null, + + @SerializedName("product_cod_data") + var productCodData: @RawValue HashMap?=null, + @SerializedName("cod_limit") var codLimit: Double?=null, @@ -510,6 +575,10 @@ data class PaymentModeList( + + + + diff --git a/src/main/java/com/sdk/platform/theme/ThemeModels.kt b/src/main/java/com/sdk/platform/theme/ThemeModels.kt index 8efa8b4e..1e7042bb 100644 --- a/src/main/java/com/sdk/platform/theme/ThemeModels.kt +++ b/src/main/java/com/sdk/platform/theme/ThemeModels.kt @@ -1053,55 +1053,6 @@ data class ThemeConfiguration( -} - - - - -/* - Model: GlobalConfig -*/ -@Parcelize -data class GlobalConfig( - - - - @SerializedName("statics") - var statics: StaticConfig?=null, - - @SerializedName("custom") - var custom: CustomConfig?=null - -): Parcelable { - - - - - - - -} - - - - -/* - Model: StaticConfig -*/ -@Parcelize -data class StaticConfig( - - - - @SerializedName("props") - var props: StaticProps?=null - -): Parcelable { - - - - - } @@ -1230,526 +1181,6 @@ data class Images( -} - - - - -/* - Model: StaticProps -*/ -@Parcelize -data class StaticProps( - - - - @SerializedName("colors") - var colors: Colors?=null, - - @SerializedName("auth") - var auth: AuthConfig?=null, - - @SerializedName("palette") - var palette: PaletteConfig?=null - -): Parcelable { - - - - - - - - - -} - - - - -/* - Model: Colors -*/ -@Parcelize -data class Colors( - - - - @SerializedName("primary_color") - var primaryColor: String?=null, - - @SerializedName("secondary_color") - var secondaryColor: String?=null, - - @SerializedName("accent_color") - var accentColor: String?=null, - - @SerializedName("link_color") - var linkColor: String?=null, - - @SerializedName("button_secondary_color") - var buttonSecondaryColor: String?=null, - - @SerializedName("bg_color") - var bgColor: String?=null - -): Parcelable { - - - - - - - - - - - - - - - -} - - - - -/* - Model: AuthConfig -*/ -@Parcelize -data class AuthConfig( - - - - @SerializedName("show_header_auth") - var showHeaderAuth: Boolean?=null, - - @SerializedName("show_footer_auth") - var showFooterAuth: Boolean?=null - -): Parcelable { - - - - - - - -} - - - - -/* - Model: PaletteConfig -*/ -@Parcelize -data class PaletteConfig( - - - - @SerializedName("general_setting") - var generalSetting: GeneralSetting?=null, - - @SerializedName("advance_setting") - var advanceSetting: AdvanceSetting?=null - -): Parcelable { - - - - - - - -} - - - - -/* - Model: GeneralSetting -*/ -@Parcelize -data class GeneralSetting( - - - - @SerializedName("theme") - var theme: ThemeSetting?=null, - - @SerializedName("text") - var text: TextSetting?=null, - - @SerializedName("button") - var button: ButtonSetting?=null, - - @SerializedName("sale_discount") - var saleDiscount: SaleDiscountSetting?=null, - - @SerializedName("header") - var header: HeaderSetting?=null, - - @SerializedName("footer") - var footer: FooterSetting?=null - -): Parcelable { - - - - - - - - - - - - - - - -} - - - - -/* - Model: AdvanceSetting -*/ -@Parcelize -data class AdvanceSetting( - - - - @SerializedName("overlay_popup") - var overlayPopup: OverlayPopupSetting?=null, - - @SerializedName("divider_stroke_highlight") - var dividerStrokeHighlight: DividerStrokeHighlightSetting?=null, - - @SerializedName("user_alerts") - var userAlerts: UserAlertsSetting?=null - -): Parcelable { - - - - - - - - - -} - - - - -/* - Model: ThemeSetting -*/ -@Parcelize -data class ThemeSetting( - - - - @SerializedName("page_background") - var pageBackground: String?=null, - - @SerializedName("theme_accent") - var themeAccent: String?=null - -): Parcelable { - - - - - - - -} - - - - -/* - Model: TextSetting -*/ -@Parcelize -data class TextSetting( - - - - @SerializedName("text_heading") - var textHeading: String?=null, - - @SerializedName("text_body") - var textBody: String?=null, - - @SerializedName("text_label") - var textLabel: String?=null, - - @SerializedName("text_secondary") - var textSecondary: String?=null - -): Parcelable { - - - - - - - - - - - -} - - - - -/* - Model: ButtonSetting -*/ -@Parcelize -data class ButtonSetting( - - - - @SerializedName("button_primary") - var buttonPrimary: String?=null, - - @SerializedName("button_secondary") - var buttonSecondary: String?=null, - - @SerializedName("button_link") - var buttonLink: String?=null - -): Parcelable { - - - - - - - - - -} - - - - -/* - Model: SaleDiscountSetting -*/ -@Parcelize -data class SaleDiscountSetting( - - - - @SerializedName("sale_badge_background") - var saleBadgeBackground: String?=null, - - @SerializedName("sale_badge_text") - var saleBadgeText: String?=null, - - @SerializedName("sale_discount_text") - var saleDiscountText: String?=null, - - @SerializedName("sale_timer") - var saleTimer: String?=null - -): Parcelable { - - - - - - - - - - - -} - - - - -/* - Model: HeaderSetting -*/ -@Parcelize -data class HeaderSetting( - - - - @SerializedName("header_background") - var headerBackground: String?=null, - - @SerializedName("header_nav") - var headerNav: String?=null, - - @SerializedName("header_icon") - var headerIcon: String?=null - -): Parcelable { - - - - - - - - - -} - - - - -/* - Model: FooterSetting -*/ -@Parcelize -data class FooterSetting( - - - - @SerializedName("footer_background") - var footerBackground: String?=null, - - @SerializedName("footer_bottom_background") - var footerBottomBackground: String?=null, - - @SerializedName("footer_heading_text") - var footerHeadingText: String?=null, - - @SerializedName("footer_body_text") - var footerBodyText: String?=null, - - @SerializedName("footer_icon") - var footerIcon: String?=null - -): Parcelable { - - - - - - - - - - - - - -} - - - - -/* - Model: OverlayPopupSetting -*/ -@Parcelize -data class OverlayPopupSetting( - - - - @SerializedName("dialog_backgroung") - var dialogBackgroung: String?=null, - - @SerializedName("overlay") - var overlay: String?=null - -): Parcelable { - - - - - - - -} - - - - -/* - Model: DividerStrokeHighlightSetting -*/ -@Parcelize -data class DividerStrokeHighlightSetting( - - - - @SerializedName("divider_strokes") - var dividerStrokes: String?=null, - - @SerializedName("highlight") - var highlight: String?=null - -): Parcelable { - - - - - - - -} - - - - -/* - Model: UserAlertsSetting -*/ -@Parcelize -data class UserAlertsSetting( - - - - @SerializedName("success_background") - var successBackground: String?=null, - - @SerializedName("success_text") - var successText: String?=null, - - @SerializedName("error_background") - var errorBackground: String?=null, - - @SerializedName("error_text") - var errorText: String?=null, - - @SerializedName("info_background") - var infoBackground: String?=null, - - @SerializedName("info_text") - var infoText: String?=null - -): Parcelable { - - - - - - - - - - - - - - - } diff --git a/src/main/java/com/sdk/platform/webhook/WebhookModels.kt b/src/main/java/com/sdk/platform/webhook/WebhookModels.kt index 78d4a4a1..aa4e9a21 100644 --- a/src/main/java/com/sdk/platform/webhook/WebhookModels.kt +++ b/src/main/java/com/sdk/platform/webhook/WebhookModels.kt @@ -978,7 +978,7 @@ data class SubscriberResponse( var emailId: String?=null, @SerializedName("status") - var status: String?=null, + var status: SubscriberStatus?=null, @SerializedName("auth_meta") var authMeta: AuthMeta?=null, @@ -1111,7 +1111,7 @@ data class SubscriberConfig( var customHeaders: @RawValue HashMap?=null, @SerializedName("status") - var status: String?=null, + var status: SubscriberStatus?=null, @SerializedName("email_id") var emailId: String?=null, @@ -1177,3 +1177,30 @@ data class SubscriberConfigList( + + + /* + Enum: SubscriberStatus + Used By: Webhook + */ + enum class SubscriberStatus(val value:String){ + + @SerializedName("active") + active("active"), + + @SerializedName("inactive") + inactive("inactive"), + + @SerializedName("blocked") + blocked("blocked"); + + + companion object { + fun valueOfSubscriberStatus(value : String): SubscriberStatus? { + return SubscriberStatus.values().find { + it.value == value + } + } + } + } +