Compare commits

..

521 Commits

Author SHA1 Message Date
87daf99796 Merge branch 'devops-staging' of gitlab.com:empatnusabangsa/ppob/ppob-backend 2023-12-15 13:33:40 +07:00
43cd898f77 Merge branch 'development' of gitlab.com:empatnusabangsa/ppob/ppob-backend into devops-staging 2023-12-15 13:33:12 +07:00
be921bb3d2 Merge branch 'devops-staging' of gitlab.com:empatnusabangsa/ppob/ppob-backend 2023-12-12 15:06:23 +07:00
7c9b37fb34 Merge branch 'development' of gitlab.com:empatnusabangsa/ppob/ppob-backend into devops-staging 2023-12-12 15:04:52 +07:00
c32aa44f46 Merge branch 'devops-staging' of gitlab.com:empatnusabangsa/ppob/ppob-backend 2023-12-05 23:09:53 +07:00
bc897c0262 Merge branch 'development' of gitlab.com:empatnusabangsa/ppob/ppob-backend into devops-staging 2023-12-05 23:07:34 +07:00
365d3b60e6 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-10-30 13:42:32 +07:00
15a5b5a5c8 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-10-30 13:42:04 +07:00
7e17a0db3d Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-10-30 13:23:36 +07:00
2b7d68861e Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-10-30 13:23:00 +07:00
c593fc5993 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-10-05 23:50:19 +07:00
fb5d38e53d Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-10-05 23:49:39 +07:00
210da39310 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-10-02 11:38:27 +07:00
2806640b70 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-21 01:03:22 +07:00
3fee394dff Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-21 00:55:24 +07:00
9b1c3ea0d5 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-21 00:47:19 +07:00
cf83253ed7 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-21 00:39:39 +07:00
5654c42320 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-21 00:29:59 +07:00
85cd14e1e6 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-21 00:23:27 +07:00
581ff5001f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-21 00:10:31 +07:00
5c25edaeb1 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-21 00:03:37 +07:00
7fb4c75edd Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-20 23:55:26 +07:00
b5505abe53 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-20 23:52:50 +07:00
a9268806a7 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-20 23:41:36 +07:00
82f0ee82c0 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-20 23:31:49 +07:00
bc78724c43 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-20 23:25:36 +07:00
705a44e12e Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-20 23:15:41 +07:00
9c6a86fe9c Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-20 23:10:10 +07:00
e652b02756 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-20 23:01:34 +07:00
fba39ca42d Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-20 22:24:09 +07:00
9d80fa8473 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-14 15:03:16 +07:00
c75c7f5ae3 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-09-12 13:09:17 +07:00
77d41eb86b Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-12 13:05:17 +07:00
ebcdc043f3 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-09-01 02:47:11 +07:00
76f8bb6fcc Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-09-01 02:46:47 +07:00
0ad88bf6bf Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-31 21:41:11 +07:00
a67ef0c962 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-31 21:40:44 +07:00
cc69e4b867 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-31 21:37:11 +07:00
64724d3349 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-31 21:36:38 +07:00
651a64cc2e Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-31 16:18:15 +07:00
e2ae446f1f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-31 16:17:44 +07:00
6ba42668b4 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-31 16:00:49 +07:00
37faf64e5a Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-31 16:00:17 +07:00
672293fc9f Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-31 15:45:11 +07:00
21ed1f5f03 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-31 15:44:35 +07:00
64683dc801 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-31 15:39:57 +07:00
bc4e7a8bac Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-31 15:39:17 +07:00
c73ff16734 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-31 15:37:29 +07:00
f8e2447380 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-31 15:36:58 +07:00
0ef4688b6f Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-31 15:31:58 +07:00
553e620a2e Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-31 15:25:26 +07:00
b25365c2e3 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-30 17:34:47 +07:00
7eb3361ddb Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-30 17:34:15 +07:00
b29d8f1a13 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-30 03:01:18 +07:00
a46d3c66ff Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-30 03:00:57 +07:00
83c58b00d2 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-29 23:04:24 +07:00
d0b152d67e Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-29 23:03:53 +07:00
eee68a189a Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-29 22:56:43 +07:00
bc5d322abc Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-29 22:56:09 +07:00
07698b969a Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-28 20:50:38 +07:00
0c7a9a68ab Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-28 20:50:09 +07:00
785027026a Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-23 12:51:05 +07:00
445d072002 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-23 12:50:29 +07:00
74b880cc76 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-02 00:24:11 +07:00
75495c0e00 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-02 00:23:26 +07:00
b94be41669 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-08-02 00:04:53 +07:00
679111ac2c Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-08-02 00:04:23 +07:00
d5e5be06b6 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-06-22 02:20:14 +07:00
00af2ccaca Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-06-21 21:08:42 +07:00
4730479ec5 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-06-21 20:01:51 +07:00
59bacf9224 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-05-30 10:47:28 +07:00
d9f564d719 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-05-30 10:46:40 +07:00
49f41cf3ac Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-05-29 22:14:43 +07:00
32081c4d42 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-05-29 22:13:49 +07:00
a699f4d875 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-05-29 14:42:54 +07:00
3848ce1b04 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-05-29 14:42:09 +07:00
4b286f533a Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-05-29 13:52:28 +07:00
8d392e1245 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-05-29 13:51:22 +07:00
846fdf381f Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-05-11 07:33:25 +07:00
ffb28d2d38 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-05-10 16:26:05 +07:00
173c202cd9 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-05-10 16:10:33 +07:00
17f8bb10a9 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-05-10 15:00:54 +07:00
cf899abbc2 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-05-10 14:15:19 +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
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
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
84b19c6bfa Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-28 19:47:55 +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
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
3f82aaa916 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-21 12:09:16 +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
f8b5166f95 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-21 11:44:29 +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
da916e495f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-04-21 11:32:17 +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
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
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
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
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
57b5992917 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-03-09 10:59:47 +07:00
Fadli
b1d7560bc1 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-03-09 10:58:14 +07:00
Fadli
e0a4d6b7b0 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-03-01 23:16:10 +07:00
Fadli
088518c4ef Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-03-01 23:15:48 +07:00
Fadli
2a138e383a Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-03-01 23:03:58 +07:00
Fadli
41446c352d Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-03-01 23:03:28 +07:00
Fadli
8f48fbddfa Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-03-01 03:30:40 +07:00
Fadli
a12a4ed8c8 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-03-01 02:55:46 +07:00
Fadli
ee47cde8ba Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-03-01 02:51:20 +07:00
Fadli
0650ab5f9a Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-03-01 02:45:37 +07:00
Fadli
65a6643d8d Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-03-01 02:30:04 +07:00
Fadli
5cfc01e9e2 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-03-01 02:12:21 +07:00
Fadli
ad2e7ac0c5 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-03-01 02:05:23 +07:00
Fadli
3e5757e5f1 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-03-01 01:33:55 +07:00
Fadli
61cb5f17b4 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-28 16:11:29 +07:00
Fadli
5dcbc3336d Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-28 15:13:54 +07:00
Fadli
ac3449020b Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-28 14:39:13 +07:00
Fadli
c68225ca73 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-23 00:51:46 +07:00
Fadli
121f179e7e Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-23 00:03:27 +07:00
Fadli
4da370d42a Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 23:57:35 +07:00
Fadli
9d1731d607 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 23:52:23 +07:00
Fadli
543555054d Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 23:42:39 +07:00
Fadli
b38092c48d Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 23:31:11 +07:00
Fadli
7bbe5067bf Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 23:13:16 +07:00
Fadli
0cf05f3364 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 23:07:49 +07:00
Fadli
8abf1aa92b Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 23:00:52 +07:00
Fadli
b818677260 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 22:53:05 +07:00
Fadli
9df7cf6c6e Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 22:40:37 +07:00
Fadli
2d1cdd7af3 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 22:28:58 +07:00
Fadli
3cdbf74cc3 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 22:25:34 +07:00
Fadli
6dae54c33a Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 22:13:24 +07:00
Fadli
2f4c577381 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 21:44:21 +07:00
Fadli
e3a0a1bb68 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 21:34:16 +07:00
Fadli
4bee13c5f5 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 21:24:31 +07:00
Fadli
4c2c983e57 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 20:55:30 +07:00
Fadli
534865ffd5 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 20:49:03 +07:00
Fadli
30c858dcd7 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 19:08:01 +07:00
Fadli
7b508a0e77 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-22 18:51:01 +07:00
Fadli
c720f9b77f Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-02-09 23:33:25 +07:00
Fadli
b2a562d93e Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-09 23:08:18 +07:00
Fadli
1f785fa16d Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-02-06 17:42:52 +07:00
Fadli
be65552335 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-02-06 17:42:27 +07:00
Fadli
7fb930e9f4 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-01-11 15:32:59 +07:00
Fadli
ad023e4483 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-11 15:32:26 +07:00
Fadli
46931781ff Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-01-11 15:02:02 +07:00
Fadli
207efdc810 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-11 15:01:33 +07:00
Fadli
a48cd6684f Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-01-10 23:38:01 +07:00
Fadli
a827f27027 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-10 23:37:32 +07:00
Fadli
d95fd0cd5f Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-01-10 22:02:31 +07:00
Fadli
bffd709423 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-10 22:00:54 +07:00
Fadli
33d3c7be8d Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-01-10 14:54:48 +07:00
Fadli
7273028c70 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-10 14:54:13 +07:00
Fadli
a621b2de8b Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-01-10 13:28:02 +07:00
Fadli
90cd4b16af Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-10 13:27:37 +07:00
Fadli
398d525208 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-01-10 13:00:44 +07:00
Fadli
dd5b037949 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-10 13:00:12 +07:00
Fadli
03d843281c Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-01-07 01:26:32 +07:00
Fadli
3f6997de99 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-07 01:25:55 +07:00
Fadli
00e247a5f9 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-01-06 16:14:03 +07:00
Fadli
bd7150609c Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-06 16:12:41 +07:00
ilham dwi pratama
25a78b6fbf Merge branch 'development' into 'master'
fix: change balance_remaining tu numeric

See merge request empatnusabangsa/ppob/ppob-backend!226
2023-01-06 08:41:56 +00:00
ilham dwi pratama
6746278b6c Merge branch 'devops-staging' into 'master'
Devops staging

See merge request empatnusabangsa/ppob/ppob-backend!224
2023-01-06 06:29:31 +00:00
ilham dwi pratama
e2dcef04e5 Merge branch 'development' into 'devops-staging'
fix: change column

See merge request empatnusabangsa/ppob/ppob-backend!223
2023-01-06 06:28:48 +00:00
ilham dwi pratama
32d5187448 Merge branch 'devops-staging' into 'master'
Devops staging

See merge request empatnusabangsa/ppob/ppob-backend!222
2023-01-06 06:27:20 +00:00
ilham dwi pratama
f57ae48811 Merge branch 'development' into 'devops-staging'
fix: turn off sync

See merge request empatnusabangsa/ppob/ppob-backend!221
2023-01-06 06:24:31 +00:00
Fadli
6e22f23909 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-01-06 12:20:07 +07:00
Fadli
4da07fe5d1 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-06 12:19:41 +07:00
Fadli
463a60db3a Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-01-06 11:56:23 +07:00
Fadli
74bb978292 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-06 11:55:52 +07:00
Fadli
4c13b45782 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-01-04 02:38:32 +07:00
Fadli
e0cf8208b1 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-04 02:08:25 +07:00
Fadli
b21fdd35a9 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2023-01-04 01:15:13 +07:00
Fadli
2f52ada598 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-03 16:38:43 +07:00
Fadli
ea951fea61 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-01 16:24:15 +07:00
Fadli
f76a648710 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-01 15:38:11 +07:00
Fadli
dd046bd8d6 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2023-01-01 15:22:07 +07:00
Fadli
040d96a0e6 - add filename for excel histori transaksi 2023-01-01 15:20:20 +07:00
Fadli
a57d3aa37f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-29 17:52:34 +07:00
Fadli
60cfdffa47 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-29 16:31:30 +07:00
Fadli
51fa6cbfef Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-29 13:18:28 +07:00
Fadli
161ae095ea Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-12-20 11:01:39 +07:00
Fadli
378b566366 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-20 01:40:05 +07:00
Fadli
4955cfb893 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-19 23:00:25 +07:00
Fadli
251308e5e4 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-12-15 15:40:46 +07:00
Fadli
335cff4202 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-15 15:40:13 +07:00
Fadli
0321b6bc98 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-08 16:07:56 +07:00
Fadli
4b92b2694f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-08 16:05:22 +07:00
Fadli
1e0f1dedc6 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-29 00:02:40 +07:00
Fadli
e38a15ee32 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-29 00:02:15 +07:00
Fadli
4a70f8d763 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-24 22:53:10 +07:00
Fadli
a31c10a608 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-24 22:31:44 +07:00
Fadli
ef1f912871 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-22 13:11:55 +07:00
Fadli
0ecf5f9480 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-22 13:11:32 +07:00
Fadli
d8c9e2be72 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-22 13:07:32 +07:00
Fadli
beaac7e4ad Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-22 13:07:02 +07:00
Fadli
e0279c410e Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-21 16:35:03 +07:00
Fadli
dfd05013c5 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-21 16:34:38 +07:00
Fadli
f5295bcc4e Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-18 16:07:39 +07:00
Fadli
aed60a6f30 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-18 16:07:16 +07:00
Fadli
77b5e52ff9 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-18 16:02:32 +07:00
Fadli
7eda53cb4c Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-18 16:01:02 +07:00
Fadli
2d1275651f Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-18 15:40:31 +07:00
Fadli
904e8add9e Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-18 15:39:55 +07:00
Fadli
1b53e34683 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-17 12:29:14 +07:00
Fadli
2f40d9c4a8 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-17 12:28:44 +07:00
Fadli
1717554d9d Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-17 03:11:10 +07:00
Fadli
70fd1e06a7 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-17 03:10:43 +07:00
Fadli
29def85db0 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-17 02:45:53 +07:00
Fadli
626d4f5514 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-17 02:45:08 +07:00
Fadli
096bbfc83f Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-16 23:57:59 +07:00
Fadli
d644462496 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-16 23:56:59 +07:00
Fadli
2c9fc80a92 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-16 23:53:47 +07:00
Fadli
5b1d7294bf Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-16 12:16:31 +07:00
Fadli
a2b801f3b6 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-16 12:16:03 +07:00
Fadli
91c263ec41 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-16 11:48:46 +07:00
Fadli
0f25659a70 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-16 11:47:29 +07:00
Fadli
c131c9e24f Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-10-28 11:11:50 +07:00
Fadli
fa9569b80c Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-28 11:11:17 +07:00
Fadli
4e9d4e48f9 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-10-28 11:08:07 +07:00
Fadli
c428574ae3 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-27 00:12:52 +07:00
Fadli
85fda283db Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-26 12:35:35 +07:00
Fadli
c5b27575ab Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-26 12:10:01 +07:00
Fadli
5e1dbf7209 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-25 13:01:19 +07:00
Fadli
de41172c5f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-21 17:27:25 +07:00
Fadli
5c3e8f05f0 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-19 16:53:46 +07:00
Fadli
d2cb64cc8d Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-18 13:07:27 +07:00
Fadli
83594cb0e3 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-12 11:50:57 +07:00
Fadli
6ac60fac2b Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-10-12 10:46:28 +07:00
Fadli
1bc5fd08dc Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-12 10:46:02 +07:00
Fadli
4253434e0b Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-10-12 10:43:39 +07:00
Fadli
44bdfc3916 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-12 10:42:10 +07:00
Fadli
ff333173b3 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-10-12 10:25:21 +07:00
Fadli
76b6ff9888 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-12 10:24:53 +07:00
Fadli
50c1c08c51 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-12 10:06:45 +07:00
Fadli
555bad6f27 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-12 09:59:51 +07:00
Fadli
7ee95b6da2 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-12 09:53:40 +07:00
Fadli
31486e4392 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-11 11:41:24 +07:00
Fadli
e9ac78aa5a Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-10-11 11:32:02 +07:00
Fadli
23acd699d4 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-11 11:31:16 +07:00
Fadli
6d75bfaa9b Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-10 22:03:25 +07:00
Fadli
842cbe757b Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-10-10 17:22:36 +07:00
Fadli
fed04631db Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-10 17:21:52 +07:00
Fadli
a2e81f1c53 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-10-10 14:45:53 +07:00
Fadli
4a293638fe Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-10 14:44:57 +07:00
Fadli
0f1514e58f Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-30 14:04:54 +07:00
Fadli
88a73af076 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-30 14:04:05 +07:00
Fadli
4ab55f27c5 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-14 12:23:01 +07:00
Fadli
e56b341470 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-14 12:21:56 +07:00
Fadli
558689d487 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-14 11:19:56 +07:00
Fadli
3fa92bee30 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-14 11:19:24 +07:00
Fadli
10dc71887e Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-12 12:39:30 +07:00
muhammad fadil
6758b090cc Merge branch 'development' into 'devops-staging'
fix: get list by categories all where partner is null

See merge request empatnusabangsa/ppob/ppob-backend!220
2022-09-07 12:20:32 +00:00
muhammad fadil
b6a743d006 Merge branch 'development' into 'devops-staging'
fix: get list by categories all where supplier status is true

See merge request empatnusabangsa/ppob/ppob-backend!219
2022-09-07 10:52:31 +00:00
muhammad fadil
b454652177 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!218
2022-09-07 10:12:41 +00:00
Fadli
be4c85d930 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-07 01:26:39 +07:00
Fadli
4ddc2d7d4f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-07 01:26:01 +07:00
Fadli
09f9810792 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-07 00:55:58 +07:00
Fadli
f1cedd44bf Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-07 00:55:03 +07:00
Fadli
8fdd79d0ce Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-06 22:30:29 +07:00
Fadli
cdcb1cebc5 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-06 22:29:56 +07:00
Fadli
6670352210 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-06 22:20:37 +07:00
Fadli
ce8497827a Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-06 22:17:52 +07:00
Fadli
57ed270c55 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-06 22:00:53 +07:00
Fadli
15e4090527 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-06 22:00:17 +07:00
Fadli
6ba62ed85d Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-06 21:44:26 +07:00
Fadli
b7b3c6a6e2 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-06 21:43:56 +07:00
Fadli
d1be6fcef6 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-06 21:37:18 +07:00
Fadli
ee3625531d Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-06 21:36:39 +07:00
muhammad fadil
179669ff47 Merge branch 'development' into 'devops-staging'
fix: get list product by categories

See merge request empatnusabangsa/ppob/ppob-backend!217
2022-09-06 10:16:29 +00:00
Fadli
1ab030a5fd Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-06 13:27:07 +07:00
Fadli
f607b4eccf Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-06 13:25:49 +07:00
Fadli
e4d6983298 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-06 13:16:59 +07:00
Fadli
ab0dd66dd9 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-06 13:15:51 +07:00
muhammad fadil
89e71c4c94 Merge branch 'devops-staging' into 'master'
Devops staging

See merge request empatnusabangsa/ppob/ppob-backend!215
2022-09-01 09:47:00 +00:00
muhammad fadil
ec947576ac Merge branch 'development' into 'devops-staging'
fix: update status product at upload product

See merge request empatnusabangsa/ppob/ppob-backend!214
2022-09-01 09:45:04 +00:00
Fadli
79d776af8d Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-31 12:26:30 +07:00
Fadli
1a3c062ad3 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-31 12:25:38 +07:00
Fadli
87b4183b9d Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-31 11:28:58 +07:00
Fadli
a6dd49638a Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-31 11:28:13 +07:00
Fadli
53f50cfc6c Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-31 07:14:07 +07:00
Fadli
46bf90d2c9 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-31 07:13:36 +07:00
Fadli
89a66ed1a1 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-31 07:07:42 +07:00
Fadli
8c9d16fe7d Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-31 07:07:05 +07:00
muhammad fadil
64b608e808 Merge branch 'devops-staging' into 'master'
Devops staging

See merge request empatnusabangsa/ppob/ppob-backend!212
2022-08-30 18:34:49 +00:00
muhammad fadil
f788b568e8 Merge branch 'development' into 'devops-staging'
fix: update status product at upload product

See merge request empatnusabangsa/ppob/ppob-backend!211
2022-08-30 18:32:02 +00:00
Fadli
939b18dd6a Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-30 17:40:27 +07:00
Fadli
f0145890fa Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-30 17:39:54 +07:00
Fadli
733626c1be Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-30 14:46:36 +07:00
Fadli
cf72eb7c20 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-30 14:46:01 +07:00
Fadli
b4e4a70fe3 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-30 14:32:27 +07:00
Fadli
1d6ed2045f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-30 14:29:25 +07:00
Fadli
b4a00ab365 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-30 11:09:36 +07:00
Fadli
0c4c423a36 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-30 11:06:11 +07:00
Fadli
2afa086123 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-30 01:47:26 +07:00
Fadli
b1594b3e1a Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-30 01:19:27 +07:00
Fadli
1160ddff8c Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-30 00:42:16 +07:00
Fadli
19c6bfe767 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-30 00:32:44 +07:00
Fadli
02cd289988 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-30 00:25:25 +07:00
Fadli
53df1d9802 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-30 00:18:48 +07:00
Fadli
84749b5b06 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-29 23:19:48 +07:00
Fadli
5e4317395a Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-29 22:57:54 +07:00
Fadli
f97109c35b Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-23 06:02:48 +07:00
Fadli
479affe44b Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-23 05:59:54 +07:00
Fadli
10c85dab5f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-23 05:55:56 +07:00
Fadli
0ad6aa3490 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-23 05:52:05 +07:00
Fadli
da5e3cc6eb Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-23 05:31:39 +07:00
Fadli
01be11b0a2 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-21 01:52:57 +07:00
Fadli
b5373356b7 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-21 01:52:24 +07:00
Fadli
1f91072f3e Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-21 01:44:30 +07:00
Fadli
b34b39e39c Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-21 01:43:51 +07:00
Fadli
52375b242a Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-21 01:17:08 +07:00
Fadli
b720a93983 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-21 01:16:17 +07:00
Fadli
5b298f39eb Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-20 23:41:59 +07:00
Fadli
8009df499e Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-20 23:41:27 +07:00
Fadli
0f6d41351c Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-20 23:30:51 +07:00
Fadli
a6e03d68ac Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-20 23:30:13 +07:00
muhammad fadil
4f5bd7bdd0 Merge branch 'devops-staging' into 'master'
Devops staging

See merge request empatnusabangsa/ppob/ppob-backend!209
2022-08-15 07:45:53 +00:00
muhammad fadil
c0e95e9c7d Merge branch 'development' into 'devops-staging'
Fix: top up supplier

See merge request empatnusabangsa/ppob/ppob-backend!208
2022-08-15 07:42:29 +00:00
muhammad fadil
fcf6136e65 Merge branch 'devops-staging' into 'master'
Devops staging

See merge request empatnusabangsa/ppob/ppob-backend!206
2022-08-15 07:04:50 +00:00
muhammad fadil
1ab6cd6bac Merge branch 'development' into 'devops-staging'
Fix: top up supplier

See merge request empatnusabangsa/ppob/ppob-backend!205
2022-08-15 07:02:22 +00:00
muhammad fadil
29e2a1803d Merge branch 'devops-staging' into 'master'
Devops staging

See merge request empatnusabangsa/ppob/ppob-backend!202
2022-08-15 06:28:11 +00:00
muhammad fadil
f890a17c0d Merge branch 'development' into 'devops-staging'
Fix: top up supplier

See merge request empatnusabangsa/ppob/ppob-backend!201
2022-08-15 06:25:18 +00:00
Fadli
dcb85e0ef7 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-15 02:27:06 +07:00
muhammad fadil
0fee77b615 Merge branch 'development' into 'devops-staging'
Fix: balance remaining

See merge request empatnusabangsa/ppob/ppob-backend!200
2022-08-12 14:37:26 +00:00
Fadli
3575aa47b1 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-10 23:57:15 +07:00
Fadli
dd80de65c5 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-10 23:21:14 +07:00
Fadli
038b6a14c5 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-10 23:05:37 +07:00
Fadli
ba446d7a0e Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-10 22:41:19 +07:00
Fadli
24b277f231 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-10 22:31:57 +07:00
muhammad fadil
61cf8d71a7 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!199
2022-08-10 14:23:08 +00:00
muhammad fadil
7e417fee62 Merge branch 'development' into 'devops-staging'
Fix: query productPriceRepository

See merge request empatnusabangsa/ppob/ppob-backend!198
2022-08-10 09:05:48 +00:00
muhammad fadil
c70a723ca4 Merge branch 'development' into 'devops-staging'
Feat: add query productPriceRepository

See merge request empatnusabangsa/ppob/ppob-backend!197
2022-08-10 07:06:53 +00:00
muhammad fadil
1b03d689b3 Merge branch 'development' into 'devops-staging'
Feat: add logs at callback failed

See merge request empatnusabangsa/ppob/ppob-backend!196
2022-08-10 04:25:37 +00:00
Fadli
504ebfc3bd Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-10 03:23:16 +07:00
muhammad fadil
4dfe7dd6de Merge branch 'development' into 'devops-staging'
Feat: add try catch at callback metro

See merge request empatnusabangsa/ppob/ppob-backend!195
2022-08-09 13:39:29 +00:00
muhammad fadil
2951f60680 Merge branch 'development' into 'devops-staging'
Feat: add column balance_remaining at get list history-user

See merge request empatnusabangsa/ppob/ppob-backend!194
2022-08-08 07:30:11 +00:00
muhammad fadil
5919685124 Merge branch 'development' into 'devops-staging'
Feat: add column and function balance_remaining

See merge request empatnusabangsa/ppob/ppob-backend!193
2022-08-05 16:12:21 +00:00
Fadli
59a6f1eb9e Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-05 14:58:21 +07:00
Fadli
11b73195ce Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-05 14:57:34 +07:00
Fadli
6606a95234 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-05 14:55:12 +07:00
Fadli
e7c8dbf8f5 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-05 14:31:49 +07:00
Fadli
433de77ab0 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-05 14:31:00 +07:00
Fadli
19541ce796 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-05 12:53:04 +07:00
Fadli
b51f77516e Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-05 12:51:53 +07:00
Fadli
a9d09a40ff Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-08-05 11:42:00 +07:00
Fadli
3396a67709 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-04 18:44:56 +07:00
Fadli
80340618b9 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-04 18:10:08 +07:00
Fadli
0f24e89bf0 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-03 22:48:41 +07:00
muhammad fadil
b4767bae1b Merge branch 'development' into 'devops-staging'
Fix: error callback order failed

See merge request empatnusabangsa/ppob/ppob-backend!192
2022-08-03 15:08:46 +00:00
Fadli
238b7ed576 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-03 19:27:01 +07:00
Fadli
5d2c79cea9 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-08-03 19:01:34 +07:00
Fadli
ffdf888d24 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-07-23 01:04:45 +07:00
Fadli
849e5f3cfc Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-07-22 08:58:05 +07:00
Fadli
3913bc8c8a Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-07-22 04:14:33 +07:00
Fadli
642ac5f749 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-07-22 03:17:47 +07:00
muhammad fadil
caf921b400 Merge branch 'development' into 'devops-staging'
Feat: add column supplier_name and product_price at get list history user

See merge request empatnusabangsa/ppob/ppob-backend!191
2022-07-18 15:41:53 +00:00
Fadli
9f4ea6bd1a Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-07-01 02:36:35 +07:00
Fadli
cd978afd7d Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-07-01 02:35:38 +07:00
Fadli
55193f4a5c Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-06-29 23:56:03 +07:00
Fadli
8641929e29 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-06-29 23:55:03 +07:00
Fadli
949e368c2f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-06-29 23:53:43 +07:00
ilham dwi pratama
828b82b7b6 Merge branch 'development' into 'devops-staging'
fix: callbacktransction

See merge request empatnusabangsa/ppob/ppob-backend!190
2022-06-28 10:11:04 +00:00
ilham dwi pratama
0111600d89 Merge branch 'development' into 'devops-staging'
fix: callbacktransction

See merge request empatnusabangsa/ppob/ppob-backend!189
2022-06-28 10:07:01 +00:00
ilham dwi pratama
a2af6e7043 Merge branch 'development' into 'devops-staging'
fix: callbacktransction

See merge request empatnusabangsa/ppob/ppob-backend!188
2022-06-28 09:22:50 +00:00
ilham dwi pratama
564166f14f Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!186
2022-06-28 08:41:03 +00:00
ilham dwi pratama
e2a66b80bc Merge branch 'development' into 'master'
Development

See merge request empatnusabangsa/ppob/ppob-backend!185
2022-06-28 08:16:55 +00:00
ilham dwi pratama
62a9690bec Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!184
2022-06-28 06:53:12 +00:00
ilham dwi pratama
6ffab1a2a0 Merge branch 'development' into 'master'
fix: callback ppob

See merge request empatnusabangsa/ppob/ppob-backend!183
2022-06-28 06:51:52 +00:00
muhammad fadil
a972e1e570 Merge branch 'development' into 'master'
Development

See merge request empatnusabangsa/ppob/ppob-backend!181
2022-06-21 17:16:21 +00:00
muhammad fadil
8b8d921c7c Merge branch 'development' into 'devops-staging'
Feat: add relation to partner

See merge request empatnusabangsa/ppob/ppob-backend!180
2022-06-20 06:35:54 +00:00
ilham dwi pratama
80e5aa4431 Merge branch 'development' into 'devops-staging'
fix: callback ppob

See merge request empatnusabangsa/ppob/ppob-backend!179
2022-06-16 09:44:14 +00:00
ilham dwi pratama
c06b40e839 Merge branch 'development' into 'devops-staging'
fix: callback ppob

See merge request empatnusabangsa/ppob/ppob-backend!178
2022-06-16 07:39:46 +00:00
muhammad fadil
929cec7fa9 Merge branch 'development' into 'devops-staging'
Fix: bug filter get product by categories

See merge request empatnusabangsa/ppob/ppob-backend!177
2022-05-25 04:31:54 +00:00
muhammad fadil
a67be14731 Merge branch 'development' into 'devops-staging'
Fix: bug filter get product by categories

See merge request empatnusabangsa/ppob/ppob-backend!176
2022-05-24 15:49:18 +00:00
muhammad fadil
384e40c32f Merge branch 'development' into 'devops-staging'
Feat: add rumus prepaid and postpaid

See merge request empatnusabangsa/ppob/ppob-backend!175
2022-05-24 13:26:11 +00:00
ilham dwi pratama
a445de1bba Merge branch 'development' into 'devops-staging'
fix: callback failed on bill

See merge request empatnusabangsa/ppob/ppob-backend!174
2022-05-23 18:10:24 +00:00
ilham dwi pratama
2fd2f042e9 Merge branch 'development' into 'devops-staging'
fix: transaction

See merge request empatnusabangsa/ppob/ppob-backend!173
2022-05-23 17:47:39 +00:00
ilham dwi pratama
3b4da47eb7 Merge branch 'development' into 'devops-staging'
fix: ppob callback

See merge request empatnusabangsa/ppob/ppob-backend!172
2022-05-23 17:43:33 +00:00
ilham dwi pratama
772a921058 Merge branch 'development' into 'devops-staging'
fix: ppob callback

See merge request empatnusabangsa/ppob/ppob-backend!171
2022-05-23 17:34:48 +00:00
muhammad fadil
12c1aaf5a6 Merge branch 'development' into 'devops-staging'
Feat: add column admin_price

See merge request empatnusabangsa/ppob/ppob-backend!170
2022-05-23 14:33:45 +00:00
muhammad fadil
f8c18522cf Merge branch 'development' into 'devops-staging'
Feat: add column partner_fee

See merge request empatnusabangsa/ppob/ppob-backend!169
2022-05-23 14:22:28 +00:00
ilham dwi pratama
4368d0ad8d Merge branch 'development' into 'devops-staging'
fixing: callback transaction

See merge request empatnusabangsa/ppob/ppob-backend!168
2022-05-21 12:41:31 +00:00
ilham dwi pratama
05f77ebf67 Merge branch 'development' into 'devops-staging'
fixing: callback transaction

See merge request empatnusabangsa/ppob/ppob-backend!167
2022-05-21 11:34:01 +00:00
ilham dwi pratama
a7a6290e2c Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!166
2022-05-21 08:21:43 +00:00
ilham dwi pratama
c2988d30a9 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!165
2022-05-21 07:40:03 +00:00
muhammad fadil
03c1dcabee Merge branch 'development' into 'devops-staging'
Feat add get by id check bill history

See merge request empatnusabangsa/ppob/ppob-backend!164
2022-05-19 12:29:33 +00:00
ilham dwi pratama
b1a71c4153 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!163
2022-05-18 15:24:33 +00:00
ilham dwi pratama
f40236fac4 Merge branch 'development' into 'devops-staging'
fixing: check bill

See merge request empatnusabangsa/ppob/ppob-backend!162
2022-05-17 07:51:30 +00:00
ilham dwi pratama
a10f471326 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!161
2022-05-17 07:29:02 +00:00
ilham dwi pratama
3029a533f3 Merge branch 'development' into 'devops-staging'
fix: callback

See merge request empatnusabangsa/ppob/ppob-backend!160
2022-05-12 17:46:21 +00:00
ilham dwi pratama
62b9476387 Merge branch 'development' into 'devops-staging'
fix: admin price

See merge request empatnusabangsa/ppob/ppob-backend!159
2022-05-12 17:39:44 +00:00
ilham dwi pratama
ab394582bd Merge branch 'development' into 'devops-staging'
fix: callback

See merge request empatnusabangsa/ppob/ppob-backend!158
2022-05-12 17:32:41 +00:00
muhammad fadil
e3c58d8e3b Merge branch 'development' into 'devops-staging'
Feat add column admin_price at table product history price

See merge request empatnusabangsa/ppob/ppob-backend!157
2022-05-11 10:01:25 +00:00
muhammad fadil
2397279332 Merge branch 'development' into 'devops-staging'
Fix: filter sub categories

See merge request empatnusabangsa/ppob/ppob-backend!156
2022-05-09 10:30:53 +00:00
ilham dwi pratama
1135599a9b Merge branch 'development' into 'devops-staging'
fix: product in partner

See merge request empatnusabangsa/ppob/ppob-backend!155
2022-05-08 15:43:27 +00:00
ilham dwi pratama
f045481f6f Merge branch 'development' into 'devops-staging'
fix: check bill

See merge request empatnusabangsa/ppob/ppob-backend!154
2022-05-05 11:22:02 +00:00
ilham dwi pratama
5062e50a48 Merge branch 'development' into 'devops-staging'
add: transaction billing

See merge request empatnusabangsa/ppob/ppob-backend!153
2022-05-03 12:32:07 +00:00
ilham dwi pratama
36cb20d8dd Merge branch 'development' into 'devops-staging'
add: check bill

See merge request empatnusabangsa/ppob/ppob-backend!152
2022-04-29 08:53:28 +00:00
ilham dwi pratama
bd5022e5cb Merge branch 'development' into 'devops-staging'
fix: callback metro

See merge request empatnusabangsa/ppob/ppob-backend!151
2022-04-28 10:48:11 +00:00
muhammad fadil
a7ed0ebdc5 Merge branch 'development' into 'devops-staging'
add : Add supplier: Metro, logic for the callback

See merge request empatnusabangsa/ppob/ppob-backend!150
2022-04-28 10:45:49 +00:00
muhammad fadil
c8cc51d288 Merge branch 'development' into 'devops-staging'
Feat: add validation error if id partner is null

See merge request empatnusabangsa/ppob/ppob-backend!149
2022-04-26 05:48:40 +00:00
ilham dwi pratama
87868dfd19 Merge branch 'development' into 'devops-staging'
add: new partner

See merge request empatnusabangsa/ppob/ppob-backend!148
2022-04-14 07:10:10 +00:00
ilham dwi pratama
9a2c4bceaf Merge branch 'development' into 'devops-staging'
add: new partner

See merge request empatnusabangsa/ppob/ppob-backend!147
2022-04-14 06:24:34 +00:00
ab9dd9c207 Merge branch 'development' into 'devops-staging'
add column in table supplier

See merge request empatnusabangsa/ppob/ppob-backend!146
2022-04-01 18:36:30 +00:00
e10b9d1ecb Merge branch 'development' into 'devops-staging'
add column url in table supplier

See merge request empatnusabangsa/ppob/ppob-backend!145
2022-04-01 11:18:43 +00:00
c9de9fadf6 Merge branch 'development' into 'devops-staging'
add column url in table supplier

See merge request empatnusabangsa/ppob/ppob-backend!144
2022-04-01 10:53:09 +00:00
d13b3067df Merge branch 'development' into 'devops-staging'
add column url in table supplier

See merge request empatnusabangsa/ppob/ppob-backend!143
2022-04-01 08:58:15 +00:00
e66dc3ef6a Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!142
2022-03-31 18:09:41 +00:00
ilham dwi pratama
ea54c113fa Merge branch 'development' into 'master'
add: order by in product retail

See merge request empatnusabangsa/ppob/ppob-backend!140
2022-03-10 17:25:52 +00:00
ilham dwi pratama
a2e640a0af Merge branch 'development' into 'master'
fix: product

See merge request empatnusabangsa/ppob/ppob-backend!138
2022-03-10 17:05:40 +00:00
ilham dwi pratama
77b3a77ca8 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!136
2022-02-27 02:18:44 +00:00
ilham dwi pratama
7cb93db9fe Merge branch 'development' into 'master'
Development

See merge request empatnusabangsa/ppob/ppob-backend!135
2022-02-27 02:16:55 +00:00
ilham dwi pratama
65be12a4c4 Merge branch 'development' into 'devops-staging'
fix: transaction service

See merge request empatnusabangsa/ppob/ppob-backend!133
2022-02-05 18:21:23 +00:00
ilham dwi pratama
3479daf015 Merge branch 'development' into 'master'
fix: transaction service

See merge request empatnusabangsa/ppob/ppob-backend!132
2022-02-05 18:20:43 +00:00
ilham dwi pratama
518f12c62b Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!130
2022-02-05 14:09:51 +00:00
ilham dwi pratama
58ada53eec Merge branch 'development' into 'master'
fix: transaction

See merge request empatnusabangsa/ppob/ppob-backend!129
2022-02-05 14:08:47 +00:00
ilham dwi pratama
93832fa1e4 Merge branch 'development' into 'master'
fix: transaction service

See merge request empatnusabangsa/ppob/ppob-backend!127
2022-02-04 15:39:34 +00:00
ilham dwi pratama
d003378518 Merge branch 'development' into 'master'
fix: calculating

See merge request empatnusabangsa/ppob/ppob-backend!125
2022-02-04 14:29:33 +00:00
ilham dwi pratama
51be905bc0 Merge branch 'development' into 'master'
Development

See merge request empatnusabangsa/ppob/ppob-backend!123
2022-02-04 13:13:45 +00:00
ilham dwi pratama
e3d3cdadc8 Merge branch 'development' into 'master'
fix: hit elang

See merge request empatnusabangsa/ppob/ppob-backend!120
2022-02-04 13:04:39 +00:00
ilham dwi pratama
3971f2196b Merge branch 'development' into 'devops-staging'
fix: hit elang

See merge request empatnusabangsa/ppob/ppob-backend!119
2022-02-04 13:00:19 +00:00
63c1d9d261 Merge branch 'development' into 'master'
add: history-deposit-profile

See merge request empatnusabangsa/ppob/ppob-backend!116
2022-02-03 07:04:28 +00:00
ilham dwi pratama
87d7734023 Merge branch 'development' into 'devops-staging'
add: history-deposit-profile

See merge request empatnusabangsa/ppob/ppob-backend!115
2022-02-02 19:51:14 +00:00
ilham
d44fa33721 Merge remote-tracking branch 'origin/master' 2022-01-28 16:01:23 +07:00
ilham dwi pratama
ef783d83e0 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!110
2022-01-28 05:32:35 +00:00
ilham dwi pratama
7436801002 Merge branch 'development' into 'devops-staging'
fix: one way pembayaran

See merge request empatnusabangsa/ppob/ppob-backend!109
2022-01-26 07:31:19 +00:00
ilham dwi pratama
ca70f7cef4 Merge branch 'development' into 'devops-staging'
fix: resend user

See merge request empatnusabangsa/ppob/ppob-backend!108
2022-01-24 11:10:58 +00:00
ilham dwi pratama
324879ad22 Merge branch 'development' into 'devops-staging'
fix user

See merge request empatnusabangsa/ppob/ppob-backend!107
2022-01-24 10:16:24 +00:00
ilham dwi pratama
ece11e8fe3 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!106
2022-01-24 09:10:43 +00:00
ilham dwi pratama
289fef715a Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!105
2022-01-24 08:35:29 +00:00
ilham dwi pratama
ec251d8e7d Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!104
2022-01-24 06:39:54 +00:00
ilham dwi pratama
c639944147 Merge branch 'development' into 'devops-staging'
fix: approve user

See merge request empatnusabangsa/ppob/ppob-backend!103
2022-01-24 06:11:52 +00:00
ilham dwi pratama
523cc31ff4 Merge branch 'development' into 'devops-staging'
fix approval user

See merge request empatnusabangsa/ppob/ppob-backend!102
2022-01-24 05:27:20 +00:00
ilham dwi pratama
42a0d75916 Merge branch 'development' into 'devops-staging'
fix approval user

See merge request empatnusabangsa/ppob/ppob-backend!101
2022-01-24 04:40:26 +00:00
ilham dwi pratama
f59f2e47bc Merge branch 'development' into 'devops-staging'
fix: user approval

See merge request empatnusabangsa/ppob/ppob-backend!100
2022-01-24 04:02:33 +00:00
48ccfca6c1 Merge branch 'development' into 'devops-staging'
fix: approve retail

See merge request empatnusabangsa/ppob/ppob-backend!99
2022-01-24 02:23:00 +00:00
ilham dwi pratama
e82931f241 Merge branch 'development' into 'devops-staging'
fix: update user

See merge request empatnusabangsa/ppob/ppob-backend!98
2022-01-12 04:18:38 +00:00
ilham dwi pratama
cd478fe21d Merge branch 'development' into 'devops-staging'
fix: paging in membership

See merge request empatnusabangsa/ppob/ppob-backend!97
2022-01-12 04:10:58 +00:00
ilham dwi pratama
23b663c33b Merge branch 'development' into 'devops-staging'
fixing: transaction create

See merge request empatnusabangsa/ppob/ppob-backend!96
2022-01-09 17:21:16 +00:00
ilham dwi pratama
6c2c9c82a9 Merge branch 'development' into 'devops-staging'
fixing: transaction create

See merge request empatnusabangsa/ppob/ppob-backend!95
2022-01-09 17:14:47 +00:00
ilham dwi pratama
8a43f80689 Merge branch 'development' into 'devops-staging'
fix: transaction

See merge request empatnusabangsa/ppob/ppob-backend!94
2022-01-09 16:52:23 +00:00
ilham dwi pratama
36262d8b4d Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!93
2022-01-07 10:15:01 +00:00
ilham dwi pratama
ebfb53d045 Merge branch 'development' into 'devops-staging'
add: new column in user

See merge request empatnusabangsa/ppob/ppob-backend!92
2022-01-07 08:35:24 +00:00
ilham dwi pratama
d9f964de90 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!91
2022-01-06 16:22:25 +00:00
ilham dwi pratama
22d4f0a8bc Merge branch 'development' into 'devops-staging'
fix: fix order by transaction

See merge request empatnusabangsa/ppob/ppob-backend!89
2022-01-06 04:43:31 +00:00
ilham dwi pratama
d38e4207c5 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!88
2022-01-06 02:42:00 +00:00
ilham dwi pratama
3f77af8645 Merge branch 'development' into 'devops-staging'
fix: deploy

See merge request empatnusabangsa/ppob/ppob-backend!87
2022-01-05 15:58:40 +00:00
ilham dwi pratama
e3d8d223c6 Merge branch 'development' into 'devops-staging'
fix: change password partner

See merge request empatnusabangsa/ppob/ppob-backend!86
2022-01-05 07:48:57 +00:00
ilham dwi pratama
c16a9eef6f Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!85
2022-01-05 07:10:26 +00:00
ilham dwi pratama
71264c5b13 Merge branch 'development' into 'devops-staging'
fix: transaction-history-user

See merge request empatnusabangsa/ppob/ppob-backend!84
2022-01-05 05:03:38 +00:00
ilham dwi pratama
d587f7a2ce Merge branch 'development' into 'devops-staging'
fix: update price

See merge request empatnusabangsa/ppob/ppob-backend!83
2022-01-03 12:56:40 +00:00
ilham dwi pratama
ffd02a6030 Merge branch 'development' into 'devops-staging'
fix: transaction history by desc

See merge request empatnusabangsa/ppob/ppob-backend!82
2022-01-03 09:09:42 +00:00
ilham dwi pratama
e0b8512818 Merge branch 'development' into 'devops-staging'
fix: profile

See merge request empatnusabangsa/ppob/ppob-backend!81
2022-01-03 06:13:33 +00:00
ilham dwi pratama
a58dc04f71 Merge branch 'development' into 'devops-staging'
fix: transaction for dashboard partner

See merge request empatnusabangsa/ppob/ppob-backend!80
2022-01-03 06:00:55 +00:00
ilham dwi pratama
f25c48404d Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!79
2022-01-03 05:49:57 +00:00
ilham dwi pratama
bdb7a1928b Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!78
2022-01-02 09:57:11 +00:00
ilham dwi pratama
a60747337f Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!77
2021-12-30 18:17:46 +00:00
ilham dwi pratama
034df71492 Merge branch 'development' into 'devops-staging'
fix: order history

See merge request empatnusabangsa/ppob/ppob-backend!76
2021-12-29 23:49:20 +00:00
ilham dwi pratama
eb846ce8e0 Merge branch 'development' into 'devops-staging'
fix filter transaction

See merge request empatnusabangsa/ppob/ppob-backend!75
2021-12-29 09:40:35 +00:00
ilham dwi pratama
953ce99d11 Merge branch 'development' into 'devops-staging'
fix: order history and add filter

See merge request empatnusabangsa/ppob/ppob-backend!74
2021-12-29 09:32:46 +00:00
ilham dwi pratama
a6fce54b87 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!73
2021-12-29 08:15:09 +00:00
ilham dwi pratama
83f765c85a Merge branch 'development' into 'devops-staging'
fix: product service

See merge request empatnusabangsa/ppob/ppob-backend!72
2021-12-28 11:45:39 +00:00
ilham dwi pratama
29cfea2d56 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!71
2021-12-28 11:30:04 +00:00
ilham dwi pratama
79783cebad Merge branch 'development' into 'devops-staging'
fix: change password partner

See merge request empatnusabangsa/ppob/ppob-backend!70
2021-12-27 03:55:13 +00:00
ilham dwi pratama
645eb45996 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!68
2021-12-26 16:02:45 +00:00
ilham dwi pratama
af47b8243d Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!67
2021-12-26 04:04:19 +00:00
ilham dwi pratama
c663dbda92 Merge branch 'development' into 'master'
Development

See merge request empatnusabangsa/ppob/ppob-backend!66
2021-12-25 17:44:22 +00:00
ilham dwi pratama
c6b4303adc Merge branch 'development' into 'devops-staging'
fix: product

See merge request empatnusabangsa/ppob/ppob-backend!65
2021-12-23 14:44:41 +00:00
ilham dwi pratama
5222381d39 Merge branch 'development' into 'devops-staging'
add: profit akun coa

See merge request empatnusabangsa/ppob/ppob-backend!64
2021-12-23 13:45:04 +00:00
ilham dwi pratama
09c2b93741 Merge branch 'development' into 'devops-staging'
fix: upload product

See merge request empatnusabangsa/ppob/ppob-backend!63
2021-12-23 13:20:44 +00:00
ilham dwi pratama
23fae85ecf Merge branch 'development' into 'devops-staging'
fix: upload product

See merge request empatnusabangsa/ppob/ppob-backend!62
2021-12-23 13:00:28 +00:00
Catur Bagaskara
56747cf717 Merge branch 'development' into 'devops-staging'
feat: add key supplier name in product all

See merge request empatnusabangsa/ppob/ppob-backend!61
2021-12-23 10:00:36 +00:00
ilham dwi pratama
ea33eef5c4 Merge branch 'development' into 'devops-staging'
add: update user

See merge request empatnusabangsa/ppob/ppob-backend!60
2021-12-23 09:17:14 +00:00
Catur Bagaskara
0aeae2f673 Merge branch 'development' into 'devops-staging'
feat: add endpoint product detail

See merge request empatnusabangsa/ppob/ppob-backend!59
2021-12-23 06:27:37 +00:00
ilham dwi pratama
a59ce9ab22 Merge branch 'development' into 'devops-staging'
add: create product based on csv

See merge request empatnusabangsa/ppob/ppob-backend!58
2021-12-23 05:50:04 +00:00
Catur Bagaskara
f99bede20e Merge branch 'development' into 'devops-staging'
feat: rearrangement find one user api service

See merge request empatnusabangsa/ppob/ppob-backend!57
2021-12-23 04:45:17 +00:00
ilham dwi pratama
8b05ffd936 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!56
2021-12-22 18:19:18 +00:00
ilham dwi pratama
025995f1f7 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!55
2021-12-22 17:45:22 +00:00
ilham dwi pratama
f74c75050b Merge branch 'development' into 'devops-staging'
fix: confirm deposit return

See merge request empatnusabangsa/ppob/ppob-backend!54
2021-12-22 17:36:25 +00:00
ilham dwi pratama
42f830814f Merge branch 'development' into 'devops-staging'
fix: confirm deposit return

See merge request empatnusabangsa/ppob/ppob-backend!53
2021-12-22 17:30:43 +00:00
ilham dwi pratama
0eb95cd9df Merge branch 'development' into 'devops-staging'
fix: get product for transaction

See merge request empatnusabangsa/ppob/ppob-backend!52
2021-12-22 17:14:55 +00:00
ilham dwi pratama
9a2d63992a Merge branch 'development' into 'devops-staging'
fix: order by membership

See merge request empatnusabangsa/ppob/ppob-backend!51
2021-12-22 16:32:32 +00:00
ilham dwi pratama
514c274be0 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!50
2021-12-22 15:57:47 +00:00
fa2157babd Merge branch 'development' into 'devops-staging'
add pvc

See merge request empatnusabangsa/ppob/ppob-backend!49
2021-12-22 13:58:30 +00:00
Catur Bagaskara
de808d1ba3 Merge branch 'development' into 'devops-staging'
add pvc

See merge request empatnusabangsa/ppob/ppob-backend!48
2021-12-22 13:44:47 +00:00
ilham dwi pratama
388560661c Merge branch 'development' into 'devops-staging'
add: get History Deposit

See merge request empatnusabangsa/ppob/ppob-backend!47
2021-12-22 11:04:22 +00:00
Catur Bagaskara
c35442b67e Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!46
2021-12-22 09:10:43 +00:00
Catur Bagaskara
ccfffe6b48 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!45
2021-12-22 08:31:51 +00:00
Catur Bagaskara
2c151488a6 Merge branch 'development' into 'devops-staging'
feat: add endpoint get product history price

See merge request empatnusabangsa/ppob/ppob-backend!44
2021-12-21 14:38:18 +00:00
Catur Bagaskara
99e203ac6f Merge branch 'development' into 'devops-staging'
feat: remove validation for get image

See merge request empatnusabangsa/ppob/ppob-backend!42
2021-12-21 07:40:03 +00:00
Catur Bagaskara
e56c63911c Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!41
2021-12-21 06:36:53 +00:00
ilham dwi pratama
efe43c811f Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!40
2021-12-20 07:07:42 +00:00
ilham dwi pratama
a44166f1a2 Merge branch 'development' into 'devops-staging'
add: add validation if saldo not enough

See merge request empatnusabangsa/ppob/ppob-backend!39
2021-12-20 05:19:58 +00:00
ilham dwi pratama
6b266f08cc Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!38
2021-12-20 05:14:33 +00:00
ilham dwi pratama
988d0293aa Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!37
2021-12-20 03:23:54 +00:00
ilham dwi pratama
3a93d1d4f9 Merge branch 'development' into 'devops-staging'
fix: entity partner

See merge request empatnusabangsa/ppob/ppob-backend!36
2021-12-17 04:27:29 +00:00
ilham dwi pratama
ed2fc4b437 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!35
2021-12-17 02:53:47 +00:00
ilham dwi pratama
fdc3b64c0d Merge branch 'development' into 'devops-staging'
fix: get product all

See merge request empatnusabangsa/ppob/ppob-backend!34
2021-12-16 19:27:38 +00:00
ilham dwi pratama
0e20db5545 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!33
2021-12-16 19:01:51 +00:00
ilham dwi pratama
430ebc1f59 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!32
2021-12-16 13:57:55 +00:00
ilham dwi pratama
93b073be18 Merge branch 'development' into 'devops-staging'
fix: entity cateogires

See merge request empatnusabangsa/ppob/ppob-backend!31
2021-12-16 12:30:23 +00:00
ilham dwi pratama
2f30072f20 Merge branch 'development' into 'devops-staging'
fix: add code in categories and subcategories

See merge request empatnusabangsa/ppob/ppob-backend!30
2021-12-16 12:13:37 +00:00
ilham dwi pratama
9e18725e16 Merge branch 'development' into 'devops-staging'
fix: add rol in get user

See merge request empatnusabangsa/ppob/ppob-backend!29
2021-12-16 11:13:32 +00:00
ilham dwi pratama
f63dad68ed Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!28
2021-12-16 10:31:36 +00:00
Catur Bagaskara
334761dfcf Merge branch 'development' into 'devops-staging'
fix: add user deetail in get all user

See merge request empatnusabangsa/ppob/ppob-backend!27
2021-12-16 08:45:03 +00:00
ilham dwi pratama
1a33d0268f Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!26
2021-12-16 08:06:24 +00:00
ilham dwi pratama
72d5d8658a Merge branch 'development' into 'devops-staging'
fix: add user detail on create member

See merge request empatnusabangsa/ppob/ppob-backend!25
2021-12-16 06:38:37 +00:00
Catur Bagaskara
c7f80d8cb2 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!24
2021-12-16 03:20:32 +00:00
343a48280f Update Dockerfile 2021-12-16 03:02:04 +00:00
ilham dwi pratama
2c0cef8575 Merge branch 'development' into 'devops-staging'
fix: yarn lock

See merge request empatnusabangsa/ppob/ppob-backend!23
2021-12-14 15:36:30 +00:00
ilham dwi pratama
940c288abb Merge branch 'development' into 'devops-staging'
fix: yarn lock

See merge request empatnusabangsa/ppob/ppob-backend!22
2021-12-14 15:32:34 +00:00
ilham dwi pratama
d2b792e5ef Merge branch 'development' into 'devops-staging'
fixing: get product by supplier and categories

See merge request empatnusabangsa/ppob/ppob-backend!21
2021-12-14 15:19:12 +00:00
ilham dwi pratama
ab50354f06 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!20
2021-12-14 14:54:59 +00:00
Catur Bagaskara
f4e3842ae6 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!19
2021-12-14 13:08:22 +00:00

View File

@ -16,7 +16,7 @@ FROM node:16-alpine as builder
ENV NODE_ENV build ENV NODE_ENV build
USER node #USER node
WORKDIR /home/node WORKDIR /home/node
COPY package.json . COPY package.json .