Commit Graph

192 Commits

Author SHA1 Message Date
b56e3293ea Merge branch 'dev' into 'staging'
Dev

See merge request pena-services/customer!27
2023-11-26 20:31:07 +00:00
b33122b984 Merge branch 'staging' into 'dev'
# Conflicts:
#   internal/interface/controller/rest/history/history.go
#   internal/interface/repository/history.go
2023-11-26 20:23:21 +00:00
4a3cf4be25 fix: add unwind and group stages to recent tariffs obtaining 2023-11-26 23:19:38 +03:00
Maxim Dolgushin
4f8963f8a3 remove some interfaces 2023-11-26 13:59:08 +03:00
Maxim Dolgushin
32eb736b14 move GetHistories 2023-11-26 13:46:11 +03:00
Maxim Dolgushin
5114839587 move GetHistories 2023-11-26 13:19:46 +03:00
Maxim Dolgushin
fa91bac30f gitignore vendor/ for now 2023-11-26 13:08:02 +03:00
d2e9c74e24 Merge branch 'dev' into 'staging'
Dev

See merge request pena-services/customer!26
2023-11-25 11:44:11 +00:00
c0bb6e4ca4 Dev 2023-11-25 11:44:11 +00:00
3655c76289 Merge branch '3' into 'dev'
3

See merge request pena-services/customer!25
2023-11-25 11:35:55 +00:00
66fd4545a7 fix: remove linter that dosn't allow add todo on the top of the func 2023-11-25 14:23:19 +03:00
0a232e505d add route /recent and fix history repo 2023-11-25 13:36:08 +03:00
1231ee9aaa duplicate processing 2023-11-25 13:36:08 +03:00
ae5e06be33 fix pipeline 2023-11-25 13:36:07 +03:00
c149d6a743 update issue 3 2023-11-25 13:36:07 +03:00
298e079f0f fix: history now filtered by userId 2023-11-21 01:07:13 +03:00
721ed64fdc fix: add workaround for custom prices handling 2023-11-16 01:46:13 +03:00
dedfe552a5 fix: add workaround for custom prices handling 2023-11-16 01:40:48 +03:00
780f614aa4 debug: add logging for broker 2023-11-15 17:17:05 +03:00
1d8a3781e1 debug: add logging for broker 2023-11-15 17:11:37 +03:00
676f6e1b57 fix: set sort of history 2023-10-16 16:16:41 +03:00
2d7f02fd49 fix: set sort of history 2023-10-16 15:12:12 +03:00
ccde1c5a03 Merge branch 'dev' into 'staging'
Dev

See merge request pena-services/customer!24
2023-10-02 21:36:28 +00:00
d961f14ef5 fix: send term to discount service 2023-10-03 00:27:56 +03:00
2ad9df6569 Update tariff.go 2023-09-28 20:56:42 +00:00
c03daca64f Update tariff.go 2023-09-28 20:53:01 +00:00
dc8c5d9546 Merge branch 'dev' into 'staging'
Update tariff.go

See merge request pena-services/customer!23
2023-09-20 20:09:23 +00:00
36518ff61d Update tariff.go 2023-09-20 20:04:15 +00:00
7c81ca50a1 Merge branch 'dev' into 'staging'
Dev

See merge request pena-services/customer!22
2023-09-19 22:25:01 +00:00
c63db0165a debug: rewrite discount products to privileges 2023-09-20 01:17:55 +03:00
75fe1144e7 debug: rewrite discount products to privileges 2023-09-20 01:11:11 +03:00
ab557c7b30 debug: rewrite discount products to privileges 2023-09-20 00:59:16 +03:00
d9761c57b1 Update tariff.go 2023-09-19 21:43:08 +00:00
ff17b6cdd5 Merge branch 'dev' into 'staging'
Update cart.go

See merge request pena-services/customer!21
2023-09-16 21:06:52 +00:00
5b7b2405aa Update cart.go 2023-09-16 21:01:44 +00:00
fff2880086 Merge branch 'dev' into 'staging'
debug: logging pay process

See merge request pena-services/customer!20
2023-09-15 20:03:04 +00:00
a783f0d804 debug: logging pay process 2023-09-15 22:55:39 +03:00
2041c996f4 Merge branch 'dev' into 'staging'
fix: remove regexp from dto

See merge request pena-services/customer!19
2023-09-14 23:06:38 +00:00
56a2dd1e36 fix: remove regexp from dto 2023-09-15 02:01:53 +03:00
42bde9d633 Merge branch 'dev' into 'staging'
fix: remove regexp from dto

See merge request pena-services/customer!18
2023-09-14 22:28:18 +00:00
f1857750fd fix: remove regexp from dto 2023-09-15 01:23:20 +03:00
6a50acdee8 fix: remove regexp from dto 2023-09-15 01:12:25 +03:00
62a9faffbe fix: remove regexp from dto 2023-09-15 01:08:35 +03:00
a375aee477 fix: remove regexp from dto 2023-09-15 01:01:38 +03:00
a53659eb00 Merge branch 'dev' into 'staging'
Update history.go

See merge request pena-services/customer!17
2023-09-14 21:20:27 +00:00
c172dadf06 Update history.go 2023-09-14 21:15:47 +00:00
93b8c79366 Merge branch 'dev' into 'staging'
Dev

See merge request pena-services/customer!16
2023-09-14 20:29:30 +00:00
12e2bdf4c7 Merge branch 'staging' into 'dev'
# Conflicts:
#   internal/service/cart/cart.go
2023-09-14 20:24:27 +00:00
c48718ca51 feat: add tariff data for payCard history event 2023-09-14 23:02:19 +03:00
9ed0084b72 feat: shorter event type constant 2023-09-14 22:56:36 +03:00