Update VAT return to format numbers with 2 or 0 decimal places

craigfrancis · Dec 5, 2018 · 3f01d4f · 3f01d4f
1 parent 8f20d33
commit 3f01d4f
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/hmrc-vat.php b/hmrc-vat.php
@@ -69,22 +69,26 @@ public function request_body_get_xml() {
 			$xml = '
 					<IRenvelope xmlns="' . xml($namespace) . '">' . $this->request_header_get_xml() . '
 						<VATDeclarationRequest>
-							<VATDueOnOutputs>' . xml($this->details['vat_due_output']) . '</VATDueOnOutputs>
-							<VATDueOnECAcquisitions>' . xml($this->details['vat_due_acquisitions']) . '</VATDueOnECAcquisitions>
-							<TotalVAT>' . xml($this->details['vat_total']) . '</TotalVAT>
-							<VATReclaimedOnInputs>' . xml($this->details['vat_reclaimed']) . '</VATReclaimedOnInputs>
-							<NetVAT>' . xml($this->details['vat_net']) . '</NetVAT>
-							<NetSalesAndOutputs>' . xml($this->details['total_sales']) . '</NetSalesAndOutputs>
-							<NetPurchasesAndInputs>' . xml($this->details['total_purchases']) . '</NetPurchasesAndInputs>
-							<NetECSupplies>' . xml($this->details['total_supplies']) . '</NetECSupplies>
-							<NetECAcquisitions>' . xml($this->details['total_acquisitions']) . '</NetECAcquisitions>
+							<VATDueOnOutputs>'        . xml($this->format_amount(2, $this->details['vat_due_output']))       . '</VATDueOnOutputs>
+							<VATDueOnECAcquisitions>' . xml($this->format_amount(2, $this->details['vat_due_acquisitions'])) . '</VATDueOnECAcquisitions>
+							<TotalVAT>'               . xml($this->format_amount(2, $this->details['vat_total']))            . '</TotalVAT>
+							<VATReclaimedOnInputs>'   . xml($this->format_amount(2, $this->details['vat_reclaimed']))        . '</VATReclaimedOnInputs>
+							<NetVAT>'                 . xml($this->format_amount(2, $this->details['vat_net']))              . '</NetVAT>
+							<NetSalesAndOutputs>'     . xml($this->format_amount(0, $this->details['total_sales']))          . '</NetSalesAndOutputs>
+							<NetPurchasesAndInputs>'  . xml($this->format_amount(0, $this->details['total_purchases']))      . '</NetPurchasesAndInputs>
+							<NetECSupplies>'          . xml($this->format_amount(0, $this->details['total_supplies']))       . '</NetECSupplies>
+							<NetECAcquisitions>'      . xml($this->format_amount(0, $this->details['total_acquisitions']))   . '</NetECAcquisitions>
 						</VATDeclarationRequest>
 					</IRenvelope>';
 
 			return $xml;
 
 		}
 
+		public function format_amount($decimals, $amount) {
+			return number_format($amount, $decimals, '.', '');
+		}
+
 	}
 
 ?>