Merge branch 'develop' into task/#1542

2026-02-13 09:30:06 +07:00 · 2026-02-13 09:30:06 +07:00 · 74b2694aef
commit 74b2694aef
parent cfd5ced28a 9a1acc0b7d
90 changed files with 1027 additions and 333 deletions
--- a/src/controllers/PosMasterActController.ts
+++ b/src/controllers/PosMasterActController.ts
@ -715,6 +715,7 @@ export class PosMasterActController extends Controller {
              "lastUpdateFullName",
              "lastUpdatedAt",
              "dateEnd",
+              "isDeleted"
            ],
            where: { profileId, status: true, isDeleted: false },
          });