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

Merge branch 'dillon/39-crm-changes' into development

Browse Source
This commit is contained in:
Dillon
2023-08-02 20:44:49 +08:00
parent 8d13ac1f2d f34333f4c9
commit f364627eef
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Jobs/UpdatePerfexCRM.php
+16 -16
View File
@@ -42,22 +42,9 @@ class UpdatePerfexCRM implements ShouldQueue
public function handle()
{
$invoiceId = 0;
//To use invoice as a reference to decide whether more tasks should be created
if($this->transaction != null){
$updatePerfexCRMInvoiceObject = new UpdatePerfexCRMInvoiceObject(
$this->updatePerfexCRMObject->getContactEmail(),
$this->updatePerfexCRMObject->getProjectName(),
'',
$this->transaction,
true
);
// UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceObject);
$invoiceId = (App()->make(CreatePerfexCRMInvoiceV2Processor::class))->execute($updatePerfexCRMInvoiceObject);
}
$this->updatePerfexCRMObject->setInvoiceId($this->getInvoiceId());
$this->updatePerfexCRMObject->setInvoiceId($invoiceId);
$result = (App()->make(UpdatePerfexCRMProcessor::class))->execute($this->updatePerfexCRMObject);
if($this->transaction != null && $this->shouldCreateInvoice){
$updatePerfexCRMInvoiceObject = new UpdatePerfexCRMInvoiceObject(
@@ -67,9 +54,22 @@ class UpdatePerfexCRM implements ShouldQueue
$this->transaction,
true
);
UpdatePerfexCRMInvoice::dispatch($updatePerfexCRMInvoiceObject);
}
}
private function getInvoiceId(){
if($this->transaction != null){
$updatePerfexCRMInvoiceObject = new UpdatePerfexCRMInvoiceObject(
$this->updatePerfexCRMObject->getContactEmail(),
$this->updatePerfexCRMObject->getProjectName(),
'',
$this->transaction,
true
);
$invoiceId = (App()->make(CreatePerfexCRMInvoiceV2Processor::class))->execute($updatePerfexCRMInvoiceObject);
return $invoiceId;
}
return 0;
}
}
app/Classes/Modules/PerfexCRM/DataTransferObjects/UpdatePerfexCRMObject.php
+1 -1
View File
@@ -35,7 +35,7 @@ class UpdatePerfexCRMObject implements DataTransferObject
private $tasks;
/** @var int */
private $invoiceId;
private $invoiceId = 0;
public function __construct(string $companyName, string $companyReference, string $contactName, string $contactEmail, string $bookingMarking, string $projectName, int $projectStatus, int $invoiceId, array $milestoneNames, array $tasks)
app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMInvoiceV2Processor.php
+3 -3
View File
@@ -39,13 +39,13 @@ class CreatePerfexCRMInvoiceV2Processor
public function execute(UpdatePerfexCRMInvoiceObject $updatePerfexCRMInvoiceObject)
{
//invoiceId to be returned - fetch or create
$invoiceId = 0;
//get the client id
$customer = $this->fetchesPerfexCRMCustomer->execute($updatePerfexCRMInvoiceObject->getEmail());
$transaction = $updatePerfexCRMInvoiceObject->getTransaction();
//get the invoice id
$invoiceId = 0;
$number = $transaction->bill_no;
$prefix = "INV-";