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 |
|
Anatoly
|
c67109d9f8
|
Merge branch 'develop' into features/migrate-wine
# Conflicts:
# apps/transfer/management/commands/transfer.py
# apps/transfer/models.py
# project/settings/base.py
|
2019-11-11 11:35:03 +03:00 |
|
Anatoly
|
8a49a5ee72
|
added gallery to model product
|
2019-11-10 16:08:27 +03:00 |
|
Виктор Гладких
|
1c8737a798
|
Merge branch 'develop' into feature/account_migrate
|
2019-11-07 17:05:06 +03:00 |
|
evgeniy-st
|
4573233e45
|
fix
|
2019-11-07 17:04:26 +03:00 |
|
evgeniy-st
|
497451cb3e
|
Added tags to Establishment back-office serializers
|
2019-11-07 17:01:27 +03:00 |
|
Виктор Гладких
|
ba6d18d202
|
Fix account migration
|
2019-11-07 17:01:26 +03:00 |
|
Semyon Yekhmenin
|
d717b09153
|
Fixed nearest establishments search
|
2019-11-06 11:35:43 +00:00 |
|
alex
|
a372d29677
|
refactor comment migration
|
2019-11-06 14:24:14 +03:00 |
|
evgeniy-st
|
c17f9ce820
|
Remove name_translated from establishment. Added AddressDetailSerializer
to EstablishmentRUDView
|
2019-11-06 14:16:10 +03:00 |
|
Dmitriy Kuzmenko
|
edaf9f8fdb
|
add migrations
|
2019-11-06 12:22:16 +03:00 |
|
d.kuzmenko
|
b5789a1a5e
|
Merge branch 'feature/affilations/award_type' into 'develop'
Feature/affilations/award type
See merge request gm/gm-backend!104
|
2019-11-06 09:00:51 +00:00 |
|
Виктор Гладких
|
e04c621a3d
|
Fix message
|
2019-11-06 11:50:42 +03:00 |
|
d.kuzmenko
|
8fca3916f9
|
Merge branch 'feature/affiliations' into 'develop'
Feature/affiliations
See merge request gm/gm-backend!102
|
2019-11-06 08:46:43 +00:00 |
|
evgeniy-st
|
661f6fb395
|
Added fields to Establishment model: index_name, tranliterated_name
|
2019-11-06 11:25:38 +03:00 |
|
Виктор Гладких
|
545e9a249b
|
Fix help
|
2019-11-05 17:32:18 +03:00 |
|
Виктор Гладких
|
6f4cd56fcd
|
Add establishment employee
|
2019-11-05 17:28:13 +03:00 |
|
d.kuzmenko
|
28471686be
|
Merge branch 'feature/fix-open-noon-afternoon' into 'develop'
Feature/fix open noon afternoon
See merge request gm/gm-backend!101
|
2019-11-05 14:26:24 +00:00 |
|
Kuroshini
|
a60fb84bcb
|
Use not only closed_at / opening_at
|
2019-11-05 17:07:48 +03:00 |
|
evgeniy-st
|
273478a7cb
|
add address to establishmentRUDSerializer
|
2019-11-05 16:57:07 +03:00 |
|
Виктор Гладких
|
22982f3332
|
Add employee fix
|
2019-11-05 16:33:38 +03:00 |
|
Виктор Гладких
|
ea1ddfa320
|
Add employee
|
2019-11-05 16:29:27 +03:00 |
|