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

Merge branch 'connetction-segment-integration' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development

Browse Source 
# Conflicts:
#	app/Classes/Modules/Transactions/ControllersLogic/CreateShippingInvoiceTransactionLogic.php
#	app/Http/Resources/OrderResource.php
#	app/Http/Resources/PackingListResource.php
#	resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
#	resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
This commit is contained in:
omair saleh
2022-09-20 02:47:47 +08:00
parent daf5c65bd7 1a67fa31dc
commit 968ff5c02a
17 changed files with 335 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/CompanyModuleResource.php
+1
View File
@@ -47,6 +47,7 @@ class CompanyModuleResource extends JsonResource
'remarks' => RemarkResource::collection($this->remarks),
'marking' => $marking,
'warehouseCharges' => array_key_exists($this->id, $segmentConstant) ? $segmentConstant[$this->id] : null,
'connections' => $this->connections,
];
}