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

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development

Browse Source
This commit is contained in:
edmondlang
2023-05-30 19:06:47 +08:00
parent 744494c336 f37d775e97
commit 94b1b045c9
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
+1 -1
View File
@@ -65,7 +65,7 @@ class AutoPurchaseOrderFillLogic extends AbstractControllerLogic
public function logic(Request $request) : JsonResponse
{
$bookings = Booking::where('service_id', '!=', 4)->where(function($query){
return $query->whereMonth('created_at', '<', 03)->whereYear('created_at', 2023);
return $query->whereMonth('created_at', '=', 04)->whereYear('created_at', 2023);
})->whereDoesntHave('transactions', function($q){
$q->where('type', TransactionType::PURCHASE_ORDER);
$q->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED]);
app/Http/Controllers/Imports/ImportHoneyTrapController.php
+12 -3
View File
@@ -33,9 +33,18 @@ class ImportHoneyTrapController
$excelRows = $import->rows;
$excelRows = $excelRows->toArray();
$returnArray = [];
$returnArray = [];
$segment_name = 'honey trap campaign';
$segment = Segment::where('name', $segment_name)->first();
$segment_id = Segment::where('name', 'honey trap platinum')->first()->id;
if (!$segment) {
$row['status'] = 'Failed';
$row['message'] = '"' . $segment_name . '"' . ' not found';
$returnArray[] = $row;
return response()->json($returnArray);
}
$segment_id = $segment->id;
foreach ($excelRows as $row) {
@@ -111,6 +120,6 @@ class ImportHoneyTrapController
{
$unixTime = (($date - 25569) * 86400);
$date = new DateTime("@$unixTime");
return $date->format('d/m/Y');
return $date->format('Y-m-d'); // Change the format to 'Y-m-d'
}
}