raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-12 03:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11290 from cyrillefr/Orders_in_confirmation_state_cannot_be_completed_by_hub_or_shop

Browse Source 
Fix Orders in confirmation state cannot be completed by hub or shop
This commit is contained in:
Filipe
2023-11-16 19:50:14 +00:00
committed by GitHub
parent 37436aab80 a764cc0f89
commit ed8fd41bec
13 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/webpacker/css/admin/shared/icons.scss
View File

@@ -20,5 +20,6 @@
.icon-cancel:before,
.icon-void:before { @extend .icon-remove, :before; }
.icon-capture { @extend .icon-ok }
.icon-capture,
.icon-capture_and_complete_order { @extend .icon-ok }
.icon-credit:before { @extend .icon-ok, :before ; }

2
app/webpacker/css/admin/shared/tables.scss
View File

@@ -84,7 +84,7 @@ table {
background-color: $color-notice;
color: $color-1;
}
.icon-edit:hover, .icon-capture:hover, .icon-ok:hover, .icon-plus:hover, .icon-road:hover {
.icon-edit:hover, .icon-capture:hover, .icon-capture_and_complete_order:hover, .icon-ok:hover, .icon-plus:hover, .icon-road:hover {
background-color: $color-success;
color: $color-1;
}

4
app/webpacker/css/admin_v3/shared/icons.scss
View File

@@ -34,9 +34,11 @@ button[class*="icon-"] {
@extend .icon-remove, :before;
}
.icon-capture {
.icon-capture,
.icon-capture_and_complete_order {
@extend .icon-ok;
}
.icon-credit:before {
@extend .icon-ok, :before;
}

1
app/webpacker/css/admin_v3/shared/tables.scss
View File

@@ -96,6 +96,7 @@ table {
}
.icon-edit:hover,
.icon-capture:hover,
.icon-capture_and_complete_order:hover,
.icon-ok:hover,
.icon-plus:hover {
background-color: $teal;