Просмотр исходного кода

Update PDF values and add Bar Details to M&B AV test PDF

Alan Lam 7 лет назад
Родитель
Сommit
d39ba9a05b

+ 16 - 0
engine/util.php

@@ -1,6 +1,22 @@
 <?php
 class Util {
 
+	public static function getGenderText($gender) {
+		switch($gender) {
+			case "M": return MALE;
+			case "F": return FEMALE;
+			default: return "";
+		}
+	}
+
+	public static function getBooleanText($boolean) {
+		switch($boolean) {
+			case "Y": return YES;
+			case "N": return NO;
+			default: return "";
+		}
+	}
+
 	public static function convertUTF8($string, $target_encoding = "CP1252") {
 		return mb_convert_encoding($string, $target_encoding, "UTF-8");
 	}

+ 5 - 5
template_processing/age_verification/test_pdf.php

@@ -105,7 +105,7 @@ $pass_image = $test->pass ? "pass.png" : "fail.png";
 
 	<div class="bl">
 		<div class="field">Gender:</div>
-		<div class="value"><?=TestPDF::getValueHtml($test->challenger_gender)?></div>
+		<div class="value"><?=TestPDF::getValueHtml(Util::getGenderText($test->challenger_gender))?></div>
 	</div>
 
 	<strong>Description:</strong><br />
@@ -165,7 +165,7 @@ $pass_image = $test->pass ? "pass.png" : "fail.png";
 
 	<div class="bl">
 		<div class="field">Eye Contact:</div>
-		<div class="value"><?=($test->challenger_eye_contact ? "Y" : "N")?></div>
+		<div class="value"><?=($test->challenger_eye_contact ? "Yes" : "No")?></div>
 	</div>
 
 	<div>
@@ -191,7 +191,7 @@ $pass_image = $test->pass ? "pass.png" : "fail.png";
 		<?php
 		$play_jackpot = $values["play_jackpot"] ?? "";
 		if(!empty($play_jackpot)) {
-			$play_jackpot = "£{$play_jackpot}";
+			$play_jackpot = "£" . number_format($play_jackpot, 2);
 		}
 		?>
 
@@ -203,7 +203,7 @@ $pass_image = $test->pass ? "pass.png" : "fail.png";
 		<?php
 		$play_machine_stake = $values["play_machine_stake"] ?? "";
 		if(!empty($play_machine_stake)) {
-			$play_machine_stake = "£{$play_machine_stake}";
+			$play_machine_stake = "£" . number_format($play_machine_stake, 2);
 		}
 		?>
 
@@ -219,7 +219,7 @@ $pass_image = $test->pass ? "pass.png" : "fail.png";
 
 		<?php
 		$play_spent = $values["play_spent"] ?? "";
-		if(!empty($play_spent)) $play_spent = "£{$play_spent}";
+		if(!empty($play_spent)) $play_spent = "£" . number_format($play_spent, 2);
 		?>
 
 		<div>

+ 79 - 45
template_processing/age_verification_mitchells_butlers/test_pdf.php

@@ -110,6 +110,10 @@ $pass_image = $test->pass ? "pass.png" : "fail.png";
 
 	<div style="clear: both;"></div><br />
 
+	<?php
+
+	?>
+
 	<div class="subheader">
 		<strong>Staff</strong>
 	</div>
@@ -121,12 +125,81 @@ $pass_image = $test->pass ? "pass.png" : "fail.png";
 
 	<div class="bl">
 		<div class="field">Gender:</div>
-		<div class="value"><?=TestPDF::getValueHtml($test->challenger_gender)?></div>
+		<div class="value"><?=TestPDF::getValueHtml(Util::getGenderText($test->challenger_gender))?></div>
 	</div>
 
 	<strong>Description:</strong><br />
 	<?=TestPDF::getValueHtml($test->challenger_description)?><br />
 
+	<br />
+
+	<div class="subheader">
+		<strong>Signage</strong>
+	</div>
+
+	<div class="wide-field-names">
+		<div class="bl">
+			<div class="field">Think 21/25:</div>
+			<div class="value"><?=TestPDF::getValueHtml($values["think_21_25"] ?? "")?></div>
+		</div>
+
+		<?php
+		$value = $values["citizen_card_brochure_displayed"] ?? "";
+		if(strlen($value)) $value = $value ? "Yes" : "No";
+		?>
+
+		<div class="bl">
+			<div class="field">Citizen Card Brochure Displayed:</div>
+			<div class="value"><?=TestPDF::getValueHtml($value)?></div>
+		</div>
+
+		<?php
+		$value = $values["think_21_poster"] ?? "";
+		if(strlen($value)) $value = $value ? "Yes" : "No";
+		?>
+
+		<div class="bl">
+			<div class="field">Think 21/25 Posters Displayed:</div>
+			<div class="value"><?=TestPDF::getValueHtml($value)?></div>
+		</div>
+
+		<strong>Think 21/25 Poster Notes:</strong><br />
+		<?=TestPDF::getValueHtml($values["think_21_poster_notes"] ?? "")?>
+	</div>
+
+	<br />
+
+	<?php
+	$bar_purchase = ($values["bar_purchase"] ?? "") ? "Yes" : "No";
+	$bar_expenditure = ($values["bar_expenditure"] ?? "") ?: 0;
+	$alcohol_purchased = ($values["alcohol_purchased"] ?? "") ? "Yes" : "No";
+	$bar_purchase_item = ($values["bar_purchase_item"] ?? "");
+	?>
+
+	<div class="subheader">
+		<strong>Bar Details</strong>
+	</div>
+
+	<div class="wide-field-names">
+		<div class="bl">
+			<div class="field">Bar Purchase:</div>
+			<div class="value"><?=TestPDF::getValueHtml($bar_purchase)?></div>
+		</div>
+		<div class="bl">
+			<div class="field">Bar Expenditure:</div>
+			<div class="value">£<?=number_format($bar_expenditure, 2)?></div>
+		</div>
+		<div class="bl">
+			<div class="field">Alcohol Purchased:</div>
+			<div class="value"><?=$alcohol_purchased?></div>
+		</div>
+		<div>
+			<div class="field">Name of Item Purchased:</div>
+			<div class="value"><?=TestPDF::getValueHtml($bar_purchase_item)?></div>
+		</div>
+	</div>
+
+
 </div>
 
 <div style="float: right; width: 49.5%">
@@ -181,20 +254,16 @@ $pass_image = $test->pass ? "pass.png" : "fail.png";
 
 	<div class="bl">
 		<div class="field">Eye Contact:</div>
-		<div class="value"><?=($test->challenger_eye_contact ? "Y" : "N")?></div>
+		<div class="value"><?=($test->challenger_eye_contact ? "Yes" : "No")?></div>
 	</div>
 
 	<div>
 		<strong>Description:</strong><br />
 		<?=TestPDF::getValueHtml($test->challenge_description)?>
 	</div>
-</div>
 
-<div class="clear"></div>
-
-<br />
+	<br />
 
-<div style="float: left; width: 49.5%">
 	<div class="subheader">
 		<strong>Play Details</strong>
 	</div>
@@ -222,7 +291,7 @@ $pass_image = $test->pass ? "pass.png" : "fail.png";
 		<?php
 		$play_jackpot = $values["play_jackpot"] ?? "";
 		if(!empty($play_jackpot)) {
-			$play_jackpot = "£{$play_jackpot}";
+			$play_jackpot = "£" . number_format($play_jackpot, 2);
 		}
 		?>
 
@@ -234,7 +303,7 @@ $pass_image = $test->pass ? "pass.png" : "fail.png";
 		<?php
 		$play_machine_stake = $values["play_machine_stake"] ?? "";
 		if(!empty($play_machine_stake)) {
-			$play_machine_stake = "£{$play_machine_stake}";
+			$play_machine_stake = "£" . number_format($play_machine_stake, 2);
 		}
 		?>
 
@@ -250,7 +319,7 @@ $pass_image = $test->pass ? "pass.png" : "fail.png";
 
 		<?php
 		$play_spent = $values["play_spent"] ?? "";
-		if(!empty($play_spent)) $play_spent = "£{$play_spent}";
+		if(!empty($play_spent)) $play_spent = "£" . number_format($play_spent, 2);
 		?>
 
 		<div>
@@ -258,42 +327,7 @@ $pass_image = $test->pass ? "pass.png" : "fail.png";
 			<div class="value"><?=TestPDF::getValueHtml($play_spent)?></div>
 		</div>
 	</div>
-</div>
-
-<div style="float: right; width: 49.5%">
-	<div class="subheader">
-		<strong>Signage</strong>
-	</div>
-
-	<div class="wide-field-names">
-		<div class="bl">
-			<div class="field">Think 21/25:</div>
-			<div class="value"><?=TestPDF::getValueHtml($values["think_21_25"] ?? "")?></div>
-		</div>
-
-		<?php
-		$value = $values["citizen_card_brochure_displayed"] ?? "";
-		if(strlen($value)) $value = $value ? "Yes" : "No";
-		?>
 
-		<div class="bl">
-			<div class="field">Citizen Card Brochure Displayed:</div>
-			<div class="value"><?=TestPDF::getValueHtml($value)?></div>
-		</div>
-
-		<?php
-		$value = $values["think_21_poster"] ?? "";
-		if(strlen($value)) $value = $value ? "Yes" : "No";
-		?>
-
-		<div class="bl">
-			<div class="field">Think 21/25 Posters Displayed:</div>
-			<div class="value"><?=TestPDF::getValueHtml($value)?></div>
-		</div>
-
-		<strong>Think 21/25 Poster Notes:</strong><br />
-		<?=TestPDF::getValueHtml($values["think_21_poster_notes"] ?? "")?>
-	</div>
 </div>
 
 <div class="clear"></div>