Commit Graph

51 Commits

Author SHA1 Message Date
alex
605a3e12e1 phone_list field create and update 2020-01-13 15:44:51 +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
Виктор Гладких
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
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
dormantman
a81f3f079a Changed url id to slug in back-office 2019-12-04 13:37:49 +03:00
Semyon Yekhmenin
1711057cee Feature/bo establishment employee features 2019-11-25 12:15:51 +00:00
Semyon Yekhmenin
e565406729 Feature/bo employee update 2019-11-22 14:21:25 +00:00
Anatoly
1a1a2a2d24 added bo endpoints for establishment notes 2019-11-20 09:43:45 +03:00
Anatoly
0d9d45bcc5 added model Product and bo endpoints 2019-11-18 17:58:46 +03:00
Anatoly
a8b3c9aa63 refactored galleries, added transfer script 2019-11-17 14:22:30 +03:00
alex
e49d62de5d social choice api and test 2019-11-14 09:53:36 +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
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
evgeniy-st
273478a7cb add address to establishmentRUDSerializer 2019-11-05 16:57:07 +03:00
evgeniy-st
128488b5ee some bugfixes 2019-10-24 16:17:37 +03:00
Kuroshini
d5609e4cb8 Works now filter first part 2019-10-23 17:29:00 +03:00
evgeniy-st
9d4c483f51 clean models (tags) 2019-10-15 18:25:09 +03:00
evgeniy-st
60cdec99e0 refactor tags 2019-10-15 17:17:03 +03:00
Anatoly
cb762ce746 added param to attr for Establoishment model and small refactoring, boost queries 2019-10-11 18:26:13 +03:00
Anatoly
ddb3eec679 finished endpoint to get tags by establishment type and subtype 2019-10-11 15:41:31 +03:00
Anatoly
f83b735eb3 changed files 2019-10-10 15:10:43 +03:00
Kuroshini
4c960c8abf Booking (squashed commit) 2019-10-01 18:25:57 +03:00
evgeniy-st
051957c7cf Refactor JSON Validation 2019-10-01 13:03:59 +03:00
Kuroshini
4d113a6916 Fix all test 2019-09-27 22:06:46 +03:00
evgeniy-st
403a60623a Merge branch 'develop' into feature/refactor-establishments 2019-09-27 10:05:15 +03:00
Виктор Гладких
40d9f2f2ed check 2019-09-26 11:45:26 +03:00
Виктор Гладких
86d754f4bb validate json translated field 2019-09-26 11:38:37 +03:00
d.kuzmenko
e0f71d2646 Merge branch 'feature/add-base-attributes-autouse' into 'develop'
Feature/add base attributes autouse

See merge request gm/gm-backend!24
2019-09-26 08:34:38 +00:00
evgeniy-st
f18c18110c Refactor some establishment serializer 2019-09-25 15:32:45 +03:00
littlewolf
a55695b120 Switch to decorator
Add update test
2019-09-24 20:12:09 +03:00
Kuroshini
1534c9b09c Remove unique
(cherry picked from commit f793c20)
2019-09-24 14:51:51 +03:00
Kuroshini
65914659e5 Slugs serializers 2019-09-24 12:31:35 +03:00
Kuroshini
6420a676df create slugs manually 2019-09-24 10:38:04 +03:00
Kuroshini
1ce71fdcdc slugs for news & establishments 2019-09-24 10:38:04 +03:00
littlewolf
9f89deb23b Fix establishment RUD serializer 2019-09-23 11:16:22 +03:00
littlewolf
014931d2c4 Add plate tests
Add is_publish to serializer
Add TODO for is_publish
2019-09-20 15:39:53 +03:00
Dmitriy Kuzmenko
5a36613c97 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apps/establishment/urls/back.py
2019-09-19 17:19:40 +03:00
Dmitriy Kuzmenko
2164e30aef chnage image field to image_url in establishments 2019-09-19 17:18:08 +03:00
Anatoly
a09d6b28f1 Merge branch 'feature/gm-80' into develop
# Conflicts:
#	apps/establishment/serializers/back.py
2019-09-19 14:32:10 +03:00
Anatoly
540a819f94 gm-80: in progress 2019-09-18 18:46:24 +03:00
ВашÐВиктор ГладкихÐ
a1ea35fce1 CRUD logic for employee 2019-09-18 18:12:49 +03:00
Dmitriy Kuzmenko
15f02b72ca add email and phone api for establishments 2019-09-13 12:20:36 +03:00