Compare commits
2
Commits
4b84844b54
..
pm_2
| Author | SHA1 | Date | |
|---|---|---|---|
 Behrad
|
1953e26356 | ||
 Milad
|
df3ff4ea14 |
@@ -26,12 +26,8 @@ frontend/.env
|
||||
|
||||
# ---- Local session / backups ----
|
||||
.zcode/
|
||||
.zcodeignore
|
||||
scratch/
|
||||
v1.2 - Copy/
|
||||
inv dash/
|
||||
bot/
|
||||
voice/
|
||||
|
||||
# ---- Machine-local compose overrides (LAN phone access, etc.) ----
|
||||
docker-compose.override.yml
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
# Procurement Stack v1.3 — Dockerized (PostgreSQL + FastAPI + React + MinIO)
|
||||
|
||||
Self-contained ship package: everything needed to run the stack is in this
|
||||
@@ -13,22 +12,19 @@ folder — no external files or sibling folders required.
|
||||
| **frontend** | `procurement-frontend` | React 19 + Vite, served by nginx (internal) | via Traefik |
|
||||
| **traefik** | `procurement-traefik` | Traefik v3 — public reverse proxy (edge) | `80` (web), `443` (websecure) |
|
||||
|
||||
|
||||
```
|
||||
|
||||
Browser ──► Traefik :80 (edge)
|
||||
│
|
||||
├── Host(localhost) ──► frontend (nginx SPA :80)
|
||||
│ │
|
||||
│ └── /api/* proxy ──► api :8000 (/api/v1)
|
||||
│
|
||||
├── Host(api.localhost) ──► api :8000
|
||||
├── Host(auth.localhost) ──► casdoor :8000 (OIDC login)
|
||||
└── Host(s3/storage.localhost) ──► minio (API / console)
|
||||
│
|
||||
├── postgres :5432 (procurement + casdoor DBs)
|
||||
└── minio :9000 (invoice/proforma files)
|
||||
|
||||
│
|
||||
├── Host(localhost) ──► frontend (nginx SPA :80)
|
||||
│ │
|
||||
│ └── /api/* proxy ──► api :8000 (/api/v1)
|
||||
│
|
||||
├── Host(api.localhost) ──► api :8000
|
||||
├── Host(auth.localhost) ──► casdoor :8000 (OIDC login)
|
||||
└── Host(s3/storage.localhost) ──► minio (API / console)
|
||||
│
|
||||
├── postgres :5432 (procurement + casdoor DBs)
|
||||
└── minio :9000 (invoice/proforma files)
|
||||
```
|
||||
|
||||
---
|
||||
@@ -78,7 +74,6 @@ v1.3/
|
||||
├── Projects/ (projects)
|
||||
├── Units/ (unit conversions)
|
||||
└── Inventory/ (warehouse management panel — React port)
|
||||
|
||||
```
|
||||
|
||||
---
|
||||
@@ -91,12 +86,12 @@ the form (username / password) is sent to
|
||||
(password grant), verifies the returned JWT, and starts the session —
|
||||
no browser redirect to Casdoor.
|
||||
|
||||
* **مدیر پروژه (PM)** → lands in the inventory panel (their project) — can record
|
||||
stock changes, manage the project's warehouses and confirm arrivals («کالاهای در راه»).
|
||||
* **مدیر تدارکات / ادمین** → lands in the procurement office — can manage
|
||||
quotes, suppliers, projects, and in the inventory panel: dashboard, daily control,
|
||||
«کالاهای در راه» (receiving included) and «سازمان‌دهی» (users, PMs, warehouses).
|
||||
The «انبارها» and «تغییر موجودی» sections are PM-only.
|
||||
- **مدیر پروژه (PM)** → lands in the inventory panel (their project) — can record
|
||||
stock changes, manage the project's warehouses and confirm arrivals («کالاهای در راه»).
|
||||
- **مدیر تدارکات / ادمین** → lands in the procurement office — can manage
|
||||
quotes, suppliers, projects, and in the inventory panel: dashboard, daily control,
|
||||
«کالاهای در راه» (receiving included) and «سازمان‌دهی» (users, PMs, warehouses).
|
||||
The «انبارها» and «تغییر موجودی» sections are PM-only.
|
||||
|
||||
**Developer Mode** (top-left button on the login page) is a 3-step flow for
|
||||
the admin (super user): ① superuser auth gate (admin credentials only) →
|
||||
@@ -108,7 +103,7 @@ controlled by the `VITE_ENABLE_DEV_LOGIN` env var (in Docker: the
|
||||
for production builds).
|
||||
|
||||
| What | Where | Credentials |
|
||||
| --- | --- | --- |
|
||||
|---|---|---|
|
||||
| App | http://localhost (via Traefik) | — |
|
||||
| Casdoor console | http://localhost:8080 | admin credentials are set when you run the seeder (`CASDOOR_ADMIN_PW`) — never commit them |
|
||||
| Seeded app users (org `inventory`) | `razaei` (admin), `mousavi` (مدیر تدارکات), `mohaghegh` (مدیر پروژه), `tester` (مدیر پروژه، پروژه «تست») | password from `CASDOOR_SEED_PASSWORD` (bcrypt-hashed at rest — see `backend/tools/seed_casdoor.py`) |
|
||||
@@ -116,11 +111,11 @@ for production builds).
|
||||
Run `backend/tools/seed_casdoor.py` once after the first boot to create the
|
||||
Casdoor organization, application and users (idempotent). Full details —
|
||||
addresses, credentials, role model, failure scenarios and the checklist —
|
||||
are in [`docs/casdoor-auth.md`](https://www.google.com/search?q=docs/casdoor-auth.md).
|
||||
are in [`docs/casdoor-auth.md`](docs/casdoor-auth.md).
|
||||
|
||||
> The **currently committed seed** (`backups/علی محقق/`) instead ships a
|
||||
> single admin — `ali.mohaghegh` («علی محقق») — see
|
||||
> [Restoring the committed seed data](https://www.google.com/search?q=%23restoring-the-committed-seed-data).
|
||||
> [Restoring the committed seed data](#restoring-the-committed-seed-data).
|
||||
|
||||
---
|
||||
|
||||
@@ -130,13 +125,13 @@ The production deployment of this stack runs on the server and is reachable
|
||||
at these public addresses (HTTPS):
|
||||
|
||||
| What | Address |
|
||||
| --- | --- |
|
||||
|---|---|
|
||||
| **App (ERP)** | https://aramesh.bennu-api-bahrestan.ir/ |
|
||||
| **Casdoor admin panel** | https://casdoor.bennu-api-bahrestan.ir/ |
|
||||
|
||||
Log in to the app with your Casdoor account (org `inventory`); the role is
|
||||
assigned inside the app (`users.role` — see «Login» above and
|
||||
[`docs/casdoor-auth.md`](https://www.google.com/search?q=docs/casdoor-auth.md)).
|
||||
[`docs/casdoor-auth.md`](docs/casdoor-auth.md)).
|
||||
|
||||
### MinIO console on the server (SSH tunnel)
|
||||
|
||||
@@ -145,20 +140,21 @@ The MinIO console is deliberately **loopback-only** on the server
|
||||
is an SSH tunnel from your machine:
|
||||
|
||||
1. Open PowerShell and start the tunnel (**keep the window open** while you
|
||||
use the panel):
|
||||
```powershell
|
||||
ssh -L 9001:127.0.0.1:9001 <user>@<server-host>
|
||||
use the panel):
|
||||
|
||||
```
|
||||
```powershell
|
||||
ssh -L 9001:127.0.0.1:9001 <user>@<server-host>
|
||||
```
|
||||
|
||||
You will also land in a normal SSH session — that is fine; the tunnel
|
||||
lives as long as the window stays open.
|
||||
|
||||
You will also land in a normal SSH session — that is fine; the tunnel
|
||||
lives as long as the window stays open.
|
||||
2. In your browser, open: **http://localhost:9001**
|
||||
|
||||
3. Log in with the production MinIO root credentials from the server's
|
||||
`/srv/erp/.env` (`MINIO_ROOT_USER` / `MINIO_ROOT_PASSWORD`) — they are
|
||||
**never** written in this repo or its history. See
|
||||
[`docs/SECRET-MANAGEMENT.md`](https://www.google.com/search?q=docs/SECRET-MANAGEMENT.md).
|
||||
`/srv/erp/.env` (`MINIO_ROOT_USER` / `MINIO_ROOT_PASSWORD`) — they are
|
||||
**never** written in this repo or its history. See
|
||||
[`docs/SECRET-MANAGEMENT.md`](docs/SECRET-MANAGEMENT.md).
|
||||
|
||||
You will see the **`procurement-files`** bucket — the invoices/proformas the
|
||||
ERP stores, browsable and downloadable from there.
|
||||
@@ -172,22 +168,22 @@ tunnel.
|
||||
|
||||
Notes from the server setup:
|
||||
|
||||
* The panel is published only on the server's loopback, so the internet
|
||||
cannot reach it at all — the tunnel is what carries it to your browser.
|
||||
* Host port `9000` stays reserved for the deploy-webhook receiver, which is
|
||||
why the console uses `9001`.
|
||||
* If you ever need the raw S3 API from your machine, or a clickable URL for
|
||||
the console (e.g. `storage.aramesh.bennu-api-bahrestan.ir` behind Traefik
|
||||
with a password prompt on top), that can be arranged on request — the
|
||||
tunnel remains the safer default.
|
||||
- The panel is published only on the server's loopback, so the internet
|
||||
cannot reach it at all — the tunnel is what carries it to your browser.
|
||||
- Host port `9000` stays reserved for the deploy-webhook receiver, which is
|
||||
why the console uses `9001`.
|
||||
- If you ever need the raw S3 API from your machine, or a clickable URL for
|
||||
the console (e.g. `storage.aramesh.bennu-api-bahrestan.ir` behind Traefik
|
||||
with a password prompt on top), that can be arranged on request — the
|
||||
tunnel remains the safer default.
|
||||
|
||||
---
|
||||
|
||||
## Prerequisites (target machine)
|
||||
|
||||
* **Docker Desktop** (Windows) or Docker Engine + Compose plugin (Linux/macOS)
|
||||
* ~3–4 GB free disk for images (`postgres:18`, `python:3.13-slim`, `node:22-alpine`, `nginx:alpine`, `minio/minio`, `minio/mc`)
|
||||
* Internet access on first build (image + `npm ci` downloads)
|
||||
- **Docker Desktop** (Windows) or Docker Engine + Compose plugin (Linux/macOS)
|
||||
- ~3–4 GB free disk for images (`postgres:18`, `python:3.13-slim`, `node:22-alpine`, `nginx:alpine`, `minio/minio`, `minio/mc`)
|
||||
- Internet access on first build (image + `npm ci` downloads)
|
||||
|
||||
---
|
||||
|
||||
@@ -196,7 +192,6 @@ tunnel remains the safer default.
|
||||
```powershell
|
||||
cd <this-folder>
|
||||
docker compose up -d --build
|
||||
|
||||
```
|
||||
|
||||
First run downloads base images and builds the frontend (takes a few minutes).
|
||||
@@ -206,7 +201,6 @@ Wait until all services are up:
|
||||
|
||||
```powershell
|
||||
docker compose ps
|
||||
|
||||
```
|
||||
|
||||
All should show `Up` (postgres also `(healthy)`).
|
||||
@@ -216,7 +210,7 @@ All should show `Up` (postgres also `(healthy)`).
|
||||
## Verify
|
||||
|
||||
| What | Where |
|
||||
| --- | --- |
|
||||
|---|---|
|
||||
| Frontend UI | http://localhost |
|
||||
| API docs (Swagger) | http://localhost:8000/docs |
|
||||
| API health | http://localhost:8000/health → `{"status":"ok","service":"procurement-api"}` |
|
||||
@@ -231,24 +225,23 @@ Automated end-to-end checks (authenticates via `SMOKE_USER` /
|
||||
```powershell
|
||||
backend\tools\smoke_test.py # read paths
|
||||
backend\tools\smoke_test_write.py / smoke_test_misc.py
|
||||
|
||||
```
|
||||
|
||||
> Every API route now requires a Casdoor JWT — a bare
|
||||
> `curl http://localhost/api/v1/quotes` returns **401** by design.
|
||||
> Day-2 operations (deploys, backups, monitoring): [`docs/OPERATIONS.md`](https://www.google.com/search?q=docs/OPERATIONS.md).
|
||||
> Day-2 operations (deploys, backups, monitoring): [`docs/OPERATIONS.md`](docs/OPERATIONS.md).
|
||||
|
||||
---
|
||||
|
||||
## MinIO (object storage for invoice / proforma files)
|
||||
|
||||
| Item | Value |
|
||||
| --- | --- |
|
||||
|---|---|
|
||||
| S3 API endpoint | `localhost:9000` (from the API container: `minio:9000`) |
|
||||
| Web console | http://localhost:9001 |
|
||||
| Root user / password | `minioadmin` / `minioadmin` (dev — change for production) |
|
||||
| Bucket | `procurement-files` (created automatically by the `minio-init` container) |
|
||||
| Object key layout | `{quote_id}/{kind}/{attachment_id}` where kind = `invoice` | `proforma` |
|
||||
| Object key layout | `{quote_id}/{kind}/{attachment_id}` where kind = `invoice` \| `proforma` |
|
||||
|
||||
File **bytes** live in MinIO; the `quote_attachments` table holds the metadata.
|
||||
|
||||
@@ -256,7 +249,6 @@ Ad-hoc bucket inspection from the host (see `mc.cmd`):
|
||||
|
||||
```powershell
|
||||
.\mc.cmd ls --recursive
|
||||
|
||||
```
|
||||
|
||||
---
|
||||
@@ -269,12 +261,10 @@ Port: 5433
|
||||
Database: procurement
|
||||
Username: postgres
|
||||
Password: postgres
|
||||
|
||||
```
|
||||
|
||||
```powershell
|
||||
docker exec -it procurement-postgres psql -U postgres -d procurement
|
||||
|
||||
```
|
||||
|
||||
---
|
||||
@@ -286,28 +276,26 @@ database dumps must never be committed (they contain user rows and signing
|
||||
material). Two supported ways to bring a fresh stack up:
|
||||
|
||||
1. **Empty boot** — schema v2.6 auto-applies on the first boot of an empty
|
||||
`postgres_data` volume; then run the seeders:
|
||||
```powershell
|
||||
# Casdoor org + app + users (prints/generates credentials — do not commit them)
|
||||
docker compose run --rm -e CASDOOR_BASE=http://casdoor:8000 api python tools/seed_casdoor.py
|
||||
# Demo dataset (optional):
|
||||
docker exec procurement-api sh -c "cd /srv/backend && python -m tools.seed"
|
||||
|
||||
```
|
||||
`postgres_data` volume; then run the seeders:
|
||||
|
||||
```powershell
|
||||
# Casdoor org + app + users (prints/generates credentials — do not commit them)
|
||||
docker compose run --rm -e CASDOOR_BASE=http://casdoor:8000 api python tools/seed_casdoor.py
|
||||
# Demo dataset (optional):
|
||||
docker exec procurement-api sh -c "cd /srv/backend && python -m tools.seed"
|
||||
```
|
||||
|
||||
2. **Restore your own dump** — create dumps on the server (kept server-side,
|
||||
e.g. `/srv/erp/backups/`), never in git:
|
||||
```powershell
|
||||
docker exec procurement-postgres pg_dump -U postgres -d procurement -Fc > /srv/erp/backups/procurement-$(date +%F).dump
|
||||
docker exec procurement-postgres pg_dump -U postgres -d casdoor -Fc > /srv/erp/backups/casdoor-$(date +%F).dump
|
||||
e.g. `/srv/erp/backups/`), never in git:
|
||||
|
||||
```
|
||||
```powershell
|
||||
docker exec procurement-postgres pg_dump -U postgres -d procurement -Fc > /srv/erp/backups/procurement-$(date +%F).dump
|
||||
docker exec procurement-postgres pg_dump -U postgres -d casdoor -Fc > /srv/erp/backups/casdoor-$(date +%F).dump
|
||||
```
|
||||
|
||||
|
||||
Restore with `pg_restore --clean --if-exists` (stop `api` + `casdoor`
|
||||
first — this **replaces all data**). The scheduled backup sidecar
|
||||
(see `docs/OPERATIONS.md`) automates this.
|
||||
Restore with `pg_restore --clean --if-exists` (stop `api` + `casdoor`
|
||||
first — this **replaces all data**). The scheduled backup sidecar
|
||||
(see `docs/OPERATIONS.md`) automates this.
|
||||
|
||||
## Common operations
|
||||
|
||||
@@ -316,44 +304,40 @@ docker compose logs -f api # see logs
|
||||
docker compose down # stop (keep data)
|
||||
docker compose up -d --build # rebuild after code changes
|
||||
docker compose down -v # ⚠️ full reset — wipes DB + MinIO volumes
|
||||
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Known behavior
|
||||
|
||||
* Authentication is Casdoor-based (JWT verified via JWKS) and **required on
|
||||
every API route** except `/health`, `/health/ready` and `/auth/login`
|
||||
(401 without a token, 403 without a role). The former dev-header fallback
|
||||
(`X-User-Role` / `X-User-Name-B64`) is disabled unless
|
||||
`PROCUREMENT_DEV_LOGIN_ENABLED=true` — never enable it in production.
|
||||
* Roles live in the app's `users` table (Casdoor is identity-only): `pm`,
|
||||
`procurement_manager`, `admin`. Role changes are **admin-only** (RBAC);
|
||||
the procurement manager can only assign projects to project managers.
|
||||
The admin has a dedicated panel at `/admin` (user sync from Casdoor +
|
||||
grant/revoke «مدیر تدارکات»).
|
||||
* **Partial goods receipt** («رسید جزیی») is supported in «کالاهای در راه»:
|
||||
at least one item with a valid quantity is enough to submit; other items
|
||||
stay in transit. The procurement ledger shows «رسیده X از Y» / «در راه Z»
|
||||
badges and a «رسید جزیی» badge on the quote.
|
||||
* **One PostgreSQL instance** serves both the app (`procurement`) and Casdoor
|
||||
(`casdoor`) — the separate casdoor-postgres container is gone (data was
|
||||
dumped/restored; see `docs/casdoor-auth.md`).
|
||||
* **Traefik v3** is the public edge (ports 80/443); the frontend nginx only
|
||||
serves the SPA and proxies `/api` internally. Production (real domains,
|
||||
HTTPS via Let's Encrypt, HTTP→HTTPS redirect):
|
||||
`docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d --build`
|
||||
(see the prod file header for the required env vars).
|
||||
* Schema runs automatically ONLY on the first boot of an empty `postgres_data` volume
|
||||
(see `docker-entrypoint-initdb.d`); the API also runs `CREATE TABLE IF NOT EXISTS`
|
||||
for the units-dashboard tables and `quote_attachments` at startup.
|
||||
* Invoice upload requires an `accepted`/`arrived` quote; proforma has no restriction.
|
||||
* The supplier detail page (`/suppliers/:id`) shows the purchase history with
|
||||
invoice/proforma download links from MinIO.
|
||||
* **Material-Supplier Lookup**: Clicking a material in the catalog (e.g., on the `/units` page) dynamically fetches its assigned suppliers (`GET /api/materials/{id}/suppliers`). The backend uses an atomic JOIN to guarantee accurate supplier data (avoiding SQLAlchemy identity-map mismatches), and the UI displays a clean empty state («تامین‌کننده‌ای برای این متریال ثبت نشده است») if none exist.
|
||||
* If builds fail with disk-full errors: `docker system prune -a`, then rebuild.
|
||||
* If the frontend shows «اتصال به سرور برقرار نشد» → the api container is not
|
||||
reachable; check `docker compose ps` and `docker compose logs api`.
|
||||
|
||||
```
|
||||
- Authentication is Casdoor-based (JWT verified via JWKS) and **required on
|
||||
every API route** except `/health`, `/health/ready` and `/auth/login`
|
||||
(401 without a token, 403 without a role). The former dev-header fallback
|
||||
(`X-User-Role` / `X-User-Name-B64`) is disabled unless
|
||||
`PROCUREMENT_DEV_LOGIN_ENABLED=true` — never enable it in production.
|
||||
- Roles live in the app's `users` table (Casdoor is identity-only): `pm`,
|
||||
`procurement_manager`, `admin`. Role changes are **admin-only** (RBAC);
|
||||
the procurement manager can only assign projects to project managers.
|
||||
The admin has a dedicated panel at `/admin` (user sync from Casdoor +
|
||||
grant/revoke «مدیر تدارکات»).
|
||||
- **Partial goods receipt** («رسید جزیی») is supported in «کالاهای در راه»:
|
||||
at least one item with a valid quantity is enough to submit; other items
|
||||
stay in transit. The procurement ledger shows «رسیده X از Y» / «در راه Z»
|
||||
badges and a «رسید جزیی» badge on the quote.
|
||||
- **One PostgreSQL instance** serves both the app (`procurement`) and Casdoor
|
||||
(`casdoor`) — the separate casdoor-postgres container is gone (data was
|
||||
dumped/restored; see `docs/casdoor-auth.md`).
|
||||
- **Traefik v3** is the public edge (ports 80/443); the frontend nginx only
|
||||
serves the SPA and proxies `/api` internally. Production (real domains,
|
||||
HTTPS via Let's Encrypt, HTTP→HTTPS redirect):
|
||||
`docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d --build`
|
||||
(see the prod file header for the required env vars).
|
||||
- Schema runs automatically ONLY on the first boot of an empty `postgres_data` volume
|
||||
(see `docker-entrypoint-initdb.d`); the API also runs `CREATE TABLE IF NOT EXISTS`
|
||||
for the units-dashboard tables and `quote_attachments` at startup.
|
||||
- Invoice upload requires an `accepted`/`arrived` quote; proforma has no restriction.
|
||||
- The supplier detail page (`/suppliers/:id`) shows the purchase history with
|
||||
invoice/proforma download links from MinIO.
|
||||
- If builds fail with disk-full errors: `docker system prune -a`, then rebuild.
|
||||
- If the frontend shows «اتصال به سرور برقرار نشد» → the api container is not
|
||||
reachable; check `docker compose ps` and `docker compose logs api`.
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
# Bale Bot API — token from Bale's BotFather (required)
|
||||
PROCUREMENT_BOT_BOT_TOKEN=
|
||||
PROCUREMENT_BOT_BALE_API_BASE=https://tapi.bale.ai
|
||||
|
||||
# ERP procurement API (in Docker: http://api:8000/api/v1)
|
||||
PROCUREMENT_BOT_API_BASE_URL=http://localhost:8000/api/v1
|
||||
PROCUREMENT_BOT_DATABASE_URL=postgresql+asyncpg://postgres:postgres@localhost:5432/procurement
|
||||
|
||||
# LLM provider — any OpenAI-compatible endpoint (JSON-mode chat completions)
|
||||
PROCUREMENT_BOT_AI_BASE_URL=https://api.deepseek.com
|
||||
PROCUREMENT_BOT_AI_API_KEY=
|
||||
PROCUREMENT_BOT_LLM_MODEL=deepseek-flash
|
||||
|
||||
# STT provider — must expose POST /audio/transcriptions.
|
||||
# Falls back to AI_* when unset. DeepSeek has no audio API, so voice needs
|
||||
# its own whisper-compatible provider (OpenAI, GLM, self-hosted faster-whisper…).
|
||||
PROCUREMENT_BOT_STT_BASE_URL=
|
||||
PROCUREMENT_BOT_STT_API_KEY=
|
||||
PROCUREMENT_BOT_STT_MODEL=whisper-1
|
||||
PROCUREMENT_BOT_STT_LANGUAGE=fa
|
||||
|
||||
# Bale chat ids allowed without Casdoor linking (comma separated)
|
||||
PROCUREMENT_BOT_ADMIN_CHAT_IDS=
|
||||
# Optional bearer for the day the ERP starts enforcing auth on procurement routes
|
||||
PROCUREMENT_BOT_SERVICE_TOKEN=
|
||||
# Drafts older than this are swept into `expired`
|
||||
PROCUREMENT_BOT_DRAFT_TTL_HOURS=24
|
||||
PROCUREMENT_BOT_LOG_LEVEL=INFO
|
||||
@@ -1,14 +0,0 @@
|
||||
# ---- Env / secrets ----
|
||||
.env
|
||||
*.local
|
||||
|
||||
# ---- Python ----
|
||||
__pycache__/
|
||||
*.pyc
|
||||
*.pyo
|
||||
.venv/
|
||||
venv/
|
||||
|
||||
# ---- OS junk ----
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
@@ -1,23 +0,0 @@
|
||||
# Bale procurement bot — a long-polling worker against tapi.bale.ai.
|
||||
# ffmpeg converts Bale voice notes (OGG/Opus) before they are sent to STT.
|
||||
FROM python:3.13-slim
|
||||
|
||||
ENV PYTHONDONTWRITEBYTECODE=1 \
|
||||
PYTHONUNBUFFERED=1
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends ffmpeg \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
WORKDIR /srv/bot
|
||||
|
||||
# Dependencies first (layer caching). PIP_INDEX_URL overridable like the api image.
|
||||
ARG PIP_INDEX_URL=https://pypi.org/simple
|
||||
COPY requirements.txt .
|
||||
RUN pip install --no-cache-dir -i ${PIP_INDEX_URL} -r requirements.txt
|
||||
|
||||
# Application
|
||||
COPY app ./app
|
||||
COPY tools ./tools
|
||||
|
||||
CMD ["python", "-m", "app.main"]
|
||||
@@ -1,120 +0,0 @@
|
||||
# procurement_ai_agent — Bale chatbot for the procurement ERP
|
||||
|
||||
A **Bale messenger bot** that turns Persian **chat messages and voice notes**
|
||||
into procurement actions in the
|
||||
[procurement ERP](https://git.bennu-api-bahrestan.ir/ali_mohaghegh/ERP) —
|
||||
draft-first: it captures what it understood, tells you **what it did** and
|
||||
**what is still empty**, and **commits only after you approve** with a ✅ button.
|
||||
|
||||
```
|
||||
you (Bale, text/voice) ┌─────────────────────────────────┐
|
||||
│ getUpdates (long poll) │ procurement_ai_agent │
|
||||
▼ │ ffmpeg → STT (Persian) │
|
||||
┌──────────────────┐ POST {base}/bot<T> │ LLM → intent + entities │
|
||||
│ tapi.bale.ai │◄───────────────────────►│ fuzzy resolve → draft payload │
|
||||
└──────────────────┘ sendMessage / buttons │ review + «چه چیزهایی خالی مونده»│
|
||||
└───────────────┬─────────────────┘
|
||||
│ HTTP + X-Actor-Id
|
||||
▼
|
||||
┌─────────────────────────────────┐
|
||||
│ ERP api (/api/v1) │
|
||||
│ quotes · suppliers · materials│
|
||||
└─────────────────────────────────┘
|
||||
```
|
||||
|
||||
## What it can do
|
||||
|
||||
| Activity | Example (voice or text) | Committed via |
|
||||
|---|---|---|
|
||||
| Register a supplier quote | «سازان نو برای پروژه برج آسمان ۵۰۰ کیلو میلگرد A3 سایز ۱۴، هر کیلو ۴۵ تومن، پرداخت ۳ فاز» | `POST /quotes` |
|
||||
| Add a supplier | «تأمین‌کننده جدید پروفیل بر، دسته لوله و اتصالات، تلفن ۰۹۱۲…» | `POST /suppliers` |
|
||||
| Add a material | «کالای جدید میلگرد A3 سایز ۱۸ با واحد کیلوگرم» | `POST /materials` |
|
||||
| Status queries | «استعلام‌های در انتظار؟» / «کدام‌ها به‌زودی منقضی می‌شوند؟» | `GET /quotes?…` |
|
||||
| Accept a quote | «استعلام سازان نو را قبول کن» | `PATCH /quotes/{id}/accept` |
|
||||
| Announce a delivery | «اقلام سازان نو رسید، ۵۰۰ و ۲۰۰» | `PATCH /quotes/{id}/arrive-items` |
|
||||
|
||||
### The draft → approve loop
|
||||
|
||||
1. Send a message or voice note. Voice → ffmpeg → STT; text/STT text → LLM
|
||||
extracts a typed **intent + entities** (JSON mode, Persian digits
|
||||
normalized).
|
||||
2. Names are fuzzy-matched against the ERP. Several candidates → inline
|
||||
**pick buttons**; no match → listed as missing.
|
||||
3. The bot replies with a **review card**: everything captured + a
|
||||
✅/⚠️/❌ list of what is still empty.
|
||||
4. Keep chatting to refine («قیمت میلگرد ۴۷ شد») — the open draft updates and
|
||||
re-renders. Drafts survive bot restarts (postgres-backed, TTL-swept).
|
||||
5. **Nothing is written to the ERP until you tap ✅.** After commit you get the
|
||||
created quote id and the fields left empty.
|
||||
|
||||
### Team access & attribution
|
||||
|
||||
Each member links their Bale chat once: `/start` → Casdoor username → password
|
||||
(validated via the ERP's real `POST /auth/login`, used once, never stored).
|
||||
Every mutating call carries `X-Actor-Id: <users.id>` so `quote_events.actor`
|
||||
records the **human** who asked.
|
||||
|
||||
Commands: `/start` · `/help` · `/drafts` · `/cancel` · `/whoami` · `/unlink`
|
||||
|
||||
## Quick start (Docker)
|
||||
|
||||
```bash
|
||||
cp .env.example .env # fill PROCUREMENT_BOT_BOT_TOKEN + AI_API_KEY
|
||||
docker build -t procurement-ai-agent .
|
||||
docker run -d --name procurement-bot --env-file .env \
|
||||
--add-host host.docker.internal:host-gateway \
|
||||
procurement-ai-agent
|
||||
docker logs -f procurement-bot
|
||||
```
|
||||
|
||||
Or as part of the ERP stack — see [`integration/`](integration/README.md)
|
||||
(compose service + the one tiny ERP-side patch).
|
||||
|
||||
Full setup, env-var reference, flows and troubleshooting:
|
||||
**[docs/SETUP.md](docs/SETUP.md)**.
|
||||
|
||||
## Architecture
|
||||
|
||||
```
|
||||
app/
|
||||
├── main.py ensure bot tables → sweeper task → getUpdates long-poll loop
|
||||
├── config.py pydantic-settings, PROCUREMENT_BOT_ prefix
|
||||
├── bale/client.py Telegram-compatible Bale API (poll, send, edit, buttons, files)
|
||||
├── api/client.py ERP /api/v1 client (X-Actor-Id attribution, error envelope)
|
||||
├── stt.py ffmpeg (OGG/Opus → MP3) → OpenAI-compatible /audio/transcriptions
|
||||
├── nlu.py Persian intent+entity extraction (JSON-mode chat completions)
|
||||
├── resolve.py fuzzy name→id matching (difflib over ilike search), TTL caches
|
||||
├── drafts.py draft store · QuoteCreate payload builder · missing-field logic
|
||||
├── keyboards.py inline keyboards (callback_data ≤ 64 B op-codes)
|
||||
├── texts.py Persian message templates
|
||||
├── runtime.py context, link store, in-memory pending flows
|
||||
├── models.py bot_links / bot_drafts / bot_messages / bot_meta (own schema)
|
||||
└── handlers/ dispatch · commands · callbacks · links ·
|
||||
quote · supplier · material · queries · decisions
|
||||
```
|
||||
|
||||
Design notes:
|
||||
|
||||
- **Telegram-compatible Bale API** (`tapi.bale.ai`): getUpdates long polling —
|
||||
no public port, no webhook, resumable offset persisted across restarts.
|
||||
- **Draft-first**: `bot_drafts.payload` holds a talking-friendly JSON that is
|
||||
converted into the exact `POST /quotes` request body (temp_id
|
||||
cross-references) only on approval; the API deliberately tolerates
|
||||
incomplete quotes, so partial commits are explicit, never accidental.
|
||||
- **Accept flow echoes the termsheet's existing `schedule_steps`** back to
|
||||
`PATCH /quotes/{id}/accept` (the API replaces steps with what it receives).
|
||||
- **Persian-aware matching**: Persian/Arabic digit normalization, ZWNJ folding,
|
||||
Arabic ya/ka folding, difflib ranking on top of the API's ilike search.
|
||||
- **Voice notes** arrive as OGG/Opus; ffmpeg converts to mono 16 kHz MP3 before
|
||||
STT. The LLM provider and the STT provider are configured independently
|
||||
(e.g. DeepSeek for NLU + any whisper-compatible endpoint for voice).
|
||||
|
||||
## Testing
|
||||
|
||||
An offline end-to-end harness stubs Bale/ERP/AI and drives the real handler
|
||||
pipeline with fake updates — no token, DB or API key needed:
|
||||
|
||||
```bash
|
||||
pip install -r requirements.txt
|
||||
python tools/smoke_test.py # → ALL PASSED: 48 passed
|
||||
```
|
||||
@@ -1,2 +0,0 @@
|
||||
"""Bale procurement chatbot — drafts ERP actions from chat text/voice,
|
||||
reports what it captured + what is missing, and commits only on approval."""
|
||||
@@ -1 +0,0 @@
|
||||
"""ERP API client — the only way the bot touches procurement data."""
|
||||
@@ -1,150 +0,0 @@
|
||||
"""Async client for the procurement API (/api/v1).
|
||||
|
||||
Attribution: every call carries ``X-Actor-Id`` (the linked ERP user id) so
|
||||
``quote_events.actor`` records the human who asked, not the bot. A service
|
||||
bearer token is sent when configured (procurement endpoints are currently
|
||||
open — the slot is for the day auth lands).
|
||||
"""
|
||||
import logging
|
||||
from typing import Any
|
||||
|
||||
import httpx
|
||||
|
||||
logger = logging.getLogger("bot.api")
|
||||
|
||||
|
||||
class ApiError(Exception):
|
||||
def __init__(self, status: int, code: str, message: str, field: str | None = None):
|
||||
super().__init__(message)
|
||||
self.status = status
|
||||
self.code = code
|
||||
self.message = message
|
||||
self.field = field
|
||||
|
||||
|
||||
class ErpClient:
|
||||
def __init__(self, base_url: str, timeout: float = 30.0, service_token: str = ""):
|
||||
self._base = base_url.rstrip("/")
|
||||
self._timeout = timeout
|
||||
self._service_token = service_token
|
||||
|
||||
def _actor_headers(self, actor_id: str | None, actor_name: str | None) -> dict:
|
||||
headers: dict[str, str] = {}
|
||||
if self._service_token:
|
||||
headers["Authorization"] = f"Bearer {self._service_token}"
|
||||
if actor_id:
|
||||
headers["X-Actor-Id"] = actor_id
|
||||
return headers
|
||||
|
||||
async def _request(self, method: str, path: str, *, actor_id: str | None = None,
|
||||
json: Any = None, params: dict | None = None) -> Any:
|
||||
url = f"{self._base}{path}"
|
||||
async with httpx.AsyncClient(timeout=self._timeout) as client:
|
||||
try:
|
||||
resp = await client.request(
|
||||
method, url, json=json, params=params, headers=self._actor_headers(actor_id, None)
|
||||
)
|
||||
except httpx.HTTPError as exc:
|
||||
raise ApiError(0, "NETWORK", f"ERP API unreachable: {exc}") from exc
|
||||
if resp.status_code in (200, 201):
|
||||
return resp.json()
|
||||
try:
|
||||
err = resp.json().get("error") or {}
|
||||
except ValueError:
|
||||
err = {}
|
||||
raise ApiError(
|
||||
resp.status_code,
|
||||
str(err.get("code") or "INTERNAL_ERROR"),
|
||||
str(err.get("message") or f"HTTP {resp.status_code}"),
|
||||
err.get("field"),
|
||||
)
|
||||
|
||||
# ------------------------------------------------------------------ auth
|
||||
|
||||
async def login(self, username: str, password: str) -> dict:
|
||||
body = await self._request("POST", "/auth/login", json={"username": username, "password": password})
|
||||
return body.get("data") or {}
|
||||
|
||||
# ---------------------------------------------------------------- lookup
|
||||
|
||||
async def list_suppliers(self, q: str | None = None, page_size: int = 20) -> list[dict]:
|
||||
params: dict = {"page_size": page_size}
|
||||
if q:
|
||||
params["q"] = q
|
||||
return (await self._request("GET", "/suppliers", params=params)).get("data") or []
|
||||
|
||||
async def create_supplier(self, payload: dict, actor_id: str | None = None) -> dict:
|
||||
return (await self._request("POST", "/suppliers", json=payload, actor_id=actor_id)).get("data") or {}
|
||||
|
||||
async def list_materials(self, q: str | None = None, page_size: int = 20) -> list[dict]:
|
||||
params: dict = {"page_size": page_size}
|
||||
if q:
|
||||
params["q"] = q
|
||||
return (await self._request("GET", "/materials", params=params)).get("data") or []
|
||||
|
||||
async def create_material(self, payload: dict, actor_id: str | None = None) -> dict:
|
||||
return (await self._request("POST", "/materials", json=payload, actor_id=actor_id)).get("data") or []
|
||||
|
||||
async def list_units(self, q: str | None = None, page_size: int = 100) -> list[dict]:
|
||||
params: dict = {"page_size": page_size}
|
||||
if q:
|
||||
params["q"] = q
|
||||
return (await self._request("GET", "/units", params=params)).get("data") or []
|
||||
|
||||
async def list_projects(self, page_size: int = 100) -> list[dict]:
|
||||
return (await self._request("GET", "/projects", params={"page_size": page_size})).get("data") or []
|
||||
|
||||
async def list_categories(self, page_size: int = 100) -> list[dict]:
|
||||
return (await self._request("GET", "/material-categories", params={"page_size": page_size})).get("data") or []
|
||||
|
||||
# ---------------------------------------------------------------- quotes
|
||||
|
||||
async def list_quotes(self, *, status: str | None = None, q: str | None = None,
|
||||
expand: str | None = None, sort: str | None = None,
|
||||
page: int = 1, page_size: int = 10) -> tuple[list[dict], dict]:
|
||||
params: dict = {"page": page, "page_size": page_size}
|
||||
if status:
|
||||
params["status"] = status
|
||||
if q:
|
||||
params["q"] = q
|
||||
if expand:
|
||||
params["expand"] = expand
|
||||
if sort:
|
||||
params["sort"] = sort
|
||||
body = await self._request("GET", "/quotes", params=params)
|
||||
return body.get("data") or [], body.get("meta") or {}
|
||||
|
||||
async def get_quote(self, quote_id: str, expand: str | None = None, actor_id: str | None = None) -> dict:
|
||||
params = {"expand": expand} if expand else None
|
||||
return (await self._request("GET", f"/quotes/{quote_id}", params=params, actor_id=actor_id)).get("data") or {}
|
||||
|
||||
async def create_quote(self, payload: dict, actor_id: str | None = None) -> dict:
|
||||
return (await self._request("POST", "/quotes", json=payload, actor_id=actor_id)).get("data") or {}
|
||||
|
||||
async def accept_quote(self, quote_id: str, payload: dict, actor_id: str | None = None) -> dict:
|
||||
path = f"/quotes/{quote_id}/accept"
|
||||
return (await self._request("PATCH", path, json=payload, actor_id=actor_id)).get("data") or {}
|
||||
|
||||
async def arrive_quote(self, quote_id: str, actor_id: str | None = None) -> dict:
|
||||
return (await self._request("PATCH", f"/quotes/{quote_id}/arrive", actor_id=actor_id)).get("data") or {}
|
||||
|
||||
async def arrive_items(self, quote_id: str, payload: dict, actor_id: str | None = None) -> dict:
|
||||
return (await self._request("PATCH", f"/quotes/{quote_id}/arrive-items", json=payload, actor_id=actor_id)).get("data") or {}
|
||||
|
||||
async def reject_quote(self, quote_id: str, reason: str | None = None, actor_id: str | None = None) -> dict:
|
||||
return (await self._request(
|
||||
"PATCH", f"/quotes/{quote_id}/reject", json={"reason": reason} if reason else None, actor_id=actor_id
|
||||
)).get("data") or {}
|
||||
|
||||
async def upload_quote_file(self, quote_id: str, kind: str, file_name: str, content: bytes,
|
||||
mime_type: str = "application/pdf", actor_id: str | None = None) -> dict:
|
||||
url = f"{self._base}/quotes/{quote_id}/{kind}"
|
||||
files = {"file": (file_name, content, mime_type)}
|
||||
async with httpx.AsyncClient(timeout=self._timeout) as client:
|
||||
try:
|
||||
resp = await client.post(url, files=files, headers=self._actor_headers(actor_id, None))
|
||||
if resp.status_code in (200, 201):
|
||||
return resp.json()
|
||||
except Exception as e:
|
||||
logger.warning("Failed to upload quote attachment to ERP: %s", e)
|
||||
return {}
|
||||
@@ -1 +0,0 @@
|
||||
"""Bale Bot API client (Telegram-compatible surface at tapi.bale.ai)."""
|
||||
@@ -1,177 +0,0 @@
|
||||
"""Thin async client for the Bale Bot API.
|
||||
|
||||
Bale's bot surface is a Telegram Bot API clone: ``POST {base}/bot{token}/{method}``
|
||||
and file downloads at ``{base}/file/bot{token}/{file_path}``. Long polling via
|
||||
``getUpdates`` avoids any webhook/TLS setup on the server.
|
||||
|
||||
HTML parse_mode is requested first; if Bale rejects it for a given payload we
|
||||
transparently retry as plain text so messages never get lost.
|
||||
"""
|
||||
import asyncio
|
||||
import logging
|
||||
|
||||
import httpx
|
||||
|
||||
logger = logging.getLogger("bot.bale")
|
||||
|
||||
REPLY_MARKUP = "reply_markup"
|
||||
|
||||
|
||||
class BaleError(Exception):
|
||||
def __init__(self, description: str, error_code: int | None = None):
|
||||
super().__init__(description)
|
||||
self.description = description
|
||||
self.error_code = error_code
|
||||
|
||||
|
||||
class BaleClient:
|
||||
def __init__(self, base_url: str, token: str, timeout: float = 60.0):
|
||||
self._base = base_url.rstrip("/")
|
||||
self._token = token
|
||||
self._timeout = timeout
|
||||
|
||||
# ------------------------------------------------------------------ core
|
||||
|
||||
def _method_url(self, method: str) -> str:
|
||||
return f"{self._base}/bot{self._token}/{method}"
|
||||
|
||||
def _file_url(self, file_path: str) -> str:
|
||||
return f"{self._base}/file/bot{self._token}/{file_path.lstrip('/')}"
|
||||
|
||||
async def _call(self, method: str, payload: dict | None = None, timeout: float | None = None) -> dict:
|
||||
async with httpx.AsyncClient(timeout=timeout or self._timeout) as client:
|
||||
try:
|
||||
resp = await client.post(self._method_url(method), json=payload or {})
|
||||
except httpx.HTTPError as exc:
|
||||
raise BaleError(f"network error calling {method}: {exc}") from exc
|
||||
try:
|
||||
body = resp.json()
|
||||
except ValueError as exc:
|
||||
raise BaleError(f"non-JSON response for {method} (HTTP {resp.status_code})") from exc
|
||||
if not body.get("ok"):
|
||||
raise BaleError(str(body.get("description") or "unknown bale error"), resp.status_code)
|
||||
return body.get("result")
|
||||
|
||||
# ------------------------------------------------------------- receiving
|
||||
|
||||
async def get_updates(self, offset: int, timeout_seconds: int) -> list[dict]:
|
||||
"""Long poll. ``timeout_seconds=0`` returns immediately (drain mode)."""
|
||||
result = await self._call(
|
||||
"getUpdates",
|
||||
{"offset": offset, "timeout": timeout_seconds, "allowed_updates": ["message", "callback_query"]},
|
||||
timeout=timeout_seconds + 15,
|
||||
)
|
||||
return result or []
|
||||
|
||||
# -------------------------------------------------------------- sending
|
||||
|
||||
async def send_message(self, chat_id: int, text: str, reply_markup: dict | None = None,
|
||||
reply_to: int | None = None) -> dict:
|
||||
payload: dict = {"chat_id": chat_id, "text": text[:4000]}
|
||||
if reply_markup:
|
||||
payload[REPLY_MARKUP] = reply_markup
|
||||
if reply_to:
|
||||
payload["reply_to_message_id"] = reply_to
|
||||
return await self._call("sendMessage", payload)
|
||||
|
||||
async def edit_message_text(self, chat_id: int, message_id: int, text: str,
|
||||
reply_markup: dict | None = None) -> dict:
|
||||
payload: dict = {"chat_id": chat_id, "message_id": message_id, "text": text[:4000]}
|
||||
if reply_markup:
|
||||
payload[REPLY_MARKUP] = reply_markup
|
||||
return await self._call("editMessageText", payload)
|
||||
|
||||
async def delete_message(self, chat_id: int, message_id: int) -> bool:
|
||||
payload: dict = {"chat_id": chat_id, "message_id": message_id}
|
||||
try:
|
||||
return bool(await self._call("deleteMessage", payload))
|
||||
except BaleError as exc:
|
||||
logger.warning("deleteMessage failed for chat %s msg %s: %s", chat_id, message_id, exc)
|
||||
return False
|
||||
except Exception as exc:
|
||||
logger.warning("unexpected error in deleteMessage for chat %s msg %s: %s", chat_id, message_id, exc)
|
||||
return False
|
||||
|
||||
async def answer_callback_query(self, callback_query_id: str, text: str | None = None) -> None:
|
||||
payload: dict = {"callback_query_id": callback_query_id}
|
||||
if text:
|
||||
payload["text"] = text[:200]
|
||||
try:
|
||||
await self._call("answerCallbackQuery", payload)
|
||||
except BaleError as exc:
|
||||
logger.warning("answerCallbackQuery failed: %s", exc)
|
||||
|
||||
async def send_chat_action(self, chat_id: int, action: str = "typing") -> None:
|
||||
try:
|
||||
await self._call("sendChatAction", {"chat_id": chat_id, "action": action})
|
||||
except BaleError as exc:
|
||||
logger.debug("sendChatAction failed: %s", exc)
|
||||
|
||||
# ---------------------------------------------------------------- files
|
||||
|
||||
async def get_file(self, file_id: str) -> dict:
|
||||
return await self._call("getFile", {"file_id": file_id})
|
||||
|
||||
async def download_file(self, file_id: str) -> bytes:
|
||||
"""Resolve a file_id to bytes (getFile → file_path → download URL)."""
|
||||
info = await self.get_file(file_id)
|
||||
file_path = info.get("file_path")
|
||||
if not file_path:
|
||||
raise BaleError("getFile returned no file_path")
|
||||
async with httpx.AsyncClient(timeout=120) as client:
|
||||
resp = await client.get(self._file_url(file_path))
|
||||
resp.raise_for_status()
|
||||
return resp.content
|
||||
|
||||
|
||||
async def poll_loop(client: BaleClient, on_update, offset_key: str = "bale_offset") -> None:
|
||||
"""Long-poll supervisor: resumable offset, one update at a time, never dies.
|
||||
|
||||
``on_update`` must be an async callable receiving the raw update dict.
|
||||
"""
|
||||
from app.db import SessionLocal
|
||||
from app.models import BotMeta
|
||||
|
||||
async def load_offset() -> int:
|
||||
async with SessionLocal() as session:
|
||||
row = (await session.execute(
|
||||
__import__("sqlalchemy").select(BotMeta.value).where(BotMeta.key == offset_key)
|
||||
)).scalar()
|
||||
return int(row) if row else 0
|
||||
|
||||
async def save_offset(value: int) -> None:
|
||||
from sqlalchemy.dialects.postgresql import insert as pg_insert
|
||||
|
||||
async with SessionLocal() as session:
|
||||
stmt = pg_insert(BotMeta).values(key=offset_key, value=str(value))
|
||||
stmt = stmt.on_conflict_do_update(index_elements=[BotMeta.key], set_={"value": str(value)})
|
||||
await session.execute(stmt)
|
||||
await session.commit()
|
||||
|
||||
offset = await load_offset()
|
||||
if offset == 0:
|
||||
# Skip any backlog accumulated while the bot was down: peek once
|
||||
# without waiting and jump straight to the newest update.
|
||||
backlog = await client.get_updates(0, 0)
|
||||
if backlog:
|
||||
offset = max(u["update_id"] for u in backlog) + 1
|
||||
|
||||
logger.info("polling started (offset=%s)", offset)
|
||||
while True:
|
||||
try:
|
||||
updates = await client.get_updates(offset, 25)
|
||||
for update in updates:
|
||||
offset = max(offset, update["update_id"] + 1)
|
||||
await save_offset(offset)
|
||||
try:
|
||||
await on_update(update)
|
||||
except Exception:
|
||||
logger.exception("handler crashed on update %s", update.get("update_id"))
|
||||
except asyncio.CancelledError:
|
||||
raise
|
||||
except BaleError as exc:
|
||||
logger.warning("poll error: %s", exc)
|
||||
await asyncio.sleep(3)
|
||||
except Exception:
|
||||
logger.exception("unexpected poll error")
|
||||
await asyncio.sleep(3)
|
||||
@@ -1,148 +0,0 @@
|
||||
"""Bot configuration.
|
||||
|
||||
All settings can be overridden with environment variables prefixed with
|
||||
``PROCUREMENT_BOT_`` (e.g. ``PROCUREMENT_BOT_BOT_TOKEN=...``) or a local
|
||||
``.env`` file. Docker/compose passes them in directly (same convention as
|
||||
the api service's ``PROCUREMENT_*`` prefix).
|
||||
"""
|
||||
from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||
|
||||
|
||||
class Settings(BaseSettings):
|
||||
model_config = SettingsConfigDict(
|
||||
env_prefix="PROCUREMENT_BOT_",
|
||||
env_file=".env",
|
||||
env_file_encoding="utf-8",
|
||||
extra="ignore",
|
||||
)
|
||||
|
||||
# Bale Bot API — Telegram-compatible clone hosted at tapi.bale.ai.
|
||||
BALE_API_BASE: str = "https://tapi.bale.ai"
|
||||
BOT_TOKEN: str = "" # from Bale's BotFather
|
||||
POLL_TIMEOUT_SECONDS: int = 25 # getUpdates long-poll window
|
||||
POLL_ERROR_SLEEP_SECONDS: float = 3.0
|
||||
|
||||
# ERP API (in-network service URL inside Docker).
|
||||
API_BASE_URL: str = "http://localhost:8000/api/v1"
|
||||
API_TIMEOUT_SECONDS: float = 30.0
|
||||
# Optional bearer for the day procurement endpoints start enforcing auth.
|
||||
SERVICE_TOKEN: str = ""
|
||||
|
||||
# Frontend URL (for opening Wizard from Bale bot)
|
||||
FRONTEND_URL: str = "http://localhost:8081"
|
||||
|
||||
# Security token for standalone wizard review URL
|
||||
DRAFT_TOKEN_SECRET: str = "procurement-draft-secret-change-in-prod-v7"
|
||||
DRAFT_TOKEN_EXPIRE_SECONDS: int = 7200 # 2 hours
|
||||
|
||||
# Persistent storage directory for draft attachments (proformas)
|
||||
ATTACHMENTS_DIR: str = "data/attachments/proformas"
|
||||
|
||||
# OpenAI-compatible AI provider (LLM), e.g. OpenAI / GLM / DeepSeek / OpenRouter.
|
||||
AI_BASE_URL: str = "" # e.g. https://api.openai.com/v1
|
||||
AI_API_KEY: str = ""
|
||||
LLM_MODEL: str = "gpt-4o-mini"
|
||||
LLM_TIMEOUT_SECONDS: float = 60.0
|
||||
|
||||
# STT providers — support multiple models/APIs in parallel.
|
||||
# 1. JSON list: [{"name": "m1", "base_url": "...", "api_key": "...", "model": "..."}, ...]
|
||||
STT_PROVIDERS_JSON: str = ""
|
||||
|
||||
# 2. Individual provider variables (up to 3 distinct STT models)
|
||||
STT_PROVIDER_1_NAME: str = "model-1"
|
||||
STT_PROVIDER_1_BASE_URL: str = ""
|
||||
STT_PROVIDER_1_API_KEY: str = ""
|
||||
STT_PROVIDER_1_MODEL: str = ""
|
||||
STT_PROVIDER_1_LANGUAGE: str = "fa"
|
||||
|
||||
STT_PROVIDER_2_NAME: str = "model-2"
|
||||
STT_PROVIDER_2_BASE_URL: str = ""
|
||||
STT_PROVIDER_2_API_KEY: str = ""
|
||||
STT_PROVIDER_2_MODEL: str = ""
|
||||
STT_PROVIDER_2_LANGUAGE: str = "fa"
|
||||
|
||||
STT_PROVIDER_3_NAME: str = "model-3"
|
||||
STT_PROVIDER_3_BASE_URL: str = ""
|
||||
STT_PROVIDER_3_API_KEY: str = ""
|
||||
STT_PROVIDER_3_MODEL: str = ""
|
||||
STT_PROVIDER_3_LANGUAGE: str = "fa"
|
||||
|
||||
# Legacy single STT provider fallback:
|
||||
STT_BASE_URL: str = ""
|
||||
STT_API_KEY: str = ""
|
||||
STT_MODEL: str = "whisper-1"
|
||||
STT_LANGUAGE: str = "fa"
|
||||
|
||||
@property
|
||||
def stt_base_url(self) -> str:
|
||||
return self.STT_BASE_URL or self.AI_BASE_URL
|
||||
|
||||
@property
|
||||
def stt_api_key(self) -> str:
|
||||
return self.STT_API_KEY or self.AI_API_KEY
|
||||
|
||||
@property
|
||||
def stt_providers(self) -> list[dict]:
|
||||
import json
|
||||
if self.STT_PROVIDERS_JSON:
|
||||
try:
|
||||
data = json.loads(self.STT_PROVIDERS_JSON)
|
||||
if isinstance(data, list) and len(data) > 0:
|
||||
return data
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Check explicit STT_PROVIDER_1 / 2 / 3
|
||||
custom_list: list[dict] = []
|
||||
for idx in (1, 2, 3):
|
||||
b_url = getattr(self, f"STT_PROVIDER_{idx}_BASE_URL")
|
||||
key = getattr(self, f"STT_PROVIDER_{idx}_API_KEY")
|
||||
model = getattr(self, f"STT_PROVIDER_{idx}_MODEL")
|
||||
name = getattr(self, f"STT_PROVIDER_{idx}_NAME")
|
||||
lang = getattr(self, f"STT_PROVIDER_{idx}_LANGUAGE") or "fa"
|
||||
if b_url and key:
|
||||
custom_list.append({
|
||||
"name": name or f"model-{idx}",
|
||||
"base_url": b_url,
|
||||
"api_key": key,
|
||||
"model": model or self.STT_MODEL,
|
||||
"language": lang,
|
||||
"timeout": 30.0,
|
||||
})
|
||||
if custom_list:
|
||||
return custom_list
|
||||
|
||||
# Fallback to single legacy STT provider if set
|
||||
if self.stt_base_url and self.stt_api_key:
|
||||
return [{
|
||||
"name": "default",
|
||||
"base_url": self.stt_base_url,
|
||||
"api_key": self.stt_api_key,
|
||||
"model": self.STT_MODEL,
|
||||
"language": self.STT_LANGUAGE,
|
||||
"timeout": 30.0,
|
||||
}]
|
||||
return []
|
||||
|
||||
# PostgreSQL — same instance/database as the api service.
|
||||
DATABASE_URL: str = "postgresql+asyncpg://postgres:postgres@localhost:5432/procurement"
|
||||
|
||||
# Chats that may use the bot without Casdoor linking (comma separated).
|
||||
ADMIN_CHAT_IDS: str = ""
|
||||
|
||||
# Drafts older than this are marked expired by the sweeper loop.
|
||||
DRAFT_TTL_HOURS: int = 24
|
||||
|
||||
LOG_LEVEL: str = "INFO"
|
||||
|
||||
@property
|
||||
def admin_chat_ids(self) -> set[int]:
|
||||
out: set[int] = set()
|
||||
for part in self.ADMIN_CHAT_IDS.replace(";", ",").split(","):
|
||||
part = part.strip()
|
||||
if part.isdigit():
|
||||
out.add(int(part))
|
||||
return out
|
||||
|
||||
|
||||
settings = Settings()
|
||||
@@ -1,7 +0,0 @@
|
||||
"""Async engine/session for the bot's own tables (same postgres as the api)."""
|
||||
from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
|
||||
|
||||
from app.config import settings
|
||||
|
||||
engine = create_async_engine(settings.DATABASE_URL, pool_pre_ping=True)
|
||||
SessionLocal = async_sessionmaker(engine, expire_on_commit=False)
|
||||
@@ -1,81 +0,0 @@
|
||||
"""Idempotent DDL for the bot's own tables (mirrors the api's init_db.py
|
||||
convention — the ORM never creates tables; this script does, IF NOT EXISTS).
|
||||
"""
|
||||
import logging
|
||||
|
||||
from sqlalchemy import text
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.models import Base
|
||||
|
||||
logger = logging.getLogger("bot.db_init")
|
||||
|
||||
DDL = [
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS bot_links (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
chat_id BIGINT UNIQUE NOT NULL,
|
||||
user_id UUID,
|
||||
casdoor_username TEXT,
|
||||
display_name TEXT,
|
||||
role VARCHAR(32),
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
)
|
||||
""",
|
||||
"CREATE INDEX IF NOT EXISTS ix_bot_links_chat_id ON bot_links (chat_id)",
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS bot_drafts (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
chat_id BIGINT NOT NULL,
|
||||
kind VARCHAR(16) NOT NULL,
|
||||
payload JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||
missing JSONB,
|
||||
status VARCHAR(16) NOT NULL DEFAULT 'active',
|
||||
source VARCHAR(16),
|
||||
source_message_id BIGINT,
|
||||
review_message_id BIGINT,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
)
|
||||
""",
|
||||
"CREATE INDEX IF NOT EXISTS ix_bot_drafts_chat_id ON bot_drafts (chat_id)",
|
||||
"CREATE INDEX IF NOT EXISTS ix_bot_drafts_chat_status ON bot_drafts (chat_id, status)",
|
||||
"ALTER TABLE bot_drafts ADD COLUMN IF NOT EXISTS last_bale_update_at TIMESTAMPTZ",
|
||||
"ALTER TABLE bot_drafts ADD COLUMN IF NOT EXISTS source_message_id BIGINT",
|
||||
"CREATE INDEX IF NOT EXISTS ix_bot_drafts_review_msg ON bot_drafts (review_message_id)",
|
||||
"CREATE INDEX IF NOT EXISTS ix_bot_drafts_source_msg ON bot_drafts (source_message_id)",
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS bot_messages (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
chat_id BIGINT NOT NULL,
|
||||
direction VARCHAR(4) NOT NULL,
|
||||
kind VARCHAR(16) NOT NULL DEFAULT 'text',
|
||||
body TEXT,
|
||||
payload JSONB,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
)
|
||||
""",
|
||||
"CREATE INDEX IF NOT EXISTS ix_bot_messages_chat_id ON bot_messages (chat_id)",
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS bot_meta (
|
||||
key VARCHAR(64) PRIMARY KEY,
|
||||
value TEXT,
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
)
|
||||
""",
|
||||
]
|
||||
|
||||
|
||||
async def ensure_bot_tables(session: AsyncSession) -> None:
|
||||
for stmt in DDL:
|
||||
await session.execute(text(stmt))
|
||||
await session.commit()
|
||||
logger.info("bot tables ready")
|
||||
|
||||
|
||||
async def ensure_schema() -> None:
|
||||
from app.db import SessionLocal
|
||||
|
||||
async with SessionLocal() as session:
|
||||
await ensure_bot_tables(session)
|
||||
@@ -1,482 +0,0 @@
|
||||
"""Draft store + payload/missing-field logic.
|
||||
|
||||
A draft's ``payload`` is a talking-friendly JSON the bot keeps refining. When
|
||||
the user approves, ``build_quote_payload`` converts it into the exact
|
||||
``POST /quotes`` request body (temp_ids cross-referencing line items,
|
||||
termsheets and prices).
|
||||
|
||||
Resolution state lives inside the payload:
|
||||
payload["supplier_id"], payload["project_id"],
|
||||
item["material_id"], item["unit_id"], item["unit_explicit"],
|
||||
payload["options"][field] = candidate list shown as pick-buttons.
|
||||
"""
|
||||
import difflib
|
||||
import uuid
|
||||
from datetime import datetime, timedelta, timezone
|
||||
|
||||
from sqlalchemy import cast, func, select, String, update
|
||||
|
||||
from app.db import SessionLocal
|
||||
from app.models import BotDraft
|
||||
from app.nlu import normalize_text
|
||||
|
||||
KIND_QUOTE = "quote"
|
||||
KIND_SUPPLIER = "supplier"
|
||||
KIND_MATERIAL = "material"
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Store
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
async def create(chat_id: int, kind: str, payload: dict, source: str | None = None,
|
||||
source_message_id: int | None = None) -> BotDraft:
|
||||
async with SessionLocal() as session:
|
||||
draft = BotDraft(
|
||||
chat_id=chat_id,
|
||||
kind=kind,
|
||||
payload=payload,
|
||||
source=source,
|
||||
source_message_id=source_message_id,
|
||||
)
|
||||
session.add(draft)
|
||||
await session.commit()
|
||||
await session.refresh(draft)
|
||||
return draft
|
||||
|
||||
|
||||
async def get_active(chat_id: int, kind: str | None = None) -> BotDraft | None:
|
||||
async with SessionLocal() as session:
|
||||
stmt = select(BotDraft).where(BotDraft.chat_id == chat_id, BotDraft.status == "active")
|
||||
if kind:
|
||||
stmt = stmt.where(BotDraft.kind == kind)
|
||||
stmt = stmt.order_by(BotDraft.updated_at.desc()).limit(1)
|
||||
return (await session.execute(stmt)).scalar_one_or_none()
|
||||
|
||||
|
||||
async def get_by_message_id(chat_id: int, message_id: int) -> BotDraft | None:
|
||||
"""Find the active draft associated with a given message_id (review card or user source message)."""
|
||||
async with SessionLocal() as session:
|
||||
stmt = (
|
||||
select(BotDraft)
|
||||
.where(
|
||||
BotDraft.chat_id == chat_id,
|
||||
BotDraft.status == "active",
|
||||
(BotDraft.review_message_id == message_id) | (BotDraft.source_message_id == message_id),
|
||||
)
|
||||
.order_by(BotDraft.updated_at.desc())
|
||||
.limit(1)
|
||||
)
|
||||
return (await session.execute(stmt)).scalar_one_or_none()
|
||||
|
||||
|
||||
async def get_by_prefix(draft_prefix: str, chat_id: int | None = None) -> BotDraft | None:
|
||||
"""Resolve the short id used in callback_data (first 8 hex of the UUID)."""
|
||||
async with SessionLocal() as session:
|
||||
stmt = select(BotDraft).where(cast(BotDraft.id, String).like(f"{draft_prefix}%"))
|
||||
if chat_id is not None:
|
||||
stmt = stmt.where(BotDraft.chat_id == chat_id)
|
||||
return (await session.execute(stmt)).scalar_one_or_none()
|
||||
|
||||
|
||||
async def save_payload(draft: BotDraft, missing: dict | None = None,
|
||||
review_message_id: int | None = None,
|
||||
source_message_id: int | None = None,
|
||||
mark_bale_synced: bool = False) -> None:
|
||||
async with SessionLocal() as session:
|
||||
effective_review_msg_id = review_message_id if review_message_id is not None else draft.review_message_id
|
||||
values: dict = {
|
||||
"payload": draft.payload,
|
||||
"missing": missing,
|
||||
"review_message_id": effective_review_msg_id,
|
||||
}
|
||||
if source_message_id is not None:
|
||||
values["source_message_id"] = source_message_id
|
||||
draft.source_message_id = source_message_id
|
||||
if mark_bale_synced:
|
||||
values["last_bale_update_at"] = func.now()
|
||||
await session.execute(
|
||||
update(BotDraft)
|
||||
.where(BotDraft.id == draft.id)
|
||||
.values(**values)
|
||||
)
|
||||
await session.commit()
|
||||
draft.review_message_id = effective_review_msg_id
|
||||
|
||||
|
||||
async def set_status(draft_id: str, status: str) -> None:
|
||||
async with SessionLocal() as session:
|
||||
await session.execute(update(BotDraft).where(BotDraft.id == draft_id).values(status=status))
|
||||
await session.commit()
|
||||
|
||||
|
||||
async def set_bale_updated_at(draft_id) -> None:
|
||||
async with SessionLocal() as session:
|
||||
await session.execute(
|
||||
update(BotDraft)
|
||||
.where(BotDraft.id == draft_id)
|
||||
.values(last_bale_update_at=func.now())
|
||||
)
|
||||
await session.commit()
|
||||
|
||||
|
||||
async def get_pending_bale_updates() -> list[BotDraft]:
|
||||
async with SessionLocal() as session:
|
||||
stmt = (
|
||||
select(BotDraft)
|
||||
.where(
|
||||
BotDraft.review_message_id.is_not(None),
|
||||
(BotDraft.last_bale_update_at.is_(None)) | (BotDraft.updated_at > BotDraft.last_bale_update_at),
|
||||
)
|
||||
.order_by(BotDraft.updated_at.asc())
|
||||
.limit(10)
|
||||
)
|
||||
return list((await session.execute(stmt)).scalars().all())
|
||||
|
||||
|
||||
async def expire_stale(ttl_hours: int) -> int:
|
||||
cutoff = datetime.now(timezone.utc) - timedelta(hours=ttl_hours)
|
||||
async with SessionLocal() as session:
|
||||
result = await session.execute(
|
||||
update(BotDraft)
|
||||
.where(BotDraft.status == "active", BotDraft.updated_at < cutoff)
|
||||
.values(status="expired")
|
||||
)
|
||||
await session.commit()
|
||||
return result.rowcount or 0
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Quote payload
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def new_quote_payload() -> dict:
|
||||
return {
|
||||
"supplier_name": None, "supplier_id": None,
|
||||
"project_name": None, "project_id": None, "project_names": [], "project_ids": [],
|
||||
"is_official": True, "notes": None, "expiry_date": None,
|
||||
"items": [], "termsheets": [],
|
||||
"options": {}, "proforma_file": None,
|
||||
}
|
||||
|
||||
|
||||
def new_item(material_name: str | None = None) -> dict:
|
||||
return {
|
||||
"material_name": material_name, "material_id": None,
|
||||
"quantity": None, "unit_name": None, "unit_id": None, "unit_explicit": False,
|
||||
"unit_price": None, "brand_name": None, "specs": [], "notes": None,
|
||||
}
|
||||
|
||||
|
||||
def _similarity(a: str | None, b: str | None) -> float:
|
||||
na, nb = normalize_text(a or ""), normalize_text(b or "")
|
||||
if not na or not nb:
|
||||
return 0.0
|
||||
ratio = difflib.SequenceMatcher(None, na, nb).ratio()
|
||||
if na in nb or nb in na:
|
||||
ratio += 0.3
|
||||
return ratio
|
||||
|
||||
|
||||
def merge_quote_patch(payload: dict, patch: dict) -> bool:
|
||||
"""Merge an NLU patch into the payload. Returns True if anything changed."""
|
||||
changed = False
|
||||
|
||||
def set_field(key: str, value) -> None:
|
||||
nonlocal changed
|
||||
if value is None:
|
||||
return
|
||||
if payload.get(key) != value:
|
||||
payload[key] = value
|
||||
changed = True
|
||||
|
||||
if patch.get("supplier_name"):
|
||||
payload["supplier_name"] = str(patch["supplier_name"]).strip()
|
||||
payload["supplier_id"] = None # needs re-resolution
|
||||
changed = True
|
||||
if patch.get("project_names"):
|
||||
payload["project_names"] = [str(p).strip() for p in patch["project_names"] if p]
|
||||
if payload["project_names"] and not payload.get("project_name"):
|
||||
payload["project_name"] = payload["project_names"][0]
|
||||
payload["project_id"] = None
|
||||
changed = True
|
||||
elif patch.get("project_name"):
|
||||
payload["project_name"] = str(patch["project_name"]).strip()
|
||||
payload["project_id"] = None
|
||||
if not payload.get("project_names"):
|
||||
payload["project_names"] = [payload["project_name"]]
|
||||
changed = True
|
||||
set_field("is_official", patch.get("is_official"))
|
||||
if patch.get("notes"):
|
||||
payload["notes"] = f"{payload.get('notes') or ''}\n{patch['notes']}".strip()
|
||||
changed = True
|
||||
if patch.get("expiry_date"):
|
||||
set_field("expiry_date", patch["expiry_date"])
|
||||
|
||||
for raw in patch.get("items") or []:
|
||||
name = (raw.get("material_name") or "").strip() or None
|
||||
target = None
|
||||
if name:
|
||||
best, best_ratio = None, 0.0
|
||||
for item in payload["items"]:
|
||||
# If both items have distinct specs, they are different line items
|
||||
if raw.get("specs") and item.get("specs") and set(raw["specs"]) != set(item["specs"]):
|
||||
continue
|
||||
# If both items have distinct brands, they are different line items
|
||||
if raw.get("brand_name") and item.get("brand_name") and normalize_text(raw["brand_name"]) != normalize_text(item["brand_name"]):
|
||||
continue
|
||||
ratio = _similarity(name, item.get("material_name"))
|
||||
if ratio > best_ratio:
|
||||
best, best_ratio = item, ratio
|
||||
if best is not None and best_ratio >= 0.55:
|
||||
target = best
|
||||
if target is None:
|
||||
target = new_item(name)
|
||||
payload["items"].append(target)
|
||||
changed = True
|
||||
for key in ("quantity", "unit_price"):
|
||||
if raw.get(key) is not None:
|
||||
try:
|
||||
value = float(raw[key])
|
||||
except (TypeError, ValueError):
|
||||
continue
|
||||
if target.get(key) != value:
|
||||
target[key] = value
|
||||
changed = True
|
||||
if raw.get("specs"):
|
||||
target["specs"] = [str(s).strip() for s in raw["specs"] if s]
|
||||
spec_str = "، ".join(target["specs"])
|
||||
if spec_str and not target.get("notes"):
|
||||
target["notes"] = spec_str
|
||||
changed = True
|
||||
for key in ("unit_name", "brand_name", "notes"):
|
||||
if raw.get(key):
|
||||
val = str(raw[key]).strip()
|
||||
if target.get(key) != val:
|
||||
target[key] = val
|
||||
changed = True
|
||||
|
||||
for raw in patch.get("payment_terms") or []:
|
||||
label = (raw.get("label") or "شرایط پرداخت").strip()
|
||||
milestones = []
|
||||
for m in raw.get("milestones") or []:
|
||||
if m.get("due_date") or m.get("amount"):
|
||||
milestones.append({
|
||||
"due_date": m.get("due_date"),
|
||||
"amount": float(m.get("amount") or 0),
|
||||
"note": m.get("note"),
|
||||
})
|
||||
entry = {
|
||||
"label": label,
|
||||
"discount_type": raw.get("discount_type") or "none",
|
||||
"discount_value": float(raw.get("discount_value") or 0),
|
||||
"milestones": milestones,
|
||||
"description": (raw.get("description") or "").strip() or None,
|
||||
}
|
||||
if not any(normalize_text(t["label"]) == normalize_text(label) for t in payload["termsheets"]):
|
||||
payload["termsheets"].append(entry)
|
||||
changed = True
|
||||
|
||||
return changed
|
||||
|
||||
|
||||
def compute_quote_missing(payload: dict) -> list[dict]:
|
||||
"""What is still empty — strictly aligned with DB schema requirements."""
|
||||
out: list[dict] = []
|
||||
|
||||
def add(key: str, label: str, ok: bool, blocking: bool) -> None:
|
||||
out.append({"key": key, "label": label, "ok": ok, "blocking": blocking})
|
||||
|
||||
# In DB: supplier_id is NOT NULL in quotes table.
|
||||
sup_ok = bool(payload.get("supplier_id") or payload.get("supplier_name"))
|
||||
add("supplier", "تأمین‌کننده", sup_ok, True)
|
||||
|
||||
# In DB: project_id is nullable (optional)
|
||||
add("project", "پروژه", bool(payload.get("project_id") or payload.get("project_ids")), False)
|
||||
|
||||
# In DB: expiry_date is nullable (optional)
|
||||
add("expiry", "تاریخ اعتبار", bool(payload.get("expiry_date")), False)
|
||||
|
||||
items = payload.get("items") or []
|
||||
add("items", "قلم (کالا/مقدار)", bool(items), True)
|
||||
for i, item in enumerate(items, start=1):
|
||||
name = item.get("material_name") or f"قلم {i}"
|
||||
has_mat = bool(item.get("material_id") or item.get("material_name"))
|
||||
if not has_mat:
|
||||
add(f"item:{i}:material", f"نام کالا برای قلم {i}", False, True)
|
||||
|
||||
if not item.get("quantity"):
|
||||
add(f"item:{i}:qty", f"مقدار «{name}»", False, True)
|
||||
if not item.get("unit_id") and not item.get("unit_name"):
|
||||
add(f"item:{i}:unit", f"واحد کالا برای «{name}»", False, True)
|
||||
if not item.get("unit_price"):
|
||||
add(f"item:{i}:price", f"قیمت واحد برای «{name}»", False, False)
|
||||
|
||||
if items and not payload.get("termsheets"):
|
||||
add("terms", "شرایط پرداخت", False, False)
|
||||
if not payload.get("notes"):
|
||||
add("notes", "توضیحات", False, False)
|
||||
return out
|
||||
|
||||
|
||||
def quote_ready(payload: dict) -> tuple[bool, list[str]]:
|
||||
"""Blocking check before commit; returns (ok, blocking_labels)."""
|
||||
missing = compute_quote_missing(payload)
|
||||
return all(not (m["blocking"] and not m["ok"]) for m in missing), [
|
||||
m["label"] for m in missing if m["blocking"] and not m["ok"]
|
||||
]
|
||||
|
||||
|
||||
def build_quote_request(payload: dict, only_resolved_items: bool = False) -> tuple[dict | None, list[str]]:
|
||||
"""Convert the payload into a QuoteCreate body. Returns (body, problems)."""
|
||||
problems: list[str] = []
|
||||
if not payload.get("supplier_id"):
|
||||
return None, ["تأمین‌کننده مشخص نیست"]
|
||||
|
||||
items = payload.get("items") or []
|
||||
line_items: list[dict] = []
|
||||
for i, item in enumerate(items, start=1):
|
||||
if not item.get("material_id"):
|
||||
if only_resolved_items:
|
||||
continue
|
||||
problems.append(f"کالای قلم {i} («{item.get('material_name') or '?'}») شناسایی نشد")
|
||||
continue
|
||||
if not item.get("quantity"):
|
||||
problems.append(f"مقدار قلم {i} («{item.get('material_name') or '?'}») مشخص نیست")
|
||||
continue
|
||||
unit_id = item.get("unit_id")
|
||||
if not unit_id:
|
||||
problems.append(f"واحد قلم {i} («{item.get('material_name') or '?'}») مشخص نیست")
|
||||
continue
|
||||
notes_parts = []
|
||||
if item.get("brand_name"):
|
||||
notes_parts.append(f"برند: {item['brand_name']}")
|
||||
if item.get("specs"):
|
||||
notes_parts.append("، ".join(item["specs"]))
|
||||
if item.get("notes"):
|
||||
if item["notes"] not in notes_parts:
|
||||
notes_parts.append(item["notes"])
|
||||
notes_str = " | ".join(notes_parts) if notes_parts else None
|
||||
|
||||
line_items.append({
|
||||
"temp_id": f"t{i}",
|
||||
"material_id": item["material_id"],
|
||||
"unit_id": int(unit_id),
|
||||
"quantity": item["quantity"],
|
||||
"notes": notes_str,
|
||||
})
|
||||
|
||||
termsheets: list[dict] = []
|
||||
item_termsheets: list[dict] = []
|
||||
priced = [it for it in items if it.get("unit_price") and it.get("material_id")]
|
||||
if priced:
|
||||
raw_sheets = payload.get("termsheets") or []
|
||||
if not raw_sheets:
|
||||
raw_sheets = [{"label": "پیشنهاد قیمت"}]
|
||||
for j, ts in enumerate(raw_sheets, start=1):
|
||||
steps = []
|
||||
for s_idx, m in enumerate(ts.get("milestones") or ts.get("schedule_steps") or [], start=1):
|
||||
steps.append({
|
||||
"step_no": s_idx,
|
||||
"due_date": m.get("due_date"),
|
||||
"amount": float(m.get("amount") or 0),
|
||||
"note": m.get("note"),
|
||||
})
|
||||
termsheets.append({
|
||||
"temp_id": f"p{j}",
|
||||
"label": ts.get("label") or f"شرایط {j}",
|
||||
"discount_type": ts.get("discount_type") or "none",
|
||||
"discount_value": float(ts.get("discount_value") or 0),
|
||||
"schedule_steps": steps,
|
||||
})
|
||||
first = termsheets[0]["temp_id"]
|
||||
for i, item in enumerate(items, start=1):
|
||||
if item.get("unit_price") and item.get("material_id") and item.get("quantity") and item.get("unit_id"):
|
||||
item_termsheets.append({
|
||||
"line_item_temp_id": f"t{i}",
|
||||
"termsheet_temp_id": first,
|
||||
"unit_price": item["unit_price"],
|
||||
})
|
||||
|
||||
body: dict = {
|
||||
"supplier_id": payload["supplier_id"],
|
||||
"is_official": bool(payload.get("is_official", True)),
|
||||
"line_items": line_items,
|
||||
"termsheets": termsheets,
|
||||
"item_termsheets": item_termsheets,
|
||||
}
|
||||
if payload.get("project_ids"):
|
||||
body["project_ids"] = payload["project_ids"]
|
||||
elif payload.get("project_id"):
|
||||
body["project_ids"] = [payload["project_id"]]
|
||||
if payload.get("expiry_date"):
|
||||
body["expiry_date"] = payload["expiry_date"]
|
||||
if payload.get("notes"):
|
||||
body["notes"] = payload["notes"]
|
||||
if not line_items and problems:
|
||||
return None, problems
|
||||
return body, problems
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Supplier / material payloads
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def new_supplier_payload() -> dict:
|
||||
return {"name": None, "category_id": None, "category_name": None,
|
||||
"phone": None, "location": None, "contact_person": None, "options": {}}
|
||||
|
||||
|
||||
def merge_supplier_patch(payload: dict, patch: dict) -> bool:
|
||||
src = patch.get("supplier") or patch
|
||||
changed = False
|
||||
for key in ("name", "phone", "location", "contact_person"):
|
||||
if src.get(key) and payload.get(key) != str(src[key]).strip():
|
||||
payload[key] = str(src[key]).strip()
|
||||
changed = True
|
||||
if src.get("category_name"):
|
||||
payload["category_name"] = str(src["category_name"]).strip()
|
||||
payload["category_id"] = None
|
||||
changed = True
|
||||
return changed
|
||||
|
||||
|
||||
def supplier_missing(payload: dict) -> list[dict]:
|
||||
return [
|
||||
{"key": "name", "label": "نام تأمین‌کننده", "ok": bool(payload.get("name")), "blocking": True},
|
||||
{"key": "category", "label": "دسته‌بندی", "ok": bool(payload.get("category_id")), "blocking": True},
|
||||
{"key": "phone", "label": "تلفن", "ok": bool(payload.get("phone")), "blocking": False},
|
||||
{"key": "location", "label": "موقعیت", "ok": bool(payload.get("location")), "blocking": False},
|
||||
]
|
||||
|
||||
|
||||
def new_material_payload() -> dict:
|
||||
return {"name": None, "canonical_unit_id": None, "unit_name": None, "topic": None, "options": {}}
|
||||
|
||||
|
||||
def merge_material_patch(payload: dict, patch: dict) -> bool:
|
||||
src = patch.get("material") or patch
|
||||
changed = False
|
||||
if src.get("name") and payload.get("name") != str(src["name"]).strip():
|
||||
payload["name"] = str(src["name"]).strip()
|
||||
changed = True
|
||||
if src.get("unit_name"):
|
||||
payload["unit_name"] = str(src["unit_name"]).strip()
|
||||
payload["canonical_unit_id"] = None
|
||||
changed = True
|
||||
if src.get("topic") and payload.get("topic") != str(src["topic"]).strip():
|
||||
payload["topic"] = str(src["topic"]).strip()
|
||||
changed = True
|
||||
return changed
|
||||
|
||||
|
||||
def material_missing(payload: dict) -> list[dict]:
|
||||
return [
|
||||
{"key": "name", "label": "نام کالا", "ok": bool(payload.get("name")), "blocking": True},
|
||||
{"key": "unit", "label": "واحد اصلی", "ok": bool(payload.get("canonical_unit_id")), "blocking": True},
|
||||
{"key": "topic", "label": "تاپیک", "ok": bool(payload.get("topic")), "blocking": False},
|
||||
]
|
||||
|
||||
|
||||
def short_id() -> str:
|
||||
return uuid.uuid4().hex[:8]
|
||||
@@ -1,325 +0,0 @@
|
||||
"""Update dispatch — the heart of the bot.
|
||||
|
||||
Pipeline per update:
|
||||
callback_query → callbacks router (link-gated)
|
||||
message text starting "/" → command router
|
||||
voice/audio → download → STT → treated as text (source=voice)
|
||||
text → pending-flow interception (linking / accept-arrive confirmations)
|
||||
→ auth gate (link or admin)
|
||||
→ NLU → intent router
|
||||
"""
|
||||
import logging
|
||||
|
||||
from app import drafts as draft_store
|
||||
from app.config import settings
|
||||
from app.nlu import understand
|
||||
from app.runtime import BotContext, LinkedUser
|
||||
from app.storage import save_proforma_file
|
||||
from app.stt import transcribe, transcribe_multi
|
||||
from app.texts import CANCELLED, LINK_START, NOTHING_TO_COMMIT, STT_FAILED, UNKNOWN_HINT, VOICE_EMPTY, esc
|
||||
|
||||
from . import commands, callbacks, quote, supplier, material, queries, decisions
|
||||
|
||||
logger = logging.getLogger("bot.handlers")
|
||||
|
||||
|
||||
async def handle_update(ctx: BotContext, update: dict) -> None:
|
||||
if update.get("callback_query"):
|
||||
await callbacks.handle_callback(ctx, update["callback_query"])
|
||||
return
|
||||
message = update.get("message") or update.get("edited_message")
|
||||
if not message:
|
||||
return
|
||||
chat_id = message["chat"]["id"]
|
||||
try:
|
||||
await handle_message(ctx, chat_id, message)
|
||||
except Exception:
|
||||
logger.exception("message handling failed for chat %s", chat_id)
|
||||
await ctx.send(chat_id, "خطای غیرمنتظره رخ داد؛ دوباره تلاش کن.")
|
||||
|
||||
|
||||
async def handle_message(ctx: BotContext, chat_id: int, message: dict) -> None:
|
||||
text = (message.get("text") or message.get("caption") or "").strip()
|
||||
source = "text"
|
||||
voice_transcripts: list[dict] | None = None
|
||||
message_id = message.get("message_id")
|
||||
|
||||
if text.startswith("/"):
|
||||
await commands.handle_command(ctx, chat_id, text)
|
||||
return
|
||||
|
||||
# Pending multi-step interactions take the message first.
|
||||
flow = ctx.pending.get(chat_id)
|
||||
if flow:
|
||||
handled = await _route_to_flow(ctx, chat_id, flow, text)
|
||||
if handled:
|
||||
return
|
||||
ctx.pending.pop(chat_id) # stale/irrelevant flow → fall through
|
||||
|
||||
user = await _gate(ctx, chat_id, message)
|
||||
if user is None:
|
||||
return # gate either started linking or is mid-linking
|
||||
|
||||
reply_to = message.get("reply_to_message")
|
||||
reply_to_msg_id = reply_to.get("message_id") if reply_to else None
|
||||
|
||||
def _is_audio(msg: dict) -> bool:
|
||||
if msg.get("voice") or msg.get("audio"):
|
||||
return True
|
||||
doc = msg.get("document")
|
||||
if doc and (doc.get("mime_type") or "").lower().startswith("audio/"):
|
||||
return True
|
||||
return False
|
||||
|
||||
async def _extract_voice() -> list[dict] | None:
|
||||
nonlocal source
|
||||
source = "voice"
|
||||
await ctx.bale.send_chat_action(chat_id, "typing")
|
||||
audio_media = message.get("voice") or message.get("audio") or message.get("document")
|
||||
file_id = audio_media["file_id"]
|
||||
try:
|
||||
audio_bytes = await ctx.bale.download_file(file_id)
|
||||
transcripts = await transcribe_multi(
|
||||
settings,
|
||||
audio_bytes,
|
||||
mime_type=audio_media.get("mime_type"),
|
||||
filename=audio_media.get("file_name"),
|
||||
)
|
||||
except Exception as exc:
|
||||
detail = "هوش مصنوعی تنظیم نشده" if "not configured" in str(exc) else str(exc)[:200]
|
||||
await ctx.send(chat_id, STT_FAILED.format(detail=esc(detail)), reply_to=message_id)
|
||||
return None
|
||||
if not transcripts:
|
||||
await ctx.send(chat_id, VOICE_EMPTY, reply_to=message_id)
|
||||
return None
|
||||
return transcripts
|
||||
|
||||
# =========================================================================
|
||||
# BRANCH 1: EDIT MODE — Strictly requires reply_to_message_id on a draft
|
||||
# =========================================================================
|
||||
if reply_to_msg_id is not None:
|
||||
target_draft = await draft_store.get_by_message_id(chat_id, reply_to_msg_id)
|
||||
if target_draft is None:
|
||||
await ctx.send(
|
||||
chat_id,
|
||||
"⚠️ پیش‌نویس فعال مربوط به این پیام یافت نشد (ممکن است ثبت نهایی، منقضی یا لغو شده باشد).\nبرای ثبت استعلام جدید، پیام خود را بدون ریپلای ارسال فرمایید.",
|
||||
reply_to=message_id,
|
||||
)
|
||||
return
|
||||
|
||||
# Check for proforma attachment (document or photo)
|
||||
proforma_attached = False
|
||||
saved_meta = None
|
||||
doc = message.get("document")
|
||||
photos = message.get("photo")
|
||||
|
||||
if doc and not (doc.get("mime_type") or "").lower().startswith("audio/"):
|
||||
doc_file_id = doc["file_id"]
|
||||
doc_file_name = doc.get("file_name") or f"proforma_{message_id}.pdf"
|
||||
doc_mime = doc.get("mime_type") or "application/pdf"
|
||||
elif photos:
|
||||
largest = photos[-1] if isinstance(photos, list) else photos
|
||||
doc_file_id = largest["file_id"]
|
||||
doc_file_name = f"proforma_{message_id}.jpg"
|
||||
doc_mime = "image/jpeg"
|
||||
else:
|
||||
doc_file_id = None
|
||||
doc_file_name = None
|
||||
doc_mime = None
|
||||
|
||||
if doc_file_id:
|
||||
await ctx.bale.send_chat_action(chat_id, "upload_document")
|
||||
try:
|
||||
content = await ctx.bale.download_file(doc_file_id)
|
||||
saved_meta = await save_proforma_file(
|
||||
target_draft.id,
|
||||
doc_file_name,
|
||||
content,
|
||||
mime_type=doc_mime,
|
||||
storage_dir=settings.ATTACHMENTS_DIR,
|
||||
)
|
||||
payload = dict(target_draft.payload or {})
|
||||
payload["proforma_file"] = saved_meta["file_name"]
|
||||
payload["proforma"] = saved_meta
|
||||
target_draft.payload = payload
|
||||
await draft_store.save_payload(target_draft, mark_bale_synced=True)
|
||||
proforma_attached = True
|
||||
except Exception as exc:
|
||||
logger.exception("Failed to persist proforma")
|
||||
await ctx.send(chat_id, f"❌ خطا در ذخیره فایل پیش‌فاکتور: {esc(str(exc)[:100])}", reply_to=message_id)
|
||||
return
|
||||
|
||||
if _is_audio(message):
|
||||
voice_transcripts = await _extract_voice()
|
||||
if not voice_transcripts:
|
||||
return
|
||||
text = voice_transcripts[0]["text"]
|
||||
|
||||
if proforma_attached and not text and not voice_transcripts:
|
||||
await quote.render(ctx, chat_id, target_draft, fresh=False)
|
||||
await ctx.send(
|
||||
chat_id,
|
||||
f"📎 پیش‌فاکتور «{saved_meta['file_name']}» با موفقیت ذخیره و به استعلام ضمیمه شد ✅",
|
||||
reply_to=message_id,
|
||||
)
|
||||
return
|
||||
|
||||
if not proforma_attached and not text and not voice_transcripts:
|
||||
await ctx.send(
|
||||
chat_id,
|
||||
"⚠️ برای ویرایش پیش‌نویس، لطفاً تغییرات را به صورت متن یا پیام صوتی (ویس) ارسال کنید، یا فایل پیش‌فاکتور را بفرستید.",
|
||||
reply_to=message_id,
|
||||
)
|
||||
return
|
||||
|
||||
# =========================================================================
|
||||
# BRANCH 2: NEW QUOTE MODE — Messages without reply
|
||||
# =========================================================================
|
||||
else:
|
||||
target_draft = None
|
||||
|
||||
if _is_audio(message):
|
||||
voice_transcripts = await _extract_voice()
|
||||
if not voice_transcripts:
|
||||
return
|
||||
text = voice_transcripts[0]["text"]
|
||||
elif text:
|
||||
source = "text"
|
||||
else:
|
||||
await ctx.send(
|
||||
chat_id,
|
||||
"⚠️ برای ثبت استعلام خرید جدید، لطفاً اقلام و مشخصات را به صورت پیام متنی یا پیام صوتی (ویس) ارسال فرمایید.",
|
||||
reply_to=message_id,
|
||||
)
|
||||
return
|
||||
|
||||
draft_summary = _draft_summary(target_draft) if target_draft else None
|
||||
input_payload = voice_transcripts if voice_transcripts else text
|
||||
result = await understand(settings, input_payload, draft_summary)
|
||||
intent, patch = result.get("intent"), result.get("patch") or {}
|
||||
consensus_text = result.get("consensus_text") or text
|
||||
|
||||
if source == "voice":
|
||||
await ctx._log(chat_id, "in", "voice", consensus_text)
|
||||
|
||||
logger.info("chat %s intent=%s conf=%s consensus=%r (is_edit=%s)",
|
||||
chat_id, intent, result.get("confidence"), consensus_text[:40], target_draft is not None)
|
||||
|
||||
if intent in ("register_quote", "update_draft"):
|
||||
await quote.handle_entities(
|
||||
ctx, chat_id, user, patch, source,
|
||||
incoming_msg_id=message_id,
|
||||
target_draft=target_draft,
|
||||
)
|
||||
elif intent == "commit_draft":
|
||||
active = target_draft or await draft_store.get_active(chat_id)
|
||||
if active is None:
|
||||
await ctx.send(chat_id, NOTHING_TO_COMMIT, reply_to=message_id)
|
||||
elif active.kind == draft_store.KIND_QUOTE:
|
||||
await quote.commit(ctx, chat_id, user, active)
|
||||
elif active.kind == draft_store.KIND_SUPPLIER:
|
||||
await supplier.commit(ctx, chat_id, user, active)
|
||||
elif active.kind == draft_store.KIND_MATERIAL:
|
||||
await material.commit(ctx, chat_id, user, active)
|
||||
elif intent == "discard_draft":
|
||||
active = target_draft or await draft_store.get_active(chat_id)
|
||||
if active:
|
||||
await draft_store.set_status(active.id, "cancelled")
|
||||
if active.review_message_id:
|
||||
try:
|
||||
await ctx.delete(chat_id, active.review_message_id)
|
||||
except Exception:
|
||||
pass
|
||||
ctx.pending.pop(chat_id, None)
|
||||
await ctx.send(chat_id, CANCELLED, reply_to=message_id)
|
||||
elif intent == "show_draft":
|
||||
active = target_draft or await draft_store.get_active(chat_id)
|
||||
if active is None:
|
||||
await ctx.send(chat_id, NOTHING_TO_COMMIT, reply_to=message_id)
|
||||
elif active.kind == draft_store.KIND_QUOTE:
|
||||
await quote.render(ctx, chat_id, active, fresh=False)
|
||||
elif active.kind == draft_store.KIND_SUPPLIER:
|
||||
await supplier.render(ctx, chat_id, active)
|
||||
elif active.kind == draft_store.KIND_MATERIAL:
|
||||
await material.render(ctx, chat_id, active)
|
||||
elif intent == "add_supplier":
|
||||
await supplier.handle_entities(ctx, chat_id, user, patch, source)
|
||||
elif intent == "add_material":
|
||||
await material.handle_entities(ctx, chat_id, user, patch, source)
|
||||
elif intent == "status_query":
|
||||
await queries.handle_query(ctx, chat_id, user, patch)
|
||||
elif intent == "accept_quote":
|
||||
await decisions.start_accept(ctx, chat_id, user, patch)
|
||||
elif intent == "arrive_items":
|
||||
await decisions.start_arrive(ctx, chat_id, user, patch)
|
||||
else:
|
||||
await ctx.send(chat_id, UNKNOWN_HINT)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# helpers
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
async def _gate(ctx: BotContext, chat_id: int, message: dict) -> LinkedUser | None:
|
||||
"""Link or admin gate. Returns None when the message was consumed by linking."""
|
||||
from . import links
|
||||
|
||||
link = await ctx.links.get(chat_id)
|
||||
if link and link.user_id:
|
||||
return LinkedUser(chat_id, link.user_id, link.display_name, link.role, is_admin=False)
|
||||
if chat_id in ctx.admin_chat_ids:
|
||||
return LinkedUser(chat_id, None, None, None, is_admin=True)
|
||||
|
||||
flow = ctx.pending.get(chat_id)
|
||||
if flow and flow.kind == "link_password":
|
||||
await links.finish_link(ctx, chat_id, flow, text=None, password=message.get("text") or "")
|
||||
return None
|
||||
if flow and flow.kind == "link_username":
|
||||
await links.finish_username_step(ctx, chat_id, flow, message.get("text") or "")
|
||||
return None
|
||||
await ctx.send(chat_id, LINK_START)
|
||||
ctx.pending.set(chat_id, "link_username", {})
|
||||
return None
|
||||
|
||||
|
||||
async def _route_to_flow(ctx: BotContext, chat_id: int, flow, text: str) -> bool:
|
||||
from . import links, decisions
|
||||
|
||||
if flow.kind == "link_username":
|
||||
await links.finish_username_step(ctx, chat_id, flow, text)
|
||||
return True
|
||||
if flow.kind == "link_password":
|
||||
await links.finish_link(ctx, chat_id, flow, text=text, password=text)
|
||||
return True
|
||||
if flow.kind == "quote_pick":
|
||||
await decisions.handle_quote_pick_text(ctx, chat_id, flow, text)
|
||||
return True
|
||||
if flow.kind in ("accept", "arrive_qty", "arrive_confirm"):
|
||||
return await decisions.handle_flow_text(ctx, chat_id, flow, text)
|
||||
return False
|
||||
|
||||
|
||||
def _draft_summary(draft) -> str | None:
|
||||
if draft is None:
|
||||
return None
|
||||
import json
|
||||
|
||||
payload = draft.payload or {}
|
||||
if draft.kind == draft_store.KIND_QUOTE:
|
||||
items = ", ".join(
|
||||
f"{it.get('material_name') or '?'}"
|
||||
+ (f" {it.get('quantity')}" if it.get("quantity") else "")
|
||||
+ (f" {it.get('unit_name')}" if it.get("unit_name") else "")
|
||||
for it in payload.get("items") or []
|
||||
)
|
||||
summary = (
|
||||
f"kind=quote; supplier={payload.get('supplier_name') or '?'}; project={payload.get('project_name') or '?'}; "
|
||||
f"items=[{items}]; terms={[t.get('label') for t in payload.get('termsheets') or []]}"
|
||||
)
|
||||
elif draft.kind == draft_store.KIND_SUPPLIER:
|
||||
summary = f"kind=add_supplier; name={payload.get('name') or '?'}; category={payload.get('category_name') or '?'}"
|
||||
elif draft.kind == draft_store.KIND_MATERIAL:
|
||||
summary = f"kind=add_material; name={payload.get('name') or '?'}; unit={payload.get('unit_name') or '?'}"
|
||||
else:
|
||||
summary = json.dumps(payload, ensure_ascii=False)[:500]
|
||||
return summary
|
||||
@@ -1,107 +0,0 @@
|
||||
"""Inline-button routing (callback_query).
|
||||
|
||||
Data grammar (≤64 bytes): op:{arg}:{d8} / pk:{d8}:{field}:{idx} / qc:{idx}
|
||||
/ ac:{op}[:{i}] / ar:{op} — full state lives in bot_drafts / pending flows.
|
||||
"""
|
||||
import logging
|
||||
|
||||
from app import drafts as draft_store
|
||||
from app.runtime import LinkedUser
|
||||
from app.texts import CANCELLED, UNLINKED, esc
|
||||
|
||||
from . import quote, supplier, material, decisions
|
||||
|
||||
logger = logging.getLogger("bot.callbacks")
|
||||
|
||||
|
||||
async def handle_callback(ctx, cq: dict) -> None:
|
||||
chat_id = ((cq.get("message") or {}).get("chat") or {}).get("id")
|
||||
data = cq.get("data") or ""
|
||||
if chat_id is None:
|
||||
return
|
||||
try:
|
||||
await _dispatch(ctx, chat_id, data, cq)
|
||||
except Exception:
|
||||
logger.exception("callback failed: %s", data)
|
||||
await ctx.send(chat_id, "خطا در پردازش دکمه؛ دوباره تلاش کن.")
|
||||
finally:
|
||||
await ctx.bale.answer_callback_query(cq.get("id"), None)
|
||||
|
||||
|
||||
async def _gate(ctx, chat_id: int) -> LinkedUser | None:
|
||||
link = await ctx.links.get(chat_id)
|
||||
if link and link.user_id:
|
||||
return LinkedUser(chat_id, link.user_id, link.display_name, link.role, is_admin=False)
|
||||
if chat_id in ctx.admin_chat_ids:
|
||||
return LinkedUser(chat_id, None, None, None, is_admin=True)
|
||||
await ctx.send(chat_id, UNLINKED)
|
||||
return None
|
||||
|
||||
|
||||
async def _dispatch(ctx, chat_id: int, data: str, cq: dict) -> None:
|
||||
user = await _gate(ctx, chat_id)
|
||||
if user is None:
|
||||
return
|
||||
parts = data.split(":")
|
||||
|
||||
# ---- pending-flow buttons (accept / arrive / quote pick) ---------------
|
||||
if parts[0] == "qc" and len(parts) == 2:
|
||||
flow = ctx.pending.get(chat_id)
|
||||
if flow and flow.kind == "quote_pick":
|
||||
await decisions.apply_quote_pick(ctx, chat_id, user, flow, int(parts[1]))
|
||||
return
|
||||
if parts[0] == "ac":
|
||||
await decisions.handle_accept_callback(ctx, chat_id, user, parts)
|
||||
return
|
||||
if parts[0] == "ar":
|
||||
await decisions.handle_arrive_callback(ctx, chat_id, user, parts)
|
||||
return
|
||||
|
||||
# ---- pick a candidate for a draft field -------------------------------
|
||||
if parts[0] == "pk" and len(parts) == 4:
|
||||
draft = await draft_store.get_by_prefix(parts[1], chat_id)
|
||||
if draft is None:
|
||||
await ctx.send(chat_id, "این پیش‌نویس دیگر معتبر نیست.")
|
||||
return
|
||||
await _apply_pick(ctx, chat_id, user, draft, parts[2], int(parts[3]))
|
||||
return
|
||||
|
||||
# ---- draft commit / cancel --------------------------------------------
|
||||
op, arg, prefix = parts[0], parts[1], parts[2] if len(parts) > 2 else ""
|
||||
if op in ("q", "s", "m") and arg in ("ok", "ok2", "no"):
|
||||
kind = {"q": draft_store.KIND_QUOTE, "s": draft_store.KIND_SUPPLIER, "m": draft_store.KIND_MATERIAL}[op]
|
||||
draft = await draft_store.get_by_prefix(prefix, chat_id)
|
||||
if draft is None or draft.kind != kind:
|
||||
await ctx.send(chat_id, "این پیش‌نویس دیگر معتبر نیست.")
|
||||
return
|
||||
if arg == "no":
|
||||
await draft_store.set_status(draft.id, "cancelled")
|
||||
ctx.pending.pop(chat_id, None)
|
||||
if draft.review_message_id:
|
||||
try:
|
||||
await ctx.bale.edit_message_text(chat_id, draft.review_message_id, "❌ این پیش‌نویس لغو شد.", reply_markup=None)
|
||||
await draft_store.set_bale_updated_at(draft.id)
|
||||
except Exception:
|
||||
pass
|
||||
await ctx.send(chat_id, CANCELLED)
|
||||
return
|
||||
if kind == draft_store.KIND_QUOTE:
|
||||
await quote.commit(ctx, chat_id, user, draft, only_resolved=(arg == "ok2"))
|
||||
elif kind == draft_store.KIND_SUPPLIER:
|
||||
await supplier.commit(ctx, chat_id, user, draft)
|
||||
else:
|
||||
await material.commit(ctx, chat_id, user, draft)
|
||||
|
||||
|
||||
async def _apply_pick(ctx, chat_id: int, user: LinkedUser, draft, field: str, idx: int) -> None:
|
||||
options = (draft.payload.get("options") or {}).get(field) or []
|
||||
if idx < 0 or idx >= len(options):
|
||||
await ctx.send(chat_id, "گزینه نامعتبر است.")
|
||||
return
|
||||
choice = options[idx]
|
||||
if draft.kind == draft_store.KIND_QUOTE:
|
||||
await quote.apply_pick(ctx, chat_id, user, draft, field, choice)
|
||||
elif draft.kind == draft_store.KIND_SUPPLIER:
|
||||
await supplier.apply_pick(ctx, chat_id, user, draft, field, choice)
|
||||
elif draft.kind == draft_store.KIND_MATERIAL:
|
||||
await material.apply_pick(ctx, chat_id, user, draft, field, choice)
|
||||
@@ -1,82 +0,0 @@
|
||||
"""/commands — /start /help /drafts /cancel /whoami /unlink."""
|
||||
import logging
|
||||
|
||||
from app import drafts as draft_store
|
||||
from app.runtime import ROLE_FA
|
||||
from app.texts import CANCELLED, DRAFTS_EMPTY, DRAFTS_LIST_HEADER, HELP, UNLINKED, WELCOME, esc
|
||||
|
||||
logger = logging.getLogger("bot.commands")
|
||||
|
||||
KIND_FA = {"quote": "استعلام", "supplier": "تأمین‌کننده", "material": "کالا"}
|
||||
STATUS_FA = {"active": "باز", "committed": "ثبت‌شده", "cancelled": "لغوشده", "expired": "منقضی"}
|
||||
|
||||
|
||||
async def handle_command(ctx, chat_id: int, text: str) -> None:
|
||||
command = text.split()[0].split("@")[0].lower()
|
||||
if command == "/start":
|
||||
await _start(ctx, chat_id)
|
||||
elif command in ("/help", "/راهنما"):
|
||||
await ctx.send(chat_id, HELP)
|
||||
elif command == "/drafts":
|
||||
await _drafts(ctx, chat_id)
|
||||
elif command in ("/cancel", "/لغو"):
|
||||
await _cancel(ctx, chat_id)
|
||||
elif command == "/whoami":
|
||||
await _whoami(ctx, chat_id)
|
||||
elif command == "/unlink":
|
||||
await ctx.links.delete(chat_id)
|
||||
await ctx.send(chat_id, "اتصال قطع شد. برای اتصال دوباره /start بزن.")
|
||||
else:
|
||||
await ctx.send(chat_id, HELP)
|
||||
|
||||
|
||||
async def _start(ctx, chat_id: int) -> None:
|
||||
await ctx.send(chat_id, WELCOME)
|
||||
link = await ctx.links.get(chat_id)
|
||||
if not link or not link.user_id:
|
||||
if chat_id not in ctx.admin_chat_ids:
|
||||
await ctx.send(chat_id, "برای شروع، حساب خود را متصل کن — نام کاربری Casdoor را بفرست:")
|
||||
ctx.pending.set(chat_id, "link_username", {})
|
||||
|
||||
|
||||
async def _drafts(ctx, chat_id: int) -> None:
|
||||
from sqlalchemy import select
|
||||
|
||||
from app.db import SessionLocal
|
||||
from app.models import BotDraft
|
||||
|
||||
async with SessionLocal() as session:
|
||||
rows = (await session.execute(
|
||||
select(BotDraft)
|
||||
.where(BotDraft.chat_id == chat_id, BotDraft.status == "active")
|
||||
.order_by(BotDraft.updated_at.desc())
|
||||
)).scalars().all()
|
||||
if not rows:
|
||||
await ctx.send(chat_id, DRAFTS_EMPTY)
|
||||
return
|
||||
lines = [DRAFTS_LIST_HEADER]
|
||||
for d in rows:
|
||||
p = d.payload or {}
|
||||
title = p.get("supplier_name") or p.get("name") or "بدون عنوان"
|
||||
lines.append(f"• {KIND_FA.get(d.kind, d.kind)}: {esc(title)}")
|
||||
await ctx.send(chat_id, "\n".join(lines))
|
||||
|
||||
|
||||
async def _cancel(ctx, chat_id: int) -> None:
|
||||
ctx.pending.pop(chat_id)
|
||||
active = await draft_store.get_active(chat_id)
|
||||
if active:
|
||||
await draft_store.set_status(active.id, "cancelled")
|
||||
await ctx.send(chat_id, CANCELLED)
|
||||
|
||||
|
||||
async def _whoami(ctx, chat_id: int) -> None:
|
||||
link = await ctx.links.get(chat_id)
|
||||
if chat_id in ctx.admin_chat_ids:
|
||||
await ctx.send(chat_id, "حالت ادمین (بدون اتصال Casdoor).")
|
||||
return
|
||||
if not link or not link.user_id:
|
||||
await ctx.send(chat_id, UNLINKED)
|
||||
return
|
||||
role = ROLE_FA.get(link.role or "", link.role or "بدون نقش")
|
||||
await ctx.send(chat_id, f"اتصال: {esc(link.display_name)} — {role}")
|
||||
@@ -1,389 +0,0 @@
|
||||
"""Accept / arrive flows — always with an explicit confirmation step."""
|
||||
import logging
|
||||
import re
|
||||
|
||||
from app.api.client import ApiError
|
||||
from app.keyboards import accept_keyboard, arrive_keyboard, quote_pick_keyboard
|
||||
from app.nlu import normalize_digits
|
||||
from app.texts import (
|
||||
ACCEPT_DONE_TS, ACCEPT_REPORT, ARRIVE_REPORT, CANCELLED, ERR_GENERIC,
|
||||
QUOTE_NOT_FOUND, STATUS_FA, esc,
|
||||
)
|
||||
|
||||
logger = logging.getLogger("bot.decisions")
|
||||
|
||||
EXPAND = "supplier,line_items,termsheets"
|
||||
CONFIRM_WORDS = {"تایید", "تأیید", "ثبت", "ثبت کن", "اوکی", "اوکیه", "بله", "yes", "ok"}
|
||||
CANCEL_WORDS = {"لغو", "بی خیال", "بیخیال", "انصراف", "نه", "cancel"}
|
||||
|
||||
|
||||
def _norm(text: str) -> str:
|
||||
return (text or "").strip().lower().replace("\u200c", " ")
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# shared: pick a quote by supplier text
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
async def start_accept(ctx, chat_id, user, patch: dict) -> None:
|
||||
await _start_for_status(ctx, chat_id, user, patch, mode="accept", status="offered")
|
||||
|
||||
|
||||
async def start_arrive(ctx, chat_id, user, patch: dict) -> None:
|
||||
await _start_for_status(ctx, chat_id, user, patch, mode="arrive", status="accepted")
|
||||
|
||||
|
||||
async def _start_for_status(ctx, chat_id, user, patch: dict, mode: str, status: str) -> None:
|
||||
target = (patch.get("target") or {})
|
||||
q = target.get("supplier_name") or target.get("project_name") or target.get("quote_id")
|
||||
try:
|
||||
quotes, _ = await ctx.api.list_quotes(status=status, q=q, expand=EXPAND, page_size=10)
|
||||
except ApiError as exc:
|
||||
await ctx.send(chat_id, ERR_GENERIC.format(detail=esc(exc.message)))
|
||||
return
|
||||
if not quotes:
|
||||
await ctx.send(chat_id, QUOTE_NOT_FOUND.format(q=esc(q or "?")))
|
||||
return
|
||||
if len(quotes) == 1:
|
||||
if mode == "accept":
|
||||
await begin_accept(ctx, chat_id, user, quotes[0])
|
||||
else:
|
||||
await begin_arrive(ctx, chat_id, user, quotes[0])
|
||||
return
|
||||
pairs = [(_quote_label(qq), str(qq["id"])) for qq in quotes]
|
||||
flow = ctx.pending.set(chat_id, "quote_pick", {"mode": mode, "ids": [pid for _, pid in pairs]})
|
||||
flow.data["user_id"] = user.actor_id
|
||||
message = await ctx.send(chat_id, "چند مورد پیدا شد؛ کدام را می‌خواهی؟", reply_markup=quote_pick_keyboard(pairs))
|
||||
flow.data["message_id"] = (message or {}).get("message_id")
|
||||
|
||||
|
||||
def _quote_label(quote: dict) -> str:
|
||||
sup = (quote.get("supplier") or {}).get("name") or "—"
|
||||
return f"#{str(quote.get('id'))[:8]} {sup}"
|
||||
|
||||
|
||||
async def apply_quote_pick(ctx, chat_id, user, flow, idx: int) -> None:
|
||||
ids = flow.data.get("ids") or []
|
||||
ctx.pending.pop(chat_id)
|
||||
if idx < 0 or idx >= len(ids):
|
||||
await ctx.send(chat_id, "گزینه نامعتبر است.")
|
||||
return
|
||||
try:
|
||||
quote = await ctx.api.get_quote(ids[idx], expand=EXPAND, actor_id=user.actor_id)
|
||||
except ApiError as exc:
|
||||
await ctx.send(chat_id, ERR_GENERIC.format(detail=esc(exc.message)))
|
||||
return
|
||||
if flow.data.get("mode") == "arrive":
|
||||
await begin_arrive(ctx, chat_id, user, quote)
|
||||
else:
|
||||
await begin_accept(ctx, chat_id, user, quote)
|
||||
|
||||
|
||||
async def handle_quote_pick_text(ctx, chat_id, flow, text: str) -> None:
|
||||
if _norm(text) in CANCEL_WORDS:
|
||||
ctx.pending.pop(chat_id)
|
||||
await ctx.send(chat_id, CANCELLED)
|
||||
return
|
||||
numbers = re.findall(r"\d+", normalize_digits(text))
|
||||
if numbers:
|
||||
await apply_quote_pick(ctx, chat_id, _flow_user(flow), flow, int(numbers[0]) - 1)
|
||||
else:
|
||||
await ctx.send(chat_id, "شماره مورد را بفرست یا از دکمه‌ها استفاده کن.")
|
||||
|
||||
|
||||
def _flow_user(flow):
|
||||
from app.runtime import LinkedUser
|
||||
return LinkedUser(chat_id=None, user_id=flow.data.get("user_id"), display_name=None,
|
||||
role=None, is_admin=False)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# accept
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def _accept_summary(quote: dict, chosen: int) -> str:
|
||||
lines = [
|
||||
f"✔️ پذیرش استعلام #{esc(str(quote.get('id'))[:8])} — {esc((quote.get('supplier') or {}).get('name') or '—')}",
|
||||
"",
|
||||
"اقلام:",
|
||||
]
|
||||
for li in quote.get("line_items") or []:
|
||||
mat = (li.get("material") or {}).get("name") or li.get("material_id") or "?"
|
||||
unit = ((li.get("unit") or {}).get("name_fa")) or ""
|
||||
price = li.get("unit_price")
|
||||
parts = [f"• {esc(mat)} — مقدار {esc(li.get('quantity'))} {unit}"]
|
||||
if price:
|
||||
parts.append(f"قیمت {esc(price)}")
|
||||
lines.append(" — ".join(parts))
|
||||
lines.append("")
|
||||
lines.append("شرایط پرداخت:")
|
||||
for i, ts in enumerate(quote.get("termsheets") or []):
|
||||
mark = "👉" if i == chosen else " "
|
||||
discount = f" (تخفیف {esc(ts.get('discount_value'))})" if ts.get("discount_value") else ""
|
||||
lines.append(f"{mark} [{i + 1}] {esc(ts.get('label'))}{discount} — {len(ts.get('schedule_steps') or [])} مرحله")
|
||||
lines.append("")
|
||||
lines.append("شرایط را انتخاب کن و پذیرش را تأیید کن.")
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
async def begin_accept(ctx, chat_id, user, quote: dict) -> None:
|
||||
termsheets = quote.get("termsheets") or []
|
||||
if not termsheets:
|
||||
await ctx.send(chat_id, "این استعلام شرایط پرداخت ندارد؛ اول در برنامه ثبت کن.")
|
||||
return
|
||||
if not quote.get("line_items"):
|
||||
await ctx.send(chat_id, "این استعلام قلم ندارد.")
|
||||
return
|
||||
flow = ctx.pending.set(chat_id, "accept", {
|
||||
"quote_id": str(quote["id"]),
|
||||
"quote_snapshot": {
|
||||
"id": quote.get("id"),
|
||||
"supplier": quote.get("supplier"),
|
||||
"line_items": quote.get("line_items") or [],
|
||||
},
|
||||
"termsheets": termsheets,
|
||||
"chosen": 0,
|
||||
"user_id": user.actor_id,
|
||||
})
|
||||
text = _accept_summary(quote, 0)
|
||||
message = await ctx.send(chat_id, text, reply_markup=accept_keyboard([ts.get("label") or "?" for ts in termsheets]))
|
||||
flow.data["message_id"] = (message or {}).get("message_id")
|
||||
|
||||
|
||||
async def handle_accept_callback(ctx, chat_id, user, parts) -> None:
|
||||
flow = ctx.pending.get(chat_id)
|
||||
if not flow or flow.kind != "accept":
|
||||
await ctx.send(chat_id, "این عملیات منقضی شده؛ دوباره درخواست بده.")
|
||||
return
|
||||
op = parts[1] if len(parts) > 1 else ""
|
||||
if op == "no":
|
||||
ctx.pending.pop(chat_id)
|
||||
await ctx.send(chat_id, CANCELLED)
|
||||
return
|
||||
if op == "ts" and len(parts) == 3:
|
||||
idx = int(parts[2])
|
||||
if 0 <= idx < len(flow.data["termsheets"]):
|
||||
flow.data["chosen"] = idx
|
||||
await ctx.edit(chat_id, flow.data.get("message_id"),
|
||||
_accept_summary(flow.data["quote_snapshot"], idx),
|
||||
reply_markup=accept_keyboard([ts.get("label") or "?" for ts in flow.data["termsheets"]]))
|
||||
return
|
||||
if op == "ok":
|
||||
await _commit_accept(ctx, chat_id, user, flow)
|
||||
|
||||
|
||||
async def _commit_accept(ctx, chat_id, user, flow) -> None:
|
||||
data = flow.data
|
||||
quote_id = data["quote_id"]
|
||||
termsheets = data["termsheets"]
|
||||
ts_index = data.get("chosen", 0)
|
||||
if not 0 <= ts_index < len(termsheets):
|
||||
await ctx.send(chat_id, "شرایط پرداخت انتخاب نشده است.")
|
||||
return
|
||||
ts = termsheets[ts_index]
|
||||
steps = ts.get("schedule_steps") or []
|
||||
if not steps:
|
||||
await ctx.send(chat_id, "ترم‌شیت انتخابی مرحله پرداخت ندارد؛ در برنامه تکمیلش کن.")
|
||||
return
|
||||
|
||||
try:
|
||||
quote = await ctx.api.get_quote(quote_id, expand=EXPAND, actor_id=user.actor_id)
|
||||
except ApiError as exc:
|
||||
await ctx.send(chat_id, ERR_GENERIC.format(detail=esc(exc.message)))
|
||||
return
|
||||
|
||||
decisions_payload = []
|
||||
problems = []
|
||||
for li in quote.get("line_items") or []:
|
||||
decision = li.get("decision") or {}
|
||||
if decision.get("status") == "rejected":
|
||||
continue
|
||||
price = li.get("unit_price")
|
||||
if not price:
|
||||
problems.append(f"قیمت قلم «{(li.get('material') or {}).get('name') or '?'}» ثبت نشده")
|
||||
continue
|
||||
li_projects = li.get("projects") or []
|
||||
project_id = li_projects[0]["id"] if len(li_projects) == 1 else quote.get("project_id")
|
||||
decisions_payload.append({
|
||||
"line_item_id": li["id"],
|
||||
"status": "chosen",
|
||||
"accepted_termsheet_index": 0,
|
||||
"adjusted_unit_price": price,
|
||||
"project_id": project_id,
|
||||
})
|
||||
if problems:
|
||||
await ctx.send(chat_id, "پذیرش ممکن نیست:\n" + "\n".join(f"❌ {esc(p)}" for p in problems))
|
||||
return
|
||||
if not decisions_payload:
|
||||
await ctx.send(chat_id, "قلم قابل پذیرشی نیست (همه رد شده‌اند؟).")
|
||||
return
|
||||
|
||||
payload = {
|
||||
"accepted_termsheets": [{
|
||||
"id": ts["id"],
|
||||
"label": ts.get("label"),
|
||||
"discount_type": ts.get("discount_type") or "none",
|
||||
"discount_value": ts.get("discount_value") or 0,
|
||||
"schedule_steps": steps,
|
||||
}],
|
||||
"item_decisions": decisions_payload,
|
||||
}
|
||||
try:
|
||||
result = await ctx.api.accept_quote(quote_id, payload, actor_id=user.actor_id)
|
||||
except ApiError as exc:
|
||||
await ctx.send(chat_id, ERR_GENERIC.format(detail=esc(exc.message)))
|
||||
return
|
||||
ctx.pending.pop(chat_id)
|
||||
chosen_label = ts.get("label") or ""
|
||||
await ctx.send(chat_id, ACCEPT_REPORT.format(
|
||||
id=esc(str(result.get("id"))[:8]),
|
||||
status=STATUS_FA.get(result.get("status"), result.get("status")),
|
||||
count=len(decisions_payload),
|
||||
) + "\n" + ACCEPT_DONE_TS.format(label=esc(chosen_label)))
|
||||
|
||||
|
||||
async def handle_flow_text(ctx, chat_id, flow, text: str) -> bool:
|
||||
if flow.kind == "accept":
|
||||
norm = _norm(text)
|
||||
if norm in CANCEL_WORDS:
|
||||
ctx.pending.pop(chat_id)
|
||||
await ctx.send(chat_id, CANCELLED)
|
||||
return True
|
||||
if any(word in norm for word in ("تایید", "تأیید", "ثبت", "اوکی", "ok", "yes")):
|
||||
await _commit_accept(ctx, chat_id, _flow_user(flow), flow)
|
||||
return True
|
||||
await ctx.send(chat_id, "برای پذیرش از دکمه‌ها استفاده کن (یا /cancel).")
|
||||
return True
|
||||
if flow.kind == "arrive_qty":
|
||||
await _handle_arrive_quantities(ctx, chat_id, flow, text)
|
||||
return True
|
||||
if flow.kind == "arrive_confirm":
|
||||
norm = _norm(text)
|
||||
if any(word in norm for word in ("تایید", "تأیید", "ثبت", "اوکی", "ok", "yes")):
|
||||
await _commit_arrive(ctx, chat_id, _flow_user(flow), flow)
|
||||
return True
|
||||
if norm in CANCEL_WORDS:
|
||||
ctx.pending.pop(chat_id)
|
||||
await ctx.send(chat_id, CANCELLED)
|
||||
return True
|
||||
await ctx.send(chat_id, "با دکمه‌ها تأیید یا لغو کن (یا /cancel).")
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# arrive (partial deliveries)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def _arrive_summary(items: list[dict], quantities: dict[str, float] | None = None) -> str:
|
||||
lines = ["🚚 اعلام رسیدن اقلام", ""]
|
||||
for li in items:
|
||||
mat = (li.get("material") or {}).get("name") or "?"
|
||||
ordered = li.get("quantity") or 0
|
||||
received = ((li.get("receipt") or {}).get("received_qty")) or 0
|
||||
unit = ((li.get("unit") or {}).get("name_fa")) or ""
|
||||
got = ""
|
||||
if quantities and li["id"] in quantities:
|
||||
got = f" → الان: {esc(quantities[li['id']])} {unit}"
|
||||
lines.append(f"• {esc(mat)} — سفارش {esc(ordered)} {unit} — تاکنون {esc(received)}{got}")
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
async def begin_arrive(ctx, chat_id, user, quote: dict) -> None:
|
||||
items = [li for li in quote.get("line_items") or [] if (li.get("decision") or {}).get("status") == "chosen"]
|
||||
if not items:
|
||||
await ctx.send(chat_id, "قلم پذیرفته‌شده‌ای برای تحویل نیست.")
|
||||
return
|
||||
flow = ctx.pending.set(chat_id, "arrive_qty", {
|
||||
"quote_id": str(quote["id"]),
|
||||
"items": [{"id": li["id"], "name": (li.get("material") or {}).get("name") or "?",
|
||||
"ordered": li.get("quantity"), "unit": ((li.get("unit") or {}).get("name_fa")) or "",
|
||||
"received": ((li.get("receipt") or {}).get("received_qty")) or 0} for li in items],
|
||||
"user_id": user.actor_id,
|
||||
})
|
||||
text = (
|
||||
f"استعلام #{esc(str(quote.get('id'))[:8])} — {esc((quote.get('supplier') or {}).get('name') or '—')}\n"
|
||||
+ _arrive_summary(quote.get("line_items") or [])
|
||||
+ "\n\nمقادیر رسیده را به ترتیب اقلام بفرست (مثلاً: «500 و 200»)، یا «تحویل کامل همه» را بزن."
|
||||
)
|
||||
message = await ctx.send(chat_id, text, reply_markup=arrive_keyboard())
|
||||
flow.data["message_id"] = (message or {}).get("message_id")
|
||||
|
||||
|
||||
async def _handle_arrive_quantities(ctx, chat_id, flow, text: str) -> None:
|
||||
numbers = [float(n) for n in re.findall(r"\d+(?:\.\d+)?", normalize_digits(text))]
|
||||
items = flow.data["items"]
|
||||
if not numbers:
|
||||
await ctx.send(chat_id, "مقادیر را عددی بفرست، مثل «500 و 200»، یا از دکمه‌ها استفاده کن.")
|
||||
return
|
||||
if len(numbers) == 1 and len(items) > 1:
|
||||
await ctx.send(chat_id, f"{len(items)} قلم است؛ برای هر قلم یک عدد بفرست (به ترتیب).")
|
||||
return
|
||||
if len(numbers) != len(items):
|
||||
await ctx.send(chat_id, "تعداد اعداد با تعداد اقلام نمی‌خواند؛ دوباره بفرست.")
|
||||
return
|
||||
quantities = {item["id"]: qty for item, qty in zip(items, numbers)}
|
||||
flow.kind = "arrive_confirm"
|
||||
flow.data["quantities"] = quantities
|
||||
await ctx.edit(chat_id, flow.data.get("message_id"),
|
||||
_arrive_summary(_items_with_details(flow.data["items"]), quantities)
|
||||
+ "\n\nتأیید می‌کنی؟",
|
||||
reply_markup=arrive_keyboard())
|
||||
|
||||
|
||||
def _items_with_details(items: list[dict]) -> list[dict]:
|
||||
return [{
|
||||
"id": it["id"],
|
||||
"material": {"name": it["name"]},
|
||||
"quantity": it["ordered"],
|
||||
"unit": {"name_fa": it["unit"]},
|
||||
"receipt": {"received_qty": it["received"]},
|
||||
} for it in items]
|
||||
|
||||
|
||||
async def handle_arrive_callback(ctx, chat_id, user, parts) -> None:
|
||||
flow = ctx.pending.get(chat_id)
|
||||
if not flow or not flow.kind.startswith("arrive"):
|
||||
await ctx.send(chat_id, "این عملیات منقضی شده؛ دوباره درخواست بده.")
|
||||
return
|
||||
op = parts[1] if len(parts) > 1 else ""
|
||||
if op == "no":
|
||||
ctx.pending.pop(chat_id)
|
||||
await ctx.send(chat_id, CANCELLED)
|
||||
return
|
||||
if op == "full":
|
||||
quantities = {item["id"]: max(float(item["ordered"] or 0) - float(item["received"] or 0), 0) for item in flow.data["items"]}
|
||||
if any(v <= 0 for v in quantities.values()):
|
||||
await ctx.send(chat_id, "برای بعضی اقلام چیزی برای تحویل نمانده؛ مقادیر را دستی بفرست.")
|
||||
return
|
||||
flow.kind = "arrive_confirm"
|
||||
flow.data["quantities"] = quantities
|
||||
await ctx.edit(chat_id, flow.data.get("message_id"),
|
||||
_arrive_summary(_items_with_details(flow.data["items"]), quantities)
|
||||
+ "\n\nتأیید می‌کنی؟",
|
||||
reply_markup=arrive_keyboard())
|
||||
return
|
||||
if op == "ok":
|
||||
if flow.kind != "arrive_confirm" or not flow.data.get("quantities"):
|
||||
await ctx.send(chat_id, "اول مقادیر رسیده را بفرست یا «تحویل کامل همه» را بزن.")
|
||||
return
|
||||
await _commit_arrive(ctx, chat_id, user, flow)
|
||||
|
||||
|
||||
async def _commit_arrive(ctx, chat_id, user, flow) -> None:
|
||||
quantities: dict = flow.data["quantities"]
|
||||
payload = {"items": [{"line_item_id": li_id, "received_qty": qty} for li_id, qty in quantities.items()]}
|
||||
try:
|
||||
result = await ctx.api.arrive_items(flow.data["quote_id"], payload, actor_id=user.actor_id)
|
||||
except ApiError as exc:
|
||||
await ctx.send(chat_id, ERR_GENERIC.format(detail=esc(exc.message)))
|
||||
return
|
||||
ctx.pending.pop(chat_id)
|
||||
lines = []
|
||||
for item in result.get("items") or []:
|
||||
lines.append(f"• قلم {esc(str(item.get('line_item_id'))[:8])} — {esc(item.get('received_qty'))} ثبت شد")
|
||||
await ctx.send(chat_id, ARRIVE_REPORT.format(
|
||||
id=esc(str(result.get("id"))[:8]),
|
||||
status=STATUS_FA.get(result.get("status"), result.get("status")),
|
||||
lines="\n".join(lines) or "—",
|
||||
))
|
||||
@@ -1,46 +0,0 @@
|
||||
"""Casdoor linking: chat ↔ ERP user (validated through the real login endpoint)."""
|
||||
import logging
|
||||
|
||||
from app.api.client import ApiError
|
||||
from app.runtime import ROLE_FA
|
||||
from app.texts import LINK_ASK_PASSWORD, LINK_FAIL, LINK_OK, esc
|
||||
|
||||
logger = logging.getLogger("bot.links")
|
||||
|
||||
|
||||
async def finish_username_step(ctx, chat_id: int, flow, text: str) -> None:
|
||||
username = (text or "").strip()
|
||||
if not username or username.startswith("/"):
|
||||
ctx.pending.pop(chat_id)
|
||||
return
|
||||
flow.kind = "link_password"
|
||||
flow.data["username"] = username
|
||||
await ctx.send(chat_id, LINK_ASK_PASSWORD)
|
||||
|
||||
|
||||
async def finish_link(ctx, chat_id: int, flow, text: str | None, password: str) -> None:
|
||||
username = flow.data.get("username") or ""
|
||||
ctx.pending.pop(chat_id)
|
||||
if not password or password.startswith("/"):
|
||||
return
|
||||
try:
|
||||
data = await ctx.api.login(username, password)
|
||||
except ApiError as exc:
|
||||
await ctx.send(chat_id, LINK_FAIL.format(detail=esc(exc.message)))
|
||||
return
|
||||
except Exception as exc: # network etc.
|
||||
logger.exception("login failed")
|
||||
await ctx.send(chat_id, LINK_FAIL.format(detail=esc(str(exc)[:200])))
|
||||
return
|
||||
|
||||
user = data.get("user") or {}
|
||||
display = " ".join(x for x in [user.get("first_name"), user.get("last_name")] if x) or username
|
||||
await ctx.links.upsert(
|
||||
chat_id=chat_id,
|
||||
user_id=user.get("id"),
|
||||
username=username,
|
||||
display_name=display,
|
||||
role=user.get("role"),
|
||||
)
|
||||
role_fa = ROLE_FA.get(user.get("role") or "", user.get("role") or "بدون نقش")
|
||||
await ctx.send(chat_id, LINK_OK.format(name=esc(display), role=role_fa))
|
||||
@@ -1,98 +0,0 @@
|
||||
"""Add-material flow: name + canonical unit (required)."""
|
||||
import logging
|
||||
|
||||
from app import drafts as draft_store
|
||||
from app.api.client import ApiError
|
||||
from app.drafts import (
|
||||
KIND_MATERIAL, merge_material_patch, material_missing, new_material_payload,
|
||||
)
|
||||
from app.keyboards import pick_buttons, simple_review_keyboard
|
||||
from app.resolve import safe_resolve
|
||||
from app.texts import ERR_GENERIC, esc, material_committed_report, material_review_text
|
||||
|
||||
logger = logging.getLogger("bot.material")
|
||||
|
||||
|
||||
async def handle_entities(ctx, chat_id, user, patch: dict, source: str | None) -> None:
|
||||
draft = await draft_store.get_active(chat_id, KIND_MATERIAL)
|
||||
if draft is not None:
|
||||
payload = draft.payload
|
||||
merge_material_patch(payload, patch)
|
||||
else:
|
||||
payload = new_material_payload()
|
||||
merge_material_patch(payload, patch)
|
||||
draft = await draft_store.create(chat_id, KIND_MATERIAL, payload, source=source)
|
||||
await resolve_payload(ctx, payload)
|
||||
await draft_store.save_payload(draft, missing={"fields": material_missing(payload)})
|
||||
await render(ctx, chat_id, draft, fresh=draft.review_message_id is None)
|
||||
|
||||
|
||||
async def resolve_payload(ctx, payload: dict) -> None:
|
||||
options = payload.setdefault("options", {})
|
||||
if not payload.get("canonical_unit_id") and payload.get("unit_name"):
|
||||
res = await safe_resolve(ctx.resolver, "unit", payload["unit_name"])
|
||||
if res.resolved:
|
||||
payload["canonical_unit_id"] = res.candidates[0].id
|
||||
payload["unit_name"] = res.candidates[0].name
|
||||
options.pop("unit", None)
|
||||
elif res.candidates:
|
||||
options["unit"] = [{"id": c.id, "name": c.name} for c in res.candidates]
|
||||
else:
|
||||
options.pop("unit", None)
|
||||
|
||||
|
||||
async def apply_pick(ctx, chat_id, user, draft, field: str, choice: dict) -> None:
|
||||
if field == "unit":
|
||||
draft.payload["canonical_unit_id"] = choice["id"]
|
||||
draft.payload["unit_name"] = choice["name"]
|
||||
draft.payload.setdefault("options", {}).pop("unit", None)
|
||||
await draft_store.save_payload(draft, missing={"fields": material_missing(draft.payload)})
|
||||
await render(ctx, chat_id, draft, fresh=False)
|
||||
|
||||
|
||||
def _keyboard(payload: dict, draft_id: str) -> dict:
|
||||
rows: list[list[dict]] = []
|
||||
options = (payload.get("options") or {}).get("unit") or []
|
||||
if options:
|
||||
rows += pick_buttons(draft_id, "unit", [o["name"] for o in options[:6]])
|
||||
return simple_review_keyboard(draft_id, KIND_MATERIAL, rows)
|
||||
|
||||
|
||||
async def render(ctx, chat_id, draft, fresh: bool = True) -> None:
|
||||
payload = draft.payload
|
||||
missing = material_missing(payload)
|
||||
text = material_review_text(payload, missing)
|
||||
keyboard = _keyboard(payload, draft.id)
|
||||
if fresh:
|
||||
message = await ctx.send(chat_id, text, reply_markup=keyboard)
|
||||
draft.review_message_id = (message or {}).get("message_id")
|
||||
await draft_store.save_payload(draft, missing={"fields": missing},
|
||||
review_message_id=draft.review_message_id)
|
||||
else:
|
||||
await ctx.edit(chat_id, draft.review_message_id, text, reply_markup=keyboard)
|
||||
await draft_store.save_payload(draft, missing={"fields": missing})
|
||||
|
||||
|
||||
async def commit(ctx, chat_id, user, draft) -> None:
|
||||
payload = draft.payload
|
||||
await resolve_payload(ctx, payload)
|
||||
missing = {m["key"]: m["ok"] for m in material_missing(payload)}
|
||||
problems = [label for key, label, ok in [
|
||||
("name", "نام کالا", missing.get("name")),
|
||||
("unit", "واحد اصلی", missing.get("unit")),
|
||||
] if not ok]
|
||||
if problems:
|
||||
await ctx.send(chat_id, "ثبت ممکن نیست؛ اول این‌ها را مشخص کن:\n" +
|
||||
"\n".join(f"❌ {esc(p)}" for p in problems))
|
||||
return
|
||||
body = {"name": payload["name"], "canonical_unit_id": int(payload["canonical_unit_id"])}
|
||||
if payload.get("topic"):
|
||||
body["topic"] = payload["topic"]
|
||||
try:
|
||||
created = await ctx.api.create_material(body, actor_id=user.actor_id)
|
||||
except ApiError as exc:
|
||||
await ctx.send(chat_id, ERR_GENERIC.format(detail=esc(exc.message)))
|
||||
return
|
||||
await draft_store.set_status(draft.id, "committed")
|
||||
ctx.resolver.invalidate("materials")
|
||||
await ctx.send(chat_id, material_committed_report(created))
|
||||
@@ -1,44 +0,0 @@
|
||||
"""Status queries: «استعلام‌های در انتظار؟»، «کدام‌ها منقضی می‌شوند؟» …"""
|
||||
import logging
|
||||
from datetime import date, timedelta
|
||||
|
||||
from app.api.client import ApiError
|
||||
from app.texts import ERR_GENERIC, status_report, esc
|
||||
|
||||
logger = logging.getLogger("bot.queries")
|
||||
|
||||
EXPAND = "supplier,line_items"
|
||||
|
||||
|
||||
async def handle_query(ctx, chat_id, user, patch: dict) -> None:
|
||||
query = patch.get("query") or {}
|
||||
kind = query.get("kind") or "pending"
|
||||
supplier_name = query.get("supplier_name")
|
||||
q = supplier_name or query.get("project_name")
|
||||
|
||||
try:
|
||||
if kind == "expiring":
|
||||
quotes, _ = await ctx.api.list_quotes(status="offered", expand=EXPAND,
|
||||
q=q, sort="-quote_date", page_size=100)
|
||||
deadline = date.today() + timedelta(days=query.get("days") or 7)
|
||||
soon = []
|
||||
for quote in quotes:
|
||||
expiry = (quote.get("expiry_date") or "")[:10]
|
||||
if expiry and expiry <= deadline.isoformat():
|
||||
soon.append(quote)
|
||||
soon.sort(key=lambda x: x.get("expiry_date") or "9999")
|
||||
await ctx.send(chat_id, status_report("expiring", soon[:10]))
|
||||
return
|
||||
|
||||
if kind in ("accepted", "arrived", "pending", "offered"):
|
||||
status = "offered" if kind == "pending" else kind
|
||||
quotes, _ = await ctx.api.list_quotes(status=status, expand=EXPAND, q=q,
|
||||
sort="-quote_date", page_size=10)
|
||||
await ctx.send(chat_id, status_report("pending" if kind == "offered" else kind, quotes))
|
||||
return
|
||||
|
||||
# recent / anything else
|
||||
quotes, meta = await ctx.api.list_quotes(expand=EXPAND, q=q, sort="-quote_date", page_size=5)
|
||||
await ctx.send(chat_id, status_report("recent", quotes))
|
||||
except ApiError as exc:
|
||||
await ctx.send(chat_id, ERR_GENERIC.format(detail=esc(exc.message)))
|
||||
@@ -1,349 +0,0 @@
|
||||
"""Register-quote flow: entities → draft → resolve → review (+missing) → commit."""
|
||||
import logging
|
||||
|
||||
from app import drafts as draft_store
|
||||
from app.api.client import ApiError
|
||||
from app.drafts import (
|
||||
KIND_QUOTE, build_quote_request, compute_quote_missing, merge_quote_patch,
|
||||
new_quote_payload, quote_ready,
|
||||
)
|
||||
from app.keyboards import quote_review_keyboard
|
||||
from app.resolve import safe_resolve
|
||||
from app.texts import ERR_GENERIC, quote_committed_report, quote_review_text, esc
|
||||
|
||||
logger = logging.getLogger("bot.quote")
|
||||
|
||||
FIELD_FA = {"sup": "تأمین‌کننده", "prj": "پروژه"}
|
||||
|
||||
|
||||
async def handle_entities(
|
||||
ctx, chat_id, user, patch: dict, source: str | None,
|
||||
incoming_msg_id: int | None = None,
|
||||
target_draft = None,
|
||||
) -> None:
|
||||
prev_review_msg_id = None
|
||||
if target_draft is not None:
|
||||
draft = target_draft
|
||||
prev_review_msg_id = draft.review_message_id
|
||||
draft.review_message_id = None
|
||||
payload = draft.payload
|
||||
merge_quote_patch(payload, patch)
|
||||
draft.source_message_id = incoming_msg_id
|
||||
else:
|
||||
payload = new_quote_payload()
|
||||
merge_quote_patch(payload, patch)
|
||||
draft = await draft_store.create(
|
||||
chat_id, KIND_QUOTE, payload, source=source, source_message_id=incoming_msg_id
|
||||
)
|
||||
|
||||
await resolve_payload(ctx, payload)
|
||||
|
||||
if prev_review_msg_id:
|
||||
try:
|
||||
await ctx.delete(chat_id, prev_review_msg_id)
|
||||
except Exception as e:
|
||||
logger.warning("Could not delete previous review message %s: %s", prev_review_msg_id, e)
|
||||
|
||||
await render(ctx, chat_id, draft, fresh=True, reply_to=incoming_msg_id)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# resolution
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
async def resolve_payload(ctx, payload: dict) -> None:
|
||||
options = payload.setdefault("options", {})
|
||||
|
||||
if not payload.get("supplier_id") and payload.get("supplier_name"):
|
||||
res = await safe_resolve(ctx.resolver, "supplier", payload["supplier_name"])
|
||||
if res.resolved:
|
||||
c = res.candidates[0]
|
||||
payload["supplier_id"] = c.id
|
||||
payload["supplier_name"] = c.name
|
||||
extra = c.extra or {}
|
||||
for k in ("location", "phone", "contact_person", "category_name"):
|
||||
if extra.get(k):
|
||||
payload[f"supplier_{k}"] = extra[k]
|
||||
options.pop("sup", None)
|
||||
elif res.candidates:
|
||||
options["sup"] = [{"id": c.id, "name": c.name} for c in res.candidates]
|
||||
else:
|
||||
options.pop("sup", None)
|
||||
|
||||
if not payload.get("project_id") and payload.get("project_name"):
|
||||
res = await safe_resolve(ctx.resolver, "project", payload["project_name"])
|
||||
if res.resolved:
|
||||
payload["project_id"] = res.candidates[0].id
|
||||
payload["project_name"] = res.candidates[0].name
|
||||
if payload["project_id"] not in payload.get("project_ids", []):
|
||||
payload.setdefault("project_ids", []).append(payload["project_id"])
|
||||
options.pop("prj", None)
|
||||
elif res.candidates:
|
||||
options["prj"] = [{"id": c.id, "name": c.name} for c in res.candidates]
|
||||
else:
|
||||
options.pop("prj", None)
|
||||
|
||||
for p_name in payload.get("project_names") or []:
|
||||
res = await safe_resolve(ctx.resolver, "project", p_name)
|
||||
if res.resolved:
|
||||
p_id = res.candidates[0].id
|
||||
if p_id not in payload.get("project_ids", []):
|
||||
payload.setdefault("project_ids", []).append(p_id)
|
||||
if not payload.get("project_id"):
|
||||
payload["project_id"] = p_id
|
||||
|
||||
for i, item in enumerate(payload.get("items") or [], start=1):
|
||||
if not item.get("material_id") and item.get("material_name"):
|
||||
res = await safe_resolve(ctx.resolver, "material", item["material_name"])
|
||||
if res.resolved:
|
||||
_set_material(item, res.candidates[0].id, res.candidates[0].name, res.candidates[0].extra)
|
||||
options.pop(f"mat{i}", None)
|
||||
elif res.candidates:
|
||||
options[f"mat{i}"] = [{"id": c.id, "name": c.name} for c in res.candidates]
|
||||
else:
|
||||
options.pop(f"mat{i}", None)
|
||||
if not item.get("unit_id"):
|
||||
await _resolve_unit(ctx, item)
|
||||
|
||||
|
||||
def _set_material(item: dict, material_id: str, name: str, extra: dict | None = None) -> None:
|
||||
item["material_id"] = material_id
|
||||
item["material_row"] = {"id": material_id, "canonical_unit_id": (extra or {}).get("canonical_unit_id")}
|
||||
|
||||
|
||||
async def _resolve_unit(ctx, item: dict) -> None:
|
||||
if item.get("unit_id"):
|
||||
return
|
||||
if item.get("unit_name"):
|
||||
res = await safe_resolve(ctx.resolver, "unit", item["unit_name"])
|
||||
if res.resolved:
|
||||
item["unit_id"] = res.candidates[0].id
|
||||
item["unit_explicit"] = True
|
||||
item["unit_name"] = res.candidates[0].name
|
||||
return
|
||||
canonical = ((item.get("material_row") or {}).get("canonical_unit_id"))
|
||||
if canonical:
|
||||
item["unit_id"] = str(canonical)
|
||||
item["unit_explicit"] = False
|
||||
|
||||
|
||||
async def apply_pick(ctx, chat_id, user, draft, field: str, choice: dict) -> None:
|
||||
payload = draft.payload
|
||||
options = payload.setdefault("options", {})
|
||||
options.pop(field, None)
|
||||
|
||||
if field == "sup":
|
||||
payload["supplier_id"] = choice["id"]
|
||||
payload["supplier_name"] = choice["name"]
|
||||
elif field == "prj":
|
||||
payload["project_id"] = choice["id"]
|
||||
payload["project_name"] = choice["name"]
|
||||
elif field.startswith("mat"):
|
||||
index = int(field[3:]) - 1
|
||||
items = payload.get("items") or []
|
||||
if 0 <= index < len(items):
|
||||
items[index]["material_name"] = choice["name"]
|
||||
_set_material(items[index], choice["id"], choice["name"])
|
||||
await _resolve_unit(ctx, items[index])
|
||||
elif field.startswith("unit"):
|
||||
index = int(field[4:]) - 1
|
||||
items = payload.get("items") or []
|
||||
if 0 <= index < len(items):
|
||||
items[index]["unit_id"] = choice["id"]
|
||||
items[index]["unit_explicit"] = True
|
||||
items[index]["unit_name"] = choice["name"]
|
||||
|
||||
await resolve_payload(ctx, payload)
|
||||
await draft_store.save_payload(draft, missing={"fields": compute_quote_missing(payload)})
|
||||
await render(ctx, chat_id, draft, fresh=False)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# rendering
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def _pick_rows(payload: dict) -> list[list[str]]:
|
||||
"""Field labels shown as pick-button rows (via keyboards.pick_buttons)."""
|
||||
rows: list[list[str]] = []
|
||||
options = payload.get("options") or {}
|
||||
if options.get("sup"):
|
||||
rows.append(["sup"] + [o["name"] for o in options["sup"]])
|
||||
if options.get("prj"):
|
||||
rows.append(["prj"] + [o["name"] for o in options["prj"]])
|
||||
for i, item in enumerate(payload.get("items") or [], start=1):
|
||||
if options.get(f"mat{i}"):
|
||||
rows.append([f"mat{i}"] + [o["name"] for o in options[f"mat{i}"]])
|
||||
if options.get(f"unit{i}"):
|
||||
rows.append([f"unit{i}"] + [o["name"] for o in options[f"unit{i}"]])
|
||||
return rows
|
||||
|
||||
|
||||
def _keyboard(payload: dict, draft_id: str, wizard_url: str | None = None) -> dict:
|
||||
from app.keyboards import pick_buttons
|
||||
|
||||
prefix = str(draft_id)[:8]
|
||||
pick_rows: list[list[dict]] = []
|
||||
for row in _pick_rows(payload):
|
||||
field, names = row[0], row[1:]
|
||||
pick_rows += pick_buttons(prefix, field, names[:6])
|
||||
ready_items = sum(
|
||||
1 for it in payload.get("items") or []
|
||||
if it.get("material_id") and it.get("quantity") and it.get("unit_id")
|
||||
)
|
||||
has_partial = 0 < ready_items < len(payload.get("items") or [])
|
||||
return quote_review_keyboard(prefix, pick_rows, has_partial_option=has_partial, wizard_url=wizard_url)
|
||||
|
||||
|
||||
async def render(ctx, chat_id, draft, fresh: bool = True, note: str | None = None,
|
||||
reply_to: int | None = None) -> None:
|
||||
from app.config import settings
|
||||
|
||||
from app.security import create_draft_token
|
||||
|
||||
payload = draft.payload
|
||||
missing = compute_quote_missing(payload)
|
||||
token = create_draft_token(
|
||||
draft.id,
|
||||
chat_id=chat_id,
|
||||
secret=settings.DRAFT_TOKEN_SECRET,
|
||||
expires_in=settings.DRAFT_TOKEN_EXPIRE_SECONDS,
|
||||
)
|
||||
wizard_url = f"{settings.FRONTEND_URL.rstrip('/')}/review?token={token}"
|
||||
text = quote_review_text(payload, missing, status_note=note)
|
||||
text += f"\n\n🖥 مشاهده و تکمیل در ویزارد:\n{wizard_url}"
|
||||
keyboard = _keyboard(payload, str(draft.id), wizard_url=wizard_url)
|
||||
if fresh:
|
||||
message = await ctx.send(chat_id, text, reply_markup=keyboard, reply_to=reply_to)
|
||||
new_review_id = (message or {}).get("message_id")
|
||||
if new_review_id:
|
||||
draft.review_message_id = new_review_id
|
||||
await draft_store.save_payload(
|
||||
draft,
|
||||
missing={"fields": missing},
|
||||
review_message_id=new_review_id,
|
||||
source_message_id=reply_to or draft.source_message_id,
|
||||
mark_bale_synced=True,
|
||||
)
|
||||
else:
|
||||
await draft_store.save_payload(
|
||||
draft,
|
||||
missing={"fields": missing},
|
||||
source_message_id=reply_to or draft.source_message_id,
|
||||
mark_bale_synced=True,
|
||||
)
|
||||
else:
|
||||
if not draft.review_message_id:
|
||||
return
|
||||
success = await ctx.edit(chat_id, draft.review_message_id, text, reply_markup=keyboard)
|
||||
if success:
|
||||
await draft_store.save_payload(draft, missing={"fields": missing}, mark_bale_synced=True)
|
||||
else:
|
||||
logger.warning("Could not edit review message %s for draft %s", draft.review_message_id, draft.id)
|
||||
await draft_store.set_bale_updated_at(draft.id)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# commit
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
async def commit(ctx, chat_id, user, draft, only_resolved: bool = False) -> None:
|
||||
payload = draft.payload
|
||||
await resolve_payload(ctx, payload)
|
||||
|
||||
# 1. Sequential pre-creation for new supplier if user wants to commit
|
||||
if not payload.get("supplier_id") and payload.get("supplier_name"):
|
||||
cat_id = payload.get("supplier_category_id")
|
||||
if not cat_id:
|
||||
cats = await ctx.resolver.categories()
|
||||
if cats:
|
||||
cat_id = cats[0].id
|
||||
if cat_id:
|
||||
try:
|
||||
sup_body = {
|
||||
"name": payload["supplier_name"],
|
||||
"category_id": cat_id,
|
||||
}
|
||||
if payload.get("supplier_phone"):
|
||||
sup_body["phone"] = payload["supplier_phone"]
|
||||
created_sup = await ctx.api.create_supplier(sup_body, actor_id=user.actor_id)
|
||||
payload["supplier_id"] = created_sup["id"]
|
||||
ctx.resolver.invalidate("suppliers")
|
||||
except Exception as e:
|
||||
logger.warning("Could not auto-create supplier: %s", e)
|
||||
|
||||
# 2. Sequential pre-creation for new materials
|
||||
for i, item in enumerate(payload.get("items") or [], start=1):
|
||||
if not item.get("material_id") and item.get("material_name") and item.get("unit_id"):
|
||||
try:
|
||||
created_mat = await ctx.api.create_material({
|
||||
"name": item["material_name"],
|
||||
"canonical_unit_id": int(item["unit_id"]),
|
||||
}, actor_id=user.actor_id)
|
||||
_set_material(item, created_mat["id"], created_mat.get("name") or item["material_name"])
|
||||
ctx.resolver.invalidate("materials")
|
||||
except Exception as e:
|
||||
logger.warning("Could not auto-create material: %s", e)
|
||||
|
||||
ready, blockers = quote_ready(payload)
|
||||
body, problems = build_quote_request(payload, only_resolved_items=only_resolved)
|
||||
if body is None:
|
||||
lines = ["ثبت ممکن نیست؛ این‌ها را اول مشخص کن:"] + [f"❌ {esc(p)}" for p in problems]
|
||||
await ctx.send(chat_id, "\n".join(lines))
|
||||
return
|
||||
if not ready and not only_resolved:
|
||||
lines = ["برای ثبت کامل، اول این‌ها را مشخص کن:"] + [f"❌ {esc(b)}" for b in blockers]
|
||||
lines += ["", "یا دکمه «ثبت فقط اقلام مشخص» را بزن."]
|
||||
await ctx.send(chat_id, "\n".join(lines))
|
||||
return
|
||||
|
||||
try:
|
||||
created = await ctx.api.create_quote(body, actor_id=user.actor_id)
|
||||
except ApiError as exc:
|
||||
await ctx.send(chat_id, ERR_GENERIC.format(detail=esc(exc.message)))
|
||||
return
|
||||
except Exception:
|
||||
logger.exception("create_quote failed")
|
||||
await ctx.send(chat_id, ERR_GENERIC.format(detail="خطای شبکه"))
|
||||
return
|
||||
|
||||
await draft_store.set_status(draft.id, "committed")
|
||||
ctx.pending.pop(chat_id, None)
|
||||
ctx.resolver.invalidate()
|
||||
|
||||
quote_id = (created or {}).get("id") or ""
|
||||
# If a proforma file was attached, persist it to the created ERP quote
|
||||
proforma_info = payload.get("proforma")
|
||||
if quote_id and proforma_info and proforma_info.get("saved_path"):
|
||||
try:
|
||||
from pathlib import Path
|
||||
p_path = Path(proforma_info["saved_path"])
|
||||
if p_path.exists():
|
||||
file_bytes = p_path.read_bytes()
|
||||
await ctx.api.upload_quote_file(
|
||||
quote_id,
|
||||
"proforma",
|
||||
proforma_info.get("file_name") or "proforma.pdf",
|
||||
file_bytes,
|
||||
mime_type=proforma_info.get("mime_type") or "application/pdf",
|
||||
actor_id=user.actor_id,
|
||||
)
|
||||
logger.info("Successfully uploaded proforma to quote %s", quote_id)
|
||||
except Exception as e:
|
||||
logger.warning("Could not upload draft proforma to quote %s: %s", quote_id, e)
|
||||
|
||||
if draft.review_message_id:
|
||||
try:
|
||||
msg = f"✅ این پیشنهاد در سیستم با موفقیت ثبت نهایی شد.\nشناسه پیشنهاد: {quote_id}"
|
||||
await ctx.edit(chat_id, draft.review_message_id, msg, reply_markup=None)
|
||||
await draft_store.set_bale_updated_at(draft.id)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
remaining = [
|
||||
m["label"] for m in compute_quote_missing(payload)
|
||||
if not m["blocking"] and not m["ok"]
|
||||
]
|
||||
dropped = len(payload.get("items") or []) - len(body.get("line_items") or [])
|
||||
if dropped > 0:
|
||||
remaining.append(f"{dropped} قلم ناشناس حذف شد")
|
||||
await ctx.send(chat_id, quote_committed_report(created, payload, remaining))
|
||||
@@ -1,103 +0,0 @@
|
||||
"""Add-supplier flow: name + one of the 8 fixed Persian categories (required)."""
|
||||
import logging
|
||||
|
||||
from app import drafts as draft_store
|
||||
from app.api.client import ApiError
|
||||
from app.drafts import (
|
||||
KIND_SUPPLIER, merge_supplier_patch, new_supplier_payload, supplier_missing,
|
||||
)
|
||||
from app.keyboards import pick_buttons, simple_review_keyboard
|
||||
from app.resolve import safe_resolve
|
||||
from app.texts import ERR_GENERIC, esc, supplier_committed_report, supplier_review_text
|
||||
|
||||
logger = logging.getLogger("bot.supplier")
|
||||
|
||||
|
||||
async def handle_entities(ctx, chat_id, user, patch: dict, source: str | None) -> None:
|
||||
draft = await draft_store.get_active(chat_id, KIND_SUPPLIER)
|
||||
if draft is not None:
|
||||
payload = draft.payload
|
||||
merge_supplier_patch(payload, patch)
|
||||
else:
|
||||
payload = new_supplier_payload()
|
||||
merge_supplier_patch(payload, patch)
|
||||
draft = await draft_store.create(chat_id, KIND_SUPPLIER, payload, source=source)
|
||||
await resolve_payload(ctx, payload)
|
||||
await draft_store.save_payload(draft, missing={"fields": supplier_missing(payload)})
|
||||
await render(ctx, chat_id, draft, fresh=draft.review_message_id is None)
|
||||
|
||||
|
||||
async def resolve_payload(ctx, payload: dict) -> None:
|
||||
options = payload.setdefault("options", {})
|
||||
if not payload.get("category_id") and payload.get("category_name"):
|
||||
res = await safe_resolve(ctx.resolver, "category", payload["category_name"])
|
||||
if res.resolved:
|
||||
payload["category_id"] = res.candidates[0].id
|
||||
payload["category_name"] = res.candidates[0].name
|
||||
options.pop("cat", None)
|
||||
elif res.candidates:
|
||||
options["cat"] = [{"id": c.id, "name": c.name} for c in res.candidates]
|
||||
else:
|
||||
options.pop("cat", None)
|
||||
|
||||
|
||||
async def apply_pick(ctx, chat_id, user, draft, field: str, choice: dict) -> None:
|
||||
if field == "cat":
|
||||
draft.payload["category_id"] = choice["id"]
|
||||
draft.payload["category_name"] = choice["name"]
|
||||
draft.payload.setdefault("options", {}).pop("cat", None)
|
||||
await draft_store.save_payload(draft, missing={"fields": supplier_missing(draft.payload)})
|
||||
await render(ctx, chat_id, draft, fresh=False)
|
||||
|
||||
|
||||
def _keyboard(payload: dict, draft_id: str) -> dict:
|
||||
rows: list[list[dict]] = []
|
||||
options = (payload.get("options") or {}).get("cat") or []
|
||||
if options:
|
||||
rows += pick_buttons(draft_id, "cat", [o["name"] for o in options[:6]])
|
||||
return simple_review_keyboard(draft_id, KIND_SUPPLIER, rows)
|
||||
|
||||
|
||||
async def render(ctx, chat_id, draft, fresh: bool = True) -> None:
|
||||
payload = draft.payload
|
||||
missing = supplier_missing(payload)
|
||||
text = supplier_review_text(payload, missing)
|
||||
keyboard = _keyboard(payload, draft.id)
|
||||
if fresh:
|
||||
message = await ctx.send(chat_id, text, reply_markup=keyboard)
|
||||
draft.review_message_id = (message or {}).get("message_id")
|
||||
await draft_store.save_payload(draft, missing={"fields": missing},
|
||||
review_message_id=draft.review_message_id)
|
||||
else:
|
||||
await ctx.edit(chat_id, draft.review_message_id, text, reply_markup=keyboard)
|
||||
await draft_store.save_payload(draft, missing={"fields": missing})
|
||||
|
||||
|
||||
async def commit(ctx, chat_id, user, draft) -> None:
|
||||
payload = draft.payload
|
||||
await resolve_payload(ctx, payload)
|
||||
missing = {m["key"]: m["ok"] for m in supplier_missing(payload)}
|
||||
problems = [label for key, label, ok in [
|
||||
("name", "نام تأمین‌کننده", missing.get("name")),
|
||||
("category", "دسته‌بندی", missing.get("category")),
|
||||
] if not ok]
|
||||
if problems:
|
||||
await ctx.send(chat_id, "ثبت ممکن نیست؛ اول این‌ها را مشخص کن:\n" +
|
||||
"\n".join(f"❌ {esc(p)}" for p in problems))
|
||||
return
|
||||
body = {
|
||||
"name": payload["name"],
|
||||
"category_id": payload["category_id"],
|
||||
"phone": payload.get("phone"),
|
||||
"location": payload.get("location"),
|
||||
"contact_person": payload.get("contact_person"),
|
||||
}
|
||||
body = {k: v for k, v in body.items() if v}
|
||||
try:
|
||||
created = await ctx.api.create_supplier(body, actor_id=user.actor_id)
|
||||
except ApiError as exc:
|
||||
await ctx.send(chat_id, ERR_GENERIC.format(detail=esc(exc.message)))
|
||||
return
|
||||
await draft_store.set_status(draft.id, "committed")
|
||||
ctx.resolver.invalidate("suppliers")
|
||||
await ctx.send(chat_id, supplier_committed_report(created))
|
||||
@@ -1,74 +0,0 @@
|
||||
"""Inline keyboard builders.
|
||||
|
||||
Bale keeps Telegram's 64-byte ``callback_data`` cap, so every callback is a
|
||||
short op-code plus the 8-char draft prefix; the full state lives in bot_drafts
|
||||
(or the in-memory pending-flow map) and is looked up on tap.
|
||||
"""
|
||||
|
||||
|
||||
def _kb(rows: list[list[dict]]) -> dict:
|
||||
return {"inline_keyboard": rows}
|
||||
|
||||
|
||||
def _btn(text: str, data: str) -> dict:
|
||||
return {"text": text, "callback_data": data}
|
||||
|
||||
|
||||
# callback scheme (≤64 bytes):
|
||||
# q:ok:{d8} / q:no:{d8} / q:ok2:{d8} quote commit / cancel / commit-resolved-only
|
||||
# s:ok:{d8} / s:no:{d8} supplier
|
||||
# m:ok:{d8} / m:no:{d8} material
|
||||
# pk:{d8}:{field}:{idx} pick candidate for a draft field
|
||||
# qc:{idx} / ac:{op} / ar:{op} pending-flow buttons (accept/arrive)
|
||||
|
||||
def draft_actions(prefix: str, kind: str, has_partial_option: bool = False) -> list[list[dict]]:
|
||||
op = {"quote": "q", "supplier": "s", "material": "m"}.get(kind, "q")
|
||||
rows = [[_btn("✅ ثبت نهایی", f"{op}:ok:{prefix}"), _btn("❌ انصراف", f"{op}:no:{prefix}")]]
|
||||
if has_partial_option:
|
||||
rows.insert(0, [_btn("✅ ثبت فقط اقلام مشخص", f"{op}:ok2:{prefix}")])
|
||||
return rows
|
||||
|
||||
|
||||
def pick_buttons(prefix: str, field: str, names: list[str]) -> list[list[dict]]:
|
||||
return [[_btn(name[:60], f"pk:{prefix}:{field}:{i}")] for i, name in enumerate(names)]
|
||||
|
||||
|
||||
def quote_review_keyboard(
|
||||
prefix: str,
|
||||
pick_rows: list[list[dict]],
|
||||
has_partial_option: bool = False,
|
||||
wizard_url: str | None = None,
|
||||
) -> dict:
|
||||
rows = list(pick_rows)
|
||||
if wizard_url:
|
||||
rows.append([{"text": "🖥 بازبینی و تکمیل در ویزارد", "url": wizard_url}])
|
||||
rows += draft_actions(prefix, "quote", has_partial_option=has_partial_option)
|
||||
return _kb(rows)
|
||||
|
||||
|
||||
def simple_review_keyboard(prefix: str, kind: str, pick_rows: list[list[dict]]) -> dict:
|
||||
rows = list(pick_rows)
|
||||
rows += draft_actions(prefix, kind)
|
||||
return _kb(rows)
|
||||
|
||||
|
||||
def quote_pick_keyboard(pairs: list[tuple[str, str]]) -> dict:
|
||||
"""Pick among candidate quotes: pairs of (label, quote_id)."""
|
||||
return _kb([[_btn(label[:60], f"qc:{i}")] for i, (label, _) in enumerate(pairs)])
|
||||
|
||||
|
||||
def accept_keyboard(termsheet_labels: list[str]) -> dict:
|
||||
rows = [[_btn(f"شرایط: {label[:40]}", f"ac:ts:{i}")] for i, label in enumerate(termsheet_labels)]
|
||||
rows.append([_btn("✅ تأیید پذیرش", "ac:ok"), _btn("❌ انصراف", "ac:no")])
|
||||
return _kb(rows)
|
||||
|
||||
|
||||
def arrive_keyboard() -> dict:
|
||||
return _kb([
|
||||
[_btn("📦 تحویل کامل همه اقلام", "ar:full")],
|
||||
[_btn("✅ ثبت مقادیر اعلام‌شده", "ar:ok"), _btn("❌ انصراف", "ar:no")],
|
||||
])
|
||||
|
||||
|
||||
def cancel_keyboard() -> dict:
|
||||
return _kb([[_btn("❌ انصراف", "ac:no")]])
|
||||
@@ -1,60 +0,0 @@
|
||||
"""Bot entrypoint: ensure tables → sweeper task → Bale long-poll loop.
|
||||
|
||||
Mirrors the api's pattern of a plain asyncio background loop (no Celery/Redis).
|
||||
"""
|
||||
import asyncio
|
||||
import logging
|
||||
|
||||
from app.bale.client import BaleClient, poll_loop
|
||||
from app.config import settings
|
||||
from app.db_init import ensure_schema
|
||||
from app.drafts import expire_stale
|
||||
from app.handlers import handle_update
|
||||
from app.runtime import BotContext
|
||||
from app.api.client import ErpClient
|
||||
from app.sync import sync_drafts_loop
|
||||
|
||||
logging.basicConfig(
|
||||
level=getattr(logging, settings.LOG_LEVEL.upper(), logging.INFO),
|
||||
format="%(asctime)s %(levelname)s %(name)s — %(message)s",
|
||||
)
|
||||
logger = logging.getLogger("bot.main")
|
||||
|
||||
|
||||
async def sweeper_loop() -> None:
|
||||
"""Expire stale drafts + sweep dead pending flows every 10 minutes."""
|
||||
while True:
|
||||
try:
|
||||
expired = await expire_stale(settings.DRAFT_TTL_HOURS)
|
||||
if expired:
|
||||
logger.info("expired %s stale drafts", expired)
|
||||
except Exception:
|
||||
logger.exception("sweeper failed")
|
||||
await asyncio.sleep(600)
|
||||
|
||||
|
||||
async def main() -> None:
|
||||
if not settings.BOT_TOKEN:
|
||||
raise SystemExit("PROCUREMENT_BOT_BOT_TOKEN is not set — get one from Bale's BotFather")
|
||||
logger.info("starting bale procurement bot (api=%s, ai=%s)",
|
||||
settings.API_BASE_URL, "configured" if settings.AI_BASE_URL else "NOT configured")
|
||||
await ensure_schema()
|
||||
|
||||
bale = BaleClient(settings.BALE_API_BASE, settings.BOT_TOKEN)
|
||||
api = ErpClient(settings.API_BASE_URL, settings.API_TIMEOUT_SECONDS, settings.SERVICE_TOKEN)
|
||||
ctx = BotContext(bale, api)
|
||||
|
||||
sweeper = asyncio.create_task(sweeper_loop())
|
||||
sync_task = asyncio.create_task(sync_drafts_loop(ctx))
|
||||
try:
|
||||
await poll_loop(bale, lambda update: handle_update(ctx, update))
|
||||
finally:
|
||||
sweeper.cancel()
|
||||
sync_task.cancel()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
asyncio.run(main())
|
||||
except KeyboardInterrupt:
|
||||
pass
|
||||
@@ -1,85 +0,0 @@
|
||||
"""Bot-owned tables (bot_* prefix, idempotent DDL in db_init.py).
|
||||
|
||||
These are separate from the ERP schema on purpose: the bot is an autonomous
|
||||
container and owns its own state (links, drafts, message audit log).
|
||||
"""
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import BigInteger, DateTime, Index, Integer, String, Text, func
|
||||
from sqlalchemy.dialects.postgresql import JSONB, UUID
|
||||
from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
|
||||
|
||||
|
||||
class Base(DeclarativeBase):
|
||||
pass
|
||||
|
||||
|
||||
def _uuid_pk() -> Mapped[str]:
|
||||
return mapped_column(UUID(as_uuid=False), primary_key=True, server_default=func.gen_random_uuid())
|
||||
|
||||
|
||||
def _timestamptz(**kwargs) -> Mapped[datetime]:
|
||||
return mapped_column(DateTime(timezone=True), server_default=func.now(), nullable=False, **kwargs)
|
||||
|
||||
|
||||
class BotLink(Base):
|
||||
"""Bale chat ↔ ERP user mapping (established via Casdoor login)."""
|
||||
|
||||
__tablename__ = "bot_links"
|
||||
|
||||
id: Mapped[str] = _uuid_pk()
|
||||
chat_id: Mapped[int] = mapped_column(BigInteger, unique=True, nullable=False, index=True)
|
||||
user_id: Mapped[str | None] = mapped_column(UUID(as_uuid=False)) # users.id
|
||||
casdoor_username: Mapped[str | None] = mapped_column(Text)
|
||||
display_name: Mapped[str | None] = mapped_column(Text)
|
||||
role: Mapped[str | None] = mapped_column(String(32))
|
||||
created_at: Mapped[datetime] = _timestamptz()
|
||||
updated_at: Mapped[datetime] = _timestamptz(onupdate=func.now())
|
||||
|
||||
|
||||
class BotDraft(Base):
|
||||
"""A prepared-but-not-committed ERP action (quote / supplier / material)."""
|
||||
|
||||
__tablename__ = "bot_drafts"
|
||||
__table_args__ = (
|
||||
Index("ix_bot_drafts_chat_status", "chat_id", "status"),
|
||||
Index("ix_bot_drafts_review_msg", "review_message_id"),
|
||||
Index("ix_bot_drafts_source_msg", "source_message_id"),
|
||||
)
|
||||
|
||||
id: Mapped[str] = _uuid_pk()
|
||||
chat_id: Mapped[int] = mapped_column(BigInteger, nullable=False, index=True)
|
||||
kind: Mapped[str] = mapped_column(String(16), nullable=False) # quote|supplier|material
|
||||
payload: Mapped[dict] = mapped_column(JSONB, nullable=False, default=dict)
|
||||
missing: Mapped[dict | None] = mapped_column(JSONB)
|
||||
status: Mapped[str] = mapped_column(String(16), nullable=False, default="active") # active|committed|cancelled|expired|failed
|
||||
source: Mapped[str | None] = mapped_column(String(16)) # text|voice
|
||||
source_message_id: Mapped[int | None] = mapped_column(BigInteger)
|
||||
review_message_id: Mapped[int | None] = mapped_column(BigInteger)
|
||||
last_bale_update_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
|
||||
created_at: Mapped[datetime] = _timestamptz()
|
||||
updated_at: Mapped[datetime] = _timestamptz(onupdate=func.now())
|
||||
|
||||
|
||||
class BotMessage(Base):
|
||||
"""Audit log of every inbound/outbound message (who asked for what)."""
|
||||
|
||||
__tablename__ = "bot_messages"
|
||||
|
||||
id: Mapped[str] = _uuid_pk()
|
||||
chat_id: Mapped[int] = mapped_column(BigInteger, nullable=False, index=True)
|
||||
direction: Mapped[str] = mapped_column(String(4), nullable=False) # in|out
|
||||
kind: Mapped[str] = mapped_column(String(16), nullable=False, default="text") # text|voice|callback|error
|
||||
body: Mapped[str | None] = mapped_column(Text)
|
||||
payload: Mapped[dict | None] = mapped_column(JSONB)
|
||||
created_at: Mapped[datetime] = _timestamptz()
|
||||
|
||||
|
||||
class BotMeta(Base):
|
||||
"""Tiny KV store (e.g. last processed Bale update_id across restarts)."""
|
||||
|
||||
__tablename__ = "bot_meta"
|
||||
|
||||
key: Mapped[str] = mapped_column(String(64), primary_key=True)
|
||||
value: Mapped[str | None] = mapped_column(Text)
|
||||
updated_at: Mapped[datetime] = _timestamptz(onupdate=func.now())
|
||||
@@ -1,174 +0,0 @@
|
||||
"""Natural-language understanding: Persian free text → typed intent + entities.
|
||||
|
||||
One chat/completions call per message with JSON-mode output. The prompt embeds
|
||||
the current draft summary so the model can decide between "start a new
|
||||
activity" and "refine the open draft" (update_draft with a partial patch).
|
||||
"""
|
||||
import json
|
||||
import logging
|
||||
import re
|
||||
|
||||
import httpx
|
||||
|
||||
from app.config import Settings
|
||||
|
||||
logger = logging.getLogger("bot.nlu")
|
||||
|
||||
PERSIAN_DIGITS = str.maketrans("۰۱۲۳۴۵۶۷۸۹٠١٢٣٤٥٦٧٨٩", "01234567890123456789")
|
||||
|
||||
|
||||
def normalize_digits(text: str) -> str:
|
||||
return (text or "").translate(PERSIAN_DIGITS)
|
||||
|
||||
|
||||
ZWNJ = "\u200c"
|
||||
|
||||
|
||||
def normalize_text(text: str) -> str:
|
||||
"""Normalize Persian text for fuzzy matching (ZWNJ, arabic ya/ka, spaces)."""
|
||||
t = normalize_digits(text or "")
|
||||
t = t.replace(ZWNJ, " ").replace("ي", "ی").replace("ك", "ک")
|
||||
t = re.sub(r"\s+", " ", t).strip().lower()
|
||||
return t
|
||||
|
||||
|
||||
INTENTS = [
|
||||
"register_quote", # ثبت استعلام/پیشنهاد جدید از یک تأمین‌کننده
|
||||
"update_draft", # تکمیل/اصلاح پیش‌نویس باز (patch روی آن)
|
||||
"commit_draft", # «ثبت کن» / «تأیید» — commit the open draft
|
||||
"discard_draft", # «بیخیال» / «لغو»
|
||||
"show_draft", # «وضعیت پیش‌نویس؟»
|
||||
"add_supplier",
|
||||
"add_material",
|
||||
"status_query", # پرس‌وجو: استعلام‌های در انتظار / به‌زودی منقضی / ...
|
||||
"accept_quote", # پذیرش یک استعلام
|
||||
"arrive_items", # اعلام رسیدن اقلام
|
||||
"help",
|
||||
"unknown",
|
||||
]
|
||||
|
||||
SYSTEM_PROMPT = """تو دستیار تدارکات یک ERP فارسی هستی. ورودی تو پیام صوتی/متنی کاربر است.
|
||||
یک JSON و فقط JSON برگردان (بدون توضیح اضافه) با این شکل:
|
||||
|
||||
{
|
||||
"consensus_text": "متن تجمیع‌شده و اصلاح‌شده کاربر (فارسی روان و بدون غلط شنیداری)",
|
||||
"intent": یکی از {intents},
|
||||
"patch": {شکل partial هر فعالیتی که کاربر داده},
|
||||
"confidence": 0.0..1.0
|
||||
}
|
||||
|
||||
قوانین:
|
||||
- اگر ورودی شامل چند نسخه تبدیل گفتار به متن (STT) از یک پیام صوتی کاربر است:
|
||||
۱. این نسخه‌ها از چند مدل مختلف برای افزایش دقت به دست آمده‌اند. آن‌ها را با هم مقایسه و مقابله کن.
|
||||
۲. خطاهای شنیداری هر نسخه را بر مبنای منطق تدارکات (نام کالاها، برندها، مشخصات فنی و واحدهای اندازه‌گیری) تصحیح و حل تعارض کن.
|
||||
۳. متن نهایی اصلاح و تجمیع‌شده را در فیلد consensus_text قرار بده.
|
||||
۴. استخراج قصد (intent) و موجودیت‌ها (patch) را بر اساس همین متن دقیق انجام بده.
|
||||
- اگر ورودی یک متن عادی است، همان متن را در consensus_text قرار بده.
|
||||
- اگر پیام کاربر اطلاعات جدیدی به پیش‌نویسِ باز اضافه می‌کند یا اصلاح می‌کند → intent="update_draft" و patch شامل فقط فیلدهای جدید/تغییریافته.
|
||||
- اگر عبارت تأیید نهایی است (مثل «ثبت کن»، «همینه، ثبتش کن») → intent="commit_draft".
|
||||
- اگر لغو است («بیخیال»، «لغو») → intent="discard_draft".
|
||||
- اگر سؤال درباره وضعیت است → intent="status_query".
|
||||
- اگر درباره پذیرش استعلام است → intent="accept_quote" و در patch.target نام تأمین‌کننده/استعلام.
|
||||
- اگر درباره اعلام رسیدن اقلام است → intent="arrive_items" و در patch.target نام تأمین‌کننده/استعلام و در patch.arrivals مقادیر.
|
||||
- برای کالاها: material_name فقط نام کلی کالا باشد (مانند «میلگرد» یا «لوله»)؛ کارخانه یا برند در brand_name؛ و مشخصات فنی (مثل سایز یا گرید) در آرایه specs قرار گیرد.
|
||||
- برای شرایط پرداخت: در صورت ذکر اقساط/موعد و مبالغ، در milestones: [{"due_date": "YYYY-MM-DD", "amount": number}] قرار بده.
|
||||
|
||||
شکل patch برای intent="register_quote"/"update_draft":
|
||||
{"supplier_name": str, "project_name": str, "project_names": [str], "is_official": bool, "notes": str, "expiry_date": "YYYY-MM-DD",
|
||||
"items": [{"material_name": str, "brand_name": str, "specs": [str], "quantity": number, "unit_name": str, "unit_price": number, "notes": str}],
|
||||
"payment_terms": [{"label": str, "milestones": [{"due_date": "YYYY-MM-DD", "amount": number}], "discount_type": "none|percent|fixed", "discount_value": number}]}
|
||||
|
||||
شکل patch برای intent="add_supplier":
|
||||
{"supplier": {"name": str, "category_name": str, "phone": str, "location": str, "contact_person": str}}
|
||||
|
||||
شکل patch برای intent="add_material":
|
||||
{"material": {"name": str, "unit_name": str, "topic": str}}
|
||||
|
||||
شکل patch برای intent="status_query":
|
||||
{"query": {"kind": "pending|accepted|arrived|expiring|recent", "supplier_name": str, "project_name": str, "days": int}}
|
||||
|
||||
شکل patch برای intent="accept_quote"/"arrive_items":
|
||||
{"target": {"supplier_name": str, "project_name": str, "quote_id": str},
|
||||
"arrivals": [{"material_name": str, "quantity": number, "quality_note": str}]}
|
||||
|
||||
{draft_block}
|
||||
"""
|
||||
|
||||
|
||||
def _build_system_prompt(draft_summary: str | None) -> str:
|
||||
intents = ", ".join(INTENTS)
|
||||
prompt = SYSTEM_PROMPT.replace("{intents}", intents).replace("{draft_block}", "")
|
||||
if draft_summary:
|
||||
prompt += (
|
||||
"\n\nپیش‌نویسِ باز فعلی کاربر (اگر مرتبط است به آن تکیه کن و فیلدهای تکراری را بازنویسی نکن):\n"
|
||||
+ draft_summary
|
||||
)
|
||||
return prompt
|
||||
|
||||
|
||||
def _extract_json(raw: str) -> dict | None:
|
||||
raw = (raw or "").strip()
|
||||
if raw.startswith("```"):
|
||||
raw = re.sub(r"^```[a-zA-Z]*\n?", "", raw).rstrip("`").strip()
|
||||
start = raw.find("{")
|
||||
end = raw.rfind("}")
|
||||
if start == -1 or end <= start:
|
||||
return None
|
||||
try:
|
||||
return json.loads(raw[start : end + 1])
|
||||
except json.JSONDecodeError:
|
||||
return None
|
||||
|
||||
|
||||
async def understand(settings: Settings, text: str | list[dict], draft_summary: str | None = None) -> dict:
|
||||
"""Return {"consensus_text": ..., "intent": ..., "patch": {...}, "confidence": ...}; never raises."""
|
||||
fallback = {"consensus_text": "", "intent": "unknown", "patch": {}, "confidence": 0.0}
|
||||
if not settings.AI_BASE_URL or not settings.AI_API_KEY:
|
||||
logger.warning("AI provider not configured; cannot understand message")
|
||||
return fallback
|
||||
|
||||
if isinstance(text, list):
|
||||
first_text = text[0].get("text") if text else ""
|
||||
lines = ["پیام صوتی کاربر توسط چند مدل تبدیل گفتار به متن (STT) به صورت زیر پیاده‌سازی شده است:"]
|
||||
for idx, item in enumerate(text, start=1):
|
||||
name = item.get("name") or f"مدل {idx}"
|
||||
t = normalize_digits(item.get("text") or "")
|
||||
lines.append(f"- نسخه {idx} ({name}): «{t}»")
|
||||
lines.append("\nبا تلفیق این نسخه‌ها و تصحیح خطاهای شنیداری، پیام را تحلیل کن و consensus_text را به همراه intent و patch بساز.")
|
||||
user_content = "\n".join(lines)
|
||||
else:
|
||||
user_content = normalize_digits(str(text))
|
||||
first_text = str(text)
|
||||
|
||||
fallback["consensus_text"] = first_text
|
||||
|
||||
try:
|
||||
async with httpx.AsyncClient(timeout=settings.LLM_TIMEOUT_SECONDS) as client:
|
||||
resp = await client.post(
|
||||
f"{settings.AI_BASE_URL.rstrip('/')}/chat/completions",
|
||||
headers={"Authorization": f"Bearer {settings.AI_API_KEY}"},
|
||||
json={
|
||||
"model": settings.LLM_MODEL,
|
||||
"messages": [
|
||||
{"role": "system", "content": _build_system_prompt(draft_summary)},
|
||||
{"role": "user", "content": user_content},
|
||||
],
|
||||
"temperature": 0.1,
|
||||
"response_format": {"type": "json_object"},
|
||||
},
|
||||
)
|
||||
if resp.status_code != 200:
|
||||
logger.error("LLM HTTP %s: %s", resp.status_code, resp.text[:300])
|
||||
return fallback
|
||||
content = ((resp.json() or {}).get("choices") or [{}])[0].get("message", {}).get("content", "")
|
||||
parsed = _extract_json(content)
|
||||
if not parsed or parsed.get("intent") not in INTENTS:
|
||||
logger.warning("unparseable LLM output: %r", content[:200])
|
||||
return fallback
|
||||
parsed.setdefault("patch", {})
|
||||
if not parsed.get("consensus_text"):
|
||||
parsed["consensus_text"] = first_text
|
||||
return parsed
|
||||
except (httpx.HTTPError, json.JSONDecodeError, KeyError, TypeError):
|
||||
logger.exception("NLU failure")
|
||||
return fallback
|
||||
@@ -1,282 +0,0 @@
|
||||
"""Name → ERP id resolution with fuzzy matching (Persian-aware) + tiny caches.
|
||||
|
||||
The ERP search endpoints are ilike-based; we fetch candidates with `q=` and
|
||||
rank them with difflib so "میلگرد A3 14" still matches "میلگرد A3 سایز ۱۴".
|
||||
"""
|
||||
import difflib
|
||||
import time
|
||||
from dataclasses import dataclass, field
|
||||
|
||||
from sqlalchemy import text
|
||||
from app.api.client import ApiError, ErpClient
|
||||
from app.db import SessionLocal
|
||||
from app.nlu import normalize_text
|
||||
|
||||
|
||||
@dataclass
|
||||
class Candidate:
|
||||
id: str
|
||||
name: str
|
||||
extra: dict = field(default_factory=dict)
|
||||
|
||||
|
||||
@dataclass
|
||||
class Resolution:
|
||||
status: str # "one" | "many" | "none"
|
||||
candidates: list[Candidate]
|
||||
|
||||
@property
|
||||
def resolved(self) -> bool:
|
||||
return self.status == "one"
|
||||
|
||||
|
||||
def _rank(query: str, items: list[Candidate], limit: int = 6) -> list[Candidate]:
|
||||
q = normalize_text(query)
|
||||
if not q:
|
||||
return items[:limit]
|
||||
scored = []
|
||||
for item in items:
|
||||
name = normalize_text(item.name)
|
||||
ratio = difflib.SequenceMatcher(None, q, name).ratio()
|
||||
if q == name:
|
||||
ratio = 1.0
|
||||
elif q in name:
|
||||
ratio += 0.35
|
||||
scored.append((ratio, item))
|
||||
scored.sort(key=lambda pair: (-pair[0], pair[1].name))
|
||||
return [item for ratio, item in scored[:limit] if ratio >= 0.40]
|
||||
|
||||
|
||||
async def _db_units() -> list[Candidate]:
|
||||
try:
|
||||
async with SessionLocal() as s:
|
||||
rows = (await s.execute(text("SELECT id, code, name_fa FROM units"))).mappings().all()
|
||||
return [
|
||||
Candidate(
|
||||
id=str(u["id"]),
|
||||
name=u.get("name_fa") or u.get("code") or str(u["id"]),
|
||||
extra={"code": u.get("code")},
|
||||
)
|
||||
for u in rows
|
||||
]
|
||||
except Exception:
|
||||
return []
|
||||
|
||||
|
||||
async def _db_categories() -> list[Candidate]:
|
||||
try:
|
||||
async with SessionLocal() as s:
|
||||
rows = (await s.execute(text("SELECT id, name, slug FROM material_categories"))).mappings().all()
|
||||
return [
|
||||
Candidate(
|
||||
id=str(c["id"]),
|
||||
name=c.get("name") or c.get("slug") or str(c["id"]),
|
||||
)
|
||||
for c in rows
|
||||
]
|
||||
except Exception:
|
||||
return []
|
||||
|
||||
|
||||
async def _db_projects() -> list[Candidate]:
|
||||
try:
|
||||
async with SessionLocal() as s:
|
||||
rows = (await s.execute(text("SELECT id, name FROM projects"))).mappings().all()
|
||||
return [
|
||||
Candidate(
|
||||
id=str(p["id"]),
|
||||
name=p.get("name") or str(p["id"]),
|
||||
)
|
||||
for p in rows
|
||||
]
|
||||
except Exception:
|
||||
return []
|
||||
|
||||
|
||||
async def _db_suppliers(q: str | None = None) -> list[Candidate]:
|
||||
try:
|
||||
async with SessionLocal() as s:
|
||||
if q:
|
||||
rows = (await s.execute(
|
||||
text("SELECT s.id, s.name, s.location, s.phone, s.contact_person, c.name as category_name "
|
||||
"FROM suppliers s LEFT JOIN material_categories c ON s.category_id = c.id "
|
||||
"WHERE s.name ILIKE :q LIMIT 20"),
|
||||
{"q": f"%{q}%"}
|
||||
)).mappings().all()
|
||||
else:
|
||||
rows = (await s.execute(
|
||||
text("SELECT s.id, s.name, s.location, s.phone, s.contact_person, c.name as category_name "
|
||||
"FROM suppliers s LEFT JOIN material_categories c ON s.category_id = c.id LIMIT 20")
|
||||
)).mappings().all()
|
||||
return [
|
||||
Candidate(
|
||||
id=str(r["id"]),
|
||||
name=r.get("name") or str(r["id"]),
|
||||
extra={
|
||||
"location": r.get("location"),
|
||||
"phone": r.get("phone"),
|
||||
"contact_person": r.get("contact_person"),
|
||||
"category_name": r.get("category_name"),
|
||||
},
|
||||
)
|
||||
for r in rows
|
||||
]
|
||||
except Exception:
|
||||
return []
|
||||
|
||||
|
||||
async def _db_materials(q: str | None = None) -> list[Candidate]:
|
||||
try:
|
||||
async with SessionLocal() as s:
|
||||
if q:
|
||||
rows = (await s.execute(
|
||||
text("SELECT id, name, topic, canonical_unit_id, status FROM materials WHERE name ILIKE :q LIMIT 20"),
|
||||
{"q": f"%{q}%"}
|
||||
)).mappings().all()
|
||||
else:
|
||||
rows = (await s.execute(
|
||||
text("SELECT id, name, topic, canonical_unit_id, status FROM materials LIMIT 20")
|
||||
)).mappings().all()
|
||||
return [
|
||||
Candidate(
|
||||
id=str(r["id"]),
|
||||
name=r.get("name") or str(r["id"]),
|
||||
extra=dict(r),
|
||||
)
|
||||
for r in rows
|
||||
]
|
||||
except Exception:
|
||||
return []
|
||||
|
||||
|
||||
class Resolver:
|
||||
"""Caches catalog lists (units/categories/projects are stable; suppliers/materials queried on demand)."""
|
||||
|
||||
def __init__(self, api: ErpClient, ttl_seconds: float = 1800):
|
||||
self._api = api
|
||||
self._ttl = ttl_seconds
|
||||
self._cache: dict[str, tuple[float, list[Candidate]]] = {}
|
||||
|
||||
async def _cached(self, key: str, fetch) -> list[Candidate]:
|
||||
entry = self._cache.get(key)
|
||||
now = time.monotonic()
|
||||
if entry and now - entry[0] < self._ttl:
|
||||
return entry[1]
|
||||
items = await fetch()
|
||||
self._cache[key] = (now, items)
|
||||
return items
|
||||
|
||||
def invalidate(self, key: str | None = None) -> None:
|
||||
if key:
|
||||
self._cache.pop(key, None)
|
||||
else:
|
||||
self._cache.clear()
|
||||
|
||||
# ---------------------------------------------------------------- sources
|
||||
|
||||
async def units(self) -> list[Candidate]:
|
||||
async def fetch():
|
||||
try:
|
||||
rows = await self._api.list_units()
|
||||
return [Candidate(id=str(u["id"]), name=u.get("name_fa") or u.get("code") or str(u["id"]),
|
||||
extra={"code": u.get("code")}) for u in rows]
|
||||
except Exception:
|
||||
return await _db_units()
|
||||
return await self._cached("units", fetch)
|
||||
|
||||
async def categories(self) -> list[Candidate]:
|
||||
async def fetch():
|
||||
try:
|
||||
rows = await self._api.list_categories()
|
||||
return [Candidate(id=str(c["id"]), name=c.get("name") or c.get("slug") or str(c["id"])) for c in rows]
|
||||
except Exception:
|
||||
return await _db_categories()
|
||||
return await self._cached("categories", fetch)
|
||||
|
||||
async def projects(self) -> list[Candidate]:
|
||||
async def fetch():
|
||||
try:
|
||||
rows = await self._api.list_projects()
|
||||
return [Candidate(id=str(p["id"]), name=p.get("name") or str(p["id"])) for p in rows]
|
||||
except Exception:
|
||||
return await _db_projects()
|
||||
return await self._cached("projects", fetch)
|
||||
|
||||
async def suppliers(self, q: str | None = None) -> list[Candidate]:
|
||||
try:
|
||||
rows = await self._api.list_suppliers(q=q, page_size=20)
|
||||
items = [
|
||||
Candidate(
|
||||
id=str(s["id"]),
|
||||
name=s.get("name") or str(s["id"]),
|
||||
extra={
|
||||
"location": s.get("location"),
|
||||
"phone": s.get("phone"),
|
||||
"contact_person": s.get("contact_person"),
|
||||
"category_name": (s.get("category") or {}).get("name") if isinstance(s.get("category"), dict) else None,
|
||||
},
|
||||
)
|
||||
for s in rows
|
||||
]
|
||||
except Exception:
|
||||
items = await _db_suppliers(q=q)
|
||||
return _rank(q, items) if q else items
|
||||
|
||||
async def materials(self, q: str | None = None) -> list[Candidate]:
|
||||
try:
|
||||
rows = await self._api.list_materials(q=q, page_size=20)
|
||||
extra = {str(m["id"]): m for m in rows}
|
||||
items = [Candidate(id=str(m["id"]), name=m.get("name") or str(m["id"]), extra=extra.get(str(m["id"]), {}))
|
||||
for m in rows]
|
||||
except Exception:
|
||||
items = await _db_materials(q=q)
|
||||
return _rank(q, items) if q else items
|
||||
|
||||
# ------------------------------------------------------------ resolutions
|
||||
|
||||
async def resolve(self, kind: str, name: str | None) -> Resolution:
|
||||
"""Resolve by name; exact hit → "one", several close → "many", none → "none"."""
|
||||
if not name or not name.strip():
|
||||
return Resolution("none", [])
|
||||
if kind == "supplier":
|
||||
candidates = await self.suppliers(name)
|
||||
elif kind == "material":
|
||||
candidates = await self.materials(name)
|
||||
elif kind == "project":
|
||||
candidates = _rank(name, await self.projects())
|
||||
elif kind == "unit":
|
||||
candidates = _rank(name, await self.units())
|
||||
elif kind == "category":
|
||||
candidates = _rank(name, await self.categories())
|
||||
else:
|
||||
raise ValueError(f"unknown kind: {kind}")
|
||||
if not candidates:
|
||||
return Resolution("none", [])
|
||||
norm_name = normalize_text(name)
|
||||
exact = [c for c in candidates if normalize_text(c.name) == norm_name]
|
||||
if len(exact) == 1:
|
||||
return Resolution("one", exact)
|
||||
top = candidates[0]
|
||||
top_norm = normalize_text(top.name)
|
||||
ratio = difflib.SequenceMatcher(None, norm_name, top_norm).ratio()
|
||||
if ratio >= 0.88 and (len(candidates) == 1 or ratio > 0.95):
|
||||
return Resolution("one", [top])
|
||||
return Resolution("many", candidates)
|
||||
|
||||
async def unit_for_material(self, unit_name: str | None, material: dict | None) -> tuple[str | None, bool]:
|
||||
"""Return (unit_id, explicitly_resolved). Falls back to the material's
|
||||
canonical unit when the spoken unit isn't found."""
|
||||
if unit_name:
|
||||
res = await self.resolve("unit", unit_name)
|
||||
if res.resolved:
|
||||
return res.candidates[0].id, True
|
||||
if material and material.get("canonical_unit_id"):
|
||||
return str(material["canonical_unit_id"]), False
|
||||
return None, False
|
||||
|
||||
|
||||
async def safe_resolve(resolver: Resolver, kind: str, name: str | None) -> Resolution:
|
||||
try:
|
||||
return await resolver.resolve(kind, name)
|
||||
except Exception:
|
||||
return Resolution("none", [])
|
||||
@@ -1,170 +0,0 @@
|
||||
"""Shared runtime: BotContext wiring + per-chat pending interaction flows.
|
||||
|
||||
Pending flows (Casdoor linking, quote picking, accept/arrive confirmations)
|
||||
are short-lived and single-instance, so they live in memory; anything that
|
||||
must survive restarts (drafts, links) lives in postgres.
|
||||
"""
|
||||
import logging
|
||||
import time
|
||||
from dataclasses import dataclass, field
|
||||
|
||||
from sqlalchemy import select, update
|
||||
|
||||
from app.api.client import ErpClient
|
||||
from app.bale.client import BaleClient
|
||||
from app.config import settings
|
||||
from app.db import SessionLocal
|
||||
from app.models import BotLink, BotMessage
|
||||
from app.resolve import Resolver
|
||||
|
||||
logger = logging.getLogger("bot.runtime")
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Links (postgres)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class LinkStore:
|
||||
async def get(self, chat_id: int) -> BotLink | None:
|
||||
async with SessionLocal() as session:
|
||||
return (await session.execute(
|
||||
select(BotLink).where(BotLink.chat_id == chat_id)
|
||||
)).scalar_one_or_none()
|
||||
|
||||
async def upsert(self, chat_id: int, user_id: str | None, username: str | None,
|
||||
display_name: str | None, role: str | None) -> BotLink:
|
||||
async with SessionLocal() as session:
|
||||
link = (await session.execute(select(BotLink).where(BotLink.chat_id == chat_id))).scalar_one_or_none()
|
||||
if link is None:
|
||||
link = BotLink(chat_id=chat_id)
|
||||
session.add(link)
|
||||
link.user_id = user_id
|
||||
link.casdoor_username = username
|
||||
link.display_name = display_name
|
||||
link.role = role
|
||||
await session.commit()
|
||||
await session.refresh(link)
|
||||
return link
|
||||
|
||||
async def delete(self, chat_id: int) -> bool:
|
||||
async with SessionLocal() as session:
|
||||
result = await session.execute(
|
||||
update(BotLink).where(BotLink.chat_id == chat_id).values(user_id=None, role=None,
|
||||
casdoor_username=None)
|
||||
)
|
||||
await session.commit()
|
||||
return (result.rowcount or 0) > 0
|
||||
|
||||
|
||||
ROLE_FA = {"pm": "مدیر پروژه", "procurement_manager": "مدیر تدارکات", "admin": "ادمین"}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Pending flows (memory) — one per chat
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@dataclass
|
||||
class PendingFlow:
|
||||
kind: str # link_username | link_password | quote_pick | accept | arrive_qty | arrive_confirm
|
||||
data: dict = field(default_factory=dict)
|
||||
created: float = field(default_factory=time.monotonic)
|
||||
|
||||
@property
|
||||
def age_seconds(self) -> float:
|
||||
return time.monotonic() - self.created
|
||||
|
||||
|
||||
class PendingFlows:
|
||||
TTL_SECONDS = 1800
|
||||
|
||||
def __init__(self):
|
||||
self._flows: dict[int, PendingFlow] = {}
|
||||
|
||||
def set(self, chat_id: int, kind: str, data: dict | None = None) -> PendingFlow:
|
||||
flow = PendingFlow(kind=kind, data=data or {})
|
||||
self._flows[chat_id] = flow
|
||||
return flow
|
||||
|
||||
def get(self, chat_id: int) -> PendingFlow | None:
|
||||
flow = self._flows.get(chat_id)
|
||||
if flow and flow.age_seconds > self.TTL_SECONDS:
|
||||
self._flows.pop(chat_id, None)
|
||||
return None
|
||||
return flow
|
||||
|
||||
def pop(self, chat_id: int, default=None):
|
||||
return self._flows.pop(chat_id, default)
|
||||
|
||||
def sweep(self) -> None:
|
||||
for chat_id, flow in list(self._flows.items()):
|
||||
if flow.age_seconds > self.TTL_SECONDS:
|
||||
self._flows.pop(chat_id, None)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Context
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class BotContext:
|
||||
def __init__(self, bale: BaleClient, api: ErpClient):
|
||||
self.bale = bale
|
||||
self.api = api
|
||||
self.resolver = Resolver(api)
|
||||
self.links = LinkStore()
|
||||
self.pending = PendingFlows()
|
||||
|
||||
@property
|
||||
def admin_chat_ids(self) -> set[int]:
|
||||
return settings.admin_chat_ids
|
||||
|
||||
async def send(self, chat_id: int, text: str, reply_markup: dict | None = None,
|
||||
reply_to: int | None = None) -> dict:
|
||||
"""Send + audit-log every outbound message."""
|
||||
try:
|
||||
message = await self.bale.send_message(chat_id, text, reply_markup=reply_markup, reply_to=reply_to)
|
||||
except Exception:
|
||||
logger.exception("failed to send to chat %s", chat_id)
|
||||
message = {}
|
||||
await self._log(chat_id, "out", "text", text)
|
||||
return message
|
||||
|
||||
async def edit(self, chat_id: int, message_id: int | None, text: str,
|
||||
reply_markup: dict | None = None) -> bool:
|
||||
if not message_id:
|
||||
return False
|
||||
try:
|
||||
await self.bale.edit_message_text(chat_id, message_id, text, reply_markup=reply_markup)
|
||||
return True
|
||||
except Exception as exc:
|
||||
logger.warning("failed to edit message %s in chat %s: %s", message_id, chat_id, exc)
|
||||
return False
|
||||
|
||||
async def delete(self, chat_id: int, message_id: int | None) -> bool:
|
||||
if not message_id:
|
||||
return False
|
||||
try:
|
||||
return await self.bale.delete_message(chat_id, message_id)
|
||||
except Exception:
|
||||
logger.exception("failed to delete message %s in chat %s", message_id, chat_id)
|
||||
return False
|
||||
|
||||
async def _log(self, chat_id: int, direction: str, kind: str, body: str | None = None) -> None:
|
||||
try:
|
||||
async with SessionLocal() as session:
|
||||
session.add(BotMessage(chat_id=chat_id, direction=direction, kind=kind, body=body))
|
||||
await session.commit()
|
||||
except Exception:
|
||||
logger.exception("failed to log bot message")
|
||||
|
||||
|
||||
@dataclass
|
||||
class LinkedUser:
|
||||
chat_id: int
|
||||
user_id: str | None
|
||||
display_name: str | None
|
||||
role: str | None
|
||||
is_admin: bool
|
||||
|
||||
@property
|
||||
def actor_id(self) -> str | None:
|
||||
return self.user_id
|
||||
@@ -1,72 +0,0 @@
|
||||
"""Security and token generation for standalone draft review."""
|
||||
import base64
|
||||
import hashlib
|
||||
import hmac
|
||||
import json
|
||||
import time
|
||||
from typing import Any
|
||||
from uuid import UUID
|
||||
|
||||
|
||||
def _b64url_encode(data: bytes) -> str:
|
||||
return base64.urlsafe_b64encode(data).rstrip(b"=").decode("ascii")
|
||||
|
||||
|
||||
def _b64url_decode(s: str) -> bytes:
|
||||
padding = 4 - (len(s) % 4)
|
||||
if padding != 4:
|
||||
s += "=" * padding
|
||||
return base64.urlsafe_b64decode(s.encode("ascii"))
|
||||
|
||||
|
||||
def create_draft_token(
|
||||
draft_id: str | UUID,
|
||||
chat_id: int | None = None,
|
||||
user_id: str | None = None,
|
||||
secret: str = "procurement-draft-secret-change-in-prod-v7",
|
||||
expires_in: int = 7200,
|
||||
) -> str:
|
||||
"""Generate an HMAC-SHA256 signed token for secure draft access."""
|
||||
now = int(time.time())
|
||||
payload = {
|
||||
"draft_id": str(draft_id),
|
||||
"chat_id": chat_id,
|
||||
"user_id": str(user_id) if user_id else None,
|
||||
"iat": now,
|
||||
"exp": now + expires_in,
|
||||
}
|
||||
payload_bytes = json.dumps(payload, separators=(",", ":"), ensure_ascii=False).encode("utf-8")
|
||||
payload_b64 = _b64url_encode(payload_bytes)
|
||||
|
||||
sig = hmac.new(secret.encode("utf-8"), payload_b64.encode("ascii"), hashlib.sha256).digest()
|
||||
sig_b64 = _b64url_encode(sig)
|
||||
|
||||
return f"{payload_b64}.{sig_b64}"
|
||||
|
||||
|
||||
def verify_draft_token(
|
||||
token: str,
|
||||
secret: str = "procurement-draft-secret-change-in-prod-v7",
|
||||
) -> dict[str, Any] | None:
|
||||
"""Verify signature and expiration of a draft token. Return payload or None."""
|
||||
if not token or "." not in token:
|
||||
return None
|
||||
try:
|
||||
payload_b64, sig_b64 = token.split(".", 1)
|
||||
expected_sig = hmac.new(secret.encode("utf-8"), payload_b64.encode("ascii"), hashlib.sha256).digest()
|
||||
actual_sig = _b64url_decode(sig_b64)
|
||||
|
||||
if not hmac.compare_digest(expected_sig, actual_sig):
|
||||
return None
|
||||
|
||||
payload_bytes = _b64url_decode(payload_b64)
|
||||
payload = json.loads(payload_bytes.decode("utf-8"))
|
||||
|
||||
# Check expiration
|
||||
exp = payload.get("exp")
|
||||
if exp is not None and int(exp) < int(time.time()):
|
||||
return None
|
||||
|
||||
return payload
|
||||
except Exception:
|
||||
return None
|
||||
@@ -1,53 +0,0 @@
|
||||
"""Persistent storage for draft attachments (proforma files)."""
|
||||
from datetime import datetime, timezone
|
||||
import logging
|
||||
import os
|
||||
from pathlib import Path
|
||||
import re
|
||||
from uuid import UUID, uuid4
|
||||
|
||||
logger = logging.getLogger("bot.storage")
|
||||
|
||||
|
||||
def sanitize_filename(filename: str) -> str:
|
||||
"""Sanitize filename preserving Persian/Arabic/English letters, numbers, and extensions."""
|
||||
raw = (filename or "proforma.pdf").strip()
|
||||
name = Path(raw).name
|
||||
# Remove control characters and path traversal
|
||||
clean = re.sub(r'[\/\\:\*\?"<>\|\r\n\t]', "_", name)
|
||||
clean = clean.strip(". ")
|
||||
return clean or f"proforma_{uuid4().hex[:8]}.pdf"
|
||||
|
||||
|
||||
async def save_proforma_file(
|
||||
draft_id: str | UUID,
|
||||
file_name: str,
|
||||
content: bytes,
|
||||
mime_type: str | None = None,
|
||||
storage_dir: str = "data/attachments/proformas",
|
||||
) -> dict:
|
||||
"""Save proforma bytes permanently to disk.
|
||||
|
||||
Returns dict metadata for persisting in draft payload.
|
||||
"""
|
||||
clean_name = sanitize_filename(file_name)
|
||||
target_dir = Path(storage_dir) / str(draft_id)
|
||||
target_dir.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
unique_prefix = uuid4().hex[:8]
|
||||
saved_filename = f"{unique_prefix}_{clean_name}"
|
||||
target_path = target_dir / saved_filename
|
||||
|
||||
# Write bytes to disk
|
||||
target_path.write_bytes(content)
|
||||
logger.info("Persisted proforma (%d bytes) to %s", len(content), target_path)
|
||||
|
||||
return {
|
||||
"file_name": clean_name,
|
||||
"saved_filename": saved_filename,
|
||||
"saved_path": str(target_path.resolve()),
|
||||
"relative_path": str(target_path.as_posix()),
|
||||
"size_bytes": len(content),
|
||||
"mime_type": mime_type or "application/octet-stream",
|
||||
"saved_at": datetime.now(timezone.utc).isoformat(),
|
||||
}
|
||||
@@ -1,102 +0,0 @@
|
||||
"""Speech-to-text via an OpenAI-compatible /audio/transcriptions endpoint.
|
||||
|
||||
Bale voice notes arrive as OGG/Opus which not every provider accepts, so the
|
||||
audio is first converted to mono 16 kHz MP3 with ffmpeg (installed in the bot
|
||||
image). Any OpenAI-compatible provider works (OpenAI, GLM, OpenRouter proxies,
|
||||
self-hosted whisper servers exposing the same contract).
|
||||
"""
|
||||
import asyncio
|
||||
import logging
|
||||
import subprocess
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
|
||||
import httpx
|
||||
|
||||
from app.config import Settings
|
||||
|
||||
logger = logging.getLogger("bot.stt")
|
||||
|
||||
_CONVERT_TIMEOUT = 60
|
||||
_STT_TIMEOUT = 120
|
||||
|
||||
|
||||
def _to_mp3(raw: bytes, suffix: str) -> bytes:
|
||||
"""Convert arbitrary audio bytes to mono 16 kHz MP3 using ffmpeg."""
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
src = Path(tmp) / f"in{suffix or '.ogg'}"
|
||||
dst = Path(tmp) / "out.mp3"
|
||||
src.write_bytes(raw)
|
||||
proc = subprocess.run(
|
||||
["ffmpeg", "-y", "-i", str(src), "-vn", "-ac", "1", "-ar", "16000", "-b:a", "64k", str(dst)],
|
||||
capture_output=True,
|
||||
timeout=_CONVERT_TIMEOUT,
|
||||
)
|
||||
if proc.returncode != 0 or not dst.exists():
|
||||
raise RuntimeError(f"ffmpeg failed: {proc.stderr[-400:]!r}")
|
||||
return dst.read_bytes()
|
||||
|
||||
|
||||
async def _call_single_stt(client: httpx.AsyncClient, provider: dict, converted_mp3: bytes) -> dict | None:
|
||||
name = provider.get("name") or "stt"
|
||||
base_url = (provider.get("base_url") or "").rstrip("/")
|
||||
api_key = provider.get("api_key") or ""
|
||||
model = provider.get("model") or "whisper-1"
|
||||
language = provider.get("language") or "fa"
|
||||
timeout = float(provider.get("timeout") or _STT_TIMEOUT)
|
||||
|
||||
url = f"{base_url}/audio/transcriptions"
|
||||
try:
|
||||
resp = await client.post(
|
||||
url,
|
||||
headers={"Authorization": f"Bearer {api_key}"},
|
||||
files={"file": ("voice.mp3", converted_mp3, "audio/mpeg")},
|
||||
data={"model": model, "language": language},
|
||||
timeout=timeout,
|
||||
)
|
||||
if resp.status_code == 200:
|
||||
txt = str((resp.json() or {}).get("text") or "").strip()
|
||||
if txt:
|
||||
logger.info("STT provider %s succeeded: %r", name, txt[:60])
|
||||
return {"name": name, "text": txt, "model": model}
|
||||
else:
|
||||
logger.warning("STT provider %s returned HTTP %s: %s", name, resp.status_code, resp.text[:200])
|
||||
except Exception as exc:
|
||||
logger.warning("STT provider %s failed: %s", name, exc)
|
||||
return None
|
||||
|
||||
|
||||
async def transcribe_multi(settings: Settings, audio: bytes, mime_type: str | None = None,
|
||||
filename: str | None = None) -> list[dict]:
|
||||
"""Transcribe audio with all configured STT providers in parallel.
|
||||
|
||||
Returns a list of candidate dicts: [{"name": str, "text": str, "model": str}, ...]
|
||||
Empty list if all failed or silence.
|
||||
"""
|
||||
providers = settings.stt_providers
|
||||
if not providers:
|
||||
raise RuntimeError("No STT providers are configured (PROCUREMENT_BOT_STT_*)")
|
||||
|
||||
suffix = Path(filename or "").suffix
|
||||
if not suffix and mime_type:
|
||||
suffix = {"audio/ogg": ".ogg", "audio/opus": ".ogg", "audio/mpeg": ".mp3",
|
||||
"audio/mp4": ".m4a", "audio/wav": ".wav"}.get(mime_type.split(";")[0].strip(), ".ogg")
|
||||
converted = await asyncio.to_thread(_to_mp3, audio, suffix)
|
||||
|
||||
async with httpx.AsyncClient(timeout=_STT_TIMEOUT) as client:
|
||||
tasks = [_call_single_stt(client, p, converted) for p in providers]
|
||||
results = await asyncio.gather(*tasks, return_exceptions=True)
|
||||
|
||||
valid_transcripts: list[dict] = []
|
||||
for r in results:
|
||||
if isinstance(r, dict) and r.get("text"):
|
||||
valid_transcripts.append(r)
|
||||
|
||||
return valid_transcripts
|
||||
|
||||
|
||||
async def transcribe(settings: Settings, audio: bytes, mime_type: str | None = None,
|
||||
filename: str | None = None) -> str:
|
||||
"""Return the Persian transcript for a voice note (empty string on silence)."""
|
||||
transcripts = await transcribe_multi(settings, audio, mime_type=mime_type, filename=filename)
|
||||
return transcripts[0]["text"] if transcripts else ""
|
||||
@@ -1,59 +0,0 @@
|
||||
"""Background sync loop: watches bot_drafts for updates from Web Wizard or external API.
|
||||
|
||||
If a draft was updated in the Wizard:
|
||||
- If status == 'active': re-renders review text & keyboard in Bale so chat reflects edits.
|
||||
- If status == 'committed': edits Bale message to show it was committed and removes buttons.
|
||||
- If status == 'cancelled': edits Bale message to show it was cancelled and removes buttons.
|
||||
"""
|
||||
import asyncio
|
||||
import logging
|
||||
from app import drafts as draft_store
|
||||
from app.handlers import quote
|
||||
|
||||
logger = logging.getLogger("bot.sync")
|
||||
|
||||
|
||||
async def sync_drafts_loop(ctx) -> None:
|
||||
while True:
|
||||
try:
|
||||
pending = await draft_store.get_pending_bale_updates()
|
||||
for draft in pending:
|
||||
try:
|
||||
if not draft.review_message_id:
|
||||
await draft_store.set_bale_updated_at(draft.id)
|
||||
continue
|
||||
|
||||
if draft.status == "committed":
|
||||
payload = draft.payload or {}
|
||||
quote_id = payload.get("committed_quote_id") or ""
|
||||
msg = "✅ این پیشنهاد با موفقیت در سیستم ثبت نهایی شد."
|
||||
if quote_id:
|
||||
msg += f"\nشناسه پیشنهاد: {quote_id}"
|
||||
await ctx.bale.edit_message_text(draft.chat_id, draft.review_message_id, msg, reply_markup=None)
|
||||
await draft_store.set_bale_updated_at(draft.id)
|
||||
logger.info("Synced committed draft %s to Bale message %s", draft.id, draft.review_message_id)
|
||||
|
||||
elif draft.status == "cancelled":
|
||||
msg = "❌ این پیش‌نویس لغو شد."
|
||||
await ctx.bale.edit_message_text(draft.chat_id, draft.review_message_id, msg, reply_markup=None)
|
||||
await draft_store.set_bale_updated_at(draft.id)
|
||||
logger.info("Synced cancelled draft %s to Bale message %s", draft.id, draft.review_message_id)
|
||||
|
||||
elif draft.status == "active" and draft.kind == draft_store.KIND_QUOTE:
|
||||
await quote.render(ctx, draft.chat_id, draft, fresh=False)
|
||||
await draft_store.set_bale_updated_at(draft.id)
|
||||
logger.info("Synced active draft %s edits to Bale message %s", draft.id, draft.review_message_id)
|
||||
|
||||
else:
|
||||
await draft_store.set_bale_updated_at(draft.id)
|
||||
|
||||
except Exception as exc:
|
||||
logger.warning("Failed to sync draft %s to Bale: %s", draft.id, exc)
|
||||
await draft_store.set_bale_updated_at(draft.id)
|
||||
|
||||
except asyncio.CancelledError:
|
||||
break
|
||||
except Exception:
|
||||
logger.exception("Error in sync_drafts_loop")
|
||||
|
||||
await asyncio.sleep(1.5)
|
||||
@@ -1,432 +0,0 @@
|
||||
"""Persian message templates (the ERP's user-facing layer is Persian)."""
|
||||
import html
|
||||
from datetime import date
|
||||
|
||||
STATUS_FA = {
|
||||
"offered": "🔵 در انتظار بررسی",
|
||||
"accepted": "🟢 پذیرفته‌شده",
|
||||
"arrived": "✅ رسیده",
|
||||
"rejected": "🔴 ردشده",
|
||||
"expired": "⚪️ منقضی",
|
||||
}
|
||||
|
||||
MISSING_MARKS = {True: "✅", False: "❌"}
|
||||
WARNING_MARK = "⚠️"
|
||||
|
||||
|
||||
def esc(value) -> str:
|
||||
return str(value if value is not None and value != "" else "—")
|
||||
|
||||
|
||||
def g2j(gy: int, gm: int, gd: int) -> tuple[int, int, int]:
|
||||
g_d_m = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334]
|
||||
gy2 = gy if gm > 2 else gy - 1
|
||||
days = 355666 + (365 * gy) + ((gy2 + 3) // 4) - ((gy2 + 99) // 100) + ((gy2 + 399) // 400) + gd + g_d_m[gm - 1]
|
||||
jy = -1595 + (33 * (days // 12053))
|
||||
days %= 12053
|
||||
jy += 4 * (days // 1461)
|
||||
days %= 1461
|
||||
if days > 365:
|
||||
jy += (days - 1) // 365
|
||||
days = (days - 1) % 365
|
||||
if days < 186:
|
||||
jm = 1 + (days // 31)
|
||||
jd = 1 + (days % 31)
|
||||
else:
|
||||
jm = 7 + ((days - 186) // 30)
|
||||
jd = 1 + ((days - 186) % 30)
|
||||
return jy, jm, jd
|
||||
|
||||
|
||||
def fa_num(val, use_fa_digits: bool = True) -> str:
|
||||
"""Format integer/float with thousands separator and Persian digits."""
|
||||
if val is None or val == "":
|
||||
return "—"
|
||||
try:
|
||||
num = float(val)
|
||||
if num.is_integer():
|
||||
s = f"{int(num):,}"
|
||||
else:
|
||||
s = f"{num:,.2f}".rstrip("0").rstrip(".")
|
||||
if use_fa_digits:
|
||||
trans = str.maketrans("0123456789,", "۰۱۲۳۴۵۶۷۸۹٬")
|
||||
return s.translate(trans)
|
||||
return s
|
||||
except (ValueError, TypeError):
|
||||
return str(val)
|
||||
|
||||
|
||||
def fa_digits(val) -> str:
|
||||
"""Convert ASCII digits to Persian digits without thousands separators."""
|
||||
if not val:
|
||||
return ""
|
||||
trans = str.maketrans("0123456789", "۰۱۲۳۴۵۶۷۸۹")
|
||||
return str(val).translate(trans)
|
||||
|
||||
|
||||
def fa_date(value, use_fa_digits: bool = True) -> str:
|
||||
if not value:
|
||||
return "—"
|
||||
s = str(value)[:10]
|
||||
try:
|
||||
parts = [int(p) for p in s.replace("/", "-").split("-")]
|
||||
if len(parts) == 3 and parts[0] > 1900:
|
||||
jy, jm, jd = g2j(parts[0], parts[1], parts[2])
|
||||
res = f"{jy:04d}/{jm:02d}/{jd:02d}"
|
||||
if use_fa_digits:
|
||||
trans = str.maketrans("0123456789", "۰۱۲۳۴۵۶۷۸۹")
|
||||
return res.translate(trans)
|
||||
return res
|
||||
except Exception:
|
||||
pass
|
||||
if use_fa_digits:
|
||||
trans = str.maketrans("0123456789", "۰۱۲۳۴۵۶۷۸۹")
|
||||
return s.translate(trans)
|
||||
return s
|
||||
|
||||
|
||||
WELCOME = (
|
||||
"سلام! 👋 من دستیار تدارکات هستم.\n\n"
|
||||
"می‌توانی با پیام متنی یا صوتی فعالیتی تعریف کنی — مثلاً:\n"
|
||||
"«سازان نو برای پروژه برج آسمان، ۵۰۰ کیلو میلگرد A3، هر کیلو ۴۵ تومن، پرداخت ۳ فاز»\n\n"
|
||||
"من هر چه را فهمیدم به‌صورت پیش‌نویس آماده می‌کنم، چیزی که فهمیدم و چیزهای خالی را نشان "
|
||||
"می‌دهم و فقط با تأیید تو در سیستم ثبت می‌کنم.\n\n"
|
||||
"دستورها:\n"
|
||||
"/drafts — پیش‌نویس‌های باز\n"
|
||||
"/cancel — لغو پیش‌نویس/عملیات جاری\n"
|
||||
"/whoami — اتصال من\n"
|
||||
"/unlink — قطع اتصال\n"
|
||||
"/help — راهنما"
|
||||
)
|
||||
|
||||
HELP = (
|
||||
"چه کارهایی می‌توانم بکنم؟\n\n"
|
||||
"🧾 ثبت استعلام — تأمین‌کننده، پروژه، اقلام (کالا/مقدار/واحد)، قیمت و شرایط پرداخت را از گفتگو درمی‌آورم.\n"
|
||||
"🏢 افزودن تأمین‌کننده — «تأمین‌کننده جدید فلانی، دسته لوله و اتصالات، تلفن ...»\n"
|
||||
"📦 افزودن کالا — «کالای جدید میلگرد A3 با واحد کیلوگرم»\n"
|
||||
"📊 پرس‌وجو — «استعلام‌های در انتظار؟»، «کدام‌ها به‌زودی منقضی می‌شوند؟»\n"
|
||||
"✔️ پذیرش استعلام — «استعلام سازان نو را قبول کن»\n"
|
||||
"🚚 اعلام رسیدن — «اقلام سازان نو رسید، ۵۰۰ کیلو»\n\n"
|
||||
"هر ثبت فقط با دکمه ✅ انجام می‌شود. با /cancel هر چیز نیمه‌کاره را لغو کن."
|
||||
)
|
||||
|
||||
LINK_START = (
|
||||
"برای اتصال حساب Bale به حساب ERP، نام کاربری Casdoor خود را بفرست "
|
||||
"(یا اگر رمز جدا داری همان نام کاربری سامانه). برای لغو: /cancel"
|
||||
)
|
||||
LINK_ASK_PASSWORD = "ممنون. حالا رمز عبور را بفرست (فقط برای یک بار ورود؛ ذخیره نمی‌شود). /cancel برای لغو"
|
||||
LINK_OK = "✅ اتصال انجام شد: {name} ({role})\nحالا می‌توانی فعالیت‌ها را بفرستی. /help را ببین."
|
||||
LINK_FAIL = "ورود ناموفق بود: {detail}\nدوباره /start بزن یا نام کاربری را بفرست."
|
||||
ADMIN_NO_LINK = "حالت ادمین (بدون اتصال) فعال است؛ ثبت‌ها بدون انتساب کاربر انجام می‌شود."
|
||||
|
||||
DRAFTS_LIST_HEADER = "📋 پیش‌نویس‌های باز:"
|
||||
DRAFTS_EMPTY = "پیش‌نویس بازی نداری. یک فعالیت را با متن یا وویس بفرست."
|
||||
NOTHING_TO_COMMIT = "پیش‌نویس بازی برای ثبت نیست؛ اول یک فعالیت بفرست."
|
||||
CANCELLED = "لغو شد. ✔️"
|
||||
UNKNOWN_HINT = (
|
||||
"متوجه منظورت نشد 🤔\n"
|
||||
"می‌توانی مثلاً بگویی: «ثبت استعلام از سازان نو برای ۲۰۰ عدد شیر فلکه» یا /help را ببینی."
|
||||
)
|
||||
UNLINKED = "ابتدا حساب خود را متصل کن: /start"
|
||||
AI_NOT_CONFIGURED = (
|
||||
"پردازش هوشمند تنظیم نشده است (متغیرهای PROCUREMENT_BOT_AI_*). "
|
||||
"با مدیر سیستم تماس بگیر."
|
||||
)
|
||||
STT_FAILED = "نتوانستم پیام صوتی را تبدیل کنم: {detail}"
|
||||
VOICE_EMPTY = "از پیام صوتی متنی شنیده نشد؛ دوباره بگو یا با متن بفرست."
|
||||
ERR_GENERIC = "خطا: {detail}"
|
||||
PICK_QUOTE = "چند استعلام پیدا شد؛ کدام را می‌خواهی؟"
|
||||
QUOTE_NOT_FOUND = "استعلامی برای «{q}» پیدا نکردم."
|
||||
ACCEPT_REPORT = (
|
||||
"✅ پذیرش انجام شد\n"
|
||||
"استعلام #{id}\n"
|
||||
"وضعیت: {status}\n"
|
||||
"اقلام تصمیم‌گیری‌شده: {count}"
|
||||
)
|
||||
ARRIVE_REPORT = (
|
||||
"🚚 ثبت رسید انجام شد\n"
|
||||
"استعلام #{id} — وضعیت: {status}\n{lines}"
|
||||
)
|
||||
ACCEPT_DONE_TS = "شرایط انتخاب‌شده: {label}"
|
||||
|
||||
|
||||
def missing_block(missing: list[dict]) -> str:
|
||||
"""Checklist of missing vs. captured fields."""
|
||||
if not missing:
|
||||
return "همه فیلدها کامل است ✅"
|
||||
lines = []
|
||||
for m in missing:
|
||||
if m.get("ok"):
|
||||
mark = "✅"
|
||||
elif m.get("blocking"):
|
||||
mark = "❌"
|
||||
else:
|
||||
mark = "⚠️"
|
||||
lines.append(f"{mark} {m.get('label')}")
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
def quote_review_text(payload: dict, missing: list[dict], status_note: str | None = None) -> str:
|
||||
lines = ["📋 پیش‌نویس استعلام"]
|
||||
|
||||
has_blocking = any(m.get("blocking") and not m.get("ok") for m in missing)
|
||||
has_warnings = any(not m.get("blocking") and not m.get("ok") for m in missing)
|
||||
|
||||
if not has_blocking and not has_warnings:
|
||||
lines.append("✅ همه‌ی اطلاعات کامل است، آماده ثبت.")
|
||||
elif has_blocking:
|
||||
lines.append("⛔️ به دلیل وارد نکردن موارد اجباری (❌) امکان ثبت نهایی وجود ندارد.")
|
||||
else:
|
||||
lines.append("⚠️ پیش‌نویس ناقص است (موارد اختیاری خالی است)، اما امکان ثبت وجود دارد.")
|
||||
|
||||
if status_note:
|
||||
lines.append(status_note)
|
||||
|
||||
lines.append("━━━━━━━━━━━━━━\n")
|
||||
|
||||
# 🏢 تأمین‌کننده
|
||||
lines.append("🏢 تأمین‌کننده")
|
||||
sup_name = payload.get("supplier_name")
|
||||
is_official = payload.get("is_official", True)
|
||||
official_badge = " (رسمی)" if is_official else " (غیررسمی)"
|
||||
|
||||
if payload.get("supplier_id"):
|
||||
lines.append(f"{sup_name}{official_badge} ✅")
|
||||
if payload.get("supplier_location"):
|
||||
lines.append(f"📍 {payload['supplier_location']}")
|
||||
contact_parts = []
|
||||
if payload.get("supplier_phone"):
|
||||
contact_parts.append(fa_digits(payload["supplier_phone"]))
|
||||
if payload.get("supplier_contact_person"):
|
||||
contact_parts.append(str(payload["supplier_contact_person"]))
|
||||
if contact_parts:
|
||||
lines.append(f"📞 {' — '.join(contact_parts)}")
|
||||
elif sup_name:
|
||||
lines.append(f"{sup_name}{official_badge} ✨ (تأمین‌کننده جدید)")
|
||||
else:
|
||||
lines.append("— (مشخص نشده)")
|
||||
|
||||
cat_name = payload.get("supplier_category_name")
|
||||
if cat_name:
|
||||
lines.append(f"\n🏷️ موضوع: {cat_name}")
|
||||
|
||||
# 📦 اقلام
|
||||
items = payload.get("items") or []
|
||||
total_amount = 0.0
|
||||
has_any_price = False
|
||||
|
||||
if items:
|
||||
lines.append(f"\n📦 اقلام ({fa_num(len(items))})")
|
||||
default_proj = payload.get("project_name")
|
||||
for i, it in enumerate(items, start=1):
|
||||
name = it.get("material_name") or f"قلم {i}"
|
||||
title_parts = [str(name)]
|
||||
if it.get("brand_name"):
|
||||
title_parts.append(str(it["brand_name"]))
|
||||
if it.get("specs"):
|
||||
title_parts.append("، ".join(str(s) for s in it["specs"]))
|
||||
if not it.get("material_id"):
|
||||
title_parts.append("✨ (کالای جدید)")
|
||||
lines.append(f"{fa_num(i)}. {' — '.join(title_parts)}")
|
||||
|
||||
# Project
|
||||
item_proj = it.get("project_name") or default_proj
|
||||
if item_proj:
|
||||
lines.append(f" 🏗️ {item_proj}")
|
||||
else:
|
||||
lines.append(" 🏗️ پروژه مشخص نشده")
|
||||
|
||||
# Qty, Unit, Price, Total
|
||||
qty = it.get("quantity")
|
||||
unit = it.get("unit_name") or ("(واحد کالا)" if it.get("unit_id") else None)
|
||||
unit_price = it.get("unit_price")
|
||||
|
||||
calc_line = " "
|
||||
if qty is not None:
|
||||
calc_line += f"{fa_num(qty)} {unit or ''}".strip()
|
||||
else:
|
||||
calc_line += "مقدار نامشخص"
|
||||
|
||||
if unit_price:
|
||||
has_any_price = True
|
||||
calc_line += f" × {fa_num(unit_price)}"
|
||||
if qty is not None:
|
||||
try:
|
||||
line_sum = float(qty) * float(unit_price)
|
||||
total_amount += line_sum
|
||||
calc_line += f" = {fa_num(line_sum)} تومان"
|
||||
except (ValueError, TypeError):
|
||||
calc_line += " تومان"
|
||||
else:
|
||||
calc_line += " تومان"
|
||||
else:
|
||||
calc_line += " × — = — تومان"
|
||||
|
||||
lines.append(calc_line)
|
||||
|
||||
if has_any_price and total_amount > 0:
|
||||
lines.append(f"\n💰 مجموع مبلغ: {fa_num(total_amount)} تومان")
|
||||
elif not has_any_price:
|
||||
lines.append("\n💰 مجموع مبلغ: محاسبه‌نشده (قیمت اقلام وارد نشده)")
|
||||
else:
|
||||
lines.append("\n📦 اقلام: هنوز چیزی ثبت نشده ❌")
|
||||
|
||||
# 💳 شرایط پرداخت
|
||||
sheets = payload.get("termsheets") or []
|
||||
if sheets:
|
||||
lines.append(f"\n💳 شرایط پرداخت ({fa_num(len(sheets))})")
|
||||
for s_idx, t in enumerate(sheets, start=1):
|
||||
lbl = t.get("label") or f"گزینه {s_idx}"
|
||||
milestones = t.get("milestones") or t.get("schedule_steps") or []
|
||||
if milestones:
|
||||
lines.append(f"▫️ {lbl} — {fa_num(len(milestones))} مرحله")
|
||||
step_sum = 0.0
|
||||
for m in milestones:
|
||||
due = fa_date(m.get("due_date"))
|
||||
amt = m.get("amount")
|
||||
amt_str = f"{fa_num(amt)} تومان" if amt else "مبلغ توافقی"
|
||||
if amt:
|
||||
try:
|
||||
step_sum += float(amt)
|
||||
except (ValueError, TypeError):
|
||||
pass
|
||||
note = f" ({m['note']})" if m.get("note") else ""
|
||||
lines.append(f" • {due} — {amt_str}{note}")
|
||||
|
||||
if total_amount > 0 and step_sum > 0:
|
||||
diff = abs(total_amount - step_sum)
|
||||
if diff < 1.0:
|
||||
lines.append(" ✅ جمع مراحل با مجموع مبلغ برابر است")
|
||||
else:
|
||||
lines.append(f" ⚠️ اختلاف جمع مراحل با مجموع فاکتور: {fa_num(diff)} تومان")
|
||||
if len(items) > 0:
|
||||
lines.append(f" شامل: هر {fa_num(len(items))} قلم")
|
||||
else:
|
||||
disc = ""
|
||||
if t.get("discount_value"):
|
||||
disc = f" (تخفیف {fa_num(t['discount_value'])})"
|
||||
lines.append(f"▫️ {lbl}{disc}")
|
||||
elif items:
|
||||
lines.append("\n💳 شرایط پرداخت: نقدی / توافقی (پیش‌فرض)")
|
||||
|
||||
# Metadata
|
||||
meta_lines = []
|
||||
if payload.get("quote_date"):
|
||||
meta_lines.append(f"🗓️ تاریخ: {fa_date(payload['quote_date'])}")
|
||||
if payload.get("expiry_date"):
|
||||
meta_lines.append(f"⏳ اعتبار: {fa_date(payload['expiry_date'])}")
|
||||
if payload.get("proforma_file"):
|
||||
meta_lines.append(f"📎 پیش‌فاکتور: {payload['proforma_file']}")
|
||||
if payload.get("notes"):
|
||||
meta_lines.append(f"📝 توضیحات: {payload['notes']}")
|
||||
|
||||
if meta_lines:
|
||||
lines.append("")
|
||||
lines.extend(meta_lines)
|
||||
|
||||
# 📋 وضعیت فیلدها (اگر نقصی وجود داشته باشد)
|
||||
if has_blocking or has_warnings:
|
||||
lines.append("\n📋 وضعیت فیلدها:")
|
||||
lines.append(missing_block(missing))
|
||||
|
||||
# Footer
|
||||
lines.append("\n━━━━━━━━━━━━━━")
|
||||
if has_blocking:
|
||||
lines.append("برای تغییر، پیام بفرست (مثلاً «قیمت قلم ۲ شد ۴۶٬۰۰۰»).")
|
||||
lines.append("با پیام بعدی می‌توانی چیزهای خالی را تکمیل کنی، یا با دکمه‌ها ثبت/لغو کنی.")
|
||||
elif has_warnings:
|
||||
lines.append("برای تغییر، پیام بفرست (مثلاً «قیمت قلم ۲ شد ۴۶٬۰۰۰»).")
|
||||
lines.append("می‌توانی چیزهای خالی را تکمیل کنی، یا با دکمه‌ها ثبت/لغو کنی.")
|
||||
else:
|
||||
lines.append("برای تغییر، پیام بفرست (مثلاً «قیمت قلم ۲ شد ۴۶٬۰۰۰»).")
|
||||
lines.append("با پیام بعدی می‌توانی چیزهای خالی را تکمیل کنی، یا با دکمه‌ها ثبت/لغو کنی.")
|
||||
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
def supplier_review_text(payload: dict, missing: list[dict]) -> str:
|
||||
lines = ["🏢 پیش‌نویس تأمین‌کننده جدید", f"نام: {esc(payload.get('name'))}"]
|
||||
lines.append(f"دسته: {esc(payload.get('category_name'))}")
|
||||
if payload.get("phone"):
|
||||
lines.append(f"تلفن: {esc(payload['phone'])}")
|
||||
if payload.get("location"):
|
||||
lines.append(f"موقعیت: {esc(payload['location'])}")
|
||||
if payload.get("contact_person"):
|
||||
lines.append(f"رابط: {esc(payload['contact_person'])}")
|
||||
lines.append("\nوضعیت فیلدها:")
|
||||
lines.append(missing_block(missing))
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
def material_review_text(payload: dict, missing: list[dict]) -> str:
|
||||
lines = ["📦 پیش‌نویس کالای جدید", f"نام: {esc(payload.get('name'))}"]
|
||||
lines.append(f"واحد اصلی: {esc(payload.get('unit_name'))}")
|
||||
if payload.get("topic"):
|
||||
lines.append(f"تاپیک: {esc(payload['topic'])}")
|
||||
lines.append("\nوضعیت فیلدها:")
|
||||
lines.append(missing_block(missing))
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
def quote_committed_report(created: dict, payload: dict, remaining: list[str]) -> str:
|
||||
lines = [f"✅ ثبت شد — استعلام #{esc(created.get('id'))}"]
|
||||
sup = (created.get("supplier") or {}).get("name") or payload.get("supplier_name")
|
||||
if sup:
|
||||
lines.append(f"تأمین‌کننده: {esc(sup)}")
|
||||
items = created.get("line_items") or []
|
||||
if items:
|
||||
lines.append(f"اقلام: {len(items)}")
|
||||
sheets = created.get("termsheets") or []
|
||||
if sheets:
|
||||
lines.append(f"شرایط پرداخت: {len(sheets)}")
|
||||
if payload.get("project_id"):
|
||||
lines.append("پروژه: پیوست شد")
|
||||
if remaining:
|
||||
lines.append("\nخالی مانده‌ها (بعداً می‌توانی در برنامه تکمیل کنی):")
|
||||
lines += [f"⚠️ {esc(r)}" for r in remaining]
|
||||
lines.append("\nمرحله بعد: وقتی تصمیم گرفتی، بگو «استعلام را قبول کن» تا پذیرش را با هم انجام دهیم.")
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
def supplier_committed_report(created: dict) -> str:
|
||||
return (
|
||||
f"✅ تأمین‌کننده ثبت شد — {esc(created.get('name'))}\n"
|
||||
f"دسته: {esc((created.get('category') or {}).get('name'))}"
|
||||
)
|
||||
|
||||
|
||||
def material_committed_report(created: dict) -> str:
|
||||
return f"✅ کالا ثبت شد — {esc(created.get('name'))}"
|
||||
|
||||
|
||||
def quote_line(quote: dict) -> str:
|
||||
sup = (quote.get("supplier") or {}).get("name") or quote.get("supplier_id") or "—"
|
||||
items = quote.get("line_items") or []
|
||||
item_names = []
|
||||
for it in items:
|
||||
mat = (it.get("material") or {}).get("name")
|
||||
if mat:
|
||||
qty = it.get("quantity")
|
||||
item_names.append(f"{mat} ({qty})" if qty else mat)
|
||||
tail = f" — {'، '.join(item_names[:3])}" + ("…" if len(item_names) > 3 else "") if item_names else ""
|
||||
return (
|
||||
f"#{str(quote.get('id'))[:8]} — {esc(sup)} — {STATUS_FA.get(quote.get('status'), quote.get('status'))} — "
|
||||
f"{fa_date(quote.get('quote_date'))}{tail}"
|
||||
)
|
||||
|
||||
|
||||
def status_report(kind: str, quotes: list[dict], extra_note: str | None = None) -> str:
|
||||
titles = {
|
||||
"pending": "🔵 استعلام‌های در انتظار بررسی",
|
||||
"accepted": "🟢 پذیرفته‌شده (در انتظار تحویل)",
|
||||
"arrived": "✅ رسیده",
|
||||
"expiring": "⏳ به‌زودی منقضی می‌شوند (۷ روز آینده)",
|
||||
"recent": "🕘 آخرین استعلام‌ها",
|
||||
}
|
||||
if not quotes:
|
||||
return f"{titles.get(kind, 'نتیجه‌ای')}\nموردی نیست."
|
||||
lines = [titles.get(kind, "استعلام‌ها")]
|
||||
if extra_note:
|
||||
lines.append(extra_note)
|
||||
lines += [f"• {quote_line(q)}" for q in quotes[:10]]
|
||||
return "\n".join(lines)
|
||||
@@ -1,172 +0,0 @@
|
||||
# Setup & Operations Guide
|
||||
|
||||
A Bale messenger bot that turns Persian **chat messages and voice notes** into
|
||||
procurement actions in the ERP. It works **draft-first**: it captures what it
|
||||
understood, tells you exactly **what it did** and **what is still empty**, and
|
||||
**commits only after you approve** with a ✅ button.
|
||||
|
||||
Bale's Bot API is a Telegram-compatible clone hosted at `tapi.bale.ai`, so the
|
||||
bot uses the familiar `getUpdates` long-polling — **no public port, no webhook,
|
||||
no TLS setup**.
|
||||
|
||||
---
|
||||
|
||||
## What it can do (v1)
|
||||
|
||||
| Activity | Example (voice or text) | Committed via |
|
||||
|---|---|---|
|
||||
| Register a supplier quote | «سازان نو برای پروژه برج آسمان ۵۰۰ کیلو میلگرد A3 سایز ۱۴، هر کیلو ۴۵ تومن، پرداخت ۳ فاز» | `POST /quotes` (nested create) |
|
||||
| Add a supplier | «تأمین‌کننده جدید پروفیل بر، دسته لوله و اتصالات، تلفن ۰۹۱۲…» | `POST /suppliers` |
|
||||
| Add a material | «کالای جدید میلگرد A3 سایز ۱۸ با واحد کیلوگرم» | `POST /materials` |
|
||||
| Status queries | «استعلام‌های در انتظار؟» / «کدام‌ها به‌زودی منقضی می‌شوند؟» | `GET /quotes?…` |
|
||||
| Accept a quote | «استعلام سازان نو را قبول کن» | `PATCH /quotes/{id}/accept` |
|
||||
| Announce a delivery | «اقلام سازان نو رسید، ۵۰۰ و ۲۰۰» | `PATCH /quotes/{id}/arrive-items` |
|
||||
|
||||
### The draft → approve loop (the core idea)
|
||||
|
||||
1. You send a message (or voice note). The bot converts voice to text
|
||||
(STT) and extracts an **intent + entities** (LLM).
|
||||
2. Names are fuzzy-matched against the ERP (supplier / material / unit /
|
||||
project). Multiple candidates → inline **pick buttons**; no match → it is
|
||||
listed as missing.
|
||||
3. The bot replies with a **review card**: everything it captured, plus a
|
||||
✅/⚠️/❌ **list of what is still empty** («یادآوری چیزهای خالی»).
|
||||
4. You keep chatting to refine («قیمت میلگرد ۴۷ شد», «پروژه برج آسمان») — the
|
||||
open draft is updated and re-rendered.
|
||||
5. **Nothing is written to the ERP until you tap ✅ ثبت نهایی.** Partial
|
||||
commits are possible («ثبت فقط اقلام مشخص») because the API deliberately
|
||||
tolerates incomplete quotes. After commit you get the created quote id and
|
||||
the list of fields that were left empty.
|
||||
|
||||
### Team access & attribution
|
||||
|
||||
- Every user links their Bale chat to their ERP account once: `/start` →
|
||||
Casdoor **username** → **password** (validated through the real
|
||||
`POST /auth/login`; the password is used once and never stored).
|
||||
- Mutating API calls carry `X-Actor-Id: <users.id>` so `quote_events.actor`
|
||||
records the **human** who asked, not the bot. (The bot's container talks to
|
||||
the api in-network: `http://api:8000/api/v1`.)
|
||||
- `BALE_ADMIN_CHAT_IDS` may list chat ids that bypass linking.
|
||||
|
||||
### Commands
|
||||
|
||||
`/start` · `/help` · `/drafts` (open drafts) · `/cancel` (abort draft/flow) ·
|
||||
`/whoami` · `/unlink`
|
||||
|
||||
---
|
||||
|
||||
## Setup
|
||||
|
||||
1. **Create the bot** in Bale's BotFather and copy the token.
|
||||
2. **Configure an AI provider** — any OpenAI-compatible endpoint works for
|
||||
both STT (`POST {base}/audio/transcriptions`, Persian) and the LLM
|
||||
(`POST {base}/chat/completions`, JSON mode). Examples: OpenAI `whisper-1`
|
||||
+ `gpt-4o-mini`, or any proxy/provider you already use.
|
||||
3. **Compose** (dev):
|
||||
|
||||
```powershell
|
||||
# env passed at compose level (or a .env next to docker-compose.yml)
|
||||
$env:BALE_BOT_TOKEN = "<token>"
|
||||
$env:AI_BASE_URL = "https://api.openai.com/v1"
|
||||
$env:AI_API_KEY = "<key>"
|
||||
|
||||
docker compose up -d --build bot
|
||||
docker compose logs -f bot
|
||||
```
|
||||
|
||||
For Coolify (`docker-compose.coolify.yml`) set the same variables as
|
||||
service-level env vars; the bot container needs no domain/labels.
|
||||
|
||||
### Environment variables (prefix `PROCUREMENT_BOT_`)
|
||||
|
||||
| Variable | Default | Purpose |
|
||||
|---|---|---|
|
||||
| `BOT_TOKEN` | — (required) | token from Bale's BotFather |
|
||||
| `BALE_API_BASE` | `https://tapi.bale.ai` | Bot API base (overridable for tests) |
|
||||
| `API_BASE_URL` | `http://localhost:8000/api/v1` | ERP api (in Docker: `http://api:8000/api/v1`) |
|
||||
| `DATABASE_URL` | same postgres as the api | bot's own tables (`bot_*`) |
|
||||
| `AI_BASE_URL` / `AI_API_KEY` | — | OpenAI-compatible STT+LLM provider |
|
||||
| `STT_MODEL` / `LLM_MODEL` | `whisper-1` / `gpt-4o-mini` | model names at the provider |
|
||||
| `ADMIN_CHAT_IDS` | — | comma-separated Bale chat ids allowed without linking |
|
||||
| `SERVICE_TOKEN` | — | optional bearer for the day procurement endpoints enforce auth |
|
||||
| `DRAFT_TTL_HOURS` | `24` | drafts older than this are marked expired |
|
||||
|
||||
In compose these are fed from `BALE_BOT_TOKEN`, `BALE_API_BASE`, `AI_BASE_URL`,
|
||||
`AI_API_KEY`, `AI_STT_MODEL`, `AI_LLM_MODEL`, `BALE_ADMIN_CHAT_IDS`,
|
||||
`BALE_SERVICE_TOKEN`.
|
||||
|
||||
---
|
||||
|
||||
## How it's built
|
||||
|
||||
```
|
||||
bot/
|
||||
├── Dockerfile python:3.13-slim + ffmpeg (voice conversion)
|
||||
├── app/
|
||||
│ ├── main.py ensure tables → sweeper task → poll loop
|
||||
│ ├── config.py pydantic-settings, PROCUREMENT_BOT_ prefix
|
||||
│ ├── bale/client.py getUpdates/sendMessage/edit/callbacks/getFile+download
|
||||
│ ├── api/client.py ERP /api/v1 client (X-Actor-Id attribution)
|
||||
│ ├── stt.py ffmpeg (OGG/Opus → MP3) → /audio/transcriptions
|
||||
│ ├── nlu.py Persian intent+entity extraction (JSON mode)
|
||||
│ ├── resolve.py fuzzy name→id matching (difflib + ilike search)
|
||||
│ ├── drafts.py draft store + QuoteCreate payload builder + missing-field logic
|
||||
│ ├── keyboards.py inline keyboards (callback_data ≤ 64 B op-codes)
|
||||
│ ├── texts.py Persian message templates
|
||||
│ ├── runtime.py context, link store, in-memory pending flows
|
||||
│ ├── models.py / db_init.py bot_links / bot_drafts / bot_messages / bot_meta (idempotent DDL)
|
||||
│ └── handlers/ dispatch, commands, callbacks, links,
|
||||
│ quote, supplier, material, queries, decisions
|
||||
└── tools/smoke_test.py offline end-to-end harness (fake Bale/ERP/AI, in-memory store)
|
||||
```
|
||||
|
||||
Design notes:
|
||||
|
||||
- **Draft state lives in postgres** (`bot_drafts.payload` JSONB in the shape of
|
||||
the eventual API request), so drafts survive bot restarts; short-lived
|
||||
interactions (linking, quote picking, accept/arrive confirmations) are
|
||||
in-memory with a 30-minute TTL.
|
||||
- **Callback grammar** fits Bale's 64-byte `callback_data`:
|
||||
`q:ok:{draft8}` (commit), `pk:{draft8}:{field}:{idx}` (pick candidate),
|
||||
`ac:ts:{i}` (choose payment terms), `ar:full` / `ar:ok` (delivery)…
|
||||
- **Persian handling**: Persian/Arabic digits are normalized before parsing;
|
||||
fuzzy matching folds ZWNJ and Arabic ya/ka; all user-facing text is Persian.
|
||||
- **Voice notes** arrive as OGG/Opus; ffmpeg converts to mono 16 kHz MP3
|
||||
before hitting the STT endpoint (accepted by essentially all providers).
|
||||
- The **accept flow echoes the termsheet's existing `schedule_steps`** back to
|
||||
`PATCH /quotes/{id}/accept` (the API replaces steps with what you send, so
|
||||
the bot must send the current ones).
|
||||
|
||||
### Attribution tweak in the api (backward compatible)
|
||||
|
||||
`backend/app/utils/security.py::get_actor` now prefers an `X-Actor-Id` header
|
||||
over the raw bearer token when attributing `quote_events.actor`. Requests
|
||||
without that header behave exactly as before.
|
||||
|
||||
---
|
||||
|
||||
## Testing
|
||||
|
||||
Offline harness (no Bale token, no DB, no AI key — stubs everything and drives
|
||||
the real handler pipeline with fake updates):
|
||||
|
||||
```powershell
|
||||
docker compose run --rm bot python tools/smoke_test.py
|
||||
# or, with the requirements installed locally:
|
||||
cd bot && python tools/smoke_test.py
|
||||
```
|
||||
|
||||
Covers: linking, voice→draft, ambiguous-material pick buttons, unit fallback,
|
||||
draft refinement, commit payload shape (temp_id cross-references), supplier /
|
||||
material commits, status digest, accept payload (steps echoed, per-item price),
|
||||
arrival quantities («۵۰۰ و ۲۰۰»), cancel and unknown-intent handling.
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
| Symptom | Likely cause |
|
||||
|---|---|
|
||||
| Bot silent | wrong `BALE_BOT_TOKEN`; check `docker compose logs bot` |
|
||||
| «پردازش هوشمند تنظیم نشده است» | `AI_BASE_URL` / `AI_API_KEY` missing |
|
||||
| Voice → «نتوانستم پیام صوتی را تبدیل کنم» | provider rejected the model name (`STT_MODEL`) or key |
|
||||
| «ERP API unreachable» | api container not up / wrong `API_BASE_URL` |
|
||||
| Draft disappears | TTL expiry (`DRAFT_TTL_HOURS`) or someone pressed ❌ / `/cancel` |
|
||||
Binary file not shown.
@@ -1,44 +0,0 @@
|
||||
# ERP integration pack
|
||||
|
||||
The agent is a **standalone container** — it talks to the ERP exclusively over
|
||||
HTTP and keeps its own state in its own `bot_*` tables. Integrating it into the
|
||||
[ERP stack](https://git.bennu-api-bahrestan.ir/ali_mohaghegh/ERP) needs exactly
|
||||
two things:
|
||||
|
||||
## 1. Compose service
|
||||
|
||||
Add [`erp-compose-service.yml`](erp-compose-service.yml) to the ERP's
|
||||
`docker-compose.yml` (and the Coolify variant). The bot long-polls Bale, so it
|
||||
needs **no ports, no webhook, no TLS** — it joins the compose `default` network
|
||||
and reaches `http://api:8000/api/v1` in-network.
|
||||
|
||||
Credentials/env are passed at compose level from a `.env` next to the compose
|
||||
file: `BALE_BOT_TOKEN`, `AI_BASE_URL`, `AI_API_KEY`, `AI_LLM_MODEL`
|
||||
(see [`../.env.example`](../.env.example) for the full list).
|
||||
|
||||
> If your stack is started with multiple `-f` files (e.g. a prod_v2 checkout +
|
||||
> port-remap override), keep using the same chain — the `bot` service merges in
|
||||
> like any other service and the override's host-port remaps don't affect it.
|
||||
|
||||
## 2. Per-user attribution in the API
|
||||
|
||||
Apply [`x-actor-id.patch`](x-actor-id.patch) — a ~6-line, fully
|
||||
backward-compatible change to `backend/app/utils/security.py`:
|
||||
|
||||
- before: `get_actor` returns the raw `Authorization: Bearer …` string and
|
||||
`quote_events.actor` stores the bot's token;
|
||||
- after: an `X-Actor-Id: <users.id>` header (sent by the bot for every mutating
|
||||
call, carrying the **linked ERP user's id**) takes precedence, so the audit
|
||||
trail records the human who asked, not the bot.
|
||||
|
||||
Requests without the header behave exactly as before.
|
||||
|
||||
## What the agent does NOT touch
|
||||
|
||||
- No ERP code is imported by the bot (HTTP-only, own postgres tables
|
||||
`bot_links` / `bot_drafts` / `bot_messages` / `bot_meta`, created idempotently
|
||||
at startup with `CREATE TABLE IF NOT EXISTS`).
|
||||
- No Alembic migration needed — the bot owns its schema.
|
||||
- The ERP's data model stays untouched; committed drafts flow through the
|
||||
ordinary public endpoints (`POST /quotes`, `PATCH /quotes/{id}/accept`,
|
||||
`PATCH /quotes/{id}/arrive-items`, `POST /suppliers`, `POST /materials`).
|
||||
@@ -1,39 +0,0 @@
|
||||
# ==========================================================================
|
||||
# Add this service to the ERP stack's docker-compose.yml (and mirror it in
|
||||
# docker-compose.coolify.yml with `container_name: procurement-bot`).
|
||||
#
|
||||
# It expects THIS repository checked out (or vendored) next to the ERP repo
|
||||
# as `./bot` — either `git clone … bot` inside the ERP checkout, or change
|
||||
# `context:` to an absolute/relative path to this repo.
|
||||
#
|
||||
# In-container URLs are unaffected by host port remaps (postgres/api are
|
||||
# reached over the compose network, not host ports).
|
||||
# ==========================================================================
|
||||
services:
|
||||
bot:
|
||||
build:
|
||||
context: ./bot # ← path to this repository
|
||||
dockerfile: Dockerfile
|
||||
container_name: procurement-bot
|
||||
|
||||
environment:
|
||||
PROCUREMENT_BOT_BOT_TOKEN: ${BALE_BOT_TOKEN:-}
|
||||
PROCUREMENT_BOT_BALE_API_BASE: ${BALE_API_BASE:-https://tapi.bale.ai}
|
||||
PROCUREMENT_BOT_API_BASE_URL: http://api:8000/api/v1
|
||||
PROCUREMENT_BOT_DATABASE_URL: postgresql+asyncpg://postgres:postgres@postgres:5432/procurement
|
||||
PROCUREMENT_BOT_AI_BASE_URL: ${AI_BASE_URL:-}
|
||||
PROCUREMENT_BOT_AI_API_KEY: ${AI_API_KEY:-}
|
||||
PROCUREMENT_BOT_STT_MODEL: ${AI_STT_MODEL:-whisper-1}
|
||||
PROCUREMENT_BOT_STT_BASE_URL: ${AI_STT_BASE_URL:-}
|
||||
PROCUREMENT_BOT_STT_API_KEY: ${AI_STT_API_KEY:-}
|
||||
PROCUREMENT_BOT_LLM_MODEL: ${AI_LLM_MODEL:-gpt-4o-mini}
|
||||
PROCUREMENT_BOT_ADMIN_CHAT_IDS: ${BALE_ADMIN_CHAT_IDS:-}
|
||||
PROCUREMENT_BOT_SERVICE_TOKEN: ${BALE_SERVICE_TOKEN:-}
|
||||
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
api:
|
||||
condition: service_started
|
||||
|
||||
restart: unless-stopped
|
||||
@@ -1,18 +0,0 @@
|
||||
diff --git a/backend/app/utils/security.py b/backend/app/utils/security.py
|
||||
index a78c1cb..75e7349 100644
|
||||
--- a/backend/app/utils/security.py
|
||||
+++ b/backend/app/utils/security.py
|
||||
@@ -7,7 +7,13 @@ def get_actor(request: Request) -> str | None:
|
||||
|
||||
This is the reserved placeholder from the contract — no authentication
|
||||
or authorization is enforced yet.
|
||||
+
|
||||
+ Services acting on behalf of a user (the Bale bot) pass ``X-Actor-Id``
|
||||
+ (users.id); it wins over the raw token so the audit trail shows the human.
|
||||
"""
|
||||
+ actor_id = request.headers.get("X-Actor-Id")
|
||||
+ if actor_id:
|
||||
+ return actor_id.strip()
|
||||
auth = request.headers.get("Authorization")
|
||||
if auth and auth.lower().startswith("bearer "):
|
||||
return auth[7:].strip() or None
|
||||
Binary file not shown.
@@ -1,5 +0,0 @@
|
||||
httpx>=0.27.0
|
||||
sqlalchemy[asyncio]>=2.0.30
|
||||
asyncpg>=0.29.0
|
||||
pydantic>=2.7.0
|
||||
pydantic-settings>=2.2.0
|
||||
@@ -1,448 +0,0 @@
|
||||
"""Offline smoke test for the Bale bot — no Bale network, no postgres, no AI keys.
|
||||
|
||||
It stubs the Bale client, the ERP API client, STT and the NLU module, replaces
|
||||
the draft store with an in-memory fake, then drives the real handler pipeline
|
||||
end-to-end through fake updates (text, voice, inline-button callbacks).
|
||||
|
||||
Run inside the bot container (or anywhere the requirements are installed):
|
||||
|
||||
python tools/smoke_test.py
|
||||
|
||||
Exit code 0 = all checks passed.
|
||||
"""
|
||||
import asyncio
|
||||
import os
|
||||
import sys
|
||||
import types
|
||||
from pathlib import Path
|
||||
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
|
||||
|
||||
# asyncpg is only needed when a real connection opens; stub it so app.db imports.
|
||||
try:
|
||||
import asyncpg # noqa: F401
|
||||
except ImportError:
|
||||
sys.modules.setdefault("asyncpg", types.ModuleType("asyncpg"))
|
||||
|
||||
CHAT = 100200300
|
||||
|
||||
_passed = _failed = 0
|
||||
|
||||
|
||||
def check(name: str, ok: bool, detail: str = "") -> None:
|
||||
global _passed, _failed
|
||||
ok = bool(ok)
|
||||
mark = "PASS" if ok else "FAIL"
|
||||
print(f"[{mark}] {name}" + (f" — {detail}" if detail and not ok else ""))
|
||||
_passed += ok
|
||||
_failed += (not ok)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# fakes
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class FakeBale:
|
||||
def __init__(self):
|
||||
self.sent: list[dict] = []
|
||||
self.edited: list[dict] = []
|
||||
self.answered: list[str] = []
|
||||
self._mid = 0
|
||||
|
||||
async def send_message(self, chat_id, text, reply_markup=None, reply_to=None):
|
||||
self._mid += 1
|
||||
self.sent.append({"chat_id": chat_id, "text": text, "reply_markup": reply_markup})
|
||||
return {"message_id": self._mid, "chat": {"id": chat_id}}
|
||||
|
||||
async def edit_message_text(self, chat_id, message_id, text, reply_markup=None):
|
||||
self.edited.append({"chat_id": chat_id, "message_id": message_id, "text": text,
|
||||
"reply_markup": reply_markup})
|
||||
return {"message_id": message_id}
|
||||
|
||||
async def answer_callback_query(self, callback_query_id, text=None):
|
||||
self.answered.append(callback_query_id)
|
||||
|
||||
async def send_chat_action(self, chat_id, action="typing"):
|
||||
pass
|
||||
|
||||
async def download_file(self, file_id):
|
||||
return b"fake-ogg-bytes"
|
||||
|
||||
def last_text(self) -> str:
|
||||
return self.sent[-1]["text"] if self.sent else ""
|
||||
|
||||
def last_markup(self) -> dict | None:
|
||||
return self.sent[-1]["reply_markup"] if self.sent else None
|
||||
|
||||
|
||||
class FakeApi:
|
||||
"""Canned ERP responses + captured mutation payloads."""
|
||||
|
||||
def __init__(self):
|
||||
self.created_quotes: list[dict] = []
|
||||
self.created_suppliers: list[dict] = []
|
||||
self.created_materials: list[dict] = []
|
||||
self.accept_payloads: list[dict] = []
|
||||
self.arrive_payloads: list[dict] = []
|
||||
self.login_calls: list[dict] = []
|
||||
|
||||
async def login(self, username, password):
|
||||
self.login_calls.append({"username": username, "password": password})
|
||||
if username == "mohaghegh" and password == "secret":
|
||||
return {"access_token": "jwt", "user": {"id": "user-1", "first_name": "علی",
|
||||
"last_name": "محقق", "role": "procurement_manager"}}
|
||||
raise RuntimeError("invalid credentials")
|
||||
|
||||
async def list_suppliers(self, q=None, page_size=20):
|
||||
return [{"id": "sup-1", "name": "سازان نو", "category_id": "cat-2"}]
|
||||
|
||||
async def create_supplier(self, payload, actor_id=None):
|
||||
self.created_suppliers.append(payload)
|
||||
return {"id": "sup-new", "name": payload["name"],
|
||||
"category": {"id": payload["category_id"], "name": "لوله و اتصالات"}}
|
||||
|
||||
async def list_materials(self, q=None, page_size=20):
|
||||
return [
|
||||
{"id": "mat-1", "name": "میلگرد A3 سایز ۱۴", "canonical_unit_id": 3},
|
||||
{"id": "mat-2", "name": "میلگرد A3 سایز ۱۶", "canonical_unit_id": 3},
|
||||
{"id": "mat-3", "name": "شیر فلکه چهارطرفه", "canonical_unit_id": 2},
|
||||
]
|
||||
|
||||
async def create_material(self, payload, actor_id=None):
|
||||
self.created_materials.append(payload)
|
||||
return {"id": "mat-new", "name": payload["name"]}
|
||||
|
||||
async def list_units(self, q=None, page_size=100):
|
||||
return [{"id": 2, "code": "adad", "name_fa": "عدد"},
|
||||
{"id": 3, "code": "kg", "name_fa": "کیلوگرم"}]
|
||||
|
||||
async def list_projects(self, page_size=100):
|
||||
return [{"id": "prj-1", "name": "برج آسمان"}]
|
||||
|
||||
async def list_categories(self, page_size=100):
|
||||
return [{"id": "cat-1", "name": "تأسیسات مکانیکی و آبی"},
|
||||
{"id": "cat-2", "name": "لوله و اتصالات"}]
|
||||
|
||||
def _expanded(self, quote_id, status):
|
||||
"""Realistic GET /quotes?expand=line_items,termsheets,supplier shape."""
|
||||
return {
|
||||
"id": quote_id, "supplier": {"name": "سازان نو"}, "project_id": None, "status": status,
|
||||
"quote_date": "2026-09-10T00:00:00Z", "expiry_date": "2026-09-20",
|
||||
"line_items": [
|
||||
{"id": "li-1", "material": {"name": "میلگرد A3 سایز ۱۴"}, "unit": {"name_fa": "کیلوگرم"},
|
||||
"quantity": 500, "unit_price": 45000, "projects": [],
|
||||
"decision": {"status": "chosen"} if status == "accepted" else None, "receipt": None},
|
||||
{"id": "li-2", "material": {"name": "شیر فلکه چهارطرفه"}, "unit": {"name_fa": "عدد"},
|
||||
"quantity": 200, "unit_price": 90000, "projects": [],
|
||||
"decision": {"status": "chosen"} if status == "accepted" else None, "receipt": None},
|
||||
],
|
||||
"termsheets": [{"id": "ts-1", "label": "۳ فاز", "discount_type": "none", "discount_value": 0,
|
||||
"schedule_steps": [{"step_no": 1, "due_date": "2026-10-01", "amount": 1000}]}],
|
||||
}
|
||||
|
||||
async def list_quotes(self, *, status=None, q=None, expand=None, sort=None, page=1, page_size=10):
|
||||
if status == "offered":
|
||||
return [self._expanded("q-aaaa1111", "offered")], {"total": 1}
|
||||
if status == "accepted":
|
||||
return [self._expanded("q-bbbb2222", "accepted")], {"total": 1}
|
||||
return [], {"total": 0}
|
||||
|
||||
async def get_quote(self, quote_id, expand=None, actor_id=None):
|
||||
return self._expanded(quote_id, "accepted" if quote_id.startswith("q-bbbb") else "offered")
|
||||
|
||||
async def create_quote(self, payload, actor_id=None):
|
||||
self.created_quotes.append(payload)
|
||||
return {"id": "q-new", "supplier": {"name": "سازان نو"},
|
||||
"line_items": payload.get("line_items") or [],
|
||||
"termsheets": payload.get("termsheets") or []}
|
||||
|
||||
async def accept_quote(self, quote_id, payload, actor_id=None):
|
||||
self.accept_payloads.append({"quote_id": quote_id, "payload": payload})
|
||||
return {"id": quote_id, "status": "accepted", "line_items": [{"id": "li-1", "decision": {}}]}
|
||||
|
||||
async def arrive_items(self, quote_id, payload, actor_id=None):
|
||||
self.arrive_payloads.append({"quote_id": quote_id, "payload": payload})
|
||||
return {"id": quote_id, "status": "arrived",
|
||||
"items": [{"line_item_id": it["line_item_id"], "received_qty": float(it["received_qty"])}
|
||||
for it in payload["items"]]}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# in-memory draft store + link store
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
MEM: dict = {"drafts": {}, "links": {}}
|
||||
|
||||
|
||||
def _install_fake_stores() -> None:
|
||||
import uuid as _uuid
|
||||
|
||||
import app.drafts as drafts
|
||||
import app.runtime as runtime
|
||||
|
||||
async def create(chat_id, kind, payload, source=None):
|
||||
draft_id = _uuid.uuid4()
|
||||
draft = types.SimpleNamespace(id=str(draft_id), chat_id=chat_id, kind=kind, payload=payload,
|
||||
missing=None, status="active", source=source,
|
||||
review_message_id=None)
|
||||
MEM["drafts"][str(draft_id)] = draft
|
||||
return draft
|
||||
|
||||
async def get_active(chat_id, kind=None):
|
||||
found = [d for d in MEM["drafts"].values()
|
||||
if d.chat_id == chat_id and d.status == "active" and (kind is None or d.kind == kind)]
|
||||
return max(found, key=lambda d: d.id) if found else None
|
||||
|
||||
async def get_by_prefix(prefix, chat_id=None):
|
||||
for draft in MEM["drafts"].values():
|
||||
if draft.id.startswith(prefix) and (chat_id is None or draft.chat_id == chat_id):
|
||||
return draft
|
||||
return None
|
||||
|
||||
async def save_payload(draft, missing=None, review_message_id=None):
|
||||
draft.missing = missing
|
||||
if review_message_id:
|
||||
draft.review_message_id = review_message_id
|
||||
|
||||
async def set_status(draft_id, status):
|
||||
if draft_id in MEM["drafts"]:
|
||||
MEM["drafts"][draft_id].status = status
|
||||
|
||||
async def expire_stale(ttl_hours):
|
||||
return 0
|
||||
|
||||
drafts.create, drafts.get_active, drafts.get_by_prefix = create, get_active, get_by_prefix
|
||||
drafts.save_payload, drafts.set_status, drafts.expire_stale = save_payload, set_status, expire_stale
|
||||
|
||||
async def link_get(self, chat_id):
|
||||
return MEM["links"].get(chat_id)
|
||||
|
||||
async def link_upsert(self, chat_id, user_id, username, display_name, role):
|
||||
MEM["links"][chat_id] = types.SimpleNamespace(chat_id=chat_id, user_id=user_id,
|
||||
casdoor_username=username,
|
||||
display_name=display_name, role=role)
|
||||
return MEM["links"][chat_id]
|
||||
|
||||
async def link_delete(self, chat_id):
|
||||
return MEM["links"].pop(chat_id, None) is not None
|
||||
|
||||
runtime.LinkStore.get, runtime.LinkStore.upsert, runtime.LinkStore.delete = link_get, link_upsert, link_delete
|
||||
|
||||
|
||||
async def fake_log(self, chat_id, direction, kind, body=None):
|
||||
pass
|
||||
|
||||
|
||||
NLU_QUEUE: list[dict] = []
|
||||
|
||||
|
||||
async def fake_understand(settings, text, draft_summary=None):
|
||||
return NLU_QUEUE.pop(0) if NLU_QUEUE else {"intent": "unknown", "patch": {}, "confidence": 0}
|
||||
|
||||
|
||||
async def fake_transcribe(settings, audio, mime_type=None, filename=None):
|
||||
return ("سازان نو برای پروژه برج آسمان ۵۰۰ کیلو میلگرد A3 سایز ۱۴ هر کیلو ۴۵ هزار تومن "
|
||||
"پرداخت سه فاز")
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# driver
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def build_ctx():
|
||||
import app.handlers as H
|
||||
from app.resolve import Resolver
|
||||
from app.runtime import BotContext
|
||||
|
||||
bale, api = FakeBale(), FakeApi()
|
||||
ctx = BotContext(bale, api)
|
||||
ctx.bale = bale
|
||||
ctx.api = api
|
||||
ctx.resolver = Resolver(api)
|
||||
ctx._log = types.MethodType(fake_log, ctx)
|
||||
H.understand = fake_understand
|
||||
H.transcribe = fake_transcribe
|
||||
return ctx, bale, api
|
||||
|
||||
|
||||
def text_update(update_id, text):
|
||||
return {"update_id": update_id, "message": {"chat": {"id": CHAT}, "text": text, "from": {"id": CHAT}}}
|
||||
|
||||
|
||||
def voice_update(update_id):
|
||||
return {"update_id": update_id,
|
||||
"message": {"chat": {"id": CHAT}, "voice": {"file_id": "v1", "mime_type": "audio/ogg", "duration": 6}}}
|
||||
|
||||
|
||||
def callback_update(update_id, data):
|
||||
return {"update_id": update_id, "callback_query": {"id": f"cb{update_id}", "data": data,
|
||||
"message": {"chat": {"id": CHAT}}}}
|
||||
|
||||
|
||||
async def main() -> int:
|
||||
_install_fake_stores()
|
||||
from app.drafts import build_quote_request, compute_quote_missing, merge_quote_patch, new_quote_payload
|
||||
import app.handlers as H
|
||||
from app.nlu import _extract_json, normalize_digits
|
||||
|
||||
# ---- pure logic -------------------------------------------------------
|
||||
check("digits: ۵۰۰→500", normalize_digits("۵۰۰ کیلو") == "500 کیلو")
|
||||
check("json extract: fenced", (_extract_json('```json\n{"a": 1}\n```') or {}) == {"a": 1})
|
||||
|
||||
payload = new_quote_payload()
|
||||
merge_quote_patch(payload, {
|
||||
"supplier_name": "سازان نو",
|
||||
"items": [{"material_name": "میلگرد A3", "quantity": 500, "unit_price": 45000}],
|
||||
"payment_terms": [{"label": "۳ فاز"}],
|
||||
})
|
||||
merge_quote_patch(payload, {"items": [{"material_name": "میلگرد A3", "quantity": 600}]})
|
||||
check("merge: no dup item", len(payload["items"]) == 1)
|
||||
check("merge: qty updated", payload["items"][0]["quantity"] == 600)
|
||||
check("merge: terms added", payload["termsheets"][0]["label"] == "۳ فاز")
|
||||
missing = compute_quote_missing(payload)
|
||||
check("missing: supplier empty", any(m["key"] == "supplier" and not m["ok"] for m in missing))
|
||||
body, problems = build_quote_request(payload)
|
||||
check("build: blocked without supplier", body is None)
|
||||
|
||||
# ---- pipeline: linking gate -------------------------------------------
|
||||
ctx, bale, api = build_ctx()
|
||||
await H.handle_update(ctx, text_update(1, "سلام"))
|
||||
check("gate: unlinked asked username", "نام کاربری" in bale.last_text())
|
||||
|
||||
await H.handle_update(ctx, text_update(2, "mohaghegh"))
|
||||
await H.handle_update(ctx, text_update(3, "secret"))
|
||||
check("link: login called", api.login_calls and api.login_calls[0]["username"] == "mohaghegh")
|
||||
check("link: linked greeting", "اتصال انجام شد" in bale.last_text())
|
||||
|
||||
# ---- voice → draft quote ----------------------------------------------
|
||||
NLU_QUEUE.append({"intent": "register_quote", "confidence": 0.9, "patch": {
|
||||
"supplier_name": "سازان نو", "project_name": "برج آسمان",
|
||||
"items": [{"material_name": "میلگرد", "quantity": 500, "unit_name": "کیلوگرم",
|
||||
"unit_price": 45000}],
|
||||
"payment_terms": [{"label": "۳ فاز", "description": "سه قسط"}],
|
||||
}})
|
||||
await H.handle_update(ctx, voice_update(4))
|
||||
draft = await _active("quote")
|
||||
check("voice: draft created", draft is not None)
|
||||
check("voice: supplier resolved", draft.payload.get("supplier_id") == "sup-1")
|
||||
check("voice: project resolved", draft.payload.get("project_id") == "prj-1")
|
||||
item = (draft.payload.get("items") or [{}])[0]
|
||||
check("voice: material ambiguous → pick buttons", "mat1" in (draft.payload.get("options") or {}))
|
||||
check("voice: review shows missing list", "وضعیت فیلدها" in bale.last_text())
|
||||
check("voice: review mentions unit", "کیلوگرم" in bale.last_text())
|
||||
|
||||
# pick the material via inline button
|
||||
markup = bale.last_markup() or {}
|
||||
pick_data = _first_callback(markup, "pk:")
|
||||
check("voice: pick callback present", pick_data is not None and ":mat1:0" in pick_data)
|
||||
await H.handle_update(ctx, callback_update(5, pick_data))
|
||||
item = (draft.payload.get("items") or [{}])[0]
|
||||
check("pick: material resolved", item.get("material_id") == "mat-1")
|
||||
check("pick: unit resolved from spoken name", str(item.get("unit_id")) == "3" and item.get("unit_explicit") is True)
|
||||
|
||||
# refine price via follow-up text
|
||||
NLU_QUEUE.append({"intent": "update_draft", "confidence": 0.8, "patch": {
|
||||
"items": [{"material_name": "میلگرد", "unit_price": 47000}]}})
|
||||
await H.handle_update(ctx, text_update(6, "قیمت میلگرد ۴۷ شد"))
|
||||
draft = await _active("quote")
|
||||
check("refine: price updated", (draft.payload["items"][0]["unit_price"]) == 47000)
|
||||
|
||||
# commit via ✅
|
||||
await H.handle_update(ctx, callback_update(7, f"q:ok:{draft.id[:8]}"))
|
||||
check("commit: quote posted", len(api.created_quotes) == 1)
|
||||
body = api.created_quotes[0]
|
||||
check("commit: supplier id", body.get("supplier_id") == "sup-1")
|
||||
check("commit: line item temp/refs", body["line_items"][0]["temp_id"] == "t1"
|
||||
and body["item_termsheets"][0]["line_item_temp_id"] == "t1")
|
||||
check("commit: price linked", body["item_termsheets"][0]["unit_price"] == 47000)
|
||||
check("commit: termsheet carried", body["termsheets"][0]["label"] == "۳ فاز")
|
||||
check("commit: report sent", "ثبت شد" in bale.last_text())
|
||||
check("commit: draft committed", (await _active("quote")) is None)
|
||||
|
||||
# ---- add supplier ------------------------------------------------------
|
||||
NLU_QUEUE.append({"intent": "add_supplier", "confidence": 0.9, "patch": {
|
||||
"supplier": {"name": "پروفیل بر", "category_name": "لوله و اتصالات", "phone": "0912"}}})
|
||||
await H.handle_update(ctx, text_update(8, "تأمین‌کننده جدید پروفیل بر دسته لوله و اتصالات تلفن 0912"))
|
||||
draft = await _active("supplier")
|
||||
check("supplier: draft created", draft is not None)
|
||||
check("supplier: category resolved", draft.payload.get("category_id") == "cat-2")
|
||||
await H.handle_update(ctx, callback_update(9, f"s:ok:{draft.id[:8]}"))
|
||||
check("supplier: posted", api.created_suppliers and api.created_suppliers[0]["name"] == "پروفیل بر")
|
||||
check("supplier: report", "تأمین‌کننده ثبت شد" in bale.last_text())
|
||||
|
||||
# ---- status query ------------------------------------------------------
|
||||
NLU_QUEUE.append({"intent": "status_query", "confidence": 0.9,
|
||||
"patch": {"query": {"kind": "pending"}}})
|
||||
await H.handle_update(ctx, text_update(10, "استعلام‌های در انتظار چیه؟"))
|
||||
check("query: pending digest", "در انتظار بررسی" in bale.last_text() and "#q-aaaa11" in bale.last_text())
|
||||
|
||||
# ---- accept flow -------------------------------------------------------
|
||||
NLU_QUEUE.append({"intent": "accept_quote", "confidence": 0.9,
|
||||
"patch": {"target": {"supplier_name": "سازان نو"}}})
|
||||
await H.handle_update(ctx, text_update(11, "استعلام سازان نو را قبول کن"))
|
||||
check("accept: summary shown", "پذیرش استعلام" in bale.last_text())
|
||||
flow = ctx.pending.get(CHAT)
|
||||
check("accept: pending flow", flow is not None and flow.kind == "accept")
|
||||
await H.handle_update(ctx, callback_update(12, "ac:ok"))
|
||||
check("accept: payload posted", len(api.accept_payloads) == 1)
|
||||
payload = api.accept_payloads[0]["payload"]
|
||||
check("accept: termsheet echoed with steps",
|
||||
payload["accepted_termsheets"][0]["id"] == "ts-1" and payload["accepted_termsheets"][0]["schedule_steps"])
|
||||
check("accept: decision price", payload["item_decisions"][0]["adjusted_unit_price"] == 45000)
|
||||
check("accept: decision index", payload["item_decisions"][0]["accepted_termsheet_index"] == 0)
|
||||
check("accept: report", "پذیرش انجام شد" in bale.last_text())
|
||||
|
||||
# ---- arrive flow -------------------------------------------------------
|
||||
NLU_QUEUE.append({"intent": "arrive_items", "confidence": 0.9,
|
||||
"patch": {"target": {"supplier_name": "سازان نو"}}})
|
||||
await H.handle_update(ctx, text_update(13, "اقلام سازان نو رسید"))
|
||||
check("arrive: items shown", "اعلام رسیدن" in bale.last_text())
|
||||
await H.handle_update(ctx, text_update(14, "۵۰۰ و ۲۰۰"))
|
||||
flow = ctx.pending.get(CHAT)
|
||||
check("arrive: quantities parsed", flow is not None and flow.kind == "arrive_confirm"
|
||||
and flow.data["quantities"] == {"li-1": 500.0, "li-2": 200.0})
|
||||
await H.handle_update(ctx, callback_update(15, "ar:ok"))
|
||||
check("arrive: payload posted", len(api.arrive_payloads) == 1
|
||||
and api.arrive_payloads[0]["payload"]["items"][0]["received_qty"] == 500)
|
||||
check("arrive: report", "ثبت رسید انجام شد" in bale.last_text())
|
||||
|
||||
# ---- add material ------------------------------------------------------
|
||||
NLU_QUEUE.append({"intent": "add_material", "confidence": 0.9,
|
||||
"patch": {"material": {"name": "میلگرد A3 سایز ۱۸", "unit_name": "کیلوگرم"}}})
|
||||
await H.handle_update(ctx, text_update(16, "کالای جدید میلگرد A3 سایز ۱۸ با واحد کیلوگرم"))
|
||||
draft = await _active("material")
|
||||
check("material: draft created", draft is not None)
|
||||
check("material: unit resolved", str(draft.payload.get("canonical_unit_id")) == "3")
|
||||
await H.handle_update(ctx, callback_update(17, f"m:ok:{draft.id[:8]}"))
|
||||
check("material: posted", api.created_materials
|
||||
and api.created_materials[0]["canonical_unit_id"] == 3)
|
||||
|
||||
# ---- cancel / unknown --------------------------------------------------
|
||||
NLU_QUEUE.append({"intent": "register_quote", "confidence": 0.9, "patch": {"supplier_name": "سازان نو"}})
|
||||
await H.handle_update(ctx, text_update(18, "استعلام از سازان نو"))
|
||||
await H.handle_update(ctx, text_update(19, "/cancel"))
|
||||
check("cancel: draft dropped", (await _active("quote")) is None and "لغو شد" in bale.last_text())
|
||||
|
||||
NLU_QUEUE.append({"intent": "unknown", "confidence": 0.0, "patch": {}})
|
||||
await H.handle_update(ctx, text_update(20, "اسپاگتی بپز"))
|
||||
check("unknown: hint sent", "متوجه منظورت نشد" in bale.last_text())
|
||||
|
||||
print(f"\n{['FAILED', 'ALL PASSED'][int(_failed == 0)]}: {_passed} passed, {_failed} failed")
|
||||
return 1 if _failed else 0
|
||||
|
||||
|
||||
async def _active(kind):
|
||||
from app import drafts as draft_store
|
||||
return await draft_store.get_active(CHAT, kind)
|
||||
|
||||
|
||||
def _first_callback(markup: dict | None, prefix: str) -> str | None:
|
||||
for row in (markup or {}).get("inline_keyboard") or []:
|
||||
for btn in row:
|
||||
if btn.get("callback_data", "").startswith(prefix):
|
||||
return btn["callback_data"]
|
||||
return None
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(asyncio.run(main()))
|
||||
+24
-15
@@ -145,18 +145,6 @@ async def context_from_claims(claims: dict, db: AsyncSession) -> UserContext:
|
||||
user.username = username
|
||||
await db.flush()
|
||||
|
||||
project_ids: list = []
|
||||
if user.role in ("supervisor", "pm"):
|
||||
projects = (
|
||||
await db.execute(
|
||||
select(Project)
|
||||
.where(Project.pm_user_id == user.id)
|
||||
.order_by(Project.created_at, Project.id)
|
||||
)
|
||||
).scalars().all()
|
||||
project_ids = [p.id for p in projects]
|
||||
project_id = project_ids[0] if project_ids else None
|
||||
|
||||
# لایه پنل‌ها: تخصیص پنل + سطح دسترسی و عضویت پروژه‌ای (جدا از نقش)
|
||||
panels: dict = {}
|
||||
panel_rows = (
|
||||
@@ -166,6 +154,7 @@ async def context_from_claims(claims: dict, db: AsyncSession) -> UserContext:
|
||||
).scalars().all()
|
||||
for row in panel_rows:
|
||||
panels[row.panel] = row.level
|
||||
|
||||
member_project_ids: list = [
|
||||
row.project_id
|
||||
for row in (
|
||||
@@ -177,6 +166,19 @@ async def context_from_claims(claims: dict, db: AsyncSession) -> UserContext:
|
||||
).scalars().all()
|
||||
]
|
||||
|
||||
pm_projects = (
|
||||
await db.execute(
|
||||
select(Project)
|
||||
.where(Project.pm_user_id == user.id)
|
||||
.order_by(Project.created_at, Project.id)
|
||||
)
|
||||
).scalars().all()
|
||||
pm_project_ids_list = [p.id for p in pm_projects]
|
||||
|
||||
# ترکیب پروژه‌های تحت مدیریت مستقیم و پروژه‌های عضویت با حفظ اولویت و بدون تکرار
|
||||
project_ids = list(dict.fromkeys(pm_project_ids_list + member_project_ids))
|
||||
project_id = project_ids[0] if project_ids else None
|
||||
|
||||
display_name = f"{user.first_name} {user.last_name}".strip() or user.casdoor_id
|
||||
return UserContext(
|
||||
user=user,
|
||||
@@ -190,15 +192,22 @@ async def context_from_claims(claims: dict, db: AsyncSession) -> UserContext:
|
||||
|
||||
|
||||
async def pm_project_ids(db: AsyncSession, user: User) -> list:
|
||||
"""Every project id managed by the given PM/supervisor user (oldest first)."""
|
||||
rows = (
|
||||
"""Every project id managed or assigned to the given PM/supervisor user (oldest first)."""
|
||||
pm_rows = (
|
||||
await db.execute(
|
||||
select(Project.id)
|
||||
.where(Project.pm_user_id == user.id)
|
||||
.order_by(Project.created_at, Project.id)
|
||||
)
|
||||
).scalars().all()
|
||||
return list(rows)
|
||||
member_rows = (
|
||||
await db.execute(
|
||||
select(UserProjectMembership.project_id)
|
||||
.where(UserProjectMembership.user_id == user.id)
|
||||
.order_by(UserProjectMembership.created_at)
|
||||
)
|
||||
).scalars().all()
|
||||
return list(dict.fromkeys(list(pm_rows) + list(member_rows)))
|
||||
|
||||
|
||||
async def get_optional_user(request: Request, db: AsyncSession | None = None) -> UserContext | None:
|
||||
|
||||
@@ -40,9 +40,6 @@ class Settings(BaseSettings):
|
||||
MINIO_BUCKET: str = "procurement-files"
|
||||
MINIO_SECURE: bool = False
|
||||
|
||||
# Security token for standalone wizard review URL (must match bot)
|
||||
DRAFT_TOKEN_SECRET: str = "procurement-draft-secret-change-in-prod-v7"
|
||||
|
||||
# Background auto-expiry of offered quotes whose expiry_date has passed.
|
||||
AUTO_EXPIRE_ENABLED: bool = True
|
||||
AUTO_EXPIRE_INTERVAL_SECONDS: int = 3600
|
||||
|
||||
@@ -247,7 +247,6 @@ _V26_DDL = [
|
||||
physical_qty NUMERIC(18,6),
|
||||
transfer_pair_id UUID,
|
||||
performed_by TEXT,
|
||||
delivered_to TEXT,
|
||||
transaction_date TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
note TEXT,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
@@ -259,9 +258,6 @@ _V26_DDL = [
|
||||
"""
|
||||
CREATE INDEX IF NOT EXISTS idx_inventory_tx_warehouse_date ON inventory_transactions (warehouse_id, transaction_date)
|
||||
""",
|
||||
"""
|
||||
ALTER TABLE inventory_transactions ADD COLUMN IF NOT EXISTS delivered_to TEXT
|
||||
""",
|
||||
# suppliers.categories JSONB (v2.4 runtime) is replaced by suppliers.category_id — drop it.
|
||||
"""
|
||||
ALTER TABLE suppliers DROP COLUMN IF EXISTS categories
|
||||
@@ -414,50 +410,6 @@ async def ensure_drop_category_tables(engine: AsyncEngine) -> None:
|
||||
logger.info("category taxonomy tables dropped (attributes / ref units / conversions)")
|
||||
|
||||
|
||||
async def ensure_rbac_schema(engine: AsyncEngine) -> None:
|
||||
"""Panel-access schema (pm branch): users.username, projects planning
|
||||
columns, user_panels and user_project_members. Idempotent; safe on any
|
||||
volume — the RBAC model expects these and login 500s without them."""
|
||||
stmts = (
|
||||
"ALTER TABLE users ADD COLUMN IF NOT EXISTS username TEXT",
|
||||
"ALTER TABLE projects ADD COLUMN IF NOT EXISTS location TEXT DEFAULT ''",
|
||||
"ALTER TABLE projects ADD COLUMN IF NOT EXISTS project_manager TEXT DEFAULT ''",
|
||||
"ALTER TABLE projects ADD COLUMN IF NOT EXISTS planned_start DATE",
|
||||
"ALTER TABLE projects ADD COLUMN IF NOT EXISTS planned_end DATE",
|
||||
"ALTER TABLE projects ADD COLUMN IF NOT EXISTS actual_start DATE",
|
||||
"ALTER TABLE projects ADD COLUMN IF NOT EXISTS actual_end DATE",
|
||||
"ALTER TABLE projects ADD COLUMN IF NOT EXISTS status TEXT DEFAULT 'ACTIVE'",
|
||||
"ALTER TABLE projects ADD COLUMN IF NOT EXISTS progress DOUBLE PRECISION DEFAULT 0.0",
|
||||
"ALTER TABLE projects ADD COLUMN IF NOT EXISTS updated_at TIMESTAMPTZ DEFAULT now()",
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS user_panels (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
panel TEXT NOT NULL,
|
||||
level TEXT NOT NULL,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
CONSTRAINT uq_user_panel UNIQUE (user_id, panel)
|
||||
)
|
||||
""",
|
||||
"CREATE INDEX IF NOT EXISTS ix_user_panels_user_id ON user_panels(user_id)",
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS user_project_members (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
project_id UUID NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
CONSTRAINT uq_user_project_member UNIQUE (user_id, project_id)
|
||||
)
|
||||
""",
|
||||
"CREATE INDEX IF NOT EXISTS ix_user_project_members_user_id ON user_project_members(user_id)",
|
||||
"CREATE INDEX IF NOT EXISTS ix_user_project_members_project_id ON user_project_members(project_id)",
|
||||
)
|
||||
async with engine.begin() as conn:
|
||||
for stmt in stmts:
|
||||
await conn.execute(text(stmt))
|
||||
logger.info("RBAC schema ensured (username / project columns / user_panels / user_project_members)")
|
||||
|
||||
|
||||
async def ensure_audit_table(engine: AsyncEngine) -> None:
|
||||
"""v2.7: general activity trail (audit_log). Idempotent; safe on any volume."""
|
||||
ddl = """
|
||||
@@ -480,81 +432,3 @@ async def ensure_audit_table(engine: AsyncEngine) -> None:
|
||||
for stmt in indexes:
|
||||
await conn.execute(text(stmt))
|
||||
logger.info("audit_log table ensured")
|
||||
|
||||
|
||||
async def ensure_bot_drafts_table(engine: AsyncEngine) -> None:
|
||||
"""Ensure bot_drafts table and indexes exist for Bale bot quote sync."""
|
||||
ddl = """
|
||||
CREATE TABLE IF NOT EXISTS bot_drafts (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
chat_id BIGINT NOT NULL,
|
||||
kind VARCHAR(16) NOT NULL,
|
||||
payload JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||
missing JSONB,
|
||||
status VARCHAR(16) NOT NULL DEFAULT 'active',
|
||||
source VARCHAR(16),
|
||||
source_message_id BIGINT,
|
||||
review_message_id BIGINT,
|
||||
last_bale_update_at TIMESTAMPTZ,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
)
|
||||
"""
|
||||
indexes = (
|
||||
"CREATE INDEX IF NOT EXISTS ix_bot_drafts_chat_id ON bot_drafts(chat_id)",
|
||||
"CREATE INDEX IF NOT EXISTS ix_bot_drafts_chat_status ON bot_drafts(chat_id, status)",
|
||||
"ALTER TABLE bot_drafts ADD COLUMN IF NOT EXISTS last_bale_update_at TIMESTAMPTZ",
|
||||
"ALTER TABLE bot_drafts ADD COLUMN IF NOT EXISTS source_message_id BIGINT",
|
||||
"CREATE INDEX IF NOT EXISTS ix_bot_drafts_review_msg ON bot_drafts(review_message_id)",
|
||||
"CREATE INDEX IF NOT EXISTS ix_bot_drafts_source_msg ON bot_drafts(source_message_id)",
|
||||
)
|
||||
async with engine.begin() as conn:
|
||||
await conn.execute(text(ddl))
|
||||
for stmt in indexes:
|
||||
await conn.execute(text(stmt))
|
||||
logger.info("bot_drafts table ensured")
|
||||
|
||||
|
||||
async def ensure_project_transfers_table(engine: AsyncEngine) -> None:
|
||||
"""Create (if missing) the project_transfers table for inter-site transfers. Safe on any volume."""
|
||||
ddl = """
|
||||
CREATE TABLE IF NOT EXISTS project_transfers (
|
||||
id UUID NOT NULL DEFAULT gen_random_uuid() PRIMARY KEY,
|
||||
from_project_id UUID NOT NULL REFERENCES projects(id) ON DELETE RESTRICT,
|
||||
from_warehouse_id UUID NOT NULL REFERENCES warehouses(id) ON DELETE RESTRICT,
|
||||
to_project_id UUID NOT NULL REFERENCES projects(id) ON DELETE RESTRICT,
|
||||
material_id UUID NOT NULL REFERENCES materials(id) ON DELETE RESTRICT,
|
||||
brand_id UUID REFERENCES brands(id) ON DELETE SET NULL,
|
||||
unit_id INTEGER NOT NULL REFERENCES units(id) ON DELETE RESTRICT,
|
||||
quantity NUMERIC(18,6) NOT NULL CHECK (quantity > 0),
|
||||
specs JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||
specs_hash TEXT NOT NULL DEFAULT 'default',
|
||||
note TEXT,
|
||||
status TEXT NOT NULL DEFAULT 'in_transit' CHECK (status IN ('in_transit', 'received', 'cancelled')),
|
||||
out_transaction_id UUID REFERENCES inventory_transactions(id) ON DELETE SET NULL,
|
||||
transfer_date TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
transferred_by TEXT,
|
||||
received_at TIMESTAMPTZ,
|
||||
received_by TEXT,
|
||||
to_warehouse_id UUID REFERENCES warehouses(id) ON DELETE SET NULL,
|
||||
receipt_allocations JSONB,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
)
|
||||
"""
|
||||
indexes = (
|
||||
"CREATE INDEX IF NOT EXISTS idx_project_transfers_from ON project_transfers(from_project_id, status)",
|
||||
"CREATE INDEX IF NOT EXISTS idx_project_transfers_to ON project_transfers(to_project_id, status)",
|
||||
"DROP TRIGGER IF EXISTS trg_project_transfers_updated_at ON project_transfers",
|
||||
"""
|
||||
CREATE TRIGGER trg_project_transfers_updated_at
|
||||
BEFORE UPDATE ON project_transfers
|
||||
FOR EACH ROW EXECUTE FUNCTION set_updated_at()
|
||||
""",
|
||||
)
|
||||
async with engine.begin() as conn:
|
||||
await conn.execute(text(ddl))
|
||||
for stmt in indexes:
|
||||
await conn.execute(text(stmt))
|
||||
logger.info("project_transfers table ensured")
|
||||
|
||||
|
||||
@@ -27,13 +27,10 @@ from app.db.engine import AsyncSessionLocal, engine
|
||||
from app.db.init_db import (
|
||||
ensure_attachment_table,
|
||||
ensure_audit_table,
|
||||
ensure_bot_drafts_table,
|
||||
ensure_drop_category_tables,
|
||||
ensure_dashboard_tables,
|
||||
ensure_material_topic_column,
|
||||
ensure_quote_projects,
|
||||
ensure_rbac_schema,
|
||||
ensure_project_transfers_table,
|
||||
ensure_v26,
|
||||
)
|
||||
from app.observability import RequestContextMiddleware, setup_logging
|
||||
@@ -108,11 +105,8 @@ async def lifespan(_app: FastAPI):
|
||||
await ensure_material_topic_column(engine)
|
||||
await ensure_quote_projects(engine)
|
||||
await ensure_v26(engine)
|
||||
await ensure_rbac_schema(engine)
|
||||
await ensure_audit_table(engine)
|
||||
await ensure_drop_category_tables(engine)
|
||||
await ensure_bot_drafts_table(engine)
|
||||
await ensure_project_transfers_table(engine)
|
||||
task = asyncio.create_task(_auto_expire_loop()) if settings.AUTO_EXPIRE_ENABLED else None
|
||||
try:
|
||||
yield
|
||||
@@ -239,15 +233,12 @@ from app.routers.auth import router as _auth_router # noqa: E402
|
||||
# attach an Authorization header to <iframe>/<img> loads, so the two file GET
|
||||
# routes accept a short-lived signed ?t= token as well as a Bearer session.
|
||||
from app.routers.files import router as _files_router # noqa: E402
|
||||
from app.routers.drafts import router as _drafts_router # noqa: E402
|
||||
|
||||
for router in ROUTERS:
|
||||
if router is _auth_router:
|
||||
app.include_router(router, prefix=API_V1_PREFIX)
|
||||
elif router is _files_router:
|
||||
app.include_router(router, prefix=API_V1_PREFIX)
|
||||
elif router is _drafts_router:
|
||||
app.include_router(router, prefix=API_V1_PREFIX)
|
||||
else:
|
||||
app.include_router(router, prefix=API_V1_PREFIX, dependencies=[Depends(get_current_user)])
|
||||
|
||||
|
||||
@@ -32,8 +32,6 @@ from app.models.procurement import (
|
||||
TermsheetScheduleStep,
|
||||
)
|
||||
|
||||
from app.models.project_transfer import ProjectTransfer
|
||||
|
||||
__all__ = [
|
||||
"Base",
|
||||
"Unit",
|
||||
@@ -62,5 +60,4 @@ __all__ = [
|
||||
"ItemDecision",
|
||||
"ItemReceipt",
|
||||
"QuoteAttachment",
|
||||
"ProjectTransfer",
|
||||
]
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
from datetime import datetime
|
||||
from uuid import UUID
|
||||
from sqlalchemy import BigInteger, Column, DateTime, String, func
|
||||
from sqlalchemy.dialects.postgresql import JSONB, UUID as PG_UUID
|
||||
from app.db.base import Base
|
||||
|
||||
class BotDraft(Base):
|
||||
__tablename__ = "bot_drafts"
|
||||
|
||||
id = Column(PG_UUID(as_uuid=True), primary_key=True, server_default=func.gen_random_uuid())
|
||||
chat_id = Column(BigInteger, nullable=False)
|
||||
kind = Column(String(16), nullable=False)
|
||||
payload = Column(JSONB, nullable=False, default=dict)
|
||||
missing = Column(JSONB)
|
||||
status = Column(String(16), nullable=False, default="active")
|
||||
source = Column(String(16))
|
||||
source_message_id = Column(BigInteger)
|
||||
review_message_id = Column(BigInteger)
|
||||
last_bale_update_at = Column(DateTime(timezone=True))
|
||||
created_at = Column(DateTime(timezone=True), server_default=func.now())
|
||||
updated_at = Column(DateTime(timezone=True), onupdate=func.now())
|
||||
@@ -156,7 +156,6 @@ class InventoryTransaction(Base):
|
||||
# NULL for a standalone entry; links TRANSFER_OUT to its TRANSFER_IN row.
|
||||
transfer_pair_id: Mapped[uuid.UUID | None] = mapped_column(Uuid(as_uuid=True))
|
||||
performed_by: Mapped[str | None] = mapped_column(Text) # user display name (dev placeholder)
|
||||
delivered_to: Mapped[str | None] = mapped_column(Text)
|
||||
transaction_date: Mapped[datetime] = mapped_column(
|
||||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||||
)
|
||||
|
||||
@@ -1,87 +0,0 @@
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from sqlalchemy import (
|
||||
DateTime,
|
||||
ForeignKey,
|
||||
Numeric,
|
||||
Text,
|
||||
func,
|
||||
text,
|
||||
)
|
||||
from sqlalchemy.dialects.postgresql import JSONB
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
|
||||
from app.db.base import Base
|
||||
from app.models.catalog import _timestamptz, _uuid_pk
|
||||
|
||||
|
||||
class ProjectTransfer(Base):
|
||||
"""project_transfers — Inter-project (inter-site) material transfer ledger.
|
||||
|
||||
Records the movement of materials from a source project warehouse to a
|
||||
destination project. Stock is deducted from the source warehouse immediately
|
||||
upon creation (status = 'in_transit') via out_transaction_id.
|
||||
When the destination project PM confirms receipt in 'Arrivals', stock is
|
||||
added to the destination warehouse (status = 'received').
|
||||
While 'in_transit', the transfer can be edited or cancelled (restoring source stock).
|
||||
Once 'received', the transfer is permanently locked from edit or cancellation.
|
||||
"""
|
||||
|
||||
__tablename__ = "project_transfers"
|
||||
__mapper_args__ = {"eager_defaults": True}
|
||||
|
||||
id: Mapped[uuid.UUID] = _uuid_pk()
|
||||
from_project_id: Mapped[uuid.UUID] = mapped_column(
|
||||
ForeignKey("projects.id", ondelete="RESTRICT"), nullable=False
|
||||
)
|
||||
from_warehouse_id: Mapped[uuid.UUID] = mapped_column(
|
||||
ForeignKey("warehouses.id", ondelete="RESTRICT"), nullable=False
|
||||
)
|
||||
to_project_id: Mapped[uuid.UUID] = mapped_column(
|
||||
ForeignKey("projects.id", ondelete="RESTRICT"), nullable=False
|
||||
)
|
||||
material_id: Mapped[uuid.UUID] = mapped_column(
|
||||
ForeignKey("materials.id", ondelete="RESTRICT"), nullable=False
|
||||
)
|
||||
brand_id: Mapped[uuid.UUID | None] = mapped_column(
|
||||
ForeignKey("brands.id", ondelete="SET NULL")
|
||||
)
|
||||
unit_id: Mapped[int] = mapped_column(
|
||||
ForeignKey("units.id", ondelete="RESTRICT"), nullable=False
|
||||
)
|
||||
quantity: Mapped[Decimal] = mapped_column(Numeric(18, 6), nullable=False)
|
||||
specs: Mapped[dict] = mapped_column(JSONB, nullable=False, server_default=text("'{}'::jsonb"))
|
||||
specs_hash: Mapped[str] = mapped_column(Text, nullable=False, server_default=text("'default'"))
|
||||
note: Mapped[str | None] = mapped_column(Text)
|
||||
status: Mapped[str] = mapped_column(Text, nullable=False, server_default=text("'in_transit'"))
|
||||
|
||||
out_transaction_id: Mapped[uuid.UUID | None] = mapped_column(
|
||||
ForeignKey("inventory_transactions.id", ondelete="SET NULL")
|
||||
)
|
||||
transfer_date: Mapped[datetime] = mapped_column(
|
||||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||||
)
|
||||
transferred_by: Mapped[str | None] = mapped_column(Text)
|
||||
received_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
|
||||
received_by: Mapped[str | None] = mapped_column(Text)
|
||||
to_warehouse_id: Mapped[uuid.UUID | None] = mapped_column(
|
||||
ForeignKey("warehouses.id", ondelete="SET NULL")
|
||||
)
|
||||
receipt_allocations: Mapped[list | None] = mapped_column(JSONB)
|
||||
created_at: Mapped[datetime] = _timestamptz()
|
||||
updated_at: Mapped[datetime] = mapped_column(
|
||||
DateTime(timezone=True), nullable=False, server_default=func.now(), onupdate=func.now()
|
||||
)
|
||||
|
||||
from_project: Mapped["Project"] = relationship("Project", foreign_keys=[from_project_id], lazy="raise")
|
||||
to_project: Mapped["Project"] = relationship("Project", foreign_keys=[to_project_id], lazy="raise")
|
||||
from_warehouse: Mapped["Warehouse"] = relationship("Warehouse", foreign_keys=[from_warehouse_id], lazy="raise")
|
||||
to_warehouse: Mapped["Warehouse | None"] = relationship("Warehouse", foreign_keys=[to_warehouse_id], lazy="raise")
|
||||
material: Mapped["Material"] = relationship("Material", foreign_keys=[material_id], lazy="raise")
|
||||
brand: Mapped["Brand | None"] = relationship("Brand", foreign_keys=[brand_id], lazy="raise")
|
||||
unit: Mapped["Unit"] = relationship("Unit", foreign_keys=[unit_id], lazy="raise")
|
||||
out_transaction: Mapped["InventoryTransaction | None"] = relationship(
|
||||
"InventoryTransaction", foreign_keys=[out_transaction_id], lazy="raise"
|
||||
)
|
||||
@@ -4,7 +4,6 @@ from app.routers import (
|
||||
auth,
|
||||
brand_materials,
|
||||
brands,
|
||||
drafts,
|
||||
files,
|
||||
inventory,
|
||||
item_decisions,
|
||||
@@ -15,7 +14,6 @@ from app.routers import (
|
||||
material_categories,
|
||||
materials,
|
||||
pm,
|
||||
project_transfers,
|
||||
projects,
|
||||
quote_events,
|
||||
quotes,
|
||||
@@ -52,7 +50,5 @@ ROUTERS = [
|
||||
standard_conversions.router,
|
||||
inventory.router,
|
||||
pm.router,
|
||||
project_transfers.router,
|
||||
users.router,
|
||||
drafts.router,
|
||||
]
|
||||
|
||||
@@ -78,7 +78,8 @@ async def login(request: Request, payload: LoginRequest, db: AsyncSession = Depe
|
||||
claims = await _verify_token(access_token)
|
||||
ctx = await context_from_claims(claims, db)
|
||||
projects = await _user_projects(db, ctx.user)
|
||||
if ctx.role == "supervisor" and not projects:
|
||||
has_projects = bool(projects) or bool(ctx.project_ids) or bool(ctx.member_project_ids)
|
||||
if ctx.role == "supervisor" and not has_projects:
|
||||
raise ForbiddenError("پروژه تخصیص داده نشده است — تا زمان تخصیص پروژه، اجازه ورود به سامانه را ندارید")
|
||||
await analytics.track(
|
||||
"login_success",
|
||||
|
||||
@@ -1,194 +0,0 @@
|
||||
"""Drafts router — exposes bot_drafts to frontend for Wizard pre-population and bi-directional sync."""
|
||||
from typing import Any
|
||||
from uuid import UUID
|
||||
from fastapi import APIRouter, Depends
|
||||
from pydantic import BaseModel
|
||||
from sqlalchemy import func, select, update
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.db.engine import get_db
|
||||
from app.models.draft import BotDraft
|
||||
from app.utils.draft_token import verify_draft_token
|
||||
from app.utils.errors import NotFoundError, UnauthorizedError
|
||||
|
||||
router = APIRouter(prefix="/drafts", tags=["drafts"])
|
||||
|
||||
|
||||
class DraftUpdateIn(BaseModel):
|
||||
payload: dict[str, Any] | None = None
|
||||
status: str | None = None
|
||||
|
||||
|
||||
class DraftCommitIn(BaseModel):
|
||||
quote_id: str | None = None
|
||||
|
||||
|
||||
def _serialize_draft(draft: BotDraft) -> dict:
|
||||
return {
|
||||
"id": str(draft.id),
|
||||
"chat_id": draft.chat_id,
|
||||
"kind": draft.kind,
|
||||
"status": draft.status,
|
||||
"payload": draft.payload or {},
|
||||
"missing": draft.missing or [],
|
||||
"source": draft.source,
|
||||
"review_message_id": draft.review_message_id,
|
||||
"last_bale_update_at": draft.last_bale_update_at.isoformat() if draft.last_bale_update_at else None,
|
||||
"created_at": draft.created_at.isoformat() if draft.created_at else None,
|
||||
"updated_at": draft.updated_at.isoformat() if draft.updated_at else None,
|
||||
}
|
||||
|
||||
|
||||
def _verify_token_or_raise(token: str) -> dict:
|
||||
token_payload = verify_draft_token(token)
|
||||
if not token_payload or not token_payload.get("draft_id"):
|
||||
raise UnauthorizedError("لینک بازبینی نامعتبر یا منقضی شده است")
|
||||
return token_payload
|
||||
|
||||
|
||||
@router.get("/verify")
|
||||
async def verify_and_get_draft(token: str, db: AsyncSession = Depends(get_db)):
|
||||
"""Public endpoint for token-based draft review without ERP login."""
|
||||
token_payload = _verify_token_or_raise(token)
|
||||
draft_id = UUID(token_payload["draft_id"])
|
||||
stmt = select(BotDraft).where(BotDraft.id == draft_id)
|
||||
draft = (await db.execute(stmt)).scalar_one_or_none()
|
||||
if not draft:
|
||||
raise NotFoundError("پیش‌نویس استعلام یافت نشد")
|
||||
|
||||
return {"data": _serialize_draft(draft), "token_payload": token_payload}
|
||||
|
||||
|
||||
@router.patch("/by-token")
|
||||
async def update_draft_by_token(token: str, body: DraftUpdateIn, db: AsyncSession = Depends(get_db)):
|
||||
"""Update draft payload using verified token."""
|
||||
token_payload = _verify_token_or_raise(token)
|
||||
draft_id = UUID(token_payload["draft_id"])
|
||||
stmt = select(BotDraft).where(BotDraft.id == draft_id)
|
||||
draft = (await db.execute(stmt)).scalar_one_or_none()
|
||||
if not draft:
|
||||
raise NotFoundError("پیش‌نویس استعلام یافت نشد")
|
||||
|
||||
if body.payload is not None:
|
||||
merged = dict(draft.payload or {})
|
||||
merged.update(body.payload)
|
||||
draft.payload = merged
|
||||
|
||||
if body.status is not None:
|
||||
draft.status = body.status
|
||||
|
||||
draft.updated_at = func.now()
|
||||
await db.commit()
|
||||
await db.refresh(draft)
|
||||
|
||||
return {"data": _serialize_draft(draft)}
|
||||
|
||||
|
||||
@router.post("/by-token/commit")
|
||||
async def commit_draft_by_token(token: str, body: DraftCommitIn, db: AsyncSession = Depends(get_db)):
|
||||
"""Commit draft using verified token."""
|
||||
token_payload = _verify_token_or_raise(token)
|
||||
draft_id = UUID(token_payload["draft_id"])
|
||||
stmt = select(BotDraft).where(BotDraft.id == draft_id)
|
||||
draft = (await db.execute(stmt)).scalar_one_or_none()
|
||||
if not draft:
|
||||
raise NotFoundError("پیش‌نویس استعلام یافت نشد")
|
||||
|
||||
draft.status = "committed"
|
||||
payload = dict(draft.payload or {})
|
||||
if body.quote_id:
|
||||
payload["committed_quote_id"] = body.quote_id
|
||||
draft.payload = payload
|
||||
draft.updated_at = func.now()
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(draft)
|
||||
|
||||
return {"data": _serialize_draft(draft)}
|
||||
|
||||
|
||||
@router.post("/by-token/cancel")
|
||||
async def cancel_draft_by_token(token: str, db: AsyncSession = Depends(get_db)):
|
||||
"""Cancel draft using verified token."""
|
||||
token_payload = _verify_token_or_raise(token)
|
||||
draft_id = UUID(token_payload["draft_id"])
|
||||
stmt = select(BotDraft).where(BotDraft.id == draft_id)
|
||||
draft = (await db.execute(stmt)).scalar_one_or_none()
|
||||
if not draft:
|
||||
raise NotFoundError("پیش‌نویس استعلام یافت نشد")
|
||||
|
||||
draft.status = "cancelled"
|
||||
draft.updated_at = func.now()
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(draft)
|
||||
|
||||
return {"data": _serialize_draft(draft)}
|
||||
|
||||
|
||||
@router.get("/{draft_id}")
|
||||
async def get_draft(draft_id: UUID, db: AsyncSession = Depends(get_db)):
|
||||
stmt = select(BotDraft).where(BotDraft.id == draft_id)
|
||||
draft = (await db.execute(stmt)).scalar_one_or_none()
|
||||
if not draft:
|
||||
raise NotFoundError("پیش‌نویس استعلام یافت نشد")
|
||||
|
||||
return {"data": _serialize_draft(draft)}
|
||||
|
||||
|
||||
@router.patch("/{draft_id}")
|
||||
async def update_draft(draft_id: UUID, body: DraftUpdateIn, db: AsyncSession = Depends(get_db)):
|
||||
stmt = select(BotDraft).where(BotDraft.id == draft_id)
|
||||
draft = (await db.execute(stmt)).scalar_one_or_none()
|
||||
if not draft:
|
||||
raise NotFoundError("پیش‌نویس استعلام یافت نشد")
|
||||
|
||||
if body.payload is not None:
|
||||
merged = dict(draft.payload or {})
|
||||
merged.update(body.payload)
|
||||
draft.payload = merged
|
||||
|
||||
if body.status is not None:
|
||||
draft.status = body.status
|
||||
|
||||
draft.updated_at = func.now()
|
||||
await db.commit()
|
||||
await db.refresh(draft)
|
||||
|
||||
return {"data": _serialize_draft(draft)}
|
||||
|
||||
|
||||
@router.post("/{draft_id}/commit")
|
||||
async def commit_draft(draft_id: UUID, body: DraftCommitIn, db: AsyncSession = Depends(get_db)):
|
||||
stmt = select(BotDraft).where(BotDraft.id == draft_id)
|
||||
draft = (await db.execute(stmt)).scalar_one_or_none()
|
||||
if not draft:
|
||||
raise NotFoundError("پیش‌نویس استعلام یافت نشد")
|
||||
|
||||
draft.status = "committed"
|
||||
payload = dict(draft.payload or {})
|
||||
if body.quote_id:
|
||||
payload["committed_quote_id"] = body.quote_id
|
||||
draft.payload = payload
|
||||
draft.updated_at = func.now()
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(draft)
|
||||
|
||||
return {"data": _serialize_draft(draft)}
|
||||
|
||||
|
||||
@router.post("/{draft_id}/cancel")
|
||||
async def cancel_draft(draft_id: UUID, db: AsyncSession = Depends(get_db)):
|
||||
stmt = select(BotDraft).where(BotDraft.id == draft_id)
|
||||
draft = (await db.execute(stmt)).scalar_one_or_none()
|
||||
if not draft:
|
||||
raise NotFoundError("پیش‌نویس استعلام یافت نشد")
|
||||
|
||||
draft.status = "cancelled"
|
||||
draft.updated_at = func.now()
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(draft)
|
||||
|
||||
return {"data": _serialize_draft(draft)}
|
||||
@@ -214,7 +214,6 @@ def transaction_to_dict(tx: InventoryTransaction, wh: Warehouse | None = None) -
|
||||
"physical_qty": float(tx.physical_qty) if tx.physical_qty is not None else None,
|
||||
"transfer_pair_id": str(tx.transfer_pair_id) if tx.transfer_pair_id else None,
|
||||
"performed_by": tx.performed_by,
|
||||
"delivered_to": tx.delivered_to,
|
||||
"transaction_date": to_iso(tx.transaction_date),
|
||||
"note": tx.note,
|
||||
}
|
||||
|
||||
@@ -1,206 +0,0 @@
|
||||
import uuid
|
||||
from typing import Literal
|
||||
|
||||
from fastapi import APIRouter, Depends, Query, Request
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.db.engine import get_db
|
||||
from app.routers.pm import ArrivalScope, arrivals_scope
|
||||
from app.schemas.project_transfers import (
|
||||
ProjectTransferCreate,
|
||||
ProjectTransferOut,
|
||||
ProjectTransferReceive,
|
||||
ProjectTransferUpdate,
|
||||
)
|
||||
from app.services import project_transfer_service
|
||||
from app.utils.errors import ForbiddenError
|
||||
|
||||
router = APIRouter(tags=["project-transfers"])
|
||||
|
||||
|
||||
def _to_transfer_out(t) -> dict:
|
||||
return {
|
||||
"id": t.id,
|
||||
"from_project": (
|
||||
{"id": t.from_project.id, "name": t.from_project.name}
|
||||
if t.from_project
|
||||
else {"id": t.from_project_id, "name": ""}
|
||||
),
|
||||
"from_warehouse": (
|
||||
{"id": t.from_warehouse.id, "name": t.from_warehouse.name}
|
||||
if t.from_warehouse
|
||||
else {"id": t.from_warehouse_id, "name": ""}
|
||||
),
|
||||
"to_project": (
|
||||
{"id": t.to_project.id, "name": t.to_project.name}
|
||||
if t.to_project
|
||||
else {"id": t.to_project_id, "name": ""}
|
||||
),
|
||||
"to_warehouse": (
|
||||
{"id": t.to_warehouse.id, "name": t.to_warehouse.name}
|
||||
if t.to_warehouse
|
||||
else None
|
||||
),
|
||||
"material": (
|
||||
{"id": t.material.id, "name": t.material.name}
|
||||
if t.material
|
||||
else {"id": t.material_id, "name": ""}
|
||||
),
|
||||
"brand": (
|
||||
{"id": t.brand.id, "name": t.brand.name}
|
||||
if t.brand
|
||||
else None
|
||||
),
|
||||
"unit": (
|
||||
{"id": t.unit.id, "code": t.unit.code, "name_fa": t.unit.name_fa}
|
||||
if t.unit
|
||||
else {"id": t.unit_id, "code": "", "name_fa": None}
|
||||
),
|
||||
"quantity": t.quantity,
|
||||
"specs": t.specs or {},
|
||||
"specs_hash": t.specs_hash,
|
||||
"note": t.note,
|
||||
"status": t.status,
|
||||
"transfer_date": t.transfer_date,
|
||||
"transferred_by": t.transferred_by,
|
||||
"received_at": t.received_at,
|
||||
"received_by": t.received_by,
|
||||
"receipt_allocations": t.receipt_allocations,
|
||||
"created_at": t.created_at,
|
||||
"updated_at": t.updated_at,
|
||||
}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# POST /inventory/project-transfers — Create inter-project transfer
|
||||
# ---------------------------------------------------------------------------
|
||||
@router.post("/inventory/project-transfers", status_code=201)
|
||||
async def create_transfer(
|
||||
payload: ProjectTransferCreate,
|
||||
ctx: ArrivalScope = Depends(arrivals_scope),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
transfer = await project_transfer_service.create_project_transfer(
|
||||
db=db,
|
||||
payload=payload,
|
||||
caller_project_id=ctx.project_id,
|
||||
caller_role=ctx.role,
|
||||
transferred_by=ctx.display_name,
|
||||
)
|
||||
return {"data": _to_transfer_out(transfer)}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# GET /inventory/project-transfers — List transfers with direction and filters
|
||||
# ---------------------------------------------------------------------------
|
||||
@router.get("/inventory/project-transfers")
|
||||
async def list_transfers(
|
||||
project_id: uuid.UUID | None = Query(default=None),
|
||||
direction: Literal["outgoing", "incoming", "all"] = Query(default="all"),
|
||||
status: str | None = Query(default=None),
|
||||
ctx: ArrivalScope = Depends(arrivals_scope),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
target_pid = project_id or ctx.project_id
|
||||
transfers = await project_transfer_service.list_project_transfers(
|
||||
db=db,
|
||||
project_id=target_pid,
|
||||
direction=direction,
|
||||
status=status,
|
||||
)
|
||||
return {"data": [_to_transfer_out(t) for t in transfers]}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# GET /inventory/project-transfers/{id} — Single transfer details
|
||||
# ---------------------------------------------------------------------------
|
||||
@router.get("/inventory/project-transfers/{transfer_id}")
|
||||
async def get_transfer(
|
||||
transfer_id: uuid.UUID,
|
||||
ctx: ArrivalScope = Depends(arrivals_scope),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
transfer = await project_transfer_service.get_project_transfer_or_404(db, transfer_id)
|
||||
if ctx.role == "pm" and ctx.project_id is not None:
|
||||
if transfer.from_project_id != ctx.project_id and transfer.to_project_id != ctx.project_id:
|
||||
raise ForbiddenError("شما به این رکورد انتقال دسترسی ندارید")
|
||||
return {"data": _to_transfer_out(transfer)}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# PATCH /inventory/project-transfers/{id} — Edit in-transit transfer (source PM only)
|
||||
# ---------------------------------------------------------------------------
|
||||
@router.patch("/inventory/project-transfers/{transfer_id}")
|
||||
async def update_transfer(
|
||||
transfer_id: uuid.UUID,
|
||||
payload: ProjectTransferUpdate,
|
||||
ctx: ArrivalScope = Depends(arrivals_scope),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
transfer = await project_transfer_service.update_project_transfer(
|
||||
db=db,
|
||||
transfer_id=transfer_id,
|
||||
payload=payload,
|
||||
caller_project_id=ctx.project_id,
|
||||
caller_role=ctx.role,
|
||||
)
|
||||
return {"data": _to_transfer_out(transfer)}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# DELETE /inventory/project-transfers/{id} — Cancel in-transit transfer (source PM only)
|
||||
# ---------------------------------------------------------------------------
|
||||
@router.delete("/inventory/project-transfers/{transfer_id}")
|
||||
async def delete_transfer(
|
||||
transfer_id: uuid.UUID,
|
||||
ctx: ArrivalScope = Depends(arrivals_scope),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
res = await project_transfer_service.delete_project_transfer(
|
||||
db=db,
|
||||
transfer_id=transfer_id,
|
||||
caller_project_id=ctx.project_id,
|
||||
caller_role=ctx.role,
|
||||
)
|
||||
return {"data": res}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# GET /pm/transfers/on-the-way — Incoming in-transit transfers for active project
|
||||
# ---------------------------------------------------------------------------
|
||||
@router.get("/pm/transfers/on-the-way")
|
||||
async def pm_incoming_transfers(
|
||||
ctx: ArrivalScope = Depends(arrivals_scope),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
if ctx.role == "pm" and ctx.project_id is None:
|
||||
raise ForbiddenError("شما به هیچ پروژه‌ای متصل نیستید")
|
||||
|
||||
transfers = await project_transfer_service.list_project_transfers(
|
||||
db=db,
|
||||
project_id=ctx.project_id,
|
||||
direction="incoming",
|
||||
status="in_transit",
|
||||
)
|
||||
return {"data": [_to_transfer_out(t) for t in transfers]}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# POST /inventory/project-transfers/{id}/receive — Destination PM confirms arrival
|
||||
# ---------------------------------------------------------------------------
|
||||
@router.post("/inventory/project-transfers/{transfer_id}/receive")
|
||||
async def receive_transfer(
|
||||
transfer_id: uuid.UUID,
|
||||
payload: ProjectTransferReceive,
|
||||
ctx: ArrivalScope = Depends(arrivals_scope),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
transfer = await project_transfer_service.receive_project_transfer(
|
||||
db=db,
|
||||
transfer_id=transfer_id,
|
||||
payload=payload,
|
||||
caller_project_id=ctx.project_id,
|
||||
caller_role=ctx.role,
|
||||
received_by=ctx.display_name,
|
||||
)
|
||||
return {"data": _to_transfer_out(transfer)}
|
||||
@@ -169,11 +169,14 @@ async def create_quote(
|
||||
):
|
||||
# سطح limited: استعلام فقط برای پروژه‌های عضویت خودش
|
||||
if (ctx.panels or {}).get("procurement") == "limited" and ctx.role != "admin":
|
||||
member = set(ctx.member_project_ids or [])
|
||||
wanted = {pid for pid in ([payload.project_id] + list(payload.project_ids or [])) if pid}
|
||||
allowed = set(ctx.project_ids or []) | set(ctx.member_project_ids or [])
|
||||
if ctx.project_id:
|
||||
allowed.add(ctx.project_id)
|
||||
allowed_str = {str(pid) for pid in allowed if pid}
|
||||
wanted = {str(pid) for pid in ([payload.project_id] + list(payload.project_ids or [])) if pid}
|
||||
if not wanted:
|
||||
raise ValidationError("برای افزودن استعلام، پروژه الزامی است")
|
||||
if not wanted <= member:
|
||||
if not wanted <= allowed_str:
|
||||
raise ForbiddenError("استعلام فقط برای پروژه‌های تخصیص‌یافته به شما مجاز است")
|
||||
quote = await quote_service.create_quote(db, payload, actor)
|
||||
return {"data": await serialize_quote_with_children(db, quote)}
|
||||
|
||||
@@ -2,10 +2,8 @@
|
||||
|
||||
GET/POST /suppliers/{id}/materials — manage a supplier's catalog.
|
||||
DELETE /suppliers/{id}/materials/{material_id} — unlink.
|
||||
GET /materials/{id}/suppliers — suppliers linked to a material.
|
||||
GET /materials/{id}/suppliers — price-comparison data source.
|
||||
"""
|
||||
from uuid import UUID
|
||||
|
||||
from fastapi import APIRouter, Depends, Query
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
@@ -24,47 +22,29 @@ router = APIRouter(tags=["supplier-materials"])
|
||||
_procurement_writer = require_procurement_writer()
|
||||
|
||||
|
||||
def link_to_dict(
|
||||
link: SupplierMaterial,
|
||||
material: Material | None = None,
|
||||
category: MaterialCategory | None = None,
|
||||
supplier: Supplier | None = None,
|
||||
) -> dict:
|
||||
"""Serialize a SupplierMaterial ORM row to a plain dict for the API envelope."""
|
||||
def link_to_dict(link: SupplierMaterial, material: Material | None = None,
|
||||
category: MaterialCategory | None = None,
|
||||
supplier: Supplier | None = None) -> dict:
|
||||
return {
|
||||
"id": str(link.id),
|
||||
"supplier_id": str(link.supplier_id),
|
||||
"material_id": str(link.material_id),
|
||||
"is_active": link.is_active,
|
||||
"last_quoted_price": (
|
||||
float(link.last_quoted_price) if link.last_quoted_price is not None else None
|
||||
),
|
||||
"last_quoted_price": float(link.last_quoted_price) if link.last_quoted_price is not None else None,
|
||||
"last_quoted_at": to_iso(link.last_quoted_at) if link.last_quoted_at else None,
|
||||
"created_at": to_iso(link.created_at),
|
||||
"material": (
|
||||
{
|
||||
"id": str(material.id),
|
||||
"name": material.name,
|
||||
"category": (
|
||||
{"id": str(category.id), "name": category.name} if category else None
|
||||
),
|
||||
}
|
||||
if material
|
||||
else None
|
||||
),
|
||||
"supplier": (
|
||||
{"id": str(supplier.id), "name": supplier.name} if supplier else None
|
||||
),
|
||||
"material": {
|
||||
"id": str(material.id),
|
||||
"name": material.name,
|
||||
"category": {"id": str(category.id), "name": category.name} if category else None,
|
||||
} if material else None,
|
||||
"supplier": {"id": str(supplier.id), "name": supplier.name} if supplier else None,
|
||||
}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# GET /suppliers/{supplier_id}/materials
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@router.get("/suppliers/{supplier_id}/materials")
|
||||
async def list_supplier_materials(
|
||||
supplier_id: UUID,
|
||||
supplier_id,
|
||||
page: int = Query(1, ge=1),
|
||||
page_size: int = Query(20, ge=1, le=100),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
@@ -78,24 +58,14 @@ async def list_supplier_materials(
|
||||
.order_by(SupplierMaterial.created_at)
|
||||
)
|
||||
items, meta = await paginate(stmt, page, page_size, db)
|
||||
mat_ids = [lnk.material_id for lnk in items]
|
||||
materials: dict = {}
|
||||
if mat_ids:
|
||||
result = await db.execute(select(Material).where(Material.id.in_(mat_ids)))
|
||||
materials = {m.id: m for m in result.scalars()}
|
||||
return {
|
||||
"data": [link_to_dict(lnk, materials.get(lnk.material_id)) for lnk in items],
|
||||
"meta": meta,
|
||||
}
|
||||
mat_ids = {l.material_id for l in items}
|
||||
materials = {m.id: m for m in (await db.execute(select(Material).where(Material.id.in_(mat_ids)))).scalars()}
|
||||
return {"data": [link_to_dict(l, materials.get(l.material_id), None) for l in items], "meta": meta}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# POST /suppliers/{supplier_id}/materials
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@router.post("/suppliers/{supplier_id}/materials", status_code=201)
|
||||
async def create_supplier_material(
|
||||
supplier_id: UUID,
|
||||
supplier_id,
|
||||
payload: SupplierMaterialCreate,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
_auth=Depends(_procurement_writer),
|
||||
@@ -103,17 +73,13 @@ async def create_supplier_material(
|
||||
async with db.begin():
|
||||
link = await link_supplier_material(db, supplier_id, payload.material_id)
|
||||
material = await db.get(Material, payload.material_id)
|
||||
return {"data": link_to_dict(link, material)}
|
||||
return {"data": link_to_dict(link, material, None)}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# DELETE /suppliers/{supplier_id}/materials/{material_id}
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@router.delete("/suppliers/{supplier_id}/materials/{material_id}")
|
||||
async def delete_supplier_material(
|
||||
supplier_id: UUID,
|
||||
material_id: UUID,
|
||||
supplier_id,
|
||||
material_id,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
_auth=Depends(_procurement_writer),
|
||||
):
|
||||
@@ -127,80 +93,17 @@ async def list_material_suppliers(
|
||||
material_id,
|
||||
page: int = Query(1, ge=1),
|
||||
page_size: int = Query(20, ge=1, le=100),
|
||||
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
async with db.begin():
|
||||
await unlink_supplier_material(db, supplier_id, material_id)
|
||||
return {
|
||||
"data": {
|
||||
"supplier_id": str(supplier_id),
|
||||
"material_id": str(material_id),
|
||||
"deleted": True,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# GET /materials/{material_id}/suppliers
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@router.get(
|
||||
"/materials/{material_id}/suppliers",
|
||||
summary="List all suppliers linked to a material",
|
||||
)
|
||||
async def list_material_suppliers(
|
||||
material_id: UUID,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
"""Return the suppliers linked to a material, straight from PostgreSQL.
|
||||
|
||||
The path parameter is typed as UUID so FastAPI validates and coerces it
|
||||
before the handler runs; a malformed id is rejected with 422, an unknown
|
||||
material with 404.
|
||||
|
||||
Atomic JOIN — a supplier is returned only through its supplier_materials
|
||||
link, so the response can never contain a supplier that is not actually
|
||||
linked to this material:
|
||||
|
||||
select(Supplier)
|
||||
.join(SupplierMaterial, Supplier.id == SupplierMaterial.supplier_id)
|
||||
.where(SupplierMaterial.material_id == material_id)
|
||||
|
||||
Response envelope (frontend MaterialSupplier binds these fields directly):
|
||||
{
|
||||
"data": [
|
||||
{
|
||||
"id": "<supplier_uuid>",
|
||||
"name": "فولاد ناب آریا",
|
||||
"phone": "021-..." | null,
|
||||
"contact_person": "علی محمدی" | null,
|
||||
"location": "تهران" | null
|
||||
}
|
||||
]
|
||||
}
|
||||
"""
|
||||
material = await db.get(Material, material_id)
|
||||
if material is None:
|
||||
raise NotFoundError("متریال یافت نشد")
|
||||
|
||||
stmt = (
|
||||
select(Supplier)
|
||||
.join(SupplierMaterial, Supplier.id == SupplierMaterial.supplier_id)
|
||||
select(SupplierMaterial)
|
||||
.where(SupplierMaterial.material_id == material_id)
|
||||
.order_by(Supplier.name)
|
||||
.order_by(SupplierMaterial.last_quoted_at.desc().nulls_last())
|
||||
)
|
||||
suppliers = (await db.execute(stmt)).scalars().all()
|
||||
|
||||
return {
|
||||
"data": [
|
||||
{
|
||||
"id": str(supplier.id),
|
||||
"name": supplier.name,
|
||||
"phone": supplier.phone,
|
||||
"contact_person": supplier.contact_person,
|
||||
"location": supplier.location,
|
||||
}
|
||||
for supplier in suppliers
|
||||
]
|
||||
}
|
||||
items, meta = await paginate(stmt, page, page_size, db)
|
||||
sup_ids = {l.supplier_id for l in items}
|
||||
suppliers = {s.id: s for s in (await db.execute(select(Supplier).where(Supplier.id.in_(sup_ids)))).scalars()}
|
||||
return {"data": [link_to_dict(l, supplier=suppliers.get(l.supplier_id)) for l in items], "meta": meta}
|
||||
|
||||
@@ -17,7 +17,7 @@ import uuid
|
||||
|
||||
import httpx
|
||||
from fastapi import APIRouter, Depends
|
||||
from sqlalchemy import delete, select, update, text
|
||||
from sqlalchemy import delete, select, update, text, or_
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.auth import UserContext, get_current_user, require_role
|
||||
@@ -100,7 +100,9 @@ async def user_to_dict(user: User, projects: list[Project] | None = None, db: As
|
||||
}
|
||||
if db is not None:
|
||||
out["panels"] = await _panels_of(db, user.id)
|
||||
out["member_project_ids"] = await _member_project_ids_of(db, user.id)
|
||||
member_pids = await _member_project_ids_of(db, user.id)
|
||||
all_pids = list(dict.fromkeys(member_pids + [str(p.id) for p in projects]))
|
||||
out["member_project_ids"] = all_pids
|
||||
return out
|
||||
|
||||
|
||||
@@ -112,13 +114,23 @@ async def _org_manager(ctx: UserContext = Depends(get_current_user)) -> UserCont
|
||||
|
||||
|
||||
async def _user_projects(db: AsyncSession, user: User) -> list[Project]:
|
||||
"""Every project assigned to the user (supervisor or PM) (oldest first)."""
|
||||
"""Every project assigned to the user (supervisor or PM) (oldest first).
|
||||
Includes both direct PM assignments (pm_user_id) and member projects (UserProjectMembership).
|
||||
"""
|
||||
if user.role not in ("supervisor", "pm"):
|
||||
return []
|
||||
member_subq = select(UserProjectMembership.project_id).where(
|
||||
UserProjectMembership.user_id == user.id
|
||||
)
|
||||
rows = (
|
||||
await db.execute(
|
||||
select(Project)
|
||||
.where(Project.pm_user_id == user.id)
|
||||
.where(
|
||||
or_(
|
||||
Project.pm_user_id == user.id,
|
||||
Project.id.in_(member_subq),
|
||||
)
|
||||
)
|
||||
.order_by(Project.created_at, Project.id)
|
||||
)
|
||||
).scalars().all()
|
||||
@@ -246,12 +258,12 @@ async def create_user(
|
||||
async def update_user_role(
|
||||
user_id,
|
||||
payload: UserRoleUpdate,
|
||||
ctx: UserContext = Depends(require_role("admin")),
|
||||
ctx: UserContext = Depends(_org_manager),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
"""Set/clear a role — ADMIN ONLY (RBAC): procurement managers must not
|
||||
assign or elevate roles. Revoking (or switching away from «pm») also
|
||||
unassigns the user from their project."""
|
||||
"""Set/clear a role — organization management (admin, procurement manager, PM)."""
|
||||
if payload.role == "admin" and ctx.role != "admin":
|
||||
raise ForbiddenError("فقط ادمین می‌تواند نقش ادمین تعیین کند")
|
||||
user = await db.get(User, user_id)
|
||||
if user is None:
|
||||
raise NotFoundError("کاربر یافت نشد")
|
||||
@@ -386,13 +398,14 @@ async def assign_user_project(
|
||||
|
||||
|
||||
@router.put("/{user_id}/panels")
|
||||
@router.patch("/{user_id}/panels")
|
||||
async def set_user_panels(
|
||||
user_id,
|
||||
payload: UserPanelsUpdate,
|
||||
_: UserContext = Depends(require_role("admin")),
|
||||
_: UserContext = Depends(_org_manager),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
"""تخصیص پنل + سطح دسترسی به کاربر — فقط ادمین."""
|
||||
"""تخصیص پنل + سطح دسترسی به کاربر — مدیران سازمان (ادمین، مدیر تدارکات، مدیر پروژه)."""
|
||||
user = await db.get(User, user_id)
|
||||
if user is None:
|
||||
raise NotFoundError("کاربر یافت نشد")
|
||||
@@ -409,10 +422,11 @@ async def set_user_panels(
|
||||
|
||||
|
||||
@router.put("/{user_id}/panel-projects")
|
||||
@router.patch("/{user_id}/panel-projects")
|
||||
async def set_user_panel_projects(
|
||||
user_id,
|
||||
payload: UserPanelProjectsUpdate,
|
||||
_: UserContext = Depends(require_role("admin")),
|
||||
_: UserContext = Depends(_org_manager),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
"""عضویت پروژه‌ای کاربر (M:N) — محدوده داده‌ی سطح limited."""
|
||||
|
||||
@@ -64,7 +64,6 @@ class InventoryTransactionCreate(APIModel):
|
||||
unit_id: int | None = None
|
||||
specs: dict | None = None
|
||||
note: str | None = None
|
||||
delivered_to: str | None = None
|
||||
transaction_date: datetime | None = None
|
||||
|
||||
@model_validator(mode="after")
|
||||
|
||||
@@ -140,11 +140,6 @@ class AcceptTermsheetIn(APIModel):
|
||||
schedule_steps: list[ScheduleStepIn] = Field(min_length=1)
|
||||
|
||||
|
||||
class ProjectAllocationIn(APIModel):
|
||||
project_id: UUID
|
||||
quantity: Decimal = Field(gt=0, description="Allocated quantity for this project")
|
||||
|
||||
|
||||
class ItemDecisionIn(APIModel):
|
||||
line_item_id: UUID
|
||||
status: Literal["chosen", "rejected"]
|
||||
@@ -152,7 +147,6 @@ class ItemDecisionIn(APIModel):
|
||||
adjusted_unit_price: Decimal | None = Field(default=None, gt=0)
|
||||
adjusted_notes: str | None = None
|
||||
project_id: UUID | None = Field(default=None, description="The ONE purchased project (v2.6 — required when the offer spans several projects)")
|
||||
allocations: list[ProjectAllocationIn] = Field(default_factory=list, description="Multi-project split allocations for this line item")
|
||||
|
||||
|
||||
class ItemProjectsIn(APIModel):
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
from datetime import datetime
|
||||
from decimal import Decimal
|
||||
from uuid import UUID
|
||||
|
||||
from pydantic import Field
|
||||
|
||||
from app.schemas.common import APIModel
|
||||
|
||||
|
||||
class WarehouseAllocationIn(APIModel):
|
||||
warehouse_id: UUID
|
||||
quantity: Decimal = Field(gt=0)
|
||||
|
||||
|
||||
class ProjectTransferCreate(APIModel):
|
||||
from_warehouse_id: UUID
|
||||
to_project_id: UUID
|
||||
material_id: UUID
|
||||
brand_id: UUID | None = None
|
||||
unit_id: int
|
||||
quantity: Decimal = Field(gt=0)
|
||||
specs: dict = Field(default_factory=dict)
|
||||
note: str | None = None
|
||||
transfer_date: datetime | None = None
|
||||
|
||||
|
||||
class ProjectTransferUpdate(APIModel):
|
||||
to_project_id: UUID | None = None
|
||||
quantity: Decimal | None = Field(default=None, gt=0)
|
||||
note: str | None = None
|
||||
transfer_date: datetime | None = None
|
||||
|
||||
|
||||
class ProjectTransferReceive(APIModel):
|
||||
allocations: list[WarehouseAllocationIn] = Field(
|
||||
min_length=1,
|
||||
description="Warehouse allocations in destination project (sum must equal transfer quantity)",
|
||||
)
|
||||
received_at: datetime | None = None
|
||||
note: str | None = None
|
||||
|
||||
|
||||
class IdNameOut(APIModel):
|
||||
id: UUID
|
||||
name: str
|
||||
|
||||
|
||||
class UnitBriefOut(APIModel):
|
||||
id: int
|
||||
code: str
|
||||
name_fa: str | None = None
|
||||
|
||||
|
||||
class ProjectTransferOut(APIModel):
|
||||
id: UUID
|
||||
from_project: IdNameOut
|
||||
from_warehouse: IdNameOut
|
||||
to_project: IdNameOut
|
||||
to_warehouse: IdNameOut | None = None
|
||||
material: IdNameOut
|
||||
brand: IdNameOut | None = None
|
||||
unit: UnitBriefOut
|
||||
quantity: Decimal
|
||||
specs: dict
|
||||
specs_hash: str
|
||||
note: str | None = None
|
||||
status: str
|
||||
transfer_date: datetime
|
||||
transferred_by: str | None = None
|
||||
received_at: datetime | None = None
|
||||
received_by: str | None = None
|
||||
receipt_allocations: list[dict] | None = None
|
||||
created_at: datetime
|
||||
updated_at: datetime
|
||||
@@ -290,7 +290,6 @@ async def apply_transaction(
|
||||
transaction_type=t,
|
||||
quantity=quantity,
|
||||
performed_by=performed_by,
|
||||
delivered_to=payload.delivered_to,
|
||||
transaction_date=payload.transaction_date,
|
||||
note=payload.note,
|
||||
)
|
||||
@@ -320,7 +319,6 @@ async def apply_transaction(
|
||||
transaction_type=t,
|
||||
quantity=-quantity,
|
||||
performed_by=performed_by,
|
||||
delivered_to=payload.delivered_to,
|
||||
transaction_date=payload.transaction_date,
|
||||
note=payload.note,
|
||||
)
|
||||
|
||||
@@ -1,471 +0,0 @@
|
||||
import uuid
|
||||
from datetime import datetime, timezone
|
||||
from decimal import Decimal
|
||||
|
||||
from sqlalchemy import delete, select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy.orm import selectinload
|
||||
|
||||
from app.models.catalog import Brand, Material, Unit
|
||||
from app.models.inventory import InventoryItem, InventoryTransaction, Warehouse
|
||||
from app.models.procurement import Project
|
||||
from app.models.project_transfer import ProjectTransfer
|
||||
from app.schemas.project_transfers import (
|
||||
ProjectTransferCreate,
|
||||
ProjectTransferReceive,
|
||||
ProjectTransferUpdate,
|
||||
)
|
||||
from app.services.inventory_service import (
|
||||
_find_inventory,
|
||||
_get_or_create_inventory,
|
||||
canonical_specs_hash,
|
||||
)
|
||||
from app.utils.errors import ConflictError, ForbiddenError, NotFoundError, ValidationError
|
||||
|
||||
|
||||
async def get_project_transfer_or_404(db: AsyncSession, transfer_id: uuid.UUID) -> ProjectTransfer:
|
||||
stmt = (
|
||||
select(ProjectTransfer)
|
||||
.where(ProjectTransfer.id == transfer_id)
|
||||
.options(
|
||||
selectinload(ProjectTransfer.from_project),
|
||||
selectinload(ProjectTransfer.to_project),
|
||||
selectinload(ProjectTransfer.from_warehouse),
|
||||
selectinload(ProjectTransfer.to_warehouse),
|
||||
selectinload(ProjectTransfer.material),
|
||||
selectinload(ProjectTransfer.brand),
|
||||
selectinload(ProjectTransfer.unit),
|
||||
)
|
||||
)
|
||||
transfer = await db.scalar(stmt)
|
||||
if transfer is None:
|
||||
raise NotFoundError("رکورد انتقال بین کارگاهی یافت نشد", field="transfer_id")
|
||||
return transfer
|
||||
|
||||
|
||||
async def create_project_transfer(
|
||||
db: AsyncSession,
|
||||
payload: ProjectTransferCreate,
|
||||
caller_project_id: uuid.UUID | None,
|
||||
caller_role: str,
|
||||
transferred_by: str | None = None,
|
||||
) -> ProjectTransfer:
|
||||
tx = db.begin_nested() if db.in_transaction() else db.begin()
|
||||
async with tx:
|
||||
# Validate source warehouse
|
||||
from_wh = await db.get(Warehouse, payload.from_warehouse_id)
|
||||
if from_wh is None:
|
||||
raise NotFoundError("انبار مبدأ یافت نشد", field="from_warehouse_id")
|
||||
|
||||
# RBAC: PM can only send from their own project
|
||||
if caller_role == "pm" and caller_project_id is not None:
|
||||
if from_wh.project_id != caller_project_id:
|
||||
raise ForbiddenError("شما فقط مجاز به انتقال از انبار پروژه خود هستید")
|
||||
|
||||
from_proj = await db.get(Project, from_wh.project_id)
|
||||
to_proj = await db.get(Project, payload.to_project_id)
|
||||
if to_proj is None:
|
||||
raise NotFoundError("پروژه مقصد یافت نشد", field="to_project_id")
|
||||
|
||||
if from_wh.project_id == payload.to_project_id:
|
||||
raise ValidationError(
|
||||
"پروژه مقصد نمی‌تواند همان پروژه مبدأ باشد (از انتقال بین‌انباری استفاده کنید)",
|
||||
field="to_project_id",
|
||||
)
|
||||
|
||||
# Validate material, brand, unit
|
||||
mat = await db.get(Material, payload.material_id)
|
||||
if mat is None:
|
||||
raise NotFoundError("ماده اولیه یافت نشد", field="material_id")
|
||||
|
||||
if payload.brand_id is not None:
|
||||
brand = await db.get(Brand, payload.brand_id)
|
||||
if brand is None:
|
||||
raise NotFoundError("برند یافت نشد", field="brand_id")
|
||||
|
||||
unit = await db.get(Unit, payload.unit_id)
|
||||
if unit is None:
|
||||
raise NotFoundError("واحد یافت نشد", field="unit_id")
|
||||
|
||||
# Requirement 2: Canonical specs hash from inventory_service
|
||||
specs = payload.specs or {}
|
||||
specs_hash = canonical_specs_hash(specs)
|
||||
|
||||
# Check stock in source warehouse with SELECT ... FOR UPDATE
|
||||
source_item = await _find_inventory(
|
||||
db,
|
||||
payload.from_warehouse_id,
|
||||
payload.material_id,
|
||||
payload.brand_id,
|
||||
specs_hash,
|
||||
for_update=True,
|
||||
)
|
||||
|
||||
# Smart fallback: If exact hash or brand didn't match, check candidate rows in this warehouse for this material
|
||||
if source_item is None:
|
||||
candidates_res = await db.execute(
|
||||
select(InventoryItem)
|
||||
.where(
|
||||
InventoryItem.warehouse_id == payload.from_warehouse_id,
|
||||
InventoryItem.material_id == payload.material_id,
|
||||
)
|
||||
.with_for_update()
|
||||
)
|
||||
candidates = candidates_res.scalars().all()
|
||||
|
||||
if len(candidates) == 1:
|
||||
source_item = candidates[0]
|
||||
elif len(candidates) > 1:
|
||||
best_cand = None
|
||||
best_score = -1
|
||||
p_keys = set(specs.keys())
|
||||
p_vals = set(str(v).strip() for v in specs.values() if str(v).strip())
|
||||
|
||||
for cand in candidates:
|
||||
score = 0
|
||||
if cand.brand_id == payload.brand_id:
|
||||
score += 10
|
||||
elif cand.brand_id is None and payload.brand_id is None:
|
||||
score += 10
|
||||
elif cand.brand_id is None:
|
||||
score += 4
|
||||
|
||||
c_specs = cand.specs or {}
|
||||
c_keys = set(c_specs.keys())
|
||||
c_vals = set(str(v).strip() for v in c_specs.values() if str(v).strip())
|
||||
|
||||
for pk in p_keys:
|
||||
if pk in c_keys or f"spec_{pk}" in c_keys or any(pk in ck for ck in c_keys):
|
||||
score += 5
|
||||
for pv in p_vals:
|
||||
if pv in c_vals or any(pv in str(cv) for cv in c_vals):
|
||||
score += 5
|
||||
|
||||
if cand.quantity >= payload.quantity:
|
||||
score += 2
|
||||
|
||||
if score > best_score:
|
||||
best_score = score
|
||||
best_cand = cand
|
||||
|
||||
source_item = best_cand
|
||||
|
||||
if source_item is None or source_item.quantity < payload.quantity:
|
||||
avail = source_item.quantity if source_item else Decimal("0")
|
||||
raise ValidationError(
|
||||
f"موجودی کافی در انبار مبدأ وجود ندارد (موجودی فعلی: {avail})",
|
||||
field="quantity",
|
||||
)
|
||||
|
||||
# Deduct from source warehouse immediately
|
||||
source_item.quantity -= payload.quantity
|
||||
|
||||
transfer_pair_id = uuid.uuid4()
|
||||
now_dt = payload.transfer_date or datetime.now(timezone.utc)
|
||||
note_text = f"انتقال بین کارگاهی به پروژه {to_proj.name}"
|
||||
if payload.note:
|
||||
note_text += f" — {payload.note}"
|
||||
|
||||
out_tx = InventoryTransaction(
|
||||
inventory_id=source_item.id,
|
||||
warehouse_id=from_wh.id,
|
||||
transaction_type="TRANSFER_OUT",
|
||||
quantity=-payload.quantity,
|
||||
transfer_pair_id=transfer_pair_id,
|
||||
performed_by=transferred_by,
|
||||
transaction_date=now_dt,
|
||||
note=note_text,
|
||||
)
|
||||
db.add(out_tx)
|
||||
await db.flush()
|
||||
|
||||
actual_brand_id = source_item.brand_id
|
||||
actual_specs = source_item.specs if source_item.specs is not None else specs
|
||||
actual_specs_hash = source_item.specs_hash or canonical_specs_hash(actual_specs)
|
||||
|
||||
transfer = ProjectTransfer(
|
||||
from_project_id=from_wh.project_id,
|
||||
from_warehouse_id=from_wh.id,
|
||||
to_project_id=payload.to_project_id,
|
||||
material_id=payload.material_id,
|
||||
brand_id=actual_brand_id,
|
||||
unit_id=source_item.unit_id if source_item.unit_id else payload.unit_id,
|
||||
quantity=payload.quantity,
|
||||
specs=actual_specs,
|
||||
specs_hash=actual_specs_hash,
|
||||
note=payload.note,
|
||||
status="in_transit",
|
||||
out_transaction_id=out_tx.id,
|
||||
transfer_date=now_dt,
|
||||
transferred_by=transferred_by,
|
||||
)
|
||||
db.add(transfer)
|
||||
await db.flush()
|
||||
|
||||
return await get_project_transfer_or_404(db, transfer.id)
|
||||
|
||||
|
||||
async def update_project_transfer(
|
||||
db: AsyncSession,
|
||||
transfer_id: uuid.UUID,
|
||||
payload: ProjectTransferUpdate,
|
||||
caller_project_id: uuid.UUID | None,
|
||||
caller_role: str,
|
||||
) -> ProjectTransfer:
|
||||
tx = db.begin_nested() if db.in_transaction() else db.begin()
|
||||
async with tx:
|
||||
transfer = await db.scalar(
|
||||
select(ProjectTransfer).where(ProjectTransfer.id == transfer_id).with_for_update()
|
||||
)
|
||||
if transfer is None:
|
||||
raise NotFoundError("رکورد انتقال یافت نشد", field="transfer_id")
|
||||
|
||||
# RBAC (Requirement 4)
|
||||
if caller_role == "pm" and caller_project_id is not None:
|
||||
if transfer.from_project_id != caller_project_id:
|
||||
raise ForbiddenError("شما فقط مجاز به ویرایش انتقال‌های پروژه مبدأ خود هستید")
|
||||
|
||||
# Status Lock Guard (Requirement 4)
|
||||
if transfer.status == "received":
|
||||
raise ConflictError(
|
||||
"این انتقال در پروژه مقصد تحویل و ثبت انبار شده است و امکان ویرایش آن وجود ندارد"
|
||||
)
|
||||
if transfer.status != "in_transit":
|
||||
raise ConflictError("فقط انتقال‌های در راه (in_transit) قابل ویرایش هستند")
|
||||
|
||||
if payload.to_project_id is not None and payload.to_project_id != transfer.to_project_id:
|
||||
new_to_proj = await db.get(Project, payload.to_project_id)
|
||||
if new_to_proj is None:
|
||||
raise NotFoundError("پروژه مقصد یافت نشد", field="to_project_id")
|
||||
if payload.to_project_id == transfer.from_project_id:
|
||||
raise ValidationError("پروژه مقصد نمی‌تواند همان پروژه مبدأ باشد", field="to_project_id")
|
||||
transfer.to_project_id = payload.to_project_id
|
||||
|
||||
# Quantity adjustment (reconciles source stock difference)
|
||||
if payload.quantity is not None and payload.quantity != transfer.quantity:
|
||||
delta = payload.quantity - transfer.quantity
|
||||
source_item = await _find_inventory(
|
||||
db,
|
||||
transfer.from_warehouse_id,
|
||||
transfer.material_id,
|
||||
transfer.brand_id,
|
||||
transfer.specs_hash,
|
||||
for_update=True,
|
||||
)
|
||||
if delta > 0:
|
||||
if source_item is None or source_item.quantity < delta:
|
||||
avail = source_item.quantity if source_item else Decimal("0")
|
||||
raise ValidationError(
|
||||
f"موجودی انبار مبدأ برای افزایش انتقال کافی نیست (موجود: {avail})",
|
||||
field="quantity",
|
||||
)
|
||||
source_item.quantity -= delta
|
||||
else:
|
||||
if source_item is not None:
|
||||
source_item.quantity += abs(delta)
|
||||
|
||||
transfer.quantity = payload.quantity
|
||||
|
||||
# Update out_transaction
|
||||
if transfer.out_transaction_id is not None:
|
||||
out_tx = await db.get(InventoryTransaction, transfer.out_transaction_id)
|
||||
if out_tx is not None:
|
||||
out_tx.quantity = -payload.quantity
|
||||
|
||||
if payload.note is not None:
|
||||
transfer.note = payload.note
|
||||
|
||||
if payload.transfer_date is not None:
|
||||
transfer.transfer_date = payload.transfer_date
|
||||
if transfer.out_transaction_id is not None:
|
||||
out_tx = await db.get(InventoryTransaction, transfer.out_transaction_id)
|
||||
if out_tx is not None:
|
||||
out_tx.transaction_date = payload.transfer_date
|
||||
|
||||
return await get_project_transfer_or_404(db, transfer_id)
|
||||
|
||||
|
||||
async def delete_project_transfer(
|
||||
db: AsyncSession,
|
||||
transfer_id: uuid.UUID,
|
||||
caller_project_id: uuid.UUID | None,
|
||||
caller_role: str,
|
||||
) -> dict:
|
||||
tx = db.begin_nested() if db.in_transaction() else db.begin()
|
||||
async with tx:
|
||||
transfer = await db.scalar(
|
||||
select(ProjectTransfer).where(ProjectTransfer.id == transfer_id).with_for_update()
|
||||
)
|
||||
if transfer is None:
|
||||
raise NotFoundError("رکورد انتقال یافت نشد", field="transfer_id")
|
||||
|
||||
# RBAC (Requirement 4)
|
||||
if caller_role == "pm" and caller_project_id is not None:
|
||||
if transfer.from_project_id != caller_project_id:
|
||||
raise ForbiddenError("شما فقط مجاز به لغو انتقال‌های پروژه مبدأ خود هستید")
|
||||
|
||||
# Status Lock Guard (Requirement 4)
|
||||
if transfer.status == "received":
|
||||
raise ConflictError(
|
||||
"این انتقال در پروژه مقصد تحویل و ثبت انبار شده است و امکان لغو یا حذف آن وجود ندارد"
|
||||
)
|
||||
|
||||
# Reversibility (Requirement 4): Restore stock to source warehouse
|
||||
source_item = await _find_inventory(
|
||||
db,
|
||||
transfer.from_warehouse_id,
|
||||
transfer.material_id,
|
||||
transfer.brand_id,
|
||||
transfer.specs_hash,
|
||||
for_update=True,
|
||||
)
|
||||
if source_item is not None:
|
||||
source_item.quantity += transfer.quantity
|
||||
|
||||
# Delete out_transaction
|
||||
if transfer.out_transaction_id is not None:
|
||||
out_tx = await db.get(InventoryTransaction, transfer.out_transaction_id)
|
||||
if out_tx is not None:
|
||||
await db.delete(out_tx)
|
||||
|
||||
await db.delete(transfer)
|
||||
|
||||
return {"ok": True, "message": "انتقال با موفقیت لغو شد و موجودی به انبار مبدأ بازگردانده شد"}
|
||||
|
||||
|
||||
async def receive_project_transfer(
|
||||
db: AsyncSession,
|
||||
transfer_id: uuid.UUID,
|
||||
payload: ProjectTransferReceive,
|
||||
caller_project_id: uuid.UUID | None,
|
||||
caller_role: str,
|
||||
received_by: str | None = None,
|
||||
) -> ProjectTransfer:
|
||||
tx = db.begin_nested() if db.in_transaction() else db.begin()
|
||||
async with tx:
|
||||
transfer = await db.scalar(
|
||||
select(ProjectTransfer).where(ProjectTransfer.id == transfer_id).with_for_update()
|
||||
)
|
||||
if transfer is None:
|
||||
raise NotFoundError("رکورد انتقال یافت نشد", field="transfer_id")
|
||||
|
||||
# RBAC (Requirement 4)
|
||||
if caller_role == "pm" and caller_project_id is not None:
|
||||
if transfer.to_project_id != caller_project_id:
|
||||
raise ForbiddenError("شما فقط مجاز به تأیید تحویل در پروژه مقصد خود هستید")
|
||||
|
||||
# Lock Guard
|
||||
if transfer.status == "received":
|
||||
raise ConflictError("این انتقال قبلاً تحویل گرفته و ثبت انبار شده است")
|
||||
if transfer.status != "in_transit":
|
||||
raise ConflictError("این انتقال در وضعیت در راه نیست")
|
||||
|
||||
# Requirement 1: 100% full delivery logic (no partial receipt)
|
||||
alloc_sum = sum(Decimal(str(a.quantity)) for a in payload.allocations)
|
||||
if alloc_sum != transfer.quantity:
|
||||
raise ValidationError(
|
||||
f"تخصیص انبارها باید دقیقاً برابر کل مقدار ارسالی ({transfer.quantity}) باشد. مجموع واردشده: {alloc_sum}",
|
||||
field="allocations",
|
||||
)
|
||||
|
||||
# Validate destination warehouses belong to destination project
|
||||
wh_ids = [a.warehouse_id for a in payload.allocations]
|
||||
wh_rows = (await db.execute(select(Warehouse).where(Warehouse.id.in_(wh_ids)))).scalars().all()
|
||||
wh_map = {w.id: w for w in wh_rows}
|
||||
|
||||
for a in payload.allocations:
|
||||
wh = wh_map.get(a.warehouse_id)
|
||||
if wh is None or wh.project_id != transfer.to_project_id:
|
||||
raise ValidationError(
|
||||
"انبار انتخاب‌شده معتبر نیست یا متعلق به پروژه مقصد نمی‌باشد",
|
||||
field="allocations.warehouse_id",
|
||||
)
|
||||
|
||||
from_proj = await db.get(Project, transfer.from_project_id)
|
||||
from_proj_name = from_proj.name if from_proj else "پروژه مبدأ"
|
||||
|
||||
out_tx = (
|
||||
await db.get(InventoryTransaction, transfer.out_transaction_id)
|
||||
if transfer.out_transaction_id
|
||||
else None
|
||||
)
|
||||
pair_id = out_tx.transfer_pair_id if (out_tx and out_tx.transfer_pair_id) else uuid.uuid4()
|
||||
now_dt = payload.received_at or datetime.now(timezone.utc)
|
||||
|
||||
# Add stock to destination warehouse(s) via TRANSFER_IN
|
||||
for a in payload.allocations:
|
||||
dest_item = await _get_or_create_inventory(
|
||||
db,
|
||||
a.warehouse_id,
|
||||
transfer.material_id,
|
||||
transfer.brand_id,
|
||||
transfer.unit_id,
|
||||
transfer.specs,
|
||||
transfer.specs_hash,
|
||||
)
|
||||
dest_item.quantity += a.quantity
|
||||
|
||||
note_text = f"رسید انتقال بین کارگاهی از {from_proj_name}"
|
||||
if payload.note:
|
||||
note_text += f" — {payload.note}"
|
||||
|
||||
in_tx = InventoryTransaction(
|
||||
inventory_id=dest_item.id,
|
||||
warehouse_id=a.warehouse_id,
|
||||
transaction_type="TRANSFER_IN",
|
||||
quantity=a.quantity,
|
||||
transfer_pair_id=pair_id,
|
||||
performed_by=received_by,
|
||||
transaction_date=now_dt,
|
||||
note=note_text,
|
||||
)
|
||||
db.add(in_tx)
|
||||
|
||||
transfer.status = "received"
|
||||
transfer.received_at = now_dt
|
||||
transfer.received_by = received_by
|
||||
transfer.to_warehouse_id = payload.allocations[0].warehouse_id
|
||||
transfer.receipt_allocations = [
|
||||
{"warehouse_id": str(a.warehouse_id), "quantity": str(a.quantity)}
|
||||
for a in payload.allocations
|
||||
]
|
||||
|
||||
return await get_project_transfer_or_404(db, transfer_id)
|
||||
|
||||
|
||||
async def list_project_transfers(
|
||||
db: AsyncSession,
|
||||
project_id: uuid.UUID | None = None,
|
||||
direction: str = "all", # 'outgoing' | 'incoming' | 'all'
|
||||
status: str | None = None,
|
||||
) -> list[ProjectTransfer]:
|
||||
stmt = (
|
||||
select(ProjectTransfer)
|
||||
.options(
|
||||
selectinload(ProjectTransfer.from_project),
|
||||
selectinload(ProjectTransfer.to_project),
|
||||
selectinload(ProjectTransfer.from_warehouse),
|
||||
selectinload(ProjectTransfer.to_warehouse),
|
||||
selectinload(ProjectTransfer.material),
|
||||
selectinload(ProjectTransfer.brand),
|
||||
selectinload(ProjectTransfer.unit),
|
||||
)
|
||||
)
|
||||
|
||||
if project_id is not None:
|
||||
if direction == "outgoing":
|
||||
stmt = stmt.where(ProjectTransfer.from_project_id == project_id)
|
||||
elif direction == "incoming":
|
||||
stmt = stmt.where(ProjectTransfer.to_project_id == project_id)
|
||||
else:
|
||||
stmt = stmt.where(
|
||||
(ProjectTransfer.from_project_id == project_id)
|
||||
| (ProjectTransfer.to_project_id == project_id)
|
||||
)
|
||||
|
||||
if status:
|
||||
stmt = stmt.where(ProjectTransfer.status == status)
|
||||
|
||||
stmt = stmt.order_by(ProjectTransfer.transfer_date.desc())
|
||||
res = await db.execute(stmt)
|
||||
return list(res.scalars().all())
|
||||
@@ -7,7 +7,6 @@ same transaction.
|
||||
import asyncio
|
||||
import logging
|
||||
from datetime import date, datetime, timezone
|
||||
from decimal import Decimal
|
||||
from uuid import UUID
|
||||
|
||||
from sqlalchemy import delete, func, select, update
|
||||
@@ -19,7 +18,6 @@ from app.models.procurement import (
|
||||
ItemTermsheet,
|
||||
LineItem,
|
||||
LineItemProjects,
|
||||
LineItemSpec,
|
||||
Project,
|
||||
Quote,
|
||||
QuoteEvent,
|
||||
@@ -420,78 +418,6 @@ async def replace_quote_children(
|
||||
|
||||
|
||||
|
||||
async def _ensure_quote_project(db: AsyncSession, quote_id: UUID, project_id: UUID) -> None:
|
||||
"""Ensure (quote_id, project_id) exists in quote_projects junction."""
|
||||
exists = await db.scalar(
|
||||
select(QuoteProjects).where(
|
||||
QuoteProjects.quote_id == quote_id,
|
||||
QuoteProjects.project_id == project_id,
|
||||
)
|
||||
)
|
||||
if not exists:
|
||||
db.add(QuoteProjects(quote_id=quote_id, project_id=project_id))
|
||||
|
||||
|
||||
async def _merge_split_line_items_on_reopen(db: AsyncSession, quote_id: UUID) -> None:
|
||||
"""Consolidate split line items when reverting a quote back to offered.
|
||||
|
||||
Line items sharing the exact same material, brand_material, unit, notes,
|
||||
and identical specs are merged into a single consolidated row whose quantity
|
||||
is the sum of all split rows. Secondary split rows are safely deleted.
|
||||
"""
|
||||
line_items = (
|
||||
await db.execute(
|
||||
select(LineItem).where(LineItem.quote_id == quote_id).order_by(LineItem.created_at.asc(), LineItem.id.asc())
|
||||
)
|
||||
).scalars().all()
|
||||
if len(line_items) <= 1:
|
||||
return
|
||||
|
||||
# Load all specs for these line items to compare canonical signatures
|
||||
specs_rows = (
|
||||
await db.execute(
|
||||
select(LineItemSpec).where(LineItemSpec.line_item_id.in_([li.id for li in line_items]))
|
||||
)
|
||||
).scalars().all()
|
||||
specs_by_li: dict[UUID, list[tuple]] = {}
|
||||
for sp in specs_rows:
|
||||
sig = (
|
||||
str(sp.attribute_definition_id),
|
||||
str(sp.value_number) if sp.value_number is not None else "",
|
||||
(sp.value_string or "").strip(),
|
||||
str(sp.value_boolean) if sp.value_boolean is not None else "",
|
||||
str(sp.value_date) if sp.value_date is not None else "",
|
||||
)
|
||||
specs_by_li.setdefault(sp.line_item_id, []).append(sig)
|
||||
|
||||
# Group line items by identity
|
||||
groups: dict[tuple, list[LineItem]] = {}
|
||||
for li in line_items:
|
||||
specs_sig = tuple(sorted(specs_by_li.get(li.id, [])))
|
||||
key = (
|
||||
li.material_id,
|
||||
li.brand_material_id,
|
||||
li.unit_id,
|
||||
(li.notes or "").strip(),
|
||||
specs_sig,
|
||||
)
|
||||
groups.setdefault(key, []).append(li)
|
||||
|
||||
for key, items in groups.items():
|
||||
if len(items) > 1:
|
||||
primary = items[0]
|
||||
total_qty = sum(Decimal(str(it.quantity)) for it in items)
|
||||
primary.quantity = total_qty
|
||||
|
||||
secondary_ids = [it.id for it in items[1:]]
|
||||
await db.execute(delete(ItemDecision).where(ItemDecision.line_item_id.in_(secondary_ids)))
|
||||
await db.execute(delete(ItemTermsheet).where(ItemTermsheet.line_item_id.in_(secondary_ids)))
|
||||
await db.execute(delete(LineItemProjects).where(LineItemProjects.line_item_id.in_(secondary_ids)))
|
||||
await db.execute(delete(LineItemSpec).where(LineItemSpec.line_item_id.in_(secondary_ids)))
|
||||
await db.execute(delete(LineItem).where(LineItem.id.in_(secondary_ids)))
|
||||
await db.flush()
|
||||
|
||||
|
||||
async def _apply_status_transition(db: AsyncSession, quote: Quote, new_status: str) -> None:
|
||||
"""Backward transitions only; reverts bookkeeping when going back to offered."""
|
||||
current = quote.status
|
||||
@@ -528,8 +454,6 @@ async def _apply_status_transition(db: AsyncSession, quote: Quote, new_status: s
|
||||
)
|
||||
.execution_options(synchronize_session=False)
|
||||
)
|
||||
# Requirement 2: Merge split line items back into single rows
|
||||
await _merge_split_line_items_on_reopen(db, quote.id)
|
||||
# LineItemProjects (candidate projects) are preserved untouched!
|
||||
elif new_status == "accepted": # arrived -> accepted
|
||||
quote.arrived_date = None
|
||||
@@ -633,125 +557,6 @@ async def accept_quote(db: AsyncSession, quote_id: UUID, payload: AcceptQuoteIn,
|
||||
"برای قلم انتخاب‌شده adjusted_unit_price الزامی است", field="item_decisions"
|
||||
)
|
||||
termsheet_id = ts_ids_by_index[index]
|
||||
|
||||
li_row = await db.scalar(
|
||||
select(LineItem).where(LineItem.id == decision_in.line_item_id).with_for_update()
|
||||
)
|
||||
if li_row is None:
|
||||
raise NotFoundError("خط آیتم یافت نشد", field="item_decisions.line_item_id")
|
||||
|
||||
allocations = decision_in.allocations or []
|
||||
if allocations:
|
||||
# Requirement 3: Validate no duplicate projects within allocations of this item
|
||||
alloc_pids = [a.project_id for a in allocations]
|
||||
if len(alloc_pids) != len(set(alloc_pids)):
|
||||
raise ValidationError(
|
||||
"پروژه تکراری برای یک قلم کالا در ردیف‌های تخصیص انتخاب شده است",
|
||||
field="item_decisions.allocations",
|
||||
)
|
||||
# Requirement 5: Decimal precision check for sum of allocation quantities
|
||||
alloc_sum = sum(Decimal(str(a.quantity)) for a in allocations)
|
||||
target_qty = Decimal(str(li_row.quantity))
|
||||
if alloc_sum != target_qty:
|
||||
raise ValidationError(
|
||||
f"مجموع مقادیر تخصیص‌یافته ({alloc_sum}) با مقدار کل قلم ({target_qty}) برابر نیست",
|
||||
field="item_decisions.allocations",
|
||||
)
|
||||
# Validate all projects exist
|
||||
for a in allocations:
|
||||
if await db.get(Project, a.project_id) is None:
|
||||
raise NotFoundError("پروژه یافت نشد", field="item_decisions.allocations.project_id")
|
||||
|
||||
if len(allocations) >= 2:
|
||||
# 1. Update the original line item to the first allocation quantity
|
||||
first_alloc = allocations[0]
|
||||
li_row.quantity = first_alloc.quantity
|
||||
decision_in.project_id = first_alloc.project_id
|
||||
|
||||
# Query all existing item_termsheets and line_item_specs for copying
|
||||
orig_termsheets = (
|
||||
await db.execute(
|
||||
select(ItemTermsheet).where(ItemTermsheet.line_item_id == li_row.id)
|
||||
)
|
||||
).scalars().all()
|
||||
orig_specs = (
|
||||
await db.execute(
|
||||
select(LineItemSpec).where(LineItemSpec.line_item_id == li_row.id)
|
||||
)
|
||||
).scalars().all()
|
||||
|
||||
# 2. For each subsequent allocation, create a new LineItem and copy specs + ALL termsheets
|
||||
for split_alloc in allocations[1:]:
|
||||
new_li = LineItem(
|
||||
quote_id=quote.id,
|
||||
material_id=li_row.material_id,
|
||||
brand_material_id=li_row.brand_material_id,
|
||||
unit_id=li_row.unit_id,
|
||||
quantity=split_alloc.quantity,
|
||||
notes=li_row.notes,
|
||||
)
|
||||
db.add(new_li)
|
||||
await db.flush()
|
||||
|
||||
# Copy LineItemSpec
|
||||
for sp in orig_specs:
|
||||
db.add(
|
||||
LineItemSpec(
|
||||
line_item_id=new_li.id,
|
||||
attribute_definition_id=sp.attribute_definition_id,
|
||||
value_number=sp.value_number,
|
||||
value_string=sp.value_string,
|
||||
value_boolean=sp.value_boolean,
|
||||
value_date=sp.value_date,
|
||||
unit_id_at_time=sp.unit_id_at_time,
|
||||
)
|
||||
)
|
||||
|
||||
# Requirement 1: Copy ALL payment options (ItemTermsheet)
|
||||
chosen_new_it: ItemTermsheet | None = None
|
||||
for it_orig in orig_termsheets:
|
||||
price = (
|
||||
decision_in.adjusted_unit_price
|
||||
if (it_orig.termsheet_id == termsheet_id and decision_in.adjusted_unit_price is not None)
|
||||
else it_orig.unit_price
|
||||
)
|
||||
copied_it = ItemTermsheet(
|
||||
line_item_id=new_li.id,
|
||||
termsheet_id=it_orig.termsheet_id,
|
||||
unit_price=price,
|
||||
min_order_qty=it_orig.min_order_qty,
|
||||
)
|
||||
db.add(copied_it)
|
||||
if it_orig.termsheet_id == termsheet_id:
|
||||
chosen_new_it = copied_it
|
||||
|
||||
if chosen_new_it is None:
|
||||
chosen_new_it = ItemTermsheet(
|
||||
line_item_id=new_li.id,
|
||||
termsheet_id=termsheet_id,
|
||||
unit_price=decision_in.adjusted_unit_price,
|
||||
)
|
||||
db.add(chosen_new_it)
|
||||
await db.flush()
|
||||
|
||||
# Create ItemDecision for the split line item
|
||||
new_decision = ItemDecision(
|
||||
line_item_id=new_li.id,
|
||||
status="chosen",
|
||||
chosen_item_termsheet_id=chosen_new_it.id,
|
||||
adjusted_unit_price=decision_in.adjusted_unit_price,
|
||||
adjusted_notes=decision_in.adjusted_notes,
|
||||
project_id=split_alloc.project_id,
|
||||
decided_at=utcnow(),
|
||||
)
|
||||
db.add(new_decision)
|
||||
|
||||
# Requirement 4: sync QuoteProjects & LineItemProjects
|
||||
await _ensure_quote_project(db, quote.id, split_alloc.project_id)
|
||||
db.add(LineItemProjects(line_item_id=new_li.id, project_id=split_alloc.project_id))
|
||||
elif len(allocations) == 1:
|
||||
decision_in.project_id = allocations[0].project_id
|
||||
|
||||
it = await db.scalar(
|
||||
select(ItemTermsheet).where(
|
||||
ItemTermsheet.line_item_id == decision_in.line_item_id,
|
||||
@@ -805,8 +610,6 @@ async def accept_quote(db: AsyncSession, quote_id: UUID, payload: AcceptQuoteIn,
|
||||
if decision.project_id is not None:
|
||||
if await db.get(Project, decision.project_id) is None:
|
||||
raise NotFoundError("پروژه یافت نشد", field="item_decisions.project_id")
|
||||
# Requirement 4: sync QuoteProjects
|
||||
await _ensure_quote_project(db, quote.id, decision.project_id)
|
||||
chosen_ts_ids.add(termsheet_id)
|
||||
else: # rejected
|
||||
if decision is None:
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
"""HMAC-SHA256 token verification for standalone draft review."""
|
||||
import base64
|
||||
import hashlib
|
||||
import hmac
|
||||
import json
|
||||
import time
|
||||
from typing import Any
|
||||
from uuid import UUID
|
||||
|
||||
def _b64url_encode(data: bytes) -> str:
|
||||
return base64.urlsafe_b64encode(data).rstrip(b"=").decode("ascii")
|
||||
|
||||
|
||||
def _b64url_decode(s: str) -> bytes:
|
||||
padding = 4 - (len(s) % 4)
|
||||
if padding != 4:
|
||||
s += "=" * padding
|
||||
return base64.urlsafe_b64decode(s.encode("ascii"))
|
||||
|
||||
|
||||
def _get_secret(secret: str | None = None) -> str:
|
||||
if secret:
|
||||
return secret
|
||||
try:
|
||||
from app.config import settings
|
||||
return settings.DRAFT_TOKEN_SECRET
|
||||
except Exception:
|
||||
return "procurement-draft-secret-change-in-prod-v7"
|
||||
|
||||
|
||||
def create_draft_token(
|
||||
draft_id: str | UUID,
|
||||
chat_id: int | None = None,
|
||||
user_id: str | None = None,
|
||||
secret: str | None = None,
|
||||
expires_in: int = 7200,
|
||||
) -> str:
|
||||
sec = _get_secret(secret)
|
||||
now = int(time.time())
|
||||
payload = {
|
||||
"draft_id": str(draft_id),
|
||||
"chat_id": chat_id,
|
||||
"user_id": str(user_id) if user_id else None,
|
||||
"iat": now,
|
||||
"exp": now + expires_in,
|
||||
}
|
||||
payload_bytes = json.dumps(payload, separators=(",", ":"), ensure_ascii=False).encode("utf-8")
|
||||
payload_b64 = _b64url_encode(payload_bytes)
|
||||
|
||||
sig = hmac.new(sec.encode("utf-8"), payload_b64.encode("ascii"), hashlib.sha256).digest()
|
||||
sig_b64 = _b64url_encode(sig)
|
||||
|
||||
return f"{payload_b64}.{sig_b64}"
|
||||
|
||||
|
||||
def verify_draft_token(
|
||||
token: str,
|
||||
secret: str | None = None,
|
||||
) -> dict[str, Any] | None:
|
||||
"""Verify signature and expiration of a draft token. Return payload or None."""
|
||||
if not token or "." not in token:
|
||||
return None
|
||||
try:
|
||||
sec = _get_secret(secret)
|
||||
payload_b64, sig_b64 = token.split(".", 1)
|
||||
expected_sig = hmac.new(sec.encode("utf-8"), payload_b64.encode("ascii"), hashlib.sha256).digest()
|
||||
actual_sig = _b64url_decode(sig_b64)
|
||||
|
||||
if not hmac.compare_digest(expected_sig, actual_sig):
|
||||
return None
|
||||
|
||||
payload_bytes = _b64url_decode(payload_b64)
|
||||
payload = json.loads(payload_bytes.decode("utf-8"))
|
||||
|
||||
exp = payload.get("exp")
|
||||
if exp is not None and int(exp) < int(time.time()):
|
||||
return None
|
||||
|
||||
return payload
|
||||
except Exception:
|
||||
return None
|
||||
@@ -128,7 +128,6 @@ async def get_category(db, slug: str) -> MaterialCategory:
|
||||
|
||||
USER_PLAN = [
|
||||
# (casdoor username, first, last, role)
|
||||
("ali.mohaghegh", "علی", "محقق", "admin"),
|
||||
("razaei", "علی", "رضایی", "admin"),
|
||||
("mousavi", "حسین", "موسوی", "procurement_manager"),
|
||||
("mohaghegh", "محمد", "محقق", "pm"),
|
||||
|
||||
+1
-37
@@ -11,7 +11,7 @@ services:
|
||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
|
||||
|
||||
ports:
|
||||
- "5455:5432"
|
||||
- "5433:5432"
|
||||
|
||||
networks:
|
||||
- default
|
||||
@@ -208,7 +208,6 @@ services:
|
||||
mem_limit: 768m
|
||||
|
||||
api:
|
||||
image: v15-api:latest
|
||||
build:
|
||||
context: ./backend
|
||||
dockerfile: Dockerfile
|
||||
@@ -280,7 +279,6 @@ services:
|
||||
mem_limit: 768m
|
||||
|
||||
frontend:
|
||||
image: v15-frontend:latest
|
||||
build:
|
||||
context: ./frontend
|
||||
args:
|
||||
@@ -316,40 +314,6 @@ services:
|
||||
restart: unless-stopped
|
||||
mem_limit: 128m
|
||||
|
||||
bot:
|
||||
image: v15-bot:latest
|
||||
build:
|
||||
context: ./bot
|
||||
dockerfile: Dockerfile
|
||||
container_name: procurement-bot
|
||||
|
||||
volumes:
|
||||
- ./bot/app:/srv/bot/app
|
||||
|
||||
environment:
|
||||
PROCUREMENT_BOT_BOT_TOKEN: ${BALE_BOT_TOKEN:-1354444845:yhVMnKZBFuKaU3UW5fP1bHmknEHx99mipWw}
|
||||
PROCUREMENT_BOT_BALE_API_BASE: ${BALE_API_BASE:-https://tapi.bale.ai}
|
||||
PROCUREMENT_BOT_API_BASE_URL: http://api:8000/api/v1
|
||||
PROCUREMENT_BOT_DATABASE_URL: postgresql+asyncpg://postgres:${POSTGRES_PASSWORD:-postgres}@postgres:5432/procurement
|
||||
PROCUREMENT_BOT_AI_BASE_URL: ${AI_BASE_URL:-https://api.deepseek.com}
|
||||
PROCUREMENT_BOT_AI_API_KEY: ${AI_API_KEY:-sk-a671eab15be846d494bf0839070a3b32}
|
||||
PROCUREMENT_BOT_LLM_MODEL: ${AI_LLM_MODEL:-deepseek-flash}
|
||||
PROCUREMENT_BOT_ADMIN_CHAT_IDS: ${BALE_ADMIN_CHAT_IDS:-1461166742,1839839922}
|
||||
PROCUREMENT_BOT_SERVICE_TOKEN: ${BALE_SERVICE_TOKEN:-}
|
||||
PROCUREMENT_BOT_FRONTEND_URL: ${APP_HOST:-http://localhost}
|
||||
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
api:
|
||||
condition: service_started
|
||||
|
||||
networks:
|
||||
- default
|
||||
|
||||
restart: unless-stopped
|
||||
mem_limit: 512m
|
||||
|
||||
networks:
|
||||
# شبکه‌ی عمومی: فقط ترافیک و سرویس‌های عمومی. postgres روی شبکه‌ی
|
||||
# پیش‌فرض می‌ماند و از بیرون قابل دسترسی نیست.
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
href="https://fonts.googleapis.com/css2?family=Vazirmatn:wght@400;500;600;700;800&display=swap"
|
||||
rel="stylesheet"
|
||||
/>
|
||||
<title>دفتر پیشنهادهای خرید — دفترچه تأمین</title>
|
||||
<title>سامانه جامع مدیریت پروژه، تدارکات و انبار</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "دفترچه تأمین — سامانه تدارکات و انبار",
|
||||
"short_name": "دفترچه تأمین",
|
||||
"description": "سامانه تدارکات و مدیریت انبار پروژه‌های ساختمانی",
|
||||
"name": "سامانه جامع مدیریت پروژه، تدارکات و انبار",
|
||||
"short_name": "مدیریت پروژه و تأمین",
|
||||
"description": "سامانه جامع مدیریت عملیات پروژه، تدارکات و انبارداری",
|
||||
"dir": "rtl",
|
||||
"lang": "fa",
|
||||
"start_url": "/",
|
||||
|
||||
+160
-47
@@ -55,31 +55,23 @@ function Loading() {
|
||||
);
|
||||
}
|
||||
|
||||
// همه‌ی صفحات پشت ورود هستند — به جز پیش‌نویس‌های ویزارد از ربات یا بدون نشست که به صفحه‌ی ورود می‌روند.
|
||||
// همه‌ی صفحات پشت ورود هستند — بدون نشست، به صفحه‌ی ورود می‌رویم.
|
||||
function RequireAuth({ children }: { children: React.ReactNode }) {
|
||||
const user = useAuthStore((s) => s.user);
|
||||
const location = useLocation();
|
||||
|
||||
// در صورت داشتن شناسه پیش‌نویس (از ربات بله)، دسترسی مستقیم به ویزارد بدون لاگین مجاز است
|
||||
const searchParams = new URLSearchParams(location.search);
|
||||
const hasDraft = searchParams.has("draft") || searchParams.has("draft_id");
|
||||
if (location.pathname === "/wizard" && hasDraft) {
|
||||
return <>{children}</>;
|
||||
}
|
||||
|
||||
if (!user) {
|
||||
const returnUrl = encodeURIComponent(location.pathname + location.search);
|
||||
return <Navigate to={`/login?returnUrl=${returnUrl}`} replace />;
|
||||
}
|
||||
const { pathname } = useLocation();
|
||||
if (!user) return <Navigate to="/login" replace />;
|
||||
if (user.role === "supervisor") {
|
||||
// اگر سرپرست پروژه‌ای نداشته باشد، دسترسی مسدود می‌شود
|
||||
if (!user.projects || user.projects.length === 0) {
|
||||
const hasProjects =
|
||||
(Boolean(user.projects && user.projects.length > 0)) ||
|
||||
(Boolean(user.member_project_ids && user.member_project_ids.length > 0));
|
||||
if (!hasProjects) {
|
||||
return (
|
||||
<div className="flex min-h-screen items-center justify-center bg-bg px-4">
|
||||
<div className="w-full max-w-md rounded-2xl border border-line bg-panel p-8 text-center shadow-sm">
|
||||
<h1 className="text-[16px] font-extrabold text-red">پروژه تخصیص داده نشده است</h1>
|
||||
<p className="mt-2 text-[12.5px] leading-6 text-muted">
|
||||
شما به عنوان سرپرست پروژه در سیستم ثبت شدهاید اما هنوز هیچ پروژه‌ای به شما تخصیص داده نشده است.
|
||||
شما به عنوان سرپرست پروژه در سیستم ثبت شدهاید اما هنوز هیچ پروژه‌ای به شما تخصیص داده نشده است.
|
||||
تا زمان تخصیص پروژه توسط مدیر سیستم، اجازه ورود به سامانه را ندارید.
|
||||
</p>
|
||||
<button
|
||||
@@ -96,43 +88,137 @@ function RequireAuth({ children }: { children: React.ReactNode }) {
|
||||
</div>
|
||||
);
|
||||
}
|
||||
// سرپرست پروژه فقط به انبار و PM دسترسی دارد
|
||||
if (!location.pathname.startsWith("/inventory") && location.pathname !== "/panel/pm") {
|
||||
return <Navigate to="/panel/pm" replace />;
|
||||
}
|
||||
}
|
||||
|
||||
// بررسی دسترسی به مسیرها بر اساس ترکیب نقش سازمانی و پنل‌های تخصیصی:
|
||||
const panels = user.panels ?? {};
|
||||
const isAdmin = user.role === "admin";
|
||||
const hasPanelsConfig = Boolean(user.panels && Object.keys(user.panels).length > 0);
|
||||
|
||||
const hasProcurement =
|
||||
isAdmin ||
|
||||
(hasPanelsConfig
|
||||
? Boolean(panels.procurement)
|
||||
: user.role === "procurement_manager");
|
||||
|
||||
const hasInventory =
|
||||
isAdmin ||
|
||||
(hasPanelsConfig
|
||||
? Boolean(panels.inventory)
|
||||
: user.role === "pm" || user.role === "supervisor");
|
||||
|
||||
const hasPm =
|
||||
isAdmin ||
|
||||
(hasPanelsConfig
|
||||
? Boolean(panels.pm)
|
||||
: user.role === "pm" || user.role === "supervisor");
|
||||
|
||||
const isProcurementRoute =
|
||||
pathname === "/" ||
|
||||
pathname.startsWith("/wizard") ||
|
||||
pathname.startsWith("/suppliers") ||
|
||||
pathname.startsWith("/projects") ||
|
||||
pathname.startsWith("/units") ||
|
||||
pathname.startsWith("/requester");
|
||||
|
||||
if (isProcurementRoute && !hasProcurement) {
|
||||
if (hasInventory) return <Navigate to="/inventory" replace />;
|
||||
if (hasPm) return <Navigate to="/panel/pm" replace />;
|
||||
return <Navigate to="/login" replace />;
|
||||
}
|
||||
|
||||
if (pathname.startsWith("/inventory") && !hasInventory) {
|
||||
if (hasProcurement) return <Navigate to={panels.procurement === "limited" && !isAdmin ? "/wizard" : "/"} replace />;
|
||||
if (hasPm) return <Navigate to="/panel/pm" replace />;
|
||||
return <Navigate to="/login" replace />;
|
||||
}
|
||||
|
||||
return <>{children}</>;
|
||||
}
|
||||
|
||||
// صفحه‌ی اصلی بر اساس لایه پنل‌ها (جایگزین نقش‌ها):
|
||||
// انبار → پنل انبار · تدارکات limited → خانه حداقلی استعلام · بقیه → دفتر تدارکات
|
||||
// نقش‌های میراث (سرپرست → PM، مدیر پروژه → انبار) برای دوره مهاجرت حفظ شده‌اند.
|
||||
function HomeRoute() {
|
||||
const user = useAuthStore((s) => s.user);
|
||||
const panels = user?.panels ?? {};
|
||||
if (panels.inventory) return <Navigate to="/inventory" replace />;
|
||||
if (panels.procurement === "limited") return <RequesterHome />;
|
||||
// فقط پنل PM: مستقیم به پنل مدیریت پروژه
|
||||
if (panels.pm && !panels.inventory && !panels.procurement) {
|
||||
return <Navigate to="/panel/pm" replace />;
|
||||
const isAdmin = user?.role === "admin";
|
||||
const hasPanelsConfig = Boolean(user?.panels && Object.keys(user.panels).length > 0);
|
||||
|
||||
const hasProcurement =
|
||||
isAdmin ||
|
||||
(hasPanelsConfig
|
||||
? Boolean(panels.procurement)
|
||||
: user?.role === "procurement_manager");
|
||||
|
||||
const hasInventory =
|
||||
isAdmin ||
|
||||
(hasPanelsConfig
|
||||
? Boolean(panels.inventory)
|
||||
: user?.role === "pm" || user?.role === "supervisor");
|
||||
|
||||
const hasPm =
|
||||
isAdmin ||
|
||||
(hasPanelsConfig
|
||||
? Boolean(panels.pm)
|
||||
: user?.role === "pm" || user?.role === "supervisor");
|
||||
|
||||
// ۱. اگر پنل تدارکات دارد:
|
||||
if (hasProcurement) {
|
||||
if (panels.procurement === "limited" && !isAdmin) {
|
||||
return <Navigate to="/wizard" replace />;
|
||||
}
|
||||
return <DashboardPage />;
|
||||
}
|
||||
if (user?.role === "supervisor") return <Navigate to="/panel/pm" replace />;
|
||||
if (user?.role === "pm") return <Navigate to="/inventory" replace />;
|
||||
return <DashboardPage />;
|
||||
|
||||
// ۲. اگر پنل انبار دارد:
|
||||
if (hasInventory) return <Navigate to="/inventory" replace />;
|
||||
|
||||
// ۳. اگر پنل PM دارد:
|
||||
if (hasPm) return <Navigate to="/panel/pm" replace />;
|
||||
|
||||
// در صورتی که کاربر به هیچ پنلی دسترسی ندارد:
|
||||
return (
|
||||
<div className="flex min-h-screen items-center justify-center p-4">
|
||||
<div className="w-full max-w-md rounded-2xl border border-line bg-panel p-6 text-center shadow-lg">
|
||||
<h3 className="text-base font-bold text-slate-800">عدم دسترسی به پنل‌های سامانه</h3>
|
||||
<p className="mt-2 text-xs text-muted leading-6">
|
||||
حساب کاربری شما فعال است اما در حال حاضر به هیچ‌یک از پنل‌های سامانه دسترسی ندارد. لطفاً با مدیر سیستم تماس بگیرید.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// دسترسی ایجاد استعلام/پیشنهاد (ویزارد): ادمین، نقش‌های میراث، تدارکات full
|
||||
// و تدارکات limited (محدود به پروژه‌های عضویت — صفحه /requester)
|
||||
// دسترسی ایجاد استعلام/پیشنهاد (ویزارد): ادمین، نقش‌های تدارکات و پنل‌های تدارکات (full یا limited)
|
||||
function RequireProcurementWrite({ children }: { children: React.ReactNode }) {
|
||||
const user = useAuthStore((s) => s.user);
|
||||
const panels = user?.panels ?? {};
|
||||
if (user?.role === "admin" || user?.role === "procurement_manager" || user?.role === "pm") {
|
||||
const isAdmin = user?.role === "admin";
|
||||
const hasPanelsConfig = Boolean(user?.panels && Object.keys(user.panels).length > 0);
|
||||
const hasProcurement =
|
||||
isAdmin ||
|
||||
(hasPanelsConfig
|
||||
? Boolean(panels.procurement)
|
||||
: user?.role === "procurement_manager" || user?.role === "pm");
|
||||
|
||||
if (hasProcurement) {
|
||||
return <>{children}</>;
|
||||
}
|
||||
if (panels.procurement === "full") return <>{children}</>;
|
||||
if (panels.procurement === "limited") return <Navigate to="/requester" replace />;
|
||||
return <Navigate to={user?.role === "supervisor" ? "/inventory" : "/"} replace />;
|
||||
|
||||
const hasInventory =
|
||||
isAdmin ||
|
||||
(hasPanelsConfig
|
||||
? Boolean(panels.inventory)
|
||||
: user?.role === "pm" || user?.role === "supervisor");
|
||||
if (hasInventory) return <Navigate to="/inventory" replace />;
|
||||
|
||||
const hasPm =
|
||||
isAdmin ||
|
||||
(hasPanelsConfig
|
||||
? Boolean(panels.pm)
|
||||
: user?.role === "pm" || user?.role === "supervisor");
|
||||
if (hasPm) return <Navigate to="/panel/pm" replace />;
|
||||
|
||||
return <Navigate to="/login" replace />;
|
||||
}
|
||||
|
||||
// پنل «مدیریت پروژه (PM)» — اپ PM روی همان دامنه زیر مسیر /pm سرو می‌شود
|
||||
@@ -146,25 +232,52 @@ function PmPanelPage() {
|
||||
);
|
||||
}
|
||||
|
||||
// دسترسی پنل PM: ادمین، پنل pm (full/limited) و نقش‌های میراث pm/supervisor —
|
||||
// مدیر تدارکات (یا هر کاربر بدون پنل pm) دسترسی ندارد
|
||||
// دسترسی پنل PM: ادمین، پنل pm (full/limited) و نقش‌های pm/supervisor
|
||||
function RequirePmPanel({ children }: { children: React.ReactNode }) {
|
||||
const user = useAuthStore((s) => s.user);
|
||||
const panels = user?.panels ?? {};
|
||||
const allowed =
|
||||
user?.role === "admin" ||
|
||||
Boolean(panels.pm) ||
|
||||
user?.role === "pm" ||
|
||||
user?.role === "supervisor";
|
||||
if (!allowed) return <Navigate to="/" replace />;
|
||||
const isAdmin = user?.role === "admin";
|
||||
const hasPanelsConfig = Boolean(user?.panels && Object.keys(user.panels).length > 0);
|
||||
const hasPm =
|
||||
isAdmin ||
|
||||
(hasPanelsConfig
|
||||
? Boolean(panels.pm)
|
||||
: user?.role === "pm" || user?.role === "supervisor");
|
||||
|
||||
if (!hasPm) {
|
||||
const hasProcurement =
|
||||
isAdmin ||
|
||||
(hasPanelsConfig
|
||||
? Boolean(panels.procurement)
|
||||
: user?.role === "procurement_manager");
|
||||
if (hasProcurement) {
|
||||
return <Navigate to={panels.procurement === "limited" && !isAdmin ? "/wizard" : "/"} replace />;
|
||||
}
|
||||
const hasInventory =
|
||||
isAdmin ||
|
||||
(hasPanelsConfig
|
||||
? Boolean(panels.inventory)
|
||||
: user?.role === "pm" || user?.role === "supervisor");
|
||||
if (hasInventory) return <Navigate to="/inventory" replace />;
|
||||
return <Navigate to="/login" replace />;
|
||||
}
|
||||
return <>{children}</>;
|
||||
}
|
||||
|
||||
// دسترسی پنل سازمان‌دهی: فقط ادمین، مدیر تدارکات و مدیر پروژه
|
||||
function RequireOrganization({ children }: { children: React.ReactNode }) {
|
||||
const user = useAuthStore((s) => s.user);
|
||||
const allowed = user?.role === "admin" || user?.role === "procurement_manager" || user?.role === "pm";
|
||||
if (!allowed) return <Navigate to={user?.role === "supervisor" ? "/inventory" : "/"} replace />;
|
||||
const isAdmin = user?.role === "admin";
|
||||
const allowed = isAdmin || user?.role === "procurement_manager" || user?.role === "pm";
|
||||
if (!allowed) {
|
||||
const panels = user?.panels ?? {};
|
||||
const hasPanelsConfig = Boolean(user?.panels && Object.keys(user.panels).length > 0);
|
||||
const hasProcurement = isAdmin || (hasPanelsConfig ? Boolean(panels.procurement) : user?.role === "procurement_manager");
|
||||
if (hasProcurement) return <Navigate to={panels.procurement === "limited" && !isAdmin ? "/wizard" : "/"} replace />;
|
||||
const hasInventory = isAdmin || (hasPanelsConfig ? Boolean(panels.inventory) : user?.role === "supervisor");
|
||||
if (hasInventory) return <Navigate to="/inventory" replace />;
|
||||
return <Navigate to="/panel/pm" replace />;
|
||||
}
|
||||
return <>{children}</>;
|
||||
}
|
||||
|
||||
@@ -197,7 +310,6 @@ export default function App() {
|
||||
<ErrorBoundary>
|
||||
<Suspense fallback={<Loading />}>
|
||||
<Routes>
|
||||
<Route path="/review" element={<WizardPage isStandalone />} />
|
||||
<Route path="/login" element={<LoginPage />} />
|
||||
<Route
|
||||
path="/"
|
||||
@@ -217,6 +329,7 @@ export default function App() {
|
||||
</RequireAuth>
|
||||
}
|
||||
/>
|
||||
<Route path="/requester" element={<Navigate to="/wizard" replace />} />
|
||||
<Route
|
||||
path="/suppliers"
|
||||
element={
|
||||
|
||||
@@ -17,49 +17,61 @@ export function AppSwitcherMenu({
|
||||
}) {
|
||||
const logout = useLogout();
|
||||
const user = useAuthStore((s) => s.user);
|
||||
const isSupervisor = user?.role === "supervisor";
|
||||
const panels = user?.panels ?? {};
|
||||
|
||||
// سرپرست پروژه: منحصراً دو پنل «انبار» و «مدیریت پروژه» نمایش داده می‌شود
|
||||
if (isSupervisor) {
|
||||
const supervisorItems: MenuItem[] = [
|
||||
{
|
||||
label: "انبار",
|
||||
to: "/inventory",
|
||||
active: activeModule === "warehouse",
|
||||
},
|
||||
{
|
||||
label: "مدیریت پروژه",
|
||||
to: "/panel/pm",
|
||||
},
|
||||
{ divider: true },
|
||||
{ label: "خروج از حساب", onClick: logout },
|
||||
];
|
||||
return <PanelMenu title="پنل‌ها" items={supervisorItems} />;
|
||||
}
|
||||
const isAdmin = user?.role === "admin";
|
||||
const hasPanelsConfig = Boolean(user?.panels && Object.keys(user.panels).length > 0);
|
||||
|
||||
const canManage = user?.role === "admin" || user?.role === "procurement_manager" || user?.role === "pm";
|
||||
const items: MenuItem[] = [
|
||||
{
|
||||
const hasProcurement =
|
||||
isAdmin ||
|
||||
(hasPanelsConfig
|
||||
? Boolean(panels.procurement)
|
||||
: user?.role === "procurement_manager");
|
||||
|
||||
const hasInventory =
|
||||
isAdmin ||
|
||||
(hasPanelsConfig
|
||||
? Boolean(panels.inventory)
|
||||
: user?.role === "pm" || user?.role === "supervisor");
|
||||
|
||||
const hasPm =
|
||||
isAdmin ||
|
||||
(hasPanelsConfig
|
||||
? Boolean(panels.pm)
|
||||
: user?.role === "pm" || user?.role === "supervisor");
|
||||
|
||||
// فقط نقش‌های ادمین، مدیر پروژه و مدیر تدارکات به پنل سازمان‌دهی دسترسی دارند
|
||||
const canManageOrg =
|
||||
isAdmin ||
|
||||
user?.role === "procurement_manager" ||
|
||||
user?.role === "pm";
|
||||
|
||||
const items: MenuItem[] = [];
|
||||
|
||||
if (hasInventory) {
|
||||
items.push({
|
||||
label: "انبار",
|
||||
to: "/inventory",
|
||||
active: activeModule === "warehouse",
|
||||
},
|
||||
];
|
||||
});
|
||||
}
|
||||
|
||||
if (canSwitchToProcurement) {
|
||||
if (hasProcurement && canSwitchToProcurement) {
|
||||
items.push({
|
||||
label: "تدارکات",
|
||||
to: "/",
|
||||
to: panels.procurement === "limited" && !isAdmin ? "/wizard" : "/",
|
||||
active: activeModule === "procurement",
|
||||
});
|
||||
}
|
||||
|
||||
items.push({
|
||||
label: "مدیریت پروژه",
|
||||
to: "/panel/pm",
|
||||
});
|
||||
if (hasPm) {
|
||||
items.push({
|
||||
label: "مدیریت پروژه",
|
||||
to: "/panel/pm",
|
||||
});
|
||||
}
|
||||
|
||||
if (canManage) {
|
||||
if (canManageOrg) {
|
||||
items.push({
|
||||
label: "سازمان‌دهی",
|
||||
to: "/organization",
|
||||
|
||||
@@ -98,7 +98,7 @@ export function MobileTabBar() {
|
||||
}
|
||||
// سرپرست پروژه به بخش‌های تدارکات/دفتر دسترسی ندارد
|
||||
if (isSupervisor) return null;
|
||||
if (pathname === "/wizard" || pathname.startsWith("/review")) return null;
|
||||
if (pathname === "/wizard") return null;
|
||||
const onOfficePage =
|
||||
pathname === "/" ||
|
||||
pathname === "/projects" ||
|
||||
|
||||
+20
-196
@@ -30,10 +30,6 @@ import type {
|
||||
Supplier,
|
||||
TransactionType,
|
||||
Warehouse,
|
||||
ProjectTransfer,
|
||||
ProjectTransferCreateIn,
|
||||
ProjectTransferUpdateIn,
|
||||
ProjectTransferReceiveIn,
|
||||
} from "./types";
|
||||
|
||||
const BASE_URL = (import.meta.env?.VITE_API_BASE_URL as string | undefined)?.trim() || "/api/v1";
|
||||
@@ -243,32 +239,24 @@ async function request<T>(path: string, init?: RequestInit): Promise<T> {
|
||||
}
|
||||
|
||||
async function getData<T>(path: string): Promise<T> {
|
||||
const res = await request<any>(path);
|
||||
if (res && typeof res === "object" && "data" in res) {
|
||||
return res.data as T;
|
||||
}
|
||||
return res as T;
|
||||
const res = await request<{ data: T }>(path);
|
||||
return res.data;
|
||||
}
|
||||
async function postData<T>(path: string, body: unknown): Promise<T> {
|
||||
const res = await request<any>(path, { method: "POST", body: JSON.stringify(body) });
|
||||
if (res && typeof res === "object" && "data" in res) {
|
||||
return res.data as T;
|
||||
}
|
||||
return res as T;
|
||||
const res = await request<{ data: T }>(path, { method: "POST", body: JSON.stringify(body) });
|
||||
return res.data;
|
||||
}
|
||||
async function patchData<T>(path: string, body: unknown): Promise<T> {
|
||||
const res = await request<any>(path, { method: "PATCH", body: JSON.stringify(body) });
|
||||
if (res && typeof res === "object" && "data" in res) {
|
||||
return res.data as T;
|
||||
}
|
||||
return res as T;
|
||||
const res = await request<{ data: T }>(path, { method: "PATCH", body: JSON.stringify(body) });
|
||||
return res.data;
|
||||
}
|
||||
async function putData<T>(path: string, body: unknown): Promise<T> {
|
||||
const res = await request<{ data: T }>(path, { method: "PUT", body: JSON.stringify(body) });
|
||||
return res.data;
|
||||
}
|
||||
async function deleteData<T>(path: string): Promise<T> {
|
||||
const res = await request<any>(path, { method: "DELETE" });
|
||||
if (res && typeof res === "object" && "data" in res) {
|
||||
return res.data as T;
|
||||
}
|
||||
return res as T;
|
||||
const res = await request<{ data: T }>(path, { method: "DELETE" });
|
||||
return res.data;
|
||||
}
|
||||
|
||||
// آپلود چندبخشی (multipart) — بدون هدر Content-Type دستی تا مرورگر
|
||||
@@ -480,39 +468,6 @@ function adaptBrandLink(raw: RawBrandLink): BrandLinkRow {
|
||||
return { id: raw.id, brand_id: raw.brand_id, brand_name: raw.brand?.name || "" };
|
||||
}
|
||||
|
||||
// تأمین‌کنندگان متصل به یک متریال — پاسخ GET /materials/{id}/suppliers
|
||||
// Raw shape mirrors the backend dict exactly: clean supplier objects produced
|
||||
// by an atomic JOIN (select(Supplier).join(SupplierMaterial)…) — the name
|
||||
// always comes from the suppliers table, never from the material row.
|
||||
interface RawMaterialSupplier {
|
||||
id: string;
|
||||
name: string;
|
||||
phone: string | null;
|
||||
contact_person: string | null;
|
||||
location: string | null;
|
||||
}
|
||||
|
||||
/** Clean UI-facing type for one supplier linked to a material. */
|
||||
export interface MaterialSupplier {
|
||||
id: string;
|
||||
name: string;
|
||||
phone: string | null;
|
||||
contact_person: string | null;
|
||||
location: string | null;
|
||||
}
|
||||
|
||||
function adaptMaterialSupplier(raw: RawMaterialSupplier): MaterialSupplier {
|
||||
return {
|
||||
id: raw.id,
|
||||
// Bound straight from the supplier object in the API response — there is
|
||||
// no fallback, so a supplier row can never render the material's name.
|
||||
name: raw.name,
|
||||
phone: raw.phone,
|
||||
contact_person: raw.contact_person,
|
||||
location: raw.location,
|
||||
};
|
||||
}
|
||||
|
||||
// فایل پیوست — پاسخ بک‌اند (metadata؛ بایت‌ها از endpoint دانلود می‌آیند)
|
||||
interface RawAttachment {
|
||||
id: string;
|
||||
@@ -982,28 +937,13 @@ export const api = {
|
||||
|
||||
if (becomingAccepted) {
|
||||
const acceptedTs = (patch.termsheets || []).filter((t) => t.status === "accepted");
|
||||
// پروژه‌ی واحدِ انتخاب‌شده یا تخصیص‌های چندپروژه‌ای برای هر قلم
|
||||
// پروژه‌ی واحدِ انتخاب‌شده برای هر قلم (item_decisions.project_id)
|
||||
const targetProjByLine = new Map<string, string>();
|
||||
const allocationsByLine = new Map<string, { project_id: string; quantity: number }[]>();
|
||||
for (const li of patch.line_items || []) {
|
||||
if (li.allocations && li.allocations.length > 0) {
|
||||
const resolvedAllocs: { project_id: string; quantity: number }[] = [];
|
||||
for (const a of li.allocations) {
|
||||
const pid = looksLikeUuid(a.project_id) ? a.project_id! : await projectIdByNameOrCreate(a.project_name);
|
||||
if (pid && a.quantity > 0) {
|
||||
resolvedAllocs.push({ project_id: pid, quantity: Number(a.quantity) });
|
||||
}
|
||||
}
|
||||
if (resolvedAllocs.length) {
|
||||
allocationsByLine.set(li.id, resolvedAllocs);
|
||||
targetProjByLine.set(li.id, resolvedAllocs[0].project_id);
|
||||
}
|
||||
} else {
|
||||
const tp = li.target_project;
|
||||
if (tp && tp.name) {
|
||||
const pid = looksLikeUuid(tp.id) ? tp.id : await projectIdByNameOrCreate(tp.name);
|
||||
if (pid) targetProjByLine.set(li.id, pid);
|
||||
}
|
||||
const tp = li.target_project;
|
||||
if (tp && tp.name) {
|
||||
const pid = looksLikeUuid(tp.id) ? tp.id : await projectIdByNameOrCreate(tp.name);
|
||||
if (pid) targetProjByLine.set(li.id, pid);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1023,13 +963,11 @@ export const api = {
|
||||
const idx = li.accepted_ts_id ? acceptedTs.findIndex((t) => t.id === li.accepted_ts_id) : -1;
|
||||
const chosen = !li.rejected && idx >= 0;
|
||||
const chosenProjId = targetProjByLine.get(li.id);
|
||||
const lineAllocs = allocationsByLine.get(li.id);
|
||||
return {
|
||||
line_item_id: li.id,
|
||||
status: chosen ? "chosen" : "rejected",
|
||||
...(chosen ? { accepted_termsheet_index: idx } : {}),
|
||||
...(chosen && chosenProjId ? { project_id: chosenProjId } : {}),
|
||||
...(chosen && lineAllocs && lineAllocs.length ? { allocations: lineAllocs } : {}),
|
||||
...(li.unit_price != null ? { adjusted_unit_price: li.unit_price } : {}),
|
||||
};
|
||||
}),
|
||||
@@ -1092,73 +1030,6 @@ export const api = {
|
||||
},
|
||||
},
|
||||
|
||||
drafts: {
|
||||
get: async (
|
||||
id: string,
|
||||
): Promise<{
|
||||
id: string;
|
||||
chat_id: number;
|
||||
kind: string;
|
||||
status: string;
|
||||
payload: Record<string, any>;
|
||||
missing?: { fields?: { ok: boolean; key: string; label: string; blocking: boolean }[] } | null;
|
||||
source?: string;
|
||||
created_at?: string;
|
||||
updated_at?: string;
|
||||
}> => {
|
||||
return getData(`/drafts/${id}`);
|
||||
},
|
||||
update: async (
|
||||
id: string,
|
||||
payload: Record<string, any>,
|
||||
): Promise<void> => {
|
||||
await patchData(`/drafts/${id}`, { payload });
|
||||
},
|
||||
commit: async (
|
||||
id: string,
|
||||
quoteId?: string,
|
||||
): Promise<void> => {
|
||||
await postData(`/drafts/${id}/commit`, { quote_id: quoteId });
|
||||
},
|
||||
cancel: async (
|
||||
id: string,
|
||||
): Promise<void> => {
|
||||
await postData(`/drafts/${id}/cancel`, {});
|
||||
},
|
||||
verifyToken: async (
|
||||
token: string,
|
||||
): Promise<{
|
||||
id: string;
|
||||
chat_id: number;
|
||||
kind: string;
|
||||
status: string;
|
||||
payload: Record<string, any>;
|
||||
missing?: { fields?: { ok: boolean; key: string; label: string; blocking: boolean }[] } | null;
|
||||
source?: string;
|
||||
created_at?: string;
|
||||
updated_at?: string;
|
||||
}> => {
|
||||
return getData(`/drafts/verify?token=${encodeURIComponent(token)}`);
|
||||
},
|
||||
updateByToken: async (
|
||||
token: string,
|
||||
payload: Record<string, any>,
|
||||
): Promise<void> => {
|
||||
await patchData(`/drafts/by-token?token=${encodeURIComponent(token)}`, { payload });
|
||||
},
|
||||
commitByToken: async (
|
||||
token: string,
|
||||
quoteId?: string,
|
||||
): Promise<void> => {
|
||||
await postData(`/drafts/by-token/commit?token=${encodeURIComponent(token)}`, { quote_id: quoteId });
|
||||
},
|
||||
cancelByToken: async (
|
||||
token: string,
|
||||
): Promise<void> => {
|
||||
await postData(`/drafts/by-token/cancel?token=${encodeURIComponent(token)}`, {});
|
||||
},
|
||||
},
|
||||
|
||||
suppliers: {
|
||||
list: async (): Promise<Supplier[]> => {
|
||||
const raw = await getData<RawSupplier[]>(`/suppliers?page_size=${PAGE_SIZE}`);
|
||||
@@ -1265,16 +1136,6 @@ export const api = {
|
||||
updateCanonicalUnit: async (id: string, canonical_unit_id: number): Promise<void> => {
|
||||
await patchData(`/materials/${id}`, { canonical_unit_id });
|
||||
},
|
||||
// فهرست تأمین‌کننده‌های متصل به یک متریال (GET /materials/{id}/suppliers)
|
||||
listSuppliers: async (materialId: string): Promise<MaterialSupplier[]> => {
|
||||
// The backend returns { data: [...clean supplier objects] } from an
|
||||
// atomic JOIN; getData<T> unwraps the envelope. No fallback data —
|
||||
// an empty array means the material genuinely has no suppliers.
|
||||
const raw = await getData<RawMaterialSupplier[]>(
|
||||
`/materials/${materialId}/suppliers`,
|
||||
);
|
||||
return raw.map(adaptMaterialSupplier);
|
||||
},
|
||||
},
|
||||
|
||||
projects: {
|
||||
@@ -1806,9 +1667,9 @@ export const apiV26 = {
|
||||
patchData<UserRow>(`/users/${id}`, { role }),
|
||||
// لایه پنل‌ها — تخصیص پنل + سطح دسترسی و عضویت پروژه‌ای (فقط ادمین)
|
||||
setPanels: async (id: string, panels: Record<string, string>): Promise<UserRow> =>
|
||||
patchData<UserRow>(`/users/${id}/panels`, { panels }),
|
||||
putData<UserRow>(`/users/${id}/panels`, { panels }),
|
||||
setPanelProjects: async (id: string, project_ids: string[]): Promise<UserRow> =>
|
||||
patchData<UserRow>(`/users/${id}/panel-projects`, { project_ids }),
|
||||
putData<UserRow>(`/users/${id}/panel-projects`, { project_ids }),
|
||||
assignProject: async (id: string, projectId: string | null): Promise<UserRow> =>
|
||||
postData<UserRow>(`/users/${id}/project`, { project_id: projectId }),
|
||||
// همگام‌سازی هویت‌ها از Casdoor (ادمین/مدیر تدارکات) — نقش‌ها دست‌نخورده می‌مانند
|
||||
@@ -1865,7 +1726,7 @@ export const apiV26 = {
|
||||
transaction_type: TransactionType; warehouse_id: string; dest_warehouse_id?: string | null;
|
||||
material_id: string; brand_id?: string | null; quantity?: number | null;
|
||||
physical_qty?: number | null; unit_id?: number | null; specs?: Record<string, string> | null;
|
||||
note?: string | null; delivered_to?: string | null; transaction_date?: string | null;
|
||||
note?: string | null; transaction_date?: string | null;
|
||||
}): Promise<InventoryTransaction[]> => {
|
||||
return postData<InventoryTransaction[]>(`/inventory/transactions${projectQuery()}`, body);
|
||||
},
|
||||
@@ -1916,41 +1777,4 @@ export const apiV26 = {
|
||||
attributes: [],
|
||||
}),
|
||||
},
|
||||
|
||||
projectTransfers: {
|
||||
list: async (projectId?: string | null, direction: "outgoing" | "incoming" | "all" = "all", status?: string): Promise<ProjectTransfer[]> => {
|
||||
const q = new URLSearchParams();
|
||||
if (projectId) q.set("project_id", projectId);
|
||||
if (direction) q.set("direction", direction);
|
||||
if (status) q.set("status", status);
|
||||
const qs = q.toString() ? `?${q.toString()}` : "";
|
||||
try {
|
||||
const res = await getData<ProjectTransfer[]>(`/inventory/project-transfers${qs}`);
|
||||
return Array.isArray(res) ? res : [];
|
||||
} catch (err) {
|
||||
console.error("Failed to fetch project transfers:", err);
|
||||
return [];
|
||||
}
|
||||
},
|
||||
get: async (id: string, projectId?: string | null): Promise<ProjectTransfer> =>
|
||||
getData<ProjectTransfer>(projectId ? `/inventory/project-transfers/${id}?project_id=${projectId}` : `/inventory/project-transfers/${id}`),
|
||||
create: async (body: ProjectTransferCreateIn, projectId?: string | null): Promise<ProjectTransfer> =>
|
||||
postData<ProjectTransfer>(projectId ? `/inventory/project-transfers?project_id=${projectId}` : `/inventory/project-transfers`, body),
|
||||
update: async (id: string, patch: ProjectTransferUpdateIn, projectId?: string | null): Promise<ProjectTransfer> =>
|
||||
patchData<ProjectTransfer>(projectId ? `/inventory/project-transfers/${id}?project_id=${projectId}` : `/inventory/project-transfers/${id}`, patch),
|
||||
delete: async (id: string, projectId?: string | null): Promise<{ ok: boolean; message: string }> =>
|
||||
deleteData(projectId ? `/inventory/project-transfers/${id}?project_id=${projectId}` : `/inventory/project-transfers/${id}`),
|
||||
onTheWay: async (projectId?: string | null): Promise<ProjectTransfer[]> => {
|
||||
try {
|
||||
const res = await getData<ProjectTransfer[]>(projectId ? `/pm/transfers/on-the-way?project_id=${projectId}` : `/pm/transfers/on-the-way`);
|
||||
return Array.isArray(res) ? res : [];
|
||||
} catch (err) {
|
||||
console.error("Failed to fetch on-the-way transfers:", err);
|
||||
return [];
|
||||
}
|
||||
},
|
||||
receive: async (id: string, body: ProjectTransferReceiveIn, projectId?: string | null): Promise<ProjectTransfer> =>
|
||||
postData<ProjectTransfer>(projectId ? `/inventory/project-transfers/${id}/receive?project_id=${projectId}` : `/inventory/project-transfers/${id}/receive`, body),
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ export function formatMaterialTitle(
|
||||
const normName = normalize(rawName);
|
||||
if (normName.startsWith(normBrand)) {
|
||||
const rest = rawName.slice(rawBrand.length).trim();
|
||||
rawName = rest.replace(/^[.\s·\-]+/, "").trim();
|
||||
rawName = rest.replace(/^[.\s·-]+/, "").trim();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -291,13 +291,22 @@ export function filterQuotes(
|
||||
|
||||
const STATUS_BY_LABEL: Record<string, string> = {
|
||||
"پیشنهاد شده": "offered",
|
||||
"در انتظار تایید": "offered",
|
||||
"در انتظار تأیید": "offered",
|
||||
"پذیرفته شده": "accepted",
|
||||
"در حال خرید": "accepted",
|
||||
"رسیده": "arrived",
|
||||
"تکمیل شده": "arrived",
|
||||
"باز": "offered",
|
||||
"پذیرفته": "accepted",
|
||||
"تکمیل": "arrived",
|
||||
"offered": "offered",
|
||||
"accepted": "accepted",
|
||||
"arrived": "arrived",
|
||||
"rejected": "rejected",
|
||||
"رد شده": "rejected",
|
||||
"expired": "expired",
|
||||
"منقضی شده": "expired",
|
||||
};
|
||||
const stKey = STATUS_BY_LABEL[stVal] || stVal;
|
||||
|
||||
@@ -309,9 +318,10 @@ export function filterQuotes(
|
||||
const matInfo = activeItems(quote).map((li) => materialById(store.materials, li.material_id));
|
||||
|
||||
if (q) {
|
||||
const projectsText = `${(quote.projects || []).join(" ")} ${quote.project || ""}`;
|
||||
const hay =
|
||||
`${supObj.name} ${quote.project || ""} ` +
|
||||
matInfo.map((m) => `${m.brand} ${materialSpecs(m).join(" ")}`).join(" ");
|
||||
`${quote.id} PR-${quote.id} ${supObj.name} ${projectsText} ` +
|
||||
matInfo.map((m) => `${m.name} ${m.brand} ${materialSpecs(m).join(" ")}`).join(" ");
|
||||
if (!hay.toLowerCase().includes(q)) return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -79,7 +79,6 @@ export interface LineItem {
|
||||
projects?: { id: string; name: string }[]; // پروژه‌های کاندیدای تخصیص‌یافته به این قلم (line_item_projects)
|
||||
target_project?: { id: string; name: string } | null; // پروژه‌ی نهایی انتخاب‌شده در هنگام خرید (item_decisions.project_id)
|
||||
target_project_id?: string | null;
|
||||
allocations?: { project_id?: string; project_name: string; quantity: number }[]; // تخصیص چندپروژه‌ای در پذیرش
|
||||
}
|
||||
|
||||
// پیشنهاد خرید (اصلی‌ترین entity)
|
||||
@@ -170,7 +169,6 @@ export interface InventoryTransaction {
|
||||
physical_qty?: number | null;
|
||||
transfer_pair_id?: string | null;
|
||||
performed_by?: string | null;
|
||||
delivered_to?: string | null;
|
||||
transaction_date: string;
|
||||
note?: string | null;
|
||||
material?: { id: string; name: string } | null;
|
||||
@@ -207,52 +205,3 @@ export interface ConfirmedReceipt {
|
||||
quality_note: string | null;
|
||||
allocations: { warehouse_id: string; warehouse_name: string; quantity: string }[];
|
||||
}
|
||||
|
||||
export interface ProjectTransfer {
|
||||
id: string;
|
||||
from_project: { id: string; name: string };
|
||||
from_warehouse: { id: string; name: string };
|
||||
to_project: { id: string; name: string };
|
||||
to_warehouse?: { id: string; name: string } | null;
|
||||
material: { id: string; name: string };
|
||||
brand?: { id: string; name: string } | null;
|
||||
unit: { id: number; code: string; name_fa?: string | null };
|
||||
quantity: number;
|
||||
specs: Record<string, string>;
|
||||
specs_hash: string;
|
||||
note?: string | null;
|
||||
status: "in_transit" | "received" | "cancelled";
|
||||
transfer_date: string;
|
||||
transferred_by?: string | null;
|
||||
received_at?: string | null;
|
||||
received_by?: string | null;
|
||||
receipt_allocations?: { warehouse_id: string; quantity: string | number }[] | null;
|
||||
created_at: string;
|
||||
updated_at: string;
|
||||
}
|
||||
|
||||
export interface ProjectTransferCreateIn {
|
||||
from_warehouse_id: string;
|
||||
to_project_id: string;
|
||||
material_id: string;
|
||||
brand_id?: string | null;
|
||||
unit_id: number;
|
||||
quantity: number;
|
||||
specs?: Record<string, string>;
|
||||
note?: string | null;
|
||||
transfer_date?: string | null;
|
||||
}
|
||||
|
||||
export interface ProjectTransferUpdateIn {
|
||||
to_project_id?: string;
|
||||
quantity?: number;
|
||||
note?: string | null;
|
||||
transfer_date?: string | null;
|
||||
}
|
||||
|
||||
export interface ProjectTransferReceiveIn {
|
||||
allocations: { warehouse_id: string; quantity: number }[];
|
||||
received_at?: string | null;
|
||||
note?: string | null;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import { useNavigate, useSearchParams } from "react-router-dom";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { toast } from "sonner";
|
||||
import { ClipboardList, Eye, EyeOff, Loader2, Lock, ShieldCheck, Wrench, X } from "lucide-react";
|
||||
import { api, apiV26 } from "../../lib/api";
|
||||
@@ -33,8 +33,6 @@ export function LoginPage() {
|
||||
const setUser = useAuthStore((s) => s.setUser);
|
||||
const setDevUser = useAuthStore((s) => s.setDevUser);
|
||||
const navigate = useNavigate();
|
||||
const [params] = useSearchParams();
|
||||
const returnUrl = params.get("returnUrl");
|
||||
|
||||
// ---- فرم اصلی (Casdoor) ----
|
||||
const [username, setUsername] = useState("");
|
||||
@@ -79,7 +77,10 @@ export function LoginPage() {
|
||||
toast.error("نقش شما هنوز در سیستم تعیین نشده است — با مدیر سیستم تماس بگیرید");
|
||||
return;
|
||||
}
|
||||
if (user.role === "supervisor" && (!user.projects || user.projects.length === 0)) {
|
||||
const hasProjects =
|
||||
(Boolean(user.projects && user.projects.length > 0)) ||
|
||||
(Boolean(user.member_project_ids && user.member_project_ids.length > 0));
|
||||
if (user.role === "supervisor" && !hasProjects) {
|
||||
toast.error("پروژه تخصیص داده نشده است — تا زمان تخصیص پروژه اجازه ورود ندارید");
|
||||
return;
|
||||
}
|
||||
@@ -88,14 +89,23 @@ export function LoginPage() {
|
||||
// تحلیل رفتار (no-op بدون تنظیمات VITE_OPENPANEL_*)
|
||||
identifyUser({ id: user.id, name: user.display_name, role: user.role });
|
||||
track("login_success", { role: user.role });
|
||||
toast.success(`خوش آمدید، ${user.display_name}`);
|
||||
if (returnUrl) {
|
||||
navigate(decodeURIComponent(returnUrl));
|
||||
// هدایت پس از ورود بر اساس پنل‌ها یا نقش:
|
||||
const panels = user.panels ?? {};
|
||||
if (panels.procurement === "full") {
|
||||
navigate("/");
|
||||
} else if (panels.procurement === "limited") {
|
||||
navigate("/requester");
|
||||
} else if (panels.inventory) {
|
||||
navigate("/inventory");
|
||||
} else if (panels.pm) {
|
||||
navigate("/panel/pm");
|
||||
} else if (user.role === "supervisor") {
|
||||
navigate("/panel/pm");
|
||||
} else if (user.role === "pm") {
|
||||
navigate("/inventory");
|
||||
} else {
|
||||
// سرپرست پروژه → پنل مدیریت پروژه (PM)؛ مدیر پروژه → پنل انبار؛ بقیه → دفتر
|
||||
if (user.role === "supervisor") navigate("/panel/pm");
|
||||
else navigate(user.role === "pm" ? "/inventory" : "/");
|
||||
} (revert: restore production to the state before 730d0bd (PM/RBAC work moved to 'pm'))
|
||||
navigate("/");
|
||||
}
|
||||
} catch (err) {
|
||||
toast.error(err instanceof Error ? err.message : "خطا در ورود");
|
||||
} finally {
|
||||
@@ -136,9 +146,8 @@ export function LoginPage() {
|
||||
}
|
||||
setDevUser(devRole, devRole === "pm" ? devProjectId : null, devRole === "pm" ? devProject?.name || null : null);
|
||||
toast.success(`ورود آزمایشی انجام شد — نقش: ${DEV_ROLE_LABELS[devRole]}`);
|
||||
if (returnUrl) {
|
||||
navigate(decodeURIComponent(returnUrl));
|
||||
} else if (devRole === "admin") navigate("/admin");
|
||||
// ادمین → پنل مدیریت ادمین؛ مدیر تدارکات → دفتر؛ مدیر پروژه → پنل انبار
|
||||
if (devRole === "admin") navigate("/admin");
|
||||
else if (devRole === "pm") navigate("/inventory");
|
||||
else navigate("/");
|
||||
};
|
||||
@@ -285,10 +294,21 @@ export function LoginPage() {
|
||||
<ClipboardList className="h-6 w-6" strokeWidth={2} />
|
||||
</span>
|
||||
<div>
|
||||
<h1 className="text-[19px] font-extrabold leading-7">سامانه تدارکات و انبار</h1>
|
||||
<p className="mt-1 text-[12.5px] leading-6 text-muted">
|
||||
برای ورود، نام کاربری و رمز عبور سازمانی خود را وارد کنید
|
||||
<h1 className="text-[19px] font-extrabold leading-7">سامانه جامع مدیریت پروژه، تدارکات و انبار</h1>
|
||||
<p className="mt-1.5 text-[12.5px] leading-6 text-muted">
|
||||
درگاه یکپارچه ورود به سامانه مدیریت عملیات پروژه، تدارکات و انبارداری
|
||||
</p>
|
||||
<div className="mt-2.5 flex items-center justify-center gap-1.5 flex-wrap">
|
||||
<span className="inline-flex items-center rounded-full bg-sky-50 px-2.5 py-0.5 text-[11px] font-semibold text-sky-700 border border-sky-200">
|
||||
مدیریت پروژه
|
||||
</span>
|
||||
<span className="inline-flex items-center rounded-full bg-indigo-50 px-2.5 py-0.5 text-[11px] font-semibold text-indigo-700 border border-indigo-200">
|
||||
تدارکات
|
||||
</span>
|
||||
<span className="inline-flex items-center rounded-full bg-emerald-50 px-2.5 py-0.5 text-[11px] font-semibold text-emerald-700 border border-emerald-200">
|
||||
انبارداری
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -23,134 +23,12 @@ import {
|
||||
import { MilestoneRow } from "../../components/MilestoneRow";
|
||||
import { FileList } from "../../components/FileList";
|
||||
import { JalaliDatePicker } from "../../components/JalaliDatePicker";
|
||||
import { Building2, Plus, Trash2, CheckCircle2, AlertCircle } from "lucide-react";
|
||||
|
||||
// تبدیل عدد به حروف فارسی جهت نمایش زیر باکس مقدار
|
||||
const ONES = ["", "یک", "دو", "سه", "چهار", "پنج", "شش", "هفت", "هشت", "نه"];
|
||||
const TEENS = [
|
||||
"ده",
|
||||
"یازده",
|
||||
"دوازده",
|
||||
"سیزده",
|
||||
"چهارده",
|
||||
"پانزده",
|
||||
"شانزده",
|
||||
"هفده",
|
||||
"هجده",
|
||||
"نوزده",
|
||||
];
|
||||
const TENS = [
|
||||
"",
|
||||
"",
|
||||
"بیست",
|
||||
"سی",
|
||||
"چهل",
|
||||
"پنجاه",
|
||||
"شصت",
|
||||
"هفتاد",
|
||||
"هشتاد",
|
||||
"نود",
|
||||
];
|
||||
const HUNDREDS = [
|
||||
"",
|
||||
"صد",
|
||||
"دویست",
|
||||
"سیصد",
|
||||
"چهارصد",
|
||||
"پانصد",
|
||||
"ششصد",
|
||||
"هفتصد",
|
||||
"هشتصد",
|
||||
"نهصد",
|
||||
];
|
||||
const SCALES = ["", "هزار", "میلیون", "میلیارد", "تریلیون"];
|
||||
const DECIMAL_SCALES: Record<number, string> = {
|
||||
1: "دهم",
|
||||
2: "صدم",
|
||||
3: "هزارم",
|
||||
4: "ده‌هزارم",
|
||||
};
|
||||
|
||||
function convertThreeDigits(n: number): string {
|
||||
if (n === 0) return "";
|
||||
const parts: string[] = [];
|
||||
const h = Math.floor(n / 100);
|
||||
const rem = n % 100;
|
||||
if (h > 0) parts.push(HUNDREDS[h]);
|
||||
if (rem >= 10 && rem <= 19) {
|
||||
parts.push(TEENS[rem - 10]);
|
||||
} else {
|
||||
const t = Math.floor(rem / 10);
|
||||
const u = rem % 10;
|
||||
if (t > 0) parts.push(TENS[t]);
|
||||
if (u > 0) parts.push(ONES[u]);
|
||||
}
|
||||
return parts.join(" و ");
|
||||
}
|
||||
|
||||
function toEnglishDigits(str: string): string {
|
||||
return str
|
||||
.replace(/[۰-۹]/g, (d) => String(d.charCodeAt(0) - 1776))
|
||||
.replace(/[٠-٩]/g, (d) => String(d.charCodeAt(0) - 1632));
|
||||
}
|
||||
|
||||
function numberToPersianWords(val: number | string | null | undefined): string {
|
||||
if (val == null || val === "") return "";
|
||||
const numStr = toEnglishDigits(String(val).trim());
|
||||
const num = parseFloat(numStr);
|
||||
if (isNaN(num)) return "";
|
||||
if (num === 0) return "صفر";
|
||||
|
||||
const isNeg = num < 0;
|
||||
const parts = Math.abs(num).toString().split(".");
|
||||
const intStr = parts[0];
|
||||
const decStr = parts[1];
|
||||
|
||||
let intNum = parseInt(intStr, 10);
|
||||
let intResult = "";
|
||||
|
||||
if (intNum === 0) {
|
||||
intResult = "صفر";
|
||||
} else {
|
||||
const chunks: number[] = [];
|
||||
while (intNum > 0) {
|
||||
chunks.push(intNum % 1000);
|
||||
intNum = Math.floor(intNum / 1000);
|
||||
}
|
||||
const chunkWords: string[] = [];
|
||||
for (let i = chunks.length - 1; i >= 0; i--) {
|
||||
const c = chunks[i];
|
||||
if (c > 0) {
|
||||
const w = convertThreeDigits(c);
|
||||
const s = SCALES[i];
|
||||
chunkWords.push(s ? `${w} ${s}` : w);
|
||||
}
|
||||
}
|
||||
intResult = chunkWords.join(" و ");
|
||||
}
|
||||
|
||||
if (decStr && parseInt(decStr, 10) > 0) {
|
||||
const cleanDecStr = decStr.slice(0, 4);
|
||||
const decNum = parseInt(cleanDecStr, 10);
|
||||
const decWord = numberToPersianWords(decNum);
|
||||
const scale = DECIMAL_SCALES[cleanDecStr.length];
|
||||
if (scale) {
|
||||
if (intNum === 0) {
|
||||
return `${isNeg ? "منفی " : ""}${decWord} ${scale}`;
|
||||
}
|
||||
return `${isNeg ? "منفی " : ""}${intResult} و ${decWord} ${scale}`;
|
||||
}
|
||||
return `${isNeg ? "منفی " : ""}${intResult} ممیز ${decWord}`;
|
||||
}
|
||||
|
||||
return isNeg ? `منفی ${intResult}` : intResult;
|
||||
}
|
||||
|
||||
interface CardDraft {
|
||||
domId: string;
|
||||
isNew: boolean;
|
||||
milestones: Milestone[];
|
||||
label: string | null;
|
||||
label: string | null; // null = پیش‌فرض «گزینه N»
|
||||
}
|
||||
|
||||
export interface AcceptModalProps {
|
||||
@@ -173,9 +51,6 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
|
||||
const [removedItems, setRemovedItems] = useState<Set<string>>(new Set());
|
||||
const [assignments, setAssignments] = useState<Record<string, string>>({});
|
||||
const [itemProjectsSel, setItemProjectsSel] = useState<Record<string, string>>({});
|
||||
const [itemAllocations, setItemAllocations] = useState<
|
||||
Record<string, { rowId: string; project_name: string; quantity: number | string }[]>
|
||||
>({});
|
||||
const [acceptDate, setAcceptDate] = useState<string | null>(() => new Date().toISOString());
|
||||
const [ready, setReady] = useState(false);
|
||||
|
||||
@@ -192,35 +67,17 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
|
||||
setRemovedItems(rem);
|
||||
setAssignments({});
|
||||
const projSel: Record<string, string> = {};
|
||||
const allocs: Record<string, { rowId: string; project_name: string; quantity: number | string }[]> = {};
|
||||
q.line_items.forEach((li) => {
|
||||
const names = (li.projects || []).map((p) => p.name).filter(Boolean);
|
||||
const defaultProj = li.target_project?.name
|
||||
projSel[li.id] = li.target_project?.name
|
||||
? li.target_project.name
|
||||
: names.length
|
||||
? names[0]
|
||||
: q.projects && q.projects.length
|
||||
? q.projects[0]
|
||||
: q.project || "";
|
||||
projSel[li.id] = defaultProj;
|
||||
if (li.allocations && li.allocations.length) {
|
||||
allocs[li.id] = li.allocations.map((a, idx) => ({
|
||||
rowId: `alloc-${li.id}-${idx}`,
|
||||
project_name: a.project_name,
|
||||
quantity: a.quantity,
|
||||
}));
|
||||
} else {
|
||||
allocs[li.id] = [
|
||||
{
|
||||
rowId: `alloc-${li.id}-0`,
|
||||
project_name: defaultProj,
|
||||
quantity: li.quantity ?? 1,
|
||||
},
|
||||
];
|
||||
}
|
||||
});
|
||||
setItemProjectsSel(projSel);
|
||||
setItemAllocations(allocs);
|
||||
setReady(true);
|
||||
}, [q]);
|
||||
|
||||
@@ -280,44 +137,6 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
|
||||
setAssignments((a) => ({ ...a, [liId]: domId }));
|
||||
};
|
||||
|
||||
const addAllocationRow = (liId: string, totalQty: number) => {
|
||||
setItemAllocations((prev) => {
|
||||
const currentList = prev[liId] || [];
|
||||
const currentSum = currentList.reduce((sum, a) => sum + (parseFloat(String(a.quantity)) || 0), 0);
|
||||
const remaining = Math.max(0, Math.round((totalQty - currentSum) * 10000) / 10000);
|
||||
const usedProjects = new Set(currentList.map((a) => a.project_name).filter(Boolean));
|
||||
const firstAvailable = projectOptions.find((p) => !usedProjects.has(p)) || "";
|
||||
const newRow = {
|
||||
rowId: `alloc-${liId}-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`,
|
||||
project_name: firstAvailable,
|
||||
quantity: remaining > 0 ? remaining : "",
|
||||
};
|
||||
return { ...prev, [liId]: [...currentList, newRow] };
|
||||
});
|
||||
};
|
||||
|
||||
const removeAllocationRow = (liId: string, rowId: string) => {
|
||||
setItemAllocations((prev) => {
|
||||
const currentList = prev[liId] || [];
|
||||
if (currentList.length <= 1) return prev;
|
||||
return { ...prev, [liId]: currentList.filter((a) => a.rowId !== rowId) };
|
||||
});
|
||||
};
|
||||
|
||||
const updateAllocationRow = (
|
||||
liId: string,
|
||||
rowId: string,
|
||||
patch: Partial<{ project_name: string; quantity: number | string }>,
|
||||
) => {
|
||||
setItemAllocations((prev) => {
|
||||
const currentList = prev[liId] || [];
|
||||
return {
|
||||
...prev,
|
||||
[liId]: currentList.map((a) => (a.rowId === rowId ? { ...a, ...patch } : a)),
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
const confirm = () => {
|
||||
if (!q) return;
|
||||
|
||||
@@ -343,7 +162,6 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
|
||||
next.line_items.forEach((li) => {
|
||||
if (removedItems.has(li.id)) li.rejected = true;
|
||||
});
|
||||
|
||||
const active = activeItems(next);
|
||||
if (!active.length) {
|
||||
toast.error("همه‌ی قلم‌ها رد شده‌اند؛ حداقل یک قلم لازم است.");
|
||||
@@ -388,60 +206,13 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
|
||||
if (t.status === "accepted" && !usedIds.has(t.id)) t.status = "offered";
|
||||
});
|
||||
|
||||
for (const li of active) {
|
||||
const allocs = itemAllocations[li.id] || [];
|
||||
const m = materialById(materials, li.material_id);
|
||||
const title = formatMaterialTitle(m);
|
||||
const targetQty = Number(li.quantity ?? 0);
|
||||
|
||||
if (!allocs.length) {
|
||||
toast.error(`برای قلم «${title}» حداقل یک ردیف تخصیص به پروژه لازم است.`);
|
||||
return;
|
||||
}
|
||||
|
||||
for (const a of allocs) {
|
||||
if (!a.project_name.trim()) {
|
||||
toast.error(`برای قلم «${title}»، لطفاً پروژهٔ تمام ردیف‌های تخصیص را مشخص کنید.`);
|
||||
return;
|
||||
}
|
||||
const qVal = parseFloat(String(a.quantity));
|
||||
if (isNaN(qVal) || qVal <= 0) {
|
||||
toast.error(`برای قلم «${title}»، مقدار تخصیص باید عددی بزرگ‌تر از صفر باشد.`);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
const pNames = allocs.map((a) => a.project_name.trim());
|
||||
if (new Set(pNames).size !== pNames.length) {
|
||||
toast.error(`برای قلم «${title}»، پروژهٔ تکراری در ردیف‌های تخصیص انتخاب شده است.`);
|
||||
return;
|
||||
}
|
||||
|
||||
const sumQty = allocs.reduce((sum, a) => sum + (parseFloat(String(a.quantity)) || 0), 0);
|
||||
const diff = Math.abs(sumQty - targetQty);
|
||||
if (diff > 0.0001) {
|
||||
toast.error(
|
||||
`مجموع مقادیر تخصیص‌یافته برای «${title}» (${fmtNum(sumQty)} ${li.unit}) با مقدار کل قلم (${fmtNum(targetQty)} ${li.unit}) برابر نیست.`
|
||||
);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// پروژه‌ی هر قلم (تکی هدف خرید) — فقط target_project تنظیم می‌شود؛
|
||||
// li.projects و next.projects دست‌نخورده باقی می‌مانند تا پروژه‌های کاندیدای اولیه حفظ شوند
|
||||
next.line_items.forEach((li) => {
|
||||
if (li.rejected) return;
|
||||
const allocs = itemAllocations[li.id];
|
||||
if (allocs && allocs.length) {
|
||||
li.allocations = allocs.map((a) => ({
|
||||
project_name: a.project_name.trim(),
|
||||
quantity: parseFloat(String(a.quantity)) || 0,
|
||||
}));
|
||||
li.target_project = { id: "", name: allocs[0].project_name.trim() };
|
||||
} else {
|
||||
const name = itemProjectsSel[li.id];
|
||||
if (name !== undefined) {
|
||||
li.target_project = name ? { id: "", name } : null;
|
||||
}
|
||||
}
|
||||
const name = itemProjectsSel[li.id];
|
||||
if (name === undefined) return;
|
||||
li.target_project = name ? { id: "", name } : null;
|
||||
});
|
||||
|
||||
const now = new Date().toISOString();
|
||||
@@ -461,12 +232,17 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
|
||||
<DialogContent className="max-w-3xl p-0 gap-0 overflow-hidden bg-slate-50 border-none shadow-2xl rounded-xl">
|
||||
<div className="flex flex-col max-h-[85vh] w-full">
|
||||
|
||||
{/* هدر ثابت */}
|
||||
{/* هدر ثابت و هم‌تراز */}
|
||||
<div className="px-6 py-4 bg-white border-b border-line shrink-0 z-10 text-right">
|
||||
<DialogHeader className="p-0 text-right">
|
||||
<DialogTitle className="text-right text-lg font-bold text-slate-800">
|
||||
پذیرش پیشنهاد — {sup.name}
|
||||
</DialogTitle>
|
||||
<div className="flex items-center justify-between gap-3">
|
||||
<DialogTitle className="text-right text-lg font-bold text-slate-800">
|
||||
پذیرش پیشنهاد — {sup.name}
|
||||
</DialogTitle>
|
||||
<span className="font-mono text-xs font-bold text-slate-700 bg-slate-100 px-2.5 py-1 rounded-lg border border-line shrink-0 select-all">
|
||||
کد: {q.id.startsWith("PR-") ? q.id : `PR-${q.id}`}
|
||||
</span>
|
||||
</div>
|
||||
</DialogHeader>
|
||||
<p className="text-[13px] text-muted mt-1 text-right">
|
||||
شرایط پرداخت را ویرایش کنید. سپس هر قلم را به بخش و پروژه دلخواه تخصیص دهید.
|
||||
@@ -572,196 +348,53 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* بخش ۳: تخصیص اقلام به پروژه‌ها */}
|
||||
{/* بخش ۳: تخصیص اقلام به پروژه */}
|
||||
<section className="bg-white rounded-xl shadow-sm border border-line p-4 md:p-5">
|
||||
<div className="flex items-center justify-between mb-1">
|
||||
<h3 className="text-[14px] font-bold text-slate-800">۳. تخصیص اقلام به پروژه‌ها</h3>
|
||||
</div>
|
||||
<h3 className="mb-1 text-[14px] font-bold text-slate-800">۳. تخصیص اقلام به پروژه‌ها</h3>
|
||||
<div className="mb-4 text-[12px] text-muted">
|
||||
مشخص کنید چه مقداری از هر قلم به کدام پروژه اختصاص داده می‌شود. در صورت خرید یک کالا برای چند پروژه، می‌توانید آن را به چند سطر تفکیک کنید.
|
||||
برای هر متریال خریداری شده، می‌توانید پروژه مربوط به آن را مشخص کنید.
|
||||
</div>
|
||||
|
||||
{projectOptions.length === 0 ? (
|
||||
<div className="text-[12px] text-amber-700 bg-amber-50 border border-amber-200 p-3 rounded-md text-center">
|
||||
⚠️ هیچ پروژه‌ای در سیستم ثبت نشده است. لطفاً ابتدا از بخش پروژه‌ها، حداقل یک پروژه ایجاد کنید.
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex flex-col gap-4">
|
||||
{allItems
|
||||
.filter((li) => !removedItems.has(li.id))
|
||||
.map((li) => {
|
||||
const m = materialById(materials, li.material_id);
|
||||
const targetQty = Number(li.quantity ?? 0);
|
||||
const allocs = itemAllocations[li.id] || [];
|
||||
const allocSum = allocs.reduce(
|
||||
(sum, a) => sum + (parseFloat(String(a.quantity)) || 0),
|
||||
0
|
||||
);
|
||||
const diff = Math.round((targetQty - allocSum) * 10000) / 10000;
|
||||
const isComplete = Math.abs(diff) < 0.0001;
|
||||
const isOver = diff < -0.0001;
|
||||
|
||||
return (
|
||||
<div
|
||||
key={li.id}
|
||||
className="rounded-xl border border-line bg-slate-50/50 p-4 transition-all hover:border-primary/30"
|
||||
>
|
||||
{/* هدر کارت قلم */}
|
||||
<div className="flex flex-wrap items-center justify-between gap-2 mb-3 pb-2.5 border-b border-line/60">
|
||||
<div className="flex items-center gap-2">
|
||||
<Building2 className="w-4 h-4 text-primary shrink-0" />
|
||||
<span className="text-[13.5px] font-bold text-slate-800">
|
||||
{formatMaterialTitle(m)}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="text-[11px] font-medium text-slate-600 bg-white border border-line px-2.5 py-0.5 rounded-full">
|
||||
کل: {fmtNum(targetQty)} {li.unit}
|
||||
</span>
|
||||
|
||||
{isComplete ? (
|
||||
<span className="inline-flex items-center gap-1 text-[11px] font-semibold text-emerald-700 bg-emerald-50 border border-emerald-200 px-2.5 py-0.5 rounded-full">
|
||||
<CheckCircle2 className="w-3 h-3" />
|
||||
تخصیص کامل ({fmtNum(allocSum)} {li.unit})
|
||||
</span>
|
||||
) : isOver ? (
|
||||
<span className="inline-flex items-center gap-1 text-[11px] font-semibold text-red-700 bg-red-50 border border-red-200 px-2.5 py-0.5 rounded-full">
|
||||
<AlertCircle className="w-3 h-3" />
|
||||
مازاد تخصیص: {fmtNum(Math.abs(diff))} {li.unit}
|
||||
</span>
|
||||
) : (
|
||||
<span className="inline-flex items-center gap-1 text-[11px] font-semibold text-amber-700 bg-amber-50 border border-amber-200 px-2.5 py-0.5 rounded-full">
|
||||
<AlertCircle className="w-3 h-3" />
|
||||
باقیمانده: {fmtNum(diff)} {li.unit}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* ردیف‌های تخصیص — تراز افقی یکپارچه بدون جابجایی دکمه‌ها */}
|
||||
<div className="flex flex-col gap-2.5 mb-3">
|
||||
{allocs.map((alloc) => {
|
||||
const otherUsedProjects = new Set(
|
||||
allocs
|
||||
.filter((a) => a.rowId !== alloc.rowId)
|
||||
.map((a) => a.project_name.trim())
|
||||
.filter(Boolean)
|
||||
);
|
||||
|
||||
const words = numberToPersianWords(alloc.quantity);
|
||||
|
||||
return (
|
||||
<div
|
||||
key={alloc.rowId}
|
||||
className="flex flex-col sm:flex-row items-start gap-2.5 bg-white p-3 rounded-lg border border-line shadow-xs"
|
||||
>
|
||||
{/* انتخاب پروژه و دکمه حذف موبایل */}
|
||||
<div className="flex items-center gap-2 flex-1 w-full sm:w-auto">
|
||||
<div className="flex-1 min-w-0">
|
||||
<select
|
||||
className="w-full h-9 rounded-md border border-line bg-panel px-2.5 py-1 font-inherit text-[12px] outline-none focus:border-primary focus:ring-1 focus:ring-primary transition-all text-slate-700"
|
||||
value={alloc.project_name}
|
||||
onChange={(e) =>
|
||||
updateAllocationRow(li.id, alloc.rowId, {
|
||||
project_name: e.target.value,
|
||||
})
|
||||
}
|
||||
>
|
||||
<option value="">انتخاب پروژه...</option>
|
||||
{projectOptions.map((p) => {
|
||||
const isUsed = otherUsedProjects.has(p);
|
||||
return (
|
||||
<option key={p} value={p} disabled={isUsed}>
|
||||
{p} {isUsed ? "(در ردیف دیگر انتخاب شده)" : ""}
|
||||
</option>
|
||||
);
|
||||
})}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
{/* دکمه حذف موبایل */}
|
||||
<button
|
||||
type="button"
|
||||
disabled={allocs.length <= 1}
|
||||
onClick={() => removeAllocationRow(li.id, alloc.rowId)}
|
||||
className="sm:hidden h-9 w-9 flex items-center justify-center rounded-md border border-line text-slate-400 hover:text-red-600 hover:bg-red-50 hover:border-red-200 transition-colors disabled:opacity-30 disabled:pointer-events-none shrink-0"
|
||||
title="حذف این ردیف تخصیص"
|
||||
>
|
||||
<Trash2 className="w-3.5 h-3.5" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* فیلد مقدار بدون اسپینر + واحد ثابت + متن حروفی */}
|
||||
<div className="flex flex-col w-full sm:w-44 shrink-0">
|
||||
<div className="flex items-stretch h-9 rounded-md border border-line bg-panel overflow-hidden focus-within:border-primary focus-within:ring-1 focus-within:ring-primary transition-all">
|
||||
<input
|
||||
type="number"
|
||||
step="any"
|
||||
min="0"
|
||||
placeholder="مقدار"
|
||||
className="flex-1 min-w-0 h-full bg-transparent px-2.5 py-1 font-inherit text-[12px] outline-none text-left font-mono [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
|
||||
style={{ MozAppearance: "textfield" }}
|
||||
dir="ltr"
|
||||
value={alloc.quantity}
|
||||
onChange={(e) =>
|
||||
updateAllocationRow(li.id, alloc.rowId, {
|
||||
quantity: e.target.value,
|
||||
})
|
||||
}
|
||||
/>
|
||||
<div
|
||||
className="px-2.5 bg-slate-100 border-s border-line text-slate-600 text-[12px] font-medium flex items-center justify-center shrink-0 select-none min-w-[42px]"
|
||||
title={`واحد: ${li.unit}`}
|
||||
>
|
||||
{li.unit}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{words ? (
|
||||
<div className="mt-1 text-[11px] text-slate-500 font-medium px-0.5 leading-tight text-right truncate" title={`${words} ${li.unit}`}>
|
||||
{words} {li.unit}
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
|
||||
{/* دکمه حذف دسکتاپ — تراز شده با لبه بالای دراپ‌داون و اینپوت */}
|
||||
<button
|
||||
type="button"
|
||||
disabled={allocs.length <= 1}
|
||||
onClick={() => removeAllocationRow(li.id, alloc.rowId)}
|
||||
className="hidden sm:flex h-9 w-9 items-center justify-center rounded-md border border-line text-slate-400 hover:text-red-600 hover:bg-red-50 hover:border-red-200 transition-colors disabled:opacity-30 disabled:pointer-events-none shrink-0"
|
||||
title="حذف این ردیف تخصیص"
|
||||
>
|
||||
<Trash2 className="w-3.5 h-3.5" />
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
{/* فوتر کارت قلم */}
|
||||
<div className="flex items-center justify-between pt-1">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => addAllocationRow(li.id, targetQty)}
|
||||
disabled={
|
||||
allocs.length >= projectOptions.length && projectOptions.length > 0
|
||||
}
|
||||
className="inline-flex items-center gap-1.5 text-[12px] font-medium text-primary hover:text-primary/80 transition-colors disabled:opacity-40 disabled:cursor-not-allowed"
|
||||
>
|
||||
<Plus className="w-3.5 h-3.5" />
|
||||
<span>افزودن ردیف تخصیص (پروژه دیگر)</span>
|
||||
</button>
|
||||
<span className="text-[11px] text-muted">
|
||||
مجموع: {fmtNum(allocSum)} از {fmtNum(targetQty)} {li.unit}
|
||||
</span>
|
||||
</div>
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-3">
|
||||
{allItems
|
||||
.filter((li) => !removedItems.has(li.id))
|
||||
.map((li) => {
|
||||
const m = materialById(materials, li.material_id);
|
||||
return (
|
||||
<div key={li.id} className="rounded-lg border border-line p-3 flex flex-col justify-between hover:border-primary/30 transition-colors">
|
||||
<div className="mb-3 flex items-center justify-between">
|
||||
<span className="text-[13px] font-semibold text-slate-800 truncate">
|
||||
{formatMaterialTitle(m)}
|
||||
</span>
|
||||
<span className="ms-2 text-[11px] text-muted bg-slate-100 px-2 py-0.5 rounded-full whitespace-nowrap">
|
||||
{fmtNum(li.quantity)} {li.unit}
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
{projectOptions.length ? (
|
||||
<select
|
||||
className="w-full h-9 rounded-md border border-line bg-panel px-2.5 py-1.5 font-inherit text-[12px] outline-none focus:border-primary focus:ring-1 focus:ring-primary transition-all"
|
||||
value={itemProjectsSel[li.id] ?? ""}
|
||||
onChange={(e) =>
|
||||
setItemProjectsSel((s) => ({ ...s, [li.id]: e.target.value }))
|
||||
}
|
||||
>
|
||||
{(itemProjectsSel[li.id] ? [] : [{ name: "" }]).map((_, i) => (
|
||||
<option key={i} value="">
|
||||
انتخاب پروژه...
|
||||
</option>
|
||||
))}
|
||||
{projectOptions.map((n) => (
|
||||
<option key={n} value={n}>
|
||||
{n}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
) : (
|
||||
<div className="text-[12px] text-muted bg-slate-50 p-2 rounded-md text-center">پروژه‌ای در سیستم ثبت نشده است.</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{/* بخش ۴: فاکتورها، پیش‌فاکتورها و تاریخ */}
|
||||
@@ -813,17 +446,17 @@ export function AcceptModal({ quoteId, onClose }: AcceptModalProps) {
|
||||
|
||||
</div>
|
||||
|
||||
{/* فوتر ثابت */}
|
||||
<div className="px-6 py-4 bg-white border-t border-line shrink-0 z-10">
|
||||
<DialogFooter className="flex w-full gap-3 sm:justify-end">
|
||||
<Button variant="slate" onClick={onClose} className="w-full sm:w-auto">
|
||||
انصراف
|
||||
</Button>
|
||||
<Button onClick={confirm} className="w-full sm:w-auto">
|
||||
ثبت معامله بسته‌شده
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</div>
|
||||
{/* فوتر ثابت */}
|
||||
<div className="px-6 py-4 bg-white border-t border-line shrink-0 z-10">
|
||||
<DialogFooter className="flex w-full gap-3 sm:justify-end">
|
||||
<Button variant="slate" onClick={onClose} className="w-full sm:w-auto">
|
||||
انصراف
|
||||
</Button>
|
||||
<Button onClick={confirm} className="w-full sm:w-auto">
|
||||
ثبت معامله بسته‌شده
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</DialogContent>
|
||||
|
||||
@@ -132,20 +132,23 @@ export function DashboardPage() {
|
||||
/>
|
||||
|
||||
<PageLayout className="flex flex-col gap-3 px-3 md:px-6">
|
||||
<StatsBar
|
||||
total={stats.total}
|
||||
offered={stats.offered}
|
||||
accepted={stats.accepted}
|
||||
arrived={stats.arrived}
|
||||
activeFilter={activeStatusFilter}
|
||||
onFilterChange={handleStatusFilterChange}
|
||||
/>
|
||||
<div className="hidden md:block">
|
||||
<StatsBar
|
||||
total={stats.total}
|
||||
offered={stats.offered}
|
||||
accepted={stats.accepted}
|
||||
arrived={stats.arrived}
|
||||
activeFilter={activeStatusFilter}
|
||||
onFilterChange={handleStatusFilterChange}
|
||||
/>
|
||||
</div>
|
||||
<FilterToolbar
|
||||
filters={filters}
|
||||
onChange={setFilters}
|
||||
suppliers={supplierOptions}
|
||||
sortDir={sortDir}
|
||||
onToggleSort={() => setSortDir((d) => (d === "desc" ? "asc" : "desc"))}
|
||||
stats={stats}
|
||||
/>
|
||||
<LedgerTable
|
||||
store={store}
|
||||
|
||||
@@ -438,26 +438,7 @@ export function EditModal({ quoteId, onClose }: EditModalProps) {
|
||||
li.accepted_ts_id = null;
|
||||
li.target_project = null;
|
||||
li.target_project_id = null;
|
||||
li.allocations = undefined;
|
||||
});
|
||||
|
||||
// ادغام سطرهای تفکیک‌شده حاصل از تخصیص چندپروژه‌ای (الزام ۲)
|
||||
const mergedMap = new Map<string, LineItem>();
|
||||
for (const li of next.line_items) {
|
||||
const key = `${li.material_id}__${li.unit || ""}__${li.unit_price ?? ""}`;
|
||||
const existing = mergedMap.get(key);
|
||||
if (existing) {
|
||||
const q1 = Number(existing.quantity ?? 0);
|
||||
const q2 = Number(li.quantity ?? 0);
|
||||
existing.quantity = Math.round((q1 + q2) * 10000) / 10000;
|
||||
if (existing.unit_price != null && existing.quantity != null) {
|
||||
existing.total_price = existing.unit_price * existing.quantity;
|
||||
}
|
||||
} else {
|
||||
mergedMap.set(key, { ...li });
|
||||
}
|
||||
}
|
||||
next.line_items = Array.from(mergedMap.values());
|
||||
} else if (next.status === "accepted") {
|
||||
next.arrived_date = null;
|
||||
next.line_items.forEach((li) => {
|
||||
@@ -481,7 +462,14 @@ export function EditModal({ quoteId, onClose }: EditModalProps) {
|
||||
<DialogContent className="flex h-[88vh] max-h-[850px] w-[95vw] max-w-3xl flex-col p-0 overflow-hidden rounded-2xl border border-gray-200 bg-white text-gray-900 shadow-2xl">
|
||||
{/* هدر */}
|
||||
<DialogHeader className="border-b border-gray-100 bg-white px-4 py-3 sm:px-6 sm:py-4 shrink-0 text-right">
|
||||
<DialogTitle className="text-base font-bold text-gray-900 sm:text-lg">ویرایش پیشنهاد خرید</DialogTitle>
|
||||
<div className="flex items-center justify-between gap-3">
|
||||
<DialogTitle className="text-base font-bold text-gray-900 sm:text-lg">ویرایش پیشنهاد خرید</DialogTitle>
|
||||
{q && (
|
||||
<span className="font-mono text-xs font-bold text-gray-700 bg-gray-100 px-2.5 py-1 rounded-lg border border-gray-200 shrink-0 select-all">
|
||||
کد: {q.id.startsWith("PR-") ? q.id : `PR-${q.id}`}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
<div className="text-[12px] text-gray-500 truncate mt-0.5">
|
||||
{supplierName ? `تأمین‌کننده: ${supplierName}` : "تنظیم اقلام، مبالغ و شرایط پرداخت"}
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import { useState } from "react";
|
||||
import { SlidersHorizontal, X, ArrowUpDown, RotateCcw } from "lucide-react";
|
||||
import { Search, SlidersHorizontal, X, ArrowUpDown, RotateCcw } from "lucide-react";
|
||||
import { Combobox } from "../../components/Combobox";
|
||||
import { fmtNum } from "../../lib/formatters";
|
||||
import { cn } from "../../lib/utils";
|
||||
|
||||
export interface Filters {
|
||||
supplier: string;
|
||||
@@ -8,29 +10,33 @@ export interface Filters {
|
||||
search: string;
|
||||
}
|
||||
|
||||
// گزینه‌های استاندارد و یکپارچه وضعیت هماهنگ با کارت‌های بالای صفحه
|
||||
// گزینه‌های استاندارد وضعیت برای دراپ‌داون فیلترهای پیشرفته
|
||||
const STATUS_OPTIONS = [
|
||||
{ id: "offered", label: "پیشنهاد باز" },
|
||||
{ id: "accepted", label: "پذیرفته‌شده" },
|
||||
{ id: "arrived", label: "تحویل‌شده" },
|
||||
{ id: "offered", label: "در انتظار تایید" },
|
||||
{ id: "accepted", label: "در حال خرید" },
|
||||
{ id: "arrived", label: "تکمیل شده" },
|
||||
];
|
||||
|
||||
const STATUS_MAP: Record<string, string> = {
|
||||
offered: "پیشنهاد باز",
|
||||
accepted: "پذیرفته‌شده",
|
||||
arrived: "تحویل‌شده",
|
||||
offered: "در انتظار تایید",
|
||||
accepted: "در حال خرید",
|
||||
arrived: "تکمیل شده",
|
||||
};
|
||||
|
||||
const STATUS_TO_KEY: Record<string, string> = {
|
||||
"در انتظار تایید": "offered",
|
||||
"در انتظار تأیید": "offered",
|
||||
"پیشنهاد باز": "offered",
|
||||
"پذیرفته‌شده": "accepted",
|
||||
"تحویل‌شده": "arrived",
|
||||
"پیشنهاد شده": "offered",
|
||||
"در حال خرید": "accepted",
|
||||
"پذیرفته‌شده": "accepted",
|
||||
"پذیرفته شده": "accepted",
|
||||
"تکمیل شده": "arrived",
|
||||
"تحویل‌شده": "arrived",
|
||||
"رسیده": "arrived",
|
||||
"باز": "offered",
|
||||
"پذیرفته": "accepted",
|
||||
"تحویل": "arrived",
|
||||
"تکمیل": "arrived",
|
||||
offered: "offered",
|
||||
accepted: "accepted",
|
||||
arrived: "arrived",
|
||||
@@ -42,6 +48,7 @@ export interface FilterToolbarProps {
|
||||
suppliers: { id: string; name: string }[];
|
||||
sortDir: "desc" | "asc";
|
||||
onToggleSort: () => void;
|
||||
stats?: { total: number; offered: number; accepted: number; arrived: number };
|
||||
}
|
||||
|
||||
export function FilterToolbar({
|
||||
@@ -50,97 +57,179 @@ export function FilterToolbar({
|
||||
suppliers,
|
||||
sortDir,
|
||||
onToggleSort,
|
||||
stats,
|
||||
}: FilterToolbarProps) {
|
||||
const [isOpen, setIsOpen] = useState(false);
|
||||
const set = (patch: Partial<Filters>) => onChange({ ...filters, ...patch });
|
||||
|
||||
// شمارش تعداد فیلترهای فعال به جز سرچ
|
||||
const activeFilterCount = [filters.supplier, filters.status].filter(Boolean).length;
|
||||
// شمارش تعداد فیلترهای فعال به جز سرچ و تب وضعیت
|
||||
const activeFilterCount = [filters.supplier].filter(Boolean).length;
|
||||
|
||||
const clearFilters = () => {
|
||||
onChange({ ...filters, supplier: "", status: "" });
|
||||
const clearSupplierFilter = () => {
|
||||
set({ supplier: "" });
|
||||
};
|
||||
|
||||
// تبدیل کلید انگلیسی به لیبل فارسی برای نمایش داخل کامبوباکس
|
||||
const statusDisplayValue = STATUS_MAP[filters.status] || filters.status;
|
||||
const clearAllFilters = () => {
|
||||
onChange({ supplier: "", status: "", search: "" });
|
||||
};
|
||||
|
||||
const normalizedStatus = STATUS_TO_KEY[filters.status] ?? filters.status ?? "";
|
||||
const statusDisplayValue = STATUS_MAP[normalizedStatus] || filters.status;
|
||||
|
||||
const handleStatusChange = (val: string) => {
|
||||
const key = STATUS_TO_KEY[val] || val;
|
||||
set({ status: key });
|
||||
};
|
||||
|
||||
const STATUS_TABS: {
|
||||
key: string;
|
||||
label: string;
|
||||
countKey?: keyof NonNullable<FilterToolbarProps["stats"]>;
|
||||
}[] = [
|
||||
{ key: "", label: "همه", countKey: "total" },
|
||||
{ key: "offered", label: "در انتظار تایید", countKey: "offered" },
|
||||
{ key: "accepted", label: "در حال خرید", countKey: "accepted" },
|
||||
{ key: "arrived", label: "تکمیل شده", countKey: "arrived" },
|
||||
];
|
||||
|
||||
return (
|
||||
<>
|
||||
{/* ===== نمای موبایل (صفحه‌نمایش‌های زیر md) ===== */}
|
||||
<div className="flex md:hidden items-center gap-2">
|
||||
{/* اینپوت جستجوی متنی */}
|
||||
<div className="flex flex-col gap-2.5">
|
||||
{/* ===== ردیف جستجو و کنترل‌های فیلتر (تک‌ردیف افقی فشرده) ===== */}
|
||||
<div className="flex items-center gap-2">
|
||||
{/* فیلد جستجوی متنی پروژه / کالا / تأمین‌کننده */}
|
||||
<div className="relative flex-1">
|
||||
<div className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3 text-muted">
|
||||
<Search className="h-4 w-4" />
|
||||
</div>
|
||||
<input
|
||||
type="search"
|
||||
className="h-10 w-full rounded-xl border border-line bg-panel px-3 text-sm shadow-sm placeholder:text-muted focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent/40"
|
||||
placeholder="جستجو در نام، برند، پروژه..."
|
||||
className="h-10 w-full rounded-xl border border-line bg-panel pr-9 pl-8 text-xs sm:text-sm text-ink shadow-2xs placeholder:text-muted focus-visible:border-accent focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent/25 transition-all"
|
||||
placeholder="جستجو در پروژه، کالا، تأمین‌کننده..."
|
||||
value={filters.search}
|
||||
onChange={(e) => set({ search: e.target.value })}
|
||||
/>
|
||||
{filters.search && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => set({ search: "" })}
|
||||
className="absolute inset-y-0 left-0 flex items-center pl-2.5 text-muted hover:text-ink cursor-pointer"
|
||||
aria-label="پاک کردن جستجو"
|
||||
>
|
||||
<X className="h-4 w-4" />
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* دکمه فیلترها با بج تعداد انتخاب‌شده */}
|
||||
{/* دکمه باز کردن فیلترهای پیشرفته (تأمین‌کننده و ...) */}
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setIsOpen(true)}
|
||||
className={`relative inline-flex h-10 items-center justify-center gap-1.5 rounded-xl border px-3 text-xs font-semibold shadow-sm transition-colors ${
|
||||
className={cn(
|
||||
"relative inline-flex h-10 items-center justify-center gap-1.5 rounded-xl border px-3 text-xs font-semibold shadow-2xs transition-all shrink-0 cursor-pointer",
|
||||
activeFilterCount > 0
|
||||
? "border-accent bg-accent-bg text-accent"
|
||||
: "border-line bg-panel text-ink hover:bg-slate-bg"
|
||||
}`}
|
||||
title="فیلترها"
|
||||
? "border-accent bg-accent-bg text-accent-dark ring-1 ring-accent/30"
|
||||
: "border-line bg-panel text-ink hover:bg-slate-50 dark:hover:bg-zinc-800",
|
||||
)}
|
||||
title="فیلترهای پیشرفته"
|
||||
>
|
||||
<SlidersHorizontal className="h-4 w-4" />
|
||||
<span>فیلتر</span>
|
||||
<span className="hidden xs:inline">فیلترها</span>
|
||||
{activeFilterCount > 0 && (
|
||||
<span className="flex h-5 w-5 items-center justify-center rounded-full bg-accent text-[11px] font-bold text-white">
|
||||
<span className="flex h-5 min-w-5 items-center justify-center rounded-full bg-accent px-1 text-[10.5px] font-bold text-white">
|
||||
{activeFilterCount}
|
||||
</span>
|
||||
)}
|
||||
</button>
|
||||
|
||||
{/* دکمه تغییر جهت سورت */}
|
||||
{/* دکمه تغییر جهت مرتب‌سازی */}
|
||||
<button
|
||||
type="button"
|
||||
onClick={onToggleSort}
|
||||
className="inline-flex h-10 w-10 shrink-0 items-center justify-center rounded-xl border border-line bg-panel text-ink shadow-sm hover:bg-slate-bg"
|
||||
title={sortDir === "desc" ? "جدیدترین اول" : "قدیمی‌ترین اول"}
|
||||
className="inline-flex h-10 w-10 shrink-0 items-center justify-center rounded-xl border border-line bg-panel text-ink shadow-2xs hover:bg-slate-50 dark:hover:bg-zinc-800 transition-colors cursor-pointer"
|
||||
title={sortDir === "desc" ? "مرتب‌سازی: جدیدترین اول" : "مرتب‌سازی: قدیمی‌ترین اول"}
|
||||
aria-label={sortDir === "desc" ? "مرتب‌سازی جدیدترین" : "مرتب‌سازی قدیمی‌ترین"}
|
||||
>
|
||||
<ArrowUpDown className="h-4 w-4 text-accent" />
|
||||
<ArrowUpDown className={cn("h-4 w-4 text-accent transition-transform", sortDir === "asc" && "rotate-180")} />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* باتم‌شیت کشویی فیلترها برای موبایل */}
|
||||
{/* ===== تب‌های اسکرول‌افقی چیپ وضعیت (Filter Chips) ===== */}
|
||||
<div className="flex items-center gap-1.5 overflow-x-auto py-0.5 no-scrollbar -mx-1 px-1 select-none">
|
||||
{STATUS_TABS.map((tab) => {
|
||||
const isActive = (!normalizedStatus && !tab.key) || normalizedStatus === tab.key;
|
||||
const count = stats && tab.countKey ? stats[tab.countKey] : null;
|
||||
|
||||
return (
|
||||
<button
|
||||
key={tab.label}
|
||||
type="button"
|
||||
onClick={() => handleStatusChange(tab.key)}
|
||||
className={cn(
|
||||
"group inline-flex h-9 shrink-0 items-center justify-center gap-1.5 rounded-xl px-3 text-xs font-semibold transition-all cursor-pointer shadow-2xs active:scale-[0.98]",
|
||||
isActive
|
||||
? "bg-accent text-white shadow-sm ring-2 ring-accent/25"
|
||||
: "border border-line bg-panel text-ink/80 hover:bg-slate-50 dark:hover:bg-zinc-800 hover:text-ink",
|
||||
)}
|
||||
>
|
||||
<span>{tab.label}</span>
|
||||
{count != null && (
|
||||
<span
|
||||
className={cn(
|
||||
"inline-flex items-center justify-center rounded-md px-1.5 py-0.5 text-[10.5px] tabular-nums font-bold leading-none transition-colors",
|
||||
isActive
|
||||
? "bg-white/20 text-white"
|
||||
: "bg-slate-100 dark:bg-zinc-800 text-muted group-hover:text-ink",
|
||||
)}
|
||||
>
|
||||
{fmtNum(count)}
|
||||
</span>
|
||||
)}
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
|
||||
{/* برچسب چیپ تأمین‌کننده در صورت فعال بودن با امکان حذف سریع */}
|
||||
{filters.supplier && (
|
||||
<span className="inline-flex h-9 shrink-0 items-center gap-1 rounded-xl border border-accent/40 bg-accent-bg px-2.5 text-xs font-semibold text-accent-dark">
|
||||
<span className="max-w-[120px] truncate">تأمین‌کننده: {filters.supplier}</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={clearSupplierFilter}
|
||||
className="rounded-full p-0.5 hover:bg-accent/20 cursor-pointer"
|
||||
title="حذف فیلتر تأمین‌کننده"
|
||||
>
|
||||
<X className="h-3 w-3" />
|
||||
</button>
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* ===== باتم‌شیت کشویی فیلترهای تکمیلی (موبایل و تبلت) ===== */}
|
||||
{isOpen && (
|
||||
<div className="fixed inset-0 z-50 flex flex-col justify-end bg-black/40 backdrop-blur-xs md:hidden">
|
||||
<div className="fixed inset-0 z-50 flex flex-col justify-end bg-black/40 backdrop-blur-xs">
|
||||
<div className="fixed inset-0" onClick={() => setIsOpen(false)} aria-hidden="true" />
|
||||
<div className="relative z-10 max-h-[85vh] w-full overflow-y-auto rounded-t-2xl border-t border-line bg-panel p-4 shadow-2xl">
|
||||
<div className="relative z-10 max-h-[85vh] w-full max-w-lg mx-auto overflow-y-auto rounded-t-2xl border-t border-line bg-panel p-4 sm:p-5 shadow-2xl">
|
||||
{/* هدر کشو */}
|
||||
<div className="mb-4 flex items-center justify-between border-b border-line pb-3">
|
||||
<div className="flex items-center gap-2">
|
||||
<SlidersHorizontal className="h-4 w-4 text-accent" />
|
||||
<span className="text-sm font-bold text-ink">فیلترهای پیشرفته</span>
|
||||
<span className="text-sm font-bold text-ink">فیلترهای تکمیلی</span>
|
||||
</div>
|
||||
<div className="flex items-center gap-3">
|
||||
{activeFilterCount > 0 && (
|
||||
{(filters.supplier || filters.status || filters.search) && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={clearFilters}
|
||||
className="inline-flex items-center gap-1 text-xs text-rose-500 hover:underline"
|
||||
onClick={clearAllFilters}
|
||||
className="inline-flex items-center gap-1 text-xs text-rose-600 dark:text-rose-400 font-semibold hover:underline cursor-pointer"
|
||||
>
|
||||
<RotateCcw className="h-3 w-3" />
|
||||
پاک کردن
|
||||
<RotateCcw className="h-3.5 w-3.5" />
|
||||
پاک کردن همه
|
||||
</button>
|
||||
)}
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setIsOpen(false)}
|
||||
className="rounded-lg p-1 text-muted hover:bg-slate-bg hover:text-ink"
|
||||
className="rounded-lg p-1 text-muted hover:bg-slate-50 dark:hover:bg-zinc-800 hover:text-ink cursor-pointer"
|
||||
aria-label="بستن"
|
||||
>
|
||||
<X className="h-5 w-5" />
|
||||
@@ -149,9 +238,9 @@ export function FilterToolbar({
|
||||
</div>
|
||||
|
||||
{/* دراپ‌داون‌ها داخل کشو */}
|
||||
<div className="flex flex-col gap-3.5">
|
||||
<div className="flex flex-col gap-4">
|
||||
<div className="field">
|
||||
<label className="mb-1 block text-xs font-semibold text-muted">تأمین‌کننده</label>
|
||||
<label className="mb-1.5 block text-xs font-bold text-ink">تأمین‌کننده</label>
|
||||
<Combobox
|
||||
value={filters.supplier}
|
||||
onChange={(it: { id: string; label: string }) => set({ supplier: it.label })}
|
||||
@@ -163,7 +252,7 @@ export function FilterToolbar({
|
||||
</div>
|
||||
|
||||
<div className="field">
|
||||
<label className="mb-1 block text-xs font-semibold text-muted">وضعیت</label>
|
||||
<label className="mb-1.5 block text-xs font-bold text-ink">وضعیت</label>
|
||||
<Combobox
|
||||
value={statusDisplayValue}
|
||||
onChange={(it: { id: string; label: string }) => handleStatusChange(it.label)}
|
||||
@@ -179,61 +268,13 @@ export function FilterToolbar({
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setIsOpen(false)}
|
||||
className="mt-5 flex h-11 w-full items-center justify-center rounded-xl bg-accent text-sm font-bold text-white shadow-md shadow-accent/20 active:scale-[0.99]"
|
||||
className="mt-6 flex h-11 w-full items-center justify-center rounded-xl bg-accent text-sm font-bold text-white shadow-md shadow-accent/20 active:scale-[0.99] transition-transform cursor-pointer"
|
||||
>
|
||||
مشاهده نتایج
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* ===== نمای دسکتاپ (md به بالا) ===== */}
|
||||
<div className="hidden md:flex flex-wrap items-end gap-3">
|
||||
<div className="field min-w-[170px] flex-1">
|
||||
<label>تأمین‌کننده</label>
|
||||
<Combobox
|
||||
value={filters.supplier}
|
||||
onChange={(it: { id: string; label: string }) => set({ supplier: it.label })}
|
||||
items={suppliers}
|
||||
allowAdd={false}
|
||||
placeholder="همه"
|
||||
onInputChange={(v) => set({ supplier: v })}
|
||||
/>
|
||||
</div>
|
||||
<div className="field min-w-[150px] flex-1">
|
||||
<label>وضعیت</label>
|
||||
<Combobox
|
||||
value={statusDisplayValue}
|
||||
onChange={(it: { id: string; label: string }) => handleStatusChange(it.label)}
|
||||
items={STATUS_OPTIONS}
|
||||
allowAdd={false}
|
||||
placeholder="همه"
|
||||
onInputChange={handleStatusChange}
|
||||
/>
|
||||
</div>
|
||||
<div className="field min-w-[200px] flex-1">
|
||||
<label>جستجو</label>
|
||||
<input
|
||||
type="search"
|
||||
className="h-9 w-full rounded-lg border border-line bg-panel px-3 py-1 text-sm shadow-sm placeholder:text-muted focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent/40"
|
||||
placeholder="جستجو در نام/برند/پروژه..."
|
||||
value={filters.search}
|
||||
onChange={(e) => set({ search: e.target.value })}
|
||||
/>
|
||||
</div>
|
||||
<div className="field min-w-[140px]">
|
||||
<label>ترتیب</label>
|
||||
<button
|
||||
type="button"
|
||||
className="inline-flex h-9 w-full items-center justify-center gap-1.5 rounded-lg border border-line bg-panel px-3 text-sm shadow-sm hover:bg-slate-bg"
|
||||
onClick={onToggleSort}
|
||||
title={sortDir === "desc" ? "تغییر به قدیمی‌ترین اول" : "تغییر به جدیدترین اول"}
|
||||
>
|
||||
<span aria-hidden className="text-accent">⇅</span>
|
||||
<span>{sortDir === "desc" ? "جدیدترین اول" : "قدیمی‌ترین اول"}</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,19 +1,29 @@
|
||||
import { Link } from "react-router-dom";
|
||||
import { AlarmClock, ChevronDown, Pencil, TriangleAlert, Building2, Package, CreditCard, Check } from "lucide-react";
|
||||
import {
|
||||
Building2,
|
||||
Boxes,
|
||||
Calendar,
|
||||
Hash,
|
||||
CreditCard,
|
||||
ChevronDown,
|
||||
Pencil,
|
||||
Package,
|
||||
TriangleAlert,
|
||||
AlarmClock,
|
||||
} from "lucide-react";
|
||||
import type { Quote, Store } from "../../lib/types";
|
||||
import {
|
||||
isExpired,
|
||||
materialById,
|
||||
materialLabel,
|
||||
formatMaterialTitle,
|
||||
projectCell,
|
||||
quoteTotal,
|
||||
supplierById,
|
||||
termsheetSummary,
|
||||
unitWarning,
|
||||
} from "../../lib/quoteUtils";
|
||||
import { STATUS_LABEL } from "../../lib/constants";
|
||||
import { esc, fmtDate, fmtDateTime, fmtNum, priceCell } from "../../lib/formatters";
|
||||
import { Badge } from "../../components/ui/badge";
|
||||
import { topicByName } from "../../lib/topics";
|
||||
import { fmtDate, fmtNum } from "../../lib/formatters";
|
||||
import { groupCommas } from "../../lib/numutil";
|
||||
import { cn } from "../../lib/utils";
|
||||
import { QuoteDetail } from "./QuoteDetail";
|
||||
|
||||
@@ -27,318 +37,270 @@ export interface QuoteCardProps {
|
||||
canWrite?: boolean;
|
||||
}
|
||||
|
||||
function InfoCell({ label, children, className }: { label: string; children: React.ReactNode; className?: string }) {
|
||||
return (
|
||||
<div className={cn("min-w-0", className)}>
|
||||
<div className="mb-0.5 text-[10px] font-semibold text-muted sm:text-[10.5px]">{label}</div>
|
||||
<div className="min-w-0 text-xs leading-5 text-ink sm:text-[13px] sm:leading-6">{children}</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export function QuoteCard({ store, q, expanded, onToggleExpand, onAccept, onEdit, canWrite = true }: QuoteCardProps) {
|
||||
export function QuoteCard({
|
||||
store,
|
||||
q,
|
||||
expanded,
|
||||
onToggleExpand,
|
||||
onAccept,
|
||||
onEdit,
|
||||
canWrite = true,
|
||||
}: QuoteCardProps) {
|
||||
const sup = supplierById(store.suppliers, q.supplier_id);
|
||||
const expired = isExpired(q);
|
||||
const total = quoteTotal(q);
|
||||
const pc = priceCell(total);
|
||||
const ts = termsheetSummary(store, q);
|
||||
const unitWarns = unitWarning(store, q);
|
||||
|
||||
// ستون / دکمه پذیرش
|
||||
let acceptedCell: React.ReactNode;
|
||||
if (q.status === "offered") {
|
||||
acceptedCell = canWrite ? (
|
||||
<button
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
onAccept();
|
||||
}}
|
||||
className="inline-flex h-7 items-center justify-center gap-1 rounded-md bg-emerald-600 px-2.5 text-xs font-bold text-white shadow-xs active:scale-95 transition-transform"
|
||||
>
|
||||
<Check className="h-3.5 w-3.5" />
|
||||
<span>پذیرش</span>
|
||||
</button>
|
||||
) : (
|
||||
<span className="text-muted text-xs font-medium">در انتظار پذیرش</span>
|
||||
);
|
||||
} else if (q.accepted_date) {
|
||||
acceptedCell = <span className="tabular-nums font-medium">{fmtDateTime(q.accepted_date)}</span>;
|
||||
} else {
|
||||
acceptedCell = <span className="text-muted">—</span>;
|
||||
}
|
||||
|
||||
// وضعیت رسید کالا
|
||||
const activeItems = (q.line_items || []).filter((li) => !li.rejected);
|
||||
const receivedSum = activeItems.reduce((s, li) => s + (li.received_qty || 0), 0);
|
||||
const orderedSum = activeItems.reduce((s, li) => s + (li.quantity || 0), 0);
|
||||
const fulfilledItems = activeItems.filter(
|
||||
(li) => li.quantity != null && li.quantity > 0 && (li.received_qty || 0) >= li.quantity,
|
||||
).length;
|
||||
const anyReceived = receivedSum > 0;
|
||||
const fullyDelivered = activeItems.length > 0 && fulfilledItems === activeItems.length && anyReceived;
|
||||
const primaryLineItem = activeItems[0];
|
||||
const primaryMaterial = primaryLineItem
|
||||
? materialById(store.materials, primaryLineItem.material_id)
|
||||
: null;
|
||||
|
||||
// نشان پیشرفت تکمیل
|
||||
let fulfillmentBadge: React.ReactNode = null;
|
||||
if (q.status === "accepted" || q.status === "arrived") {
|
||||
if (fullyDelivered || q.status === "arrived") {
|
||||
fulfillmentBadge = (
|
||||
<span className="inline-flex items-center gap-1 rounded-full border border-emerald-200 bg-emerald-50 px-2 py-0.5 text-[10.5px] font-bold text-emerald-700 sm:text-[11px]">
|
||||
✓ تکمیل
|
||||
</span>
|
||||
);
|
||||
} else if (anyReceived) {
|
||||
fulfillmentBadge = (
|
||||
<span className="inline-flex items-center gap-1 rounded-full border border-amber-200 bg-amber-50 px-2 py-0.5 text-[10.5px] font-bold text-amber-700 sm:text-[11px]">
|
||||
رسید: {fmtNum(fulfilledItems)}/{fmtNum(activeItems.length)}
|
||||
</span>
|
||||
);
|
||||
} else {
|
||||
fulfillmentBadge = (
|
||||
<span className="inline-flex items-center gap-1 rounded-full border border-blue-200 bg-blue-50 px-2 py-0.5 text-[10.5px] font-bold text-blue-700 sm:text-[11px]">
|
||||
⏳ در راه
|
||||
</span>
|
||||
);
|
||||
}
|
||||
// عنوان اصلی کالا / متریال
|
||||
let itemTitle = "پیشنهاد بدون قلم";
|
||||
if (activeItems.length === 1 && primaryMaterial) {
|
||||
itemTitle = formatMaterialTitle(primaryMaterial);
|
||||
} else if (activeItems.length > 1 && primaryMaterial) {
|
||||
itemTitle = `${formatMaterialTitle(primaryMaterial)} (+${fmtNum(activeItems.length - 1)} قلم دیگر)`;
|
||||
}
|
||||
|
||||
let arrivedCell: React.ReactNode;
|
||||
const lastReceiptAt = activeItems.reduce<Date | null>((acc, li) => {
|
||||
if (!li.arrived_date) return acc;
|
||||
const t = new Date(li.arrived_date).getTime();
|
||||
if (Number.isNaN(t)) return acc;
|
||||
return !acc || t > acc.getTime() ? new Date(li.arrived_date) : acc;
|
||||
}, null);
|
||||
// آیکون دسته‌بندی
|
||||
const topicName = primaryMaterial?.topic || sup.topic;
|
||||
const topic = topicByName(topicName, store.topics);
|
||||
const categoryIcon = topic?.icon;
|
||||
|
||||
if (q.status === "accepted") {
|
||||
if (q.arrived_date) {
|
||||
arrivedCell = <span className="tabular-nums">{fmtDateTime(q.arrived_date)}</span>;
|
||||
} else if (receivedSum > 0) {
|
||||
arrivedCell = (
|
||||
<span className="tabular-nums">
|
||||
{fmtNum(receivedSum)} از {fmtNum(orderedSum)}
|
||||
</span>
|
||||
);
|
||||
} else {
|
||||
arrivedCell = <span className="text-muted">در انتظار انبار</span>;
|
||||
}
|
||||
// محاسبه مجموع مقدار و واحدها
|
||||
let quantityDisplay = "—";
|
||||
if (activeItems.length === 1 && primaryLineItem) {
|
||||
quantityDisplay =
|
||||
primaryLineItem.quantity != null
|
||||
? `${fmtNum(primaryLineItem.quantity)} ${primaryLineItem.unit || ""}`
|
||||
: "—";
|
||||
} else if (activeItems.length > 1) {
|
||||
const totalQty = activeItems.reduce((acc, li) => acc + (li.quantity || 0), 0);
|
||||
const uniqueUnits = [...new Set(activeItems.map((li) => li.unit).filter(Boolean))].join("، ");
|
||||
quantityDisplay = `${fmtNum(totalQty)} ${uniqueUnits || "واحد"} (${fmtNum(activeItems.length)} قلم)`;
|
||||
}
|
||||
|
||||
// نام پروژه
|
||||
const projectName =
|
||||
q.projects && q.projects.length > 0 ? q.projects.join("، ") : projectCell(q);
|
||||
|
||||
// بج وضعیت با کدگذاری رنگی معنایی (Semantic Color Coding)
|
||||
let statusBadge: React.ReactNode;
|
||||
if (expired) {
|
||||
statusBadge = (
|
||||
<span className="inline-flex items-center gap-1 rounded-full border border-amber-300 bg-amber-50 dark:bg-amber-950/40 px-2 py-0.5 text-[11px] font-bold text-amber-700 dark:text-amber-400">
|
||||
<AlarmClock className="h-3 w-3 shrink-0" />
|
||||
منقضی شده
|
||||
</span>
|
||||
);
|
||||
} else if (q.status === "arrived") {
|
||||
arrivedCell = (
|
||||
<span className="tabular-nums">
|
||||
{fmtDateTime(q.arrived_date || (lastReceiptAt ? lastReceiptAt.toISOString() : ""))}
|
||||
statusBadge = (
|
||||
<span className="inline-flex items-center gap-1 rounded-full border border-emerald-200 dark:border-emerald-800 bg-emerald-50 dark:bg-emerald-950/40 px-2.5 py-0.5 text-[11px] font-bold text-emerald-700 dark:text-emerald-300">
|
||||
✓ تکمیل شده
|
||||
</span>
|
||||
);
|
||||
} else if (q.status === "accepted") {
|
||||
const fulfilledItems = activeItems.filter(
|
||||
(li) => li.quantity != null && li.quantity > 0 && (li.received_qty || 0) >= li.quantity,
|
||||
).length;
|
||||
const anyReceived = activeItems.some((li) => (li.received_qty || 0) > 0);
|
||||
|
||||
statusBadge = (
|
||||
<span className="inline-flex items-center gap-1 rounded-full border border-blue-200 dark:border-blue-800 bg-blue-50 dark:bg-blue-950/40 px-2.5 py-0.5 text-[11px] font-bold text-blue-700 dark:text-blue-300">
|
||||
{anyReceived ? `در حال خرید (${fmtNum(fulfilledItems)}/${fmtNum(activeItems.length)})` : "در حال خرید"}
|
||||
</span>
|
||||
);
|
||||
} else if (q.status === "rejected") {
|
||||
statusBadge = (
|
||||
<span className="inline-flex items-center gap-1 rounded-full border border-rose-200 dark:border-rose-800 bg-rose-50 dark:bg-rose-950/40 px-2.5 py-0.5 text-[11px] font-bold text-rose-700 dark:text-rose-300">
|
||||
رد شده
|
||||
</span>
|
||||
);
|
||||
} else {
|
||||
arrivedCell = <span className="text-muted">—</span>;
|
||||
// offered / پیش‌فرض در انتظار تایید
|
||||
statusBadge = (
|
||||
<span className="inline-flex items-center gap-1 rounded-full border border-amber-200 dark:border-amber-800 bg-amber-50 dark:bg-amber-950/40 px-2.5 py-0.5 text-[11px] font-bold text-amber-700 dark:text-amber-300">
|
||||
در انتظار تایید
|
||||
</span>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div
|
||||
className={cn(
|
||||
"overflow-hidden rounded-xl border bg-panel transition-colors shadow-2xs sm:rounded-lg",
|
||||
expired ? "border-amber/40" : "border-line hover:border-accent/40",
|
||||
expanded && "border-accent/60 ring-1 ring-accent/20",
|
||||
"overflow-hidden rounded-2xl border bg-panel transition-all shadow-2xs",
|
||||
expired ? "border-amber-300/80 bg-amber-50/10" : "border-line hover:border-accent/40",
|
||||
expanded && "border-accent/60 ring-2 ring-accent/15 shadow-sm",
|
||||
)}
|
||||
>
|
||||
{/* سربرگ کارت — با کلیک روی فضای خالی اکسپند می‌شود */}
|
||||
<div
|
||||
onClick={onToggleExpand}
|
||||
className="flex cursor-pointer items-center gap-2.5 border-b border-line bg-bg/40 px-3 py-2 sm:gap-3 sm:px-4 sm:py-2.5 select-none"
|
||||
>
|
||||
<span className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg bg-accent-bg text-xs font-bold text-accent-dark sm:h-9 sm:w-9 sm:text-sm">
|
||||
{sup.name.slice(0, 1)}
|
||||
</span>
|
||||
|
||||
<div className="min-w-0 flex-1">
|
||||
{/* خط ۱: فقط خود اسم تأمین‌کننده لینک است */}
|
||||
<div className="flex items-center">
|
||||
<Link
|
||||
to={`/suppliers/${q.supplier_id}`}
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
className="inline-block max-w-full truncate text-xs font-bold text-ink no-underline hover:text-accent hover:underline sm:text-[13.5px]"
|
||||
>
|
||||
{sup.name}
|
||||
</Link>
|
||||
{/* ===== سربرگ کارت (Header: راست عنوان و آیکون / چپ وضعیت) ===== */}
|
||||
<div className="flex items-start justify-between gap-3 border-b border-line/70 bg-slate-50/50 dark:bg-zinc-800/30 p-3.5 sm:p-4">
|
||||
{/* بخش راست (RTL): آیکون دسته‌بندی + نام کالا + تأمین‌کننده */}
|
||||
<div className="flex items-start gap-2.5 min-w-0 flex-1">
|
||||
<div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-xl bg-accent-bg text-accent-dark overflow-hidden shadow-2xs border border-accent/20">
|
||||
{categoryIcon ? (
|
||||
<img src={categoryIcon} alt="" className="h-6 w-6 object-contain" loading="lazy" />
|
||||
) : (
|
||||
<Package className="h-5 w-5 text-accent" />
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* خط ۲: موقعیت مکانی و برچسب هشدار فاکتور رسمی */}
|
||||
<div className="mt-0.5 flex min-w-0 items-center gap-1.5">
|
||||
{sup.location && (
|
||||
<span className="truncate text-[10px] text-muted sm:text-[11px]">
|
||||
{sup.location}
|
||||
</span>
|
||||
)}
|
||||
<div className="min-w-0 flex-1">
|
||||
<h3
|
||||
className="truncate text-sm sm:text-[15px] font-bold text-ink leading-tight"
|
||||
title={itemTitle}
|
||||
>
|
||||
{itemTitle}
|
||||
</h3>
|
||||
|
||||
{q.is_official && (
|
||||
<span
|
||||
className="inline-flex shrink-0 items-center gap-1 rounded bg-rose-500/10 px-1.5 py-0.5 text-[9.5px] font-bold text-rose-600 dark:text-rose-400 border border-rose-500/25 select-none"
|
||||
title="فاکتور رسمی (مشمول ارزش افزوده و مالیات)"
|
||||
{/* ساب‌تایتل: نام تأمین‌کننده، موقعیت و فاکتور رسمی */}
|
||||
<div className="mt-1 flex flex-wrap items-center gap-1.5 text-[11px] text-muted">
|
||||
<Link
|
||||
to={`/suppliers/${q.supplier_id}`}
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
className="font-semibold text-muted hover:text-accent truncate no-underline hover:underline transition-colors"
|
||||
>
|
||||
<TriangleAlert className="h-2.5 w-2.5 shrink-0 stroke-[2.2] text-rose-500 dark:text-rose-400" />
|
||||
<span>فاکتور رسمی</span>
|
||||
</span>
|
||||
)}
|
||||
🏢 {sup.name}
|
||||
</Link>
|
||||
|
||||
{sup.location && <span className="text-muted/60">· {sup.location}</span>}
|
||||
|
||||
{q.is_official && (
|
||||
<span
|
||||
className="inline-flex items-center gap-0.5 rounded px-1.5 py-0.2 text-[9.5px] font-bold bg-rose-500/10 text-rose-600 dark:text-rose-400 border border-rose-500/25 select-none"
|
||||
title="فاکتور رسمی (مشمول ارزش افزوده و مالیات)"
|
||||
>
|
||||
<TriangleAlert className="h-2.5 w-2.5 shrink-0" />
|
||||
فاکتور رسمی
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="ms-auto flex shrink-0 items-center gap-1.5">
|
||||
{fulfillmentBadge ?? (
|
||||
<Badge variant={q.status as "offered" | "accepted" | "arrived"} className="text-[10px] sm:text-xs">
|
||||
{STATUS_LABEL[q.status]}
|
||||
</Badge>
|
||||
)}
|
||||
{/* بخش چپ: بج وضعیت */}
|
||||
<div className="shrink-0 pt-0.5">{statusBadge}</div>
|
||||
</div>
|
||||
|
||||
{/* دکمه ویرایش */}
|
||||
{canWrite && (
|
||||
<button
|
||||
type="button"
|
||||
className="inline-flex h-7 items-center justify-center gap-1 rounded-md border border-line bg-panel px-2 text-xs font-medium text-ink hover:bg-slate-50 dark:hover:bg-zinc-800 transition-colors sm:h-8 sm:px-2.5"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
onEdit();
|
||||
}}
|
||||
title="ویرایش پیشنهاد"
|
||||
aria-label="ویرایش"
|
||||
>
|
||||
<Pencil className="h-3 w-3 text-muted" />
|
||||
<span className="hidden sm:inline">ویرایش</span>
|
||||
</button>
|
||||
)}
|
||||
{/* ===== بدنه کارت (Body: گرید دو ستونه فشرده متادیتا) ===== */}
|
||||
<div className="p-3.5 sm:p-4 flex flex-col gap-2.5">
|
||||
<div className="grid grid-cols-2 gap-2 sm:gap-2.5">
|
||||
{/* ۱. پروژه */}
|
||||
<div className="flex items-center gap-2 min-w-0 rounded-xl bg-slate-50/70 dark:bg-zinc-800/40 border border-line/50 p-2 sm:p-2.5">
|
||||
<Building2 className="h-4 w-4 shrink-0 text-muted" />
|
||||
<div className="min-w-0 flex-1">
|
||||
<span className="block text-[10px] font-medium text-muted">پروژه</span>
|
||||
<span className="block truncate text-xs font-bold text-ink" title={projectName}>
|
||||
{projectName}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* دکمه فلش اکسپند در هدر */}
|
||||
{/* ۲. مقدار */}
|
||||
<div className="flex items-center gap-2 min-w-0 rounded-xl bg-slate-50/70 dark:bg-zinc-800/40 border border-line/50 p-2 sm:p-2.5">
|
||||
<Boxes className="h-4 w-4 shrink-0 text-muted" />
|
||||
<div className="min-w-0 flex-1">
|
||||
<span className="block text-[10px] font-medium text-muted">مقدار</span>
|
||||
<span className="block truncate text-xs font-bold text-ink tabular-nums" title={quantityDisplay}>
|
||||
{quantityDisplay}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* ۳. تاریخ */}
|
||||
<div className="flex items-center gap-2 min-w-0 rounded-xl bg-slate-50/70 dark:bg-zinc-800/40 border border-line/50 p-2 sm:p-2.5">
|
||||
<Calendar className="h-4 w-4 shrink-0 text-muted" />
|
||||
<div className="min-w-0 flex-1">
|
||||
<span className="block text-[10px] font-medium text-muted">تاریخ درخواست</span>
|
||||
<span className="block truncate text-xs font-bold text-ink tabular-nums">
|
||||
{fmtDate(q.quote_date)}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* ۴. کد پیگیری */}
|
||||
<div className="flex items-start gap-2 min-w-0 rounded-xl bg-slate-50/70 dark:bg-zinc-800/40 border border-line/50 p-2 sm:p-2.5">
|
||||
<Hash className="h-4 w-4 shrink-0 text-muted mt-0.5" />
|
||||
<div className="min-w-0 flex-1">
|
||||
<span className="block text-[10px] font-medium text-muted">کد پیگیری</span>
|
||||
<span className="block font-mono font-bold text-[11px] sm:text-xs text-ink break-all select-all leading-tight">
|
||||
{q.id.startsWith("PR-") ? q.id : `PR-${q.id}`}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* سطر قیمت و شرایط پرداخت (در صورت وجود) */}
|
||||
{total > 0 && (
|
||||
<div className="flex flex-wrap items-center justify-between gap-2 rounded-xl bg-accent-bg/40 dark:bg-accent-bg/10 border border-accent/15 px-3 py-2 text-xs">
|
||||
<div className="flex items-center gap-1.5">
|
||||
<CreditCard className="h-3.5 w-3.5 text-accent" />
|
||||
<span className="text-[11px] text-muted">مبلغ کل:</span>
|
||||
<span className="text-xs sm:text-sm font-extrabold text-ink tabular-nums">
|
||||
{groupCommas(total, true)} تومان
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{ts.title !== "—" && (
|
||||
<span className="text-[11px] font-medium text-muted truncate">
|
||||
شرایط: {ts.title} {ts.sub ? `(${ts.sub})` : ""}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* ===== فوتر کارت (Footer: اکشن‌های استاندارد با تاچ تارگت حداقل ۴۰px) ===== */}
|
||||
<div className="flex items-center justify-between gap-2 border-t border-line/70 bg-slate-50/40 dark:bg-zinc-800/20 px-3.5 py-2.5 sm:px-4">
|
||||
{/* دکمه اصلی مشاهده / بستن جزئیات */}
|
||||
<button
|
||||
type="button"
|
||||
onClick={onToggleExpand}
|
||||
className="min-h-[40px] h-10 flex-1 inline-flex items-center justify-center gap-1.5 rounded-xl border border-line bg-panel hover:bg-slate-50 dark:hover:bg-zinc-800 text-xs font-bold text-ink px-4 transition-all shadow-2xs cursor-pointer select-none active:scale-[0.99]"
|
||||
>
|
||||
<span>{expanded ? "بستن جزئیات" : "مشاهده جزئیات"}</span>
|
||||
<ChevronDown
|
||||
className={cn("h-4 w-4 transition-transform text-muted duration-200", expanded && "rotate-180 text-accent")}
|
||||
/>
|
||||
</button>
|
||||
|
||||
{/* دکمه‌های عملیاتی برای کاربران دارای دسترسی نوشتن */}
|
||||
{canWrite && q.status === "offered" && (
|
||||
<button
|
||||
type="button"
|
||||
className={cn(
|
||||
"inline-flex h-7 w-7 items-center justify-center rounded-md border border-line bg-panel text-ink transition-colors hover:bg-slate-50 dark:hover:bg-zinc-800 sm:h-8 sm:w-8",
|
||||
expanded && "bg-accent-bg text-accent-dark border-accent/40",
|
||||
)}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
onToggleExpand();
|
||||
onAccept();
|
||||
}}
|
||||
title={expanded ? "جمع کردن توضیحات" : "نمایش توضیحات و جزئیات"}
|
||||
aria-expanded={expanded}
|
||||
className="min-h-[40px] h-10 inline-flex items-center justify-center gap-1.5 rounded-xl bg-emerald-600 hover:bg-emerald-700 active:bg-emerald-800 text-white text-xs font-bold px-3.5 shadow-xs transition-all cursor-pointer active:scale-95 shrink-0"
|
||||
>
|
||||
<ChevronDown className={cn("h-4 w-4 transition-transform duration-200", expanded && "rotate-180")} />
|
||||
<span>پذیرش پیشنهاد</span>
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{canWrite && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
onEdit();
|
||||
}}
|
||||
className="min-h-[40px] h-10 inline-flex items-center justify-center gap-1 rounded-xl border border-line bg-panel hover:bg-slate-50 dark:hover:bg-zinc-800 text-xs font-semibold text-muted hover:text-ink px-3 transition-colors cursor-pointer shrink-0"
|
||||
title="ویرایش پیشنهاد"
|
||||
aria-label="ویرایش"
|
||||
>
|
||||
<Pencil className="h-3.5 w-3.5" />
|
||||
<span className="hidden sm:inline">ویرایش</span>
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* اطلاعات کلیدی — لمس این بخش هم کارت را اکسپند می‌کند */}
|
||||
<div
|
||||
onClick={onToggleExpand}
|
||||
className="cursor-pointer grid grid-cols-2 gap-x-3 gap-y-3 p-3 select-none sm:gap-x-5 sm:gap-y-3.5 sm:p-4 md:grid-cols-4"
|
||||
>
|
||||
{/* ۱. پروژه */}
|
||||
<InfoCell label="پروژه" className="col-span-2 md:col-span-1">
|
||||
<div className="flex items-center gap-1.5 text-xs font-semibold text-ink sm:text-[13px]">
|
||||
<Building2 className="h-3.5 w-3.5 shrink-0 text-muted" />
|
||||
<span className="truncate">
|
||||
{q.projects && q.projects.length > 0 ? q.projects.join("، ") : projectCell(q)}
|
||||
</span>
|
||||
</div>
|
||||
</InfoCell>
|
||||
|
||||
{/* ۲. اقلام */}
|
||||
<InfoCell label="اقلام" className="col-span-2 md:col-span-1">
|
||||
<div className="flex flex-col gap-1 text-xs font-medium leading-5 text-ink sm:text-[13px]">
|
||||
{activeItems.length > 0 ? (
|
||||
activeItems.map((li) => {
|
||||
const m = materialById(store.materials, li.material_id);
|
||||
return (
|
||||
<span key={li.id} className="break-words">
|
||||
{materialLabel(m)}
|
||||
</span>
|
||||
);
|
||||
})
|
||||
) : (
|
||||
<span>—</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{unitWarns.map((w) => (
|
||||
<Link
|
||||
key={w.unit}
|
||||
to={`/units?cat=${encodeURIComponent(w.cat)}&unit=${encodeURIComponent(w.unit)}`}
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
className="unit-warn mt-1 inline-flex items-center gap-1 text-[10px]"
|
||||
title={`ضریب تبدیل «${esc(w.unit)}» را در داشبورد واحدها ثبت کنید`}
|
||||
>
|
||||
<TriangleAlert className="h-2.5 w-2.5 shrink-0" />
|
||||
واحد جدید: {w.unit}
|
||||
</Link>
|
||||
))}
|
||||
</InfoCell>
|
||||
|
||||
{/* ۳. مجموع مبلغ */}
|
||||
<InfoCell label="مجموع مبلغ" className="col-span-1">
|
||||
{pc ? (
|
||||
<div>
|
||||
<div className="text-sm font-extrabold tabular-nums text-ink sm:text-base">
|
||||
{pc.num} <span className="text-[10px] font-normal text-muted sm:text-xs">تومان</span>
|
||||
</div>
|
||||
<div className="hidden text-[11px] text-muted sm:block">({pc.words})</div>
|
||||
</div>
|
||||
) : (
|
||||
"—"
|
||||
)}
|
||||
</InfoCell>
|
||||
|
||||
{/* ۴. شرایط معامله */}
|
||||
<InfoCell label="شرایط معامله" className="col-span-1">
|
||||
{ts.title !== "—" ? (
|
||||
<div>
|
||||
<div className="text-xs font-semibold sm:text-[13px]" style={ts.color ? { color: ts.color } : undefined}>
|
||||
{ts.title}
|
||||
</div>
|
||||
{ts.sub && <div className="truncate text-[10px] text-muted sm:text-[11px]">{ts.sub}</div>}
|
||||
</div>
|
||||
) : (
|
||||
<span className="text-muted">—</span>
|
||||
)}
|
||||
</InfoCell>
|
||||
</div>
|
||||
|
||||
{/* تاریخ‌ها و اکشن‌ها */}
|
||||
<div className="grid grid-cols-2 gap-2 border-t border-line bg-bg/40 p-2.5 text-[11px] text-muted sm:flex sm:flex-wrap sm:items-center sm:gap-x-5 sm:gap-y-2 sm:px-4 sm:py-2 sm:text-[11.5px]">
|
||||
<span className="inline-flex items-center gap-1.5 truncate">
|
||||
<Package className="h-3 w-3 shrink-0" />
|
||||
<span>تاریخ:</span>
|
||||
<b className="tabular-nums text-ink">{fmtDate(q.quote_date)}</b>
|
||||
</span>
|
||||
|
||||
<span className="inline-flex items-center gap-1.5 truncate">
|
||||
<CreditCard className="h-3 w-3 shrink-0" />
|
||||
<span>اعتبار:</span>
|
||||
<b className={cn("tabular-nums", expired ? "text-amber" : "text-ink")}>
|
||||
{fmtDate(q.expiry_date)}
|
||||
</b>
|
||||
{expired && <AlarmClock className="h-3 w-3 shrink-0 text-amber" aria-label="منقضی" />}
|
||||
</span>
|
||||
|
||||
<span className="inline-flex items-center gap-1.5">
|
||||
<span>پذیرش:</span>
|
||||
{acceptedCell}
|
||||
</span>
|
||||
|
||||
<span className="inline-flex items-center gap-1.5 truncate">
|
||||
<span>رسید:</span>
|
||||
{arrivedCell}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{/* دکمه تمام‌عرض توضیحات بیشتر */}
|
||||
<button
|
||||
type="button"
|
||||
onClick={onToggleExpand}
|
||||
className="flex w-full items-center justify-center gap-1.5 border-t border-line bg-bg/20 py-2 text-xs font-semibold text-muted hover:text-accent hover:bg-bg/50 transition-colors select-none"
|
||||
>
|
||||
<span>{expanded ? "بستن توضیحات و جزئیات" : "توضیحات بیشتر و جزئیات پیشنهاد"}</span>
|
||||
<ChevronDown className={cn("h-3.5 w-3.5 transition-transform duration-200", expanded && "rotate-180 text-accent")} />
|
||||
</button>
|
||||
|
||||
{/* جزئیات تکمیلی بازشونده — کلیک داخل آن مانع بسته شدن ناخواسته می‌شود */}
|
||||
{/* ===== بخش جزئیات بازشونده (Expanded Detail) ===== */}
|
||||
{expanded && (
|
||||
<div onClick={(e) => e.stopPropagation()}>
|
||||
<div className="border-t border-line" onClick={(e) => e.stopPropagation()}>
|
||||
<QuoteDetail store={store} q={q} />
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -1,5 +1,16 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { Package, CreditCard, CalendarDays, Paperclip, Building2, Ban } from "lucide-react";
|
||||
import {
|
||||
Package,
|
||||
CreditCard,
|
||||
CalendarDays,
|
||||
Paperclip,
|
||||
Building2,
|
||||
Ban,
|
||||
Hash,
|
||||
Copy,
|
||||
Check,
|
||||
} from "lucide-react";
|
||||
import { toast } from "sonner";
|
||||
import type { Attachment, Quote, Store } from "../../lib/types";
|
||||
import { api } from "../../lib/api";
|
||||
import {
|
||||
@@ -13,6 +24,7 @@ import { groupCommas } from "../../lib/numutil";
|
||||
import { FlowDiagram, type FlowRefs } from "./FlowDiagram";
|
||||
import { itemProjects } from "../../lib/quoteUtils";
|
||||
import { FilePreviewModal, useFilePreview } from "../../components/FilePreviewModal";
|
||||
import { cn } from "../../lib/utils";
|
||||
|
||||
export interface QuoteDetailProps {
|
||||
store: Store;
|
||||
@@ -24,6 +36,31 @@ export function QuoteDetail({ store, q }: QuoteDetailProps) {
|
||||
const [flowEl, setFlowEl] = useState<HTMLDivElement | null>(null);
|
||||
const [flowRefs] = useState<FlowRefs>(() => ({ items: new Map(), termsheets: new Map() }));
|
||||
const [bump, setBump] = useState(0);
|
||||
const [copied, setCopied] = useState(false);
|
||||
|
||||
const trackingCode = q.id.startsWith("PR-") ? q.id : `PR-${q.id}`;
|
||||
|
||||
const handleCopyCode = async () => {
|
||||
try {
|
||||
if (navigator.clipboard && navigator.clipboard.writeText) {
|
||||
await navigator.clipboard.writeText(trackingCode);
|
||||
} else {
|
||||
const ta = document.createElement("textarea");
|
||||
ta.value = trackingCode;
|
||||
ta.style.position = "fixed";
|
||||
ta.style.opacity = "0";
|
||||
document.body.appendChild(ta);
|
||||
ta.select();
|
||||
document.execCommand("copy");
|
||||
document.body.removeChild(ta);
|
||||
}
|
||||
setCopied(true);
|
||||
toast.success("کد پیگیری با موفقیت کپی شد");
|
||||
setTimeout(() => setCopied(false), 2000);
|
||||
} catch {
|
||||
toast.error("کپی کد پیگیری با خطا مواجه شد");
|
||||
}
|
||||
};
|
||||
|
||||
// پیش‌نمایش پیوست‌ها: کلیک روی نام فایل، فایل را نشان می‌دهد (نه دانلود).
|
||||
// بایت‌ها با توکن گرفته می‌شوند چون <img>/<iframe> نمی‌توانند هدر بفرستند.
|
||||
@@ -180,6 +217,39 @@ export function QuoteDetail({ store, q }: QuoteDetailProps) {
|
||||
|
||||
return (
|
||||
<div ref={setFlowEl} className="flow border-t border-line" data-status={q.status}>
|
||||
{/* بخش برجسته و اختصاصی کد پیگیری */}
|
||||
<div className="mb-3.5 flex flex-wrap items-center justify-between gap-2.5 rounded-xl border border-line bg-panel p-3 sm:px-4 sm:py-3 shadow-2xs">
|
||||
<div className="flex items-center gap-2.5 min-w-0">
|
||||
<div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-xl bg-accent-bg text-accent shadow-2xs border border-accent/20">
|
||||
<Hash className="h-4 w-4" />
|
||||
</div>
|
||||
<div className="min-w-0">
|
||||
<span className="block text-[10.5px] font-semibold text-muted">کد پیگیری پیشنهاد</span>
|
||||
<div className="flex items-center gap-2 mt-0.5">
|
||||
<span className="font-mono text-xs sm:text-sm font-bold text-ink select-all break-all leading-tight">
|
||||
{trackingCode}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* دکمه کپی کد پیگیری */}
|
||||
<button
|
||||
type="button"
|
||||
onClick={handleCopyCode}
|
||||
className={cn(
|
||||
"inline-flex h-8 items-center gap-1.5 rounded-xl border px-3 text-xs font-bold transition-all cursor-pointer shadow-2xs active:scale-95 shrink-0",
|
||||
copied
|
||||
? "border-emerald-300 bg-emerald-50 text-emerald-700 dark:bg-emerald-950/40 dark:text-emerald-300 dark:border-emerald-800"
|
||||
: "border-line bg-slate-50 dark:bg-zinc-800 text-ink hover:bg-slate-100 dark:hover:bg-zinc-700 hover:border-accent/40",
|
||||
)}
|
||||
title="کپی کد پیگیری در کلیپ‌بورد"
|
||||
>
|
||||
{copied ? <Check className="h-3.5 w-3.5 text-emerald-600" /> : <Copy className="h-3.5 w-3.5 text-muted" />}
|
||||
<span>{copied ? "کپی شد" : "کپی کد"}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="flow-cols">
|
||||
<div className="flow-col flow-items-col">
|
||||
<div className="flow-col-h">
|
||||
|
||||
@@ -1,28 +1,68 @@
|
||||
import { useMemo } from "react";
|
||||
import { Link } from "react-router-dom";
|
||||
import { FilePlus2, Info } from "lucide-react";
|
||||
import { Header, PageLayout } from "../../components/layout/Header";
|
||||
import { AppSwitcherMenu } from "../../components/AppSwitcherMenu";
|
||||
import { useAuthStore } from "../../store/auth";
|
||||
import { useProjects } from "../../hooks";
|
||||
import { faNum } from "../../lib/formatters";
|
||||
|
||||
// خانه حداقلی کاربرِ «تدارکات — سطح limited»: فقط افزودن استعلام برای
|
||||
// پروژه‌های عضویت خودش. هیچ سربرگ دیگری از پنل تدارکات دیده نمی‌شود.
|
||||
// خانه کاربرِ «تدارکات — سطح limited»: افزودن استعلام برای پروژه‌های تخصیص‌یافته
|
||||
export function RequesterHome() {
|
||||
const user = useAuthStore((s) => s.user);
|
||||
const projects = useProjects();
|
||||
const memberIds = new Set(user?.member_project_ids ?? []);
|
||||
const myProjects = memberIds.size
|
||||
? projects.filter((p) => memberIds.has(p.id))
|
||||
: [];
|
||||
|
||||
// پروژه‌های کاربر از همه منابع موجود در سیستم (user.projects، user.project_id، member_project_ids و پروژه‌های عمومی)
|
||||
const myProjects = useMemo(() => {
|
||||
const list: { id: string; name: string }[] = [];
|
||||
const seen = new Set<string>();
|
||||
|
||||
// ۱. پروژه‌های موجود در آرایه user.projects
|
||||
for (const p of user?.projects ?? []) {
|
||||
if (p.id && !seen.has(p.id)) {
|
||||
seen.add(p.id);
|
||||
list.push({ id: p.id, name: p.name });
|
||||
}
|
||||
}
|
||||
|
||||
// ۲. پروژه‌ی اختصاصی فعال (project_id)
|
||||
if (user?.project_id && !seen.has(user.project_id)) {
|
||||
seen.add(user.project_id);
|
||||
list.push({ id: user.project_id, name: user.project_name || "پروژه تخصیص‌یافته" });
|
||||
}
|
||||
|
||||
// ۳. پروژه‌های عضویت member_project_ids تطبیق‌یافته با لیست پروژه‌ها
|
||||
const memberIdSet = new Set(user?.member_project_ids ?? []);
|
||||
for (const p of projects) {
|
||||
if (memberIdSet.has(p.id) && !seen.has(p.id)) {
|
||||
seen.add(p.id);
|
||||
list.push({ id: p.id, name: p.name });
|
||||
}
|
||||
}
|
||||
|
||||
// ۴. تطبیق نام پروژه در صورتی که فقط نام در نشست باشد
|
||||
if (list.length === 0 && user?.project_name) {
|
||||
const match = projects.find((p) => p.name === user.project_name);
|
||||
if (match && !seen.has(match.id)) {
|
||||
list.push({ id: match.id, name: match.name });
|
||||
}
|
||||
}
|
||||
|
||||
return list;
|
||||
}, [user, projects]);
|
||||
|
||||
return (
|
||||
<div className="min-h-screen">
|
||||
<Header title="افزودن استعلام" brand />
|
||||
<Header
|
||||
title="افزودن استعلام"
|
||||
brand
|
||||
menu={<AppSwitcherMenu activeModule="procurement" />}
|
||||
/>
|
||||
<PageLayout className="flex flex-col gap-4">
|
||||
<div className="rounded-lg border border-blue/20 bg-blue/5 px-3 py-2 text-[12px] leading-6 text-muted">
|
||||
<span className="inline-flex items-center gap-1.5">
|
||||
<Info className="h-3.5 w-3.5" />
|
||||
شما فقط مجاز به ثبت استعلام برای پروژه‌های تخصیص‌یافته‌ی خود هستید.
|
||||
شما مجاز به ثبت استعلام برای پروژه‌های تخصیص‌یافته‌ی خود هستید.
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@@ -36,8 +76,8 @@ export function RequesterHome() {
|
||||
{myProjects.map((p) => (
|
||||
<Link
|
||||
key={p.id}
|
||||
to="/wizard"
|
||||
className="flex items-center justify-between rounded-xl border border-line bg-panel p-4 no-underline transition-colors hover:border-accent/50"
|
||||
to={`/wizard?project=${encodeURIComponent(p.name)}`}
|
||||
className="flex items-center justify-between rounded-xl border border-line bg-panel p-4 no-underline transition-colors hover:border-accent/50 hover:bg-canvas/40"
|
||||
>
|
||||
<div>
|
||||
<b className="text-[13.5px]">🏢 {p.name}</b>
|
||||
@@ -50,7 +90,10 @@ export function RequesterHome() {
|
||||
))}
|
||||
</div>
|
||||
|
||||
<Link to="/wizard" className="btn-line-file no-underline">
|
||||
<Link
|
||||
to="/wizard"
|
||||
className="btn-line-file inline-flex items-center justify-center gap-2 no-underline"
|
||||
>
|
||||
<FilePlus2 className="h-3.5 w-3.5" />
|
||||
افزودن استعلام جدید ({faNum(myProjects.length)} پروژه فعال)
|
||||
</Link>
|
||||
@@ -60,3 +103,4 @@ export function RequesterHome() {
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ import { useAuthStore } from "../../store/auth";
|
||||
import { inventorySubheader } from "./panelMenu";
|
||||
import { apiV26 } from "../../lib/api";
|
||||
import { refreshProcurementStore } from "../../hooks";
|
||||
import type { PendingArrival, Warehouse, ProjectTransfer } from "../../lib/types";
|
||||
import type { PendingArrival, Warehouse } from "../../lib/types";
|
||||
import { faNum, fmtDate } from "../../lib/formatters";
|
||||
|
||||
// کالاهای در راه — داشبورد متصل به سیستم تدارکات (مرحله رسید)
|
||||
@@ -27,31 +27,24 @@ export function ArrivalsPage() {
|
||||
const canAccess = isAdmin || isPM || isSupervisor;
|
||||
|
||||
const [items, setItems] = useState<PendingArrival[]>([]);
|
||||
const [incomingTransfers, setIncomingTransfers] = useState<ProjectTransfer[]>([]);
|
||||
const [warehouses, setWarehouses] = useState<Warehouse[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [saving, setSaving] = useState<string | null>(null); // quoteId
|
||||
const [transferSaving, setTransferSaving] = useState<string | null>(null); // transferId
|
||||
const [expanded, setExpanded] = useState<Set<string>>(new Set());
|
||||
const [drafts, setDrafts] = useState<Record<string, ItemDraft>>({});
|
||||
const [transferDrafts, setTransferDrafts] = useState<Record<string, AllocRow[]>>({});
|
||||
|
||||
const load = useCallback(async () => {
|
||||
try {
|
||||
const activeProject = (isPM || isSupervisor) ? user?.project_id || undefined : undefined;
|
||||
const [arr, whs, incoming] = await Promise.all([
|
||||
const [arr, whs] = await Promise.all([
|
||||
// پروژه‌ی فعال صریحاً ارسال می‌شود؛ بک‌اند تخصیص PM / سرپرست را بررسی می‌کند
|
||||
apiV26.pm.onTheWay(activeProject),
|
||||
apiV26.warehouses.list(activeProject),
|
||||
apiV26.projectTransfers.onTheWay(activeProject),
|
||||
]);
|
||||
setItems(Array.isArray(arr) ? arr : []);
|
||||
setWarehouses(Array.isArray(whs) ? whs : []);
|
||||
setIncomingTransfers(Array.isArray(incoming) ? incoming : []);
|
||||
setItems(arr);
|
||||
setWarehouses(whs);
|
||||
} catch (err) {
|
||||
toast.error(err instanceof Error ? err.message : "خطا در دریافت کالاهای در راه");
|
||||
setItems([]);
|
||||
setIncomingTransfers([]);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -221,57 +214,7 @@ export function ArrivalsPage() {
|
||||
}
|
||||
};
|
||||
|
||||
// ---------- transfer helpers ----------
|
||||
|
||||
const transferDraftOf = (t: ProjectTransfer): AllocRow[] => {
|
||||
if (transferDrafts[t.id] && transferDrafts[t.id].length > 0) {
|
||||
return transferDrafts[t.id];
|
||||
}
|
||||
const defaultWh = warehouses.find((w) => String(w.project_id) === String(t.to_project.id))?.id || warehouses[0]?.id || "";
|
||||
return [{ key: 1, qty: String(t.quantity), whId: defaultWh }];
|
||||
};
|
||||
|
||||
const setTransferAlloc = (transferId: string, rows: AllocRow[]) => {
|
||||
setTransferDrafts((prev) => ({ ...prev, [transferId]: rows }));
|
||||
};
|
||||
|
||||
const handleReceiveTransfer = async (transfer: ProjectTransfer, allocs: AllocRow[]) => {
|
||||
const activeProject = isPM ? user?.project_id || undefined : undefined;
|
||||
const allocSum = round4(allocs.reduce((s, a) => s + (parseFloat(a.qty) || 0), 0));
|
||||
const targetQty = parseFloat(String(transfer.quantity));
|
||||
|
||||
if (allocSum !== targetQty) {
|
||||
toast.error(`مجموع تخصیص انبارها (${faNum(allocSum)}) باید دقیقاً برابر کل بار ارسالی (${faNum(targetQty)}) باشد.`);
|
||||
return;
|
||||
}
|
||||
if (allocs.some((a) => (parseFloat(a.qty) || 0) > 0 && !a.whId)) {
|
||||
toast.error("لطفاً برای تمامی ردیف‌های دارای مقدار، انبار مقصد را انتخاب کنید.");
|
||||
return;
|
||||
}
|
||||
|
||||
setTransferSaving(transfer.id);
|
||||
try {
|
||||
const payloadAllocs = allocs
|
||||
.filter((a) => (parseFloat(a.qty) || 0) > 0 && a.whId)
|
||||
.map((a) => ({ warehouse_id: a.whId, quantity: parseFloat(a.qty) }));
|
||||
|
||||
await apiV26.projectTransfers.receive(transfer.id, {
|
||||
allocations: payloadAllocs,
|
||||
}, activeProject);
|
||||
|
||||
toast.success("تحویل انتقال بین کارگاهی ۱۰۰٪ تأیید شد و به انبار پروژه وارد گردید ✓");
|
||||
await load();
|
||||
} catch (err) {
|
||||
toast.error(err instanceof Error ? err.message : "خطا در تأیید تحویل انتقال");
|
||||
} finally {
|
||||
setTransferSaving(null);
|
||||
}
|
||||
};
|
||||
|
||||
if (!isAdmin && !isPM) {
|
||||
|
||||
if (!canAccess) {
|
||||
|
||||
return (
|
||||
<div className="min-h-screen">
|
||||
<Header title="کالاهای در راه" backTo="/inventory" backLabel="بازگشت به داشبورد" />
|
||||
@@ -292,171 +235,19 @@ export function ArrivalsPage() {
|
||||
/>
|
||||
<PageLayout className="flex flex-col gap-4">
|
||||
<div className="rounded-lg border border-blue/20 bg-blue/5 px-3 py-2 text-[12px] leading-6 text-muted">
|
||||
🚚 این بخش به مرحله «رسید» سفارش‌های خرید و «انتقال بین کارگاهی» متصل است: اقلام ارسالی از سایر پروژه‌ها به صورت ۱۰۰٪ تحویل و بین انبارهای پروژه تخصیص داده می‌شوند؛ سفارش‌های خرید نیز قابلیت رسید کامل یا جزیی دارند.
|
||||
🚚 این بخش به مرحله «رسید» سفارش‌های خرید متصل است: تأیید پیشنهاد و پذیرش در سیستم تدارکات انجام شده و
|
||||
اینجا فقط رسید و تقسیم بین انبارها ثبت می‌شود. <b>رسید جزیی (قلمی و مقداری) مجاز است</b> — هر سفارش را باز
|
||||
کنید، تعداد واقعیِ رسیده هر قلم را وارد کنید و آن را بین انبارهای پروژه تقسیم کنید؛ قلم‌هایی که مقداری برایشان
|
||||
وارد نشود در صف «در راه» می‌مانند. مجموع تخصیص هر قلم باید دقیقاً با تعداد رسیده‌ی همان قلم برابر باشد و از
|
||||
مانده‌ی سفارش بیشتر نشود.
|
||||
</div>
|
||||
|
||||
{loading ? (
|
||||
<div className="py-6 text-center text-[12.5px] text-muted">در حال بارگذاری…</div>
|
||||
) : !(orders || []).length && !(incomingTransfers || []).length ? (
|
||||
) : !orders.length ? (
|
||||
<EmptyState emoji="🚚" text="کالای در راهی برای دریافت وجود ندارد." />
|
||||
) : (
|
||||
<>
|
||||
{/* بخش انتقال‌های بین کارگاهی در راه */}
|
||||
{(incomingTransfers || []).length > 0 && (
|
||||
<div className="flex flex-col gap-3">
|
||||
<div className="flex items-center gap-2">
|
||||
<h3 className="text-[14px] font-bold text-foreground">🔁 انتقال‌های بین کارگاهی در راه ({faNum((incomingTransfers || []).length)})</h3>
|
||||
<span className="text-[11.5px] text-muted">— تحویل ۱۰۰٪ کامل مصالح ارسالی از سایر پروژه‌ها</span>
|
||||
</div>
|
||||
|
||||
{(incomingTransfers || []).map((t) => {
|
||||
const draftAllocs = transferDraftOf(t);
|
||||
const allocSum = round4(draftAllocs.reduce((s, a) => s + (parseFloat(a.qty) || 0), 0));
|
||||
const targetQty = parseFloat(String(t.quantity));
|
||||
const isExactMatch = allocSum === targetQty;
|
||||
const hasEmptyWh = draftAllocs.some((a) => (parseFloat(a.qty) || 0) > 0 && !a.whId);
|
||||
const isValid = isExactMatch && !hasEmptyWh && allocSum > 0;
|
||||
const days = daysElapsed(t.transfer_date);
|
||||
const projectWhs = warehouses.filter((w) => String(w.project_id) === String(t.to_project.id));
|
||||
const destWhOptions = projectWhs.length > 0 ? projectWhs : warehouses;
|
||||
|
||||
return (
|
||||
<div key={t.id} className="overflow-hidden rounded-xl border border-line bg-panel shadow-sm">
|
||||
{/* سربرگ انتقال */}
|
||||
<div className="flex flex-wrap items-center justify-between gap-2 border-b border-line bg-panel px-4 py-3">
|
||||
<div className="flex flex-wrap items-center gap-2">
|
||||
<span className="text-[14px] font-bold text-foreground">🔁 انتقال از {t.from_project?.name || "پروژه مبدأ"}</span>
|
||||
<Badge variant="offered">در راه</Badge>
|
||||
{days !== null && (
|
||||
<Badge variant={days >= 7 ? "offered" : "muted"}>
|
||||
روز گذشته: {faNum(days)} روز
|
||||
</Badge>
|
||||
)}
|
||||
</div>
|
||||
<div className="flex flex-wrap items-center gap-3 text-[11.5px] text-muted">
|
||||
<span>ارسال‌کننده: <b className="text-foreground">{t.transferred_by || "—"}</b></span>
|
||||
<span>تاریخ ارسال: <b className="text-foreground">{fmtDate(t.transfer_date)}</b></span>
|
||||
<span>پروژه مقصد: <b className="text-foreground">{t.to_project?.name || "—"}</b></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="px-4 py-3">
|
||||
<div className="flex flex-wrap items-center gap-2">
|
||||
<span className="text-[13px] font-bold">{t.material?.name}</span>
|
||||
{t.brand?.name && <Badge variant="outline">{t.brand.name}</Badge>}
|
||||
<Badge variant="outline">
|
||||
مقدار ارسالی: {faNum(t.quantity)} {t.unit?.name_fa || t.unit?.code || ""}
|
||||
</Badge>
|
||||
{t.specs && Object.keys(t.specs).length > 0 && (
|
||||
<span className="text-[11.5px] text-muted">
|
||||
مشخصات: {Object.entries(t.specs).map(([k, v]) => `${k}: ${v}`).join(" · ")}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{t.note && (
|
||||
<div className="mt-1 text-[11.5px] text-muted">
|
||||
یادداشت ارسال: <span className="text-foreground">{t.note}</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="mt-3 rounded-lg border border-line/70 bg-bg/50 p-3">
|
||||
<div className="text-[12px] font-semibold text-muted mb-2">
|
||||
تخصیص ۱۰۰٪ به انبار(های) پروژه (مجموع باید دقیقاً {faNum(t.quantity)} {t.unit?.name_fa || t.unit?.code || ""} باشد):
|
||||
</div>
|
||||
|
||||
<div className="flex flex-col gap-2">
|
||||
{draftAllocs.map((a) => (
|
||||
<div key={a.key} className="flex flex-wrap items-center gap-2">
|
||||
<input
|
||||
type="number"
|
||||
inputMode="decimal"
|
||||
className="h-8 w-28 rounded-lg border border-line bg-panel px-2 text-sm ltr"
|
||||
placeholder="تعداد"
|
||||
value={a.qty}
|
||||
onChange={(e) => {
|
||||
const next = draftAllocs.map((x) => (x.key === a.key ? { ...x, qty: e.target.value } : x));
|
||||
setTransferAlloc(t.id, next);
|
||||
}}
|
||||
/>
|
||||
<select
|
||||
className="h-8 min-w-[200px] flex-1 rounded-lg border border-line bg-panel px-2 text-xs"
|
||||
value={a.whId}
|
||||
onChange={(e) => {
|
||||
const next = draftAllocs.map((x) => (x.key === a.key ? { ...x, whId: e.target.value } : x));
|
||||
setTransferAlloc(t.id, next);
|
||||
}}
|
||||
>
|
||||
<option value="">— انتخاب انبار پروژه مقصد —</option>
|
||||
{destWhOptions.map((w) => (
|
||||
<option key={w.id} value={w.id}>{w.name}</option>
|
||||
))}
|
||||
</select>
|
||||
{draftAllocs.length > 1 && (
|
||||
<button
|
||||
type="button"
|
||||
className="h-8 px-2 text-muted hover:text-red transition-colors"
|
||||
onClick={() => {
|
||||
const next = draftAllocs.filter((x) => x.key !== a.key);
|
||||
setTransferAlloc(t.id, next);
|
||||
}}
|
||||
title="حذف این ردیف تخصیص"
|
||||
>
|
||||
✕
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
|
||||
<button
|
||||
type="button"
|
||||
className="w-fit rounded-lg border border-dashed border-accent/50 px-3 py-1 text-[11.5px] text-accent mt-1 hover:bg-accent-bg/40 transition-colors"
|
||||
onClick={() => {
|
||||
const next = [...draftAllocs, { key: Date.now() + Math.random(), qty: "", whId: destWhOptions[0]?.id || "" }];
|
||||
setTransferAlloc(t.id, next);
|
||||
}}
|
||||
>
|
||||
+ افزودن انبار دیگر برای تقسیم بار
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="mt-3 flex flex-wrap items-center justify-between gap-2 border-t border-line/60 pt-2 text-[12px]">
|
||||
<div>
|
||||
{isExactMatch ? (
|
||||
<span className="font-semibold text-emerald-600">
|
||||
✓ تخصیص کامل ۱۰۰٪ ({faNum(allocSum)} از {faNum(targetQty)}) آماده تحویل
|
||||
</span>
|
||||
) : (
|
||||
<span className="font-bold text-rose-600">
|
||||
اختلاف تخصیص: مجموع تخصیص ({faNum(allocSum)}) باید دقیقاً با مقدار کل ({faNum(targetQty)}) برابر باشد.
|
||||
</span>
|
||||
)}
|
||||
{hasEmptyWh && (
|
||||
<span className="ms-2 font-bold text-rose-600">
|
||||
— لطفاً انبار مقصد را انتخاب کنید
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<Button
|
||||
size="sm"
|
||||
variant="green"
|
||||
disabled={!isValid || transferSaving === t.id}
|
||||
onClick={() => void handleReceiveTransfer(t, draftAllocs)}
|
||||
>
|
||||
{transferSaving === t.id ? "در حال ثبت تحویل…" : "✓ تأیید تحویل ۱۰۰٪ و ورود به انبار"}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* بخش سفارش‌های خرید در راه */}
|
||||
{orders.map(([quoteId, its]) => {
|
||||
orders.map(([quoteId, its]) => {
|
||||
const first = its[0];
|
||||
const open = expanded.has(quoteId);
|
||||
const hasSubmittable = orderHasSubmittable(quoteId);
|
||||
@@ -612,8 +403,7 @@ export function ArrivalsPage() {
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</>
|
||||
})
|
||||
)}
|
||||
</PageLayout>
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import { useSearchParams } from "react-router-dom";
|
||||
import { toast } from "sonner";
|
||||
import { Header, PageLayout } from "../../components/layout/Header";
|
||||
@@ -6,22 +6,21 @@ import { Combobox } from "../../components/Combobox";
|
||||
import { MultiSelectCombobox } from "../../components/MultiSelectCombobox";
|
||||
import { useAuthStore } from "../../store/auth";
|
||||
import { inventorySubheader } from "./panelMenu";
|
||||
import { api, apiV26 } from "../../lib/api";
|
||||
import { apiV26 } from "../../lib/api";
|
||||
import { notifyDataChanged } from "../../lib/crossTab";
|
||||
import { useInventoryData, unitName, whName } from "./useInventoryData";
|
||||
import { JalaliDatePicker } from "../../components/JalaliDatePicker";
|
||||
import { uniqueUnits } from "../../lib/units";
|
||||
import type { InventoryTransaction, TransactionType, Project, ProjectTransfer } from "../../lib/types";
|
||||
import { faNum, fmtDate } from "../../lib/formatters";
|
||||
import type { InventoryTransaction, TransactionType } from "../../lib/types";
|
||||
import { faNum } from "../../lib/formatters";
|
||||
import { gregorianToJalali, MONTHS, toFa } from "../../lib/jalali";
|
||||
import { cn } from "../../lib/utils";
|
||||
|
||||
type FormType = TransactionType | "TRANSFER" | "PROJECT_TRANSFER";
|
||||
type FormType = TransactionType | "TRANSFER";
|
||||
|
||||
const FORM_TYPES: { t: FormType; label: string; dir: string; cls: "in" | "out" | "mv" | "cnt"; color: string; desc: string }[] = [
|
||||
{ t: "PURCHASE", label: "موجودی اولیه", dir: "افزایش", cls: "in", color: "#10b981", desc: "ثبت موجودی اولیه — متریال/برند/واحد را از فهرست انتخاب کنید؛ اگر نامی در فهرست نبود، همان نام تایپ‌شده هنگام ثبت به‌صورت خودکار در کاتالوگ سراسری ساخته می‌شود. ثبت حداقل یک مشخصه فنی الزامی است." },
|
||||
{ t: "WITHDRAWAL", label: "برداشت", dir: "کاهش", cls: "out", color: "#e11d48", desc: "انبار را انتخاب و نام متریال را تایپ کنید؛ همه مدل‌ها (برند و مشخصه متفاوت) نمایش داده می‌شوند. برداشت‌ها در «کنترل روزانه» امروز دیده می‌شوند." },
|
||||
{ t: "PROJECT_TRANSFER", label: "انتقال بین کارگاهی", dir: "کاهش", cls: "out", color: "#e11d48", desc: "انتقال متریال از انبار این پروژه به یک پروژه دیگر — پس از ثبت، موجودی در انبار مبدأ کسر شده و کالا به عنوان بار در راه برای پروژه مقصد ارسال می‌شود تا مدیر پروژه مقصد آن را تحویل بگیرد." },
|
||||
{ t: "RETURN", label: "برگشت", dir: "افزایش", cls: "in", color: "#10b981", desc: "برگشت از مصالحی که امروز برداشت شده‌اند — نام متریال را تایپ کنید و مقدار برگشتی هر ردیف را بزنید." },
|
||||
{ t: "TRANSFER", label: "انتقال", dir: "جابه‌جایی", cls: "mv", color: "#2563eb", desc: "جابه‌جایی بین انبارهای پروژه — از انبار مبدأ، مقداری از هر مدل را به انبار مقصد منتقل کنید." },
|
||||
{ t: "DAMAGE", label: "ضایعات", dir: "کاهش", cls: "out", color: "#e11d48", desc: "ثبت ضایعات خرید (مثلاً لوله‌های سوراخ) — انبار و متریال را انتخاب و تعداد ضایعات هر مدل را وارد کنید." },
|
||||
@@ -54,22 +53,6 @@ export function ChangeInventoryPage() {
|
||||
|
||||
const [type, setType] = useState<FormType>("PURCHASE");
|
||||
const [whId, setWhId] = useState("");
|
||||
const [toProjectId, setToProjectId] = useState("");
|
||||
const [allProjects, setAllProjects] = useState<Project[]>([]);
|
||||
const [transfers, setTransfers] = useState<ProjectTransfer[]>([]);
|
||||
const [loadingTransfers, setLoadingTransfers] = useState(false);
|
||||
|
||||
// Edit modal state
|
||||
const [editingTransfer, setEditingTransfer] = useState<ProjectTransfer | null>(null);
|
||||
const [editQty, setEditQty] = useState("");
|
||||
const [editToProjectId, setEditToProjectId] = useState("");
|
||||
const [editNote, setEditNote] = useState("");
|
||||
const [editBusy, setEditBusy] = useState(false);
|
||||
|
||||
// Delete modal state
|
||||
const [deleteConfirmTransfer, setDeleteConfirmTransfer] = useState<ProjectTransfer | null>(null);
|
||||
const [deleteBusy, setDeleteBusy] = useState(false);
|
||||
|
||||
const [fromId, setFromId] = useState("");
|
||||
const [toId, setToId] = useState("");
|
||||
const [matTxt, setMatTxt] = useState("");
|
||||
@@ -79,7 +62,6 @@ export function ChangeInventoryPage() {
|
||||
const [dateInput, setDateInput] = useState<string>(() => new Date().toISOString());
|
||||
const [specsChips, setSpecsChips] = useState<string[]>([]);
|
||||
const [note, setNote] = useState("");
|
||||
const [deliveredTo, setDeliveredTo] = useState("");
|
||||
const [rows, setRows] = useState<RowDraft[]>([]);
|
||||
const [busy, setBusy] = useState(false);
|
||||
|
||||
@@ -105,20 +87,10 @@ export function ChangeInventoryPage() {
|
||||
);
|
||||
|
||||
const formRecords = useMemo(() => {
|
||||
const txt = matTxt.trim().toLowerCase();
|
||||
const txt = matTxt.trim();
|
||||
const wid = type === "TRANSFER" ? fromId : whId;
|
||||
return data.inventory.filter((r) => {
|
||||
if (r.warehouse?.id !== wid) return false;
|
||||
if (type === "WITHDRAWAL") {
|
||||
if (r.quantity_number <= 0) return false;
|
||||
if (txt) {
|
||||
const mMatch = r.material.name.toLowerCase().includes(txt);
|
||||
const bMatch = r.brand?.name?.toLowerCase().includes(txt) ?? false;
|
||||
const sMatch = Object.values(r.specs || {}).some((v) => String(v).toLowerCase().includes(txt));
|
||||
if (!mMatch && !bMatch && !sMatch) return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
if (txt && !r.material.name.includes(txt)) return false;
|
||||
return true;
|
||||
});
|
||||
@@ -215,7 +187,6 @@ export function ChangeInventoryPage() {
|
||||
setQty("");
|
||||
setSpecsChips([]);
|
||||
setNote("");
|
||||
setDeliveredTo("");
|
||||
await data.refresh();
|
||||
} catch (err) {
|
||||
toast.error(err instanceof Error ? err.message : "خطا در ثبت");
|
||||
@@ -224,82 +195,6 @@ export function ChangeInventoryPage() {
|
||||
}
|
||||
};
|
||||
|
||||
const loadTransfers = useCallback(async () => {
|
||||
if (!user?.project_id) return;
|
||||
setLoadingTransfers(true);
|
||||
try {
|
||||
const list = await apiV26.projectTransfers.list(user.project_id, "outgoing");
|
||||
setTransfers(Array.isArray(list) ? list : []);
|
||||
} catch (err) {
|
||||
console.error("Failed to load project transfers:", err);
|
||||
setTransfers([]);
|
||||
} finally {
|
||||
setLoadingTransfers(false);
|
||||
}
|
||||
}, [user?.project_id]);
|
||||
|
||||
useEffect(() => {
|
||||
api.projects
|
||||
.list()
|
||||
.then((res) => setAllProjects(Array.isArray(res) ? res : []))
|
||||
.catch(() => setAllProjects([]));
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (type === "PROJECT_TRANSFER") {
|
||||
void loadTransfers();
|
||||
}
|
||||
}, [type, loadTransfers]);
|
||||
|
||||
const whStock = useMemo(() => {
|
||||
if (!whId) return [];
|
||||
return (data.inventory || []).filter((r) => r.warehouse?.id === whId && r.quantity_number > 0);
|
||||
}, [data.inventory, whId]);
|
||||
|
||||
|
||||
|
||||
const handleSaveEdit = async () => {
|
||||
if (!editingTransfer) return;
|
||||
const n = parseNum(editQty);
|
||||
if (!(n > 0)) return toast.error("تعداد باید بزرگ‌تر از صفر باشد");
|
||||
if (!editToProjectId) return toast.error("پروژه مقصد را انتخاب کنید");
|
||||
|
||||
setEditBusy(true);
|
||||
try {
|
||||
await apiV26.projectTransfers.update(editingTransfer.id, {
|
||||
quantity: n,
|
||||
to_project_id: editToProjectId,
|
||||
note: editNote,
|
||||
}, user?.project_id);
|
||||
toast.success("انتقال با موفقیت ویرایش شد ✓");
|
||||
notifyDataChanged("inventory");
|
||||
setEditingTransfer(null);
|
||||
await data.refresh();
|
||||
await loadTransfers();
|
||||
} catch (err) {
|
||||
toast.error(err instanceof Error ? err.message : "خطا در ویرایش انتقال");
|
||||
} finally {
|
||||
setEditBusy(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleConfirmDelete = async () => {
|
||||
if (!deleteConfirmTransfer) return;
|
||||
setDeleteBusy(true);
|
||||
try {
|
||||
await apiV26.projectTransfers.delete(deleteConfirmTransfer.id, user?.project_id);
|
||||
toast.success("انتقال لغو شد و موجودی به انبار مبدأ بازگردانده شد ✓");
|
||||
notifyDataChanged("inventory");
|
||||
setDeleteConfirmTransfer(null);
|
||||
await data.refresh();
|
||||
await loadTransfers();
|
||||
} catch (err) {
|
||||
toast.error(err instanceof Error ? err.message : "خطا در لغو انتقال");
|
||||
} finally {
|
||||
setDeleteBusy(false);
|
||||
}
|
||||
};
|
||||
|
||||
const submitPurchase = async () => {
|
||||
const matName = matTxt.trim();
|
||||
const brandName = brandTxt.trim();
|
||||
@@ -340,86 +235,7 @@ export function ChangeInventoryPage() {
|
||||
}
|
||||
};
|
||||
|
||||
const submitProjectTransfer = async () => {
|
||||
const matName = matTxt.trim();
|
||||
const brandName = brandTxt.trim();
|
||||
const unitName = unitTxt.trim();
|
||||
const n = parseNum(qty);
|
||||
if (!whId) return toast.error("انبار مبدأ را انتخاب کنید");
|
||||
if (!toProjectId) return toast.error("پروژه مقصد را انتخاب کنید");
|
||||
if (!matName) return toast.error("نام متریال را وارد کنید");
|
||||
if (!unitName) return toast.error("نام واحد را وارد کنید");
|
||||
if (!(n > 0)) return toast.error("تعداد باید بزرگ‌تر از صفر باشد");
|
||||
|
||||
setBusy(true);
|
||||
try {
|
||||
// Find matching inventory in the selected source warehouse
|
||||
const invInWh = (data.inventory || []).filter(
|
||||
(r) => r.warehouse?.id === whId && r.material.name.trim() === matName
|
||||
);
|
||||
const matchedInv = invInWh.find(
|
||||
(r) => (brandName ? r.brand?.name === brandName : !r.brand)
|
||||
) || invInWh[0];
|
||||
|
||||
let uid = matchedInv?.unit?.id ?? unitIdByName(unitName);
|
||||
if (!uid) {
|
||||
const created = await apiV26.catalog.createUnit(unitName);
|
||||
uid = created.id;
|
||||
}
|
||||
|
||||
let bid: string | null = matchedInv?.brand?.id ?? (brandName ? brandIdByName(brandName) : null);
|
||||
if (brandName && !bid) {
|
||||
const created = await apiV26.catalog.createBrand(brandName);
|
||||
bid = created.id;
|
||||
}
|
||||
|
||||
let mid = matchedInv?.material.id;
|
||||
if (!mid) {
|
||||
let m = matByName(matName);
|
||||
if (!m) {
|
||||
const created = await apiV26.catalog.createMaterial({ name: matName, canonical_unit_id: uid, brand_ids: bid ? [bid] : [] });
|
||||
mid = created.id;
|
||||
} else {
|
||||
mid = m.id;
|
||||
}
|
||||
}
|
||||
|
||||
const finalSpecs = matchedInv ? (matchedInv.specs || {}) : specsFromChips();
|
||||
|
||||
await apiV26.projectTransfers.create({
|
||||
from_warehouse_id: whId,
|
||||
to_project_id: toProjectId,
|
||||
material_id: mid,
|
||||
brand_id: bid || null,
|
||||
unit_id: uid,
|
||||
quantity: n,
|
||||
specs: finalSpecs,
|
||||
note,
|
||||
transfer_date: toServerIso(),
|
||||
}, user?.project_id);
|
||||
|
||||
toast.success("انتقال بین کارگاهی ثبت شد و از انبار مبدأ کسر گردید ✓");
|
||||
notifyDataChanged("inventory");
|
||||
setQty("");
|
||||
setSpecsChips([]);
|
||||
setNote("");
|
||||
setMatTxt("");
|
||||
setBrandTxt("");
|
||||
setUnitTxt("");
|
||||
setToProjectId("");
|
||||
await data.refresh();
|
||||
await loadTransfers();
|
||||
} catch (err) {
|
||||
toast.error(err instanceof Error ? err.message : "خطا در ثبت انتقال بین کارگاهی");
|
||||
} finally {
|
||||
setBusy(false);
|
||||
}
|
||||
};
|
||||
|
||||
const submitList = async (t: TransactionType) => {
|
||||
if (t === "WITHDRAWAL" && !deliveredTo.trim()) {
|
||||
return toast.error("نام تحویل‌گیرنده اقلام الزامی است");
|
||||
}
|
||||
const ops: Record<string, unknown>[] = rows
|
||||
.map((r, i): Record<string, unknown> | null => {
|
||||
const n = parseNum(r.qty);
|
||||
@@ -429,18 +245,7 @@ export function ChangeInventoryPage() {
|
||||
if (t === "STOCK_COUNT") {
|
||||
return { transaction_type: "STOCK_COUNT", warehouse_id: whId, material_id: rec.material.id, brand_id: rec.brand?.id || null, physical_qty: n, note: r.note, transaction_date: toServerIso() };
|
||||
}
|
||||
return {
|
||||
transaction_type: t,
|
||||
warehouse_id: whId,
|
||||
material_id: rec.material.id,
|
||||
brand_id: rec.brand?.id || null,
|
||||
quantity: n,
|
||||
unit_id: rec.unit?.id ?? null,
|
||||
specs: rec.specs || {},
|
||||
note: r.note,
|
||||
delivered_to: t === "WITHDRAWAL" ? deliveredTo.trim() : undefined,
|
||||
transaction_date: toServerIso(),
|
||||
};
|
||||
return { transaction_type: t, warehouse_id: whId, material_id: rec.material.id, brand_id: rec.brand?.id || null, quantity: n, unit_id: rec.unit?.id ?? null, specs: rec.specs || {}, note: r.note, transaction_date: toServerIso() };
|
||||
})
|
||||
.filter((x): x is Record<string, unknown> => x !== null);
|
||||
if (!ops.length) return toast.error("هیچ ردیفی پر نشده است");
|
||||
@@ -552,7 +357,6 @@ export function ChangeInventoryPage() {
|
||||
const doSubmit = () => {
|
||||
try {
|
||||
if (type === "PURCHASE") void submitPurchase();
|
||||
else if (type === "PROJECT_TRANSFER") void submitProjectTransfer();
|
||||
else if (type === "RETURN") void submitReturn();
|
||||
else if (type === "TRANSFER") void submitTransfer();
|
||||
else if (type === "FOUND") void submitFound();
|
||||
@@ -567,13 +371,6 @@ export function ChangeInventoryPage() {
|
||||
if (type === "PURCHASE") {
|
||||
return !!(whId && matTxt.trim() && brandTxt.trim() && unitTxt.trim() && parseNum(qty) > 0 && specsComplete);
|
||||
}
|
||||
if (type === "WITHDRAWAL") {
|
||||
return !!(whId && deliveredTo.trim() && rows.some((r) => parseNum(r.qty) > 0));
|
||||
}
|
||||
if (type === "PROJECT_TRANSFER") {
|
||||
return !!(whId && toProjectId && matTxt.trim() && unitTxt.trim() && parseNum(qty) > 0);
|
||||
}
|
||||
}
|
||||
if (type === "TRANSFER") return !!(fromId && toId && matTxt.trim() && rows.some((r) => parseNum(r.qty) > 0));
|
||||
if (type === "RETURN") return !!(whId && matTxt.trim() && rows.some((r) => parseNum(r.qty) > 0));
|
||||
if (type === "FOUND") {
|
||||
@@ -657,47 +454,7 @@ export function ChangeInventoryPage() {
|
||||
|
||||
<div className="rounded-xl border border-line bg-panel p-3 sm:p-4 w-full shadow-2xs">
|
||||
{/* انتخاب انبارها (چیپ‌های لمسی به جای سلکت خام) */}
|
||||
{type === "PROJECT_TRANSFER" ? (
|
||||
<div className="mb-3 grid gap-3 md:grid-cols-2">
|
||||
<div className="flex flex-col gap-1.5">
|
||||
<label className="text-xs font-semibold text-muted">از (انبار مبدأ این پروژه) *</label>
|
||||
<div className="flex flex-wrap gap-1.5 mt-1">
|
||||
{whOpts.map((w) => (
|
||||
<button
|
||||
key={w.id}
|
||||
type="button"
|
||||
onClick={() => { setWhId(w.id); }}
|
||||
className={cn(
|
||||
"rounded-lg px-3 py-1.5 text-xs font-medium transition-colors",
|
||||
whId === w.id
|
||||
? "bg-rose-600 text-white font-bold shadow-xs"
|
||||
: "border border-line bg-bg/50 text-ink hover:bg-panel"
|
||||
)}
|
||||
>
|
||||
{w.name}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex flex-col gap-1.5">
|
||||
<label className="text-xs font-semibold text-muted">به (پروژه مقصد) *</label>
|
||||
<select
|
||||
className="mt-1 h-9 w-full rounded-lg border border-line bg-panel px-3 text-xs sm:text-sm font-medium"
|
||||
value={toProjectId}
|
||||
onChange={(e) => setToProjectId(e.target.value)}
|
||||
>
|
||||
<option value="">— انتخاب پروژه مقصد —</option>
|
||||
{(allProjects || [])
|
||||
.filter((p) => p.id !== user?.project_id)
|
||||
.map((p) => (
|
||||
<option key={p.id} value={p.id}>
|
||||
{p.name}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
) : !isTransfer ? (
|
||||
{!isTransfer ? (
|
||||
<div className="mb-3 flex flex-col gap-3">
|
||||
<div className="flex flex-col gap-1.5">
|
||||
<label className="text-xs font-semibold text-muted">انبار *</label>
|
||||
@@ -720,36 +477,7 @@ export function ChangeInventoryPage() {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{type === "WITHDRAWAL" && (
|
||||
<div className="grid gap-3 sm:grid-cols-2">
|
||||
<div className="field">
|
||||
<label className="text-xs font-semibold text-muted">جستجو در متریال‌ها (اختیاری)</label>
|
||||
<input
|
||||
list="dl-mat"
|
||||
className="h-9 w-full rounded-lg border border-line bg-panel px-3 text-xs sm:text-sm"
|
||||
placeholder="فیلتر بر اساس نام متریال، برند یا مشخصه (خالی = نمایش همه)…"
|
||||
value={matTxt}
|
||||
onChange={(e) => { setMatTxt(e.target.value); setRows([]); }}
|
||||
/>
|
||||
<datalist id="dl-mat">
|
||||
{data.lookup.materials.map((m) => <option key={m.id} value={m.name} />)}
|
||||
</datalist>
|
||||
</div>
|
||||
<div className="field">
|
||||
<label className="text-xs font-semibold text-muted">
|
||||
تحویل به (تحویل‌گیرنده) <span className="text-rose-500 font-bold">*</span>
|
||||
</label>
|
||||
<input
|
||||
className="h-9 w-full rounded-lg border border-line bg-panel px-3 text-xs sm:text-sm"
|
||||
placeholder="نام فرد، اکیپ یا پیمانکار تحویل‌گیرنده اقلام…"
|
||||
value={deliveredTo}
|
||||
onChange={(e) => setDeliveredTo(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{(type === "DAMAGE" || type === "WASTE" || type === "LOSS" || type === "STOCK_COUNT" || type === "RETURN" || type === "FOUND") && (
|
||||
{(type === "WITHDRAWAL" || type === "DAMAGE" || type === "WASTE" || type === "LOSS" || type === "STOCK_COUNT" || type === "RETURN" || type === "FOUND") && (
|
||||
<div className="field">
|
||||
<label className="text-xs font-semibold text-muted">{type === "FOUND" ? "متریال (خالی = همه مفقودی‌ها)" : "متریال *"}</label>
|
||||
<input
|
||||
@@ -824,72 +552,9 @@ export function ChangeInventoryPage() {
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* فرم خرید / موجودی اولیه یا انتقال بین کارگاهی */}
|
||||
{(type === "PURCHASE" || type === "PROJECT_TRANSFER") && (
|
||||
{/* فرم خرید / موجودی اولیه */}
|
||||
{type === "PURCHASE" && (
|
||||
<div className="grid gap-3 md:grid-cols-2">
|
||||
{/* چیپ‌های انتخاب سریع از موجودی‌های انبار مبدأ */}
|
||||
{type === "PROJECT_TRANSFER" && whId && (
|
||||
<div className="field md:col-span-2 rounded-xl border border-rose-500/20 bg-rose-500/5 p-3.5">
|
||||
<div className="flex items-center justify-between gap-2 mb-2">
|
||||
<span className="text-xs font-bold text-foreground flex items-center gap-1.5">
|
||||
<span>📦</span>
|
||||
<span>موجودی‌های موجود در {whName(warehouses, whId)} — برای پر کردن خودکار فرم کلیک کنید:</span>
|
||||
</span>
|
||||
<span className="text-[11px] text-muted">{faNum(whStock.length)} قلم کالا</span>
|
||||
</div>
|
||||
{whStock.length === 0 ? (
|
||||
<div className="text-xs text-muted py-1">هیچ کالایی با موجودی مثبت در این انبار یافت نشد.</div>
|
||||
) : (
|
||||
<div className="flex flex-wrap gap-2">
|
||||
{whStock.map((r) => {
|
||||
const isSelected = matTxt === r.material.name && (brandTxt === (r.brand?.name || "") || (!brandTxt && !r.brand));
|
||||
const specsSummary = Object.entries(r.specs || {})
|
||||
.map(([k, v]) => (v ? `${v}` : k.replace(/^spec_/, "")))
|
||||
.filter(Boolean)
|
||||
.join(" · ");
|
||||
return (
|
||||
<button
|
||||
key={r.id}
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setMatTxt(r.material.name);
|
||||
setBrandTxt(r.brand?.name || "");
|
||||
setUnitTxt(unitName(data.lookup.units, r.unit?.id) || "");
|
||||
const chips = Object.entries(r.specs || {})
|
||||
.map(([k, v]) => (v ? `${v}` : k.replace(/^spec_/, "")))
|
||||
.filter(Boolean);
|
||||
setSpecsChips(chips);
|
||||
}}
|
||||
className={cn(
|
||||
"flex items-center gap-2 rounded-lg border px-3 py-1.5 text-xs text-start transition-all shadow-2xs",
|
||||
isSelected
|
||||
? "border-rose-500 bg-rose-600 text-white font-bold ring-2 ring-rose-500/30"
|
||||
: "border-line bg-panel hover:border-ink/40 text-ink"
|
||||
)}
|
||||
>
|
||||
<span className="font-bold">{r.material.name}</span>
|
||||
<span className={isSelected ? "text-white/80" : "text-muted font-normal"}>
|
||||
({r.brand?.name || "بدون برند"})
|
||||
</span>
|
||||
{specsSummary && (
|
||||
<span className={isSelected ? "text-white/90" : "text-muted text-[11px]"}>
|
||||
[{specsSummary}]
|
||||
</span>
|
||||
)}
|
||||
<span className={cn(
|
||||
"rounded-md px-1.5 py-0.5 text-[11.5px] font-black",
|
||||
isSelected ? "bg-white/20 text-white" : "bg-bg text-foreground"
|
||||
)}>
|
||||
{faNum(r.quantity_number)} {unitName(data.lookup.units, r.unit?.id)}
|
||||
</span>
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="field md:col-span-2">
|
||||
<label className="text-xs font-semibold text-muted">متریال *</label>
|
||||
<Combobox
|
||||
@@ -908,15 +573,13 @@ export function ChangeInventoryPage() {
|
||||
)}
|
||||
</div>
|
||||
<div className="field">
|
||||
<label className="text-xs font-semibold text-muted">
|
||||
برند {type === "PROJECT_TRANSFER" ? "(اختیاری)" : "*"}
|
||||
</label>
|
||||
<label className="text-xs font-semibold text-muted">برند *</label>
|
||||
<Combobox
|
||||
value={brandTxt}
|
||||
items={data.lookup.brands.map((b) => b.name)}
|
||||
allowAdd
|
||||
addSuffix="به عنوان برند جدید"
|
||||
placeholder={type === "PROJECT_TRANSFER" ? "نام برند (اختیاری — برای اقلام بدون برند خالی بگذارید)" : "نام برند — از فهرست انتخاب یا نام جدید تایپ کنید"}
|
||||
placeholder="نام برند — از فهرست انتخاب یا نام جدید تایپ کنید"
|
||||
onInputChange={setBrandTxt}
|
||||
onChange={(it) => setBrandTxt(it.label)}
|
||||
/>
|
||||
@@ -953,13 +616,11 @@ export function ChangeInventoryPage() {
|
||||
/>
|
||||
</div>
|
||||
<div className="field md:col-span-2">
|
||||
<label className="text-xs font-semibold text-muted">
|
||||
مشخصه‌های فنی {type === "PROJECT_TRANSFER" ? "(اختیاری)" : "*"}
|
||||
</label>
|
||||
<label className="text-xs font-semibold text-muted">مشخصه‌های فنی *</label>
|
||||
<MultiSelectCombobox
|
||||
values={specsChips}
|
||||
onChange={setSpecsChips}
|
||||
placeholder={type === "PROJECT_TRANSFER" ? "مشخصات فنی (اختیاری — مثلاً مسی، سایز و…)" : "نام مشخصه را تایپ کنید و Enter بزنید (مثلاً سایز)"}
|
||||
placeholder="نام مشخصه را تایپ کنید و Enter بزنید (مثلاً سایز)"
|
||||
className="w-full"
|
||||
/>
|
||||
</div>
|
||||
@@ -967,7 +628,7 @@ export function ChangeInventoryPage() {
|
||||
<label className="text-xs font-semibold text-muted">یادداشت</label>
|
||||
<textarea
|
||||
className="w-full rounded-lg border border-line bg-panel px-3 py-2 text-xs sm:text-sm"
|
||||
placeholder={type === "PROJECT_TRANSFER" ? "توضیحات بار ارسالی، شماره بارنامه، راننده…" : "شماره فاکتور، تأمین‌کننده، توضیحات…"}
|
||||
placeholder="شماره فاکتور، تأمین‌کننده، توضیحات…"
|
||||
value={note}
|
||||
onChange={(e) => setNote(e.target.value)}
|
||||
/>
|
||||
@@ -983,11 +644,10 @@ export function ChangeInventoryPage() {
|
||||
setRows={setRows}
|
||||
records={formRecords}
|
||||
unitNameFn={(id) => unitName(data.lookup.units, id)}
|
||||
showMaterial={type === "WITHDRAWAL" || !matTxt.trim()}
|
||||
emptyMsg={
|
||||
!whId ? "برای نمایش رکوردها، ابتدا انبار را انتخاب کنید."
|
||||
: (type !== "WITHDRAWAL" && !matTxt.trim()) ? "نام متریال را تایپ کنید تا همه مدل‌های آن (با برند و مشخصه متفاوت) نمایش داده شود."
|
||||
: !formRecords.length ? (matTxt.trim() ? "برای این عبارت در انبار انتخابی رکوردی یافت نشد." : "هیچ کالای دارای موجودی در این انبار یافت نشد.")
|
||||
: !matTxt.trim() ? "نام متریال را تایپ کنید تا همه مدل‌های آن (با برند و مشخصه متفاوت) نمایش داده شود."
|
||||
: !formRecords.length ? "برای این نام متریال در انبار انتخابی رکوردی وجود ندارد. ابتدا «موجودی اولیه» ثبت کنید."
|
||||
: ""
|
||||
}
|
||||
/>
|
||||
@@ -1004,7 +664,6 @@ export function ChangeInventoryPage() {
|
||||
setRows={setRows}
|
||||
records={formRecords}
|
||||
unitNameFn={(id) => unitName(data.lookup.units, id)}
|
||||
showMaterial={!matTxt.trim()}
|
||||
emptyMsg={
|
||||
!fromId || !toId ? "برای نمایش موجودی‌ها، انبار مبدأ، مقصد و نام متریال را وارد کنید."
|
||||
: !matTxt.trim() ? "نام متریال را تایپ کنید…"
|
||||
@@ -1034,234 +693,11 @@ export function ChangeInventoryPage() {
|
||||
className="w-full sm:w-auto rounded-lg px-5 py-2.5 text-xs sm:text-[13px] font-bold text-white disabled:opacity-40 shadow-xs transition-transform active:scale-95"
|
||||
style={{ background: meta.color }}
|
||||
>
|
||||
✓ {busy ? "در حال ثبت…" : meta.label === "انتقال" ? "ثبت انتقال" : meta.label === "انتقال بین کارگاهی" ? "ثبت انتقال بین کارگاهی و کسر از انبار" : meta.label === "برگشت" ? "ثبت برگشت" : meta.label === "پیدا شده" ? "ثبت پیدا شدن" : `ثبت ${meta.label}`}
|
||||
✓ {busy ? "در حال ثبت…" : meta.label === "انتقال" ? "ثبت انتقال" : meta.label === "برگشت" ? "ثبت برگشت" : meta.label === "پیدا شده" ? "ثبت پیدا شدن" : `ثبت ${meta.label}`}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* بخش سوابق انتقال‌های بین کارگاهی این پروژه */}
|
||||
{type === "PROJECT_TRANSFER" && (
|
||||
<div className="rounded-xl border border-line bg-panel p-3 sm:p-4 w-full shadow-2xs">
|
||||
<div className="flex flex-wrap items-center justify-between gap-2 border-b border-line pb-3">
|
||||
<div>
|
||||
<h3 className="text-sm font-bold text-foreground">📋 سوابق انتقال‌های بین کارگاهی این پروژه</h3>
|
||||
<p className="mt-0.5 text-[11.5px] text-muted">
|
||||
مصالح ارسالی به سایر پروژه‌ها؛ تا زمان تأیید تحویل در مقصد می‌توانید آن‌ها را ویرایش یا لغو کنید.
|
||||
</p>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => void loadTransfers()}
|
||||
className="rounded-lg border border-line px-3 py-1.5 text-xs font-medium hover:bg-bg transition-colors"
|
||||
>
|
||||
🔄 به‌روزرسانی لیست
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{loadingTransfers ? (
|
||||
<div className="py-8 text-center text-xs text-muted">در حال بارگذاری سوابق…</div>
|
||||
) : !(transfers || []).length ? (
|
||||
<div className="py-8 text-center text-xs text-muted">هیچ انتقال بین کارگاهی از این پروژه ثبت نشده است.</div>
|
||||
) : (
|
||||
<div className="mt-3 overflow-x-auto">
|
||||
<table className="w-full text-right text-xs min-w-[650px]">
|
||||
<thead>
|
||||
<tr className="border-b border-line text-muted">
|
||||
<th className="py-2.5 pe-3">تاریخ انتقال</th>
|
||||
<th className="py-2.5 pe-3">متریال / برند</th>
|
||||
<th className="py-2.5 pe-3">مشخصات فنی</th>
|
||||
<th className="py-2.5 pe-3">مقدار</th>
|
||||
<th className="py-2.5 pe-3">مبدأ → مقصد</th>
|
||||
<th className="py-2.5 pe-3">وضعیت</th>
|
||||
<th className="py-2.5 text-center">عملیات</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-line/50">
|
||||
{(transfers || []).map((t) => {
|
||||
const isInTransit = t.status === "in_transit";
|
||||
return (
|
||||
<tr key={t.id} className="hover:bg-bg/40">
|
||||
<td className="py-3 pe-3 text-muted">{fmtDate(t.transfer_date)}</td>
|
||||
<td className="py-3 pe-3 font-semibold">
|
||||
<div>{t.material?.name}</div>
|
||||
<div className="text-[11px] text-muted font-normal">{t.brand?.name || "بدون برند"}</div>
|
||||
</td>
|
||||
<td className="py-3 pe-3 text-muted text-[11.5px]">
|
||||
{t.specs && Object.keys(t.specs).length > 0
|
||||
? Object.entries(t.specs).map(([k, v]) => `${k}: ${v}`).join(" · ")
|
||||
: "—"}
|
||||
</td>
|
||||
<td className="py-3 pe-3 font-bold text-foreground">
|
||||
{faNum(t.quantity)} {t.unit?.name_fa || t.unit?.code}
|
||||
</td>
|
||||
<td className="py-3 pe-3">
|
||||
<div className="text-[11px] text-muted">از: {t.from_warehouse?.name}</div>
|
||||
<div className="text-[12px] font-medium text-foreground">به: {t.to_project?.name}</div>
|
||||
</td>
|
||||
<td className="py-3 pe-3">
|
||||
{isInTransit ? (
|
||||
<span className="inline-flex items-center gap-1 rounded-full bg-amber-500/10 px-2.5 py-0.5 text-[11px] font-bold text-amber-700 border border-amber-500/20">
|
||||
🟡 در انتظار تأیید مقصد
|
||||
</span>
|
||||
) : (
|
||||
<div className="flex flex-col gap-0.5">
|
||||
<span className="inline-flex items-center gap-1 rounded-full bg-emerald-500/10 px-2.5 py-0.5 text-[11px] font-bold text-emerald-700 border border-emerald-500/20">
|
||||
🟢 تحویل‌شده در مقصد
|
||||
</span>
|
||||
{t.to_warehouse?.name && (
|
||||
<span className="text-[10.5px] text-muted">انبار: {t.to_warehouse.name}</span>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</td>
|
||||
<td className="py-3 text-center">
|
||||
{isInTransit ? (
|
||||
<div className="flex items-center justify-center gap-1.5">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setEditingTransfer(t);
|
||||
setEditQty(String(t.quantity));
|
||||
setEditToProjectId(t.to_project?.id || "");
|
||||
setEditNote(t.note || "");
|
||||
}}
|
||||
className="rounded-lg border border-line px-2.5 py-1 text-[11.5px] font-medium hover:bg-bg transition-colors"
|
||||
title="ویرایش انتقال"
|
||||
>
|
||||
✏️ ویرایش
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setDeleteConfirmTransfer(t)}
|
||||
className="rounded-lg border border-rose-200 bg-rose-50 px-2.5 py-1 text-[11.5px] font-medium text-rose-700 hover:bg-rose-100 transition-colors"
|
||||
title="لغو انتقال"
|
||||
>
|
||||
✕ لغو
|
||||
</button>
|
||||
</div>
|
||||
) : (
|
||||
<span className="inline-flex items-center gap-1 text-[11px] text-muted font-medium">
|
||||
🔒 قفل
|
||||
</span>
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* مودال ویرایش انتقال */}
|
||||
{editingTransfer && (
|
||||
<div className="fixed inset-0 z-50 flex items-center justify-center bg-ink/40 p-4" onClick={() => !editBusy && setEditingTransfer(null)}>
|
||||
<div className="w-full max-w-md rounded-xl border border-line bg-panel p-4 sm:p-5 shadow-xl" onClick={(e) => e.stopPropagation()}>
|
||||
<h3 className="mb-2 text-[14px] font-bold">✏️ ویرایش انتقال بین کارگاهی</h3>
|
||||
<p className="mb-3 text-[11.5px] text-muted">
|
||||
تغییر تعداد در انبار مبدأ تعدیل می‌گردد. پس از تحویل در مقصد، ویرایش غیرفعال خواهد شد.
|
||||
</p>
|
||||
|
||||
<div className="flex flex-col gap-3">
|
||||
<div className="rounded-lg border border-line bg-bg/50 p-2.5 text-xs">
|
||||
<div>متریال: <b>{editingTransfer.material?.name}</b></div>
|
||||
<div className="text-muted mt-0.5">انبار مبدأ: {editingTransfer.from_warehouse?.name}</div>
|
||||
</div>
|
||||
|
||||
<div className="field">
|
||||
<label className="text-xs font-semibold text-muted">پروژه مقصد *</label>
|
||||
<select
|
||||
className="h-9 w-full rounded-lg border border-line bg-panel px-3 text-xs sm:text-sm font-medium"
|
||||
value={editToProjectId}
|
||||
onChange={(e) => setEditToProjectId(e.target.value)}
|
||||
>
|
||||
{(allProjects || [])
|
||||
.filter((p) => p.id !== user?.project_id)
|
||||
.map((p) => (
|
||||
<option key={p.id} value={p.id}>
|
||||
{p.name}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div className="field">
|
||||
<label className="text-xs font-semibold text-muted">
|
||||
تعداد ({editingTransfer.unit?.name_fa || editingTransfer.unit?.code}) *
|
||||
</label>
|
||||
<input
|
||||
inputMode="decimal"
|
||||
className="h-9 w-full rounded-lg border border-line bg-panel px-3 text-xs sm:text-sm ltr"
|
||||
value={editQty}
|
||||
onChange={(e) => setEditQty(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="field">
|
||||
<label className="text-xs font-semibold text-muted">یادداشت</label>
|
||||
<textarea
|
||||
className="w-full rounded-lg border border-line bg-panel px-3 py-2 text-xs sm:text-sm"
|
||||
value={editNote}
|
||||
onChange={(e) => setEditNote(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="mt-4 flex items-center justify-end gap-2 border-t border-line pt-3">
|
||||
<button
|
||||
type="button"
|
||||
className="rounded-lg border border-line px-4 py-2 text-[12.5px]"
|
||||
onClick={() => setEditingTransfer(null)}
|
||||
disabled={editBusy}
|
||||
>
|
||||
انصراف
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
className="rounded-lg bg-blue-600 px-4 py-2 text-[12.5px] font-bold text-white hover:bg-blue-700 disabled:opacity-50"
|
||||
onClick={() => void handleSaveEdit()}
|
||||
disabled={editBusy}
|
||||
>
|
||||
{editBusy ? "در حال ذخیره…" : "ذخیره تغییرات"}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* دیالوگ تأیید لغو انتقال */}
|
||||
{deleteConfirmTransfer && (
|
||||
<div className="fixed inset-0 z-50 flex items-center justify-center bg-ink/40 p-4" onClick={() => !deleteBusy && setDeleteConfirmTransfer(null)}>
|
||||
<div className="w-full max-w-sm rounded-xl border border-line bg-panel p-4 sm:p-5 shadow-xl" onClick={(e) => e.stopPropagation()}>
|
||||
<h3 className="mb-2 text-[14px] font-bold text-rose-600">⚠️ لغو انتقال بین کارگاهی</h3>
|
||||
<p className="mb-3 text-[12px] leading-6 text-foreground">
|
||||
آیا از لغو این انتقال اطمینان دارید؟ با لغو انتقال، مقدار <b>{faNum(deleteConfirmTransfer.quantity)} {deleteConfirmTransfer.unit?.name_fa || deleteConfirmTransfer.unit?.code}</b> از متریال <b>{deleteConfirmTransfer.material?.name}</b> فوراً به انبار مبدأ ({deleteConfirmTransfer.from_warehouse?.name}) بازگردانده خواهد شد.
|
||||
</p>
|
||||
|
||||
<div className="mt-4 flex items-center justify-end gap-2 border-t border-line pt-3">
|
||||
<button
|
||||
type="button"
|
||||
className="rounded-lg border border-line px-4 py-2 text-[12.5px]"
|
||||
onClick={() => setDeleteConfirmTransfer(null)}
|
||||
disabled={deleteBusy}
|
||||
>
|
||||
انصراف
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
className="rounded-lg bg-rose-600 px-4 py-2 text-[12.5px] font-bold text-white hover:bg-rose-700 disabled:opacity-50"
|
||||
onClick={() => void handleConfirmDelete()}
|
||||
disabled={deleteBusy}
|
||||
>
|
||||
{deleteBusy ? "در حال لغو…" : "بله، لغو و بازگشت موجودی"}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* مودال تأیید شمارش موجودی */}
|
||||
{countConfirm && (
|
||||
<div className="fixed inset-0 z-50 flex items-center justify-center bg-ink/40 p-4" onClick={() => !countBusy && setCountConfirm(null)}>
|
||||
@@ -1326,80 +762,64 @@ export function ChangeInventoryPage() {
|
||||
)}
|
||||
|
||||
<div className="text-[11px] text-muted">
|
||||
{type === "PROJECT_TRANSFER"
|
||||
? "انتقال بین کارگاهی: موجودی فوراً از انبار مبدأ کسر شده و پس از تأیید تحویل توسط مدیر پروژه مقصد، وارد انبار مقصد می‌شود."
|
||||
: isTransfer
|
||||
? "انتقال فقط بین انبارهای یک پروژه ممکن است. با ثبت، خروجی از مبدأ و ورودی به مقصد هم‌زمان ثبت می‌شود."
|
||||
: `تاریخ انتخابی: ${jalDateLabel(new Date(dateInput))} — با «${jalDateLabel(new Date())}» برابر است.`}
|
||||
{isTransfer ? "انتقال فقط بین انبارهای یک پروژه ممکن است. با ثبت، خروجی از مبدأ و ورودی به مقصد هم‌زمان ثبت می‌شود." : `تاریخ انتخابی: ${jalDateLabel(new Date(dateInput))} — با «${jalDateLabel(new Date())}» برابر است.`}
|
||||
</div>
|
||||
</PageLayout>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function RowTable({ isCount, rows, setRows, records, unitNameFn, emptyMsg, showMaterial = true }: {
|
||||
function RowTable({ isCount, rows, setRows, records, unitNameFn, emptyMsg }: {
|
||||
isCount: boolean;
|
||||
rows: RowDraft[];
|
||||
setRows: (r: RowDraft[]) => void;
|
||||
records: { id: string; material?: { id: string; name: string }; brand: { id: string; name: string } | null; unit: { id: number; code: string; name_fa: string | null } | null; quantity_number: number; specs: Record<string, string> }[];
|
||||
records: { id: string; brand: { id: string; name: string } | null; unit: { id: number; code: string; name_fa: string | null } | null; quantity_number: number; specs: Record<string, string> }[];
|
||||
unitNameFn: (id: number | null | undefined) => string;
|
||||
emptyMsg: string;
|
||||
showMaterial?: boolean;
|
||||
}) {
|
||||
if (emptyMsg) return <div className="rounded-lg border border-dashed border-line p-4 text-[12.5px] text-muted">{emptyMsg}</div>;
|
||||
return (
|
||||
<div>
|
||||
<div className="overflow-x-auto max-h-[420px] overflow-y-auto border border-line rounded-lg">
|
||||
<table className="w-full text-[12.5px] min-w-[560px]">
|
||||
<thead className="sticky top-0 bg-panel z-10 shadow-2xs border-b border-line">
|
||||
<tr className="text-right text-muted">
|
||||
{showMaterial && <th className="py-2.5 px-3">متریال</th>}
|
||||
<th className="py-2.5 px-3">مشخصه‌ها</th>
|
||||
<th className="py-2.5 px-3">برند</th>
|
||||
<th className="py-2.5 px-3">واحد</th>
|
||||
<th className="py-2.5 px-3">موجودی فعلی</th>
|
||||
<th className="py-2.5 px-3">{isCount ? "شمارش‌شده" : "تعداد"}</th>
|
||||
<th className="py-2.5 px-3">یادداشت</th>
|
||||
<div className="overflow-x-auto">
|
||||
<table className="w-full text-[12.5px] min-w-[500px]">
|
||||
<thead>
|
||||
<tr className="border-b border-line text-right text-muted">
|
||||
<th className="py-2 pe-3">مشخصه‌ها</th>
|
||||
<th className="py-2 pe-3">برند</th>
|
||||
<th className="py-2 pe-3">واحد</th>
|
||||
<th className="py-2 pe-3">موجودی فعلی</th>
|
||||
<th className="py-2 pe-3">{isCount ? "شمارش‌شده" : "تعداد"}</th>
|
||||
<th className="py-2">یادداشت</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{records.map((r, i) => (
|
||||
<tr key={r.id} className="border-b border-line/50">
|
||||
<td className="py-2 pe-3 text-muted">{Object.entries(r.specs || {}).map(([k, v]) => `${k}: ${v}`).join(" · ") || "—"}</td>
|
||||
<td className="py-2 pe-3">{r.brand?.name || "—"}</td>
|
||||
<td className="py-2 pe-3">{unitNameFn(r.unit?.id)}</td>
|
||||
<td className="py-2 pe-3 font-bold">{faNum(r.quantity_number)}</td>
|
||||
<td className="py-2 pe-3">
|
||||
<input
|
||||
inputMode="decimal"
|
||||
className="h-8 w-24 rounded-lg border border-line bg-panel px-2 text-sm ltr"
|
||||
placeholder={isCount ? "شمارش‌شده" : "۰"}
|
||||
value={isCount && rows[i]?.qty === "" ? String(r.quantity_number) : (rows[i]?.qty || "")}
|
||||
onChange={(e) => setRows(rows.map((x, xi) => (xi === i ? { ...x, qty: e.target.value } : x)))}
|
||||
/>
|
||||
</td>
|
||||
<td className="py-2">
|
||||
<input
|
||||
className="h-8 w-32 rounded-lg border border-line bg-panel px-2 text-sm"
|
||||
placeholder="توضیح (اختیاری)"
|
||||
value={rows[i]?.note || ""}
|
||||
onChange={(e) => setRows(rows.map((x, xi) => (xi === i ? { ...x, note: e.target.value } : x)))}
|
||||
/>
|
||||
</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-line/40">
|
||||
{records.map((r, i) => (
|
||||
<tr key={r.id} className="hover:bg-bg/40 transition-colors">
|
||||
{showMaterial && (
|
||||
<td className="py-2 px-3 font-bold text-ink">
|
||||
{r.material?.name || "—"}
|
||||
</td>
|
||||
)}
|
||||
<td className="py-2 px-3 text-muted">{Object.entries(r.specs || {}).map(([k, v]) => `${k}: ${v}`).join(" · ") || "—"}</td>
|
||||
<td className="py-2 px-3">{r.brand?.name || "—"}</td>
|
||||
<td className="py-2 px-3">{unitNameFn(r.unit?.id)}</td>
|
||||
<td className="py-2 px-3 font-bold text-ink">{faNum(r.quantity_number)}</td>
|
||||
<td className="py-2 px-3">
|
||||
<input
|
||||
inputMode="decimal"
|
||||
className="h-8 w-24 rounded-lg border border-line bg-panel px-2 text-sm ltr focus:border-accent"
|
||||
placeholder={isCount ? "شمارش‌شده" : "۰"}
|
||||
value={isCount && rows[i]?.qty === "" ? String(r.quantity_number) : (rows[i]?.qty || "")}
|
||||
onChange={(e) => setRows(rows.map((x, xi) => (xi === i ? { ...x, qty: e.target.value } : x)))}
|
||||
/>
|
||||
</td>
|
||||
<td className="py-2 px-3">
|
||||
<input
|
||||
className="h-8 w-32 rounded-lg border border-line bg-panel px-2 text-sm focus:border-accent"
|
||||
placeholder="توضیح (اختیاری)"
|
||||
value={rows[i]?.note || ""}
|
||||
onChange={(e) => setRows(rows.map((x, xi) => (xi === i ? { ...x, note: e.target.value } : x)))}
|
||||
/>
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div className="mt-2 flex items-center justify-between text-[11px] text-muted">
|
||||
<span>ستون «موجودی فعلی» مقدار موجود هر رکورد است. برای هر ردیف تعداد و یادداشت وارد کنید.</span>
|
||||
<span>{faNum(records.length)} قلم کالا</span>
|
||||
</div>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
<div className="mt-2 text-[11px] text-muted">ستون «موجودی فعلی» مقدار موجود هر رکورد است. برای هر ردیف تعداد و یادداشت وارد کنید.</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -131,10 +131,9 @@ export function DailyControlPage() {
|
||||
const wGroups = useMemo(() => {
|
||||
const gmap = new Map<string, { recId: string; q: number; last: string; tx: InventoryTransaction }>();
|
||||
withdrawals.forEach((t) => {
|
||||
const gKey = `${t.inventory_id}__${t.delivered_to || ""}`;
|
||||
const g = gmap.get(gKey);
|
||||
const g = gmap.get(t.inventory_id);
|
||||
if (!g) {
|
||||
gmap.set(gKey, { recId: gKey, q: Math.abs(t.quantity_number || 0), last: t.transaction_date, tx: t });
|
||||
gmap.set(t.inventory_id, { recId: t.inventory_id, q: Math.abs(t.quantity_number || 0), last: t.transaction_date, tx: t });
|
||||
} else {
|
||||
g.q += Math.abs(t.quantity_number || 0);
|
||||
if (t.transaction_date > g.last) g.last = t.transaction_date;
|
||||
@@ -331,12 +330,6 @@ export function DailyControlPage() {
|
||||
whName(data.warehouses, g.tx.warehouse_id)
|
||||
].filter(Boolean).join(" · ")}
|
||||
</span>
|
||||
{g.tx.delivered_to && (
|
||||
<span className="inline-flex items-center gap-1 mt-1.5 text-[11px] font-semibold text-blue-700 bg-blue-50/80 border border-blue-200/60 rounded px-1.5 py-0.5 w-fit">
|
||||
<span className="text-slate-500 font-normal">تحویل به:</span>
|
||||
<span>{g.tx.delivered_to}</span>
|
||||
</span>
|
||||
)}
|
||||
</span>
|
||||
<span className="text-xs font-bold text-rose-600 tabular-nums">
|
||||
{faNum(g.q)} {unitName(data.lookup.units, g.tx.unit?.id)}
|
||||
|
||||
@@ -2,7 +2,8 @@ import { useCallback, useEffect, useState } from "react";
|
||||
import { toast } from "sonner";
|
||||
import { Header, PageLayout } from "../../components/layout/Header";
|
||||
import { useAuthStore } from "../../store/auth";
|
||||
import { apiV26, type UserRow } from "../../lib/api";
|
||||
import { api, apiV26, type UserRow } from "../../lib/api";
|
||||
import type { Project } from "../../lib/types";
|
||||
import { refreshProcurementStore, useProjects } from "../../hooks";
|
||||
import { faNum } from "../../lib/formatters";
|
||||
import { ProjectMultiSelect } from "../../components/ProjectMultiSelect";
|
||||
@@ -17,10 +18,12 @@ const ROLE_LABELS: Record<string, string> = {
|
||||
supervisor: "سرپرست پروژه",
|
||||
};
|
||||
|
||||
// پنل مستقل سازمان‌دهی (ادمین، مدیر تدارکات، مدیر پروژه) — مدیریت کاربران، نقش‌ها و تخصیص پروژه‌ها به سرپرستان
|
||||
// پنل مستقل سازمان‌دهی (ادمین، مدیر تدارکات، مدیر پروژه) — مدیریت کاربران، نقش‌ها و تخصیص پروژه‌ها و پنل‌ها
|
||||
export function OrganizationPage() {
|
||||
const user = useAuthStore((s) => s.user);
|
||||
const projects = useProjects();
|
||||
const storeProjects = useProjects();
|
||||
const [directProjects, setDirectProjects] = useState<Project[]>([]);
|
||||
const [loadingProjects, setLoadingProjects] = useState(false);
|
||||
|
||||
const [users, setUsers] = useState<UserRow[]>([]);
|
||||
const [loadingUsers, setLoadingUsers] = useState(true);
|
||||
@@ -28,11 +31,25 @@ export function OrganizationPage() {
|
||||
const [busyId, setBusyId] = useState<string | null>(null);
|
||||
|
||||
const canManage = user?.role === "admin" || user?.role === "procurement_manager" || user?.role === "pm";
|
||||
// فقط ادمین می‌تواند نقش‌ها را تغییر دهد؛ مدیران می‌توانند پروژه‌ها را به سرپرستان تخصیص دهند
|
||||
const canChangeRoles = user?.role === "admin";
|
||||
const canChangeRoles = canManage;
|
||||
|
||||
const fetchProjects = useCallback(async () => {
|
||||
try {
|
||||
setLoadingProjects(true);
|
||||
const list = await api.projects.list();
|
||||
if (list && Array.isArray(list)) {
|
||||
setDirectProjects(list);
|
||||
}
|
||||
} catch {
|
||||
// fallback silently
|
||||
} finally {
|
||||
setLoadingProjects(false);
|
||||
}
|
||||
}, []);
|
||||
|
||||
const loadUsers = useCallback(async () => {
|
||||
try {
|
||||
setLoadingUsers(true);
|
||||
const list = await apiV26.users.list();
|
||||
setUsers(list);
|
||||
} catch (err) {
|
||||
@@ -43,8 +60,13 @@ export function OrganizationPage() {
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (canManage) void loadUsers();
|
||||
}, [canManage, loadUsers]);
|
||||
if (canManage) {
|
||||
void loadUsers();
|
||||
void fetchProjects();
|
||||
}
|
||||
}, [canManage, loadUsers, fetchProjects]);
|
||||
|
||||
const projects = storeProjects.length > 0 ? storeProjects : directProjects;
|
||||
|
||||
const syncUsers = async () => {
|
||||
setSyncing(true);
|
||||
@@ -57,6 +79,7 @@ export function OrganizationPage() {
|
||||
: "همگام‌سازی انجام شد — کاربر جدیدی یافت نشد",
|
||||
);
|
||||
refreshProcurementStore();
|
||||
void fetchProjects();
|
||||
} catch (err) {
|
||||
toast.error(err instanceof Error ? err.message : "خطا در همگام‌سازی با Casdoor");
|
||||
} finally {
|
||||
@@ -91,39 +114,8 @@ export function OrganizationPage() {
|
||||
}
|
||||
};
|
||||
|
||||
const assignedProjectsOf = (u: UserRow) =>
|
||||
u.projects ?? (u.project_id ? [{ id: u.project_id, name: u.project_name ?? "" }] : []);
|
||||
|
||||
const syncUserProjects = async (u: UserRow, nextIds: string[]) => {
|
||||
const current = assignedProjectsOf(u).map((p) => p.id);
|
||||
const added = nextIds.filter((id) => !current.includes(id));
|
||||
const removed = current.filter((id) => !nextIds.includes(id));
|
||||
if (!added.length && !removed.length) return;
|
||||
setBusyId(u.id);
|
||||
try {
|
||||
for (const pid of added) await apiV26.projects.setPm(pid, u.id);
|
||||
for (const pid of removed) await apiV26.projects.setPm(pid, null);
|
||||
const names = nextIds
|
||||
.map((id) => projects.find((p) => p.id === id)?.name)
|
||||
.filter(Boolean)
|
||||
.join("، ");
|
||||
toast.success(
|
||||
nextIds.length
|
||||
? `پروژه‌های «${u.first_name} ${u.last_name}» به‌روزرسانی شد: ${names} ✓`
|
||||
: `«${u.first_name} ${u.last_name}» از همه‌ی پروژه‌ها جدا شد`,
|
||||
);
|
||||
await loadUsers();
|
||||
refreshProcurementStore();
|
||||
} catch (err) {
|
||||
toast.error(err instanceof Error ? err.message : "خطا در به‌روزرسانی پروژه‌ها");
|
||||
await loadUsers();
|
||||
} finally {
|
||||
setBusyId(null);
|
||||
}
|
||||
};
|
||||
|
||||
// ---------- لایه پنل‌ها: تخصیص پنل + سطح دسترسی و عضویت پروژه‌ای ----------
|
||||
const setPanel = async (u: UserRow, panel: "procurement" | "inventory", level: "" | "full" | "limited") => {
|
||||
const setPanel = async (u: UserRow, panel: "procurement" | "inventory" | "pm", level: "" | "full" | "limited") => {
|
||||
setBusyId(u.id);
|
||||
const next = { ...(u.panels ?? {}) };
|
||||
if (level) next[panel] = level;
|
||||
@@ -157,12 +149,14 @@ export function OrganizationPage() {
|
||||
const panelLabel = (level: string | undefined) =>
|
||||
level === "full" ? "کامل" : level === "limited" ? "محدود" : "—";
|
||||
|
||||
// سرپرستان تخصیص‌یافته به یک پروژه
|
||||
// سرپرستان و مسئولان تخصیص‌یافته به یک پروژه
|
||||
const supervisorsOf = (projectId: string) =>
|
||||
users.filter(
|
||||
(u) =>
|
||||
(u.role === "supervisor" || u.role === "pm") &&
|
||||
(u.projects?.some((p) => p.id === projectId) || u.project_id === projectId),
|
||||
(u.role === "supervisor" || u.role === "pm" || Boolean(u.panels?.pm)) &&
|
||||
(u.projects?.some((p) => p.id === projectId) ||
|
||||
u.project_id === projectId ||
|
||||
u.member_project_ids?.includes(projectId)),
|
||||
);
|
||||
|
||||
return (
|
||||
@@ -172,34 +166,33 @@ export function OrganizationPage() {
|
||||
brand
|
||||
menu={<AppSwitcherMenu activeModule="organization" />}
|
||||
/>
|
||||
<PageLayout className="flex flex-col gap-4">
|
||||
<div className="rounded-lg border border-blue/20 bg-blue/5 px-3 py-2 text-[12px] leading-6 text-muted">
|
||||
ℹ️ کاربران در Casdoor تعریف شده و از طریق دکمه «همگام‌سازی» اضافه می‌شوند. نقش‌ها در این پنل توسط ادمین تعیین می‌گردند.
|
||||
مدیران پروژه و تدارکات می‌توانند پروژه‌ها را به سرپرستان پروژه تخصیص دهند.
|
||||
<PageLayout className="flex flex-col gap-5">
|
||||
<div className="rounded-lg border border-blue/20 bg-blue/5 px-3.5 py-2.5 text-[12px] leading-6 text-muted">
|
||||
ℹ️ کاربران در سامانه احراز هویت (Casdoor) تعریف شده و با کلیک بر روی دکمه «همگام‌سازی» اضافه می‌شوند. نقش‌های سازمانی و سطوح دسترسی هر پنل در جدول زیر توسط ادمین تعیین می‌گردد.
|
||||
</div>
|
||||
|
||||
{/* ---------- بخش ۱: جدول کاربران و نقش‌ها ---------- */}
|
||||
{/* ---------- بخش ۱: جدول یکپارچه کاربران، نقش‌ها و سطوح دسترسی پنل‌ها ---------- */}
|
||||
<div className="rounded-xl border border-line bg-panel p-4">
|
||||
<div className="mb-3 flex flex-wrap items-center justify-between gap-2">
|
||||
<div>
|
||||
<h3 className="text-[14px] font-bold">👥 کاربران و نقش‌ها</h3>
|
||||
<h3 className="text-[14px] font-bold">👥 کاربران، نقش‌ها و سطوح دسترسی پنل‌ها</h3>
|
||||
<p className="mt-0.5 text-[11.5px] text-muted">
|
||||
تعیین نقش کاربران و تخصیص پروژه‌ها به سرپرستان پروژه
|
||||
تعیین نقش سازمانی، تخصیص پنل‌ها (تدارکات، انبار، PM) و مشخص نمودن پروژه‌های عضویت کاربر
|
||||
</p>
|
||||
</div>
|
||||
<button
|
||||
onClick={() => void syncUsers()}
|
||||
disabled={syncing}
|
||||
className="rounded-lg border border-accent/40 bg-accent/5 px-3 py-1.5 text-[12px] font-bold text-accent disabled:opacity-50"
|
||||
className="rounded-lg border border-accent/40 bg-accent/5 px-3 py-1.5 text-[12px] font-bold text-accent hover:bg-accent/10 transition-colors disabled:opacity-50"
|
||||
>
|
||||
{syncing ? "در حال همگام‌سازی…" : "🔄 همگام‌سازی از Casdoor"}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{loadingUsers ? (
|
||||
<div className="py-3 text-[12.5px] text-muted">در حال بارگذاری کاربران…</div>
|
||||
<div className="py-8 text-center text-[12.5px] text-muted">در حال بارگذاری کاربران…</div>
|
||||
) : !users.length ? (
|
||||
<div className="rounded-lg border border-dashed border-line px-3 py-3 text-[12px] text-muted">
|
||||
<div className="rounded-lg border border-dashed border-line px-3 py-6 text-center text-[12px] text-muted">
|
||||
کاربری ثبت نشده است — دکمه‌ی «همگام‌سازی از Casdoor» را بزنید.
|
||||
</div>
|
||||
) : (
|
||||
@@ -207,210 +200,394 @@ export function OrganizationPage() {
|
||||
<table className="w-full text-[12.5px]">
|
||||
<thead>
|
||||
<tr className="border-b border-line text-right text-muted">
|
||||
<th className="py-2 pe-3">نام</th>
|
||||
<th className="py-2 pe-3">نام کاربری</th>
|
||||
<th className="py-2 pe-3">نقش</th>
|
||||
<th className="py-2 pe-3">پروژه‌های تخصیص‌یافته (سرپرست پروژه)</th>
|
||||
<th className="py-2">وضعیت</th>
|
||||
<th className="py-2.5 pe-3">نام و مشخصات</th>
|
||||
<th className="py-2.5 pe-3">نقش سازمانی</th>
|
||||
<th className="py-2.5 pe-3">پنل تدارکات</th>
|
||||
<th className="py-2.5 pe-3">پنل انبار</th>
|
||||
<th className="py-2.5 pe-3">پنل مدیریت پروژه (PM)</th>
|
||||
<th className="py-2.5">پروژه‌های عضویت (محدوده سطح محدود)</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{users.map((u) => (
|
||||
<tr key={u.id} className="border-b border-line/50">
|
||||
<td className="py-2.5 pe-3">
|
||||
<b>{u.first_name} {u.last_name}</b>
|
||||
</td>
|
||||
<td className="py-2.5 pe-3 font-mono text-[11px] text-muted">
|
||||
{u.username || "—"}
|
||||
</td>
|
||||
<td className="py-2.5 pe-3">
|
||||
{canChangeRoles ? (
|
||||
<select
|
||||
className="h-7 rounded-lg border border-line bg-panel px-2 text-[12px]"
|
||||
value={u.role ?? ""}
|
||||
disabled={busyId === u.id}
|
||||
onChange={(e) => void changeRole(u, (e.target.value || null) as Role)}
|
||||
>
|
||||
<option value="">— بدون نقش —</option>
|
||||
<option value="admin">ادمین</option>
|
||||
<option value="procurement_manager">مدیر تدارکات</option>
|
||||
<option value="pm">مدیر پروژه</option>
|
||||
<option value="supervisor">سرپرست پروژه</option>
|
||||
</select>
|
||||
) : (
|
||||
<span className="rounded bg-panel px-2 py-0.5 text-[11px] font-semibold">
|
||||
{ROLE_LABELS[u.role ?? ""] ?? "بدون نقش"}
|
||||
</span>
|
||||
)}
|
||||
</td>
|
||||
<td className="py-2.5 pe-3">
|
||||
{u.role === "supervisor" || u.role === "pm" ? (
|
||||
<div className="w-72">
|
||||
<ProjectMultiSelect
|
||||
options={projects.map((p) => ({ id: p.id, name: p.name }))}
|
||||
values={assignedProjectsOf(u).map((p) => p.id)}
|
||||
onChange={(nextIds) => void syncUserProjects(u, nextIds)}
|
||||
disabled={busyId === u.id}
|
||||
/>
|
||||
{users.map((u) => {
|
||||
const isAdmin = u.role === "admin";
|
||||
const hasPanel = Boolean(u.panels?.procurement || u.panels?.inventory || u.panels?.pm);
|
||||
|
||||
return (
|
||||
<tr key={u.id} className="border-b border-line/50 transition-colors hover:bg-canvas/30">
|
||||
{/* ۱. نام و نام کاربری */}
|
||||
<td className="py-2.5 pe-3">
|
||||
<div className="flex flex-col">
|
||||
<div className="flex items-center gap-1.5">
|
||||
<span className="font-bold text-foreground">
|
||||
{u.first_name} {u.last_name}
|
||||
</span>
|
||||
<span className="font-mono text-[10px] text-muted">
|
||||
({u.username || "—"})
|
||||
</span>
|
||||
</div>
|
||||
{busyId === u.id && (
|
||||
<span className="text-[10px] text-accent animate-pulse font-medium">
|
||||
در حال ذخیره تغییرات…
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
) : (
|
||||
<span className="text-[11px] text-muted">
|
||||
{u.role === "admin"
|
||||
? "دسترسی کامل به همه پروژه‌ها"
|
||||
: u.role === "procurement_manager"
|
||||
? "دسترسی کامل مدیریتی"
|
||||
: "—"}
|
||||
</span>
|
||||
)}
|
||||
</td>
|
||||
<td className="py-2.5 text-[11px] text-muted">
|
||||
{busyId === u.id ? (
|
||||
<span className="text-accent">در حال ذخیره…</span>
|
||||
) : (
|
||||
<span className="text-emerald-600">✓ ثبت‌شده</span>
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</td>
|
||||
|
||||
{/* ۲. نقش سازمانی */}
|
||||
<td className="py-2.5 pe-3">
|
||||
{canChangeRoles ? (
|
||||
<select
|
||||
className="h-7 rounded-lg border border-line bg-panel px-2 text-[12px] focus:outline-none focus:ring-1 focus:ring-accent"
|
||||
value={u.role ?? ""}
|
||||
disabled={busyId === u.id}
|
||||
onChange={(e) => void changeRole(u, (e.target.value || null) as Role)}
|
||||
>
|
||||
<option value="">— بدون نقش —</option>
|
||||
<option value="admin">ادمین</option>
|
||||
<option value="procurement_manager">مدیر تدارکات</option>
|
||||
<option value="pm">مدیر پروژه</option>
|
||||
<option value="supervisor">سرپرست پروژه</option>
|
||||
</select>
|
||||
) : (
|
||||
<span className="rounded bg-panel px-2 py-0.5 text-[11px] font-semibold text-muted">
|
||||
{ROLE_LABELS[u.role ?? ""] ?? "بدون نقش"}
|
||||
</span>
|
||||
)}
|
||||
</td>
|
||||
|
||||
{/* ۳. پنل تدارکات */}
|
||||
<td className="py-2.5 pe-3">
|
||||
{isAdmin ? (
|
||||
<span className="text-[11px] text-muted">کامل (ادمین)</span>
|
||||
) : canChangeRoles ? (
|
||||
<select
|
||||
className="h-7 rounded-lg border border-line bg-panel px-2 text-[12px] focus:outline-none focus:ring-1 focus:ring-accent"
|
||||
value={u.panels?.procurement ?? ""}
|
||||
disabled={busyId === u.id}
|
||||
onChange={(e) => void setPanel(u, "procurement", e.target.value as "" | "full" | "limited")}
|
||||
>
|
||||
<option value="">— بدون تخصیص —</option>
|
||||
<option value="full">کامل</option>
|
||||
<option value="limited">محدود (فقط استعلام)</option>
|
||||
</select>
|
||||
) : (
|
||||
<span className="text-[11px]">{panelLabel(u.panels?.procurement)}</span>
|
||||
)}
|
||||
</td>
|
||||
|
||||
{/* ۴. پنل انبار */}
|
||||
<td className="py-2.5 pe-3">
|
||||
{isAdmin ? (
|
||||
<span className="text-[11px] text-muted">کامل (ادمین)</span>
|
||||
) : canChangeRoles ? (
|
||||
<select
|
||||
className="h-7 rounded-lg border border-line bg-panel px-2 text-[12px] focus:outline-none focus:ring-1 focus:ring-accent"
|
||||
value={u.panels?.inventory ?? ""}
|
||||
disabled={busyId === u.id}
|
||||
onChange={(e) => void setPanel(u, "inventory", e.target.value as "" | "full" | "limited")}
|
||||
>
|
||||
<option value="">— بدون تخصیص —</option>
|
||||
<option value="full">کامل (بدون تغییر موجودی)</option>
|
||||
<option value="limited">محدود (با تغییر موجودی)</option>
|
||||
</select>
|
||||
) : (
|
||||
<span className="text-[11px]">{panelLabel(u.panels?.inventory)}</span>
|
||||
)}
|
||||
</td>
|
||||
|
||||
{/* ۵. پنل مدیریت پروژه (PM) */}
|
||||
<td className="py-2.5 pe-3">
|
||||
{isAdmin ? (
|
||||
<span className="text-[11px] text-muted">کامل (ادمین)</span>
|
||||
) : canChangeRoles ? (
|
||||
<select
|
||||
className="h-7 rounded-lg border border-line bg-panel px-2 text-[12px] focus:outline-none focus:ring-1 focus:ring-accent"
|
||||
value={u.panels?.pm ?? ""}
|
||||
disabled={busyId === u.id}
|
||||
onChange={(e) => void setPanel(u, "pm", e.target.value as "" | "full" | "limited")}
|
||||
>
|
||||
<option value="">— بدون تخصیص —</option>
|
||||
<option value="full">کامل</option>
|
||||
<option value="limited">محدود</option>
|
||||
</select>
|
||||
) : (
|
||||
<span className="text-[11px]">{panelLabel(u.panels?.pm)}</span>
|
||||
)}
|
||||
</td>
|
||||
|
||||
{/* ۶. پروژه‌های عضویت */}
|
||||
<td className="py-2.5">
|
||||
{isAdmin ? (
|
||||
<span className="text-[11px] text-muted">دسترسی خودکار به تمام پروژه‌ها</span>
|
||||
) : hasPanel ? (
|
||||
<div className="w-72">
|
||||
<ProjectMultiSelect
|
||||
options={projects.map((p) => ({ id: p.id, name: p.name }))}
|
||||
values={u.member_project_ids ?? []}
|
||||
onChange={(nextIds) => void setMemberProjects(u, nextIds)}
|
||||
disabled={busyId === u.id}
|
||||
/>
|
||||
</div>
|
||||
) : (
|
||||
<span className="text-[11px] text-muted">— ابتدا پنل تخصیص دهید —</span>
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
<div className="mt-2 text-[11px] text-muted">
|
||||
سرپرستان پروژه‌ای که پروژه‌ای به آن‌ها تخصیص داده نشده باشد، تا زمان تخصیص پروژه اجازه ورود به سامانه را نخواهند داشت.
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* ---------- بخش ۲: کارت‌های پروژه‌ها و سرپرستان مسئول ---------- */}
|
||||
<div>
|
||||
<h3 className="mb-2 text-[14px] font-bold">🏢 پروژه‌ها و سرپرستان مسئول</h3>
|
||||
<div className="grid grid-cols-1 gap-3 md:grid-cols-2 lg:grid-cols-3">
|
||||
{projects.map((p) => {
|
||||
const sups = supervisorsOf(p.id);
|
||||
return (
|
||||
<div key={p.id} className="rounded-xl border border-line bg-panel p-4">
|
||||
<div className="mb-2 flex items-center justify-between">
|
||||
<h4 className="text-[14px] font-bold">🏢 {p.name}</h4>
|
||||
<span className="rounded-lg bg-panel px-2 py-0.5 text-[11px] text-muted">
|
||||
{p.status || "پروژه فعال"}
|
||||
</span>
|
||||
</div>
|
||||
{p.description && (
|
||||
<p className="mb-3 text-[12px] text-muted line-clamp-2">{p.description}</p>
|
||||
)}
|
||||
<div>
|
||||
<h5 className="mb-1.5 text-[11.5px] font-bold text-muted">👤 سرپرست(های) پروژه:</h5>
|
||||
{!sups.length ? (
|
||||
<div className="rounded-lg border border-dashed border-line px-3 py-2 text-[11.5px] text-amber-600">
|
||||
⚠️ سرپرستی تعیین نشده است — از جدول بالا پروژه را به سرپرست تخصیص دهید.
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex flex-col gap-1">
|
||||
{sups.map((s) => (
|
||||
<div key={s.id} className="flex items-center gap-2 rounded-lg border border-line px-2.5 py-1.5 text-[12px]">
|
||||
<span className="font-semibold">{s.first_name} {s.last_name}</span>
|
||||
<span className="text-[10px] text-muted font-mono">({s.username})</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
{/* ---------- بخش ۳: پنل‌ها و سطوح دسترسی (جایگزین نقش‌ها) ---------- */}
|
||||
<div className="rounded-xl border border-line bg-panel p-4">
|
||||
<div className="mb-3">
|
||||
<h3 className="text-[14px] font-bold">🔑 پنل‌ها و سطوح دسترسی</h3>
|
||||
<p className="mt-0.5 text-[11.5px] leading-5 text-muted">
|
||||
به هر شخص پنل «تدارکات» یا «انبار» را تخصیص دهید. تدارکات — کامل: تغییر در کل پنل؛ محدود: فقط افزودن
|
||||
استعلام برای پروژه‌های عضویت. انبار — کامل: همه پروژه‌ها بدون تغییر موجودی؛ محدود: فقط پروژه‌های عضویت با
|
||||
امکان تغییر موجودی. ادمین دست‌نخورده است.
|
||||
</p>
|
||||
<div className="mb-2 flex items-center justify-between">
|
||||
<div>
|
||||
<h3 className="text-[14px] font-bold">🏢 پروژه‌ها و سرپرستان مسئول</h3>
|
||||
<p className="text-[11.5px] text-muted">
|
||||
مشاهده وضعیت پروژه‌ها و سرپرستان یا اعضای تخصیص‌یافته به هر پروژه
|
||||
</p>
|
||||
</div>
|
||||
{loadingProjects && (
|
||||
<span className="text-[11px] text-muted animate-pulse">در حال به‌روزرسانی پروژه‌ها…</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="overflow-x-auto">
|
||||
<table className="w-full text-[12.5px]">
|
||||
<thead>
|
||||
<tr className="border-b border-line text-right text-muted">
|
||||
<th className="py-2 pe-3">نام</th>
|
||||
<th className="py-2 pe-3">پنل تدارکات</th>
|
||||
<th className="py-2 pe-3">پنل انبار</th>
|
||||
<th className="py-2">پروژه‌های عضویت (محدوده سطح محدود)</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{users.map((u) => {
|
||||
if (u.role === "admin") {
|
||||
return (
|
||||
<tr key={u.id} className="border-b border-line/50">
|
||||
<td className="py-2.5 pe-3"><b>{u.first_name} {u.last_name}</b></td>
|
||||
<td colSpan={3} className="py-2.5 text-[11px] text-muted">
|
||||
ادمین — دسترسی کامل به همه پنل‌ها (دست‌نخورده)
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
}
|
||||
const hasPanel = Boolean(u.panels?.procurement || u.panels?.inventory);
|
||||
return (
|
||||
<tr key={u.id} className="border-b border-line/50">
|
||||
<td className="py-2.5 pe-3">
|
||||
<b>{u.first_name} {u.last_name}</b>
|
||||
<span className="ms-1 font-mono text-[10px] text-muted">({u.username || "—"})</span>
|
||||
</td>
|
||||
<td className="py-2.5 pe-3">
|
||||
{canChangeRoles ? (
|
||||
<select
|
||||
className="h-7 rounded-lg border border-line bg-panel px-2 text-[12px]"
|
||||
value={u.panels?.procurement ?? ""}
|
||||
disabled={busyId === u.id}
|
||||
onChange={(e) => void setPanel(u, "procurement", e.target.value as "" | "full" | "limited")}
|
||||
>
|
||||
<option value="">— بدون تخصیص —</option>
|
||||
<option value="full">کامل</option>
|
||||
<option value="limited">محدود (فقط استعلام)</option>
|
||||
</select>
|
||||
) : (
|
||||
<span className="text-[11px]">{panelLabel(u.panels?.procurement)}</span>
|
||||
)}
|
||||
</td>
|
||||
<td className="py-2.5 pe-3">
|
||||
{canChangeRoles ? (
|
||||
<select
|
||||
className="h-7 rounded-lg border border-line bg-panel px-2 text-[12px]"
|
||||
value={u.panels?.inventory ?? ""}
|
||||
disabled={busyId === u.id}
|
||||
onChange={(e) => void setPanel(u, "inventory", e.target.value as "" | "full" | "limited")}
|
||||
>
|
||||
<option value="">— بدون تخصیص —</option>
|
||||
<option value="full">کامل (بدون تغییر موجودی)</option>
|
||||
<option value="limited">محدود (با تغییر موجودی)</option>
|
||||
</select>
|
||||
) : (
|
||||
<span className="text-[11px]">{panelLabel(u.panels?.inventory)}</span>
|
||||
)}
|
||||
</td>
|
||||
<td className="py-2.5">
|
||||
{hasPanel ? (
|
||||
<div className="w-72">
|
||||
<ProjectMultiSelect
|
||||
options={projects.map((p) => ({ id: p.id, name: p.name }))}
|
||||
values={u.member_project_ids ?? []}
|
||||
onChange={(nextIds) => void setMemberProjects(u, nextIds)}
|
||||
disabled={busyId === u.id}
|
||||
/>
|
||||
</div>
|
||||
) : (
|
||||
<span className="text-[11px] text-muted">— ابتدا پنل تخصیص دهید —</span>
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
{loadingProjects && !projects.length ? (
|
||||
<div className="rounded-xl border border-line bg-panel p-6 text-center text-xs text-muted">
|
||||
در حال دریافت اطلاعات پروژه‌ها…
|
||||
</div>
|
||||
) : !projects.length ? (
|
||||
<div className="rounded-xl border border-dashed border-line bg-panel p-6 text-center text-xs text-muted flex flex-col items-center gap-2">
|
||||
<span>پروژه‌ای برای نمایش یافت نشد یا در دسترس نیست.</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => void fetchProjects()}
|
||||
className="rounded-lg bg-accent/10 px-3 py-1 text-xs font-semibold text-accent hover:bg-accent/20 transition-colors"
|
||||
>
|
||||
🔄 تلاش مجدد برای دریافت پروژه‌ها
|
||||
</button>
|
||||
</div>
|
||||
) : (
|
||||
<div className="grid grid-cols-1 gap-3 md:grid-cols-2 lg:grid-cols-3">
|
||||
{projects.map((p) => {
|
||||
const sups = supervisorsOf(p.id);
|
||||
return (
|
||||
<div key={p.id} className="rounded-xl border border-line bg-panel p-4 flex flex-col justify-between">
|
||||
<div>
|
||||
<div className="mb-2 flex items-center justify-between">
|
||||
<h4 className="text-[14px] font-bold text-foreground">🏢 {p.name}</h4>
|
||||
<span className="rounded-lg bg-canvas px-2 py-0.5 text-[11px] text-muted font-medium border border-line">
|
||||
{p.status || "پروژه فعال"}
|
||||
</span>
|
||||
</div>
|
||||
{p.description && (
|
||||
<p className="mb-3 text-[12px] text-muted line-clamp-2">{p.description}</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="pt-2 border-t border-line/50">
|
||||
<h5 className="mb-1.5 text-[11.5px] font-bold text-muted">👤 سرپرست(های) مسئول:</h5>
|
||||
{!sups.length ? (
|
||||
<div className="rounded-lg border border-dashed border-line px-3 py-2 text-[11.5px] text-amber-600 dark:text-amber-400 bg-amber-500/5">
|
||||
⚠️ سرپرستی تعیین نشده است — از جدول بالا، این پروژه را به عنوان عضویت تخصیص دهید.
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex flex-col gap-1">
|
||||
{sups.map((s) => (
|
||||
<div key={s.id} className="flex items-center justify-between rounded-lg border border-line bg-canvas/40 px-2.5 py-1.5 text-[12px]">
|
||||
<span className="font-semibold text-foreground">{s.first_name} {s.last_name}</span>
|
||||
<span className="text-[10px] text-muted font-mono">({s.username || ROLE_LABELS[s.role ?? ""] || "عضو"})</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* ---------- بخش ۴: راهنما و توضیحات سطوح دسترسی پنل‌ها ---------- */}
|
||||
<div className="rounded-xl border border-line bg-panel p-5">
|
||||
<div className="mb-4 flex items-center justify-between border-b border-line pb-3">
|
||||
<div>
|
||||
<h3 className="flex items-center gap-2 text-[15px] font-bold">
|
||||
<span className="flex h-7 w-7 items-center justify-center rounded-lg bg-accent/10 text-accent">
|
||||
📖
|
||||
</span>
|
||||
توضیحات پنل‌ها و راهنمای سطوح دسترسی
|
||||
</h3>
|
||||
<p className="mt-1 text-[12px] text-muted">
|
||||
مفهوم، اختیارات و محدوده کاری هر سطح دسترسی (کامل / محدود) در هر یک از پنل‌های سامانه
|
||||
</p>
|
||||
</div>
|
||||
<div className="hidden sm:flex items-center gap-2 text-[11px] text-muted bg-panel border border-line px-3 py-1.5 rounded-lg">
|
||||
<span className="h-2 w-2 rounded-full bg-emerald-500 animate-pulse" />
|
||||
مدل دسترسی ماژولار مبتنی بر پنل
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-1 gap-4 lg:grid-cols-3">
|
||||
{/* کارت پنل تدارکات */}
|
||||
<div className="flex flex-col rounded-xl border border-line bg-canvas/40 p-4 transition-all hover:border-sky-500/40">
|
||||
<div className="mb-3 flex items-center justify-between">
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="flex h-8 w-8 items-center justify-center rounded-lg bg-sky-500/10 text-[18px]">
|
||||
🛒
|
||||
</span>
|
||||
<div>
|
||||
<h4 className="text-[13.5px] font-bold text-foreground">پنل تدارکات</h4>
|
||||
<span className="text-[10.5px] text-muted font-mono">Procurement</span>
|
||||
</div>
|
||||
</div>
|
||||
<span className="rounded-md bg-sky-500/10 px-2 py-0.5 text-[11px] font-medium text-sky-600 dark:text-sky-400">
|
||||
خرید و بازرگانی
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div className="flex-1 space-y-3">
|
||||
<div className="rounded-lg border border-line/60 bg-panel/70 p-3">
|
||||
<div className="mb-1 flex items-center gap-1.5">
|
||||
<span className="inline-block h-2 w-2 rounded-full bg-emerald-500" />
|
||||
<span className="text-[12px] font-bold text-emerald-600 dark:text-emerald-400">سطح کامل (Full)</span>
|
||||
</div>
|
||||
<ul className="space-y-1 pe-2 text-[11.5px] leading-relaxed text-muted list-disc list-inside">
|
||||
<li>دسترسی کامل مدیریتی به تمامی بخش‌های تدارکات</li>
|
||||
<li>ثبت و ویرایش پیش‌فاکتورها، شرایط پرداخت و فاکتورها</li>
|
||||
<li>مدیریت تأمین‌کنندگان، اقلام و تصمیم‌گیری خرید در همه پروژه‌ها</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div className="rounded-lg border border-line/60 bg-panel/70 p-3">
|
||||
<div className="mb-1 flex items-center gap-1.5">
|
||||
<span className="inline-block h-2 w-2 rounded-full bg-amber-500" />
|
||||
<span className="text-[12px] font-bold text-amber-600 dark:text-amber-400">سطح محدود (Limited - متقاضی)</span>
|
||||
</div>
|
||||
<ul className="space-y-1 pe-2 text-[11.5px] leading-relaxed text-muted list-disc list-inside">
|
||||
<li>فقط امکان ثبت درخواست استعلام قیمت و پیش‌فاکتور اولیه</li>
|
||||
<li>محدود منحصراً به پروژه‌هایی که کاربر در آن‌ها عضویت دارد</li>
|
||||
<li>عدم دسترسی به تأییدات نهایی، تغییر قیمت‌ها یا پروژه‌های غیرعضو</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* کارت پنل انبار */}
|
||||
<div className="flex flex-col rounded-xl border border-line bg-canvas/40 p-4 transition-all hover:border-amber-500/40">
|
||||
<div className="mb-3 flex items-center justify-between">
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="flex h-8 w-8 items-center justify-center rounded-lg bg-amber-500/10 text-[18px]">
|
||||
📦
|
||||
</span>
|
||||
<div>
|
||||
<h4 className="text-[13.5px] font-bold text-foreground">پنل انبار</h4>
|
||||
<span className="text-[10.5px] text-muted font-mono">Inventory</span>
|
||||
</div>
|
||||
</div>
|
||||
<span className="rounded-md bg-amber-500/10 px-2 py-0.5 text-[11px] font-medium text-amber-600 dark:text-amber-400">
|
||||
انبارداری و موجودی
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div className="flex-1 space-y-3">
|
||||
<div className="rounded-lg border border-line/60 bg-panel/70 p-3">
|
||||
<div className="mb-1 flex items-center gap-1.5">
|
||||
<span className="inline-block h-2 w-2 rounded-full bg-emerald-500" />
|
||||
<span className="text-[12px] font-bold text-emerald-600 dark:text-emerald-400">سطح کامل (Full - مدیر/ناظر)</span>
|
||||
</div>
|
||||
<ul className="space-y-1 pe-2 text-[11.5px] leading-relaxed text-muted list-disc list-inside">
|
||||
<li>مشاهده موجودی و کاردکس کالا در تمامی انبارها و پروژه‌ها</li>
|
||||
<li>پایش و نظارت بر گردش کالا در کل سازمان و گزارش‌گیری کلان</li>
|
||||
<li className="font-semibold text-amber-700 dark:text-amber-300">بدون امکان تغییر مستقیم موجودی (جهت حفظ سلامت داده و کنترل نظارتی)</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div className="rounded-lg border border-line/60 bg-panel/70 p-3">
|
||||
<div className="mb-1 flex items-center gap-1.5">
|
||||
<span className="inline-block h-2 w-2 rounded-full bg-amber-500" />
|
||||
<span className="text-[12px] font-bold text-amber-600 dark:text-amber-400">سطح محدود (Limited - انباردار کارگاه)</span>
|
||||
</div>
|
||||
<ul className="space-y-1 pe-2 text-[11.5px] leading-relaxed text-muted list-disc list-inside">
|
||||
<li>دسترسی فقط به انبارهای پروژه‌های عضویت کاربر</li>
|
||||
<li>امکان ثبت و تغییر موجودی، رسید کالا، حواله مصرف و تطبیق فیزیکی</li>
|
||||
<li>تفکیک دقیق موجودی و تراکنش‌های انبار بر اساس پروژه</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* کارت پنل مدیریت پروژه (PM) */}
|
||||
<div className="flex flex-col rounded-xl border border-line bg-canvas/40 p-4 transition-all hover:border-indigo-500/40">
|
||||
<div className="mb-3 flex items-center justify-between">
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="flex h-8 w-8 items-center justify-center rounded-lg bg-indigo-500/10 text-[18px]">
|
||||
📊
|
||||
</span>
|
||||
<div>
|
||||
<h4 className="text-[13.5px] font-bold text-foreground">پنل مدیریت پروژه (PM)</h4>
|
||||
<span className="text-[10.5px] text-muted font-mono">Project Management</span>
|
||||
</div>
|
||||
</div>
|
||||
<span className="rounded-md bg-indigo-500/10 px-2 py-0.5 text-[11px] font-medium text-indigo-600 dark:text-indigo-400">
|
||||
کنترل پروژه و اجرا
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div className="flex-1 space-y-3">
|
||||
<div className="rounded-lg border border-line/60 bg-panel/70 p-3">
|
||||
<div className="mb-1 flex items-center gap-1.5">
|
||||
<span className="inline-block h-2 w-2 rounded-full bg-emerald-500" />
|
||||
<span className="text-[12px] font-bold text-emerald-600 dark:text-emerald-400">سطح کامل (Full - مدیر پروژه)</span>
|
||||
</div>
|
||||
<ul className="space-y-1 pe-2 text-[11.5px] leading-relaxed text-muted list-disc list-inside">
|
||||
<li>مدیریت جامع ساختار شکست کار (WBS)، زمان‌بندی و گانت چارت تعاملی</li>
|
||||
<li>تعریف و ویرایش فعالیت‌ها، ثبت خط مبنا (Baseline)، کنترل هزینه و منابع</li>
|
||||
<li>پایش شاخص‌های پیشرفت زمانی و مالی (EVM) و گزارش‌های تحلیلی</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div className="rounded-lg border border-line/60 bg-panel/70 p-3">
|
||||
<div className="mb-1 flex items-center gap-1.5">
|
||||
<span className="inline-block h-2 w-2 rounded-full bg-amber-500" />
|
||||
<span className="text-[12px] font-bold text-amber-600 dark:text-amber-400">سطح محدود (Limited - سرپرست/کارشناس)</span>
|
||||
</div>
|
||||
<ul className="space-y-1 pe-2 text-[11.5px] leading-relaxed text-muted list-disc list-inside">
|
||||
<li>مشاهده فعالیت‌ها و تسک‌های مربوط به پروژه‌های عضویت کاربر</li>
|
||||
<li>به‌روزرسانی درصد پیشرفت فیزیکی و وضعیت انجام تسک‌ها</li>
|
||||
<li>تکمیل چک‌لیست‌های کنترل کیفیت (QC) و ثبت گزارش‌های اجرایی روزانه</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* نوار توضیحات تکمیلی و راهنمای عمومی */}
|
||||
<div className="mt-4 grid grid-cols-1 md:grid-cols-2 gap-3 pt-3 border-t border-line text-[11.5px]">
|
||||
<div className="flex items-start gap-2.5 rounded-lg border border-line/60 bg-canvas/30 p-2.5">
|
||||
<span className="text-[16px] leading-none">👑</span>
|
||||
<div>
|
||||
<span className="font-bold text-foreground">دسترسی ادمین (Admin):</span>
|
||||
<p className="mt-0.5 text-muted leading-relaxed">
|
||||
کاربر با نقش ادمین بالاترین سطح دسترسی سیستمی را داشته و به تمامی پنل‌ها و پروژه‌ها دسترسی کامل دارد و نیازی به تخصیص جداگانه پنل‌ها ندارد.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-start gap-2.5 rounded-lg border border-line/60 bg-canvas/30 p-2.5">
|
||||
<span className="text-[16px] leading-none">🎯</span>
|
||||
<div>
|
||||
<span className="font-bold text-foreground">کارکرد «پروژه‌های عضویت»:</span>
|
||||
<p className="mt-0.5 text-muted leading-relaxed">
|
||||
هرگاه برای کاربری در هر پنلی سطح «محدود» انتخاب شود، دامنه داده‌ها و اختیارات وی دقیقاً به پروژه‌های انتخابی در ستون «پروژه‌های عضویت» محدود خواهد شد.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</PageLayout>
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
||||
import { toast } from "sonner";
|
||||
import {
|
||||
Building2,
|
||||
ChevronDown,
|
||||
Link2,
|
||||
Pencil,
|
||||
@@ -13,7 +12,7 @@ import {
|
||||
TriangleAlert,
|
||||
} from "lucide-react";
|
||||
import type { StandardConversion } from "../../lib/types";
|
||||
import { api, apiV26, nextId, type BrandLinkRow, type MaterialSupplier, type MaterialUnitRow } from "../../lib/api";
|
||||
import { api, apiV26, nextId, type BrandLinkRow, type MaterialUnitRow } from "../../lib/api";
|
||||
import {
|
||||
refreshProcurementStore,
|
||||
useDeleteStandardConversion,
|
||||
@@ -103,11 +102,6 @@ export function UnitsPage() {
|
||||
const [rowsLoading, setRowsLoading] = useState(false);
|
||||
const [brandLinks, setBrandLinks] = useState<BrandLinkRow[]>([]);
|
||||
|
||||
// تأمین‌کننده‌های متریال انتخاب‌شده — type imported from api.ts
|
||||
const [materialSuppliers, setMaterialSuppliers] = useState<MaterialSupplier[]>([]);
|
||||
const [suppliersLoading, setSuppliersLoading] = useState(false);
|
||||
const [suppliersLoadedId, setSuppliersLoadedId] = useState<string | null>(null);
|
||||
|
||||
// واحدها و برندهای سراسری (فهرست دیتابیس)
|
||||
const [units, setUnits] = useState<UnitLite[]>([]);
|
||||
const [allBrands, setAllBrands] = useState<string[]>([]);
|
||||
@@ -259,7 +253,6 @@ export function UnitsPage() {
|
||||
if (!materialId) {
|
||||
setRows([]);
|
||||
setBrandLinks([]);
|
||||
setMaterialSuppliers([]);
|
||||
return;
|
||||
}
|
||||
void loadRows(materialId);
|
||||
@@ -270,35 +263,6 @@ export function UnitsPage() {
|
||||
setFormBrand("");
|
||||
}, [materialId, loadRows]);
|
||||
|
||||
// واکشی تأمین‌کننده‌های متصل به متریال انتخاب‌شده
|
||||
useEffect(() => {
|
||||
if (!materialId) {
|
||||
setMaterialSuppliers([]);
|
||||
setSuppliersLoadedId(null);
|
||||
return;
|
||||
}
|
||||
let alive = true;
|
||||
setSuppliersLoading(true);
|
||||
api.materials
|
||||
.listSuppliers(materialId)
|
||||
.then((list) => {
|
||||
if (alive) {
|
||||
setMaterialSuppliers(list);
|
||||
setSuppliersLoadedId(materialId);
|
||||
}
|
||||
})
|
||||
.catch((err: unknown) => {
|
||||
if (!alive) return;
|
||||
setMaterialSuppliers([]);
|
||||
setSuppliersLoadedId(materialId);
|
||||
// Surface the real error so backend issues are not silently hidden
|
||||
const msg = err instanceof Error ? err.message : "خواندن تأمین‌کننده‌های متریال ناموفق بود";
|
||||
toast.error(msg);
|
||||
})
|
||||
.finally(() => { if (alive) setSuppliersLoading(false); });
|
||||
return () => { alive = false; };
|
||||
}, [materialId]);
|
||||
|
||||
const brandNameFor = (row: MaterialUnitRow): string => {
|
||||
if (!row.brand_material_id) return "";
|
||||
return brandLinks.find((b) => b.id === row.brand_material_id)?.brand_name || "";
|
||||
@@ -582,48 +546,6 @@ export function UnitsPage() {
|
||||
</div>
|
||||
) : (
|
||||
<>
|
||||
{/* تامین‌کنندگان متریال — پاسخ GET /materials/{id}/suppliers */}
|
||||
<div className="mb-6 flex flex-col overflow-hidden rounded-xl border border-line bg-panel shadow-sm">
|
||||
<div className="shrink-0 border-b border-line bg-panel px-4 py-3">
|
||||
<h4 className="flex items-center gap-2 text-[14px] font-bold text-accent">
|
||||
<Building2 className="h-4 w-4" /> تامین‌کنندگان متریال
|
||||
</h4>
|
||||
</div>
|
||||
<div className="flex w-full flex-1 flex-col p-4 transition-opacity duration-300 ease-in-out opacity-100 min-h-[80px] md:min-h-[100px]">
|
||||
{suppliersLoading || materialId !== suppliersLoadedId ? (
|
||||
<div className="flex flex-1 flex-col items-center justify-center text-center text-sm text-muted">
|
||||
<div className="h-5 w-5 animate-spin rounded-full border-2 border-muted border-t-transparent"></div>
|
||||
</div>
|
||||
) : materialSuppliers.length === 0 ? (
|
||||
<div className="flex flex-1 flex-col items-center justify-center text-center text-sm text-gray-400 md:text-base">
|
||||
تامین‌کننده‌ای برای این متریال ثبت نشده است
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex flex-col gap-2 max-h-[200px] overflow-y-auto custom-scrollbar pr-1">
|
||||
{materialSuppliers.map((s) => (
|
||||
<div
|
||||
key={s.id}
|
||||
className="rounded-lg border border-line bg-slate-bg px-3 py-2.5 text-sm shrink-0"
|
||||
>
|
||||
{/* نام تأمین‌کننده — مستقیم از پاسخ API، بدون fallback */}
|
||||
<div className="flex items-center gap-1.5 text-[13px] font-semibold">
|
||||
<Building2 className="h-3.5 w-3.5 shrink-0 text-accent" />
|
||||
{s.name}
|
||||
</div>
|
||||
{(s.location || s.phone || s.contact_person) && (
|
||||
<div className="mt-0.5 flex flex-wrap items-center gap-x-3 gap-y-0.5 text-[11.5px] text-muted">
|
||||
{s.location && <span>{s.location}</span>}
|
||||
{s.phone && <span dir="ltr">{s.phone}</span>}
|
||||
{s.contact_person && <span>{s.contact_person}</span>}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* واحد مرجع متریال */}
|
||||
<div className="ref-unit-box">
|
||||
<div className="ref-title">
|
||||
@@ -665,6 +587,119 @@ export function UnitsPage() {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* ضرایب متریال */}
|
||||
<h4 className="sec-title">
|
||||
<Repeat className="me-1 inline h-4 w-4 text-accent" /> ضریب‌های تبدیل
|
||||
</h4>
|
||||
{rowsLoading ? (
|
||||
<div className="conv-empty">در حال بارگذاری…</div>
|
||||
) : !rows.length ? (
|
||||
<div className="conv-empty">هنوز ضریبی برای این متریال ثبت نشده است.</div>
|
||||
) : (
|
||||
rows.map((r) => (
|
||||
<div key={r.id}>
|
||||
<div className="cg-head">
|
||||
{unitDisplay(r.unit) || `واحد #${r.unit_id}`} ← {ref}
|
||||
</div>
|
||||
<div className="conv-row">
|
||||
<span className="cv-brand">{brandNameFor(r) || "همه برندها"}</span>
|
||||
<span className="cv-factor">{faNum(r.conversion_factor)}</span>
|
||||
<span className="cv-arrow">×</span>
|
||||
<span className="cv-unit">{ref}</span>
|
||||
<span className="conv-actions">
|
||||
<button type="button" title="ویرایش" onClick={() => startEdit(r)}>
|
||||
<Pencil className="h-3.5 w-3.5" />
|
||||
</button>
|
||||
<button type="button" title="حذف" onClick={() => void deleteMu(r)}>
|
||||
<Trash2 className="h-3.5 w-3.5" />
|
||||
</button>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
)}
|
||||
|
||||
{/* فرم افزودن ضریب */}
|
||||
<div className="add-conv">
|
||||
<h4 className="mb-2 text-[13.5px] font-bold">
|
||||
{editingId ? (
|
||||
<>
|
||||
<Pencil className="me-1 inline h-3.5 w-3.5" /> ویرایش ضریب تبدیل
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<Plus className="me-1 inline h-3.5 w-3.5" /> افزودن ضریب تبدیل
|
||||
</>
|
||||
)}
|
||||
</h4>
|
||||
<div className="grid grid-cols-1 gap-2 sm:grid-cols-[1.2fr_0.6fr_1fr_0.8fr_auto] sm:items-end">
|
||||
<div className="field">
|
||||
<label>واحد پیشنهادشده</label>
|
||||
<Combobox
|
||||
value={formUnit}
|
||||
onChange={(it) => setFormUnit(it.label)}
|
||||
items={units.map((u) => unitDisplay(u)).filter(Boolean)}
|
||||
allowAdd
|
||||
addSuffix="به عنوان واحد جدید"
|
||||
placeholder="مثلاً حلقه"
|
||||
onInputChange={setFormUnit}
|
||||
/>
|
||||
</div>
|
||||
<div className="field">
|
||||
<label>ضریب</label>
|
||||
<NumberInput
|
||||
value={factorNum()}
|
||||
onChange={(n) => setFormFactor(n != null ? String(n) : "")}
|
||||
placeholder="مثلاً 0.98"
|
||||
inputMode="decimal"
|
||||
/>
|
||||
</div>
|
||||
<div className="field">
|
||||
<label>برند (خالی = همه برندها)</label>
|
||||
<Combobox
|
||||
value={formBrand}
|
||||
onChange={(it) => setFormBrand(it.label)}
|
||||
items={allBrands}
|
||||
allowAdd
|
||||
disabled={!!editingId}
|
||||
addSuffix="به عنوان برند جدید"
|
||||
placeholder="مثلاً راجین"
|
||||
onInputChange={setFormBrand}
|
||||
/>
|
||||
</div>
|
||||
<div className="field">
|
||||
<label>به واحد (مرجع)</label>
|
||||
<input
|
||||
type="text"
|
||||
className="h-9 w-full rounded-lg border border-line bg-slate-bg px-3 text-sm text-muted"
|
||||
value={ref || "مرجع"}
|
||||
placeholder="مرجع"
|
||||
readOnly
|
||||
/>
|
||||
</div>
|
||||
<div className="flex items-center gap-1.5">
|
||||
<Button size="sm" onClick={() => void saveConv()}>
|
||||
{editingId ? "ذخیره تغییرات" : "افزودن"}
|
||||
</Button>
|
||||
{editingId && (
|
||||
<Button
|
||||
size="sm"
|
||||
variant="slate"
|
||||
onClick={() => {
|
||||
setEditingId(null);
|
||||
setFormUnit("");
|
||||
setFormFactor("");
|
||||
setFormBrand("");
|
||||
}}
|
||||
>
|
||||
انصراف
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<div className="conv-live">{convLive}</div>
|
||||
</div>
|
||||
|
||||
{/* واحدهای ناشناخته */}
|
||||
{unknownUnits.length > 0 && (
|
||||
<>
|
||||
@@ -794,121 +829,6 @@ export function UnitsPage() {
|
||||
تبدیل ثابت برای همه‌ی متریال‌ها اعمال می‌شود؛ ضریب یعنی: ۱ از واحد = ضریب × به واحد
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
{/* ضرایب متریال */}
|
||||
<h4 className="sec-title">
|
||||
<Repeat className="me-1 inline h-4 w-4 text-accent" /> ضریب‌های تبدیل
|
||||
</h4>
|
||||
{rowsLoading ? (
|
||||
<div className="conv-empty">در حال بارگذاری…</div>
|
||||
) : !rows.length ? (
|
||||
<div className="conv-empty">هنوز ضریبی برای این متریال ثبت نشده است.</div>
|
||||
) : (
|
||||
rows.map((r) => (
|
||||
<div key={r.id}>
|
||||
<div className="cg-head">
|
||||
{unitDisplay(r.unit) || `واحد #${r.unit_id}`} ← {ref}
|
||||
</div>
|
||||
<div className="conv-row">
|
||||
<span className="cv-brand">{brandNameFor(r) || "همه برندها"}</span>
|
||||
<span className="cv-factor">{faNum(r.conversion_factor)}</span>
|
||||
<span className="cv-arrow">×</span>
|
||||
<span className="cv-unit">{ref}</span>
|
||||
<span className="conv-actions">
|
||||
<button type="button" title="ویرایش" onClick={() => startEdit(r)}>
|
||||
<Pencil className="h-3.5 w-3.5" />
|
||||
</button>
|
||||
<button type="button" title="حذف" onClick={() => void deleteMu(r)}>
|
||||
<Trash2 className="h-3.5 w-3.5" />
|
||||
</button>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
)}
|
||||
|
||||
{/* فرم افزودن ضریب */}
|
||||
<div className="add-conv">
|
||||
<h4 className="mb-2 text-[13.5px] font-bold">
|
||||
{editingId ? (
|
||||
<>
|
||||
<Pencil className="me-1 inline h-3.5 w-3.5" /> ویرایش ضریب تبدیل
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<Plus className="me-1 inline h-3.5 w-3.5" /> افزودن ضریب تبدیل
|
||||
</>
|
||||
)}
|
||||
</h4>
|
||||
<div className="grid grid-cols-1 gap-2 sm:grid-cols-[1.2fr_0.6fr_1fr_0.8fr_auto] sm:items-end">
|
||||
<div className="field">
|
||||
<label>واحد پیشنهادشده</label>
|
||||
<Combobox
|
||||
value={formUnit}
|
||||
onChange={(it) => setFormUnit(it.label)}
|
||||
items={units.map((u) => unitDisplay(u)).filter(Boolean)}
|
||||
allowAdd
|
||||
addSuffix="به عنوان واحد جدید"
|
||||
placeholder="مثلاً حلقه"
|
||||
onInputChange={setFormUnit}
|
||||
/>
|
||||
</div>
|
||||
<div className="field">
|
||||
<label>ضریب</label>
|
||||
<NumberInput
|
||||
value={factorNum()}
|
||||
onChange={(n) => setFormFactor(n != null ? String(n) : "")}
|
||||
placeholder="مثلاً 0.98"
|
||||
inputMode="decimal"
|
||||
/>
|
||||
</div>
|
||||
<div className="field">
|
||||
<label>برند (خالی = همه برندها)</label>
|
||||
<Combobox
|
||||
value={formBrand}
|
||||
onChange={(it) => setFormBrand(it.label)}
|
||||
items={allBrands}
|
||||
allowAdd
|
||||
disabled={!!editingId}
|
||||
addSuffix="به عنوان برند جدید"
|
||||
placeholder="مثلاً راجین"
|
||||
onInputChange={setFormBrand}
|
||||
/>
|
||||
</div>
|
||||
<div className="field">
|
||||
<label>به واحد (مرجع)</label>
|
||||
<input
|
||||
type="text"
|
||||
className="h-9 w-full rounded-lg border border-line bg-slate-bg px-3 text-sm text-muted"
|
||||
value={ref || "مرجع"}
|
||||
placeholder="مرجع"
|
||||
readOnly
|
||||
/>
|
||||
</div>
|
||||
<div className="flex items-center gap-1.5">
|
||||
<Button size="sm" onClick={() => void saveConv()}>
|
||||
{editingId ? "ذخیره تغییرات" : "افزودن"}
|
||||
</Button>
|
||||
{editingId && (
|
||||
<Button
|
||||
size="sm"
|
||||
variant="slate"
|
||||
onClick={() => {
|
||||
setEditingId(null);
|
||||
setFormUnit("");
|
||||
setFormFactor("");
|
||||
setFormBrand("");
|
||||
}}
|
||||
>
|
||||
انصراف
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<div className="conv-live">{convLive}</div>
|
||||
</div>
|
||||
|
||||
</>
|
||||
)}
|
||||
</section>
|
||||
|
||||
@@ -213,7 +213,11 @@ export function Step4Projects({ items, projects, assignment, onAssign, onUnassig
|
||||
/>
|
||||
))}
|
||||
{!projects.length && (
|
||||
<div className="dd-empty">هنوز پروژه‌ای تعریف نشده است — از پایین یک پروژه اضافه کنید.</div>
|
||||
<div className="dd-empty">
|
||||
{canAddProject
|
||||
? "هنوز پروژه‌ای تعریف نشده است — از پایین یک پروژه اضافه کنید."
|
||||
: "هنوز پروژه‌ای به شما تخصیص داده نشده است — با مدیر سیستم تماس بگیرید."}
|
||||
</div>
|
||||
)}
|
||||
{/* افزودن پروژه به‌صورت درجا — زیر لیست پروژه‌ها (سطح limited: ممنوع) */}
|
||||
<div className="mt-3 rounded-md border border-dashed border-line p-2" hidden={!canAddProject}>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import { track } from "../../lib/analytics";
|
||||
import { useNavigate, useSearchParams } from "react-router-dom";
|
||||
import { ChevronRight, ChevronLeft, Check, ShieldCheck, AlertCircle, X } from "lucide-react";
|
||||
import { Link, useNavigate, useSearchParams } from "react-router-dom";
|
||||
import { ChevronRight, ChevronLeft, Check } from "lucide-react";
|
||||
import { toast } from "sonner";
|
||||
import type { LineItem, Quote } from "../../lib/types";
|
||||
import { api, ApiError, looksLikeUuid, nextId } from "../../lib/api";
|
||||
@@ -22,6 +22,7 @@ import { normalize } from "../../lib/normalize";
|
||||
import { faNum } from "../../lib/formatters";
|
||||
import { matchMaterial } from "../../lib/quoteUtils";
|
||||
import { Header, PageLayout } from "../../components/layout/Header";
|
||||
import { AppSwitcherMenu } from "../../components/AppSwitcherMenu";
|
||||
import { Stepper } from "./Stepper";
|
||||
import { Step1TopicSupplier } from "./Step1TopicSupplier";
|
||||
import { Step2LineItems, type ItemDraft, type MaterialRec } from "./Step2LineItems";
|
||||
@@ -40,111 +41,11 @@ import { useAuthStore } from "../../store/auth";
|
||||
|
||||
const TOTAL_STEPS = 5;
|
||||
|
||||
// ---------- صفحه خروج امن (Safe Exit Screen) ----------
|
||||
function SafeExitScreen({
|
||||
title,
|
||||
subtitle,
|
||||
}: {
|
||||
title?: string;
|
||||
subtitle?: string;
|
||||
}) {
|
||||
return (
|
||||
<div className="min-h-screen bg-slate-50 dark:bg-slate-950 flex flex-col items-center justify-center p-4">
|
||||
<div className="max-w-md w-full bg-white dark:bg-slate-900 rounded-2xl border border-slate-200 dark:border-slate-800 p-8 text-center shadow-xl">
|
||||
<div className="mx-auto w-16 h-16 rounded-full flex items-center justify-center mb-5 bg-emerald-100 dark:bg-emerald-950/60 text-emerald-600 dark:text-emerald-400">
|
||||
<Check className="w-8 h-8 stroke-[2.5]" />
|
||||
</div>
|
||||
<h2 className="text-xl font-bold text-slate-900 dark:text-slate-100 mb-3">
|
||||
{title || "پیش‌نویس استعلام ذخیره گردید"}
|
||||
</h2>
|
||||
<p className="text-sm text-slate-600 dark:text-slate-400 mb-6 leading-relaxed">
|
||||
{subtitle ||
|
||||
"اطلاعات با موفقیت ذخیره شد. اکنون می‌توانید این برگه را ببندید و برای ادامه کار به ربات بله بازگردید."}
|
||||
</p>
|
||||
<div className="space-y-3">
|
||||
<Button
|
||||
className="w-full bg-emerald-600 hover:bg-emerald-700 text-white font-medium py-2.5 rounded-xl transition shadow-xs text-sm"
|
||||
onClick={() => {
|
||||
window.close();
|
||||
}}
|
||||
>
|
||||
بستن این برگه
|
||||
</Button>
|
||||
<p className="text-xs text-slate-400 dark:text-slate-500">
|
||||
(در صورت مسدود بودن بستن خودکار توسط مرورگر، لطفاً تب مرورگر را به صورت دستی ببندید)
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// ---------- صفحه خطای توکن نامعتبر ----------
|
||||
function TokenInvalidScreen({ message }: { message: string }) {
|
||||
return (
|
||||
<div className="min-h-screen bg-slate-50 dark:bg-slate-950 flex flex-col items-center justify-center p-4">
|
||||
<div className="max-w-md w-full bg-white dark:bg-slate-900 rounded-2xl border border-rose-200 dark:border-rose-900/50 p-8 text-center shadow-xl">
|
||||
<div className="mx-auto w-16 h-16 rounded-full flex items-center justify-center mb-5 bg-rose-100 dark:bg-rose-950/60 text-rose-600 dark:text-rose-400">
|
||||
<AlertCircle className="w-8 h-8 stroke-[2.5]" />
|
||||
</div>
|
||||
<h2 className="text-xl font-bold text-slate-900 dark:text-slate-100 mb-3">
|
||||
لینک نامعتبر یا منقضی شده
|
||||
</h2>
|
||||
<p className="text-sm text-slate-600 dark:text-slate-400 mb-6 leading-relaxed">
|
||||
{message ||
|
||||
"اعتبار این لینک بازبینی به پایان رسیده است. لطفاً از طریق ربات بله، مجدداً دکمه بازبینی را دریافت فرمایید."}
|
||||
</p>
|
||||
<Button
|
||||
variant="line"
|
||||
className="w-full rounded-xl py-2 text-sm"
|
||||
onClick={() => {
|
||||
window.close();
|
||||
}}
|
||||
>
|
||||
بستن برگه
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// ویزارد ۵ مرحله‌ای افزودن پیشنهاد جدید و بازبینی پیش‌نویس
|
||||
export function WizardPage({ isStandalone = false }: { isStandalone?: boolean }) {
|
||||
// ویزارد ۵ مرحله‌ای افزودن پیشنهاد جدید
|
||||
export function WizardPage() {
|
||||
useStoreData();
|
||||
const navigate = useNavigate();
|
||||
const [params] = useSearchParams();
|
||||
const token = params.get("token");
|
||||
const isStandaloneMode = isStandalone || Boolean(token);
|
||||
|
||||
const [exitInfo, setExitInfo] = useState<{
|
||||
show: boolean;
|
||||
title?: string;
|
||||
subtitle?: string;
|
||||
}>({ show: false });
|
||||
const [tokenError, setTokenError] = useState<string | null>(null);
|
||||
|
||||
// Setup History Trap when in standalone mode
|
||||
useEffect(() => {
|
||||
if (!isStandaloneMode) return;
|
||||
try {
|
||||
window.history.replaceState({ page: "review_root" }, "", window.location.href);
|
||||
window.history.pushState({ page: "review_active" }, "", window.location.href);
|
||||
} catch {}
|
||||
|
||||
const onPop = () => {
|
||||
setExitInfo({
|
||||
show: true,
|
||||
title: "بازبینی به پایان رسید",
|
||||
subtitle: "پیش‌نویس ذخیره گردید. اکنون می‌توانید این برگه را ببندید و به ربات بله بازگردید.",
|
||||
});
|
||||
try {
|
||||
window.history.pushState(null, "", window.location.href);
|
||||
} catch {}
|
||||
};
|
||||
|
||||
window.addEventListener("popstate", onPop);
|
||||
return () => window.removeEventListener("popstate", onPop);
|
||||
}, [isStandaloneMode]);
|
||||
|
||||
const quotes = useQuotes();
|
||||
const suppliers = useSuppliers();
|
||||
@@ -154,13 +55,19 @@ export function WizardPage({ isStandalone = false }: { isStandalone?: boolean })
|
||||
const user = useAuthStore((s) => s.user);
|
||||
const isLimitedProcurement =
|
||||
user?.panels?.procurement === "limited" && user?.role !== "admin";
|
||||
const memberProjectNames = useMemo(
|
||||
() =>
|
||||
projects
|
||||
.filter((p) => (user?.member_project_ids ?? []).includes(p.id))
|
||||
.map((p) => p.name),
|
||||
[projects, user],
|
||||
);
|
||||
const memberProjectNames = useMemo(() => {
|
||||
const allowedIds = new Set([
|
||||
...(user?.member_project_ids ?? []),
|
||||
...(user?.projects ?? []).map((p) => p.id),
|
||||
...(user?.project_id ? [user.project_id] : []),
|
||||
]);
|
||||
const matched = projects
|
||||
.filter((p) => allowedIds.has(p.id))
|
||||
.map((p) => p.name);
|
||||
const directNames = (user?.projects ?? []).map((p) => p.name);
|
||||
if (user?.project_name) directNames.push(user.project_name);
|
||||
return [...new Set([...matched, ...directNames])];
|
||||
}, [projects, user]);
|
||||
const topics = useAppStore((s) => s.topics);
|
||||
const createQuote = useCreateQuote();
|
||||
const addSupplier = useAddSupplier();
|
||||
@@ -194,296 +101,38 @@ export function WizardPage({ isStandalone = false }: { isStandalone?: boolean })
|
||||
const [proforma, setProforma] = useState<File | null>(null);
|
||||
const [emptyFields, setEmptyFields] = useState<{ label: string; step: number }[]>([]);
|
||||
const [confirmOpen, setConfirmOpen] = useState(false);
|
||||
const [loadedDraftId, setLoadedDraftId] = useState<string | null>(null);
|
||||
const draftFetchedRef = useRef(false);
|
||||
const lastRemoteUpdatedAtRef = useRef<string | null>(null);
|
||||
const isSelfUpdatingRef = useRef<boolean>(false);
|
||||
const isCommittedOrCancelledRef = useRef<boolean>(false);
|
||||
const initialLoadedRef = useRef<boolean>(false);
|
||||
|
||||
// ---------- تابع اعمال داده‌های پیش‌نویس به فیلدهای ویزارد ----------
|
||||
const applyDraftPayloadToForm = useCallback(
|
||||
(p: Record<string, any>) => {
|
||||
if (!p) return;
|
||||
|
||||
// ۱. تأمین‌کننده و وضعیت رسمی
|
||||
if (p.supplier_name !== undefined) {
|
||||
setSupplierName(p.supplier_name || "");
|
||||
setSupplierInvalid(false);
|
||||
}
|
||||
if (p.is_official !== undefined) {
|
||||
setIsOfficial(Boolean(p.is_official));
|
||||
}
|
||||
|
||||
// استنتاج تاپیک: ابتدا از اطلاعات تأمین‌کننده، سپس متریال، سپس اولین تاپیک موجود
|
||||
let topicToSet = "";
|
||||
if (p.supplier_name) {
|
||||
const sup = suppliers.find((s) => normalize(s.name) === normalize(p.supplier_name));
|
||||
if (sup?.topic) topicToSet = sup.topic;
|
||||
}
|
||||
if (!topicToSet && Array.isArray(p.items) && p.items.length > 0) {
|
||||
for (const it of p.items) {
|
||||
if (it.material_name) {
|
||||
const mat = materials.find((m) => normalize(m.name) === normalize(it.material_name));
|
||||
if (mat?.topic) {
|
||||
topicToSet = mat.topic;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!topicToSet && topics.length > 0) {
|
||||
topicToSet = topics[0].name;
|
||||
}
|
||||
if (topicToSet) {
|
||||
setSelectedTopic(topicToSet);
|
||||
}
|
||||
|
||||
// ۲. اقلام (Step 2)
|
||||
let newItems: ItemDraft[] = [];
|
||||
if (Array.isArray(p.items) && p.items.length > 0) {
|
||||
newItems = p.items.map((it: any, idx: number) => {
|
||||
const qty = it.quantity != null ? Number(it.quantity) : null;
|
||||
const price = it.unit_price != null ? Number(it.unit_price) : null;
|
||||
return {
|
||||
tempId: "it" + idx,
|
||||
cat: it.material_name || "",
|
||||
brand: it.brand_name || "",
|
||||
specs: Array.isArray(it.specs) ? it.specs : [],
|
||||
qty,
|
||||
unit: it.unit_name || "",
|
||||
price,
|
||||
total: qty != null && price != null ? qty * price : null,
|
||||
};
|
||||
});
|
||||
setItems(newItems);
|
||||
}
|
||||
|
||||
// ۳. شرایط پرداخت / termsheet (Step 3)
|
||||
if (Array.isArray(p.termsheets) && p.termsheets.length > 0) {
|
||||
const newCards: TsCardDraft[] = p.termsheets.map((ts: any, idx: number) => ({
|
||||
key: "ts" + idx,
|
||||
milestones:
|
||||
Array.isArray(ts.milestones) && ts.milestones.length > 0
|
||||
? ts.milestones.map((m: any) => ({
|
||||
when_iso: m.due_date || m.when_iso || null,
|
||||
amount: m.amount != null ? Number(m.amount) : null,
|
||||
}))
|
||||
: [{ when_iso: null, amount: null }],
|
||||
}));
|
||||
setCards(newCards);
|
||||
|
||||
const targetIds = (newItems.length > 0 ? newItems : items).map((i) => i.tempId);
|
||||
const newCov: Record<string, string[]> = {};
|
||||
newCards.forEach((c) => {
|
||||
newCov[c.key] = targetIds;
|
||||
});
|
||||
setCoverage(newCov);
|
||||
}
|
||||
|
||||
// ۴. پروژه (Step 4)
|
||||
const projNames: string[] = [];
|
||||
if (Array.isArray(p.project_names)) {
|
||||
projNames.push(...p.project_names.filter(Boolean));
|
||||
}
|
||||
if (p.project_name && !projNames.includes(p.project_name)) {
|
||||
projNames.push(p.project_name);
|
||||
}
|
||||
if (projNames.length > 0) {
|
||||
const newAssignment: Record<string, string[]> = {};
|
||||
const targetItems = newItems.length > 0 ? newItems : items;
|
||||
targetItems.forEach((it) => {
|
||||
newAssignment[it.tempId] = projNames;
|
||||
});
|
||||
setAssignment(newAssignment);
|
||||
}
|
||||
|
||||
// ۵. یادداشت و تاریخ انقضا (Step 5)
|
||||
if (p.notes !== undefined) {
|
||||
setNotes(p.notes || "");
|
||||
}
|
||||
if (p.expiry_date !== undefined) {
|
||||
setExpiryDate(p.expiry_date || null);
|
||||
}
|
||||
},
|
||||
[suppliers, materials, topics, items],
|
||||
);
|
||||
|
||||
// ---------- prefill از لینک‌ها (?topic=&supplier=) ----------
|
||||
// ---------- prefill از لینک‌ها (?topic=&supplier=&project=) ----------
|
||||
useEffect(() => {
|
||||
const t = params.get("topic");
|
||||
if (!t) return;
|
||||
const topic = topicByName(t, topics);
|
||||
if (!topic) return;
|
||||
setSelectedTopic(topic.name);
|
||||
const sid = params.get("supplier");
|
||||
if (sid) {
|
||||
const sup = suppliers.find((s) => s.id === sid);
|
||||
if (sup && normalize(sup.topic) === normalize(topic.name)) {
|
||||
setSupplierName(sup.name);
|
||||
setSupplierInvalid(false);
|
||||
if (t) {
|
||||
const topic = topicByName(t, topics);
|
||||
if (topic) {
|
||||
setSelectedTopic(topic.name);
|
||||
const sid = params.get("supplier");
|
||||
if (sid) {
|
||||
const sup = suppliers.find((s) => s.id === sid);
|
||||
if (sup && normalize(sup.topic) === normalize(topic.name)) {
|
||||
setSupplierName(sup.name);
|
||||
setSupplierInvalid(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}, [params, suppliers, topics]);
|
||||
|
||||
// ---------- بارگذاری اولیه پیش‌نویس ربات بله (?token= یا ?draft=) ----------
|
||||
useEffect(() => {
|
||||
const draftId = params.get("draft") || params.get("draft_id");
|
||||
if ((!token && !draftId) || draftFetchedRef.current) return;
|
||||
|
||||
draftFetchedRef.current = true;
|
||||
void (async () => {
|
||||
try {
|
||||
let draft: any = null;
|
||||
if (token) {
|
||||
const res = await api.drafts.verifyToken(token);
|
||||
draft = (res as any)?.data || res;
|
||||
} else if (draftId) {
|
||||
draft = await api.drafts.get(draftId);
|
||||
}
|
||||
if (!draft || !draft.payload) {
|
||||
if (token) setTokenError("پیش‌نویس معتبری یافت نشد.");
|
||||
return;
|
||||
}
|
||||
setLoadedDraftId(draft.id);
|
||||
lastRemoteUpdatedAtRef.current = draft.updated_at || null;
|
||||
|
||||
applyDraftPayloadToForm(draft.payload);
|
||||
setHighestVisited(5);
|
||||
initialLoadedRef.current = true;
|
||||
|
||||
toast.success("پیش‌نویس از ربات بله بارگذاری شد. لطفاً اطلاعات را بازبینی کنید.", {
|
||||
duration: 6000,
|
||||
});
|
||||
} catch (err: any) {
|
||||
if (token) {
|
||||
setTokenError(err?.message || "لینک بازبینی نامعتبر یا منقضی شده است.");
|
||||
} else {
|
||||
toast.error(`خطا در فراخوانی پیش‌نویس از ربات: ${err instanceof Error ? err.message : "خطای ناشناخته"}`);
|
||||
}
|
||||
}
|
||||
})();
|
||||
}, [params, token, applyDraftPayloadToForm]);
|
||||
|
||||
// ---------- پولینگ دوره‌ای برای دریافت تغییرات یا ثبت از سمت ربات بله ----------
|
||||
useEffect(() => {
|
||||
const draftId = params.get("draft") || params.get("draft_id");
|
||||
if (!token && !draftId) return;
|
||||
|
||||
const interval = setInterval(async () => {
|
||||
if (isCommittedOrCancelledRef.current || !initialLoadedRef.current) return;
|
||||
try {
|
||||
let draft: any = null;
|
||||
if (token) {
|
||||
const res = await api.drafts.verifyToken(token);
|
||||
draft = (res as any)?.data || res;
|
||||
} else if (draftId) {
|
||||
draft = await api.drafts.get(draftId);
|
||||
}
|
||||
if (!draft) return;
|
||||
|
||||
if (draft.status === "committed") {
|
||||
isCommittedOrCancelledRef.current = true;
|
||||
if (isStandaloneMode) {
|
||||
setExitInfo({
|
||||
show: true,
|
||||
title: "این پیشنهاد ثبت نهایی شد ✅",
|
||||
subtitle: "استعلام با موفقیت در سیستم ثبت گردید. می‌توانید این برگه را ببندید و به ربات بله بازگردید.",
|
||||
});
|
||||
return;
|
||||
}
|
||||
toast.success("این پیشنهاد از طریق ربات بله با موفقیت ثبت نهایی شد.", { duration: 8000 });
|
||||
navigate("/");
|
||||
return;
|
||||
}
|
||||
if (draft.status === "cancelled") {
|
||||
isCommittedOrCancelledRef.current = true;
|
||||
if (isStandaloneMode) {
|
||||
setExitInfo({
|
||||
show: true,
|
||||
title: "پیش‌نویس لغو شد",
|
||||
subtitle: "این پیش‌نویس از طریق ربات بله لغو گردید. می‌توانید این برگه را ببندید.",
|
||||
});
|
||||
return;
|
||||
}
|
||||
toast.error("این پیش‌نویس از طریق ربات بله لغو شد.", { duration: 6000 });
|
||||
navigate("/");
|
||||
return;
|
||||
}
|
||||
|
||||
if (
|
||||
draft.updated_at &&
|
||||
lastRemoteUpdatedAtRef.current &&
|
||||
draft.updated_at > lastRemoteUpdatedAtRef.current &&
|
||||
!isSelfUpdatingRef.current
|
||||
) {
|
||||
lastRemoteUpdatedAtRef.current = draft.updated_at;
|
||||
applyDraftPayloadToForm(draft.payload);
|
||||
}
|
||||
} catch {
|
||||
/* خطای موقت شبکه در پولینگ نادیده گرفته می‌شود */
|
||||
}
|
||||
}, 2000);
|
||||
|
||||
return () => clearInterval(interval);
|
||||
}, [params, token, isStandaloneMode, navigate, applyDraftPayloadToForm]);
|
||||
|
||||
// ---------- همگام‌سازی خودکار تغییرات ویزارد به پیش‌نویس ربات (Debounced Auto-Save) ----------
|
||||
useEffect(() => {
|
||||
const draftId = params.get("draft") || params.get("draft_id");
|
||||
if ((!token && !draftId) || isCommittedOrCancelledRef.current || !initialLoadedRef.current) return;
|
||||
|
||||
const timer = setTimeout(async () => {
|
||||
isSelfUpdatingRef.current = true;
|
||||
try {
|
||||
const payloadToSave: Record<string, any> = {
|
||||
supplier_name: supplierName.trim() || null,
|
||||
is_official: isOfficial,
|
||||
items: items.map((it) => ({
|
||||
material_name: it.cat.trim() || null,
|
||||
brand_name: it.brand.trim() || null,
|
||||
specs: it.specs,
|
||||
quantity: it.qty,
|
||||
unit_name: it.unit.trim() || null,
|
||||
unit_price: it.price,
|
||||
})),
|
||||
termsheets: cards.map((c, i) => ({
|
||||
label: "گزینه " + faNum(i + 1),
|
||||
milestones: (c.milestones || []).map((m) => ({
|
||||
due_date: m.when_iso,
|
||||
amount: m.amount,
|
||||
})),
|
||||
})),
|
||||
project_names: [...new Set(Object.values(assignment).flat())],
|
||||
notes: notes.trim() || null,
|
||||
expiry_date: expiryDate || null,
|
||||
};
|
||||
|
||||
if (token) {
|
||||
await api.drafts.updateByToken(token, payloadToSave);
|
||||
const res = await api.drafts.verifyToken(token);
|
||||
const updated = (res as any)?.data || res;
|
||||
if (updated?.updated_at) {
|
||||
lastRemoteUpdatedAtRef.current = updated.updated_at;
|
||||
}
|
||||
} else if (draftId) {
|
||||
await api.drafts.update(draftId, payloadToSave);
|
||||
const updated = await api.drafts.get(draftId);
|
||||
if (updated?.updated_at) {
|
||||
lastRemoteUpdatedAtRef.current = updated.updated_at;
|
||||
const proj = params.get("project");
|
||||
if (proj) {
|
||||
setAssignment((cur) => {
|
||||
const next = { ...cur };
|
||||
for (const it of items) {
|
||||
if (!next[it.tempId]?.length) {
|
||||
next[it.tempId] = [proj];
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
console.warn("Auto-save to draft failed:", err);
|
||||
} finally {
|
||||
setTimeout(() => {
|
||||
isSelfUpdatingRef.current = false;
|
||||
}, 600);
|
||||
}
|
||||
}, 800);
|
||||
|
||||
return () => clearTimeout(timer);
|
||||
}, [supplierName, isOfficial, items, cards, assignment, notes, expiryDate, params, token]);
|
||||
return next;
|
||||
});
|
||||
}
|
||||
}, [params, suppliers, topics, items]);
|
||||
|
||||
// ---------- اعتبارسنجی قبل از ترک هر مرحله ----------
|
||||
const completedSteps = useMemo(() => {
|
||||
@@ -516,11 +165,10 @@ export function WizardPage({ isStandalone = false }: { isStandalone?: boolean })
|
||||
|
||||
// ---------- پروژه‌ها ----------
|
||||
const projectNames = useMemo(() => {
|
||||
const names = new Set<string>(
|
||||
isLimitedProcurement
|
||||
? memberProjectNames
|
||||
: projects.map((p) => p.name),
|
||||
);
|
||||
if (isLimitedProcurement) {
|
||||
return memberProjectNames;
|
||||
}
|
||||
const names = new Set<string>(projects.map((p) => p.name));
|
||||
quotes.forEach((q) => {
|
||||
if (q.project) names.add(q.project);
|
||||
(q.projects || []).forEach((n) => names.add(n));
|
||||
@@ -528,6 +176,24 @@ export function WizardPage({ isStandalone = false }: { isStandalone?: boolean })
|
||||
return [...names];
|
||||
}, [projects, quotes, isLimitedProcurement, memberProjectNames]);
|
||||
|
||||
// سطح محدود: در صورت داشتن یک پروژه، خودکار اقلام به آن پروژه تخصیص می‌یابند
|
||||
useEffect(() => {
|
||||
if (isLimitedProcurement && memberProjectNames.length === 1) {
|
||||
const sole = memberProjectNames[0];
|
||||
setAssignment((cur) => {
|
||||
let changed = false;
|
||||
const next = { ...cur };
|
||||
for (const it of items) {
|
||||
if (!next[it.tempId]?.length) {
|
||||
next[it.tempId] = [sole];
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
return changed ? next : cur;
|
||||
});
|
||||
}
|
||||
}, [isLimitedProcurement, memberProjectNames, items]);
|
||||
|
||||
const assign = (tempId: string, proj: string) => {
|
||||
setAssignment((a) => {
|
||||
const cur = a[tempId] || [];
|
||||
@@ -767,23 +433,6 @@ export function WizardPage({ isStandalone = false }: { isStandalone?: boolean })
|
||||
|
||||
try {
|
||||
const created = await createQuote.mutateAsync(quote);
|
||||
const token = params.get("token");
|
||||
const draftId = params.get("draft") || params.get("draft_id");
|
||||
if (token) {
|
||||
isCommittedOrCancelledRef.current = true;
|
||||
try {
|
||||
await api.drafts.commitByToken(token, created.id);
|
||||
} catch (err) {
|
||||
console.warn("Could not commit draft via token:", err);
|
||||
}
|
||||
} else if (draftId) {
|
||||
isCommittedOrCancelledRef.current = true;
|
||||
try {
|
||||
await api.drafts.commit(draftId, created.id);
|
||||
} catch (err) {
|
||||
console.warn("Could not commit draft:", err);
|
||||
}
|
||||
}
|
||||
if (proforma) {
|
||||
try {
|
||||
await api.files.upload(created.id, "proforma", proforma);
|
||||
@@ -793,17 +442,8 @@ export function WizardPage({ isStandalone = false }: { isStandalone?: boolean })
|
||||
});
|
||||
}
|
||||
}
|
||||
toast.success("پیشنهاد ذخیره شد و در ربات بله تأیید گردید.");
|
||||
toast.success("پیشنهاد ذخیره شد.");
|
||||
track("quote_submitted", { quote_id: created.id, items: lineItems.length });
|
||||
|
||||
if (isStandaloneMode) {
|
||||
setExitInfo({
|
||||
show: true,
|
||||
title: "پیشنهاد با موفقیت در سیستم ثبت گردید ✅",
|
||||
subtitle: `شناسه استعلام: #${created.id.slice(0, 8)} — تغییرات شما با موفقیت اعمال شد. اکنون می‌توانید این برگه را ببندید و به ربات بله بازگردید.`,
|
||||
});
|
||||
return;
|
||||
}
|
||||
navigate("/");
|
||||
} catch (e) {
|
||||
const target = resolveErrorTarget(e);
|
||||
@@ -811,34 +451,6 @@ export function WizardPage({ isStandalone = false }: { isStandalone?: boolean })
|
||||
}
|
||||
};
|
||||
|
||||
const handleCancel = async () => {
|
||||
const token = params.get("token");
|
||||
const draftId = params.get("draft") || params.get("draft_id");
|
||||
isCommittedOrCancelledRef.current = true;
|
||||
if (token) {
|
||||
try {
|
||||
await api.drafts.cancelByToken(token);
|
||||
} catch (err) {
|
||||
console.warn("Could not cancel draft via token:", err);
|
||||
}
|
||||
} else if (draftId) {
|
||||
try {
|
||||
await api.drafts.cancel(draftId);
|
||||
} catch (err) {
|
||||
console.warn("Could not cancel draft:", err);
|
||||
}
|
||||
}
|
||||
if (isStandaloneMode) {
|
||||
setExitInfo({
|
||||
show: true,
|
||||
title: "پیش‌نویس لغو شد",
|
||||
subtitle: "این پیش‌نویس استعلام لغو گردید. می‌توانید این برگه را ببندید و به ربات بله بازگردید.",
|
||||
});
|
||||
return;
|
||||
}
|
||||
navigate("/");
|
||||
};
|
||||
|
||||
const save = () => {
|
||||
const incomplete: { label: string; step: number }[] = [];
|
||||
if (!completedSteps.has(1)) incomplete.push({ label: "تأمین‌کننده", step: 1 });
|
||||
@@ -853,67 +465,16 @@ export function WizardPage({ isStandalone = false }: { isStandalone?: boolean })
|
||||
void doSave();
|
||||
};
|
||||
|
||||
if (exitInfo.show) {
|
||||
return <SafeExitScreen title={exitInfo.title} subtitle={exitInfo.subtitle} />;
|
||||
}
|
||||
|
||||
if (tokenError) {
|
||||
return <TokenInvalidScreen message={tokenError} />;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="min-h-screen pb-10">
|
||||
{isStandaloneMode ? (
|
||||
<header className="sticky top-0 z-40 bg-white/95 dark:bg-zinc-900/95 backdrop-blur-md border-b border-line px-4 py-3.5 shadow-xs">
|
||||
<div className="max-w-5xl mx-auto flex items-center justify-between">
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="h-9 w-9 rounded-xl bg-blue-600 text-white flex items-center justify-center shadow-xs">
|
||||
<ShieldCheck className="w-5 h-5" />
|
||||
</div>
|
||||
<div>
|
||||
<div className="flex items-center gap-2">
|
||||
<h1 className="text-base font-bold text-ink">
|
||||
بازبینی و تکمیل پیش‌نویس استعلام
|
||||
</h1>
|
||||
<span className="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-semibold bg-blue-100 text-blue-800 dark:bg-blue-950/80 dark:text-blue-300">
|
||||
ربات بله
|
||||
</span>
|
||||
</div>
|
||||
<p className="text-xs text-muted mt-0.5">
|
||||
محیط امن بازبینی — اطلاعات با ربات بله همگام‌سازی می‌شود
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
className="inline-flex items-center gap-1.5 px-3 py-1.5 text-xs font-medium text-muted hover:text-rose-600 rounded-xl hover:bg-panel transition-colors"
|
||||
onClick={handleCancel}
|
||||
>
|
||||
<X className="w-4 h-4" />
|
||||
<span>انصراف و خروج</span>
|
||||
</button>
|
||||
</div>
|
||||
</header>
|
||||
) : (
|
||||
<Header
|
||||
title="افزودن پیشنهاد جدید"
|
||||
sub="اطلاعات را از تماس با تأمین‌کننده وارد کنید"
|
||||
backTo="/"
|
||||
backLabel="بازگشت به دفتر"
|
||||
/>
|
||||
)}
|
||||
<Header
|
||||
title="افزودن پیشنهاد جدید"
|
||||
sub="اطلاعات را از تماس با تأمین‌کننده وارد کنید"
|
||||
backTo={isLimitedProcurement ? "/requester" : "/"}
|
||||
backLabel={isLimitedProcurement ? "بازگشت به استعلام‌ها" : "بازگشت به دفتر"}
|
||||
menu={<AppSwitcherMenu activeModule="procurement" />}
|
||||
/>
|
||||
<PageLayout>
|
||||
{loadedDraftId && (
|
||||
<div className="mb-4 flex items-center justify-between rounded-xl border border-blue-200 bg-blue-50/80 p-3.5 text-sm text-blue-900 dark:border-blue-900/50 dark:bg-blue-950/40 dark:text-blue-200 shadow-xs">
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="inline-flex h-6 px-2.5 items-center justify-center rounded-full bg-blue-600 text-xs font-bold text-white">
|
||||
ربات بله
|
||||
</span>
|
||||
<span>اطلاعات پیش‌نویس استعلام با هوش مصنوعی بارگذاری شد. لطفاً اقلام و شرایط را بازبینی فرمایید.</span>
|
||||
</div>
|
||||
<span className="text-xs text-blue-600 dark:text-blue-400 font-mono font-medium">#{loadedDraftId.slice(0, 8)}</span>
|
||||
</div>
|
||||
)}
|
||||
{/* نوار مراحل استپر */}
|
||||
<Stepper current={currentStep} highestVisited={highestVisited} completedSteps={completedSteps} onGoto={goToStep} />
|
||||
|
||||
@@ -1004,15 +565,13 @@ export function WizardPage({ isStandalone = false }: { isStandalone?: boolean })
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* دکمه‌های اقدام (انصراف + بعدی / ذخیره) */}
|
||||
<div className="flex items-center gap-2 sm:gap-3">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => void handleCancel()}
|
||||
className="inline-flex items-center justify-center px-3 sm:px-4 py-2 rounded-xl text-xs sm:text-sm font-medium text-slate-500 hover:text-slate-700 hover:bg-slate-100 dark:text-zinc-400 dark:hover:text-zinc-200 dark:hover:bg-zinc-800 transition-colors cursor-pointer border-none bg-transparent"
|
||||
<Link
|
||||
to="/"
|
||||
className="inline-flex items-center justify-center px-3 sm:px-4 py-2 rounded-xl text-xs sm:text-sm font-medium text-slate-500 hover:text-slate-700 no-underline"
|
||||
>
|
||||
انصراف
|
||||
</button>
|
||||
</Link>
|
||||
|
||||
{currentStep < TOTAL_STEPS && (
|
||||
<button
|
||||
|
||||
@@ -62,6 +62,15 @@ button:disabled {
|
||||
}
|
||||
}
|
||||
|
||||
/* پنهان‌سازی اسکرول‌بار برای چیپ‌های افقی */
|
||||
.no-scrollbar::-webkit-scrollbar {
|
||||
display: none;
|
||||
}
|
||||
.no-scrollbar {
|
||||
-ms-overflow-style: none;
|
||||
scrollbar-width: none;
|
||||
}
|
||||
|
||||
/* ---------- تایپوگرافی ---------- */
|
||||
.num-words {
|
||||
@apply text-muted;
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
|
||||
"target": "ESNext",
|
||||
"lib": ["ESNext", "DOM"],
|
||||
"target": "es2023",
|
||||
"lib": ["ES2023", "DOM"],
|
||||
"module": "esnext",
|
||||
"types": ["vite/client"],
|
||||
"strict": true,
|
||||
"allowArbitraryExtensions": true,
|
||||
"skipLibCheck": true,
|
||||
|
||||
@@ -24,4 +23,4 @@
|
||||
"noFallthroughCasesInSwitch": true
|
||||
},
|
||||
"include": ["src"]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -455,7 +455,6 @@ CREATE TABLE inventory_transactions (
|
||||
physical_qty NUMERIC(18,6),
|
||||
transfer_pair_id UUID,
|
||||
performed_by TEXT,
|
||||
delivered_to TEXT,
|
||||
transaction_date TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
note TEXT,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
@@ -552,35 +551,6 @@ CREATE TABLE standard_conversions (
|
||||
CONSTRAINT uq_standard_conversion UNIQUE (from_unit, to_unit)
|
||||
);
|
||||
|
||||
-- Inter-project material transfers
|
||||
CREATE TABLE project_transfers (
|
||||
id UUID NOT NULL DEFAULT gen_random_uuid() PRIMARY KEY,
|
||||
from_project_id UUID NOT NULL REFERENCES projects(id) ON DELETE RESTRICT,
|
||||
from_warehouse_id UUID NOT NULL REFERENCES warehouses(id) ON DELETE RESTRICT,
|
||||
to_project_id UUID NOT NULL REFERENCES projects(id) ON DELETE RESTRICT,
|
||||
material_id UUID NOT NULL REFERENCES materials(id) ON DELETE RESTRICT,
|
||||
brand_id UUID REFERENCES brands(id) ON DELETE SET NULL,
|
||||
unit_id INTEGER NOT NULL REFERENCES units(id) ON DELETE RESTRICT,
|
||||
quantity NUMERIC(18,6) NOT NULL CHECK (quantity > 0),
|
||||
specs JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||
specs_hash TEXT NOT NULL DEFAULT 'default',
|
||||
note TEXT,
|
||||
status TEXT NOT NULL DEFAULT 'in_transit' CHECK (status IN ('in_transit', 'received', 'cancelled')),
|
||||
out_transaction_id UUID REFERENCES inventory_transactions(id) ON DELETE SET NULL,
|
||||
transfer_date TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
transferred_by TEXT,
|
||||
received_at TIMESTAMPTZ,
|
||||
received_by TEXT,
|
||||
to_warehouse_id UUID REFERENCES warehouses(id) ON DELETE SET NULL,
|
||||
receipt_allocations JSONB,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
);
|
||||
|
||||
CREATE INDEX idx_project_transfers_from ON project_transfers(from_project_id, status);
|
||||
CREATE INDEX idx_project_transfers_to ON project_transfers(to_project_id, status);
|
||||
|
||||
|
||||
-- ============================================================================
|
||||
-- UPDATED_AT TRIGGER (auto-set updated_at on row modification)
|
||||
-- ============================================================================
|
||||
@@ -609,10 +579,6 @@ CREATE TRIGGER trg_quote_attachments_updated_at
|
||||
BEFORE UPDATE ON quote_attachments
|
||||
FOR EACH ROW EXECUTE FUNCTION set_updated_at();
|
||||
|
||||
CREATE TRIGGER trg_project_transfers_updated_at
|
||||
BEFORE UPDATE ON project_transfers
|
||||
FOR EACH ROW EXECUTE FUNCTION set_updated_at();
|
||||
|
||||
-- ============================================================================
|
||||
-- AUTOMATION TRIGGERS (v2.5 + v2.6)
|
||||
-- ============================================================================
|
||||
@@ -659,24 +625,6 @@ CREATE TABLE IF NOT EXISTS audit_log (
|
||||
details JSONB NOT NULL DEFAULT '{}'
|
||||
);
|
||||
|
||||
-- ---------- BALE BOT DRAFTS (quote extraction & review sync) ----------
|
||||
CREATE TABLE IF NOT EXISTS bot_drafts (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
chat_id BIGINT NOT NULL,
|
||||
kind VARCHAR(16) NOT NULL,
|
||||
payload JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||
missing JSONB,
|
||||
status VARCHAR(16) NOT NULL DEFAULT 'active',
|
||||
source VARCHAR(16),
|
||||
review_message_id BIGINT,
|
||||
last_bale_update_at TIMESTAMPTZ,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS ix_bot_drafts_chat_id ON bot_drafts(chat_id);
|
||||
CREATE INDEX IF NOT EXISTS ix_bot_drafts_chat_status ON bot_drafts(chat_id, status);
|
||||
|
||||
-- ---------- UNIFIED PROJECTS (PM & PROCUREMENT SHARED SCHEMA) ----------
|
||||
ALTER TABLE projects ADD COLUMN IF NOT EXISTS location TEXT DEFAULT '';
|
||||
ALTER TABLE projects ADD COLUMN IF NOT EXISTS project_manager TEXT DEFAULT '';
|
||||
@@ -687,7 +635,6 @@ ALTER TABLE projects ADD COLUMN IF NOT EXISTS actual_end DATE;
|
||||
ALTER TABLE projects ADD COLUMN IF NOT EXISTS status TEXT DEFAULT 'ACTIVE';
|
||||
ALTER TABLE projects ADD COLUMN IF NOT EXISTS progress DOUBLE PRECISION DEFAULT 0.0;
|
||||
ALTER TABLE projects ADD COLUMN IF NOT EXISTS updated_at TIMESTAMPTZ DEFAULT now();
|
||||
(revert: restore production to the state before 730d0bd (PM/RBAC work moved to 'pm'))
|
||||
|
||||
COMMIT;
|
||||
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
{
|
||||
"intent": "register_quote",
|
||||
"patch": {
|
||||
"supplier_name": "شرکت فولاد مبارکه",
|
||||
"project_name": "برج آسمان",
|
||||
"project_names": ["برج آسمان"],
|
||||
"is_official": true,
|
||||
"notes": "تحویل پای کارگاه",
|
||||
"expiry_date": null,
|
||||
"items": [
|
||||
{
|
||||
"material_name": "میلگرد",
|
||||
"brand_name": null,
|
||||
"specs": ["A3", "سایز ۱۴"],
|
||||
"quantity": 5000,
|
||||
"unit_name": "کیلوگرم",
|
||||
"unit_price": 28500,
|
||||
"notes": ""
|
||||
}
|
||||
],
|
||||
"payment_terms": [
|
||||
{
|
||||
"label": "شرایط پرداخت",
|
||||
"milestones": [
|
||||
{"due_date": null, "amount": 50000000},
|
||||
{"due_date": null, "amount": null}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"confidence": 0.95
|
||||
}
|
||||
@@ -1,71 +0,0 @@
|
||||
import json
|
||||
import urllib.request
|
||||
|
||||
api_key = "sk-a671eab15be846d494bf0839070a3b32"
|
||||
url = "https://api.deepseek.com/chat/completions"
|
||||
|
||||
prompt = """تو دستیار تدارکات یک ERP فارسی هستی. ورودی تو پیام صوتی/متنی کاربر است.
|
||||
یک JSON و فقط JSON برگردان (بدون توضیح اضافه) با این شکل:
|
||||
{
|
||||
"intent": "register_quote",
|
||||
"patch": {
|
||||
"supplier_name": "نام تأمین‌کننده",
|
||||
"project_name": "نام پروژه",
|
||||
"project_names": ["نام پروژه"],
|
||||
"is_official": true,
|
||||
"notes": "یادداشت‌ها",
|
||||
"expiry_date": "YYYY-MM-DD",
|
||||
"items": [
|
||||
{
|
||||
"material_name": "فقط نام کلی کالا",
|
||||
"brand_name": "نام کارخانه یا برند",
|
||||
"specs": ["مشخصه ۱", "مشخصه ۲"],
|
||||
"quantity": 5000,
|
||||
"unit_name": "کیلوگرم",
|
||||
"unit_price": 28500,
|
||||
"notes": ""
|
||||
}
|
||||
],
|
||||
"payment_terms": [
|
||||
{
|
||||
"label": "شرایط پرداخت",
|
||||
"milestones": [
|
||||
{"due_date": "YYYY-MM-DD", "amount": 50000000}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"confidence": 0.95
|
||||
}
|
||||
قوانین:
|
||||
- برای کالاها: material_name فقط نام کلی کالا باشد (مانند «میلگرد» یا «لوله»)؛ کارخانه یا برند در brand_name؛ و مشخصات فنی (مثل سایز یا گرید) در آرایه specs قرار گیرد.
|
||||
- برای شرایط پرداخت: در صورت ذکر اقساط/موعد و مبالغ، در milestones: [{"due_date": "YYYY-MM-DD", "amount": number}] قرار بده.
|
||||
"""
|
||||
|
||||
user_msg = "استعلام قیمت از شرکت فولاد مبارکه برای ۵ تن میلگرد A3 سایز ۱۴ به قیمت هر کیلو ۲۸۵۰۰ تومن، تحویل پای کارگاه برج آسمان، پرداخت در دو مرحله ۵۰ میلیون نقد و مابقی تا آخر ماه"
|
||||
|
||||
payload = {
|
||||
"model": "deepseek-chat",
|
||||
"messages": [
|
||||
{"role": "system", "content": prompt},
|
||||
{"role": "user", "content": user_msg}
|
||||
],
|
||||
"response_format": {"type": "json_object"}
|
||||
}
|
||||
|
||||
data = json.dumps(payload).encode("utf-8")
|
||||
req = urllib.request.Request(url, data=data, headers={
|
||||
"Content-Type": "application/json",
|
||||
"Authorization": f"Bearer {api_key}"
|
||||
})
|
||||
|
||||
try:
|
||||
resp = urllib.request.urlopen(req)
|
||||
res_data = json.loads(resp.read().decode("utf-8"))
|
||||
content = res_data["choices"][0]["message"]["content"]
|
||||
with open("tests/deepseek_output.json", "w", encoding="utf-8") as out_f:
|
||||
out_f.write(content)
|
||||
print("DEEPSEEK SUCCESS! Saved to tests/deepseek_output.json")
|
||||
print("KEYS IN EXTRACTED JSON:", list(json.loads(content).get("patch", {}).keys()))
|
||||
except Exception as e:
|
||||
print("DEEPSEEK ERROR:", e)
|
||||
@@ -1,123 +0,0 @@
|
||||
import json
|
||||
import sys
|
||||
import types
|
||||
from pathlib import Path
|
||||
|
||||
# Stub external dependencies if not present in host python
|
||||
for mod in ["sqlalchemy", "sqlalchemy.ext", "sqlalchemy.ext.asyncio", "sqlalchemy.orm", "asyncpg", "pydantic", "pydantic_settings", "httpx"]:
|
||||
if mod not in sys.modules:
|
||||
m = types.ModuleType(mod)
|
||||
sys.modules[mod] = m
|
||||
|
||||
sys.modules["pydantic_settings"].BaseSettings = type("BaseSettings", (), {})
|
||||
sys.modules["pydantic_settings"].SettingsConfigDict = lambda **k: None
|
||||
sys.modules["pydantic"].BaseModel = type("BaseModel", (), {})
|
||||
|
||||
# Stub specific symbols needed by app.db and app.models
|
||||
sys.modules["sqlalchemy"].select = lambda *a, **k: None
|
||||
sys.modules["sqlalchemy"].update = lambda *a, **k: None
|
||||
sys.modules["sqlalchemy"].func = types.SimpleNamespace(gen_random_uuid=lambda: None, now=lambda: None)
|
||||
sys.modules["sqlalchemy"].BigInteger = type("BigInteger", (), {})
|
||||
sys.modules["sqlalchemy"].DateTime = lambda *a, **k: None
|
||||
sys.modules["sqlalchemy"].Index = lambda *a, **k: None
|
||||
sys.modules["sqlalchemy"].Integer = type("Integer", (), {})
|
||||
sys.modules["sqlalchemy"].String = lambda *a, **k: None
|
||||
sys.modules["sqlalchemy"].Text = type("Text", (), {})
|
||||
sys.modules["sqlalchemy.dialects.postgresql"] = types.ModuleType("sqlalchemy.dialects.postgresql")
|
||||
sys.modules["sqlalchemy.dialects.postgresql"].JSONB = lambda *a, **k: None
|
||||
sys.modules["sqlalchemy.dialects.postgresql"].UUID = lambda *a, **k: None
|
||||
sys.modules["sqlalchemy.orm"].DeclarativeBase = type("DeclarativeBase", (), {})
|
||||
sys.modules["sqlalchemy.orm"].Mapped = type("Mapped", (), {})
|
||||
sys.modules["sqlalchemy.orm"].mapped_column = lambda *a, **k: None
|
||||
sys.modules["sqlalchemy.ext.asyncio"].create_async_engine = lambda *a, **k: None
|
||||
sys.modules["sqlalchemy.ext.asyncio"].async_sessionmaker = lambda *a, **k: None
|
||||
|
||||
# Add 'ai procurement' to sys.path
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "ai procurement"))
|
||||
|
||||
from app.drafts import (
|
||||
new_quote_payload,
|
||||
merge_quote_patch,
|
||||
build_quote_request,
|
||||
compute_quote_missing,
|
||||
)
|
||||
|
||||
def test_wizard_conversion():
|
||||
mock_path = Path(__file__).resolve().parents[1] / "tests" / "wizard_mock_data.json"
|
||||
with open(mock_path, encoding="utf-8") as f:
|
||||
data = json.load(f)
|
||||
|
||||
# 1. Start with clean payload
|
||||
payload = new_quote_payload()
|
||||
|
||||
# 2. Extract patch from wizard mock data (simulating NLU patch extraction)
|
||||
s1 = data["step1_topic_and_supplier"]
|
||||
s2 = data["step2_line_items"]
|
||||
s3 = data["step3_termsheets"]
|
||||
s4 = data["step4_projects"]
|
||||
s5 = data["step5_review_and_metadata"]
|
||||
|
||||
patch = {
|
||||
"supplier_name": s1["supplier_name"],
|
||||
"is_official": s1["is_official"],
|
||||
"project_names": s4["projects"],
|
||||
"expiry_date": s5["expiry_date"],
|
||||
"notes": s5["notes"],
|
||||
"items": [
|
||||
{
|
||||
"material_name": it["material_name"],
|
||||
"brand_name": it["brand"],
|
||||
"specs": it["specs"],
|
||||
"quantity": it["quantity"],
|
||||
"unit_name": it["unit"],
|
||||
"unit_price": it["unit_price"],
|
||||
}
|
||||
for it in s2
|
||||
],
|
||||
"payment_terms": [
|
||||
{
|
||||
"label": ts["label"],
|
||||
"milestones": ts["milestones"],
|
||||
}
|
||||
for ts in s3
|
||||
],
|
||||
}
|
||||
|
||||
# 3. Merge patch into payload
|
||||
changed = merge_quote_patch(payload, patch)
|
||||
assert changed, "Patch should have changed payload"
|
||||
|
||||
# 4. Simulate resolution
|
||||
payload["supplier_id"] = "11111111-1111-1111-1111-111111111111"
|
||||
payload["project_ids"] = ["22222222-2222-2222-2222-222222222222"]
|
||||
for i, it in enumerate(payload["items"], start=1):
|
||||
it["material_id"] = f"33333333-3333-3333-3333-33333333333{i}"
|
||||
it["unit_id"] = 3
|
||||
|
||||
# 5. Build QuoteCreate request
|
||||
body, problems = build_quote_request(payload)
|
||||
assert problems == [], f"Expected no problems, got {problems}"
|
||||
assert body is not None, "Body should not be None"
|
||||
|
||||
assert body["supplier_id"] == "11111111-1111-1111-1111-111111111111"
|
||||
assert body["is_official"] is True
|
||||
assert len(body["line_items"]) == 2
|
||||
assert body["line_items"][0]["temp_id"] == "t1"
|
||||
assert "A3، سایز ۱۴" in body["line_items"][0]["notes"]
|
||||
assert "فولاد مبارکه" in body["line_items"][0]["notes"]
|
||||
|
||||
assert len(body["termsheets"]) == 1
|
||||
assert body["termsheets"][0]["temp_id"] == "p1"
|
||||
assert len(body["termsheets"][0]["schedule_steps"]) == 3
|
||||
assert body["termsheets"][0]["schedule_steps"][0]["step_no"] == 1
|
||||
assert body["termsheets"][0]["schedule_steps"][0]["amount"] == 300000000.0
|
||||
|
||||
assert len(body["item_termsheets"]) == 2
|
||||
assert body["item_termsheets"][0]["line_item_temp_id"] == "t1"
|
||||
assert body["item_termsheets"][0]["termsheet_temp_id"] == "p1"
|
||||
assert body["item_termsheets"][0]["unit_price"] == 48500.0
|
||||
|
||||
print("ALL WIZARD CONVERSION ASSERTIONS PASSED SUCCESSFULLY! [OK]")
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_wizard_conversion()
|
||||
@@ -1,86 +0,0 @@
|
||||
{
|
||||
"step1_topic_and_supplier": {
|
||||
"topic": "آهن‌آلات و مقاطع فولادی",
|
||||
"supplier_name": "فولاد آذرخش",
|
||||
"is_official": true,
|
||||
"new_supplier_details": {
|
||||
"location": "تهران - ونک",
|
||||
"phone": "02188776655",
|
||||
"contact_person": "حسینی"
|
||||
}
|
||||
},
|
||||
"step2_line_items": [
|
||||
{
|
||||
"material_name": "میلگرد",
|
||||
"brand": "فولاد مبارکه",
|
||||
"specs": [
|
||||
"A3",
|
||||
"سایز ۱۴"
|
||||
],
|
||||
"quantity": 12500.0,
|
||||
"unit": "کیلوگرم",
|
||||
"unit_price": 48500.0,
|
||||
"total_price": 606250000.0
|
||||
},
|
||||
{
|
||||
"material_name": "میلگرد",
|
||||
"brand": "فولاد مبارکه",
|
||||
"specs": [
|
||||
"A3",
|
||||
"سایز ۱۶"
|
||||
],
|
||||
"quantity": 8000.0,
|
||||
"unit": "کیلوگرم",
|
||||
"unit_price": 47200.0,
|
||||
"total_price": 377600000.0
|
||||
}
|
||||
],
|
||||
"step3_termsheets": [
|
||||
{
|
||||
"label": "گزینه ۱",
|
||||
"milestones": [
|
||||
{
|
||||
"due_date": "2026-09-22",
|
||||
"amount": 300000000.0
|
||||
},
|
||||
{
|
||||
"due_date": "2026-09-28",
|
||||
"amount": 450000000.0
|
||||
},
|
||||
{
|
||||
"due_date": "2026-10-15",
|
||||
"amount": 233850000.0
|
||||
}
|
||||
],
|
||||
"covered_items": [
|
||||
"میلگرد - فولاد مبارکه - A3 - سایز ۱۴",
|
||||
"میلگرد - فولاد مبارکه - A3 - سایز ۱۶"
|
||||
]
|
||||
}
|
||||
],
|
||||
"step4_projects": {
|
||||
"projects": [
|
||||
"برج آسمان"
|
||||
],
|
||||
"item_project_assignments": [
|
||||
{
|
||||
"item_name": "میلگرد - فولاد مبارکه - A3 - سایز ۱۴",
|
||||
"assigned_projects": [
|
||||
"برج آسمان"
|
||||
]
|
||||
},
|
||||
{
|
||||
"item_name": "میلگرد - فولاد مبارکه - A3 - سایز ۱۶",
|
||||
"assigned_projects": [
|
||||
"برج آسمان"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"step5_review_and_metadata": {
|
||||
"quote_date": "2026-09-19T08:30:00Z",
|
||||
"expiry_date": "2026-10-05",
|
||||
"notes": "تحویل پای کارگاه برج آسمان. کرایه حمل با فروشنده است.",
|
||||
"proforma_file": "پیش‌فاکتور_فولاد_آذرخش_۱۴۰۳.pdf"
|
||||
}
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
{
|
||||
"step1_topic_and_supplier": {
|
||||
"topic": null,
|
||||
"supplier_name": null,
|
||||
"is_official": null,
|
||||
"new_supplier_details": {
|
||||
"location": null,
|
||||
"phone": null,
|
||||
"contact_person": null
|
||||
}
|
||||
},
|
||||
"step2_line_items": [
|
||||
{
|
||||
"material_name": null,
|
||||
"brand": null,
|
||||
"specs": [],
|
||||
"quantity": null,
|
||||
"unit": null,
|
||||
"unit_price": null,
|
||||
"total_price": null
|
||||
}
|
||||
],
|
||||
"step3_termsheets": [
|
||||
{
|
||||
"label": null,
|
||||
"milestones": [
|
||||
{
|
||||
"due_date": null,
|
||||
"amount": null
|
||||
}
|
||||
],
|
||||
"covered_items": []
|
||||
}
|
||||
],
|
||||
"step4_projects": {
|
||||
"projects": [],
|
||||
"item_project_assignments": [
|
||||
{
|
||||
"item_name": null,
|
||||
"assigned_projects": []
|
||||
}
|
||||
]
|
||||
},
|
||||
"step5_review_and_metadata": {
|
||||
"quote_date": null,
|
||||
"expiry_date": null,
|
||||
"notes": null,
|
||||
"proforma_file": null
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user