Commit graph

10974 commits

Author SHA1 Message Date
Anton
75a15310ac Merge branch 'features/team-permissions' into features/label-templates 2022-09-13 14:26:15 +02:00
aignatov-bio
06548c247f
Merge pull request #4407 from aignatov-bio/ai-sci-7148-make-zebra-printers-switchable
Add ability to disable zebra printers [SCI-7148]
2022-09-12 13:54:52 +02:00
Oleksii Kriuchykhin
d5205843f4 Enable Fluics sync only if env variable is present [SCI-7047] 2022-09-08 17:22:29 +02:00
Alex Kriuchykhin
b5d60499d5
Merge pull request #4373 from okriuchykhin/ok_SCI_7086
Add activities for label template actions [SCI-7086]
2022-09-08 16:41:14 +02:00
Oleksii Kriuchykhin
bb6e638528 Add activities for label template actions [SCI-7086] 2022-09-08 16:35:53 +02:00
Alex Kriuchykhin
8a0656ce21
Merge pull request #4147 from okriuchykhin/ok_SCI_6834
Update tests with new team user assignments [SCI-6843]
2022-09-05 14:34:16 +02:00
Anton
47e20d1b27 Add ability to disable zebra printers [SCI-7148] 2022-09-05 12:37:03 +02:00
Alex Kriuchykhin
a5fc66a6f3
Merge pull request #4388 from okriuchykhin/ok_SCI_7047
Add syncing service and schedule for Fluics templates sync [SCI-7047]
2022-09-01 14:13:18 +02:00
Alex Kriuchykhin
e23475fbbe
Merge pull request #4183 from okriuchykhin/ok_SCI_6917
Convert team_repository to polymorphic relation [SCI-6917]
2022-08-31 16:43:35 +02:00
Oleksii Kriuchykhin
f586c73dc8 Convert team_repository to polymorphic relation [SCI-6917] 2022-08-31 16:42:08 +02:00
Oleksii Kriuchykhin
eb04bc974d Update tests with new team user assignments [SCI-6843] 2022-08-31 16:37:00 +02:00
aignatov-bio
57282069e9
Merge pull request #4361 from aignatov-bio/ai-sci-7084-add-sorting-by-default-template
Add sorting by default label template [SCI-7084]
2022-08-31 10:36:02 +02:00
aignatov-bio
91f1310338
Merge pull request #4364 from aignatov-bio/ai-sci-7060-update-promo-text
Update label template promo text [SCI-7060]
2022-08-31 10:13:42 +02:00
Alex Kriuchykhin
c713a993d3
Merge pull request #4178 from okriuchykhin/ok_SCI_6916
Migrate TeamRepository to new permissions [SCI-6916]
2022-08-30 16:46:44 +02:00
Alex Kriuchykhin
34c8960097
Merge pull request #4170 from okriuchykhin/ok_SCI_6915
Add team reference to user assignments model [SCI-6915]
2022-08-30 16:46:02 +02:00
artoscinote
e11ae6b5c1
Merge pull request #4395 from artoscinote/ma_SCI_7129
Add default measurments to label templates [SCI-7129]
2022-08-30 16:22:26 +02:00
Martin Artnik
bd1e30d19b Add default measurments to label templates [SCI-7129] 2022-08-30 16:16:02 +02:00
Oleksii Kriuchykhin
b2b059b7e1 Add syncing service and schedule for Fluics templates sync [SCI-7047] 2022-08-29 09:59:13 +02:00
ajugo
185bf0b197
Add label template dropdown to print dialog [SCI-7051] (#4369) 2022-08-26 10:53:55 +02:00
aignatov-bio
6706e886e3
Merge pull request #4382 from aignatov-bio/ai-sci-7085-update-css-for-view-screen
Fix css for label template view screen [SCI-7085]
2022-08-25 14:33:57 +02:00
Alex Kriuchykhin
dac492cfd4
Merge pull request #4353 from okriuchykhin/ok_SCI_7045
Add list label templates method to Fluics API client [SCI-7045]
2022-08-25 13:40:40 +02:00
Anton
9daa3f6d69 Fix css for label view page [SCI-7085] 2022-08-25 13:25:34 +02:00
Anton
771c40d4f0 CSS fixes for label template screen [SCI-7085] 2022-08-24 17:57:34 +02:00
aignatov-bio
34abe2aa7b
Merge pull request #4354 from aignatov-bio/ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor
Add column dropdown to label template editor [SCI-7054][SCI-7055]
2022-08-24 17:48:55 +02:00
aignatov-bio
6d8908c1f5
Merge branch 'features/label-templates' into ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor 2022-08-24 17:48:48 +02:00
aignatov-bio
9066d9ab04
Merge pull request #4380 from artoscinote/ma_SCI_7053
Add missing route [SCI-7053]
2022-08-24 14:13:57 +02:00
Martin Artnik
0aa4ff11d4 Add missing route [SCI-7053] 2022-08-24 14:10:51 +02:00
artoscinote
7a7df03396
Implement label preview component [SCI-7050] (#4370) 2022-08-24 13:55:54 +02:00
Anton
45bbbfffe4 Update label template promo text [SCI-7060] 2022-08-18 15:33:19 +02:00
Anton
46990b3df4 Add sorting by default label template [SCI-7084] 2022-08-18 11:49:22 +02:00
Anton
5677e45e0c Add insert ability for code in content block [SCI-7055] 2022-08-17 13:40:35 +02:00
Anton
4f312bf329 Finalize insert field dropdown [SCI-7054] 2022-08-17 12:58:27 +02:00
Anton
174d33bba8 Add column dropdown to label template editor [SCI-7054] 2022-08-16 10:16:40 +02:00
Oleksii Kriuchykhin
08e654d5fb Add list label templates method to Fluics API client [SCI-7045] 2022-08-12 19:47:29 +02:00
Alex Kriuchykhin
32c32e7b46
Merge pull request #4350 from okriuchykhin/ok_SCI_7049
Add client for ZPL preview generation service [SCI-7049]
2022-08-12 15:32:01 +02:00
Oleksii Kriuchykhin
f02f625e1e Add client for ZPL preview generation service [SCI-7049] 2022-08-12 12:57:19 +02:00
artoscinote
4e768bec04
Add endpoint for fetching label template tags [SCI-7053] (#4319) 2022-08-10 11:35:38 +02:00
aignatov-bio
6403e2256c
Merge pull request #4320 from aignatov-bio/ai-sci-7048-update-label-templates-toolbar
Update labels index page [SCI-7048]
2022-08-08 11:50:03 +02:00
artoscinote
464f9935a4
Migration fixes [SCI-7046] (#4321) 2022-08-08 11:21:38 +02:00
Anton
51cb951e06 Update labels index page [SCI-7048] 2022-08-08 11:15:46 +02:00
artoscinote
eb619184a5
Implement typed label templates [SCI-7046] (#4316)
* Implement typed label templates [SCI-7046]

* Add structure.sql, fix migration [SCI-7046]

* Fix method name [SCI-7046]

* Add dependent option to team - label_template relation [SCI-7046]

* Migration code style, add input sanitization [SCI-7046]

* Fix new label creation [SCI-7046]
2022-08-08 10:06:00 +02:00
aignatov-bio
e5448f3d1f
Merge pull request #4311 from aignatov-bio/ai-sci-7030-label-template-view-edit-screen
Add general layout for template view screen [SCI-7030]
2022-08-04 14:13:25 +02:00
Anton
a38aa80fb5 Add main functionality to view/edit screen [SCI-7041] 2022-08-04 13:37:21 +02:00
ajugo
b58e3cd4d8
Add zebra settings screen [SCI-7016] (#4310)
* Add zebra settings screen [SCI-7016]

* Fix hound [SCI-7016]
2022-08-04 11:14:35 +02:00
aignatov-bio
f48c8ac6c7
Merge pull request #4307 from aignatov-bio/ai-sci-7029-add-label-promo-page
Add promo page for label templates [SCI-7029]
2022-08-04 10:54:20 +02:00
Anton
31202922af Add general layout for template [SCI-7030] 2022-08-04 10:51:30 +02:00
Anton
8c080ea04c Add promo page for label templates [SCI-7029] 2022-08-02 14:51:18 +02:00
aignatov-bio
617dd52759
Merge pull request #4295 from aignatov-bio/ai-sci-7019-edit-action-labels-index
Add edit actions to label templates [SCI-7019]
2022-08-01 11:41:30 +02:00
Anton
67df01711f Add edit actions to label templates [SCI-7019] 2022-07-28 14:42:13 +02:00
ajugo
ad4f52d912
Add Label template list screen - view mode [SCI-7018] (#4292)
* Initial label template datatable [SCI-7018]

* Add new columns to LabelTemplate and update datatable view [SCI-7018]

* Fix after rebase [SCI-7018]

* Fix migration, disable checkboxes in view mode and fix label template to team level [SCI-7018]
2022-07-27 10:10:32 +02:00