chamomind/jws-backend
chamomind/jws-backend
7
0
Fork 0
Code Issues Projects 1 Releases Packages 1 Wiki Activity Actions

Merge branch 'develop'

Browse source
This commit is contained in:
Methapon2001 2025-01-30 16:47:05 +07:00
commit da6003d19d
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/05-quotation-controller.ts
View file

@ -194,6 +194,7 @@ export class QuotationController extends Controller {
@Query() urgentFirst?: boolean, @Query() urgentFirst?: boolean,
@Query() includeRegisteredBranch?: boolean, @Query() includeRegisteredBranch?: boolean,
@Query() hasCancel?: boolean, @Query() hasCancel?: boolean,
@Query() forDebitNote?: boolean,
@Query() code?: string, @Query() code?: string,
@Query() query = "", @Query() query = "",
) { ) {
@ -218,7 +219,7 @@ export class QuotationController extends Controller {
code, code,
payCondition, payCondition,
registeredBranch: isSystem(req.user) ? undefined : { OR: permissionCond(req.user) }, registeredBranch: isSystem(req.user) ? undefined : { OR: permissionCond(req.user) },
quotationStatus: status, quotationStatus: forDebitNote ? { notIn: ["Issued", "Expired"] } : status,
requestData: hasCancel requestData: hasCancel
? { ? {
some: { some: {