Commit Graph

762 Commits

Author SHA1 Message Date
mfadiln2018
a650657a8d fix: delete unused code at callback order failed 2022-09-06 12:57:57 +07:00
muhammad fadil
546ec8314b Merge branch 'master' into 'devops-production'
Master

See merge request empatnusabangsa/ppob/ppob-backend!216
2022-09-01 09:47:35 +00: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
61ee5b7b42 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-08-31 12:27:00 +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
376988e04b Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-08-31 11:29:34 +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
62b7a90e02 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-08-31 07:14:39 +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
dc4ee6a86d Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-08-31 07:08:15 +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
4e16517692 Merge branch 'master' into 'devops-production'
Master

See merge request empatnusabangsa/ppob/ppob-backend!213
2022-08-30 18:35:23 +00: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
3cc20691e9 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-08-30 17:41:01 +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
38bee66801 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-08-30 14:47:07 +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
8faf10b04a Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-08-30 14:33:10 +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
1e6c3b1996 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-08-30 11:10:13 +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
ce99cf5327 - change status to product history status and only 1 value get from table product history status if value is same 2022-08-30 11:05:39 +07:00
Fadli
db8e09bc70 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-08-30 01:48:15 +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
42e0ab57dd - change status to product history status 2022-08-30 01:18:57 +07:00
Fadli
112662d069 - change status to product history status 2022-08-30 01:06:35 +07:00
Fadli
8e2106b831 - change status to product history status 2022-08-30 01:05:18 +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
af29531485 - change status to product history status 2022-08-30 00:41:45 +07:00
Fadli
7cdd33cd5a - change status to product history status 2022-08-30 00:39:29 +07:00