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

Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0

Browse Source
This commit is contained in:
edmondlang
2024-07-17 10:22:21 +08:00
parent c3d94f8c4b c865b28315
commit 2a26c58dda
7 changed files with 135 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/UpdateBillGroupAndGroupToIncludeTransferFee.php
+30 -36
View File
@@ -56,12 +56,21 @@ class UpdateBillGroupAndGroupToIncludeTransferFee extends Command
$groups = Group::all();
foreach ($groups as $group) {
$group_transfer_fee = 0;
$morph_transaction = $group->morphTransactions()->where('type', TransactionType::TRANSFER_FEE)->first();
if ($morph_transaction) {
$group_transfer_fee = $morph_transaction->original_amount;
}
$originalTransferFees = (float)Transaction::where('type', TransactionType::TRANSFER_FEE)->whereIn('owner_id', $group->transactions->pluck('id'))->sum('service_charge');
$correctOriginalAmount = $group->transactions()->sum('original_amount');
$correctOriginalAmount += $originalTransferFees;
$correctOriginalAmount = $correctOriginalAmount + $originalTransferFees + $group_transfer_fee;
$correctAmount = $group->transactions()->sum('amount');
$transferFees = $originalTransferFees / $group->currency_rate;
$correctAmount += $transferFees;
$correctAmount = $correctAmount + $transferFees + ($group_transfer_fee / $group->currency_rate);
if ($group->original_amount != $correctOriginalAmount || $group->amount != $correctAmount) {
$group->original_amount = $correctOriginalAmount;
@@ -73,26 +82,26 @@ class UpdateBillGroupAndGroupToIncludeTransferFee extends Command
}
// update group calculation to include individual group transfer fee
$groups = Group::whereHas('morphTransactions', function ($q) {
$q->where('type', TransactionType::TRANSFER_FEE);
})->get();
// $groups = Group::whereHas('morphTransactions', function ($q) {
// $q->where('type', TransactionType::TRANSFER_FEE);
// })->get();
foreach ($groups as $group) {
$route = FacadesRoute::getRoutes()->getByName('api.transaction.group.update');
$request = Request::create(route('api.transaction.group.update', $group->id));
$uri = $route->uri;
$request->setRouteResolver(function () use ($request, $uri) {
// Associate Route to request so we can access route parameters.
return (new Route('PUT', $uri, []))->bind($request);
});
// foreach ($groups as $group) {
// $route = FacadesRoute::getRoutes()->getByName('api.transaction.group.update');
// $request = Request::create(route('api.transaction.group.update', $group->id));
// $uri = $route->uri;
// $request->setRouteResolver(function () use ($request, $uri) {
// // Associate Route to request so we can access route parameters.
// return (new Route('PUT', $uri, []))->bind($request);
// });
$request['rate'] = $group->currency_rate;
$request['supplier_id'] = $group->issuer;
$this->updateGroupLogic->execute($request);
// $request['rate'] = $group->currency_rate;
// $request['supplier_id'] = $group->issuer;
// $this->updateGroupLogic->execute($request);
$group_transfer_fee = $group->morphTransactions()->where('type', TransactionType::TRANSFER_FEE)->first();
$this->info("updated group id: {$group->id}, added transfer fee to individual white form CNY {$group_transfer_fee->original_amount}");
}
// $group_transfer_fee = $group->morphTransactions()->where('type', TransactionType::TRANSFER_FEE)->first();
// $this->info("updated group id: {$group->id}, added transfer fee to individual white form CNY {$group_transfer_fee->original_amount}");
// }
// update bill group calculation to include individual group transfer fee
$billGroups = BillGroup::all();
@@ -103,23 +112,8 @@ class UpdateBillGroupAndGroupToIncludeTransferFee extends Command
continue;
}
// get the groups
$payments = $billGroup->groups;
$totalOriginalTransferFee = 0;
$totalTransferFee = 0;
// for each group
foreach ($payments as $group) {
$group_transfer_fee = $group->morphTransactions()->where('type', TransactionType::TRANSFER_FEE)->first();
if ($group_transfer_fee) {
$totalOriginalTransferFee += $group_transfer_fee->original_amount;
$totalTransferFee = $totalTransferFee + ($group_transfer_fee->original_amount / $group->currency_rate);
}
}
$totalOriginal = $billGroup->original_amount + $totalOriginalTransferFee;
$total = $billGroup->amount + $totalTransferFee;
$totalOriginal = $billGroup->groups()->sum('original_amount');
$total = $billGroup->groups()->sum('amount');
// update bill group payment transaction amount if there is only 1 payment transaction
$payment_transactions = $billGroup->transactions()->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();