mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git
synced 2026-08-19 04:24:12 +00:00
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into container-profile-ui
This commit is contained in:
azumiru
@@ -27,7 +27,6 @@ class LogoutUserLogic extends AbstractControllerLogic
|
||||
*/
|
||||
public function __construct(InvalidatesAuthenticationToken $invalidatesAuthenticationToken)
|
||||
{
|
||||
logger("logout user logic");
|
||||
$this->invalidatesAuthenticationToken = $invalidatesAuthenticationToken;
|
||||
}
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ use App\Classes\ValueObjects\Constants\PackingListType;
|
||||
use App\Classes\ValueObjects\Constants\TransportType;
|
||||
|
||||
use App\Http\Resources\PackingListResource;
|
||||
use App\Models\PackingList;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Carbon\Carbon;
|
||||
@@ -80,6 +81,9 @@ class CreateShippingPackingListLogic extends AbstractControllerLogic
|
||||
/**
|
||||
* @param Request $request
|
||||
* @return JsonResponse
|
||||
* @throws \App\Classes\Exceptions\AccessForbiddenException
|
||||
* @throws \App\Classes\Exceptions\MalformedRequestException
|
||||
* @throws \App\Classes\Exceptions\RequestValidationException
|
||||
*/
|
||||
public function logic(Request $request) : JsonResponse
|
||||
{
|
||||
@@ -93,6 +97,8 @@ class CreateShippingPackingListLogic extends AbstractControllerLogic
|
||||
PackingListType::SHIPPING_PACKING_LIST,
|
||||
ApprovalStatus::PENDING_SUBMISSION
|
||||
);
|
||||
|
||||
/** @var PackingList $packingList */
|
||||
$packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
|
||||
|
||||
$packages = $request->input('packages');
|
||||
|
||||
@@ -66,6 +66,10 @@ class FetchDeliveryListFromVTPortalProcessor
|
||||
|
||||
$shippingPackingLists = $this->fetchesDataFRomVTPortal->getResponseBody($shippingPackingListsRequest);
|
||||
|
||||
if(!array_key_exists(0, $shippingPackingLists->Rows)){
|
||||
continue;
|
||||
}
|
||||
|
||||
$shippingPackingList = $shippingPackingLists->Rows[0];
|
||||
|
||||
if(!$shippingPackingList[9] && !$shippingPackingList[10]) {
|
||||
@@ -87,6 +91,7 @@ class FetchDeliveryListFromVTPortalProcessor
|
||||
$deliveryStep->update(['status' => ApprovalStatus::COMPLETED]);
|
||||
|
||||
} catch (GuzzleException $exception) {
|
||||
dd($exception);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@ class CreatesPackingList extends AbstractUpdateRelationshipRecord
|
||||
$model->claimant_id = $object->getClaimantId();
|
||||
$model->type = $object->getType();
|
||||
$model->status = $object->getStatus();
|
||||
$model->reference_contract = $object->getContractReference();
|
||||
|
||||
return $this->handler($packable->packingLists(), $model);
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ class UpdatesContractObligation
|
||||
|
||||
$accessToken=$this->getAccessToken->execute();
|
||||
|
||||
$this->updateContractStatusEndpoint = str_replace('{hash}',$obligation_hash_id,$this->updateContractStatusEndpoint);
|
||||
$this->updateContractStatusEndpoint = str_replace('{hash}', $obligation_hash_id, $this->updateContractStatusEndpoint);
|
||||
|
||||
$response = Http::withToken($accessToken)->put($this->updateContractStatusEndpoint,['entity_signature_id'=>$contract_entity_signature])->object();
|
||||
|
||||
|
||||
@@ -15,7 +15,6 @@ class UserAuthenticationLogoutController
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function logout(Request $request, LogoutUserLogic $logic): JsonResponse {
|
||||
logger("logout controller");
|
||||
return $logic->execute($request);
|
||||
}
|
||||
|
||||
|
||||
+24
@@ -11,6 +11,30 @@
|
||||
<on-boarding-section-component v-if="!company.last_order"></on-boarding-section-component>
|
||||
<div class="row" v-if="company.last_order">
|
||||
<div class="col">
|
||||
<div class="row m-b-20">
|
||||
<div class="col no-padding">
|
||||
<div class="alert alert-warning" role="alert">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<p class="fs-18 p-t-15"><i class="fa fa-exclamation-triangle m-r-5"></i> !!!! 海运费涨价通知 NOTICE OF PRICE INCREMENT !!! <i class="fa fa-exclamation-triangle m-l-5"></i></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<p>由于近期海运费非常不稳定，运费每个星期都会调整，请发货入仓之前按以下按键确认最新运费价格。</p>
|
||||
<p>Due to the recent unstable shipping rates, shipping costs are adjusted weekly, please confirm the latest shipping prices before shipping into the warehouse by following the button below.</p>
|
||||
<a href="https://www.cief-malaysia.com/services-sea-shipping/" target="_blank"><div class="btn btn-complete">Sea Shipping Price List</div></a>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<chinese-new-year-memo-component></chinese-new-year-memo-component>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row m-b-30 relative">
|
||||
<div class="col">
|
||||
<div class="row">
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
<template>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<div class="text-white p-t-25 p-l-25 p-r-25" style="background-image: radial-gradient(rgb(182, 3, 17), rgb(118, 0, 12));">
|
||||
<div class="row" style="max-width: 650px; margin: 0px auto;">
|
||||
<div class="col">
|
||||
<div class="row m-b-25">
|
||||
<div class="col text-center">
|
||||
<h4 class="text-warning no-margin">2022年农历新春前夕仓库运作通知</h4>
|
||||
<h4 class="text-warning no-margin">Chinese New Year Shipping Memo 2022</h4>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<p class="no-margin">尊敬的顾客,</p>
|
||||
<p class="m-b-15">Dear Valued Customers,</p>
|
||||
<p class="no-margin">为确保您的货物在华人农历新年前收到， 务必提前通知您的供应商安排在以下日期前把货物送到仓库:</p>
|
||||
<p>To ensure your goods received before the Chinese New Year Holidays, we advised the customer to inform their suppliers to arrange their goods earlier beforehand to the schedule below:</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row m-t-10">
|
||||
<div class="col">
|
||||
<div class="tg-wrap"><table class="tg">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="tg-2bkf" colspan="2">仓库 WAREHOUSE</th>
|
||||
<th class="tg-2bkf">入仓日期 RECEIVED DATE</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="tg-2bkf" rowspan="2">广州<br>GUANGHZOU<br></td>
|
||||
<td class="tg-2bkf">西马<br>WEST MALAYSIA</td>
|
||||
<td class="tg-2bkf">25/12/2021</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tg-2bkf">东马<br>EAST MALAYSIA</td>
|
||||
<td class="tg-2bkf">11/12/2021</td>
|
||||
</tr>
|
||||
<tr v-if="expanded">
|
||||
<td class="tg-2bkf" rowspan="2">义乌<br>YIWU</td>
|
||||
<td class="tg-2bkf">西马<br>WEST MALAYSIA</td>
|
||||
<td class="tg-2bkf">18/12/2021</td>
|
||||
</tr>
|
||||
<tr v-if="expanded">
|
||||
<td class="tg-2bkf">东马<br>EAST MALAYSIA</td>
|
||||
<td class="tg-2bkf">04/12/2021</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row m-t-15" v-if="expanded">
|
||||
<div class="col">
|
||||
<div class="row m-b-20">
|
||||
<div class="col">
|
||||
<p class="no-margin">我们建议客户尽早安排送货到中国仓库，以确保货物在恶劣天气、运输延误、海关检查等情况下准时到达目的地。</p>
|
||||
<p>Customers are advised to arrange delivery to China warehouse as soon as possible to ensure goods reach their destination on time due to the events of Bad weather, Shipping delay, Custom inspection and etc.</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<h6 class="text-warning no-margin bold">仓库运营日期</h6>
|
||||
<h6 class="text-warning no-margin bold">Warehouse Operation Date</h6>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row m-t-15 m-b-15">
|
||||
<div class="col">
|
||||
<div class="tg-wrap"><table class="tg">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="tg-2bkf">仓库<br>WAREHOUSE</th>
|
||||
<th class="tg-2bkf">仓库截止收货日期<br>LAST DAY RECEIVE GOODS</th>
|
||||
<th class="tg-2bkf">仓库復工日期<br>RESUME OPERATION DATE</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="tg-2bkf" rowspan="2">义乌<br>YIWU</td>
|
||||
<td class="tg-2bkf" rowspan="2">18/01/2022</td>
|
||||
<td class="tg-2bkf" rowspan="2">16/02/2022</td>
|
||||
</tr>
|
||||
<tr>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tg-2bkf" rowspan="2">广州<br>GUANGHZOU</td>
|
||||
<td class="tg-2bkf" rowspan="2">18/01/2022</td>
|
||||
<td class="tg-2bkf" rowspan="2">12/02/2022</td>
|
||||
</tr>
|
||||
<tr>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" style="margin-top: -1px;">
|
||||
<div class="col text-center">
|
||||
<div class="btn btn-block btn-danger bg-danger-darker no-border p-t-10 p-b-10" @click="expanded = !expanded"><i class="fa m-r-10" :class="[{'fa-angle-double-down': !expanded}, {'fa-angle-double-up': expanded}]"></i> Click To view {{expanded ? 'less' : 'more'}} details <i class="fa m-l-10" :class="[{'fa-angle-double-down': !expanded}, {'fa-angle-double-up': expanded}]"></i></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data(){
|
||||
return {
|
||||
expanded: false
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
.tg {border-collapse:collapse;border-spacing:0; width: 650px; margin: 0px auto; }
|
||||
.tg td{border-color:black;border-style:solid;border-width:1px;font-family:Arial, sans-serif;font-size:14px;
|
||||
overflow:hidden;padding:8px 20px;word-break:normal;}
|
||||
.tg th{border-color:black;border-style:solid;border-width:1px;font-family:Arial, sans-serif;font-size:14px;
|
||||
font-weight:normal;overflow:hidden;padding:8px 20px;word-break:normal;}
|
||||
.tg .tg-2bkf{background-color:#76000c;border-color:#ffffff;color:#ffffff;text-align:center;vertical-align:middle}
|
||||
@media screen and (max-width: 767px) {.tg {width: auto !important;}.tg col {width: auto !important;}.tg-wrap {overflow-x: auto;-webkit-overflow-scrolling: touch;margin: auto 0px;}}
|
||||
</style>
|
||||
@@ -1,32 +1,5 @@
|
||||
<div class="row d-none" :class="[{'d-flex': !$store.getters.isAdmin}]" v-if="!$store.getters.isAdmin">
|
||||
<div class="col">
|
||||
<div class="row">
|
||||
<div class="col no-padding">
|
||||
<div class="alert alert-warning" role="alert">
|
||||
<div class="row">
|
||||
<div class="col p-b-15">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<p class="fs-18 p-t-15"><i class="fa fa-exclamation-triangle m-r-5"></i> !!!! 海运费涨价通知 NOTICE OF PRICE INCREMENT !!! <i class="fa fa-exclamation-triangle m-l-5"></i></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<p class="no-margin">由于最近船公司正缩减仓位， 导致持续推高海运费。</p>
|
||||
<p>所以从 10/11/2021 开始入仓广州仓库的货物会有所调整。</p>
|
||||
<p>广州 - 西马运费+RM50/立方</p>
|
||||
<p class="m-b-20">有造成不便之处，敬请见谅！谢谢合作</p>
|
||||
<p>Shortage of container is getting terrible in the whole worldwide due to Shipping liner company consolidating their ship</p>
|
||||
<p>Therefore, the shipping fee from Guangzhou to West Malaysia will be adjusted start from good entering warehouse by 10/11/2021</p>
|
||||
<p >Guangzhou - West Malaysia +RM50/CBM</p>
|
||||
<p class="m-b-0">We apologize that any inconvenience caused! Thanks for your cooperation.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<customer-profile-section-component :company_id="$store.getters.getCompanyId"></customer-profile-section-component>
|
||||
</div>
|
||||
</div>
|
||||
@@ -102,6 +102,7 @@ Route::get('/orders/refresh', function(){
|
||||
|
||||
Route::get('/containers/refresh', function(){
|
||||
|
||||
// FetchLoadedContainersFromVTPortalJob::dispatch();
|
||||
FetchContainersStatusUpdateFromVTPortalJob::dispatch();
|
||||
|
||||
return redirect('orders');
|
||||
|
||||
Reference in New Issue
Block a user