dormantman
|
e94787716e
|
Change labels
|
2020-01-27 20:33:51 +03:00 |
|
dormantman
|
b687eb6024
|
Change format method
|
2020-01-27 20:29:54 +03:00 |
|
Ruslan Stepanov
|
1d534fe1a8
|
Merge branch 'develop' into 'feature/employees-params'
# Conflicts:
# apps/establishment/serializers/back.py
# apps/establishment/views/back.py
|
2020-01-27 17:04:15 +00:00 |
|
dormantman
|
3796a698d2
|
Added employee-establishment-positions method
|
2020-01-27 20:01:44 +03:00 |
|
Kuroshini
|
8a1651bf1f
|
fix permission
|
2020-01-27 18:45:50 +03:00 |
|
Kuroshini
|
f5da5f71a3
|
base related qs for cities
|
2020-01-27 18:45:23 +03:00 |
|
dormantman
|
d2f04d4958
|
Reformat method structure
|
2020-01-25 00:42:00 +03:00 |
|
dormantman
|
809b5ccab7
|
Fixed employee establishments method
|
2020-01-24 22:33:39 +03:00 |
|
Kuroshini
|
5353c5a67c
|
fix award unbind
|
2020-01-24 15:46:07 +03:00 |
|
alex
|
a195ed3a53
|
menu dishes rud
|
2020-01-24 10:35:55 +03:00 |
|
alex
|
29a7fb82ce
|
dishes menu list-create
|
2020-01-24 10:21:35 +03:00 |
|
Kuroshini
|
34977db805
|
fix permission
|
2020-01-23 21:03:24 +03:00 |
|
Kuroshini
|
d8d9a97746
|
remove award from employee
|
2020-01-23 21:02:43 +03:00 |
|
alex
|
e5faa90c76
|
multiply filters for employee
|
2020-01-23 13:54:36 +03:00 |
|
dormantman
|
8fb8c49bfe
|
Added employee positions method
|
2020-01-22 18:48:16 +03:00 |
|
dormantman
|
0688c622cc
|
Fixed structure view
|
2020-01-21 19:28:29 +03:00 |
|
dormantman
|
88e488e481
|
Added employee establishments method
|
2020-01-21 19:19:38 +03:00 |
|
alex
|
61c47e4c79
|
establishment employee position delete view
|
2020-01-21 08:17:03 +03:00 |
|
alex
|
215e7b5f19
|
establishment employee list
|
2020-01-20 12:13:50 +03:00 |
|
Kuroshini
|
a05db696b0
|
optimize db queries on /api/back/establishments/employees
|
2020-01-17 19:08:33 +03:00 |
|
alex
|
a8ea238bfc
|
some optimize for employee list
|
2020-01-17 16:02:00 +03:00 |
|
alex
|
4a7eb22291
|
order by position for establishment employee
|
2020-01-17 14:02:46 +03:00 |
|
alex
|
a915cff73d
|
photo for employee
|
2020-01-17 13:56:58 +03:00 |
|
alex
|
0695cdce6b
|
available_for_events field for employee
|
2020-01-17 11:36:13 +03:00 |
|
alex
|
4880b2629d
|
select_related for establishment types serializers
|
2020-01-17 09:54:05 +03:00 |
|
alex
|
85e5537b82
|
prefetch_related for employee serializers
|
2020-01-17 09:43:13 +03: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
|
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 |
|