Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #3

Open
wants to merge 544 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
544 commits
Select commit Hold shift + click to select a range
b33f639
mail servide and more
ehsan-g Nov 7, 2023
00b7526
to revert extra tables
ehsan-g Nov 8, 2023
3698a4c
to revert extra tables
ehsan-g Nov 8, 2023
24bd4ee
more automation for new children
ehsan-g Nov 9, 2023
8974da6
more automation for new children
ehsan-g Nov 9, 2023
842aa28
more automation for new children
ehsan-g Nov 9, 2023
b16adf3
more automation for new children
ehsan-g Nov 9, 2023
ac1840b
more automation for new children
ehsan-g Nov 9, 2023
429d2d8
more automation for new children
ehsan-g Nov 9, 2023
237b351
filter migrated children
ehsan-g Nov 10, 2023
af972c7
filter migrated children
ehsan-g Nov 10, 2023
3119b10
exapanging mail service
ehsan-g Nov 10, 2023
d0c67e9
exapanging mail service
ehsan-g Nov 10, 2023
f95ee18
exapanging mail service
ehsan-g Nov 10, 2023
b420182
exapanging mail service
ehsan-g Nov 10, 2023
f8aecc3
exapanging mail service
ehsan-g Nov 10, 2023
14688b3
exapanging mail service
ehsan-g Nov 10, 2023
a68d990
exapanging mail service
ehsan-g Nov 10, 2023
9abe91c
exapanging mail service
ehsan-g Nov 10, 2023
a897d9b
exapanging mail service
ehsan-g Nov 10, 2023
b3a810d
exapanging mail service
ehsan-g Nov 10, 2023
38e36d0
analytic bug fix
ehsan-g Nov 10, 2023
7da7b1a
Update wallet.controller.ts
ehsan-g Nov 12, 2023
c678ead
Update wallet.controller.ts
ehsan-g Nov 12, 2023
14ba7e0
Update wallet.controller.ts
ehsan-g Nov 12, 2023
228c35d
temp changes
ehsan-g Nov 12, 2023
62242b8
temp changes
ehsan-g Nov 12, 2023
c0a728b
sms campaigns
ehsan-g Nov 13, 2023
9e82960
sms campaigns
ehsan-g Nov 13, 2023
4ba57ca
preregister bug fix
ehsan-g Nov 15, 2023
184e3da
preregister bug fix
ehsan-g Nov 15, 2023
5f021b5
preregister bug fix
ehsan-g Nov 15, 2023
804dad2
preregister bug fix
ehsan-g Nov 15, 2023
56f9646
preregister bug fix
ehsan-g Nov 15, 2023
2d7395c
campaogn service and some cleanup
ehsan-g Nov 15, 2023
8a104cf
campaogn service and some cleanup
ehsan-g Nov 15, 2023
ff0835d
similar names enhanced
ehsan-g Nov 17, 2023
e7c61e9
temp changes
ehsan-g Nov 21, 2023
263acd4
mailing service prerelase
ehsan-g Nov 21, 2023
dc0b430
campaign sms url check
ehsan-g Nov 23, 2023
5f2dc3a
campaign sms url check
ehsan-g Nov 23, 2023
cf90b38
campaign sms url check
ehsan-g Nov 23, 2023
c318c18
campaign sms url check
ehsan-g Nov 23, 2023
3cb0a27
campaign sms/cancel fix
ehsan-g Nov 23, 2023
8dd19f5
campaign sms/cancel fix
ehsan-g Nov 23, 2023
e98aff2
mail server return 550
ehsan-g Nov 23, 2023
65cf45b
small changes to a query
ehsan-g Dec 3, 2023
bd70d73
prepare and update prechildcard
ehsan-g Dec 9, 2023
7d03c6b
campaign test
ehsan-g Dec 24, 2023
14aba47
campaign test
ehsan-g Dec 24, 2023
eae0991
campaign test
ehsan-g Dec 24, 2023
ad7029e
campaign test
ehsan-g Dec 24, 2023
b330473
campaign test
ehsan-g Dec 24, 2023
1d8d85a
status change
ehsan-g Jan 3, 2024
ad63fae
status change
ehsan-g Jan 3, 2024
9bfd3aa
status change
ehsan-g Jan 3, 2024
161d0b8
status change
ehsan-g Jan 3, 2024
7a8d0df
production directory error
ehsan-g Jan 3, 2024
a4d3401
status changes for arrivals
ehsan-g Jan 3, 2024
b9f8852
status changes for arrivals
ehsan-g Jan 3, 2024
0ac6108
status changes for arrivals
ehsan-g Jan 3, 2024
ec0e42c
need order
ehsan-g Jan 11, 2024
0f541ad
arrivals changes
ehsan-g Jan 13, 2024
b16d92e
not fetching tickets for signed needs
ehsan-g Jan 21, 2024
07c6ce7
not fetching tickets for signed needs
ehsan-g Jan 21, 2024
f1b835e
not fetching tickets for signed needs
ehsan-g Jan 21, 2024
e893031
postponing email
ehsan-g Jan 24, 2024
644d22a
email update
ehsan-g Jan 27, 2024
fcfd318
email update
ehsan-g Jan 27, 2024
d6afe18
email update
ehsan-g Jan 27, 2024
5366e3e
email update
ehsan-g Jan 27, 2024
d6e929c
email update
ehsan-g Jan 27, 2024
180ce7e
children with no needs update
ehsan-g Jan 27, 2024
c13c97b
children with no needs update
ehsan-g Jan 27, 2024
d1909c9
campaign frontend
ehsan-g Jan 31, 2024
6a2da70
campaign frontend
ehsan-g Jan 31, 2024
4e21d72
campaign frontend
ehsan-g Jan 31, 2024
92a6a84
campaign frontend
ehsan-g Jan 31, 2024
66132bf
campaign frontend
ehsan-g Jan 31, 2024
2e66d92
campaign sms bug fix
ehsan-g Feb 8, 2024
3834329
user search + midjourney changes
ehsan-g Feb 16, 2024
b068875
small changes
ehsan-g Feb 21, 2024
d6adaa1
small changes
ehsan-g Feb 21, 2024
2c921ba
small changes
ehsan-g Feb 21, 2024
8bcdb9b
small changes
ehsan-g Feb 21, 2024
a4659a0
small changes
ehsan-g Feb 21, 2024
44d3f19
campaign update
ehsan-g Mar 6, 2024
ed12e4c
campaign update
ehsan-g Mar 6, 2024
26fc261
schedule temp time
ehsan-g Mar 11, 2024
36f0806
schedule temp time
ehsan-g Mar 11, 2024
fc6ade9
arrival ticket fix
ehsan-g Apr 10, 2024
e0a6679
auto need confirm
ehsan-g Apr 19, 2024
384a325
auto need confirm
ehsan-g Apr 19, 2024
84a20ff
auto need confirm
ehsan-g Apr 19, 2024
aca0c37
auto need confirm
ehsan-g Apr 19, 2024
0fd1bdc
enabled campaign
ehsan-g Apr 19, 2024
42025c0
auto need confirm
ehsan-g Apr 19, 2024
d449252
ticket optimising
ehsan-g May 4, 2024
effd08f
ticket optimising
ehsan-g May 4, 2024
db18024
ticket optimising
ehsan-g May 4, 2024
6e952e9
ticket optimising
ehsan-g May 4, 2024
29fec9e
missmatch
ehsan-g May 5, 2024
c3d2016
sw page optimization
ehsan-g May 10, 2024
07839f1
sw page optimization
ehsan-g May 10, 2024
bc3ec34
sw page optimization
ehsan-g May 10, 2024
fcf5342
sw page optimization
ehsan-g May 10, 2024
b807ef7
sw page optimization
ehsan-g May 10, 2024
8ba2ee6
auto confirm optimiziation
ehsan-g May 10, 2024
33e13fd
auto confirm optimiziation
ehsan-g May 10, 2024
517b7a0
auto confirm optimiziation
ehsan-g May 10, 2024
2aad700
provider and tocket fix
ehsan-g May 12, 2024
31d14b4
provider and tocket fix
ehsan-g May 12, 2024
71f8b06
provider and tocket fix
ehsan-g May 13, 2024
69f1313
confirm/provider fix
ehsan-g May 13, 2024
21c21ac
confirm/provider fix
ehsan-g May 13, 2024
6f7caf0
confirm/provider fix
ehsan-g May 13, 2024
a63e6d3
provider sync
ehsan-g May 16, 2024
070f706
provider sync
ehsan-g May 18, 2024
920b0f5
provider sync
ehsan-g May 18, 2024
7814a7a
provider sync
ehsan-g May 18, 2024
5b641a5
provider sync
ehsan-g May 18, 2024
12f2fcb
provider sync
ehsan-g May 18, 2024
327e892
some fix
ehsan-g May 25, 2024
431ea15
provider fix
ehsan-g May 26, 2024
d152653
provider fix
ehsan-g May 26, 2024
7af7543
provider fix
ehsan-g May 26, 2024
bf58894
provider fix
ehsan-g May 26, 2024
236d3d1
provider fix
ehsan-g May 26, 2024
f9a8a47
provider fix
ehsan-g May 26, 2024
d3f4244
mass confirm fix
ehsan-g May 26, 2024
758373f
schedule update
ehsan-g May 26, 2024
d7382d0
schedule update
ehsan-g May 26, 2024
f4a5efe
schedule update
ehsan-g May 26, 2024
78ab1ad
schedule update
ehsan-g May 26, 2024
337ea29
schedule update
ehsan-g May 26, 2024
22fdaad
schedule update
ehsan-g May 26, 2024
cab278a
schedule update
ehsan-g May 26, 2024
f82b5e2
schedule update
ehsan-g May 26, 2024
d4c7751
schedule update
ehsan-g May 26, 2024
2dd761a
campaign ERRCONNECT debug
ehsan-g May 27, 2024
317ab2d
sms debug
ehsan-g May 28, 2024
7e74ec5
sleep added
ehsan-g May 31, 2024
53f9a67
expection added
ehsan-g May 31, 2024
673f7f3
expection added
ehsan-g May 31, 2024
3e29c02
expection added
ehsan-g May 31, 2024
95db0b3
expection added
ehsan-g May 31, 2024
abbdfa9
expection added
ehsan-g May 31, 2024
f07d683
expection added
ehsan-g May 31, 2024
c831b83
expection added
ehsan-g Jun 1, 2024
6e3fcca
newsletter setup
ehsan-g Jun 29, 2024
e7c4b18
newsletter setup
ehsan-g Jun 29, 2024
e35e57a
newsletter setup
ehsan-g Jun 29, 2024
595f468
newsletter setup
ehsan-g Jun 29, 2024
8b77438
newsletter setup
ehsan-g Jun 29, 2024
6c6d7ac
newsletter setup
ehsan-g Jun 29, 2024
e4bee5d
newsletter setup
ehsan-g Jun 30, 2024
6a0425f
newsletter setup
ehsan-g Jun 30, 2024
e57e699
newsletter setup
ehsan-g Jun 30, 2024
656b2b1
newsletter setup
ehsan-g Jun 30, 2024
40dfb9c
mass confirm fix
ehsan-g Jul 13, 2024
db553e4
monthly campaign
ehsan-g Jul 14, 2024
aeabda7
arrivals sms
ehsan-g Jul 15, 2024
1870b24
childre nsort
ehsan-g Jul 16, 2024
ac3e4b9
providers sort
ehsan-g Jul 16, 2024
0c7af49
children edit after confirmed
ehsan-g Jul 17, 2024
5bf25c5
children entity changes
ehsan-g Jul 20, 2024
a5aaeb1
schedule changes
ehsan-g Jul 20, 2024
c4bdc59
mass confirm fixes
ehsan-g Jul 22, 2024
225c23a
mass confirm fixes
ehsan-g Jul 22, 2024
0819a3c
ticket changes
ehsan-g Jul 22, 2024
60fc6bf
mass confirm fixes
ehsan-g Jul 22, 2024
efbfdd7
mass confirm fixes
ehsan-g Jul 22, 2024
3f057dd
update voice for preregister
ehsan-g Jul 24, 2024
66065d8
minor changes
ehsan-g Aug 4, 2024
7de8446
pipeline changes
ehsan-g Aug 4, 2024
3b66522
pipeline changes
ehsan-g Aug 4, 2024
1154584
pipeline changes
ehsan-g Aug 4, 2024
2b6dbe7
docker changes
ehsan-g Aug 11, 2024
d89333c
docker changes
ehsan-g Aug 11, 2024
7d65dab
docker changes
ehsan-g Aug 11, 2024
2cecf63
docker changes
ehsan-g Aug 11, 2024
1b562ef
email child condirm fix
ehsan-g Aug 11, 2024
d397a00
chaning node version
ehsan-g Aug 11, 2024
21e5262
docker compose version change
ehsan-g Aug 11, 2024
70c411d
docker compose version change
ehsan-g Aug 11, 2024
7b8da90
docker compose version change
ehsan-g Aug 11, 2024
052d320
docker compose version change
ehsan-g Aug 11, 2024
06ae5e4
docker compose version change
ehsan-g Aug 11, 2024
4ef1a8d
docker compose version change
ehsan-g Aug 11, 2024
5f491d4
docker/pipeline changes
ehsan-g Aug 14, 2024
9d13b0a
docker/pipeline changes
ehsan-g Aug 14, 2024
c27927f
docker/pipeline changes
ehsan-g Aug 14, 2024
b4870c0
docker/pipeline changes
ehsan-g Aug 14, 2024
e733ffd
docker/pipeline changes
ehsan-g Aug 14, 2024
0dae4fd
docker/pipeline changes
ehsan-g Aug 14, 2024
996be48
docker/pipeline changes
ehsan-g Aug 14, 2024
f72e3b9
docker/pipeline changes
ehsan-g Aug 14, 2024
8d71c68
docker/pipeline changes
ehsan-g Aug 14, 2024
3996d83
docker/pipeline changes
ehsan-g Aug 14, 2024
e90be56
docker/pipeline changes
ehsan-g Aug 14, 2024
3c1f6e2
docker/pipeline changes
ehsan-g Aug 14, 2024
87ea206
docker/pipeline changes
ehsan-g Aug 14, 2024
f386324
docker/pipeline changes
ehsan-g Aug 14, 2024
1c1673b
docker/pipeline changes
ehsan-g Aug 14, 2024
dee1929
docker/pipeline changes
ehsan-g Aug 14, 2024
ddad33d
modifying paymntapi
ehsan-g Aug 14, 2024
ab663e7
docker/pipeline changes
ehsan-g Aug 14, 2024
e748b7b
docker/pipeline changes
ehsan-g Aug 14, 2024
f158063
docker/pipeline changes
ehsan-g Aug 14, 2024
52cc809
docker/pipeline changes
ehsan-g Aug 14, 2024
4d3612e
docker/pipeline changes
ehsan-g Aug 14, 2024
f03819c
docker/pipeline changes
ehsan-g Aug 14, 2024
8c27fd6
db changes
ehsan-g Aug 16, 2024
7297a7f
db changes
ehsan-g Aug 16, 2024
aa63c1c
migrations
ehsan-g Aug 16, 2024
4a17d45
migrations
ehsan-g Aug 16, 2024
052994e
migrations
ehsan-g Aug 16, 2024
4731356
docker volume changes
ehsan-g Aug 21, 2024
a0a67ce
db changes
ehsan-g Aug 21, 2024
1a6eb35
db changes
ehsan-g Aug 21, 2024
26d2f40
db changes
ehsan-g Aug 21, 2024
d3c7bfc
db changes
ehsan-g Aug 21, 2024
4f821c6
db changes
ehsan-g Aug 22, 2024
6af5bf4
db changes
ehsan-g Aug 22, 2024
ad58c4f
db changes
ehsan-g Aug 22, 2024
cca915e
payment changes
ehsan-g Aug 22, 2024
6795ba1
payment changes
ehsan-g Aug 22, 2024
825105c
cart finalized
ehsan-g Aug 23, 2024
0150fc4
cart finalized
ehsan-g Aug 23, 2024
6213d09
stop db logs
ehsan-g Aug 26, 2024
db74296
some checks
ehsan-g Sep 7, 2024
c9f199a
optimising the tickets
ehsan-g Sep 7, 2024
b665d1f
optimising the tickets
ehsan-g Sep 7, 2024
05f3894
optimising the tickets
ehsan-g Sep 7, 2024
4b8c208
provider bug fix
ehsan-g Sep 15, 2024
1a624c5
fresh product with null title
ehsan-g Sep 21, 2024
c45a2b8
re-schdule
ehsan-g Sep 21, 2024
97dc06a
cart verify route exclusion
ehsan-g Sep 29, 2024
0b73519
optimising payment
ehsan-g Oct 13, 2024
789bf58
preregister updated
ehsan-g Oct 21, 2024
95120a5
small chnges
ehsan-g Oct 27, 2024
a0be8c3
arrivals bigger range
ehsan-g Oct 27, 2024
368484d
arrivals bigger range
ehsan-g Oct 27, 2024
43b3c41
arrivals bigger range
ehsan-g Oct 27, 2024
5d22ce5
arrivals bigger range
ehsan-g Oct 27, 2024
97a7967
arrivals bigger range
ehsan-g Oct 27, 2024
771878f
arrivals bigger range
ehsan-g Oct 27, 2024
640b3e8
campaign stopped
ehsan-g Nov 23, 2024
c2808a6
enhancing some features
ehsan-g Dec 9, 2024
1799f06
campaign maintanence
ehsan-g Dec 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
childre nsort
  • Loading branch information
ehsan-g committed Jul 16, 2024
commit 1870b24b513853ce90a22a8100e3f1a6ff0d9d0b
66 changes: 45 additions & 21 deletions src/features/children/children.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,30 @@ export class ChildrenController {
private downloadService: DownloadService,
private campaignService: CampaignService,
) {}
@Get(`preregister/:childFlaskId`)
@ApiOperation({ description: 'Get child preregister' })
async getChildPreregister(
@Req() req: Request,
@Param('childFlaskId') childFlaskId: number,
) {
const panelFlaskUserId = req.headers['panelFlaskUserId'];
const panelFlaskTypeId = req.headers['panelFlaskTypeId'];
if (
!isAuthenticated(panelFlaskUserId, panelFlaskTypeId) ||
!(
panelFlaskTypeId === FlaskUserTypesEnum.SOCIAL_WORKER ||
panelFlaskTypeId === FlaskUserTypesEnum.NGO_SUPERVISOR ||
panelFlaskTypeId === FlaskUserTypesEnum.SUPER_ADMIN ||
panelFlaskTypeId === FlaskUserTypesEnum.ADMIN
)
) {
throw new ForbiddenException('You Are not the Authorized!');
}

return await this.childrenService.getChildrenPreRegisterByFlaskId(
childFlaskId,
);
}

@UsePipes(new ValidationPipe()) // validation for dto files
@Patch(`preregister/approve/:id`)
Expand Down Expand Up @@ -318,7 +342,7 @@ export class ChildrenController {
panelFlaskTypeId === FlaskUserTypesEnum.ADMIN
)
) {
throw new ForbiddenException('You Are not the Super admin');
throw new ForbiddenException('You Are not the Authorized!');
}

if (!files) {
Expand Down Expand Up @@ -546,26 +570,26 @@ export class ChildrenController {
) {
throw new ForbiddenException('You Are not the Super admin');
}
// if(body.flaskChildId>0){
// const token =
// config().dataCache.fetchPanelAuthentication(panelFlaskUserId).token;
// const configs = {
// headers: {
// 'Content-Type': 'multipart/form-data',
// Authorization: token,
// processData: false,
// contentType: false,
// },
// };
// const formData = new FormData();
// formData.append('ngo_id', String(preRegister.flaskNgoId));
// // create flask child
// const { data } = await axios.post(
// 'https://api.sayapp.company/api/v2/child/add/',
// formData,
// configs,
// );
// }
// if(body.flaskChildId>0){
// const token =
// config().dataCache.fetchPanelAuthentication(panelFlaskUserId).token;
// const configs = {
// headers: {
// 'Content-Type': 'multipart/form-data',
// Authorization: token,
// processData: false,
// contentType: false,
// },
// };
// const formData = new FormData();
// formData.append('ngo_id', String(preRegister.flaskNgoId));
// // create flask child
// const { data } = await axios.post(
// 'https://api.sayapp.company/api/v2/child/add/',
// formData,
// configs,
// );
// }
try {
return await this.childrenService.preRegisterUpdate(body.id, {
bio: { fa: body.bio, en: '' },
Expand Down
2 changes: 1 addition & 1 deletion src/features/children/children.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ export class ChildrenService {
options,
queryBuilder,
{
sortableColumns: ['id'],
sortableColumns: ['createdAt'],
nullSort: 'last',
},
);
Expand Down
Loading