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

update remark on transactions

Browse Source
This commit is contained in:
edmondlang
2024-04-25 14:50:59 +08:00
parent 30172a6d7a
commit 29507f5120
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Transaction.php
+8
View File
@@ -259,4 +259,12 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
return $this->morphMany(VoucherEntityMapping::class, 'owner'); return $this->morphMany(VoucherEntityMapping::class, 'owner');
} }
/**
* @return MorphMany
*/
public function remarks(): morphMany
{
return $this->morphMany(Remark::class, 'owner');
}
} }
routes/web.php
+11 -11
View File
@@ -973,15 +973,17 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
route:: post('/transaction/{id}/create-remark',function ($transactionId) { route:: post('/transaction/{id}/create-remark',function ($transactionId) {
$transaction = Transaction::find($transactionId); $transaction = Transaction::find($transactionId);
$remark = new Remark(); $remark = new Remark();
$remark->owner_type = get_class($transaction);
$remark->owner_id = $transaction->id;
$remark->content = request('content'); $remark->content = request('content');
$remark->id = $transactionId;
$remark->save(); $remark->save();
return redirect()->back(); return redirect()->back();
})->name('transaction.create-remark'); })->name('transaction.create-remark');
Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}', function ($from_date, $to_date) { Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}', function ($from_date, $to_date) {
$approvedTransactions = Transaction::where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->where('owner_type', '!=', Wallet::class)->orderBy('status')->get(); $approvedTransactions = Transaction::where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->where('owner_type', '!=', Wallet::class)->orderBy('status')->get();
echo '<h1>Pending Orders Payments</h1>'; echo '<h1>Pending Orders Payments</h1>';
@@ -1004,15 +1006,15 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
echo '<td style="border: 1px solid black;">' . round($approvedTransaction->amount, 2) . '</td>'; echo '<td style="border: 1px solid black;">' . round($approvedTransaction->amount, 2) . '</td>';
echo '<td style="border: 1px solid black;">' . $approvedTransaction->created_at->format('d-m-Y h:i A') . '</td>'; echo '<td style="border: 1px solid black;">' . $approvedTransaction->created_at->format('d-m-Y h:i A') . '</td>';
echo '<td style="border: 1px solid black;">' . ApprovalStatus::APPROVAL_STATUS_ID[$approvedTransaction->status] . '</td>'; echo '<td style="border: 1px solid black;">' . ApprovalStatus::APPROVAL_STATUS_ID[$approvedTransaction->status] . '</td>';
$remark = Remark::where('id', $approvedTransaction->id)->first(); $remarks = $approvedTransaction->remarks;
if ($remark) { echo '<td style="border: 1px solid black;">';
echo '<td style="border: 1px solid black;">' . $remark->content . '</td>'; foreach ($remarks as $remark) {
} else { echo "<p>$remark->content</p>";
echo '<td style="border: 1px solid black;">No remark found</td>'; }
} echo '</td>';
echo '<td style="border: 1px solid black;">' ; echo '<td style="border: 1px solid black;">' ;
echo '<form method="post" action="' . route('transaction.create-remark', ['id' => $approvedTransaction->id]) . '">'; echo '<form method="post" action="' . route('transaction.create-remark', ['id' => $approvedTransaction->id]) . '">';
echo '<input type="text" name="content" placeholder="Enter remark">'; echo '<input type="text" name="content" placeholder="Enter remark" required>';
echo '<button type="submit">Add Remark</button>'; echo '<button type="submit">Add Remark</button>';
echo csrf_field(); echo csrf_field();
echo '</form>'; echo '</form>';
@@ -1063,6 +1065,4 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
echo '</tbody>'; echo '</tbody>';
echo '</table>'; echo '</table>';
}); });