mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-24 20:46:38 +00:00
* feat: new banking module (#54720)
* feat: initial SPA setup for banking
* wip: bring over new banking module
* feat: added Espresso design tokens
* feat: button styles
* fix: add all ink colors
* wip: espresso design system changes
* feat: button and badge espresso components
* fix: button styling for reconcile
* feat: Espresso progress bar
* feat: Espresso toggle switch
* feat: Espresso tabs design
* fix: vertical tab support
* fix: button sizing across modals
* feat: Espresso style table layout
* feat: Espresso tooltip
* feat: Espresso elevations and checkbox
* feat: Dialog with Espresso styles
* feat: Espresso textarea
* fix: input styles
* fix: colors on bank picker
* fix: breadcrumb styling
* fix: bank picker styling
* feat: create doctypes and fields for bank reconciliation
* feat: APIs for banking
* fix: use date format parser
* fix: font styling to match Espresso
* wip: settings modal
* feat: settings dialog component
* fix: icons and invalid requests
* feat: preferences tab
* fix: adjust icon stroke width to 1.5
* feat: rule configuration in settings
* fix: remove sheet component
* feat: alert and error banner component
* feat: dropdown in Espresso
* feat: popover and select in Espresso
* fix: cleanup more styles
* fix: match size of link fields
* feat: command styling
* fix: remove unused style tokens
* fix: styles for global date picker dropdown
* fix: styles for match and reconcile
* feat: table Espresso component
* feat: remove all other design tokens
* fix: remove unused tokens
* fix: form elements
* fix: remove unused styles and fix filters in bank transaction list
* feat: fetch bank rec doctypes for filtering
* fix: record payment modal
* feat: support for dark mode switching
* fix: move bank logos to public folder
* feat: add support for RTL
* feat: support for RTL
* chore: send layout direction in dev boot
* fix: make checkbox work in RTL
* feat: dark mode support
* fix: dark mode style
* feat: bank logos in dark mode
* feat: dark mode bank logos
* chore: use dark mode bank logos everywhere
* chore: move rule evaluation to controller
* chore: add tests for bank transaction rules
* fix: move deps to fix actions errors
* fix: move tw-animate-css to deps
* fix: remove shadcn
* fix: do not open modal if no transactions selected
* fix: add translation strings
* feat: add banner on existing bank reconciliation tool
* feat: bank statement import
* fix: translations and layout directions
* fix: validation for transaction matching rule
* fix: styles
* fix: show conflicting transactions in alert
* fix: show help text for new banking module forms
* feat: show total debits and credits
* fix: dark mode colors in automatic config
* feat: add keyboard shortcuts help
* feat: added keyboard shortcut for settings
* fix: decrease size of progress bar
* chore: bump packages
* feat: add tests for statement import
* fix: settings dialog
* fix: show banner on small screens
* fix: show banner when no bank account set
(cherry picked from commit 6de5367f12)
# Conflicts:
# erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
* chore: resolve conflicts
* fix: add type hints to whitelisted methods
---------
Co-authored-by: Nikhil Kothari <nik.kothari22@live.com>
92 lines
3.4 KiB
TypeScript
92 lines
3.4 KiB
TypeScript
import { Button } from "@/components/ui/button"
|
|
import { selectedCompanyAtom, useCurrentCompany } from "@/hooks/useCurrentCompany"
|
|
import { useSetAtom } from "jotai"
|
|
import { Building2, Check, ChevronDown } from "lucide-react"
|
|
import { useState } from "react"
|
|
import {
|
|
Command,
|
|
CommandEmpty,
|
|
CommandGroup,
|
|
CommandInput,
|
|
CommandItem,
|
|
CommandList,
|
|
} from "@/components/ui/command"
|
|
import {
|
|
Popover,
|
|
PopoverContent,
|
|
PopoverTrigger,
|
|
} from "@/components/ui/popover"
|
|
import { cn } from "@/lib/utils"
|
|
import _ from "@/lib/translate"
|
|
import { selectedBankAccountAtom } from "./bankRecAtoms"
|
|
|
|
const CompanySelector = ({ onChange }: { onChange?: (company: string) => void }) => {
|
|
const [open, setOpen] = useState(false)
|
|
const [searchQuery, setSearchQuery] = useState("")
|
|
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
const options = window.frappe?.boot?.docs?.filter((doc: Record<string, any>) => doc.doctype === ":Company").map((company: Record<string, any>) => company.name) || []
|
|
|
|
const setSelectedCompany = useSetAtom(selectedCompanyAtom)
|
|
const setSelectedBankAccount = useSetAtom(selectedBankAccountAtom)
|
|
const selectedCompany = useCurrentCompany()
|
|
|
|
const handleSelectCompany = (company: string) => {
|
|
setSelectedCompany(company)
|
|
setSearchQuery("")
|
|
setOpen(false)
|
|
// Only reset bank account if the company is changed
|
|
if (selectedCompany !== company) {
|
|
setSelectedBankAccount(null)
|
|
onChange?.(company)
|
|
}
|
|
}
|
|
|
|
return (<Popover open={open} onOpenChange={setOpen}>
|
|
<PopoverTrigger asChild>
|
|
<Button
|
|
variant="outline"
|
|
type='button'
|
|
role="combobox"
|
|
size='md'
|
|
aria-expanded={open}
|
|
className="justify-between"
|
|
>
|
|
<div className="flex items-center gap-2">
|
|
<Building2 />
|
|
{selectedCompany}
|
|
</div>
|
|
<ChevronDown className="text-ink-gray-4" />
|
|
</Button>
|
|
</PopoverTrigger>
|
|
<PopoverContent className="min-w-56 w-fit p-0">
|
|
<Command value={selectedCompany}>
|
|
{options.length > 5 && <CommandInput placeholder={_("Search company...")} className="h-9" />}
|
|
<CommandList>
|
|
<CommandEmpty>{_("No company found.")}</CommandEmpty>
|
|
<CommandGroup>
|
|
{options.map((option: string) => (
|
|
<CommandItem
|
|
key={option}
|
|
value={option}
|
|
onSelect={(currentValue) => {
|
|
handleSelectCompany(currentValue)
|
|
}}
|
|
>
|
|
{option}
|
|
<Check
|
|
className={cn(
|
|
"ms-auto",
|
|
searchQuery === option ? "opacity-100" : "opacity-0"
|
|
)}
|
|
/>
|
|
</CommandItem>
|
|
))}
|
|
</CommandGroup>
|
|
</CommandList>
|
|
</Command>
|
|
</PopoverContent>
|
|
</Popover>)
|
|
}
|
|
|
|
export default CompanySelector |