diff --git a/app/Classes/Modules/Bookings/ControllersLogic/AutoPackingListFillLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php similarity index 95% rename from app/Classes/Modules/Bookings/ControllersLogic/AutoPackingListFillLogic.php rename to app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php index 949973b7..0db23bc0 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/AutoPackingListFillLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php @@ -14,7 +14,7 @@ use App\Models\Transaction; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -class AutoPackingListFillLogic extends AbstractControllerLogic +class AutoPurchaseOrderFillLogic extends AbstractControllerLogic { /** @@ -46,13 +46,12 @@ class AutoPackingListFillLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { - $booking = Booking::where('created_at', '>', '01-07-2021') + $booking = Booking::whereMonth('created_at', 7) + ->whereYear('created_at', 2021) ->whereDoesntHave('transactions', function($q){ $q->where('type', TransactionType::PURCHASE_ORDER); $q->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED]); }) - ->get(); - foreach ($booking as $key => $row) { $amount = $row->fix_amount; diff --git a/app/Http/Controllers/Bookings/AutoPackingListFillController.php b/app/Http/Controllers/Bookings/AutoPackingListFillController.php index 3c6580c0..45f5ebb1 100644 --- a/app/Http/Controllers/Bookings/AutoPackingListFillController.php +++ b/app/Http/Controllers/Bookings/AutoPackingListFillController.php @@ -2,18 +2,18 @@ namespace App\Http\Controllers\Bookings; -use App\Classes\Modules\Bookings\ControllersLogic\AutoPackingListFillLogic; +use App\Classes\Modules\Bookings\ControllersLogic\AutoPurchaseOrderFillLogic; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -class AutoPackingListFillController +class AutoPurchaseOrderFillController { /** * @param Request $request - * @param AutoPackingListFillLogic $logic + * @param AutoPurchaseOrderFillLogic $logic * @return JsonResponse */ - public function auto(Request $request, AutoPackingListFillLogic $logic): JsonResponse { + public function auto(Request $request, AutoPurchaseOrderFillLogic $logic): JsonResponse { return $logic->execute($request); } diff --git a/routes/booking.php b/routes/booking.php index e19add01..69dff750 100644 --- a/routes/booking.php +++ b/routes/booking.php @@ -33,6 +33,6 @@ Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Booking Route::post('{id}/proforma/create', 'CreateProformaInvoiceTransaction@create')->name('proforma.create'); - Route::post('/auto-packing-list-fill', 'AutoPackingListFillController@auto')->name('assign'); + Route::post('/auto-purchase-order-fill', 'AutoPurchaseOrderFillController@auto')->name('assign'); }); \ No newline at end of file