Merge branch 'dillon/90-e-invoice-e' into vapor/development

This commit is contained in:
Dillon Ngo
2026-01-07 13:56:59 +08:00
3 changed files with 8 additions and 1 deletions
@@ -58,6 +58,7 @@ class FetchCompanyEInvoiceInfoLogic extends AbstractControllerLogic
$eInvoiceInfo->tin = $company->tin;
$eInvoiceInfo->msic_code = $company->msic_code;
$eInvoiceInfo->e_invoice = $company->e_invoice;
$eInvoiceInfo->e_invoice_requested_at = $company->e_invoice_requested_at;
}
else{
return $this->response([]);
@@ -2,6 +2,7 @@
namespace App\Http\Resources;
use Carbon\Carbon;
use Illuminate\Http\Resources\Json\JsonResource;
class EInvoiceInfoResource extends JsonResource
@@ -26,6 +27,7 @@ class EInvoiceInfoResource extends JsonResource
'msic_code' => (string) $this->msic_code,
'tin' => (string) $this->tin,
'e_invoice' => (int) $this->e_invoice,
'e_invoice_requested_date' => $this->e_invoice_requested_at ? Carbon::parse($this->e_invoice_requested_at)->format('d-m-Y') : null,
];
}
}
@@ -16,7 +16,7 @@
<p class="muted">MSIC Code</p>
<p class="m-b-0">{{ eInvoiceData.msic_code }}</p>
</div>
<div class="padding-15 bg-master-lightest">
<div class="padding-15 bg-master-lightest m-b-10">
<p class="muted">Billing Address</p>
<p class="mb-0">
<a data-toggle="collapse" href="#billingDetails" role="button" aria-expanded="false" aria-controls="billingDetails">
@@ -35,6 +35,10 @@
</ul>
</div>
</div>
<div class="padding-15 bg-master-lightest m-b-10" v-if="$store.getters.isAdmin">
<p class="muted">Requested Date</p>
<p class="m-b-0">{{ eInvoiceData.e_invoice_requested_date }} (d-m-Y)</p>
</div>
</div>
</div>
</div>