diff --git a/resources/img/smartinbox-images/open-case.svg b/resources/img/smartinbox-images/open-case.svg new file mode 100644 index 0000000000..463e6a30fe --- /dev/null +++ b/resources/img/smartinbox-images/open-case.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/js/common/PMColumnFilterPopoverCommonMixin.js b/resources/js/common/PMColumnFilterPopoverCommonMixin.js index b2f6aa73ce..d68c200839 100644 --- a/resources/js/common/PMColumnFilterPopoverCommonMixin.js +++ b/resources/js/common/PMColumnFilterPopoverCommonMixin.js @@ -266,7 +266,7 @@ const PMColumnFilterCommonMixin = { this.tableHeaders[i].sortDesc = false; } for (let i in this.tableHeaders) { - if (this.tableHeaders[i].field === this.orderBy) { + if (this.orderBy.endsWith(this.tableHeaders[i].field)) { let sort = this.sortOrder[0].direction; this.tableHeaders[i].sortAsc = (sort.toLowerCase() === "asc"); this.tableHeaders[i].sortDesc = (sort.toLowerCase() === "desc"); diff --git a/resources/js/components/PMColumnFilterPopover/PMColumnFilterIconAsc.vue b/resources/js/components/PMColumnFilterPopover/PMColumnFilterIconAsc.vue index 5b8f1f8f81..b87a22d0dd 100644 --- a/resources/js/components/PMColumnFilterPopover/PMColumnFilterIconAsc.vue +++ b/resources/js/components/PMColumnFilterPopover/PMColumnFilterIconAsc.vue @@ -1,5 +1,5 @@ diff --git a/resources/js/components/PMColumnFilterPopover/PMColumnFilterIconDesc.vue b/resources/js/components/PMColumnFilterPopover/PMColumnFilterIconDesc.vue index 7e6adc61a1..14ff423fbf 100644 --- a/resources/js/components/PMColumnFilterPopover/PMColumnFilterIconDesc.vue +++ b/resources/js/components/PMColumnFilterPopover/PMColumnFilterIconDesc.vue @@ -1,5 +1,5 @@ diff --git a/resources/js/components/PMColumnFilterPopover/PMColumnFilterIconThreeDots.vue b/resources/js/components/PMColumnFilterPopover/PMColumnFilterIconThreeDots.vue index f8348637a3..4b01a48d1b 100644 --- a/resources/js/components/PMColumnFilterPopover/PMColumnFilterIconThreeDots.vue +++ b/resources/js/components/PMColumnFilterPopover/PMColumnFilterIconThreeDots.vue @@ -1,5 +1,27 @@ + diff --git a/resources/js/components/PMColumnFilterPopover/PMColumnFilterPopover.vue b/resources/js/components/PMColumnFilterPopover/PMColumnFilterPopover.vue index 30577c932b..a7acaa5bab 100644 --- a/resources/js/components/PMColumnFilterPopover/PMColumnFilterPopover.vue +++ b/resources/js/components/PMColumnFilterPopover/PMColumnFilterPopover.vue @@ -4,7 +4,11 @@ variant="link" size="sm" class="pm-filter-popover-button"> - +