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

Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2024-03-24 20:15:58 +08:00
parent 9f94c2e184 bd7fd92cf0
commit 330103bc79
9 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Jobs/ListDocumentsJob.php
-11
View File
@@ -44,17 +44,6 @@ class ListDocumentsJob implements ShouldQueue
}
$result = (App()->make(ListDocumentsJobProcessor::class))->execute($this->listGenericJobObject);
//cief todo: Insert into DB: job id, query result, timestamp
// Store the result in the job_results table
//cief todo: why cannot save data in table like this
// $model = new JobResult();
// $model->job_id = $this->job->getJobId();
// $model->result = json_encode($result);
// $model->save();
// Log::error(json_encode($model->id));
}
public function getJobId(){
app/Classes/Modules/Accounts/Processors/AuthenticationProcessor.php
+1 -1
View File
@@ -81,7 +81,7 @@ class AuthenticationProcessor
$this->newCustomerToVoucherifyProcessor->execute(0, $user, false);
}
//cief todo: case study 1
//cief todo: case study 1 voucherify
//$this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_1]);
return ['access_token' => $this->generatesAuthenticationToken->execute($user), 'redirect_url' => $this->authenticationRedirect->url($user)];
app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
+1 -1
View File
@@ -81,7 +81,7 @@ class CreateAddressLogic extends AbstractControllerLogic
$company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
$query = $this->createsAddress->execute($company, $object);
//cief todo: case study 6
//cief todo: case study 6 voucherify
// $user = $company->employees()->first();
// $this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_6]);
app/Classes/Modules/Banks/ControllersLogic/CreateBankLogic.php
+1 -1
View File
@@ -89,7 +89,7 @@ class CreateBankLogic extends AbstractControllerLogic
// $bankLog = $this->createsBankLog->execute($bank);
//cief todo: case study 4
//cief todo: case study 4 voucherify
// $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
// $user = $company->employees()->first();
// $this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_4]);
app/Classes/Modules/Bookings/ControllersLogic/CreateBookingLogic.php
+1 -1
View File
@@ -97,7 +97,7 @@ class CreateBookingLogic extends AbstractControllerLogic
$this->bookingToPerfexCRMProcessor->execute($booking);
}
//cief todo: case study 5
//cief todo: case study 5 voucherify
// $user = $company->employees()->first();
// $this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_5]);
app/Classes/Modules/Companies/ControllersLogic/AssignCompanyToSegmentLogic.php
+1 -1
View File
@@ -88,7 +88,7 @@ class AssignCompanyToSegmentLogic extends AbstractControllerLogic
$this->createsSeasonalSegment->execute($seasonalSegmentObject);
}
//cief todo: case study 3
//cief todo: case study 3 voucherify
// $user = $company->employees()->first();
// $this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_3]);
app/Classes/Modules/Companies/ControllersLogic/CreateIdentificationDocumentLogic.php
+1 -1
View File
@@ -114,7 +114,7 @@ class CreateIdentificationDocumentLogic extends AbstractControllerLogic
$this->createIdentificationDocumentOnShippingProcessor->execute($request, $company->id);
}
//cief todo: case study 2
//cief todo: case study 2 voucherify
// $user = $company->employees()->first();
// $this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_2]);
app/Http/Controllers/AWS/AWSImageUploadController.php
+1 -1
View File
@@ -29,7 +29,7 @@ class AWSImageUploadController extends Controller
$request->image->storeAs('images', $imageName);
//cief todo: checking if storage disk exist
//checking if storage disk exist
if (Storage::disk('documents')) {
$check1 = "The disk documents exists.";
} else {
app/Http/Resources/CompanyResource.php
-4
View File
@@ -52,10 +52,6 @@ class CompanyResource extends JsonResource
$userInfoType = Auth::user()->type;
}
//cief todo: remove
// Log::error('CompanyResource 1: '. json_encode($userInfoEmail));
// Log::error('CompanyResource 2: '. json_encode($userInfoType));
if(!is_null($userInfoEmail) && !is_null($userInfoType)){
//cief todo: to review following merge conflict
//new UserResource(Auth::user() && Auth::user()->type === RoleTypes::USER ? $this->employees()->where('email', '=', Auth::user()->email)->first() : $this->employees()->orderBy('id', 'DESC')->first()),