Răsfoiți Sursa

Add Quickbooks CSV project export support

Alan Lam 7 ani în urmă
părinte
comite
ba88a52693

+ 3 - 2
controllers/project_export.php

@@ -33,10 +33,11 @@ switch($type) {
 		$template->exportTestsCSV("project_customer_csv.php", $tests);
 		$template->exportTestsCSV("project_customer_csv.php", $tests);
 		break;
 		break;
 
 
+	case "quickbooks":
+		$template->exportTestsCSV("project_quickbooks_csv.php", $tests);
+
 	case "kml":
 	case "kml":
 		// TODO
 		// TODO
 		break;
 		break;
 
 
 }
 }
-
-

+ 1 - 4
controllers/test_invoice.php

@@ -36,10 +36,7 @@ if(!$address) throw new Exception(__("Invoice address not found. Please set an a
 if(!$tester->hasValidPaymentMethod()) throw new Exception(__("No valid payment method found. Please go to the Settings page and make sure all respective fields are filled in and then try again."));
 if(!$tester->hasValidPaymentMethod()) throw new Exception(__("No valid payment method found. Please go to the Settings page and make sure all respective fields are filled in and then try again."));
 
 
 // Filename
 // Filename
-$reference =
-	"T" . str_pad($test->id, 3, "0", STR_PAD_LEFT) .
-	"/L" . str_pad($location->id, 3, "0", STR_PAD_LEFT) .
-	"/U" . str_pad($tester->id, 3, "0", STR_PAD_LEFT);
+$reference = $test->getTesterInvoiceReference();
 
 
 $download_filename = str_replace("/", "_", $reference) . " - " . $tester->getDisplayName() . " - Invoice.pdf";
 $download_filename = str_replace("/", "_", $reference) . " - " . $tester->getDisplayName() . " - Invoice.pdf";
 
 

+ 15 - 1
engine/template.php

@@ -73,7 +73,10 @@ class Template extends Model {
 		if(!file_exists($folder_path)) throw new Exception("Template processing folder does not exist.");
 		if(!file_exists($folder_path)) throw new Exception("Template processing folder does not exist.");
 
 
 		$file_path = $folder_path . "/" . $file;
 		$file_path = $folder_path . "/" . $file;
-		if(!file_exists($file_path)) throw new Exception("Template processing file \"$file\" does not exist.");
+		if(!file_exists($file_path)) {
+			$file_path = ROOT_DIR . "/template_processing/_common/{$file}";
+			if(!file_exists($file_path)) throw new Exception("Template processing file \"$file\" does not exist.");
+		}
 
 
 		return $file_path;
 		return $file_path;
 	}
 	}
@@ -112,6 +115,17 @@ class Template extends Model {
 		return $json->customerInvoiceFields ?? [];
 		return $json->customerInvoiceFields ?? [];
 	}
 	}
 
 
+	public function getTesterInvoiceCosts($values = []) {
+		$costs = 0;
+
+		$invoice_fields = $this->getTesterInvoiceFields();
+		foreach($invoice_fields as $field) {
+			$costs += (float) $values[$field->name] ?? 0;
+		}
+
+		return $costs;
+	}
+
 	public function setOverrides($overrides) {
 	public function setOverrides($overrides) {
 		$this->overrides = $overrides;
 		$this->overrides = $overrides;
 	}
 	}

+ 17 - 0
engine/test.php

@@ -367,10 +367,16 @@ class Test extends Model {
 		return Location::get($this->location_id);
 		return Location::get($this->location_id);
 	}
 	}
 
 
+	/**
+	 * @return User
+	 */
 	public function getTester() {
 	public function getTester() {
 		return User::get($this->tester_id);
 		return User::get($this->tester_id);
 	}
 	}
 
 
+	/**
+	 * @return User
+	 */
 	public function getVerifier() {
 	public function getVerifier() {
 		return User::get($this->verifier_id);
 		return User::get($this->verifier_id);
 	}
 	}
@@ -543,5 +549,16 @@ class Test extends Model {
 		return false;
 		return false;
 	}
 	}
 
 
+	public function getTesterInvoiceReference(): string {
+
+		$location = $this->getLocation();
+		$tester = $this->getTester();
+
+		return
+		"T" . str_pad($this->id, 3, "0", STR_PAD_LEFT) .
+		"/L" . str_pad($location->id, 3, "0", STR_PAD_LEFT) .
+		"/U" . str_pad($tester->id, 3, "0", STR_PAD_LEFT);
+	}
+
 }
 }
 ?>
 ?>

+ 5 - 0
public/js/app-projects.js

@@ -22,6 +22,11 @@ $(function() {
 				$("#projects-form").attr("action", "/account/projects/export-csv");
 				$("#projects-form").attr("action", "/account/projects/export-csv");
 				$("#type").val("customer");
 				$("#type").val("customer");
 				break;
 				break;
+
+			case "export-quickbooks-csv":
+				$("#projects-form").attr("action", "/account/projects/export-csv");
+				$("#type").val("quickbooks");
+				break;
 		}
 		}
 	});
 	});
 
 

+ 1 - 1
routes.php

@@ -65,7 +65,7 @@ $routes = [
 	"/^account\/projects\/$id_pattern\/edit$/" => ["controller" => "project_edit", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/projects\/$id_pattern\/edit$/" => ["controller" => "project_edit", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/projects\/$id_pattern\/edit\/template-overrides$/" => ["controller" => "project_edit_template_overrides", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/projects\/$id_pattern\/edit\/template-overrides$/" => ["controller" => "project_edit_template_overrides", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/projects\/export-csv$/" => ["controller" => "project_export", "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/projects\/export-csv$/" => ["controller" => "project_export", "require_user_level" => User::LEVEL_ADMIN],
-	"/^account\/projects\/$id_pattern\/export-(admin|customer)-csv$/" => ["controller" => "project_export", "params" => ["id", "type"], "require_user_level" => User::LEVEL_ADMIN],
+	"/^account\/projects\/$id_pattern\/export-(admin|customer|quickbooks)-csv$/" => ["controller" => "project_export", "params" => ["id", "type"], "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/projects\/$id_pattern\/export-kml$/" => ["controller" => "project_kml", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/projects\/$id_pattern\/export-kml$/" => ["controller" => "project_kml", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/projects\/$id_pattern\/invoice$/" => ["controller" => "project_invoice", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/projects\/$id_pattern\/invoice$/" => ["controller" => "project_invoice", "params" => ["id"], "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/projects\/$id_pattern\/(mark-finished|mark-unfinished)$/" => ["controller" => "project_mark_finished", "params" => ["id", "action"], "require_user_level" => User::LEVEL_ADMIN],
 	"/^account\/projects\/$id_pattern\/(mark-finished|mark-unfinished)$/" => ["controller" => "project_mark_finished", "params" => ["id", "action"], "require_user_level" => User::LEVEL_ADMIN],

+ 60 - 0
template_processing/_common/project_quickbooks_csv.php

@@ -0,0 +1,60 @@
+<?php
+
+$utc_timezone = new DateTimeZone("UTC");
+$invoice_interval = new DateInterval("P30D");
+
+$field_names = [
+	"BillNo",
+	"Supplier",
+	"BillDate",
+	"DueDate",
+	"Terms",
+	"Location",
+	"Memo",
+	"Account",
+	"LineDescription",
+	"LineAmount",
+	"LineTaxCode",
+	"LineTaxAmount",
+];
+
+fputcsv($handle, $field_names);
+
+foreach($tests as $test) {
+
+    if($test->dts_tester_invoice_paid === null) continue;
+
+    $project = $test->getProject();
+    $template = $project->getTemplate();
+	$location = $test->getLocation();
+	$tester = $test->getTester();
+	$values = $test->getValues(true);
+
+    $test_cost = $test->test_fee > 0 ? $test->test_fee : $project->default_tester_fee;
+    $travel_costs = $test->test_travel_cost > 0 ? $test->test_travel_cost : 0;
+    $other_costs = $template->getTesterInvoiceCosts($values);
+
+    $total_cost = $test_cost + $travel_costs + $other_costs;
+
+    $invoice_generated_dt = new DateTime($test->dts_tester_invoice_generated, $utc_timezone);
+    $invoice_date = $invoice_generated_dt->format("d/m/Y");
+
+    $invoice_generated_dt->add($invoice_interval);
+    $invoice_due_date = $invoice_generated_dt->format("d/m/Y");
+
+	$output = [];
+	$output[] = $test->getTesterInvoiceReference();
+	$output[] = sprintf("%d %s %s", $tester->id, $tester->first_name, $tester->last_name);
+	$output[] = $invoice_date;
+	$output[] = $invoice_due_date;
+	$output[] = "Net 30";
+	$output[] = $location->id;
+	$output[] = "";
+	$output[] = $total_cost;
+	$output[] = "";
+	$output[] = $total_cost;
+	$output[] = "No VAT";
+	$output[] = "0";
+
+	fputcsv($handle, $output);
+}

+ 2 - 1
views/projects.php

@@ -91,6 +91,7 @@
 						<option value="">Select Action</option>
 						<option value="">Select Action</option>
 						<option value="export-admin-csv">Export CSV</option>
 						<option value="export-admin-csv">Export CSV</option>
 						<option value="export-customer-csv">Export Customer CSV</option>
 						<option value="export-customer-csv">Export Customer CSV</option>
+						<option value="export-quickbooks-csv">Export Quickbooks CSV</option>
 					</select>
 					</select>
 					<div class="input-group-append">
 					<div class="input-group-append">
 						<button type="submit" class="btn btn-primary" name="submit" value="<?=htmlspecialchars($_SESSION["csrf_token"])?>">
 						<button type="submit" class="btn btn-primary" name="submit" value="<?=htmlspecialchars($_SESSION["csrf_token"])?>">
@@ -101,4 +102,4 @@
 			</div>
 			</div>
 		</div>
 		</div>
 	</form>
 	</form>
-</div>
+</div>