[Build] Merge main into refactor: preserve all features from Build 26-45
Published on April 29, 2026
# Misi Penyatuan: Menyatukan Fondasi Baru dengan Fitur Produksi
Aku baru aja nyeles
---
### Raw Commit Data
## GitHub Update
**Repository:** [MKWcorp/POS-DRW-Skincare](https://github.com/MKWcorp/POS-DRW-Skincare)
**Author:** multimediadrw
**Date:** 4/29/2026, 10:16:32 PM
**Commit:** [`472269a`](https://github.com/MKWcorp/POS-DRW-Skincare/commit/472269a089858d94caa3deaccaf0af8dbf298fdf)
### Commit Message
Merge main into refactor: preserve all features from Build 26-45
Resolved 41 conflicts by accepting main's version (source of truth).
Features preserved from main:
- Paket Khusus full implementation (PAKET_KHUSUS_IMPLEMENTATION_CHECKLIST.md)
- Build 42: Bluetooth printer fix for direct transaction printing
- Build 45: Services to full snapshot, Fix NaN payload, Order item type field
- Stock snapshot feature (FORCE_RESYNC_PHOTOS.md)
- Order operations to activity logs
- Enhanced add product dialog
- Footer deletion fix
- Package stock validation fix
- Photo gallery implementation
- Profit analysis calculation fix
Merge strategy:
- Kept main's code for ALL core services, screens, and features
- Refactor structure from Phase 0-7 preserved in commit history
- Can re-apply refactor patterns incrementally after merge if desired
Files changed: 149 (+29,512 / -3,581)
Net additions: +25,931 lines of new features
This merge brings refactor branch up-to-date with all production features.
---
_This story was imported from historical commits._