Commit Graph

213 Commits

Author SHA1 Message Date
evgeniy-st
4ceb0e4d86 fix establishment migration 2019-10-21 20:22:47 +03:00
Виктор Гладких
87708df084 Fix test establishment 2019-10-21 16:11:28 +03:00
Виктор Гладких
264e7bcb2a Fix conflict 2019-10-21 14:43:14 +03:00
Anatoly
7be7315cef added filters and endpoint to get winery list 2019-10-18 18:00:57 +03:00
Виктор Гладких
2e2ed19118 Fix establishment tests 2019-10-18 12:14:10 +03:00
evgeniy-st
9661de4810 Establishment types 2019-10-17 15:17:29 +03:00
Виктор Гладких
5ad3776fe3 establishment manager 2019-10-16 12:14:13 +03:00
Виктор Гладких
86692019d1 Add Country admin to views 2019-10-16 10:14:23 +03:00
evgeniy-st
9d4c483f51 clean models (tags) 2019-10-15 18:25:09 +03:00
evgeniy-st
60cdec99e0 refactor tags 2019-10-15 17:17:03 +03:00
Anatoly
1764cfc08b added urlpath to get establishment tags to all platform 2019-10-15 12:52:21 +03:00
Anatoly
469f7bdf4c added prefetch select related 2019-10-14 12:24:26 +03:00
Anatoly
9e237d4657 removed endpoint to display a list of tags by establishment id, added instead filter to filter tags by establishment id 2019-10-14 11:40:03 +03:00
Anatoly
47993a7155 added endpoint ot get list of tag categories with tags by establishment type 2019-10-14 10:22:17 +03:00
Anatoly
2d41b9142b Merge remote-tracking branch 'origin/feature/gm-192' into feature/gm-192 2019-10-11 18:26:26 +03:00
Anatoly
cb762ce746 added param to attr for Establoishment model and small refactoring, boost queries 2019-10-11 18:26:13 +03:00
evgeniy-st
0d7104eace Merge branch 'develop' into feature/gm-192 2019-10-11 16:44:54 +03:00
Anatoly
ddb3eec679 finished endpoint to get tags by establishment type and subtype 2019-10-11 15:41:31 +03:00
Anatoly
0b9fd8b1dc Merge branch 'bugfix/gm-205' into develop 2019-10-11 13:20:45 +03:00
Anatoly
a25d846028 fixed bug with duplicated records in similar establishments 2019-10-10 21:02:56 +03:00
Anatoly
f83b735eb3 changed files 2019-10-10 15:10:43 +03:00
evgeniy-st
2aa51b93d3 hide es search 2019-10-10 14:43:24 +03:00
Kuroshini
74460b3060 Fix imports issue 2019-10-10 14:43:24 +03:00
evgeniy-st
bb41f00451 hide es search 2019-10-10 14:42:42 +03:00
Kuroshini
bd7ba611fc Fix imports issue 2019-10-10 14:28:42 +03:00
Anatoly
74fa1fc014 Merge branch 'develop' into feature/gm-192 2019-10-09 16:21:50 +03:00
e.stoyushko
1969af044c Merge branch 'feature/booking' into 'develop'
Feature/booking

See merge request gm/gm-backend!6
2019-10-09 12:00:32 +00:00
Anatoly
2191a505a5 refactored EstablishmentBase serializer 2019-10-09 14:11:53 +03:00
Anatoly
ca5f588466 fix elastic document, fix prefetch and select related 2019-10-09 12:53:35 +03:00
Anatoly
d321866dc2 gm-192: in progress 2019-10-08 15:38:35 +03:00
evgeniy-st
729a77866d update elasticsearch index 2019-10-03 17:19:30 +03:00
Kuroshini
0408d93599 Squashed migrations && added lastable credentials 2019-10-03 13:41:45 +03:00
Kuroshini
393aa9ef28 Merge migrations after rebase 2019-10-01 18:30:49 +03:00
Kuroshini
4c960c8abf Booking (squashed commit) 2019-10-01 18:25:57 +03:00
evgeniy-st
e42f4d061c refactor address 2019-10-01 18:07:04 +03:00
evgeniy-st
f034377405 fix establishment serializer 2019-10-01 15:11:14 +03:00
evgeniy-st
051957c7cf Refactor JSON Validation 2019-10-01 13:03:59 +03:00
e.stoyushko
1798978cf7 Merge branch 'feature/establishment-award' into 'develop'
Feature/establishment award

See merge request gm/gm-backend!40
2019-09-30 13:53:59 +00:00
Kuroshini
33478580aa Review fixes 2019-09-30 16:40:46 +03:00
Kuroshini
019ac97d19 Add vintage year to detail 2019-09-30 13:50:17 +03:00
d.kuzmenko
8745c57f84 Merge branch 'bugfix/bunch-of-fixes' into 'develop'
Bugfix/bunch of fixes

See merge request gm/gm-backend!38
2019-09-30 07:57:12 +00:00
Kuroshini
d42bf43d19 Latest award for carousel 2019-09-27 22:56:44 +03:00
Kuroshini
9aafe0d69d new establishment attribute 2019-09-27 22:27:25 +03:00
Kuroshini
051ddb617d fix conflicts after rebase 2019-09-27 22:27:25 +03:00
Kuroshini
98b0a9af5d latest award && test fix 2019-09-27 22:27:25 +03:00
Kuroshini
4388fb7346 latest award for establishment 2019-09-27 22:27:25 +03:00
Kuroshini
4d113a6916 Fix all test 2019-09-27 22:06:46 +03:00
Kuroshini
d71ed0c1de Fix lot/lat x/y mapping && address serialization 2019-09-27 19:44:00 +03:00
evgeniy-st
993e58d215 fix views after merge 2019-09-27 11:20:43 +03:00
evgeniy-st
403a60623a Merge branch 'develop' into feature/refactor-establishments 2019-09-27 10:05:15 +03:00