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

Merge branch 'order-remark-backend' into 'development'

Browse Source 
Order remark backend

See merge request CIEFWorldwideSdnBhd/shipping-portal!83
This commit is contained in:
omair saleh
2021-11-26 02:34:25 +00:00
parent a6fc5dd1a5 6fcf952967
commit 20289c7f1e
10 changed files with 226 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+44 -1
View File
@@ -21,6 +21,47 @@
<h3 class="no-margin"><b>Order No.</b> {{order.reference}}</h3>
</div>
</div>
<div class="row m-b-20">
<div class="col-12">
<div class="row">
<div class="col-auto d-flex align-items-center">
<h6 class="no-margin"><b>Remark:</b></h6>
</div>
<div class="col-auto p-l-0" v-if="!addComment">
<div class="btn btn-xs btn-outline-info b-rad-none pointer" @click="addComment = !addComment">Add a Remark</div>
</div>
<div class="col d-flex align-items-center pl-3 pl-md-0" v-if="order.remarks.length >= 1 && !isEditRemark">
<h6 class="no-margin">{{order.remarks[0].content}}</h6>
<span class="btn btn-md btn-default m-l-10" @click="isEditRemark = !isEditRemark">
<i class="fa fa-edit"></i>
</span>
<span class="btn btn-md btn-default m-l-5 requestModal" data-type="deleteOrderRemark">
<i class="fa fa-trash"></i>
</span>
<modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteOrderRemark">
<delete-order-remark-form-component :section="section" :data="order.remarks[0]" v-on:submit="addComment=false"></delete-order-remark-form-component>
</modal-component>
</div>
<div class="col pl-2 pl-md-0" v-if="isEditRemark">
<div class="row">
<div class="col">
<order-remark-form-component :section="section" :data="order.remarks[0]" :id="order.id" v-on:submit="isEditRemark=false"></order-remark-form-component>
</div>
<div class="col-auto d-flex align-items-center">
<div class="row m-l-5">
<div class="col b-a btn btn-sm btn-default" @click="isEditRemark = !isEditRemark">
Cancel
</div>
</div>
</div>
</div>
</div>
<div class="col p-l-0" v-if="order.remarks.length === 0 && addComment">
<order-remark-form-component :section="section" :id="order.id"></order-remark-form-component>
</div>
</div>
</div>
</div>
<div class="row m-b-20">
<div class="col-12 col-sm-auto">
<h6 class="no-margin"><b>Order Date:</b> {{order.created_at}}</h6>
@@ -412,7 +453,9 @@
return {
section: 'orderProfileSection',
isLoading: true,
order: null
order: null,
isEditRemark: false,
addComment: false,
}
},
computed: {