Anton Gorbunov
|
de3933aa88
|
Merge branch 'bug/establishment_optimize' into 'develop'
format condition
See merge request gm/gm-backend!216
|
2020-01-16 08:11:48 +00:00 |
|
a.gorbunov
|
ca3d8a411c
|
format condition
|
2020-01-16 08:11:29 +00:00 |
|
Anton Gorbunov
|
37a6ea8d1e
|
Merge branch 'bug/establishment_optimize' into 'develop'
logs and save extension for preview
See merge request gm/gm-backend!215
|
2020-01-16 07:56:50 +00:00 |
|
a.gorbunov
|
9ea7c25085
|
logs and save extension for preview
|
2020-01-16 07:56:34 +00:00 |
|
Anton Gorbunov
|
87d16ef866
|
Merge branch 'bug/establishment_optimize' into 'develop'
fix condition for optimize establishment preview image
See merge request gm/gm-backend!214
|
2020-01-16 07:30:00 +00:00 |
|
a.gorbunov
|
f09b5c2367
|
fix condition for optimize establishment preview image
|
2020-01-16 07:29:36 +00:00 |
|
Anton Gorbunov
|
cc00d804b1
|
Merge branch 'bug/establishment_optimize' into 'develop'
fix optimize establishment preview images
See merge request gm/gm-backend!213
|
2020-01-16 07:14:08 +00:00 |
|
a.gorbunov
|
78da617682
|
fix optimize establishment preview images
|
2020-01-16 07:13:31 +00:00 |
|
Anton Gorbunov
|
04987fdbd9
|
Merge branch 'bug/establishment_optimize' into 'develop'
fix optimize establishment preview images
See merge request gm/gm-backend!212
|
2020-01-16 07:06:19 +00:00 |
|
a.gorbunov
|
e6dec3a1f0
|
fix optimize establishment preview images
|
2020-01-16 06:51:39 +00:00 |
|
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
|
7a7d7a70b0
|
fix naming issue
|
2020-01-15 19:15:32 +03:00 |
|
Kuroshini
|
fab351d800
|
distillery_type #3
|
2020-01-15 18:21:21 +03:00 |
|
Anatoly
|
a468f264e0
|
fix similarity rules
|
2020-01-15 17:50:34 +03:00 |
|
Kuroshini
|
59f7f8d2d4
|
distillery_type
|
2020-01-15 17:50:12 +03:00 |
|
Anatoly
|
c0273773bc
|
refactored a little similarity rules
|
2020-01-15 17:00:14 +03:00 |
|
Kuroshini
|
129201d3a9
|
add slug for backoffice establishments
|
2020-01-15 16:51:42 +03:00 |
|
Kuroshini
|
0607a56739
|
Revert "possible fix for similar distilleries"
This reverts commit 2197863
|
2020-01-15 16:47:04 +03:00 |
|
Kuroshini
|
21978639bd
|
possible fix for similar distilleries
|
2020-01-15 16:40:29 +03:00 |
|
Anatoly
|
8cb0f51802
|
fix transfer command transfer_city_gallery, add field image to City model, fix serializer CityDetailSerializer
|
2020-01-15 13:22:54 +03:00 |
|
alex
|
e4123d3ce9
|
preview_image to establishment and product type and subtype
|
2020-01-15 10:47:18 +03:00 |
|
alex
|
19b9e636c1
|
phones for cascade establishment
|
2020-01-15 09:20:09 +03:00 |
|
a.gorbunov
|
c110dc3b96
|
optimize collection images
|
2020-01-14 18:18:17 +03:00 |
|
Dmitriy Kuzmenko
|
9aeedff81e
|
Merge branch 'develop' into phone_list
|
2020-01-14 15:59:46 +03:00 |
|
Dmitriy Kuzmenko
|
11b55e9f4c
|
change chosen tag functional
|
2020-01-14 15:40:49 +03:00 |
|
Dmitriy Kuzmenko
|
387f96b8bf
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2020-01-14 10:53:53 +03:00 |
|
Dmitriy Kuzmenko
|
fb00c7c3a3
|
add chosen tag
|
2020-01-14 10:53:43 +03:00 |
|
alex
|
35d9f37fab
|
fix serializer
|
2020-01-13 15:47:50 +03:00 |
|
alex
|
605a3e12e1
|
phone_list field create and update
|
2020-01-13 15:44:51 +03:00 |
|
alex
|
d6345f27e2
|
establishment menu currency id
|
2020-01-13 11:56:04 +03:00 |
|
Anatoly
|
b2f3e1f96b
|
added field - "distillery_types" in establishment list, detail and similar list view
|
2020-01-13 11:50:54 +03:00 |
|
alex
|
d1572cbb56
|
rm publish filter from BO establishment api
|
2020-01-13 11:25:22 +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 |
|
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 |
|
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 |
|
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
|
30e25c2da0
|
fix EmployeeBackSerializers
|
2020-01-09 16:29:33 +03:00 |
|
alex
|
6b52feffd8
|
fix similar_artisans_producers
|
2019-12-30 16:38:42 +03:00 |
|
Anatoly
|
2827374911
|
intermediate commit
|
2019-12-30 13:22:57 +03:00 |
|
Dmitriy Kuzmenko
|
e2d71fca8f
|
Merge branch 'develop' into feature/guides
|
2019-12-27 18:00:20 +03:00 |
|
Anatoly
|
151c017561
|
see changes
|
2019-12-27 17:49:56 +03:00 |
|
Виктор Гладких
|
4e82d5275a
|
Fix
|
2019-12-27 16:55:01 +03:00 |
|
Виктор Гладких
|
ab5bb5c190
|
Merge branch 'develop' into feature/profile
|
2019-12-27 16:35:57 +03:00 |
|
Виктор Гладких
|
660d60e656
|
Lite refactor
|
2019-12-27 16:30:31 +03:00 |
|
Виктор Гладких
|
caa17bf9f4
|
Serialize employee with positions, public_mark and establishment
|
2019-12-27 16:13:22 +03:00 |
|
Anatoly
|
b41c185a65
|
see changes
|
2019-12-27 14:46:36 +03:00 |
|