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

payment name

Browse Source
This commit is contained in:
glovetleong
2022-03-03 10:05:37 +08:00
parent 62e2e3be2d
commit a4f442d681
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php → app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php
+2 -2
View File
@@ -12,7 +12,7 @@ use Maatwebsite\Excel\Concerns\WithMapping;
use Illuminate\Http\Request;
use Carbon\Carbon;
class ExportsInvoiceTransactions implements FromQuery, WithHeadingRow, WithMapping
class ExportsPaymentTransactions implements FromQuery, WithHeadingRow, WithMapping
{
use Exportable;
@@ -63,7 +63,7 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadingRow, WithMappi
$query = Transaction::query();
$query->where('type', TransactionType::INVOICE);
$query->where('type', TransactionType::PAYMENT);
$query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
if($start_date && $end_date) {
app/Http/Controllers/Exports/ExportCustomersToExcelController.php
+4 -4
View File
@@ -6,7 +6,7 @@ namespace App\Http\Controllers\Exports;
use App\Classes\Modules\Exports\Services\ExportsCustomers;
use App\Classes\Modules\Exports\Services\ExportsTransactions;
use App\Classes\Modules\Exports\Services\ExportsNullDebtors;
use App\Classes\Modules\Exports\Services\ExportsInvoiceTransactions;
use App\Classes\Modules\Exports\Services\ExportsPaymentTransactions;
use App\Models\User;
use Illuminate\Http\Request;
@@ -33,10 +33,10 @@ class ExportCustomersToExcelController
return $exportsNullDebtors->download('nullDebtor.csv', Excel::CSV, ['Content-Type' => 'text/csv']);
}
public function invoicetransactions(Request $request){
public function paymentTransactions(Request $request){
$token = Auth::fromUser(User::find(1));
$request->headers->set('Authorization', 'Bearer '.$token);
$exportsTransactions = new ExportsInvoiceTransactions($request);
return $exportsTransactions->download('invoice-transactions.csv', Excel::CSV, ['Content-Type' => 'text/csv']);
$exportsTransactions = new ExportsPaymentTransactions($request);
return $exportsTransactions->download('payment-transactions.csv', Excel::CSV, ['Content-Type' => 'text/csv']);
}
}
routes/web.php
+1 -1
View File
@@ -143,7 +143,7 @@ Route::get('billplz/bills/{bill_no}', function($bill_no){
Route::get('/export/customers/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export');
Route::get('/export/transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@transactions');
Route::get('/export/null-debtor/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@nullDebtor');
Route::get('/export/invoice-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@invoicetransactions');
Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@paymentTransactions');
Route::get('/import/update-debtor/f614e339d7058904a831aad742e24d55', 'Imports\ImportUpdateDebtorController@import');