update null_order_packing_list_ul

This commit is contained in:
edmondlang
2022-02-14 00:08:37 +08:00
parent 658a669a4d
commit c040dfe2c3
8 changed files with 157 additions and 17 deletions
@@ -0,0 +1,20 @@
<?php
namespace App\Classes\General\Eloquent\Filters;
use Illuminate\Database\Eloquent\Builder;
class OwnerId implements Filter
{
/**
* @param Builder $builder
* @param $value
* @return Builder|mixed
*/
public static function apply(Builder $builder, $value)
{
return $builder->where('owner_id', $value);
}
}
@@ -106,7 +106,7 @@ class AssignPackingListOrderLogic extends AbstractControllerLogic
'status' => ApprovalStatus::REJECTED
]);
$order = $this->fetchesOrder->execute(['id' => $request->input('order_id')]);
$order = $this->fetchesOrder->execute(['reference' => $request->route('reference')]);
$warehouse_packing_list = $this->updatesPackingListOwner->execute($warehouse_packing_list, $order);
@@ -50,23 +50,11 @@ class ListPackingListsLogic extends AbstractControllerLogic
*/
public function logic(Request $request) : JsonResponse
{
try {
$this->canListPackingLists->passes();
$this->canListPackingLists->passes();
$query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($request->input('filters')));
if ($request->input('null_order')) {
return $this->collectionResponse(PackingListNullOrderResource::collection($query));
}
else {
return $this->collectionResponse(PackingListResource::collection($query));
}
} catch (\Exception $exception){
throw new ErrorException($exception->getMessage(), $exception->getCode());
}
$query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($request->input('filters')));
return $this->collectionResponse(PackingListResource::collection($query));
}
}
File diff suppressed because one or more lines are too long
@@ -0,0 +1,58 @@
<template>
<div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
<div class="col bg-white padding-40 b-rad-lg">
<div class="row m-b-10">
<div class="col text-center">
<p>Plese enter your order number.</p>
</div>
</div>
<div class="row">
<div class="col">
<div class="row m-auto mt-10 mb-10">
<div class="col p-l-0 p-r-10">
<validation-wrapper-component class="m-b-15" :validator="$v.orderNo">
<label class="text-primary">Order Number</label>
<input class="form-control" v-model="orderNo">
</validation-wrapper-component>
</div>
</div>
</div>
</div>
<div class="row m-t-15">
<div class="col-auto p-r-5">
<div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
</div>
<div class="col p-l-5">
<div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.packing_list.assign.order', data, orderNo), 'put', section, true, true)">Confirm</div>
</div>
</div>
</div>
</div>
</template>
<script>
import modalFormHandler from '../../../general/mixins/modalFormHandler';
import { required } from "vuelidate/lib/validators";
export default {
props: {
data: {
type: Number,
required: false
},
section: {
default: ''
},
},
data() {
return {
orderNo: '',
};
},
validations: {
orderNo: '',
},
mixins: [modalFormHandler]
}
</script>
@@ -0,0 +1,8 @@
@extends('layouts.base_portal')
@section('inner_content')
<div class="row">
<div class="col-7">
<unclaimed-packinglist-component></unclaimed-packinglist>
</div>
</div>
@endsection
+1 -1
View File
@@ -17,7 +17,7 @@ Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' =
Route::put('/update-drop-date/{id}', 'UpdateDropDatePackingListController@update')->name('update_drop_date');
Route::put('/complete/{id}', 'CompletePackingListController@complete')->name('complete');
Route::put('/assign-remark/{id}', 'AssignPackingListRemarkController@create')->name('assign.remark');
Route::put('/assign-order/{id}', 'AssignPackingListOrderController@assign')->name('assign.order');
Route::put('/assign-order/{id}/{reference}', 'AssignPackingListOrderController@assign')->name('assign.order');
Route::group(['namespace' => 'Containers', 'prefix' => 'container', 'as' => 'container.'], function () {
+4
View File
@@ -73,6 +73,10 @@ Route::get('/warehouse-list', function () {
return view('pages.warehouse_list');
})->name('warehouse.list');
Route::get('/unclaimed-packinglist', function () {
return view('pages.unclaimed_packinglist');
})->name('warehouse.list');
Route::get('/containers', function () {
return view('pages.containers');
})->name('containers');