ATMATA/zerp
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33 Commits 1 Branch 0 Tags
3fd62ba0ad5bfecf09b4dde921c5d7d14e1203e0
Commit Graph

33 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yotakii
3fd62ba0ad some editing 2026-03-25 12:04:27 +03:00
yotakii
ba33072d95 rebrand 2026-03-16 13:01:30 +03:00
Talal Sharabi
03dea2e52b fix: rename map callback param to avoid shadowing translation t 
Made-with: Cursor
 2026-03-12 15:36:44 +04:00
Talal Sharabi
854a42980d fix: CORS for localhost:3000, login with username or email, favicon 
Made-with: Cursor
 2026-03-12 15:35:36 +04:00
Talal Sharabi
4c139429e2 feat(tenders): add Tender Management module (SRS, backend, frontend) 
- SRS document: docs/SRS_TENDER_MANAGEMENT.md
- Prisma: Tender, TenderDirective models; Deal.sourceTenderId; Attachment.tenderId/tenderDirectiveId
- Backend: tenders module (CRUD, duplicate check, directives, notifications, file upload, convert-to-deal)
- Frontend: tenders list, detail, create/edit forms, directives, convert to deal, i18n (en/ar), dashboard card
- Seed: tenders permissions for admin and sales positions
- Auth: admin.service findFirst for email check (Prisma compatibility)

Made-with: Cursor
 2026-03-11 16:57:40 +04:00
Talal Sharabi
18c13cdf7c feat(crm): add contracts, cost sheets, invoices modules and API clients 
Made-with: Cursor
 2026-03-11 16:40:25 +04:00
yotakii
8a20927044 add atmata brand 2026-03-10 11:54:46 +03:00
yotakii
6d82c5007c fix login 2026-03-05 12:16:29 +03:00
yotakii
625bc26a05 Merge branch 'master' of https://git.atmata-group.com/ATMATA/zerp 2026-03-05 11:57:04 +03:00
yotakii
8365f4da2d fix login error 2026-03-05 11:54:14 +03:00
Talal Sharabi
72ed9a2ff5 feat(hr): Complete HR module with Employee Portal, Loans, Leave, Purchase Requests, Contracts 
- Database: Add Loan, LoanInstallment, PurchaseRequest, LeaveEntitlement, EmployeeContract models
- Database: Extend Attendance with ZK Tico fields (sourceDeviceId, externalId, rawData)
- Database: Add Employee.attendancePin for device mapping
- Backend: HR admin - Loans, Purchase Requests, Leave entitlements, Employee contracts CRUD
- Backend: Leave reject, bulk attendance sync (ZK Tico ready)
- Backend: Employee Portal API - scoped by employeeId (loans, leaves, purchase-requests, attendance, salaries)
- Frontend: Employee Portal - dashboard, loans, leave, purchase-requests, attendance, salaries
- Frontend: HR Admin - new tabs for Leaves, Loans, Purchase Requests, Contracts (approve/reject)
- Dashboard: Add My Portal link
- No destructive schema changes; additive migrations only

Made-with: Cursor
 2026-03-04 19:44:09 +04:00
Talal Sharabi
ae890ca1c5 Merge origin/master: resolve conflicts, keep RBAC and fixes 
Made-with: Cursor
 2026-03-04 19:31:34 +04:00
Talal Sharabi
8edeaf10f5 RBAC: Phase 1-3, Total Salary fix, employee creation fix, permission groups, backup script 
Made-with: Cursor
 2026-03-04 19:31:08 +04:00
yotakii
69d3d21487 fix bug 2026-03-03 12:41:04 +03:00
yotakii
eecdf547cf fix salary field 2026-03-03 11:59:40 +03:00
yotakii
1c1c5bd254 fix 2026-03-03 10:38:57 +03:00
yotakii
e7afc8360f add permission-groups 2026-03-03 10:28:01 +03:00
yotakii
5beb870f1e add menuitem 2026-03-02 14:49:47 +03:00
yotakii
03ec18c5e6 fix layout 2026-03-02 14:35:36 +03:00
yotakii
cdb69af654 fix layout 2026-03-02 14:14:08 +03:00
yotakii
6fd74b90a0 update 2026-03-02 13:55:54 +03:00
yotakii
e74f872e92 fix roles view 2026-03-02 13:24:57 +03:00
yotakii
0b886e81f0 add delete option to roles 2026-03-02 10:44:23 +03:00
yotakii
5164f04b66 fix(hr): keep input focus while typing in form modal 2026-02-23 14:12:32 +03:00
yotakii
6fada5dd4e fix(hr): prevent crash when baseSalary is undefined 2026-02-23 12:48:46 +03:00
yotakii
6c3d9ea43f add more position 2026-02-23 12:23:51 +03:00
Talal Sharabi
6034f774ed Fix: wildcard permissions (GM modules visible), Admin link and module card 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-22 14:49:27 +04:00
Talal Sharabi
842678674b Admin panel: real data - backend API, users/audit/roles/stats, frontend wired 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-19 15:40:34 +04:00
Talal Sharabi
680ba3871e Deploy rule, CRM enhancements, Company Employee category, bilingual, contacts module completion 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-19 14:59:34 +04:00
Talal Sharabi
0b126cb676 Critical fix: Comprehensive input field text visibility 
- Fixed all text input visibility issues across the platform
- Added explicit color styles for all input types (text, email, password, etc.)
- Added -webkit-text-fill-color for Safari/Chrome compatibility
- Fixed placeholder text visibility
- Added proper focus and disabled states
- Fixed autocomplete color overrides
- Created reusable Input/Textarea components
- All inputs now have white background with dark text guaranteed
- Resolves issues where users could only type 1-2 letters or see nothing

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-11 23:21:01 +04:00
Talal Sharabi
7f3527b51c Fix HR module and text visibility issues 
- Added missing HR endpoints: /hr/departments and /hr/positions
- Fixed text color visibility (removed dark mode causing white text)
- Ensured all input fields have proper dark text color
- Added proper placeholder styling for forms

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-11 23:15:04 +04:00
Talal Sharabi
f31d71ff5a Production deployment with Docker and full system fixes 
- Added Docker support (Dockerfiles, docker-compose.yml)
- Fixed authentication and authorization (token storage, CORS, permissions)
- Fixed API response transformations for all modules
- Added production deployment scripts and guides
- Fixed frontend permission checks and module access
- Added database seeding script for production
- Complete documentation for deployment and configuration

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-11 11:25:20 +04:00
Talal Sharabi
35daa52767 feat: Complete Z.CRM system with all 6 modules 
✨ Features:
- Complete authentication system with JWT
- Dashboard with all 6 modules visible
- Contact Management module (Salesforce-style)
- CRM & Sales Pipeline module (Pipedrive-style)
- Inventory & Assets module (SAP-style)
- Tasks & Projects module (Jira/Asana-style)
- HR Management module (BambooHR-style)
- Marketing Management module (HubSpot-style)
- Admin Panel with user management and role matrix
- World-class UI/UX with RTL Arabic support
- Cairo font (headings) + Readex Pro font (body)
- Sample data for all modules
- Protected routes and authentication flow
- Backend API with Prisma + PostgreSQL
- Comprehensive documentation

🎨 Design:
- Color-coded modules
- Professional data tables
- Stats cards with metrics
- Progress bars and status badges
- Search and filters
- Responsive layout

📊 Tech Stack:
- Frontend: Next.js 14, TypeScript, Tailwind CSS
- Backend: Node.js, Express, Prisma
- Database: PostgreSQL
- Auth: JWT with bcrypt

🚀 Production-ready frontend with all features accessible
 2026-01-06 18:43:43 +04:00