Commit Graph

2527 Commits

Author SHA1 Message Date
Kuroshini
2c888d1c3a default ordering for BO establishments search 2020-01-13 11:16:02 +03:00
Kuroshini
dabc63647d fix 2020-01-10 19:56:53 +03:00
Kuroshini
8450e48d39 remove pagination 2020-01-10 19:42:44 +03:00
Kuroshini
591b67477f subscribe info fix 2020-01-10 19:36:09 +03:00
Kuroshini
41660933db ordering for backoffice establishments 2020-01-10 18:43:26 +03:00
Kuroshini
e1d417a9e6 add created establishment field to ES 2020-01-10 18:36:57 +03:00
Anatoly
0a3fe15e9c small refactoring (/.../establishments/slug/{slug}/similar/artisans/distilleries to /.../establishments/slug/{slug}/similar/producers/distilleries) 2020-01-10 17:25:27 +03:00
Anatoly
db8917e7af added two endpoints: /.../establishments/slug/{slug}/similar/producers/food/, /.../establishments/slug/{slug}/similar/artisans/distilleries/ 2020-01-10 17:25:27 +03:00
Олег Хаятов
de35a1c0d5 Merge branch 'feature/news-subscription' into 'develop'
Added unsubscribe action

See merge request gm/gm-backend!198
2020-01-10 13:16:21 +00:00
dormantman
2800f2f158 Fix unsubscribe bug 2020-01-10 16:11:10 +03:00
alex
989e9f9465 last country 2020-01-10 15:57:36 +03:00
Kuroshini
e8538d4fc2 unique slugs even in the same news object 2020-01-10 15:22:17 +03:00
Anatoly
23f8c0bbcd added field address_id to request data in /api/back/establishments/
in Establishment make as mandatory field address
2020-01-10 14:40:54 +03:00
alex
a16e76e393 last_ip middleware 2020-01-10 14:34:52 +03:00
alex
6ad4e0d46f last_ip 2020-01-10 14:27:00 +03:00
Kuroshini
a925d2f623 create est with address id #2 2020-01-10 14:04:11 +03:00
Kuroshini
c22fb3fb5c create est with address id 2020-01-10 14:01:59 +03:00
Anatoly
75e4077917 refactored structure of XML-document 2020-01-10 13:06:17 +03:00
dormantman
fcfebcd952 Added unsubscribe action 2020-01-09 19:46:12 +03:00
Anatoly
963e0597dc set username as non-required field on registration stage
(https://dev-krd.atlassian.net/browse/GM-304)
2020-01-09 17:57:10 +03:00
Dmitriy Kuzmenko
807f8b4169 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2020-01-09 17:47:26 +03:00
Dmitriy Kuzmenko
5041798020 add pagination for employee 2020-01-09 17:47:09 +03:00
alex
989d0d4abd Merge remote-tracking branch 'origin/develop' into develop 2020-01-09 16:29:45 +03:00
alex
30e25c2da0 fix EmployeeBackSerializers 2020-01-09 16:29:33 +03:00
Anatoly
a59016944c Merge branch 'develop' into feature/guides 2020-01-09 15:00:58 +03:00
Anatoly
b457ffe975 small changes 2020-01-09 14:59:29 +03:00
Kuroshini
fa8b4d6d97 chosen tags for recipes 2020-01-09 13:48:38 +03:00
Kuroshini
33a616ab96 fix transfer translation for news 2020-01-09 13:08:59 +03:00
Kuroshini
2bceb0b309 Merge branch 'feature/news-subscription' into develop 2020-01-09 11:49:53 +03:00
Kuroshini
0f8cf72cd8 Merge branch 'feature/news-subscription' into develop 2020-01-09 11:49:24 +03:00
dormantman
140cc6cfa5 Reformat sending mail structure 2019-12-31 16:09:04 +03:00
alex
54c3e452e2 bo search news 2019-12-31 09:20:50 +03:00
dormantman
241012da42 Added prefetch optimize 2019-12-31 05:29:48 +03:00
dormantman
d4e993abee Added country field 2019-12-31 05:13:36 +03:00
Kuroshini
7edd836a75 helping hand representation 2019-12-31 01:22:45 +03:00
Kuroshini
146f34cebe Merge branch 'feature/news-subscription' into develop
# Conflicts:
#	apps/notification/models.py
#	apps/notification/serializers/common.py
2019-12-31 00:41:20 +03:00
Kuroshini
af8febbe45 subscription work out #2 2019-12-30 23:41:58 +03:00
Kuroshini
3a6476fb06 subscriptions work out 2019-12-30 22:44:58 +03:00
dormantman
93aea70d29 Added saving date 2019-12-30 22:44:58 +03:00
dormantman
797d3a3973 Optimize 2019-12-30 22:44:58 +03:00
dormantman
e772663f44 Fix subsribtions 2019-12-30 22:44:58 +03:00
dormantman
e33418dfe6 Fix unsubscribe 2019-12-30 22:44:58 +03:00
dormantman
8567a818c7 Added corrections migrate 2019-12-30 22:44:58 +03:00
dormantman
54d1b7742f Reformat structure 2019-12-30 22:44:58 +03:00
dormantman
8108471c8e Added migrations 2019-12-30 22:44:58 +03:00
dormantman
ec00b3a24f Added correct creating subscribe 2019-12-30 22:44:58 +03:00
dormantman
08f675cdbc Added model Subscribe 2019-12-30 22:44:58 +03:00
dormantman
a8f053a646 Added last subscribe/unsubscribe dates 2019-12-30 22:44:58 +03:00
Kuroshini
fc215129ed subscriptions work out 2019-12-30 22:26:18 +03:00
dormantman
974e0ce8fe Added saving date 2019-12-30 22:23:16 +03:00