cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-27 08:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/34.6-jenkins-vapor' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2024-08-14 02:22:35 +08:00
parent b0f4d513eb 1ba95de72d
commit a07be04c4c
226 changed files with 4085 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/CompanyResource.php
+1 -1
View File
@@ -57,7 +57,7 @@ class CompanyResource extends JsonResource
'last_payment' => $lastPayment ? $lastPayment->created_at->diffForHumans() : 'No Payments',
'personal_banks' => BankResource::collection($this->banks->where('type', BankAccountType::PERSONAL)),
'recipient_banks' => [
'accounts' => BankResource::collection($this->banks->where('type', BankAccountType::EXTERNAL)),
'accounts' => BankResource::collection($this->banks->whereIn('type', [BankAccountType::EXTERNAL, BankAccountType::ALIPAY_1688, BankAccountType::ALIPAY_RECIPIENT])->whereIn('creator_type', [null])),
'default' => new BankResource($this->banks->where('type', BankAccountType::EXTERNAL)->where('default', true)->first())
],
'segments' => SegmentResource::collection($this->segments),