Commit Graph

97 Commits

Author SHA1 Message Date
Anatoly
f86357e041 fix comments 2020-01-15 22:31:30 +03:00
Kuroshini
4b45cab976 employees trigram search for back-office 2020-01-15 20:49:33 +03:00
Kuroshini
fab351d800 distillery_type #3 2020-01-15 18:21:21 +03:00
Kuroshini
59f7f8d2d4 distillery_type 2020-01-15 17:50:12 +03:00
alex
d1572cbb56 rm publish filter from BO establishment api 2020-01-13 11:25:22 +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
Dmitriy Kuzmenko
5041798020 add pagination for employee 2020-01-09 17:47:09 +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
35b7846ca1 refactored methods for getting similar establishments 2019-12-20 12:57:48 +03:00
Anatoly
dbbb526902 Refactored mechanism to find similar objects. Added endpoints to product app. 2019-12-17 13:02:46 +03:00
Dmitriy Kuzmenko
6e72c7c0e4 merge with debelop 2019-12-13 15:47:05 +03:00
Dmitriy Kuzmenko
bd6f8a47a1 add api for establishment admin 2019-12-13 11:02:37 +03:00
Anatoly
e2ec179f69 refactored the mechanism for finding similar establishments 2019-12-12 18:10:20 +03:00
alex
f565285abd back menu filter by establishment 2019-12-12 16:58:13 +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
Виктор Гладких
bd567200c8 Merge branch 'develop' into feature/permission_winery 2019-12-09 09:40:33 +03:00
Anatoly
f1fa8a58de small refactoring 2019-12-06 17:37:33 +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
d.kuzmenko
29d05929ff Merge branch 'fix/backoffice-slug-url' into 'develop'
Fix/backoffice slug url

See merge request gm/gm-backend!169
2019-12-06 11:15:16 +00:00
Anatoly
b659308729 exclude field from Establishment serializer 2019-12-06 13:06:59 +03:00
d.kuzmenko
6d80678564 Merge branch 'feature/eest_empl_options' into 'develop'
Fix options

See merge request gm/gm-backend!170
2019-12-04 15:47:42 +00:00
Kuroshini
69b40f21b7 last comment for mobile establishment detail 2019-12-04 18:26:03 +03:00
Виктор Гладких
d0378ad14e Fix options 2019-12-04 17:27:51 +03:00
dormantman
4202eb679b Corrections for tests 2019-12-04 15:48:54 +03:00
dormantman
a81f3f079a Changed url id to slug in back-office 2019-12-04 13:37:49 +03:00
Kuroshini
4b9561fe75 Fix typo 2019-12-03 11:50:36 +03:00
Kuroshini
e40156908b Artisan category tags for establishments 2019-12-02 21:38:21 +03:00
Kuroshini
140ba040e7 Extra fields for establishments 2019-12-02 21:26:55 +03:00
Semyon Yekhmenin
1711057cee Feature/bo establishment employee features 2019-11-25 12:15:51 +00: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
f95a082db3 update geoip feature 2019-11-22 16:00:06 +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
0d9d45bcc5 added model Product and bo endpoints 2019-11-18 17:58:46 +03:00
Anatoly
dce951c4f9 Merge branch 'develop' into feature/establishment-gallery
# Conflicts:
#	apps/product/serializers/common.py
2019-11-17 14:25:41 +03:00
Anatoly
a8b3c9aa63 refactored galleries, added transfer script 2019-11-17 14:22:30 +03:00
alex
78e42550c1 add address to establishment similar and collection establishment 2019-11-16 16:57:26 +03:00
alex
e49d62de5d social choice api and test 2019-11-14 09:53:36 +03:00
Kuroshini
57a4498ba1 Add schedule to establishment list serializer 2019-11-12 15:11:32 +03:00
Kuroshini
521d7f19f3 Add city name field to establishment api representations 2019-11-12 15:11:32 +03:00
Anatoly
46662398e4 refactored detail and list view of products 2019-11-11 19:19:18 +03:00
Semyon Yekhmenin
d717b09153 Fixed nearest establishments search 2019-11-06 11:35:43 +00:00
evgeniy-st
568ec84da0 Added filter class to EstalibshmentListCreateView 2019-11-05 16:20:24 +03:00
e.stoyushko
c9edaaa654 Merge branch 'feature/geo-type-index-name' into 'develop'
Feature/geo type index name

See merge request gm/gm-backend!84
2019-10-30 07:31:50 +00:00
Kuroshini
a0aa503cfa Add index_name type field to geo 2019-10-29 20:56:41 +03:00