Commit Graph

1090 Commits

Author SHA1 Message Date
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
42403184b1 - push logs in callback success checking data partneer 2022-09-06 22:17:07 +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
5f5880f4e8 - push logs in callback success checking data partneer 2022-09-06 21:59:50 +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
880d32b4bc - push logs in callback success checking data partneer 2022-09-06 21:43:27 +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
Fadli
9d9772270d - add condition for userdata partner if not null in callback success
- comment check if the transaction is success
2022-09-06 21:36:05 +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
mfadiln2018
6a7c66f461 fix: get list product by categories 2022-09-06 16:44:11 +07: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
08116a3f0d change back status failed and revert success 2022-09-06 13:24:38 +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
Fadli
606864ec3b revert back status failed 2022-09-06 13:14:50 +07:00
mfadiln2018
a650657a8d fix: delete unused code at callback order failed 2022-09-06 12:57:57 +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
mfadiln2018
975cace081 fix: update status product at upload product 2022-09-01 16:44:13 +07: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
95dc740ca2 fix order-prod for b2c temporary 2022-08-31 12:25:08 +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
73820927ce revert back 'fix: update status product at upload product' 2022-08-31 11:26:35 +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
0c617d4c3b changes back 'fix: update status product at upload product' 2022-08-31 07:12:47 +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
Fadli
25a2f2918e - revert 'fix: update status product at upload product' 2022-08-31 07:06:32 +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
mfadiln2018
ab518b8766 fix: update status product at upload product 2022-08-31 01:30:14 +07: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
2e9475e83e - fix list order prod in b2c 2022-08-30 17:39:16 +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
c58e3f281b - fix order prod error when checking status 2022-08-30 14:45:34 +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
52d712fd05 - change status to product history status and only 1 value get from table product history status if value is same 2022-08-30 14:28:27 +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