Commit Graph

363 Commits

Author SHA1 Message Date
Виктор Гладких
1c8737a798 Merge branch 'develop' into feature/account_migrate 2019-11-07 17:05:06 +03:00
evgeniy-st
4573233e45 fix 2019-11-07 17:04:26 +03:00
evgeniy-st
497451cb3e Added tags to Establishment back-office serializers 2019-11-07 17:01:27 +03:00
Виктор Гладких
ba6d18d202 Fix account migration 2019-11-07 17:01:26 +03:00
Semyon Yekhmenin
d717b09153 Fixed nearest establishments search 2019-11-06 11:35:43 +00:00
alex
a372d29677 refactor comment migration 2019-11-06 14:24:14 +03:00
evgeniy-st
c17f9ce820 Remove name_translated from establishment. Added AddressDetailSerializer
to EstablishmentRUDView
2019-11-06 14:16:10 +03:00
Dmitriy Kuzmenko
edaf9f8fdb add migrations 2019-11-06 12:22:16 +03:00
d.kuzmenko
b5789a1a5e Merge branch 'feature/affilations/award_type' into 'develop'
Feature/affilations/award type

See merge request gm/gm-backend!104
2019-11-06 09:00:51 +00:00
Виктор Гладких
e04c621a3d Fix message 2019-11-06 11:50:42 +03:00
d.kuzmenko
8fca3916f9 Merge branch 'feature/affiliations' into 'develop'
Feature/affiliations

See merge request gm/gm-backend!102
2019-11-06 08:46:43 +00:00
evgeniy-st
661f6fb395 Added fields to Establishment model: index_name, tranliterated_name 2019-11-06 11:25:38 +03:00
Виктор Гладких
545e9a249b Fix help 2019-11-05 17:32:18 +03:00
Виктор Гладких
6f4cd56fcd Add establishment employee 2019-11-05 17:28:13 +03:00
d.kuzmenko
28471686be Merge branch 'feature/fix-open-noon-afternoon' into 'develop'
Feature/fix open noon afternoon

See merge request gm/gm-backend!101
2019-11-05 14:26:24 +00:00
Kuroshini
a60fb84bcb Use not only closed_at / opening_at 2019-11-05 17:07:48 +03:00
evgeniy-st
273478a7cb add address to establishmentRUDSerializer 2019-11-05 16:57:07 +03:00
Виктор Гладких
22982f3332 Add employee fix 2019-11-05 16:33:38 +03:00
Виктор Гладких
ea1ddfa320 Add employee 2019-11-05 16:29:27 +03:00
evgeniy-st
568ec84da0 Added filter class to EstalibshmentListCreateView 2019-11-05 16:20:24 +03:00
Виктор Гладких
e7143f73c3 Add positions 2019-11-05 14:59:32 +03:00
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