Commit Graph

88 Commits

Author SHA1 Message Date
alex
e3d7618c62 preview_image to establishment and product type and subtype 2019-12-27 09:47:48 +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
Kuroshini
cc67499601 Fix wines db queries 2019-11-16 18:32:38 +03:00
alex
78e42550c1 add address to establishment similar and collection establishment 2019-11-16 16:57:26 +03:00
Semyon Yekhmenin
73f20bd2e8 Added type and subtypes fields with index names in establishment list view 2019-11-15 13:06:17 +00:00
Semyon Yekhmenin
36b47a6cba Added establishment subtype to product view 2019-11-15 09:13:28 +00:00
Kuroshini
2367fec098 Use establishment type product serializer w/ index name 2019-11-15 00:28:00 +03:00
Kuroshini
5718955ba8 Index name for products establishment 2019-11-14 22:31:21 +03:00
Semyon Yekhmenin
b60ed7c7d5 Added establishment type to product view 2019-11-14 14:33:49 +00:00
alex
e49d62de5d social choice api and test 2019-11-14 09:53:36 +03:00
Kuroshini
57a4498ba1 Add schedule to establishment list serializer 2019-11-12 15:11:32 +03:00
Kuroshini
521d7f19f3 Add city name field to establishment api representations 2019-11-12 15:11:32 +03:00
Anatoly
46662398e4 refactored detail and list view of products 2019-11-11 19:19:18 +03:00
evgeniy-st
c17f9ce820 Remove name_translated from establishment. Added AddressDetailSerializer
to EstablishmentRUDView
2019-11-06 14:16:10 +03:00
evgeniy-st
661f6fb395 Added fields to Establishment model: index_name, tranliterated_name 2019-11-06 11:25:38 +03:00
Dmitriy Kuzmenko
b3345d612a renge_menu and carte 2019-11-04 02:25:04 +03:00
Kuroshini
d4792cb342 Geo subtypes 2019-10-30 14:34:07 +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
Kuroshini
a0aa503cfa Add index_name type field to geo 2019-10-29 20:56:41 +03:00
Anatoly
03c75efece gm-259, gm-260, gm-261 2019-10-29 17:16:39 +03:00
Semyon Yekhmenin
e1e0f1e997 Added index_name in employee position 2019-10-25 13:41:53 +00:00
evgeniy-st
8a8986246f Merge branch 'bugfix/kuroshini' into develop 2019-10-24 16:19:10 +03:00
evgeniy-st
128488b5ee some bugfixes 2019-10-24 16:17:37 +03:00
Semyon Yekhmenin
74b2b52ee1 Added currency to establishment model 2019-10-24 11:06:58 +00:00
evgeniy-st
9d4c483f51 clean models (tags) 2019-10-15 18:25:09 +03:00