diff --git a/app/Classes/Modules/Accounting/ControllersLogic/UpdateBankStatementDetailLogic.php b/app/Classes/Modules/Accounting/ControllersLogic/UpdateBankStatementDetailLogic.php index 63338ace..71e8ba41 100644 --- a/app/Classes/Modules/Accounting/ControllersLogic/UpdateBankStatementDetailLogic.php +++ b/app/Classes/Modules/Accounting/ControllersLogic/UpdateBankStatementDetailLogic.php @@ -7,13 +7,16 @@ use App\Classes\Exceptions\MalformedRequestException; use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Accounting\Services\CreatesBankStatementTransactionOwner; use App\Classes\Modules\Accounting\Services\FetchesBankStatementTransaction; +use App\Classes\Modules\Accounting\Processors\ListShippingPortalTransactions; use App\Classes\ValueObjects\Constants\StatementTransactionOwnerType; use App\Classes\ValueObjects\Constants\SystemType; use App\Classes\Modules\Accounting\Processors\ChecksBillNumber; +use App\Classes\ValueObjects\Constants\ShippingTransactionType; use App\Classes\ValueObjects\Constants\TransactionType; use App\Models\Booking; use App\Models\Transaction; use App\Models\Wallet; +use Exception; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -104,10 +107,18 @@ class UpdateBankStatementDetailLogic extends AbstractControllerLogic } if($systemReference === 'izyim') { - $transaction = $transaction[0]; - $owner_type = Transaction::class; - $owner_id = $transaction['owner_id']; - $owner_reference = $transaction['owner_reference']; + $transaction = $transaction[0]; + $payFor = $request->input('pay_for'); + $transactionType = $transaction['type']; + + if (($payFor === 'sales' && !in_array($transactionType, [ShippingTransactionType::PAYMENT, ShippingTransactionType::GROUP_PAYMENT])) + || ($payFor === 'top_up' && !in_array($transactionType, [ShippingTransactionType::TOP_UP]))) { + throw new Exception("Transaction Type does not match"); + } + + $owner_type = Transaction::class; + $owner_id = $transaction['owner_id']; + $owner_reference = $transaction['owner_reference']; } } diff --git a/app/Classes/Modules/Accounting/Processors/ListShippingPortalTransactions.php b/app/Classes/Modules/Accounting/Processors/ListShippingPortalTransactions.php index 86a032b5..5e0d4756 100644 --- a/app/Classes/Modules/Accounting/Processors/ListShippingPortalTransactions.php +++ b/app/Classes/Modules/Accounting/Processors/ListShippingPortalTransactions.php @@ -12,8 +12,7 @@ class ListShippingPortalTransactions public function execute($filters) { try { - // $url = 'https://izyim.cief-malaysia.com/public/api/v1/transactions/mappable/query/with-details'; - $url = 'http://127.0.0.1:8000/public/api/v1/transactions/mappable/query/with-details'; + $url = 'https://izyim.cief-malaysia.com/public/api/v1/transactions/mappable/query/with-details'; $client = new \GuzzleHttp\Client(['verify' => false]); $response = $client->request('GET', $url . '?api-key=510acd13d8d24375cf038ad626c282565451461a9c2399357e0b65365300787e&filters=' . json_encode($filters)); $body = $response->getBody(); diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php index 92e42b83..d6b2383d 100644 --- a/resources/views/pages/pdfs/invoice.blade.php +++ b/resources/views/pages/pdfs/invoice.blade.php @@ -174,15 +174,21 @@