Commit Graph

342 Commits

Author SHA1 Message Date
Dmitriy Kuzmenko
b3345d612a renge_menu and carte 2019-11-04 02:25:04 +03:00
Dmitriy Kuzmenko
3462c74a65 modify add_menus 2019-11-04 00:50:37 +03:00
Dmitriy Kuzmenko
db6c93a72f add trensfer menus 2019-11-04 00:41:34 +03:00
alex
8eee337d34 fix last published establishment description 2019-11-03 19:12:47 +03:00
Dmitriy Kuzmenko
a30f863155 fix currency 2019-11-03 17:39:10 +03:00
Dmitriy Kuzmenko
924b4e68e9 fix currency 2019-11-03 17:13:27 +03:00
Dmitriy Kuzmenko
c47f659657 add fix currency 2019-11-03 15:34:53 +03:00
Dmitriy Kuzmenko
b88c0d5213 modify script add_currency 2019-11-03 15:24:03 +03:00
Dmitriy Kuzmenko
1856589427 disabled inline in est, and change currency creator 2019-11-03 14:55:08 +03:00
Dmitriy Kuzmenko
398a982c82 add fix currency 2019-11-03 14:09:07 +03:00
Dmitriy Kuzmenko
1ac3cf95ca add currency 2019-11-03 14:03:47 +03:00
Dmitriy Kuzmenko
c69ef65d79 add filter for description 2019-11-03 00:36:19 +03:00
Dmitriy Kuzmenko
22b4b94f1b add filter for description 2019-11-03 00:11:08 +03:00
alex
9da10acd8e fix none value establishment description 2019-11-02 22:52:20 +03:00
alex
cc2c475b4e add_establishment_description with elastic error 2019-11-02 22:45:57 +03:00
GladkihViktor
9acf2f5c5f Code style 2019-11-02 17:58:00 +03:00
GladkihViktor
56b3d0dcc2 Update transportation 2019-11-02 17:54:24 +03:00
GladkihViktor
ea830379fc Fix image url 2019-11-02 14:31:12 +03:00
Dmitriy Kuzmenko
1747f6e95c fix filter old_estab 2019-11-02 10:24:24 +03:00
Dmitriy Kuzmenko
20b9b9affd fix filter old_estab 2019-11-02 10:11:47 +03:00
Dmitriy Kuzmenko
4059446a3c add filter by exist Establishments 2019-11-02 10:04:32 +03:00
Dmitriy Kuzmenko
4108de5931 add filter for transfer establishment by fr 2019-11-02 09:17:18 +03:00
Anatoly
4e76fc966e added fix link for establishment preview_image 2019-11-01 18:43:48 +03:00
Anatoly
fdd5c0bace added fix link for establishment preview_image, run - ./manage.py transfer --fix_establishment_preview_image 2019-11-01 18:10:53 +03:00
alex
84cefefa0b fix add_establishment_description 2019-11-01 14:14:16 +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
alex
55e68ec336 fix establishment mark 2019-10-31 17:19:07 +03:00
e.stoyushko
6c8deb5f80 Merge branch 'feature/geo-subtypes' into 'develop'
Geo subtypes

See merge request gm/gm-backend!86
2019-10-31 11:52:10 +00:00
alex
0d399cc44e add_establishment_mark command 2019-10-31 12:29:40 +03:00
alex
7be3c2b93f add_establishment_description command 2019-10-31 12:02:52 +03:00
alex
fea93f50f7 fix image_url for establishment 2019-10-31 09:40:50 +03:00
littlewolf
11a1928346 Add MultipkleObjects exception 2019-10-31 08:49:17 +03:00
littlewolf
f259319ade Fix exception 2019-10-31 08:42:52 +03:00
littlewolf
08ca1dc356 Move addresses to new key 2019-10-31 07:47:45 +03:00
littlewolf
c08e202f64 Fix db 2019-10-31 07:46:29 +03:00
littlewolf
d654b093ef Fix 2019-10-31 07:44:53 +03:00
littlewolf
8f18320171 Merge branch 'develop' into origin/feature/migrate-etablishment
# Conflicts:
#	apps/establishment/transfer_data.py
#	apps/transfer/management/commands/transfer.py
2019-10-31 07:44:07 +03:00
littlewolf
b146e6cd24 Add establishment address transfer 2019-10-31 07:00:44 +03:00
alex
7e503f617e merge migrations 2019-10-30 20:15:19 +03:00
alex
962d24f737 Merge branch 'migration_fix' into develop
# Conflicts:
#	apps/establishment/admin.py
#	apps/transfer/models.py
2019-10-30 20:04:02 +03:00
a.feteleu
d31bb9b495 merge migrations 2019-10-30 19:19:40 +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
alex
4343060c74 Merge branch 'migration_fix' into HEAD 2019-10-30 15:49:32 +03:00
Kuroshini
d4792cb342 Geo subtypes 2019-10-30 14:34:07 +03:00
evgeniy-st
00bcd6c205 added merge migrations 2019-10-30 11:59:19 +03:00
evgeniy-st
e371fdceea Merge branch 'develop' into migration_fix 2019-10-30 11:50:30 +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