Commit Graph

111 Commits

Author SHA1 Message Date
Anatoly
15b8241213 refactored serializers that retrieving phone numbers 2020-02-03 13:11:13 +03:00
Anatoly
45f65658f0 added "status" field to Establishment model, refactored serializers and filters associated with field "is_publish", modified transfer 2020-01-31 11:34:06 +03:00
dormantman
b94e933cb1 Added migration 2020-01-30 20:58:45 +03:00
Anatoly
13cc40c19c added transfer for table - a la cartes 2020-01-30 16:17:30 +03:00
dormantman
19cf1b07d6 Added rud finding 2020-01-29 18:19:28 +03:00
dormantman
a6db15ed50 Added menu dishes 2020-01-29 16:11:53 +03:00
dormantman
bcc5f2da51 Added menus method 2020-01-29 15:17:15 +03:00
dormantman
e067e8e793 Added menu upload files 2020-01-28 18:29:02 +03:00
dormantman
d0e75ca07c Added instagram/western_name fields 2020-01-28 15:46:23 +03:00
alex
29a7fb82ce dishes menu list-create 2020-01-24 10:21:35 +03:00
alex
a994e7214b fix from_date and to_date for est_employee 2020-01-20 15:51:47 +03:00
Kuroshini
ea485d9960 optimize images at least for establishments 2020-01-16 19:21:57 +03:00
Anatoly
f86357e041 fix comments 2020-01-15 22:31:30 +03:00
Kuroshini
59f7f8d2d4 distillery_type 2020-01-15 17:50:12 +03:00
Anatoly
8cb0f51802 fix transfer command transfer_city_gallery, add field image to City model, fix serializer CityDetailSerializer 2020-01-15 13:22:54 +03:00
alex
e4123d3ce9 preview_image to establishment and product type and subtype 2020-01-15 10:47:18 +03:00
Dmitriy Kuzmenko
11b55e9f4c change chosen tag functional 2020-01-14 15:40:49 +03:00
alex
d6345f27e2 establishment menu currency id 2020-01-13 11:56:04 +03:00
Anatoly
b2f3e1f96b added field - "distillery_types" in establishment list, detail and similar list view 2020-01-13 11:50:54 +03:00
Dmitriy Kuzmenko
e2d71fca8f Merge branch 'develop' into feature/guides 2019-12-27 18:00:20 +03:00
alex
e3d7618c62 preview_image to establishment and product type and subtype 2019-12-27 09:47:48 +03:00
Dmitriy Kuzmenko
02d0112d8b add export for guides 2019-12-26 18:11:48 +03:00
Anatoly
f576825a71 Merge branch 'develop' into feature/guides
# Conflicts:
#	apps/collection/models.py
#	apps/establishment/models.py
#	apps/establishment/views/web.py
#	apps/product/views/common.py
#	requirements/base.txt
2019-12-23 13:11:05 +03:00
Anatoly
7452f0bef0 intermediate commit 2019-12-23 12:38:13 +03:00
Anatoly
72e5d723db added default image for type/subtype 2019-12-20 17:27:04 +03:00
Kuroshini
0f11a47a79 rest category & rest cuisine for favs
(cherry picked from commit 79a70fb)
2019-12-09 16:48:50 +03:00
Kuroshini
912431690d rename attrs #2 2019-12-09 15:21:39 +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
alex
99e2b060f8 Merge remote-tracking branch 'origin/develop' into develop 2019-12-06 14:12:59 +03:00
alex
e08296c52d address to product detail web api 2019-12-06 14:12:26 +03:00
Kuroshini
91b528feb9 tags for establishments 2019-12-06 14:03:14 +03:00
Kuroshini
1e0044cbd1 artisans tags for favs
(cherry picked from commit 7081e52)
2019-12-05 12:12:08 +03:00
Anatoly
9dc8e34e3a Merge branch 'develop' into feature/transfer-guide
# Conflicts:
#	apps/establishment/models.py
#	apps/establishment/serializers/common.py
2019-12-04 20:16:21 +03:00
Anatoly
29ff10fb4b added wine origins 2019-12-04 20:13:09 +03:00
Kuroshini
f44a4bb29d Establishments favs type 2019-12-04 19:37:05 +03:00
Kuroshini
69b40f21b7 last comment for mobile establishment detail 2019-12-04 18:26:03 +03:00
Kuroshini
dee353199d add schedule to establishments list 2019-12-04 17:31:02 +03:00
dormantman
a81f3f079a Changed url id to slug in back-office 2019-12-04 13:37:49 +03:00
Kuroshini
e40156908b Artisan category tags for establishments 2019-12-02 21:38:21 +03:00
Kuroshini
140ba040e7 Extra fields for establishments 2019-12-02 21:26:55 +03:00
Kuroshini
3b05a552aa Tz field for establishments
(cherry picked from commit a537f04)
2019-12-02 18:37:16 +03:00
alex
17f67d020a back carousel api and test 2019-11-25 15:00:53 +03:00
Semyon Yekhmenin
e565406729 Feature/bo employee update 2019-11-22 14:21:25 +00:00
alex
a5d5dc1335 establishment carousel web and mobile api 2019-11-22 17:13:41 +03:00
Anatoly
484a9a3250 added field - average price to model Product and transfer command 2019-11-19 17:37:23 +03:00
Anatoly
012d2dcb23 added validation to Company serializer 2019-11-18 17:58:46 +03:00
Anatoly
0d9d45bcc5 added model Product and bo endpoints 2019-11-18 17:58:46 +03:00
Kuroshini
9212f85ee5 Visible tags for establishments 2019-11-18 15:15:33 +03:00
Anatoly
dce951c4f9 Merge branch 'develop' into feature/establishment-gallery
# Conflicts:
#	apps/product/serializers/common.py
2019-11-17 14:25:41 +03:00
Anatoly
a8b3c9aa63 refactored galleries, added transfer script 2019-11-17 14:22:30 +03:00