a.feteleu
|
8e01c2092d
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-20 09:43:58 +03:00 |
|
Anatoly
|
1a1a2a2d24
|
added bo endpoints for establishment notes
|
2019-11-20 09:43:45 +03:00 |
|
a.feteleu
|
10579843af
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-19 18:29:20 +03:00 |
|
Anatoly
|
9975f3f3b5
|
added bo endpoints for product notes
|
2019-11-19 18:28:53 +03:00 |
|
a.feteleu
|
0b1b89b6ba
|
added merge migration
|
2019-11-19 17:38:53 +03:00 |
|
Anatoly
|
484a9a3250
|
added field - average price to model Product and transfer command
|
2019-11-19 17:37:23 +03:00 |
|
Kuroshini
|
5c4c4c60c3
|
ES as separate server
|
2019-11-18 20:12:58 +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 |
|
Dmitriy Kuzmenko
|
2cd7755d7e
|
add CRUD collections for back
|
2019-11-15 16:04:54 +03:00 |
|
Semyon Yekhmenin
|
36b47a6cba
|
Added establishment subtype to product view
|
2019-11-15 09:13:28 +00:00 |
|
evgeniy-st
|
43963f3020
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-15 11:57:16 +03:00 |
|
evgeniy-st
|
ff006eb6fb
|
Try this style of update tasks of the establishments
|
2019-11-15 11:56:16 +03:00 |
|
Виктор Гладких
|
0f142d3870
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-15 10:48:18 +03:00 |
|
Виктор Гладких
|
b590a762c1
|
Fix update
|
2019-11-15 10:48:04 +03:00 |
|
evgeniy-st
|
8951de7399
|
updated requirements, updated ES task
|
2019-11-15 10:23:16 +03:00 |
|
Виктор Гладких
|
2931381126
|
Fix update employee
|
2019-11-15 10:12:19 +03: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 |
|
alex
|
b94a6dfd62
|
social choices model
|
2019-11-14 09:14:36 +03:00 |
|
Anatoly
|
2ec40ff8fe
|
removed choices from index names for models ProductType, ProductSubType, EstablishmentType, EstablishmentSubType
|
2019-11-13 18:22:26 +03:00 |
|
Anatoly
|
3641d88a05
|
fixed admin pages for product
|
2019-11-13 17:33:19 +03:00 |
|
Виктор Гладких
|
c5ac47953c
|
Merge branch 'develop' into feature/add_tag_product
|
2019-11-12 18:38:25 +03:00 |
|
Виктор Гладких
|
89fa7c5d56
|
Fix for merge
|
2019-11-12 18:37:43 +03:00 |
|
evgeniy-st
|
0dfa1c85d5
|
Recalculate toque number fallback
|
2019-11-12 18:15:53 +03:00 |
|
Виктор Гладких
|
ced49965f9
|
Fix employee name
|
2019-11-12 17:54:07 +03:00 |
|
Виктор Гладких
|
e702be2691
|
Fix employee name
|
2019-11-12 17:51:57 +03:00 |
|
d.kuzmenko
|
dd35319e5c
|
Merge branch 'feature/fill-closed-at' into 'develop'
Closed_at fill command
See merge request gm/gm-backend!121
|
2019-11-12 12:58:24 +00:00 |
|
d.kuzmenko
|
feb1b8c6ea
|
Merge branch 'feature/bring-back-address' into 'develop'
Add city name field to establishment api representations
See merge request gm/gm-backend!118
|
2019-11-12 12:57:05 +00:00 |
|
d.kuzmenko
|
cd1967ee51
|
Merge branch 'feature/works-whole-day-es-filter' into 'develop'
Feature/works whole day es filter
See merge request gm/gm-backend!113
|
2019-11-12 12:33:45 +00:00 |
|
Anatoly
|
8eac730d9f
|
added transfer for notes
|
2019-11-12 15:14:35 +03:00 |
|
Kuroshini
|
7bba5237dc
|
Closed_at fill command
|
2019-11-12 15:12:47 +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 |
|
Kuroshini
|
e065f1c9b4
|
Works at weekday fiter
|
2019-11-12 15:10:16 +03:00 |
|
Виктор Гладких
|
429cc705a1
|
Fix add_empl_position
|
2019-11-12 10:42:15 +03:00 |
|
Dmitriy Kuzmenko
|
e4061996a8
|
fix model currency
|
2019-11-12 04:09:57 +03:00 |
|
Dmitriy Kuzmenko
|
ec96c32453
|
fix product type
|
2019-11-12 02:28:33 +03:00 |
|
Dmitriy Kuzmenko
|
c433c18c60
|
add blank TZ as UTC
|
2019-11-12 01:02:35 +03:00 |
|
Anatoly
|
46662398e4
|
refactored detail and list view of products
|
2019-11-11 19:19:18 +03:00 |
|
Dmitriy Kuzmenko
|
a7dca6cd78
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# apps/establishment/transfer_data.py
|
2019-11-11 15:32:42 +03:00 |
|
Dmitriy Kuzmenko
|
7617981259
|
change command for migration of users
|
2019-11-11 15:29:31 +03:00 |
|