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 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development

Browse Source 
# Conflicts:
#	resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
#	routes/web.php
This commit is contained in:
omair saleh
2022-02-17 20:00:29 +08:00
parent cee0f99dc9 a6038a47ba
commit 99a3a11267
5 changed files with 42 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
+4
View File
@@ -210,6 +210,10 @@ class CreateInvoiceTransactionProcessor
$booking_currency_average_rate = $this->calculatesBookingCurrencyAverageRate->execute($booking, TransactionType::BILL);
$transaction = $booking->transactions()
->where('type', TransactionType::BILL)
->first();
$transaction_object = new TransactionObject(
$billNumber,
TransactionType::SUPPLIER_DELIVER,
resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue
-282
View File
File diff suppressed because one or more lines are too long
resources/assets/vue/components/general/forms/SelectableComponent.vue
+1 -1
View File
@@ -34,7 +34,7 @@
if(!success){return;}
let vm = this;
let mappedList = $.map(response.payload.data, function(value){
let mappedList = response.payload.data.map(function(value){
let preservedValue = value;
return {'id': !isNaN(value[vm.valueColumn]) ? parseInt(value[vm.valueColumn]) : value[vm.valueColumn],
'text': vm.labelColumn.map(function(label){
resources/views/pages/pdfs/supplier_deliver_order.blade.php
+8 -3
View File
@@ -5,9 +5,14 @@
<br>
<table width="100%" style="border-bottom: 1px solid black;">
<tr>
<td
style="text-align: center; color: red; text-transform: uppercase; font-weight: bold; font-size: 18px; padding-bottom: 5px;">
Atvantic Import & Export Snd. Bhd (1309816-P)</td>
<td style="text-align: center; color: red; text-transform: uppercase; font-weight: bold; font-size: 18px; padding-bottom: 5px;">
@if(in_array($supplier_deliver_order_transaction->issuer, [2, 1921]))
Atvantic Import & Export Snd. Bhd (1309816-P)
@endif
@if(in_array($supplier_deliver_order_transaction->issuer, [1937, 1970]))
BK Gemilang Sdn Bhd (1403513-U)
@endif
</td>
</tr>
</table>
</htmlpageheader>
routes/web.php
+29 -4
View File
@@ -1,13 +1,16 @@
<?php
use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
use App\Classes\Modules\Documents\Services\CreatesDocument;
use App\Classes\Modules\Documents\Services\CreatesFiles;
use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Classes\ValueObjects\Constants\DocumentType;
use App\Classes\ValueObjects\Constants\TransactionType;
use App\Models\Booking;
use App\Models\Transaction;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Route;
use Maatwebsite\Excel\Excel;
use Meneses\LaravelMpdf\Facades\LaravelMpdf;
/*
|--------------------------------------------------------------------------
@@ -87,7 +90,29 @@ Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsP
return $exportsProducts->download('products.csv', Excel::CSV, ['Content-Type' => 'text/csv']);
})->name('products.random');
Route::get('/fix_bills', function () {
ini_set('max_execution_time', '10000');
Auth()->login(User::find(1));
Transaction::where('type', TransactionType::SUPPLIER_DELIVER)->whereIn('issuer', [1937, 1970])->chunk(50, function($dos){
foreach ($dos as $do){
$do->booking->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->delete();
$supplier = [];
$po = $do->booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first();
$supplier_order_pdf = LaravelMpdf::loadView('pages.pdfs.supplier_deliver_order', ['supplier_deliver_order_transaction' => $do, 'po_order_transaction' => $po, 'supplier' => $supplier]);
$document_object = new DocumentObject(
DocumentType::SUPPLIER_DELIVER_ORDER,
[chunk_split('data:application/pdf;base64,'.base64_encode($supplier_order_pdf->output()))],
'',
ApprovalStatus::COMPLETED,
'supplier_delivery_orders'
);
$document = (App()->make(CreatesDocument::class))->execute($do->booking, $document_object);
(App()->make(CreatesFiles::class))->execute($document, $document_object);
}
});
})->name('products.random');
//Route::get('/duplicated_bills', function (Request $request) {
// Auth()->login(User::find(1));
// $bookings = Booking::whereIn('id', [10391, 10275, 10109, 10108, 10070, 10066, 10063, 9801, 9166, 8895, 8790, 8544, 8264, 6957, 5409, 4717])->with('transactions')->pluck('marking');