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

fix upload payment proof document

Browse Source
This commit is contained in:
omair saleh
2022-07-17 14:23:33 +08:00
parent 8dd9827d0d
commit e4ca88fd66
5 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentProofDocumentLogic.php
+2 -1
View File
@@ -51,11 +51,12 @@ class CreatePaymentProofDocumentLogic extends AbstractControllerLogic
private $createInvoiceTransactionProcessor;
/**
* CreatePaymentVerificationDocumentLogic constructor.
* CreatePaymentProofDocumentLogic constructor.
* @param FetchesTransaction $fetchesTransaction
* @param CreatesDocument $createsDocument
* @param CreatesFiles $createsFile
* @param UpdatesTransactionStatus $updatesTransactionStatus
* @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
*/
public function __construct(FetchesTransaction $fetchesTransaction, CreatesDocument $createsDocument, CreatesFiles $createsFile, UpdatesTransactionStatus $updatesTransactionStatus, CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor)
{
app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php
+5
View File
@@ -28,7 +28,12 @@ class CreateInvoiceDocumentProcessor
}
/**
* @param $transaction
* @param $purchaseOrder
* @param $supplier
* @param $document_type
* @return void
* @throws \App\Classes\Exceptions\MalformedRequestException
*/
public function execute($transaction, $purchaseOrder, $supplier, $document_type)
{
app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
+3 -1
View File
@@ -69,7 +69,7 @@ class CreateInvoiceTransactionProcessor
* @param UpdatesBookingStatus $updatesBookingStatus
* @param CreateInvoiceDocumentProcessor $invoiceDocumentProcessor
*/
public function __construct(ListsTransactions $listsTransactions, CreatesTransaction $createsTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CalculatesBookingPaidAmount $calculatesBookingPaidAmount, CalculatesBookingPayableAmount $calculatesBookingPayableAmount, CalculatesBookingTransferredAmount $calculatesBookingTransferredAmount, FetchesServiceConfigurations $fetchesServiceConfigurations, CalculatesBookingCurrencyAverageRate $calculatesBookingCurrencyAverageRate, FetchesCompany $fetchesCompany, UpdatesBookingStatus $updatesBookingStatus, CreateInvoiceTransactionProcessor $invoiceDocumentProcessor)
public function __construct(ListsTransactions $listsTransactions, CreatesTransaction $createsTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CalculatesBookingPaidAmount $calculatesBookingPaidAmount, CalculatesBookingPayableAmount $calculatesBookingPayableAmount, CalculatesBookingTransferredAmount $calculatesBookingTransferredAmount, FetchesServiceConfigurations $fetchesServiceConfigurations, CalculatesBookingCurrencyAverageRate $calculatesBookingCurrencyAverageRate, FetchesCompany $fetchesCompany, UpdatesBookingStatus $updatesBookingStatus, CreateInvoiceDocumentProcessor $invoiceDocumentProcessor)
{
$this->listsTransactions = $listsTransactions;
$this->createsTransaction = $createsTransaction;
@@ -84,6 +84,8 @@ class CreateInvoiceTransactionProcessor
$this->invoiceDocumentProcessor = $invoiceDocumentProcessor;
}
/**
* @param Booking $booking
* @return void
resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
-9
View File
@@ -124,15 +124,6 @@
</div>
<div class="col-12 col-md">
<supplier-place-order-form-component :payments="payments" :currency="selectedCurrency" :supplier="selectedSupplier" section="pendingOrdersSection"></supplier-place-order-form-component>
<div class="row m-t-20">
<div class="col">
<list-component key="2" section="currencyOrdersListSection" :options="{'per_page': 10000, 'document_type_in': ['CURRENCY_VENDOR_ORDER'], 'status': 1, 'with_company': true}" :endpoint="route('api.document.list')">
<template slot="list" slot-scope="{data}">
<currency-order-component section="currencyOrdersListSection" :data="data"></currency-order-component>
</template>
</list-component>
</div>
</div>
</div>
</div>
</div>
resources/views/pages/pdfs/supplier_deliver_order.blade.php
+14 -14
View File
@@ -6,7 +6,7 @@
<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;">
{{ $transactions->issuerCompany->reference }}
{{ $transaction->issuerCompany->reference }}
</td>
</tr>
</table>
@@ -18,8 +18,8 @@
<strong>Delivery Order</strong>
</td>
<td class="document-detail">
PO#: {{ $transactions->bill_no }} <br>
Ref#: {{ $transactions->booking->marking }} <br>
PO#: {{ $transaction->bill_no }} <br>
Ref#: {{ $transaction->booking->marking }} <br>
Date: {{ $po_order_transaction->created_at }}
</td>
</tr>
@@ -82,19 +82,19 @@
<td class="description">{{ $transaction_detail->product_name }}</td>
<td width="10%" class="center top">{{ $transaction_detail->quantity }}</td>
<td width="15%" class="center top">
@if($transactions->booking()->first()->fix_currency_id !== 1)
{{ number_format( (1/$transactions->currency_rate) * $transaction_detail->price, 2) }}
@if($transaction->booking()->first()->fix_currency_id !== 1)
{{ number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2) }}
@else
{{ number_format($transaction_detail->price, 2) }}
@endif
</td>
<td width="20%" class="right top">
@if($transactions->booking()->first()->fix_currency_id !== 1)
@if($transaction->booking()->first()->fix_currency_id !== 1)
{{ number_format((float)number_format( (1/$transactions->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
{{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
@php
$subtotal += number_format((float)number_format( (1/$transactions->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
$subtotal += number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
@endphp
@else
{{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
@@ -119,10 +119,10 @@
<td colspan="4"></td>
<td class="right">Adjustment</td>
<td class="right">
@if($transactions->booking()->first()->fix_currency_id !== 1)
{{ number_format((float)number_format( (1/$transactions->currency_rate) * $transactions->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
@if($transaction->booking()->first()->fix_currency_id !== 1)
{{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
@else
{{ number_format((float)number_format($transactions->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
{{ number_format((float)number_format($transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
@endif
</td>
</tr>
@@ -130,10 +130,10 @@
<td colspan="4"></td>
<td class="right middle">Total</td>
<td class="total right middle">
@if($transactions->booking()->first()->fix_currency_id !== 1)
{{ number_format( ((1/$transactions->currency_rate) * $transactions->amount), 2) }}
@if($transaction->booking()->first()->fix_currency_id !== 1)
{{ number_format( ((1/$transaction->currency_rate) * $transaction->amount), 2) }}
@else
{{ number_format($transactions->amount, 2) }}
{{ number_format($transaction->amount, 2) }}
@endif
</td>
</tr>