diff --git a/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php b/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php index 25d4c2cc..36023ce6 100644 --- a/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php +++ b/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php @@ -62,6 +62,7 @@ class ProcessDetails extends Controller 'documentTypes' => $options['document_types'], 'statuses' => $options['statuses'], 'paymentStates' => $options['payment_states'], + 'currentApprovers' => $options['current_approvers'] ?? [], 'mirrorStatus' => $result['status'], 'mirrorSyncedAt' => $result['last_synced_at'], 'mirrorStale' => $result['sync_stale'] ?? false, @@ -89,6 +90,7 @@ class ProcessDetails extends Controller 'documentTypes' => [], 'statuses' => [], 'paymentStates' => [], + 'currentApprovers' => [], 'mirrorStatus' => 'unavailable', 'mirrorSyncedAt' => null, 'mirrorStale' => false, diff --git a/modules/EcommerceFinance/Repositories/DingProcessDetailMirrorRepository.php b/modules/EcommerceFinance/Repositories/DingProcessDetailMirrorRepository.php index 40188323..43d5f6c5 100644 --- a/modules/EcommerceFinance/Repositories/DingProcessDetailMirrorRepository.php +++ b/modules/EcommerceFinance/Repositories/DingProcessDetailMirrorRepository.php @@ -179,12 +179,22 @@ class DingProcessDetailMirrorRepository /** * @param array $filters - * @return array{document_types:list,statuses:list,payment_states:list} + * @return array{ + * document_types:list, + * statuses:list, + * payment_states:list, + * current_approvers:list + * } */ public function filterOptions(array $filters = []): array { if (! Schema::connection($this->connection->getName())->hasTable('ding_process_detail_mirror')) { - return ['document_types' => [], 'statuses' => [], 'payment_states' => []]; + return [ + 'document_types' => [], + 'statuses' => [], + 'payment_states' => [], + 'current_approvers' => [], + ]; } $base = $this->connection->table('ding_process_detail_mirror') @@ -208,9 +218,47 @@ class DingProcessDetailMirrorRepository ->map(static fn (mixed $value): string => (string) $value) ->all(), 'payment_states' => $this->paymentStatesAvailableFor($filters), + 'current_approvers' => $this->currentApproverOptions(), ]; } + /** @return list */ + private function currentApproverOptions(): array + { + if (! Schema::connection($this->connection->getName())->hasColumn( + 'ding_process_detail_mirror', + 'current_approver_name', + )) { + return []; + } + + $values = $this->connection->table('ding_process_detail_mirror') + ->where('source_scope', $this->scope()) + ->whereNotNull('current_approver_name') + ->where('current_approver_name', '!=', '') + ->distinct() + ->pluck('current_approver_name'); + $names = []; + foreach ($values as $value) { + foreach (preg_split( + '/\s*[、,,;;|]\s*/u', + (string) $value, + -1, + PREG_SPLIT_NO_EMPTY, + ) ?: [] as $name) { + $name = trim($name); + if ($name !== '') { + $names[$name] = true; + } + } + } + + $names = array_keys($names); + sort($names, SORT_NATURAL | SORT_FLAG_CASE); + + return $names; + } + /** @param array $filters */ public function exportCount(array $filters): int { diff --git a/modules/EcommerceFinance/View/ProcessDetailsPageData.php b/modules/EcommerceFinance/View/ProcessDetailsPageData.php index 06b6b570..e16d8fab 100644 --- a/modules/EcommerceFinance/View/ProcessDetailsPageData.php +++ b/modules/EcommerceFinance/View/ProcessDetailsPageData.php @@ -88,6 +88,7 @@ class ProcessDetailsPageData 'documentTypes' => $options['document_types'], 'statuses' => $options['statuses'], 'paymentStates' => $options['payment_states'], + 'currentApprovers' => $options['current_approvers'] ?? [], 'mirrorStatus' => $result['status'], 'mirrorSyncedAt' => $result['last_synced_at'], 'mirrorStale' => $result['sync_stale'] ?? false, @@ -113,6 +114,7 @@ class ProcessDetailsPageData 'documentTypes' => [], 'statuses' => [], 'paymentStates' => [], + 'currentApprovers' => [], 'mirrorStatus' => 'unavailable', 'mirrorSyncedAt' => null, 'mirrorStale' => false, diff --git a/resources/views/business/pages/financial-operations/process-details-content.blade.php b/resources/views/business/pages/financial-operations/process-details-content.blade.php index 2d69efbd..984bdd70 100644 --- a/resources/views/business/pages/financial-operations/process-details-content.blade.php +++ b/resources/views/business/pages/financial-operations/process-details-content.blade.php @@ -3,6 +3,7 @@ $summary ??= []; $documentTypes ??= []; $statuses ??= []; + $currentApprovers ??= []; $error ??= null; $paymentStates = $paymentStates ?? ($pageData['paymentStates'] ?? []); $mirrorStale = $mirrorStale ?? ($pageData['mirrorStale'] ?? false); @@ -244,6 +245,125 @@ box-shadow: 0 0 0 3px rgba(133, 102, 50, .2); } + .process-details-combobox { + position: relative; + display: flex; + align-items: center; + width: 100%; + } + + .process-details-combobox input { + width: 100%; + padding-right: 2.25rem; + } + + .process-details-combobox input::-webkit-search-cancel-button { + appearance: none; + -webkit-appearance: none; + } + + .process-details-combobox__toggle { + position: absolute; + right: .25rem; + display: inline-flex; + width: 1.7rem; + height: 1.7rem; + align-items: center; + justify-content: center; + padding: 0; + border: 0; + border-radius: .35rem; + background: transparent; + color: var(--vip-content-muted, #595959); + cursor: pointer; + } + + .process-details-combobox__toggle:hover, + .process-details-combobox__toggle:focus-visible { + background: var(--vip-content-accent-soft, #F7F0DE); + color: var(--vip-content-accent-dark, #856632); + outline: none; + } + + .process-details-combobox__toggle .material-icons-outlined { + font-size: 1.05rem; + transition: transform .15s ease; + } + + .process-details-combobox.is-open + .process-details-combobox__toggle + .material-icons-outlined { + transform: rotate(180deg); + } + + .process-details-combobox__menu { + position: absolute; + top: calc(100% + .35rem); + right: 0; + left: 0; + z-index: 40; + max-height: min(17rem, 48vh); + overflow: auto; + padding: .25rem; + border: 1px solid var(--vip-border, #D8D2C7); + border-radius: .5rem; + background: #fff; + box-shadow: 0 5px 14px rgba(23, 23, 23, .13); + overscroll-behavior: contain; + scrollbar-color: var(--vip-content-accent, #B9954F) #efede8; + scrollbar-width: thin; + } + + .process-details-combobox__menu[hidden] { + display: none !important; + } + + .process-details-combobox__option { + display: block; + width: 100%; + min-height: 1.8rem; + padding: .32rem .5rem; + overflow: hidden; + border: 0; + border-radius: .35rem; + background: transparent; + color: var(--vip-content-ink, #171717); + font: inherit; + font-size: .75rem; + text-align: left; + text-overflow: ellipsis; + white-space: nowrap; + cursor: pointer; + } + + .process-details-combobox__option[hidden] { + display: none; + } + + .process-details-combobox__option:hover, + .process-details-combobox__option.is-active { + background: var(--vip-content-accent-soft, #F7F0DE); + color: var(--vip-content-accent-dark, #856632); + } + + .process-details-combobox__option[aria-selected="true"] { + color: var(--vip-content-accent-dark, #856632); + font-weight: 700; + } + + .process-details-combobox__empty { + margin: 0; + padding: .55rem .5rem; + color: var(--vip-content-muted, #595959); + font-size: .72rem; + line-height: 1.5; + text-align: center; + } + + .process-details-combobox__empty[hidden] { + display: none; + } + .process-details-actions { display: flex; flex-wrap: wrap; @@ -849,7 +969,53 @@
- +
+ + + +
@@ -1139,6 +1305,146 @@