Skip to content

Commit

Permalink
Merge branch 'main' into feature/Add-create-affiliate-mutation
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielHosino committed Feb 10, 2022
2 parents 8f9e0ac + c996a51 commit 0993604
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [0.28.0] - 2022-02-08

### Added

- getAffiliates query
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "affiliates",
"vendor": "vtex",
"version": "0.27.0",
"version": "0.28.0",
"title": "Affiliates",
"description": "App that adds support for affiliates on IO stores",
"mustUpdateAt": "2018-01-04",
Expand Down
2 changes: 1 addition & 1 deletion node/__tests__/unit/resolvers/getAffiliates.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe('getAffiliates resolver', () => {
},
} as QueryGetAffiliatesArgs

const expectedWhere = `(id="*loja*" OR storeName="*loja*" OR email="*loja*") AND isApproved=true`
const expectedWhere = `(id="*loja*" OR storeName="*loja*" OR email="*loja*" OR name="*loja*" OR phone="*loja*") AND isApproved=true`
const expectedSort = `isApproved ASC`
const mockCtx = {
clients: {
Expand Down
2 changes: 1 addition & 1 deletion node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
"lint": "tsc --noEmit --pretty",
"test": "vtex-test-tools test --collectCoverage"
},
"version": "0.27.0"
"version": "0.28.0"
}
2 changes: 1 addition & 1 deletion node/utils/filters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const parseAffiliatesFilters = ({

if (searchTerm) {
where.push(
`(id="*${searchTerm}*" OR storeName="*${searchTerm}*" OR email="*${searchTerm}*")`
`(id="*${searchTerm}*" OR storeName="*${searchTerm}*" OR email="*${searchTerm}*" OR name="*${searchTerm}*" OR phone="*${searchTerm}*")`
)
}

Expand Down
2 changes: 1 addition & 1 deletion react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vtex.affiliates",
"version": "0.27.0",
"version": "0.28.0",
"scripts": {
"test": "vtex-test-tools test --collectCoverage"
},
Expand Down

0 comments on commit 0993604

Please sign in to comment.