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

edit billing address in payment and billing

Browse Source
This commit is contained in:
edmondlang
2022-09-29 20:53:00 +08:00
parent b01e2022dc
commit 97a568322c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/CompanyModuleResource.php
+2 -1
View File
@@ -4,6 +4,7 @@ namespace App\Http\Resources;
use App\Classes\Modules\Companies\Services\FetchesCompanyServices;
use App\Classes\ValueObjects\Constants\AddressType;
use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Classes\ValueObjects\Constants\BankAccountType;
use App\Classes\ValueObjects\Constants\BusinessType;
use App\Classes\ValueObjects\Constants\DocumentType;
@@ -42,7 +43,7 @@ class CompanyModuleResource extends JsonResource
'name' => $this->name,
'reference' => $this->reference,
'address' => new AddressResource($defaultAddress),
'billingAddress' => new AddressResource($this->addresses()->where('type', AddressType::BILLING)->first()),
'billingAddress' => new AddressResource($this->addresses()->where('type', AddressType::BILLING)->where('status', ApprovalStatus::APPROVED)->first()),
'company' => new CompanyResource($this->whenLoaded('company')),
'remarks' => RemarkResource::collection($this->remarks),
'marking' => $marking,
resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
+4 -1
View File
@@ -25,7 +25,10 @@
</div>
<div class="col">
<div v-if="item.order">
<p class="no-margin fs-10 all-caps">Address</p>
<p class="no-margin fs-10 all-caps">Address <i class="fa fa-edit pointer fa-fw m-l-5 requestModal" v-if="!item.shippng_transaction && item.order && item.order.company_module.billingAddress" data-type="editBillingAddress"></i></p>
<modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="editBillingAddress">
<address-form-component :data="item.order.address" section="editBillingAddress"></address-form-component>
</modal-component>
<div>{{ item.order.address.post_code_area}}</div>
<div>{{ item.order.address.district.name +' '+item.order.address.postcode+' '+item.order.address.state.name }}</div>
</div>