Commit Graph

1172 Commits

Author SHA1 Message Date
8d15f6f4be - Added filter by Partner Trx Id for transaction history 2023-05-10 14:14:10 +07:00
88079631e9 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2023-05-10 05:47:50 +07:00
166ee1f2e0 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-05-10 05:47:15 +07:00
288749336f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-05-09 14:46:02 +07:00
5d039499e5 - added filter by trxId in history transaction 2023-05-09 14:45:29 +07:00
acfb4ccaab Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2023-05-04 02:45:55 +07:00
cc39fdc26c Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-05-04 02:45:19 +07:00
f8df57da40 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-05-04 00:38:46 +07:00
dbb363983b - added between dates when exporting excel transaction history 2023-05-04 00:22:54 +07:00
c255c120d1 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2023-04-28 20:03:42 +07:00
0c4d4d108d Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-04-28 20:02:46 +07:00
24c639cc81 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-28 19:59:47 +07:00
8e9295a806 - fix get product partner hide markup price 2023-04-28 19:58:47 +07:00
84b19c6bfa Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-28 19:47:55 +07:00
0dd35e0baa - fix get product partner hide markup price 2023-04-28 19:47:21 +07:00
49464e876e Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-28 19:15:52 +07:00
f0be8ca067 - fix get product partner hide markup price 2023-04-28 19:13:23 +07:00
9a2455b46f Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2023-04-21 12:15:39 +07:00
a62d651fc7 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-04-21 12:14:51 +07:00
970bda1f84 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-21 12:12:35 +07:00
8943d8b8ac - fix error metro 2023-04-21 12:12:10 +07:00
3f82aaa916 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-21 12:09:16 +07:00
5cf8c7661c - fix error metro 2023-04-21 12:07:57 +07:00
8a9ab36ead Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-21 12:01:47 +07:00
704fad0895 - fix error metro 2023-04-21 12:01:24 +07:00
f8b5166f95 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-21 11:44:29 +07:00
c6e0e44608 - fix error metro 2023-04-21 11:43:49 +07:00
e120b67b2f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-21 11:38:01 +07:00
4570790514 - push logs 2023-04-21 11:37:40 +07:00
da916e495f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-21 11:32:17 +07:00
0fb2e1d6fa - push logs 2023-04-21 11:31:53 +07:00
cbdcbfb29d Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-21 11:27:36 +07:00
de3ce1adab - push logs 2023-04-21 11:26:59 +07:00
cbd65eb6c8 - push logs 2023-04-21 11:20:56 +07:00
Fadli
4098c6717c Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2023-04-11 11:27:41 +07:00
Fadli
3b36232a0a Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-04-11 11:27:08 +07:00
Fadli
f1df995968 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-11 11:21:22 +07:00
Fadli
c98472c607 - added update sub categories for updating product csv 2023-04-11 11:20:51 +07:00
Fadli
a8198ab1c2 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-04-11 11:06:58 +07:00
Fadli
0407f06421 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-11 11:06:23 +07:00
Fadli
1ca568ded4 - added update sub categories for updating product csv 2023-04-11 11:05:51 +07:00
Fadli
119aac0a4e Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2023-04-03 20:19:57 +07:00
Fadli
f7bbc1d1f6 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-04-03 20:19:25 +07:00
Fadli
15b3e2b12c Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-03 20:18:56 +07:00
Fadli
0e4d535ba3 - fix metro when response error 2023-04-03 20:18:29 +07:00
Fadli
fa78d210ba Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2023-03-30 11:02:00 +07:00
Fadli
5b90b0f1f7 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-03-30 11:01:07 +07:00
Fadli
bb11ca2584 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-03-30 10:59:44 +07:00
Fadli
56c27736a7 - fix sending check bill 2023-03-30 10:58:42 +07:00
Fadli
031356f2f2 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2023-03-09 11:00:21 +07:00