E-Invoice - Sin Yee request for einvoice postcode need to able to input starting with 0, e.g. 02600

This commit is contained in:
Dillon Ngo
2025-06-29 16:22:15 +08:00
parent 620b9651a3
commit b417ba074e
6 changed files with 13 additions and 13 deletions
@@ -23,7 +23,7 @@ class AddressObject implements DataTransferObject
/** @var int */
private $districtId;
/** @var int */
/** @var string */
private $postCode;
/** @var int */
@@ -42,12 +42,12 @@ class AddressObject implements DataTransferObject
* @param int $countryId
* @param int $stateId
* @param int $districtId
* @param int $postCode
* @param string $postCode
* @param int $type
* @param int $status
* @param null|string $reference
*/
public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, int $postCode, int $type, int $status, ?string $reference = null)
public function __construct(string $streetOne, ?string $streetTwo, int $countryId, int $stateId, int $districtId, string $postCode, int $type, int $status, ?string $reference = null)
{
$this->streetOne = $streetOne;
$this->streetTwo = $streetTwo;
@@ -101,9 +101,9 @@ class AddressObject implements DataTransferObject
}
/**
* @return int
* @return string
*/
public function getPostCode(): int
public function getPostCode(): string
{
return $this->postCode;
}
@@ -133,4 +133,4 @@ class AddressObject implements DataTransferObject
}
}
}
@@ -13,7 +13,7 @@ class EInvoiceInfoDTO implements DataTransferObject
public int $companyModuleId;
public string $streetOne;
public string $streetTwo;
public int $postCode;
public string $postCode;
public function __construct(array $data)
{
@@ -24,7 +24,7 @@ class EInvoiceInfoDTO implements DataTransferObject
$this->companyModuleId = (int) ($data['company_module_id'] ?? 0);
$this->streetOne = (string) ($data['street_one'] ?? '');
$this->streetTwo = (string) ($data['street_two'] ?? '');
$this->postCode = (int) ($data['post_code'] ?? 0);
$this->postCode = (string) ($data['post_code'] ?? '');
}
public function toArray(): array
@@ -20,7 +20,7 @@ class UpdateCompanyDetailsDTO implements DataTransferObject
public int $companyId;
public string $streetOne;
public string $streetTwo;
public int $postCode;
public string $postCode;
public function __construct(array $data)
{
@@ -38,7 +38,7 @@ class UpdateCompanyDetailsDTO implements DataTransferObject
$this->companyId = (int) ($data['company_id'] ?? 0);
$this->streetOne = (string) ($data['street_one'] ?? '');
$this->streetTwo = (string) ($data['street_two'] ?? '');
$this->postCode = (int) ($data['post_code'] ?? 0);
$this->postCode = (string) ($data['post_code'] ?? 0);
}
public function toArray(): array
@@ -20,7 +20,7 @@ class AddressEInvoiceResource extends JsonResource
'street_two' => $this->street_two,
'district' => $this->district,
'state' => $this->state,
'post_code' => (int) $this->postcode,
'post_code' => (string) $this->postcode,
'country' => $this->country,
'billing' => (int) $this->billing
];
+1 -1
View File
@@ -20,7 +20,7 @@ class EInvoiceInfoResource extends JsonResource
'street_two' => $this->street_two,
'district' => $this->district,
'state' => $this->state,
'post_code' => (int) $this->postcode,
'post_code' => (string) $this->postcode,
'country' => $this->country,
'billing' => (int) $this->billing,
'msic_code' => (string) $this->msic_code,
@@ -54,7 +54,7 @@
</validation-wrapper-component>
</div>
<div class="col-5 p-l-5">
<validation-wrapper-component :validator="$v.parameters.post_code" v-money="integer">
<validation-wrapper-component :validator="$v.parameters.post_code">
<label class="text-primary">Post Code</label>
<input class="form-control" name="post_code" v-model="parameters.post_code">
</validation-wrapper-component>