Commit Graph

40 Commits

Author SHA1 Message Date
dormantman
660a46b895 Added short weekday to model 2020-01-15 01:10:52 +03:00
dormantman
67ab06022f Added short translated weekday for timetable 2020-01-15 01:01:27 +03:00
Kuroshini
1247b4c577 indexing working time 2019-12-20 22:28:57 +03:00
Anatoly
821526d631 remove incorrect check for establishment, set schedule attr property as blank=True, refactored timetable model 2019-12-20 12:36:11 +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
Kuroshini
552e08e242 opening_at for establishment 2019-12-04 13:52:39 +03:00
dormantman
a81f3f079a Changed url id to slug in back-office 2019-12-04 13:37:49 +03:00
Виктор Гладких
29782fe876 Fix 2019-11-25 10:45:57 +03:00
Виктор Гладких
6bb0eac409 Fix establishment timetable serailizer for permission 2019-11-25 10:45:20 +03:00
Anatoly
617552841f refactored product, fix transfer and etc., see changelist 2019-11-21 09:58:43 +03:00
Kuroshini
7bba5237dc Closed_at fill command 2019-11-12 15:12:47 +03:00
Kuroshini
a60fb84bcb Use not only closed_at / opening_at 2019-11-05 17:07:48 +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
Kuroshini
42c596b592 Weekday for mobile devices 2019-10-30 14:19:03 +03:00
alex
0adac058c5 Merge remote-tracking branch 'origin/feature/develop_ci' into feature/migrate-news
# Conflicts:
#	apps/gallery/models.py
#	requirements/base.txt
2019-10-24 13:11:05 +03:00
Kuroshini
40357c20b6 Changes from gm-148 2019-10-23 17:28:06 +03:00
littlewolf
f09bd5996a Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
#	project/settings/base.py
#	requirements/base.txt
2019-10-23 09:27:42 +03:00
Kuroshini
d2e34e5d49 Timetable search results 2019-10-17 15:10:26 +03:00
Kuroshini
40f1cc1e22 Add lookup for categories 2019-10-16 20:56:56 +03:00
Kuroshini
ed03f0f40f Search establishment by working time 2019-10-16 19:05:16 +03:00
Kuroshini
6d7341377b Show timetables list (remove pagination) 2019-10-16 14:46:36 +03:00
Kuroshini
c2c9f33b57 Show timetables list (only necessary fields) 2019-10-16 14:44:55 +03:00
Kuroshini
12a339cd1b Show timetables list 2019-10-16 14:36:17 +03:00
michail
51b63335d7 Merge remote-tracking branch 'origin/feature/migrate-city-objects' into feature/migrate-city-objects 2019-10-11 15:41:32 +05:00
michail
7bcd2edab6 Added transfer.py into timetable.
Edited transfer.py for collection and location.
2019-10-11 15:41:09 +05:00
Anatoly
091491e19f small fix 2019-10-09 15:57:35 +03:00
Anatoly
3f9dea30ff Revert "remove duplicate migration"
This reverts commit 93894db7
2019-10-09 15:54:04 +03:00
Anatoly
a77b7f9c10 Revert "remove duplicate migration"
This reverts commit 40570a07
2019-10-09 15:42:46 +03:00
Anatoly
495b0a7563 Merge remote-tracking branch 'origin/develop' into develop 2019-10-09 15:36:50 +03:00
Anatoly
40570a0746 Revert "remove duplicate migration"
This reverts commit 93894db7
2019-10-09 15:36:43 +03:00
Anatoly
05d3e3ff60 fix migrations 2019-10-09 15:33:05 +03:00
evgeniy-st
095b4a4bd7 Merge branch 'develop' into feature/gm-148 2019-10-09 15:11:26 +03:00
Kuroshini
0408d93599 Squashed migrations && added lastable credentials 2019-10-03 13:41:45 +03:00
Anatoly
3234a71cde gm-148: modified settings, added missing migration 2019-10-02 10:34:17 +03:00
Kuroshini
b1e09d806a Add ordering to timetable object 2019-09-30 14:00:34 +03:00
Anatoly
24f364084e gm-80: refactored 2019-09-19 14:34:36 +03:00
Anatoly
09450a1ae5 gm-80: complete 2019-09-19 14:30:32 +03:00
Anatoly
38ba443b47 gm-80: complete 2019-09-19 11:26:54 +03:00
Anatoly
540a819f94 gm-80: in progress 2019-09-18 18:46:24 +03:00
Anatoly
3aa1e92046 added table EstablishmentSchedule, added application timetable, added table Timetable 2019-08-29 17:59:09 +03:00