cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-19 04:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

change order address

Browse Source
This commit is contained in:
omair saleh
2021-09-09 22:57:02 +08:00
parent 1ba5282244
commit 1939f64cdf
20 changed files with 280 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/Eloquent/Filters/WithOwner.php
+20
View File
@@ -0,0 +1,20 @@
<?php
namespace App\Classes\General\Eloquent\Filters;
use Illuminate\Database\Eloquent\Builder;
class WithOwner implements Filter
{
/**
* @param Builder $builder
* @param $value
* @return mixed
*/
public static function apply(Builder $builder, $value)
{
return $builder->with('owner');
}
}
app/Classes/Modules/Orders/ControllersLogic/ApproveChangeOrderAddressLogic.php
+3 -2
View File
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\Orders\ControllersLogic;
use App\Classes\General\Abstracts\AbstractControllerLogic;
use App\Classes\Modules\Orders\Processors\ApproveChangeOrderAddressProcessor;
use App\Http\Resources\AddressResource;
use App\Http\Resources\OrderResource;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
@@ -36,8 +37,8 @@ class ApproveChangeOrderAddressLogic extends AbstractControllerLogic
public function logic(Request $request): JsonResponse
{
$order = $this->approveChangeOrderAddressProcessor->execute($request);
$address = $this->approveChangeOrderAddressProcessor->execute($request);
return $this->resourceResponse(new OrderResource($order));
return $this->resourceResponse(new AddressResource($address));
}
}
app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
+25 -17
View File
@@ -2,9 +2,8 @@
namespace App\Classes\Modules\Orders\Processors;
use App\Classes\Modules\Addresses\Services\FetchesAddress;
use App\Classes\Modules\Orders\Standards\Rules\CanApproveChangeOrderAddress;
use App\Classes\Modules\Orders\Services\FetchesOrder;
use App\Classes\Modules\Addresses\Services\DeletesAddress;
use App\Classes\Modules\Orders\Services\UpdatesOrdersAddress;
use App\Classes\ValueObjects\Constants\ApprovalStatus;
@@ -15,39 +14,48 @@ class ApproveChangeOrderAddressProcessor
/** @var CanApproveChangeOrderAddress */
private $canApproveChangeOrderAddress;
/** @var FetchesOrder */
private $fetchesOrder;
/** @var FetchesAddress */
private $fetchesAddress;
/** @var UpdatesOrdersAddress */
private $updatesOrdersAddress;
/** @var DeletesAddress */
private $deletesAddress;
/**
* CreateOrderProcessor constructor.
* ApproveChangeOrderAddressProcessor constructor.
* @param CanApproveChangeOrderAddress $canApproveChangeOrderAddress
* @param FetchesOrder $fetchesOrder
* @param DeletesAddress $deletesAddress
* @param FetchesAddress $fetchesAddress
* @param UpdatesOrdersAddress $updatesOrdersAddress
*/
public function __construct(CanApproveChangeOrderAddress $canApproveChangeOrderAddress, FetchesOrder $fetchesOrder, DeletesAddress $deletesAddress, UpdatesOrdersAddress $updatesOrdersAddress)
public function __construct(CanApproveChangeOrderAddress $canApproveChangeOrderAddress, FetchesAddress $fetchesAddress, UpdatesOrdersAddress $updatesOrdersAddress)
{
$this->canApproveChangeOrderAddress = $canApproveChangeOrderAddress;
$this->fetchesOrder = $fetchesOrder;
$this->deletesAddress = $deletesAddress;
$this->fetchesAddress = $fetchesAddress;
$this->updatesOrdersAddress = $updatesOrdersAddress;
}
/**
* @param Request $request
* @return mixed
* @throws \App\Classes\Exceptions\AccessForbiddenException
* @throws \App\Classes\Exceptions\MalformedRequestException
* @throws \App\Classes\Exceptions\RequestValidationException
*/
public function execute(Request $request)
{
$status = (int) $request->route('status');
$this->canApproveChangeOrderAddress->passes();
$order = $this->fetchesOrder->execute(['id' => $request->get('order_id')]);
$this->deletesAddress->execute($order->addressesApproved->first());
$this->updatesOrdersAddress->execute($order->addressesPendingVerification->first(), ApprovalStatus::APPROVED);
$address = $this->fetchesAddress->execute(['id' => $request->route('id')]);
return $order;
if($status === ApprovalStatus::APPROVED){
$address->owner->addresses()->update(['status' => ApprovalStatus::EXPIRED]);
}
$this->updatesOrdersAddress->execute($address, $status);
return $address;
}
}
app/Classes/Modules/Orders/Services/UpdatesOrdersAddress.php
+2 -1
View File
@@ -10,7 +10,8 @@ class UpdatesOrdersAddress extends AbstractUpdateRecord
/**
* @param Address $address
* @param int $type
* @return void
* @return \Illuminate\Database\Eloquent\Model
* @throws \App\Classes\Exceptions\MalformedRequestException
*/
public function execute(Address $address, int $type)
{
app/Http/Resources/AddressResource.php
+2 -1
View File
@@ -23,7 +23,8 @@ class AddressResource extends JsonResource
'state' => $this->state,
'post_code' => $this->postcode,
'country' => $this->country,
'default' => (int) $this->default
'default' => (int) $this->default,
'owner' => new OrderResource($this->whenLoaded('owner'))
];
}
}
app/Http/Resources/OrderResource.php
+1 -1
View File
@@ -27,7 +27,7 @@ class OrderResource extends JsonResource
'status' => (int) $this->status,
'company_module' => new CompanyModuleResource($this->companyModule),
'warehouse' => new CompanyModuleResource($this->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee),
'address' => new AddressResource($this->addresses()->first()),
'address' => new AddressResource($this->addresses()->where('status', '=', ApprovalStatus::APPROVED)->first()),
'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
$this->mergeWhen($this->relationLoaded('parcels'), [
'origin_warehouse_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
resources/assets/sass/modules/_modals.scss
Vendored
+1 -1
View File
@@ -269,7 +269,7 @@ body.modal-open {
box-shadow: none;
}
.modal-dialog {
width: 600px;
width: 1140px;
}
.modal-sm {
width: 300px;
resources/assets/vue/components/address/forms/DeleteAddressFormComponent.vue
-33
View File
@@ -1,33 +0,0 @@
<template>
<div class="row">
<div class="col">
<loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
<div class="row justify-content-center" v-show="!isLoading">
<div class="col">
<div class="row m-b-20">
<div class="col">
<h3 class="all-caps">Are you Sure?</h3>
<div class="fs-11">Are you sure you want to delete this address?</div>
</div>
</div>
<div class="row">
<div class="col p-r-5">
<div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
</div>
<div class="col p-l-5">
<div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.address.delete', item.id), 'delete', section, true, true)">Delete</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import componentHandler from '../../../general/mixins/componentHandler';
import ModalFormHandler from '../../../general/mixins/modalFormHandler';
export default {
mixins: [componentHandler, ModalFormHandler]
}
</script>
resources/assets/vue/components/address/elements/AddressComponent.vue → resources/assets/vue/components/addresses/elements/AddressComponent.vue
View File
resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
+135
View File
@@ -0,0 +1,135 @@
<template>
<div class="row m-b-10 bg-master-lightest">
<div class="col">
<loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
<div class="row" v-show="!isLoading">
<div class="col">
<div class="row align-items-center">
<div class="col p-t-10 p-b-10">
<div class="row">
<div class="col">
<h5 class="text-primary no-margin"><a :href="route('order.show', item.owner.reference)">{{item.owner.reference}}</a></h5>
</div>
</div>
<div class="row align-items-center">
<div class="col">
<h6 class="no-margin"><a :href="route('customer.profile', item.owner.company_module.marking)">{{item.owner.company_module.marking}}</a></h6>
</div>
</div>
</div>
</div>
<div class="row b-t b-grey">
<div class="col p-t-10">
<div class="row m-b-15">
<div class="col">
<div class="row m-b-5">
<div class="col">
<div class="fs-8 all-caps muted">Original Address</div>
</div>
</div>
<div class="row">
<div class="col">
<div class="fs-11 bold">{{item.owner.address.street_one+' '+(item.owner.address.street_two ? item.owner.address.street_two : '')+', '+ item.owner.address.district.name+', '+item.owner.address.post_code+' '+item.owner.address.state.name+', '+item.owner.address.country.name}}</div>
</div>
</div>
</div>
</div>
<div class="row m-b-15">
<div class="col">
<div class="row m-b-5">
<div class="col">
<div class="fs-8 all-caps muted">New Address</div>
</div>
</div>
<div class="row">
<div class="col">
<div class="fs-11 bold">{{item.street_one+' '+(item.street_two ? item.street_two : '')+', '+ item.district.name+', '+item.post_code+' '+item.state.name+', '+item.country.name}}</div>
</div>
</div>
</div>
</div>
<div class="row m-t-20 parentContainer">
<div class="col">
<div class="row">
<div class="col no-padding">
<button class="btn btn-md btn-block btn-outline-danger b-rad-none p-t-10 p-b-10 requestModal" data-type="rejectAddress">
Reject
</button>
</div>
<modal-component small type="rejectAddress">
<div class="row">
<div class="col text-center">
<div class="row">
<div class="col text-center">
<div class="row m-b-20">
<div class="col">
<h5 class="all-caps">Reject Address Change Request</h5>
<div class="fs-11">Are you sure you want to reject order delivery address change request?</div>
</div>
</div>
<div class="row">
<div class="col p-r-5">
<div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
</div>
<div class="col p-l-5">
<div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="approveAddress(6)">Reject</div>
</div>
</div>
</div>
</div>
</div>
</div>
</modal-component>
<div class="col no-padding ml-auto">
<button class="btn btn-md btn-block btn-outline-success b-rad-none p-t-10 p-b-10 requestModal" data-type="approveAddress">
Approve
</button>
</div>
<modal-component small type="approveAddress">
<div class="row">
<div class="col text-center">
<div class="row">
<div class="col text-center">
<div class="row m-b-20">
<div class="col">
<h5 class="all-caps">Approve Address Change Request</h5>
<div class="fs-11">Are you sure you want to approve this order delivery address change request?</div>
</div>
</div>
<div class="row">
<div class="col p-r-5">
<div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
</div>
<div class="col p-l-5">
<div data-dismiss="modal" class="btn btn-sm btn-success btn-block b-rad-none" @click="approveAddress(2)">Approve</div>
</div>
</div>
</div>
</div>
</div>
</div>
</modal-component>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import componentHandler from '../../../general/mixins/componentHandler';
import staticFormHandler from '../../../general/mixins/staticFormHandler'
export default {
methods: {
approveAddress(status){
this.isLoading = true;
this.submit((this.route('api.order.address.status.update', this.item.id, status)), 'put', 'addressVerificationSection', true, true);
},
},
mixins: [componentHandler, staticFormHandler]
}
</script>
resources/assets/vue/components/addresses/elements/SelectAddressComponent.vue
+2 -2
View File
@@ -5,10 +5,10 @@
<div class="col-auto p-r-0">
<i class="fa fs-20 p-t-5" :class="{'fa-circle-o': value !== item.id, 'fa-check-circle': value === item.id, 'text-primary': value === item.id}"></i>
</div>
<div class="col-2">
<div class="col-3">
<h6 class="no-margin bold fs-12">{{item.reference}}</h6>
</div>
<div class="col">
<div class="col text-left">
<h6 class="no-margin fs-12">{{item.street_one}} {{item.street_two}}, {{item.district.name}}, {{item.post_code}} {{item.state.name}}, {{item.country.name}}</h6>
</div>
<div class="col-auto">
resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
+2 -2
View File
@@ -20,13 +20,13 @@
</div>
</div>
<div class="row m-b-15">
<div class="col-12 col-md pl-md-2 pb-3 pb-md-0 ">
<div class="col-12 col-md p-r-5 pb-3 pb-md-0 ">
<validation-wrapper-component selecatable :validator="$v.parameters.district_id">
<label>District</label>
<selectable-component :endpoint="route('api.address.district.list')" section="districtListSection" valueColumn="id" :labelColumn="['city']" v-model="parameters.district_id"></selectable-component>
</validation-wrapper-component>
</div>
<div class="col-12 col-md pl-md-2">
<div class="col-12 col-md p-l-5">
<validation-wrapper-component :validator="$v.parameters.post_code">
<label>Post Code</label>
<input class="form-control" name="post_code" v-model="parameters.post_code">
resources/assets/vue/components/address/forms/NewEditAddressFormComponent.vue → resources/assets/vue/components/addresses/forms/NewEditAddressFormComponent.vue
View File
resources/assets/vue/components/address/forms/SetDefaultAddressFormComponent.vue → resources/assets/vue/components/addresses/forms/SetDefaultAddressFormComponent.vue
View File
resources/assets/vue/components/address/sections/AddressListComponent.vue → resources/assets/vue/components/addresses/sections/AddressListComponent.vue
View File
resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue
-22
View File
@@ -1,22 +0,0 @@
<template>
<i class="fa fa-edit pointer requestModal" data-type="addressesList">
<modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="addressesList" size="large">
<change-order-address-form-component :data="data" :section="section" class="text-center"></change-order-address-form-component>
</modal-component>
</i>
</template>
<script>
export default {
props: {
data: {
type: Object,
required: true,
}
},
data() {
return {
section:"changeAddressSection"
}
},
}
</script>
resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue
+21 -11
View File
@@ -1,15 +1,16 @@
<template>
<div class="row justify-content-center">
<div class="col col-md-10">
<div class="row m-b-20">
<div class="row">
<div class="col">
<div class="row">
<div class="col">
<div class="row m-b-20 text-info">
<div class="col text-center">
<h3>Please select the address where you want to receive this order</h3>
<div class="col">
<h3 class="text-left">Delivery Address Update</h3>
<h6 class="text-left">Please select the address where you want to receive this order</h6>
</div>
</div>
<div class="row justify-content-center">
<div class="col col-md-10">
<div class="row justify-content-center no-margin">
<div class="col">
<list-component style="min-height: 50px;" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="{per_page: 10, HasMorphCompanyModule: data.company_module.id}">
<template slot="list" slot-scope="{data}">
<select-address-component :data="data" :value="parameters.address_id" v-model="parameters.address_id"></select-address-component>
@@ -34,11 +35,20 @@
</div>
</div>
</div>
<div class="row justify-content-center animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
<div class="col col-md-8 no-padding">
<div class="row animate__animated animate__fadeInUpBig animate__delay-1 animate__fast no-margin">
<div class="col no-padding">
<div class="row">
<div class="col p-l-5">
<button type="button" class="btn btn-lg btn-block btn-primary b-rad-none" @click="changeAddress()" >Update</button>
<div class="col"></div>
<div class="col-7">
<h6 class="text-right fs-12 text-danger m-b-15 text-right">**You delivery address change request will be approved after being reviewed, once it's approved your order delivery address will be updated.</h6>
</div>
</div>
<div class="row">
<div class="col text-left">
<button type="button" class="btn btn-md btn-default b-rad-none pointer" data-dismiss="modal" >Cancel</button>
</div>
<div class="col-auto">
<button type="button" class="btn btn-md btn-block btn-primary b-rad-none" @click="changeAddress()" v-if="parameters.address_id">Update Delivery Address</button>
</div>
</div>
</div>
resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+51 -12
View File
@@ -16,32 +16,71 @@
</div>
</div>
<div class="col">
<div class="row m-b-10">
<div class="row m-b-20">
<div class="col">
<h3 class="no-margin"><b>Order No.</b> {{order.reference}}</h3>
</div>
</div>
<div class="row m-b-10">
<div class="row m-b-20">
<div class="col-auto">
<h6 class="no-margin"><b>Delivery Address:</b> {{order.address.reference}} <i class="fa fa-info-circle m-l-10" v-tooltip:right="order.address.street_one+' '+(order.address.street_two ? order.address.street_two : '')+', '+ order.address.district.name+', '+order.address.post_code+' '+order.address.state.name+', '+order.address.country.name" ></i>
<change-address-component :data="order"></change-address-component>
<approve-change-address-component :data="order"></approve-change-address-component>
</h6>
<h6 class="no-margin"><b>Order Date:</b> {{order.created_at}}</h6>
</div>
<div class="col-auto">
<h6 class="no-margin"><b>Warehouse:</b> {{order.warehouse.id === 3 ? 'Guang Zhou' : 'Yiwu'}}</h6>
</div>
<div class="col-auto">
<h6 class="no-margin"><b>Order Date:</b> {{order.created_at}}</h6>
</div>
</div>
<div class="row m-b-10" v-if="$store.getters.isAdmin">
<div class="col" >
<div class="col" v-if="$store.getters.isAdmin">
<a :href="route('customer.profile', order.company_module.marking)">
<h6 class="no-margin"><b>Customer Marking:</b> {{order.company_module.marking}}</h6>
</a>
</div>
</div>
<div class="row m-b-10 align-items-center parentContainer" >
<div class="col-auto">
<h6 class="no-margin"><b>Delivery Address:</b> {{order.address.reference}} <i class="fa fa-info-circle m-l-10" v-tooltip:right="order.address.street_one+' '+(order.address.street_two ? order.address.street_two : '')+', '+ order.address.district.name+', '+order.address.post_code+' '+order.address.state.name+', '+order.address.country.name" ></i></h6>
</div>
<div class="col">
<div class="row" v-if="!order.address_change_request">
<div class="col">
<div class="btn btn-xs btn-outline-danger b-rad-none pointer requestModal" data-type="updateDeliveryAddress">Change Delivery Address</div>
<modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="updateDeliveryAddress" size="large">
<change-order-address-form-component :data="order" :section="section" class="text-center"></change-order-address-form-component>
</modal-component>
</div>
</div>
<div class="row parentContainer" v-if="order.address_change_request">
<div class="col-auto p-r-0">
<div class="p-t-10 p-b-10 p-l-15 p-r-15 b-a b-danger fs-10 text-danger requestModal" data-type="updateDeliveryAddress"><i class="fa fa-exclamation-circle m-r-10"></i>Your Delivery address change request is being reviewed</div>
</div>
<div class="col-auto bg-danger-light pointer requestModal" data-type="cancelAddressChangeRequest">
<i class="fa fa-times text-white lh-38"></i>
</div>
<modal-component small type="cancelAddressChangeRequest">
<div class="row">
<div class="col text-center">
<div class="row">
<div class="col text-center">
<div class="row m-b-20">
<div class="col">
<h5 class="all-caps">Cancel Address Change Request</h5>
<div class="fs-11">Are you sure you want to cancel your order delivery address change request?</div>
</div>
</div>
<div class="row">
<div class="col p-r-5">
<div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
</div>
<div class="col p-l-5">
<div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.order.address.status.update', order.address_change_request.id, 6), 'put', section, true, true)">Confirm</div>
</div>
</div>
</div>
</div>
</div>
</div>
</modal-component>
</div>
</div>
</div>
<div class="row align-items-center">
<div class="col-10">
<h6 class="text-info"><span class="text-danger bold">Gentle reminder:</span> You need to send the QR code to your supplier to print and stick on your packages, this QR code is required for us to identify your packages when they arrives at our warehouse!</h6>
resources/views/pages/admin/dashboard.blade.php
+14
View File
@@ -30,5 +30,19 @@
</list-component>
</div>
</div>
<div class="row p-b-5 b-b b-grey m-b-10 m-l-0 m-r-0">
<div class="col no-padding">
<h6>Address Change Verification</h6>
</div>
</div>
<div class="row no-margin">
<div class="col">
<list-component key="2" section="addressVerificationSection" :options="{'per_page': 5, 'status': 1, 'with_owner': true}" :endpoint="route('api.address.list')">
<template slot="list" slot-scope="{data}">
<address-verification-component section="addressVerificationSection" :data="data"></address-verification-component>
</template>
</list-component>
</div>
</div>
</div>
</div>
routes/order.php
+1 -1
View File
@@ -10,5 +10,5 @@ Route::group(['prefix' => 'order', 'as' => 'order.', 'namespace' => 'Orders'], f
Route::put('/cancel/{id}', 'CancelOrderController@cancel')->name('cancel');
Route::put('/restore/{id}', 'RestoreOrderController@restore')->name('restore');
Route::post('/address/change/request', 'RequestChangeOrderAddressController@request')->name('address.change.request');
Route::post('/address/change/approve', 'ApproveChangeOrderAddressController@approve')->name('address.change.approve');
Route::put('/address/{id}/status/{status}', 'ApproveChangeOrderAddressController@approve')->name('address.status.update');
});