alex
|
8137bf0f68
|
fix establishment socials read_only
|
2020-01-30 11:09:12 +03:00 |
|
Олег Хаятов
|
0e7fd39d37
|
Merge branch 'feature/bo-menus' into 'develop'
Feature/bo menus
See merge request gm/gm-backend!247
|
2020-01-29 15:54:44 +00: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 |
|
Kuroshini
|
63fa81385e
|
western_name creation
|
2020-01-29 14:41:34 +03:00 |
|
alex
|
d9ff3227dc
|
address read only
|
2020-01-28 18:54:27 +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
|
193f1655e4
|
email cascade establishment
|
2020-01-28 14:36:54 +03:00 |
|
alex
|
a02a52f2b0
|
menu dishes gallery api
|
2020-01-28 12:49:45 +03:00 |
|
alex
|
c0f3aca532
|
menu gallery
|
2020-01-28 12:16:56 +03:00 |
|
dormantman
|
d51d304077
|
Refactor (structure)
|
2020-01-27 21:45:14 +03:00 |
|
Ruslan Stepanov
|
1d534fe1a8
|
Merge branch 'develop' into 'feature/employees-params'
# Conflicts:
# apps/establishment/serializers/back.py
# apps/establishment/views/back.py
|
2020-01-27 17:04:15 +00:00 |
|
dormantman
|
f45eae56e9
|
Added new features
|
2020-01-27 20:03:42 +03:00 |
|
dormantman
|
d2f04d4958
|
Reformat method structure
|
2020-01-25 00:42:00 +03:00 |
|
dormantman
|
dd49ee7b6c
|
Reformat restaurant to name
|
2020-01-24 22:37:06 +03:00 |
|
dormantman
|
809b5ccab7
|
Fixed employee establishments method
|
2020-01-24 22:33:39 +03:00 |
|
alex
|
34055d3669
|
fix plate_set
|
2020-01-24 13:31:00 +03:00 |
|
alex
|
a195ed3a53
|
menu dishes rud
|
2020-01-24 10:35:55 +03:00 |
|
alex
|
22b1b3064d
|
is_drinks_included and last_update in serializer
|
2020-01-24 10:31:07 +03:00 |
|
alex
|
29a7fb82ce
|
dishes menu list-create
|
2020-01-24 10:21:35 +03:00 |
|
dormantman
|
8fb8c49bfe
|
Added employee positions method
|
2020-01-22 18:48:16 +03:00 |
|
Kuroshini
|
0023fcb47b
|
fix photos
|
2020-01-22 12:19:16 +03:00 |
|
dormantman
|
88e488e481
|
Added employee establishments method
|
2020-01-21 19:19:38 +03:00 |
|
Kuroshini
|
8235c6d172
|
fix
|
2020-01-21 12:37:33 +03:00 |
|
Kuroshini
|
416af8d343
|
photo for employee
|
2020-01-21 12:33:15 +03:00 |
|
alex
|
a994e7214b
|
fix from_date and to_date for est_employee
|
2020-01-20 15:51:47 +03:00 |
|
alex
|
beefc82d7b
|
toque number and employee for establishment
|
2020-01-20 14:20:46 +03:00 |
|
alex
|
215e7b5f19
|
establishment employee list
|
2020-01-20 12:13:50 +03:00 |
|
Kuroshini
|
a05db696b0
|
optimize db queries on /api/back/establishments/employees
|
2020-01-17 19:08:33 +03:00 |
|
alex
|
a8ea238bfc
|
some optimize for employee list
|
2020-01-17 16:02:00 +03:00 |
|
alex
|
a915cff73d
|
photo for employee
|
2020-01-17 13:56:58 +03:00 |
|
alex
|
0695cdce6b
|
available_for_events field for employee
|
2020-01-17 11:36:13 +03:00 |
|
Kuroshini
|
ea485d9960
|
optimize images at least for establishments
|
2020-01-16 19:21:57 +03:00 |
|
Kuroshini
|
3d09333d31
|
toques for employees in BO
|
2020-01-16 16:51:33 +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 |
|
Kuroshini
|
129201d3a9
|
add slug for backoffice establishments
|
2020-01-15 16:51:42 +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 |
|
alex
|
19b9e636c1
|
phones for cascade establishment
|
2020-01-15 09:20:09 +03:00 |
|
Dmitriy Kuzmenko
|
9aeedff81e
|
Merge branch 'develop' into phone_list
|
2020-01-14 15:59:46 +03:00 |
|
Dmitriy Kuzmenko
|
11b55e9f4c
|
change chosen tag functional
|
2020-01-14 15:40:49 +03:00 |
|
alex
|
35d9f37fab
|
fix serializer
|
2020-01-13 15:47:50 +03:00 |
|
alex
|
605a3e12e1
|
phone_list field create and update
|
2020-01-13 15:44:51 +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 |
|
Anatoly
|
23f8c0bbcd
|
added field address_id to request data in /api/back/establishments/
in Establishment make as mandatory field address
|
2020-01-10 14:40:54 +03:00 |
|
Kuroshini
|
a925d2f623
|
create est with address id #2
|
2020-01-10 14:04:11 +03:00 |
|
Kuroshini
|
c22fb3fb5c
|
create est with address id
|
2020-01-10 14:01:59 +03:00 |
|
alex
|
30e25c2da0
|
fix EmployeeBackSerializers
|
2020-01-09 16:29:33 +03:00 |
|
Dmitriy Kuzmenko
|
e2d71fca8f
|
Merge branch 'develop' into feature/guides
|
2019-12-27 18:00:20 +03:00 |
|
Виктор Гладких
|
660d60e656
|
Lite refactor
|
2019-12-27 16:30:31 +03:00 |
|
Виктор Гладких
|
caa17bf9f4
|
Serialize employee with positions, public_mark and establishment
|
2019-12-27 16:13:22 +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 |
|
Anatoly
|
471239983e
|
Merge branch 'develop' into feature/guides
# Conflicts:
# apps/collection/views/back.py
# apps/transfer/models.py
|
2019-12-17 14:47:26 +03:00 |
|
Dmitriy Kuzmenko
|
bd6f8a47a1
|
add api for establishment admin
|
2019-12-13 11:02:37 +03:00 |
|
Anatoly
|
7d40471084
|
intermediate commit
|
2019-12-10 17:44:29 +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 |
|
Semyon Yekhmenin
|
1711057cee
|
Feature/bo establishment employee features
|
2019-11-25 12:15:51 +00: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
|
1a1a2a2d24
|
added bo endpoints for establishment notes
|
2019-11-20 09:43:45 +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 |
|