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

fix: active regis branch only not work

Browse source
This commit is contained in:
Methapon2001 2024-12-18 16:29:48 +07:00
parent 3f04bd045d
commit db3bdfb25d
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/03-customer-branch-controller.ts
View file

@ -214,8 +214,10 @@ export class CustomerBranchController extends Controller {
? { ? {
registeredBranchId, registeredBranchId,
registeredBranch: branchActiveOnlyCond(activeRegisBranchOnly), registeredBranch: branchActiveOnlyCond(activeRegisBranchOnly),
...filterStatus(activeRegisBranchOnly ? Status.ACTIVE : status),
} }
: { : {
...filterStatus(activeRegisBranchOnly ? Status.ACTIVE : status),
registeredBranch: { registeredBranch: {
AND: { id: registeredBranchId }, AND: { id: registeredBranchId },
OR: company OR: company
@ -225,7 +227,7 @@ export class CustomerBranchController extends Controller {
}, },
customerId, customerId,
subDistrict: zipCode ? { zipCode } : undefined, subDistrict: zipCode ? { zipCode } : undefined,
...filterStatus(status), ...filterStatus(activeRegisBranchOnly ? Status.ACTIVE : status),
}, },
} satisfies Prisma.CustomerBranchWhereInput; } satisfies Prisma.CustomerBranchWhereInput;