Changes on the url's of the public endpoints

.editorconfig

@@ -0,0 +1,13 @@
+# editorconfig.org
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

admin/navigation.json

@@ -1,15 +1,34 @@
-{
-  "section": "orders",
-  "titleId": "admin/return-app.navigation.label",
-  "path": "/admin/returns/requests",
-  "subSectionItems": [
-    {
-      "labelId": "navigation.labelRequests",
-      "path": "/admin/returns/requests"
-    },
-    {
-      "labelId": "admin/return-app.settings.navigation.label",
-      "path": "/admin/returns/settings"
-    }
-  ]
-}
+[
+  {
+    "section": "orders",
+    "titleId": "admin/return-app.navigation.label",
+    "path": "/admin/returns/requests",
+    "subSectionItems": [
+      {
+        "labelId": "navigation.labelRequests",
+        "path": "/admin/returns/requests"
+      },
+      {
+        "labelId": "admin/return-app.settings.navigation.label",
+        "path": "/admin/returns/settings"
+      }
+    ]
+  },
+  {
+    "section": "orders",
+    "subSection": "Return",
+    "adminVersion": 4,
+    "titleId": "admin/return-app.navigation.label",
+    "path": "/admin/returns/requests",
+    "subSectionItems": [
+      {
+        "labelId": "navigation.labelRequests",
+        "path": "/admin/returns/requests"
+      },
+      {
+        "labelId": "admin/return-app.settings.navigation.label",
+        "path": "/admin/returns/settings"
+      }
+    ]
+  }
+]

admin/routes.json

@@ -3,10 +3,26 @@
     "component": "AdminReturnList",
     "path": "/admin/app/returns/requests/"
   },
+  "admin.app.return-settings-list": {
+    "component": "AdminSettingReturnList",
+    "path": "/admin/app/returns/sellers/settings/"
+  },
+  "admin.app.return-setting-details": {
+    "component": "AdminSettingDetail",
+    "path": "/admin/app/returns/sellers/settings/:id/details/"
+  },
   "admin.app.return-settings": {
     "component": "AdminReturnSettings",
     "path": "/admin/app/returns/settings/"
   },
+  "admin.app.return-add": {
+    "component": "AdminReturnAdd",
+    "path": "/admin/app/returns/orders/add/:orderId/"
+  },
+  "admin.app.order-list": {
+    "component": "AdminReturnOrderList",
+    "path": "/admin/app/returns/orders/"
+  },
   "admin.app.return-details": {
     "component": "AdminReturnDetails",
     "path": "/admin/app/returns/:id/details/"

docs/README.md

@@ -166,7 +166,7 @@ with the following example body:
 
 |Field|Description|isRequired|
 |----|----|----|
-|status|`enum` possible values: new, processing, pickedUpFromClient,pendingVerification, packageVerified, amountRefunded, denied, cancelled |true|
+|status|`enum` possible values: new, processing, pickedUpFromClient,pendingVerification, packageVerified, amountRefunded, denied, canceled |true|
 |comment| `object` only required if not updating status | false|
 |comment value|`string` only required if not updating status|true|
 |comment visibleForCustomer|`boolean` the comment will be shown to the customer. Default false|false|

graphql/schema.graphql

@@ -1,12 +1,17 @@
 type Query {
   returnAppSettings: ReturnAppSettings @cacheControl(maxAge: ZERO)
+  returnSellerSettings(sellerId: String!): SellerSetting
+    @withUserProfile
+    @cacheControl(maxAge: ZERO)
   categoryTreeName: [CategoryInfo]! @cacheControl(maxAge: MEDIUM)
   """
   storeUserEmail: If not passed, resolver will try to parse it from session cookie.
   """
   ordersAvailableToReturn(
     page: Int!
     storeUserEmail: String
+    isAdmin: Boolean
+    filter: OrdersFilters
   ): OrdersToReturnList
     @withUserProfile
     @cacheControl(scope: PRIVATE, maxAge: SHORT)
@@ -30,14 +35,26 @@ type Query {
     @withUserProfile
     @cacheControl(scope: PRIVATE, maxAge: SHORT)
   nearestPickupPoints(lat: String!, long: String!): NearPickupPointQueryResponse
+  sellerSetting(sellerId: String!): SellerSetting
+  sellerSettingList: SellerSettingResponseList @cacheControl(maxAge: ZERO)
+  returnSettingsList(
+    filter: ReturnSettingsFilters
+    page: Int!
+    perPage: Int
+  ): ReturnSettingsList
+    @withUserProfile
+    @cacheControl(scope: PRIVATE, maxAge: SHORT)
 }
 
 type Mutation {
   createReturnRequest(returnRequest: ReturnRequestInput!): returnRequestCreated
     @withUserProfile
   saveReturnAppSettings(settings: ReturnAppSettingsInput!): Boolean
+  saveSellerSetting(settings: SellerSettingInput!): Boolean
+  updateSellerSetting(id: ID!, settings: SellerSettingInput!): Boolean
   updateReturnRequestStatus(
     requestId: ID!
+    sellerName: String
     status: Status!
     comment: ReturnRequestCommentInput
     refundData: RefundDataInput

graphql/types/OrderToReturn.graphql

@@ -5,6 +5,7 @@ type OrdersToReturnList {
 
 type OrderToReturnSummary {
   orderId: String!
+  sellerName: String!
   creationDate: String!
   """
   Items invoiced / sent to costumer with items details.
@@ -23,6 +24,7 @@ type OrderToReturnSummary {
   clientProfileData: ClientProfileData!
   shippingData: ShippingData!
   paymentData: PaymentData!
+  availableAmountsToRefund: AvailableAmountsToRefund
 }
 
 type Pagination {
@@ -79,7 +81,7 @@ type ShippingData {
   addressId: String!
   address: String!
   city: String!
-  state: String!
+  state: String
   country: String!
   zipCode: String!
   addressType: AddressType!
@@ -89,3 +91,14 @@ type ShippingData {
 type PaymentData {
   canRefundCard: Boolean!
 }
+
+input CreatedInInput {
+  from: String!
+  to: String!
+}
+
+input OrdersFilters {
+  createdIn: CreatedInInput
+  orderId: String
+  sellerName: String
+}

graphql/types/PickupPoints.graphql

@@ -18,7 +18,7 @@ type CheckoutAddress {
   isDisposable: Boolean!
   postalCode: String!
   city: String!
-  state: String!
+  state: String
   country: String!
   street: String!
   number: String!

graphql/types/ReturnAppSettings.graphql

@@ -5,6 +5,8 @@ type ReturnAppSettings {
   termsUrl: String!
   customReturnReasons: [CustomReturnReason!]
   options: ReturnOption
+  orderStatus: String
+  sellerId: String
 }
 
 type PaymentOptions {
@@ -35,6 +37,8 @@ type ReturnOption {
   enablePickupPoints: Boolean
   enableProportionalShippingValue: Boolean
   enableSelectItemCondition: Boolean
+  enableHighlightFormMessage: Boolean
+  enableGoodwill: Boolean
 }
 
 input ReturnAppSettingsInput {
@@ -44,6 +48,8 @@ input ReturnAppSettingsInput {
   termsUrl: String!
   customReturnReasons: [CustomReturnReasonInput!]
   options: ReturnOptionInput
+  orderStatus: String
+  sellerId: String
 }
 
 input PaymentOptionsInput {
@@ -74,4 +80,6 @@ input ReturnOptionInput {
   enablePickupPoints: Boolean
   enableProportionalShippingValue: Boolean
   enableSelectItemCondition: Boolean
+  enableHighlightFormMessage: Boolean
+  enableGoodwill: Boolean
 }

graphql/types/ReturnRequest.graphql

@@ -1,5 +1,6 @@
 input ReturnRequestInput {
   orderId: String!
+  sellerName: String
   items: [ReturnRequestItemInput!]!
   customerProfileData: CustomerProfileDataInput!
   pickupReturnData: PickupReturnDataInput!
@@ -41,7 +42,7 @@ input PickupReturnDataInput {
   addressId: String!
   address: String!
   city: String!
-  state: String!
+  state: String
   country: String!
   zipCode: String!
   addressType: AddressType!
@@ -65,8 +66,20 @@ enum RefundPaymentMethod {
   sameAsPurchase
 }
 
+type AvailableAmountsToRefund {
+  initialInvoicedAmount: Int
+  amountToBeRefundedInProcess: Int
+  totalRefunded: Int
+  remainingRefundableAmount: Int
+  initialShippingCost: Int
+  shippingCostToBeRefundedInProcess: Int
+  totalShippingCostRefunded: Int
+  remainingRefundableShippingCost: Int
+}
+
 type ReturnRequestResponse {
   id: ID!
+  sellerName: String
   orderId: String!
   refundableAmount: Int!
   sequenceNumber: String!
@@ -82,6 +95,7 @@ type ReturnRequestResponse {
   refundData: RefundData
   refundStatusData: [RefundStatusData!]!
   cultureInfoData: CultureInfoData!
+  availableAmountsToRefund: AvailableAmountsToRefund
 }
 
 enum Status {
@@ -92,7 +106,7 @@ enum Status {
   packageVerified
   amountRefunded
   denied
-  cancelled
+  canceled
 }
 
 type CustomerProfileData {
@@ -106,7 +120,7 @@ type PickupReturnData {
   addressId: String!
   address: String!
   city: String!
-  state: String!
+  state: String
   country: String!
   zipCode: String!
   addressType: AddressType!
@@ -186,6 +200,7 @@ input ReturnRequestFilters {
   status: Status
   sequenceNumber: String
   id: String
+  sellerName: String
   """
   createdIn: It uses the field dateSubmitted in the return request schema to search for documents.
   The field createdIn is auto generated when the document is created, not reflecting the real value for documents migrated from older versions.

graphql/types/ReturnSettings.graphql

@@ -0,0 +1,23 @@
+input ReturnSettingsFilters {
+  id: String
+  sellerName: String
+
+}
+
+type ReturnSettingsList {
+  list: [ReturnSettingsResponse!]!
+  paging: Pagination!
+}
+
+
+type ReturnSettingsResponse {
+  id: ID!
+  sellerId: String
+  maxDays: Int!
+  excludedCategories: [String!]!
+  paymentOptions: PaymentOptions!
+  termsUrl: String!
+  customReturnReasons: [CustomReturnReason!]
+  options: ReturnOption
+  orderStatus: String
+}

graphql/types/SellerSetting.graphql

@@ -0,0 +1,29 @@
+type SellerSetting {
+  id: String
+  sellerId: String!
+  parentAccount: String
+  maxDays: Int!
+  excludedCategories: [String!]!
+  paymentOptions: PaymentOptions!
+  termsUrl: String!
+  customReturnReasons: [CustomReturnReason!]
+  options: ReturnOption
+  orderStatus: String
+}
+
+type SellerSettingResponseList {
+  sellers: [SellerSetting]
+}
+
+input SellerSettingInput  {
+  id: String
+  sellerId: String!
+  parentAccount: String
+  maxDays: Int!
+  excludedCategories: [String!]!
+  paymentOptions: PaymentOptionsInput!
+  termsUrl: String!
+  customReturnReasons: [CustomReturnReasonInput!]
+  options: ReturnOptionInput
+  orderStatus: String
+}

manifest.json

@@ -1,7 +1,7 @@
 {
   "vendor": "vtex",
   "name": "return-app",
-  "version": "3.5.6",
+  "version": "3.16.1-hkignore",
   "title": "Return app",
   "description": "Return app",
   "dependencies": {
@@ -13,7 +13,8 @@
     "vtex.css-handles": "0.x",
     "vtex.easypost": "0.x",
     "vtex.tenant-graphql": "0.x",
-    "vtex.catalog-graphql": "1.x"
+    "vtex.catalog-graphql": "1.x",
+    "vtex.sellers-graphql": "8.x"
   },
   "builders": {
     "admin": "0.x",
@@ -37,6 +38,9 @@
         "path": "/api/*"
       }
     },
+    {
+      "name": "colossus-fire-event"
+    },
     {
       "name": "outbound-access",
       "attrs": {