Commit Graph

189 Commits

Author SHA1 Message Date
Dmitriy Kuzmenko
d7c7880860 add counter for public_mark and change Guid serializer 2019-12-25 15:19:43 +03:00
Anatoly
2fb338bc59 refactored method to get similar list on entities (see todo: establishment/models.py) 2019-12-23 12:59:47 +03:00
Anatoly
cc7125b468 added image url to es 2019-12-23 09:19:16 +03:00
Kuroshini
660c8e791b tags translation 2019-12-20 19:08:53 +03:00
Anatoly
72e5d723db added default image for type/subtype 2019-12-20 17:27:04 +03:00
Anatoly
35b7846ca1 refactored methods for getting similar establishments 2019-12-20 12:57:48 +03:00
Anatoly
821526d631 remove incorrect check for establishment, set schedule attr property as blank=True, refactored timetable model 2019-12-20 12:36:11 +03:00
Anatoly
dbbb526902 Refactored mechanism to find similar objects. Added endpoints to product app. 2019-12-17 13:02:46 +03:00
Kuroshini
586f6e373b Anatoly, dont erase working code during refactoring pls 2019-12-16 15:30:05 +03:00
Anatoly
e2ec179f69 refactored the mechanism for finding similar establishments 2019-12-12 18:10:20 +03:00
Anatoly
51da45b00b refactoring 2019-12-10 13:08:28 +03:00
Anatoly
439fb17778 Merge branch 'develop' into feature/similar-wines 2019-12-10 12:46:44 +03:00
Виктор Гладких
8e63b969bf Merge branch 'develop' into feature/permission_winery 2019-12-06 16:58:44 +03:00
Виктор Гладких
e824b5ee65 winery permission 2019-12-06 16:51:57 +03:00
Kuroshini
91b528feb9 tags for establishments 2019-12-06 14:03:14 +03:00
Anatoly
b659308729 exclude field from Establishment serializer 2019-12-06 13:06:59 +03:00
Kuroshini
202f5715f3 remove tag category from detail 2019-12-05 17:12:43 +03:00
Kuroshini
bebd1283c0 Merge remote-tracking branch 'origin/fix/hide-unused-tags' into develop
# Conflicts:
#	apps/establishment/models.py
2019-12-04 21:04:09 +03:00
dormantman
c0bc66c749 Hide unusable tags 2019-12-04 21:02:08 +03:00
Anatoly
9dc8e34e3a Merge branch 'develop' into feature/transfer-guide
# Conflicts:
#	apps/establishment/models.py
#	apps/establishment/serializers/common.py
2019-12-04 20:16:21 +03:00
Anatoly
29ff10fb4b added wine origins 2019-12-04 20:13:09 +03:00
Kuroshini
e0ad819caa fix empty comments 2019-12-04 18:51:23 +03:00
Kuroshini
69b40f21b7 last comment for mobile establishment detail 2019-12-04 18:26:03 +03:00
dormantman
1ae11f0b61 System tags removed 2019-12-04 17:27:49 +03:00
Kuroshini
e40156908b Artisan category tags for establishments 2019-12-02 21:38:21 +03:00
Kuroshini
e981b48fa0 Fix extra tags indexing 2019-12-02 21:32:03 +03:00
Kuroshini
140ba040e7 Extra fields for establishments 2019-12-02 21:26:55 +03:00
Kuroshini
3b05a552aa Tz field for establishments
(cherry picked from commit a537f04)
2019-12-02 18:37:16 +03:00
alex
9b35da1eca add artisan subtype 2019-11-27 17:03:27 +03:00
Kuroshini
586f2a7a03 boost detail establishment speed
(cherry picked from commit c2bb9f0)
2019-11-22 18:22:41 +03:00
Semyon Yekhmenin
e565406729 Feature/bo employee update 2019-11-22 14:21:25 +00:00
alex
a5d5dc1335 establishment carousel web and mobile api 2019-11-22 17:13:41 +03:00
evgeniy-st
04d6412f39 Merge branch 'develop' into feature/in_favorites 2019-11-21 18:18:09 +03:00
evgeniy-st
35b6a66c85 In favorites 2019-11-21 18:12:52 +03:00
Anatoly
617552841f refactored product, fix transfer and etc., see changelist 2019-11-21 09:58:43 +03:00
Anatoly
1a1a2a2d24 added bo endpoints for establishment notes 2019-11-20 09:43:45 +03:00
Anatoly
9975f3f3b5 added bo endpoints for product notes 2019-11-19 18:28:53 +03:00
Kuroshini
5c4c4c60c3 ES as separate server 2019-11-18 20:12:58 +03:00
Anatoly
0d9d45bcc5 added model Product and bo endpoints 2019-11-18 17:58:46 +03:00
Kuroshini
9212f85ee5 Visible tags for establishments 2019-11-18 15:15:33 +03:00
Anatoly
a8b3c9aa63 refactored galleries, added transfer script 2019-11-17 14:22:30 +03:00
Dmitriy Kuzmenko
2cd7755d7e add CRUD collections for back 2019-11-15 16:04:54 +03:00
alex
b94a6dfd62 social choices model 2019-11-14 09:14:36 +03:00
Anatoly
2ec40ff8fe removed choices from index names for models ProductType, ProductSubType, EstablishmentType, EstablishmentSubType 2019-11-13 18:22:26 +03:00
evgeniy-st
0dfa1c85d5 Recalculate toque number fallback 2019-11-12 18:15:53 +03:00
d.kuzmenko
feb1b8c6ea Merge branch 'feature/bring-back-address' into 'develop'
Add city name field to establishment api representations

See merge request gm/gm-backend!118
2019-11-12 12:57:05 +00:00
d.kuzmenko
cd1967ee51 Merge branch 'feature/works-whole-day-es-filter' into 'develop'
Feature/works whole day es filter

See merge request gm/gm-backend!113
2019-11-12 12:33:45 +00:00
Anatoly
8eac730d9f added transfer for notes 2019-11-12 15:14:35 +03:00
Kuroshini
57a4498ba1 Add schedule to establishment list serializer 2019-11-12 15:11:32 +03:00
Kuroshini
e065f1c9b4 Works at weekday fiter 2019-11-12 15:10:16 +03:00