Dmitriy Kuzmenko
|
b3345d612a
|
renge_menu and carte
|
2019-11-04 02:25:04 +03:00 |
|
Dmitriy Kuzmenko
|
db6c93a72f
|
add trensfer menus
|
2019-11-04 00:41:34 +03:00 |
|
evgeniy-st
|
0e04b9d044
|
update toque calculating
|
2019-11-01 12:57:57 +03:00 |
|
alex
|
b3bd2a7141
|
add_establishment_social command
|
2019-11-01 10:48:46 +03:00 |
|
evgeniy-st
|
972e456f20
|
recalculate toque_number for other countries
|
2019-10-31 19:21:06 +03:00 |
|
evgeniy-st
|
6d34e406db
|
recalculate toque number
|
2019-10-31 19:09:57 +03:00 |
|
Dmitriy Kuzmenko
|
638bafe4a6
|
Merge remote-tracking branch 'origin/develop' into origin/migration_fix
# Conflicts:
# apps/establishment/admin.py
# project/settings/base.py
|
2019-10-30 19:12:59 +03:00 |
|
Dmitriy Kuzmenko
|
a3bf921771
|
fix timezone
|
2019-10-29 21:54:59 +03:00 |
|
Anatoly
|
03c75efece
|
gm-259, gm-260, gm-261
|
2019-10-29 17:16:39 +03:00 |
|
alex
|
939d7f139f
|
fix max max length error
|
2019-10-29 10:20:30 +03:00 |
|
alex
|
25a2edf17d
|
establishment fin
|
2019-10-27 16:23:30 +03:00 |
|
Anatoly
|
37d745eeaa
|
added endpoints, filters, serializers and extend model Product, ProductType, ProductSubtype
|
2019-10-26 18:54:22 +03:00 |
|
Semyon Yekhmenin
|
e1e0f1e997
|
Added index_name in employee position
|
2019-10-25 13:41:53 +00:00 |
|
Kuroshini
|
7f23f0e891
|
Establishment each hour reindexing
|
2019-10-25 14:13:19 +03:00 |
|
Semyon Yekhmenin
|
74b2b52ee1
|
Added currency to establishment model
|
2019-10-24 11:06:58 +00:00 |
|
Kuroshini
|
d5609e4cb8
|
Works now filter first part
|
2019-10-23 17:29:00 +03:00 |
|
Anatoly
|
7dbf594809
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/account/tasks.py
|
2019-10-23 15:54:21 +03:00 |
|
evgeniy-st
|
9c9c49d900
|
update slug fields
|
2019-10-23 12:25:50 +03:00 |
|
evgeniy-st
|
0c8959f4e7
|
Merge branch 'develop' into feature/gm-148
|
2019-10-22 17:11:22 +03:00 |
|
evgeniy-st
|
d1c9e649b7
|
Remove metadatacontent
|
2019-10-22 17:05:54 +03:00 |
|
evgeniy-st
|
6c195bc185
|
Merge branch 'develop' into feature/gm-148
|
2019-10-21 20:26:31 +03:00 |
|
Виктор Гладких
|
264e7bcb2a
|
Fix conflict
|
2019-10-21 14:43:14 +03:00 |
|
evgeniy-st
|
2dbe65a169
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-21 10:31:06 +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 |
|
Kuroshini
|
b77c654c6c
|
Open now filter
|
2019-10-18 02:38:59 +03:00 |
|
evgeniy-st
|
9661de4810
|
Establishment types
|
2019-10-17 15:17:29 +03:00 |
|
Kuroshini
|
6a85e52abc
|
Rename variable
|
2019-10-17 12:30:40 +03:00 |
|
Kuroshini
|
ed03f0f40f
|
Search establishment by working time
|
2019-10-16 19:05:16 +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
|
c268575a04
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 18:33:44 +03:00 |
|
evgeniy-st
|
9d4c483f51
|
clean models (tags)
|
2019-10-15 18:25:09 +03:00 |
|
evgeniy-st
|
92529f4c5b
|
Merge branch 'feature/gm-192' into feature/gm-148
|
2019-10-15 17:17:35 +03:00 |
|
evgeniy-st
|
60cdec99e0
|
refactor tags
|
2019-10-15 17:17:03 +03:00 |
|
Anatoly
|
2d830b2821
|
Merge branch 'feature/gm-192' into feature/gm-148
# Conflicts:
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
|
2019-10-15 12:08:23 +03:00 |
|
Anatoly
|
469f7bdf4c
|
added prefetch select related
|
2019-10-14 12:24:26 +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
|
bdb9348916
|
Merge branch 'bugfix/gm-205' into feature/gm-148
# Conflicts:
# apps/establishment/models.py
|
2019-10-11 13:31:33 +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 |
|