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

Fix error from production logs

Browse Source
This commit is contained in:
Dillon
2023-08-05 20:39:04 +08:00
parent 0d2ecffd8c
commit 3be1854fce
4 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Jobs/CreatePerfexCRMInvoice.php
+2 -12
View File
@@ -16,27 +16,17 @@ class CreatePerfexCRMInvoice implements ShouldQueue
/** @var $transaction*/
private $transaction;
/** @var $purchaseOrder*/
private $purchaseOrder;
/** @var $supplier*/
private $supplier;
/**
* CreatePerfexCRMInvoice constructor.
* @param $transaction
* @param $purchaseOrder
* @param $supplier
*/
public function __construct($transaction, $purchaseOrder, $supplier)
public function __construct($transaction)
{
$this->transaction = $transaction;
$this->purchaseOrder = $purchaseOrder;
$this->supplier = $supplier;
}
public function handle()
{
(App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($this->transaction, $this->purchaseOrder, $this->supplier);
(App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($this->transaction);
}
}
app/Classes/Jobs/UpdatePerfexCRMInvoice.php
+1 -1
View File
@@ -60,7 +60,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
Log::error(json_encode('UpdatePerfexCRMInvoice debug $number: '.$number));
if(is_null($invoice)){
$result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction, null, null);
$result = (App()->make(CreatePerfexCRMInvoiceProcessor::class))->execute($transaction);
if ($result) {
$invoiceId = $result->payload['id'];
} else {
app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceProcessor.php
+3 -10
View File
@@ -59,23 +59,16 @@ class CreatePerfexCRMInvoiceProcessor
/**
* @param $transaction
* @param $purchaseOrder
* @param $supplier
* @return null|object
* @throws \App\Classes\Exceptions\MalformedRequestException
*/
public function execute($transaction, $purchaseOrder, $supplier) {
public function execute($transaction) {
$booking = $transaction->booking;
if(is_null($supplier)){
$supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]);
}
if(is_null($purchaseOrder)){
$purchaseOrder = $booking->transactions()
$supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]);
$purchaseOrder = $booking->transactions()
->where('type', TransactionType::PURCHASE_ORDER)
->complete()
->first();
}
$clientId = "";
$number = $transaction->bill_no;
app/Classes/Modules/PerfexCRM/Processors/FetchPerfexCRMInvoiceProcessor.php
+1 -1
View File
@@ -57,7 +57,7 @@ class FetchPerfexCRMInvoiceProcessor
$number = 'EXC-'.$number;
$invoice = $this->fetchesPerfexCRMInvoice->execute($customer->userid,"INV-", $number);
if(is_null($invoice)){
$result = $this->createPerfexCRMInvoiceProcessor->execute($transaction, null, null);
$result = $this->createPerfexCRMInvoiceProcessor->execute($transaction);
if ($result) {
$invoiceId = $result->payload['id'];
} else {