Commit Graph

757 Commits

Author SHA1 Message Date
Anatoly
530cfc44be done "GM-377" 2020-02-10 16:56:11 +03:00
Anatoly
6987daeea4 done "GM-370" 2020-02-10 15:14:01 +03:00
Kuroshini
92367b35d7 fix 2020-02-10 12:27:05 +03:00
Олег Хаятов
2832c1696f Merge branch 'feature/establishment-status-bar' into 'develop'
must_of_the_week behaviour for update. public_mark has been returned

See merge request gm/gm-backend!271
2020-02-10 09:07:31 +00:00
Александр Пархомин
893eb6e877 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2020-02-10 09:59:08 +03:00
a.gorbunov
c6e12f3320 must_of_the_week behaviour for update. public_mark has been returned 2020-02-08 10:37:28 +00:00
a.gorbunov
3da4dfd54b hide useless statuses 2020-02-07 15:41:57 +00:00
Anatoly
4559b0eeeb added a documentation for gallery 2020-02-07 17:28:38 +03:00
Kuroshini
f30a893fae establishment vintage year and delete media 2020-02-07 16:41:27 +03:00
alex
d488b7b229 fix anonymous user 2020-02-07 16:28:11 +03:00
Anatoly
82e7262fdf modified documentation strings for creating establishment schedule 2020-02-07 15:28:59 +03:00
alex
e0cbf1115b Merge remote-tracking branch 'origin/develop' into develop 2020-02-07 15:03:07 +03:00
alex
955527a2c1 employee for admin 2020-02-07 15:02:58 +03:00
Олег Хаятов
6868f75dc8 Merge branch 'feature/fields_for_establishment' into 'develop'
Feature/fields for establishment

See merge request gm/gm-backend!268
2020-02-07 11:50:42 +00:00
a.gorbunov
5023650e8b migration for establishment 2020-02-07 11:43:50 +00:00
a.gorbunov
f854cd6ba5 last update by for establishment 2020-02-07 11:41:49 +00:00
Kuroshini
9084fbeab6 reviews or bo list 2020-02-07 14:25:57 +03:00
alex
6feb67b0b5 GET carousel for BO 2020-02-07 13:43:20 +03:00
a.gorbunov
5b6db0f974 must of the week mark 2020-02-07 10:40:30 +00:00
a.gorbunov
0eb6a73e09 Carousel mixin 2020-02-07 10:25:52 +00:00
Александр Пархомин
ea25ea7fbd add docstring for social socialchoice 2020-02-07 11:41:51 +03:00
Александр Пархомин
e990810839 add docstring for phone 2020-02-07 11:34:47 +03:00
a.gorbunov
b6cf12f35c save address cascade for establishment 2020-02-07 08:27:54 +00:00
Александр Пархомин
12b56da53a Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2020-02-07 11:09:30 +03:00
Александр Пархомин
60fd0d3aa4 add docstring for email 2020-02-07 11:09:01 +03:00
a.gorbunov
8483a56ea7 fix country_name for mobile 2020-02-07 07:53:29 +00:00
Kuroshini
2c3beb78d8 remove wrong unique constraint 2020-02-06 21:50:27 +03:00
Александр Пархомин
32439c9db6 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2020-02-06 18:06:46 +03:00
Александр Пархомин
7dec8048e1 add docstring for establishment schedule 2020-02-06 18:05:29 +03:00
Олег Хаятов
e656316cda Merge branch 'feature/save-address-cascade' into 'develop'
cascade save address

See merge request gm/gm-backend!265
2020-02-06 14:55:44 +00:00
Александр Пархомин
bb040fffdf Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2020-02-06 17:45:25 +03:00
Александр Пархомин
f6d41f878f add docstring for establishment type 2020-02-06 17:45:01 +03:00
a.gorbunov
2235198198 cascade save address 2020-02-06 14:19:17 +00:00
Kuroshini
c8d2884a48 filter employees by country for BO 2020-02-06 15:17:21 +03:00
Anatoly
0104400dbd added documentation for employees 2020-02-06 14:54:29 +03:00
Anatoly
cd766e6bbf added documentation for /api/back/establishments/<id>/employees/ 2020-02-06 13:12:10 +03:00
Олег Хаятов
2ffe4bc3ea Merge branch 'bug-establishment_tag_filtration' into 'develop'
bug-establishment_tag_filtration

See merge request gm/gm-backend!264
2020-02-06 09:07:34 +00:00
Kirill
89f2c3bf1d remove shop category tags from serialization 2020-02-06 11:22:14 +03:00
Anatoly
8993ec1097 added documentation for /api/back/establishments/employees/<id>/ 2020-02-06 11:19:41 +03:00
Kuroshini
d234214467 more detailed address information 2020-02-05 18:46:17 +03:00
Александр Пархомин
8aa7f89fe2 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2020-02-05 18:42:54 +03:00
Александр Пархомин
f87278a4dc add docstring for establishment subtype by id 2020-02-05 18:42:42 +03:00
Kuroshini
9a493545d8 types 2020-02-05 18:39:22 +03:00
Александр Пархомин
b679fdab56 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2020-02-05 18:37:38 +03:00
Александр Пархомин
58c4ab8788 add docstring for establishment subtype 2020-02-05 18:37:22 +03:00
Anatoly
a54bc86d20 added documentation for /api/back/establishments/employees/ (GET, POST) 2020-02-05 18:28:08 +03:00
Александр Пархомин
2151c36d92 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2020-02-05 18:25:10 +03:00
Александр Пархомин
06a215060f add docstring for establishment from carousel 2020-02-05 18:24:54 +03:00
Kuroshini
0ab947f5bb establishment address for BO list 2020-02-05 18:00:11 +03:00
Kuroshini
285f52ce30 establishment back list add toque number and public_mark 2020-02-05 17:46:14 +03:00