update payment and billing

2026-08-23 14:34:19 +00:00 · 2022-08-07 17:11:26 +08:00
parent 9e756132ca
commit a2c7eddf7b
15 changed files with 308 additions and 26 deletions
@@ -46,7 +46,7 @@ class OrderResource extends JsonResource
                    'received_packages' => PackingListResource::collection($this->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('packages')->get()),
                ];
            }),
-            'invoices' => TransactionResource::collection($this->transactions), 
+            'invoices' => TransactionResource::collection($this->transactions()->whereNotIn('transactions.status', [0, 1])->get()), 
            'remarks' => RemarkResource::collection($this->remarks),
            'created_at' => $this->created_at->format('d-m-Y')
        ];