[Auto Generated] 1.3.3-beta.3

gofynd · Sep 15, 2023 · c0f18e9 · c0f18e9
1 parent 838c92d
commit c0f18e9
Show file tree

Hide file tree

Showing 12 changed files with 2,459 additions and 71 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git 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:1.3.3-beta.1'` in your app build.gradle 
+1. Add the dependency in your app build.gradle `implementation 'com.github.gofynd:fdk-client-kotlin:1.3.3-beta.3'` 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
@@ -26,7 +26,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 31
         versionCode 2
-        versionName "1.3.3-beta.1"
+        versionName "1.3.3-beta.3"
         multiDexEnabled true
 
         vectorDrawables.useSupportLibrary = true

diff --git a/documentation/platform/CART.md b/documentation/platform/CART.md
@@ -127,49 +127,51 @@ Coupon List for sent page_size and page_no
 ```json
 {
   "value": {
-    "items": {
-      "_id": "5e1d9bec6d6b7e000146c840",
-      "rule": [],
-      "identifiers": {},
-      "validity": {
-        "priority": 0
-      },
-      "type_slug": "bundle_quantity_absolute",
-      "display_meta": {
-        "title": "percent50 title"
-      },
-      "_schedule": {
-        "next_schedule": [
-          {
-            "start": "2020-01-14T10:45:03.600000+00:00",
-            "end": "2020-01-16T10:45:03+00:00"
-          }
-        ],
-        "duration": null,
-        "start": "2020-01-14T10:45:03.600000+00:00",
-        "end": "2020-01-16T10:45:03+00:00",
-        "cron": ""
-      },
-      "state": {
-        "is_public": true,
-        "is_display": true,
-        "is_archived": false
-      },
-      "ownership": {
-        "payable_category": "seller",
-        "payable_by": ""
-      },
-      "code": "percent50",
-      "rule_definition": {
-        "type": "percentage",
-        "scope": [
-          "category_id"
-        ],
-        "applicable_on": "quantity",
-        "calculate_on": "esp",
-        "value_type": "percentage"
+    "items": [
+      {
+        "_id": "5e1d9bec6d6b7e000146c840",
+        "rule": [],
+        "identifiers": {},
+        "validity": {
+          "priority": 0
+        },
+        "type_slug": "bundle_quantity_absolute",
+        "display_meta": {
+          "title": "percent50 title"
+        },
+        "_schedule": {
+          "next_schedule": [
+            {
+              "start": "2020-01-14T10:45:03.600000+00:00",
+              "end": "2020-01-16T10:45:03+00:00"
+            }
+          ],
+          "duration": null,
+          "start": "2020-01-14T10:45:03.600000+00:00",
+          "end": "2020-01-16T10:45:03+00:00",
+          "cron": ""
+        },
+        "state": {
+          "is_public": true,
+          "is_display": true,
+          "is_archived": false
+        },
+        "ownership": {
+          "payable_category": "seller",
+          "payable_by": ""
+        },
+        "code": "percent50",
+        "rule_definition": {
+          "type": "percentage",
+          "scope": [
+            "category_id"
+          ],
+          "applicable_on": "quantity",
+          "calculate_on": "esp",
+          "value_type": "percentage"
+        }
       }
-    },
+    ],
     "page": {
       "type": "",
       "has_next": true,
@@ -13279,6 +13281,7 @@ Success. Returns a Cart object as shown below. Refer `CartDetailResponse` for mo
  | identifiers | [Identifier](#Identifier) |  no  |  |
  | validity | [Validity](#Validity) |  no  |  |
  | ruleDefinition | [RuleDefinition](#RuleDefinition) |  no  |  |
+ | id | String? |  yes  | Coupon id |
 
 ---
 
@@ -13308,7 +13311,7 @@ Success. Returns a Cart object as shown below. Refer `CartDetailResponse` for mo
 
  | Properties | Type | Nullable | Description |
  | ---------- | ---- | -------- | ----------- |
- | items | [CouponAdd](#CouponAdd)? |  yes  |  |
+ | items | ArrayList<[CouponAdd](#CouponAdd)>? |  yes  |  |
  | page | [Page](#Page)? |  yes  |  |
 
 ---

diff --git a/documentation/platform/ORDER.md b/documentation/platform/ORDER.md
@@ -2395,7 +2395,7 @@ Shipment Tracking updated successfully
 
 
 ```kotlin
-platformClient.order.getShipments(lane: lane, bagStatus: bagStatus, statusOverrideLane: statusOverrideLane, timeToDispatch: timeToDispatch, searchType: searchType, searchValue: searchValue, fromDate: fromDate, toDate: toDate, dpIds: dpIds, stores: stores, salesChannels: salesChannels, pageNo: pageNo, pageSize: pageSize, fetchActiveShipment: fetchActiveShipment, excludeLockedShipments: excludeLockedShipments, paymentMethods: paymentMethods, channelShipmentId: channelShipmentId, channelOrderId: channelOrderId, customMeta: customMeta, orderingChannel: orderingChannel, companyAffiliateTag: companyAffiliateTag, myOrders: myOrders, platformUserId: platformUserId, sortType: sortType, showCrossCompanyData: showCrossCompanyData, tags: tags, customerId: customerId).safeAwait{ response, error->
+platformClient.order.getShipments(lane: lane, bagStatus: bagStatus, statusOverrideLane: statusOverrideLane, timeToDispatch: timeToDispatch, searchType: searchType, searchValue: searchValue, fromDate: fromDate, toDate: toDate, dpIds: dpIds, stores: stores, salesChannels: salesChannels, pageNo: pageNo, pageSize: pageSize, fetchActiveShipment: fetchActiveShipment, excludeLockedShipments: excludeLockedShipments, paymentMethods: paymentMethods, channelShipmentId: channelShipmentId, channelOrderId: channelOrderId, customMeta: customMeta, orderingChannel: orderingChannel, companyAffiliateTag: companyAffiliateTag, myOrders: myOrders, platformUserId: platformUserId, sortType: sortType, showCrossCompanyData: showCrossCompanyData, tags: tags, customerId: customerId, orderType: orderType).safeAwait{ response, error->
     response?.let{
       // Use response
     } ->
@@ -2437,7 +2437,8 @@ platformClient.order.getShipments(lane: lane, bagStatus: bagStatus, statusOverri
 | sortType | String? | no | Sort the result data on basis of input |   
 | showCrossCompanyData | Boolean? | no | Flag to view cross & non-cross company order |   
 | tags | String? | no | Comma separated values of tags |   
-| customerId | String? | no |  |  
+| customerId | String? | no |  |   
+| orderType | String? | no |  |  
 
 
 
@@ -3670,7 +3671,7 @@ We are processing the report!
 
 
 ```kotlin
-platformClient.order.getLaneConfig(superLane: superLane, groupEntity: groupEntity, fromDate: fromDate, toDate: toDate, dpIds: dpIds, stores: stores, salesChannels: salesChannels, paymentMode: paymentMode, bagStatus: bagStatus, searchType: searchType, searchValue: searchValue, tags: tags, timeToDispatch: timeToDispatch, paymentMethods: paymentMethods, myOrders: myOrders, showCrossCompanyData: showCrossCompanyData).safeAwait{ response, error->
+platformClient.order.getLaneConfig(superLane: superLane, groupEntity: groupEntity, fromDate: fromDate, toDate: toDate, dpIds: dpIds, stores: stores, salesChannels: salesChannels, paymentMode: paymentMode, bagStatus: bagStatus, searchType: searchType, searchValue: searchValue, tags: tags, timeToDispatch: timeToDispatch, paymentMethods: paymentMethods, myOrders: myOrders, showCrossCompanyData: showCrossCompanyData, orderType: orderType).safeAwait{ response, error->
     response?.let{
       // Use response
     } ->
@@ -3701,7 +3702,8 @@ platformClient.order.getLaneConfig(superLane: superLane, groupEntity: groupEntit
 | timeToDispatch | String? | no |  |   
 | paymentMethods | String? | no |  |   
 | myOrders | Boolean? | no |  |   
-| showCrossCompanyData | Boolean? | no | Flag to view cross & non-cross company order |  
+| showCrossCompanyData | Boolean? | no | Flag to view cross & non-cross company order |   
+| orderType | String? | no |  |  
 
 
 
@@ -3818,7 +3820,7 @@ Response containing count of shipments of the given status
 
 
 ```kotlin
-platformClient.order.getOrders(lane: lane, searchType: searchType, bagStatus: bagStatus, timeToDispatch: timeToDispatch, paymentMethods: paymentMethods, tags: tags, searchValue: searchValue, fromDate: fromDate, toDate: toDate, dpIds: dpIds, stores: stores, salesChannels: salesChannels, pageNo: pageNo, pageSize: pageSize, isPrioritySort: isPrioritySort, customMeta: customMeta, myOrders: myOrders, showCrossCompanyData: showCrossCompanyData, customerId: customerId).safeAwait{ response, error->
+platformClient.order.getOrders(lane: lane, searchType: searchType, bagStatus: bagStatus, timeToDispatch: timeToDispatch, paymentMethods: paymentMethods, tags: tags, searchValue: searchValue, fromDate: fromDate, toDate: toDate, dpIds: dpIds, stores: stores, salesChannels: salesChannels, pageNo: pageNo, pageSize: pageSize, isPrioritySort: isPrioritySort, customMeta: customMeta, myOrders: myOrders, showCrossCompanyData: showCrossCompanyData, customerId: customerId, orderType: orderType).safeAwait{ response, error->
     response?.let{
       // Use response
     } ->
@@ -3852,7 +3854,8 @@ platformClient.order.getOrders(lane: lane, searchType: searchType, bagStatus: ba
 | customMeta | String? | no |  |   
 | myOrders | Boolean? | no |  |   
 | showCrossCompanyData | Boolean? | no | Flag to view cross & non-cross company order |   
-| customerId | String? | no |  |  
+| customerId | String? | no |  |   
+| orderType | String? | no |  |  
 
 
 
@@ -7507,6 +7510,7 @@ We are processing the request!
  | customerNote | String? |  yes  |  |
  | totalBags | Int |  no  |  |
  | shipmentCreatedAt | String |  no  |  |
+ | modeOfPayment | String? |  yes  |  |
 
 ---
 
@@ -7792,6 +7796,7 @@ We are processing the request!
  | forwardAffiliateOrderId | String? |  yes  |  |
  | returnAffiliateOrderId | String? |  yes  |  |
  | bagWeight | HashMap<String,Any>? |  yes  |  |
+ | refundTo | String? |  yes  |  |
 
 ---
 
@@ -8106,6 +8111,7 @@ We are processing the request!
  | currentStatus | [CurrentStatus](#CurrentStatus)? |  yes  |  |
  | bagId | Int |  no  |  |
  | entityType | String? |  yes  |  |
+ | isParent | Boolean? |  yes  |  |
 
 ---
 
@@ -8222,6 +8228,8 @@ We are processing the request!
  | shipmentUpdateTime | Double? |  yes  |  |
  | rtoAddress | [PlatformDeliveryAddress](#PlatformDeliveryAddress)? |  yes  |  |
  | creditNoteId | String? |  yes  |  |
+ | isSelfShip | Boolean? |  yes  |  |
+ | modeOfPayment | String? |  yes  |  |
 
 ---
 
@@ -8323,6 +8331,7 @@ We are processing the request!
  | customerNote | String? |  yes  |  |
  | staff | HashMap<String,Any>? |  yes  |  |
  | cartId | Int? |  yes  |  |
+ | cartObjectId | String? |  yes  |  |
 
 ---
 

diff --git 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.3-beta.1")
+            .header("x-fp-sdk-version", "1.3.3-beta.3")
 	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
@@ -24,7 +24,7 @@ class ApplicationHeaderInterceptor(
             }
             header("Accept-Language", languageCode)
             header("x-currency-code", currencyCode)
-            header("x-fp-sdk-version", "1.3.3-beta.1")
+            header("x-fp-sdk-version", "1.3.3-beta.3")
             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
@@ -11,7 +11,7 @@ class PublicHeaderInterceptor(
         val original = chain.request()
 
         val builder = original.newBuilder()
-            .header("x-fp-sdk-version", "1.3.3-beta.1")
+            .header("x-fp-sdk-version", "1.3.3-beta.3")
 	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
@@ -809,7 +809,10 @@ data class CouponAdd(
     var validity: Validity?=null,
 
     @SerializedName("rule_definition")
-    var ruleDefinition: RuleDefinition?=null
+    var ruleDefinition: RuleDefinition?=null,
+
+    @SerializedName("_id")
+    var id: String?=null
 
 ): Parcelable {
 
@@ -844,6 +847,8 @@ data class CouponAdd(
 
 
 
+
+
 
 
 
@@ -913,7 +918,7 @@ data class CouponsResponse(
 
 
     @SerializedName("items")
-    var items: CouponAdd?=null,
+    var items: ArrayList<CouponAdd>?=null,
 
     @SerializedName("page")
     var page: Page?=null

diff --git a/src/main/java/com/sdk/platform/order/OrderApiList.kt b/src/main/java/com/sdk/platform/order/OrderApiList.kt
@@ -133,7 +133,7 @@ interface OrderApiList {
     : Response<CourierPartnerTrackingDetails>
 
     @GET ("/service/platform/order/v1.0/company/{company_id}/shipments-listing")
-    suspend fun getShipments(@Path("company_id") companyId: String, @Query("lane") lane: String?, @Query("bag_status") bagStatus: String?, @Query("status_override_lane") statusOverrideLane: Boolean?, @Query("time_to_dispatch") timeToDispatch: Double?, @Query("search_type") searchType: String?, @Query("search_value") searchValue: String?, @Query("from_date") fromDate: String?, @Query("to_date") toDate: String?, @Query("dp_ids") dpIds: String?, @Query("stores") stores: String?, @Query("sales_channels") salesChannels: String?, @Query("page_no") pageNo: Int?, @Query("page_size") pageSize: Int?, @Query("fetch_active_shipment") fetchActiveShipment: Boolean?, @Query("exclude_locked_shipments") excludeLockedShipments: Boolean?, @Query("payment_methods") paymentMethods: String?, @Query("channel_shipment_id") channelShipmentId: String?, @Query("channel_order_id") channelOrderId: String?, @Query("custom_meta") customMeta: String?, @Query("ordering_channel") orderingChannel: String?, @Query("company_affiliate_tag") companyAffiliateTag: String?, @Query("my_orders") myOrders: Boolean?, @Query("platform_user_id") platformUserId: String?, @Query("sort_type") sortType: String?, @Query("show_cross_company_data") showCrossCompanyData: Boolean?, @Query("tags") tags: String?, @Query("customer_id") customerId: String?)
+    suspend fun getShipments(@Path("company_id") companyId: String, @Query("lane") lane: String?, @Query("bag_status") bagStatus: String?, @Query("status_override_lane") statusOverrideLane: Boolean?, @Query("time_to_dispatch") timeToDispatch: Double?, @Query("search_type") searchType: String?, @Query("search_value") searchValue: String?, @Query("from_date") fromDate: String?, @Query("to_date") toDate: String?, @Query("dp_ids") dpIds: String?, @Query("stores") stores: String?, @Query("sales_channels") salesChannels: String?, @Query("page_no") pageNo: Int?, @Query("page_size") pageSize: Int?, @Query("fetch_active_shipment") fetchActiveShipment: Boolean?, @Query("exclude_locked_shipments") excludeLockedShipments: Boolean?, @Query("payment_methods") paymentMethods: String?, @Query("channel_shipment_id") channelShipmentId: String?, @Query("channel_order_id") channelOrderId: String?, @Query("custom_meta") customMeta: String?, @Query("ordering_channel") orderingChannel: String?, @Query("company_affiliate_tag") companyAffiliateTag: String?, @Query("my_orders") myOrders: Boolean?, @Query("platform_user_id") platformUserId: String?, @Query("sort_type") sortType: String?, @Query("show_cross_company_data") showCrossCompanyData: Boolean?, @Query("tags") tags: String?, @Query("customer_id") customerId: String?, @Query("order_type") orderType: String?)
     : Response<ShipmentInternalPlatformViewResponse>
 
     @GET ("/service/platform/order/v1.0/company/{company_id}/shipment-details")
@@ -145,11 +145,11 @@ interface OrderApiList {
     : Response<OrderDetailsResponse>
 
     @GET ("/service/platform/order/v1.0/company/{company_id}/lane-config/")
-    suspend fun getLaneConfig(@Path("company_id") companyId: String, @Query("super_lane") superLane: String?, @Query("group_entity") groupEntity: String?, @Query("from_date") fromDate: String?, @Query("to_date") toDate: String?, @Query("dp_ids") dpIds: String?, @Query("stores") stores: String?, @Query("sales_channels") salesChannels: String?, @Query("payment_mode") paymentMode: String?, @Query("bag_status") bagStatus: String?, @Query("search_type") searchType: String?, @Query("search_value") searchValue: String?, @Query("tags") tags: String?, @Query("time_to_dispatch") timeToDispatch: String?, @Query("payment_methods") paymentMethods: String?, @Query("my_orders") myOrders: Boolean?, @Query("show_cross_company_data") showCrossCompanyData: Boolean?)
+    suspend fun getLaneConfig(@Path("company_id") companyId: String, @Query("super_lane") superLane: String?, @Query("group_entity") groupEntity: String?, @Query("from_date") fromDate: String?, @Query("to_date") toDate: String?, @Query("dp_ids") dpIds: String?, @Query("stores") stores: String?, @Query("sales_channels") salesChannels: String?, @Query("payment_mode") paymentMode: String?, @Query("bag_status") bagStatus: String?, @Query("search_type") searchType: String?, @Query("search_value") searchValue: String?, @Query("tags") tags: String?, @Query("time_to_dispatch") timeToDispatch: String?, @Query("payment_methods") paymentMethods: String?, @Query("my_orders") myOrders: Boolean?, @Query("show_cross_company_data") showCrossCompanyData: Boolean?, @Query("order_type") orderType: String?)
     : Response<LaneConfigResponse>
 
     @GET ("/service/platform/order/v1.0/company/{company_id}/orders-listing")
-    suspend fun getOrders(@Path("company_id") companyId: String, @Query("lane") lane: String?, @Query("search_type") searchType: String?, @Query("bag_status") bagStatus: String?, @Query("time_to_dispatch") timeToDispatch: String?, @Query("payment_methods") paymentMethods: String?, @Query("tags") tags: String?, @Query("search_value") searchValue: String?, @Query("from_date") fromDate: String?, @Query("to_date") toDate: String?, @Query("dp_ids") dpIds: String?, @Query("stores") stores: String?, @Query("sales_channels") salesChannels: String?, @Query("page_no") pageNo: Int?, @Query("page_size") pageSize: Int?, @Query("is_priority_sort") isPrioritySort: Boolean?, @Query("custom_meta") customMeta: String?, @Query("my_orders") myOrders: Boolean?, @Query("show_cross_company_data") showCrossCompanyData: Boolean?, @Query("customer_id") customerId: String?)
+    suspend fun getOrders(@Path("company_id") companyId: String, @Query("lane") lane: String?, @Query("search_type") searchType: String?, @Query("bag_status") bagStatus: String?, @Query("time_to_dispatch") timeToDispatch: String?, @Query("payment_methods") paymentMethods: String?, @Query("tags") tags: String?, @Query("search_value") searchValue: String?, @Query("from_date") fromDate: String?, @Query("to_date") toDate: String?, @Query("dp_ids") dpIds: String?, @Query("stores") stores: String?, @Query("sales_channels") salesChannels: String?, @Query("page_no") pageNo: Int?, @Query("page_size") pageSize: Int?, @Query("is_priority_sort") isPrioritySort: Boolean?, @Query("custom_meta") customMeta: String?, @Query("my_orders") myOrders: Boolean?, @Query("show_cross_company_data") showCrossCompanyData: Boolean?, @Query("customer_id") customerId: String?, @Query("order_type") orderType: String?)
     : Response<OrderListingResponse>
 
     @GET ("/service/platform/order/v1.0/company/{company_id}/application/{application_id}/orders/shipments/{shipment_id}/track")