Merge branch 'dillon/90-e-invoice-shipping-portal-e' into vapor/production

This commit is contained in:
Dillon Ngo
2025-12-05 08:08:51 +08:00
@@ -59,9 +59,8 @@ class CreateBatchProcessingAutoCountImportLogic extends AbstractControllerLogic
: Carbon::now()->endOfMonth()->endOfDay();
$query = Transaction::query();
$approvalStatus = ApprovalStatus::COMPLETED;
$query->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])
->where('status', $approvalStatus);
->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
// $transactions = $query->whereHas('transactions', function($transaction) use ($startDate, $endDate) {
// $transaction->where('type', TransactionType::PAYMENT)