diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php index e583eaf9..bb022317 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php @@ -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, diff --git a/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue index d676e525..e69de29b 100644 --- a/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/CustomerDashboardSectionComponent.vue @@ -1,282 +0,0 @@ - - diff --git a/resources/assets/vue/components/general/forms/SelectableComponent.vue b/resources/assets/vue/components/general/forms/SelectableComponent.vue index 95db6af8..0e71e6a7 100644 --- a/resources/assets/vue/components/general/forms/SelectableComponent.vue +++ b/resources/assets/vue/components/general/forms/SelectableComponent.vue @@ -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){ diff --git a/resources/views/pages/pdfs/supplier_deliver_order.blade.php b/resources/views/pages/pdfs/supplier_deliver_order.blade.php index f1e0d6c6..fbd2ad8a 100644 --- a/resources/views/pages/pdfs/supplier_deliver_order.blade.php +++ b/resources/views/pages/pdfs/supplier_deliver_order.blade.php @@ -5,9 +5,14 @@
- +
- Atvantic Import & Export Snd. Bhd (1309816-P) + @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 +
diff --git a/routes/web.php b/routes/web.php index 60abafae..e26ef4d8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,13 +1,16 @@ 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');