Commit Graph

41 Commits

Author SHA1 Message Date
Dmitriy Kuzmenko
db6c93a72f add trensfer menus 2019-11-04 00:41:34 +03:00
Dmitriy Kuzmenko
1856589427 disabled inline in est, and change currency creator 2019-11-03 14:55:08 +03:00
evgeniy-st
6d34e406db recalculate toque number 2019-10-31 19:09:57 +03:00
littlewolf
8f18320171 Merge branch 'develop' into origin/feature/migrate-etablishment
# Conflicts:
#	apps/establishment/transfer_data.py
#	apps/transfer/management/commands/transfer.py
2019-10-31 07:44:07 +03:00
alex
962d24f737 Merge branch 'migration_fix' into develop
# Conflicts:
#	apps/establishment/admin.py
#	apps/transfer/models.py
2019-10-30 20:04:02 +03:00
Dmitriy Kuzmenko
638bafe4a6 Merge remote-tracking branch 'origin/develop' into origin/migration_fix
# Conflicts:
#	apps/establishment/admin.py
#	project/settings/base.py
2019-10-30 19:12:59 +03:00
evgeniy-st
e371fdceea Merge branch 'develop' into migration_fix 2019-10-30 11:50:30 +03:00
Anatoly
5675f23fae fixed BaseModelAdminMixin 2019-10-29 18:12:52 +03:00
Anatoly
5984fdc7cd fixed BaseModelAdminMixin 2019-10-29 17:57:11 +03:00
Anatoly
71f2f8a574 small fix for establishment model admin 2019-10-29 17:44:03 +03:00
Dmitriy Kuzmenko
03bf648ef9 add change admin for establishments 2019-10-29 15:08:54 +03:00
Dmitriy Kuzmenko
30ba313f54 add filter accounts for existing users 2019-10-29 14:47:57 +03:00
Dmitriy Kuzmenko
631ffd265a add mixin for admin panel 2019-10-29 14:46:44 +03:00
Anatoly
8cf2cebe85 added BaseModelAdminMixin 2019-10-29 14:01:27 +03:00
alex
4e0f3c9a4d with address 2019-10-28 10:59:28 +03:00
Anatoly
37d745eeaa added endpoints, filters, serializers and extend model Product, ProductType, ProductSubtype 2019-10-26 18:54:22 +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
ddb3eec679 finished endpoint to get tags by establishment type and subtype 2019-10-11 15:41:31 +03:00
Anatoly
d321866dc2 gm-192: in progress 2019-10-08 15:38:35 +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
540a819f94 gm-80: in progress 2019-09-18 18:46:24 +03:00
Anatoly
605c81b33c replace comment model from establishment app, added new app comment 2019-09-04 18:47:06 +03:00
Dmitriy Kuzmenko
c85347b53a add menu 2019-09-01 16:18:17 +03:00
evgeniy-st
f10f6b23a0 Merge branch 'feature/employees' into develop 2019-09-01 14:33:25 +03:00
evgeniy-st
1b001f303a extended establishment api enpoint by attribute of 'employees' 2019-09-01 14:17:03 +03:00
Anatoly
21dd87e0ec Merge remote-tracking branch 'origin/develop' into features/comments
# Conflicts:
#	apps/establishment/models.py
#	apps/establishment/serializers.py
2019-09-01 14:14:38 +03:00
Anatoly
cd0f03f05d Merge remote-tracking branch 'origin/develop' into feature/reviews
# Conflicts:
#	apps/establishment/admin.py
#	apps/establishment/serializers.py
2019-09-01 14:06:17 +03:00
Dmitriy Kuzmenko
ef59216feb change contacts for est. 2019-09-01 13:39:01 +03:00
Anatoly
de8db655ed Merge remote-tracking branch 'origin/develop' into feature/reviews
# Conflicts:
#	apps/establishment/admin.py
#	apps/establishment/models.py
#	apps/establishment/serializers.py
2019-09-01 13:38:40 +03:00
Anatoly
c1738478ab added new model Review 2019-09-01 13:24:37 +03:00
Dmitriy Kuzmenko
fc4facbf83 add contacts for establishments 2019-09-01 12:35:09 +03:00
Anatoly
0d4f080850 added new model - Comment 2019-09-01 12:30:00 +03:00
Anatoly
46faf6ecee Merge remote-tracking branch 'origin/develop' into feature/establishment
# Conflicts:
#	apps/establishment/admin.py
#	apps/establishment/serializers.py
2019-08-29 18:19:57 +03:00
Anatoly
3aa1e92046 added table EstablishmentSchedule, added application timetable, added table Timetable 2019-08-29 17:59:09 +03:00
Dmitriy Kuzmenko
9a7052026b add metadata 2019-08-29 14:51:55 +03:00
Dmitriy Kuzmenko
253da87a99 URL refactoring 2019-08-28 11:35:38 +03:00
Dmitriy Kuzmenko
262e98b9e1 add awards 2019-08-28 10:15:17 +03:00
evgeniy-st
6667047537 establishment admin conf 2019-08-27 14:23:41 +03:00
evgeniy-st
bb284420c4 initial app 2019-08-26 18:07:01 +03:00