Преглед изворни кода

Rename "Invoices" to "Sale Orders"

Alan Lam пре 3 година
родитељ
комит
2b76f52ce1

+ 7 - 7
controllers/dashboard.php

@@ -7,7 +7,7 @@ use App\Constraint\NotEqualsConstraint;
 use App\Constraint\NotInConstraint;
 use App\Enums\AruStatuses;
 use App\Enums\DocumentTypes;
-use App\Enums\InvoiceStatuses;
+use App\Enums\SaleOrderStatuses;
 use App\Enums\SaleStatuses;
 use App\Enums\TicketStatuses;
 
@@ -50,16 +50,16 @@ $cards[] = [
 	"url" => "/arus?custom_filter=open"
 ];
 
-$open_invoice_count = Document::count([
-	"type" => DocumentTypes::INVOICE,
-	"invoice_status" => new NotInConstraint(InvoiceStatuses::VOID, InvoiceStatuses::PAID),
+$open_sale_order_count = Document::count([
+	"type" => DocumentTypes::SALE_ORDER,
+	"invoice_status" => new NotInConstraint(SaleOrderStatuses::VOID, SaleOrderStatuses::PAID),
 	"dts_deleted" => null
 ]);
 
 $cards[] = [
-	"title" => "Invoices Open",
-	"count" => $open_invoice_count,
-	"url" => "/invoices?custom_filter=open"
+	"title" => "Sale Orders Open",
+	"count" => $open_sale_order_count,
+	"url" => "/sale-orders?custom_filter=open"
 ];
 
 View::include("header");

+ 7 - 7
controllers/document.php

@@ -15,8 +15,8 @@ $action = $action ?? null;
 $document_number = $document_number ?? null;
 
 switch($document_type_string) {
-	case "invoices":
-		$document_type = DocumentTypes::INVOICE;
+	case "sale-orders":
+		$document_type = DocumentTypes::SALE_ORDER;
 		break;
 
 	case "delivery-notes":
@@ -111,7 +111,7 @@ $controller = new class($document_type, $document_number) {
 		$core = Core::getInstance();
 		$this->user->requireAdmin();
 
-		if($document->isInvoice() || $document->isDeliveryNote()) {
+		if($document->isSaleOrder() || $document->isDeliveryNote()) {
 			/** @var Sale $sale */
 			$sale = $document->getSale();
 			if($sale) {
@@ -231,7 +231,7 @@ $controller = new class($document_type, $document_number) {
 		$company = $this->requireCompany($company_id);
 		$document->company_id = $company->id;
 
-		if($document->isInvoice()) {
+		if($document->isSaleOrder()) {
 			$document->invoice_status = $this->request->int("invoice_status");
 			$document->terms = $this->request->string("terms");
 			$document->currency = $this->request->string("currency");
@@ -246,7 +246,7 @@ $controller = new class($document_type, $document_number) {
 
 		$document->date = $this->request->string("date");
 
-		if($document->isInvoice() || $document->isDeliveryNote()) {
+		if($document->isSaleOrder() || $document->isDeliveryNote()) {
 			$document->billing_address = $this->request->string("billing_address");
 			$document->delivery_address = $this->request->string("delivery_address");
 			$document->po_number = $this->request->string("po_number");
@@ -467,8 +467,8 @@ switch($action) {
 				$controller->deleteItems();
 				break;
 
-			case "create-invoice":
-				$controller->createDocumentWithItems(DocumentTypes::INVOICE);
+			case "create-sale-order":
+				$controller->createDocumentWithItems(DocumentTypes::SALE_ORDER);
 				break;
 
 			case "create-delivery-note":

+ 8 - 8
controllers/documents.php

@@ -9,7 +9,7 @@ namespace App;
 use App\Constraint\NotInConstraint;
 use App\Enums\AruStatuses;
 use App\Enums\DocumentTypes;
-use App\Enums\InvoiceStatuses;
+use App\Enums\SaleOrderStatuses;
 use RuntimeException;
 
 $core = Core::getInstance();
@@ -18,11 +18,11 @@ $user = $core->getUser();
 $user->requireAdmin();
 
 switch($type_string) {
-	case "invoices":
-		$title = __("Invoices");
-		$type = DocumentTypes::INVOICE;
-		$singular = __("%s invoice");
-		$plural = __("%s invoices");
+	case "sale-orders":
+		$title = __("Sale Orders");
+		$type = DocumentTypes::SALE_ORDER;
+		$singular = __("%s sale order");
+		$plural = __("%s sale orders");
 		$status_field = "invoice_status";
 		break;
 
@@ -99,8 +99,8 @@ if($number) {
 $custom_filter = $request->string("custom_filter");
 switch($custom_filter) {
 	case "open":
-		if($type === DocumentTypes::INVOICE) {
-			$nvp["invoice_status"] = new NotInConstraint(InvoiceStatuses::PAID, InvoiceStatuses::VOID);
+		if($type === DocumentTypes::SALE_ORDER) {
+			$nvp["invoice_status"] = new NotInConstraint(SaleOrderStatuses::PAID, SaleOrderStatuses::VOID);
 		}
 		if($type === DocumentTypes::ADVANCE_REPLACEMENT_UNIT) {
 			$nvp["aru_status"] = new NotInConstraint(AruStatuses::COMPLETED, AruStatuses::CANCELLED);

+ 31 - 31
controllers/sale.php

@@ -3,7 +3,7 @@
 namespace App;
 
 use App\Enums\DocumentTypes;
-use App\Enums\InvoiceStatuses;
+use App\Enums\SaleOrderStatuses;
 use App\Enums\SaleStatuses;
 use RuntimeException;
 
@@ -253,7 +253,7 @@ $controller = new class($number) {
 		Http::redirect($sale->getUrl());
 	}
 
-	public function createInvoiceFromItems(): void {
+	public function createSaleOrderFromItems(): void {
 		$sale = $this->requireSale();
 		$location = $sale->getLocation();
 		$address = $location->getAddress();
@@ -268,40 +268,40 @@ $controller = new class($number) {
 		$address_string = $location->name . "\n" . $address;
 
 		// OK
-		$invoice = new Document();
-		$invoice->company_id = $sale->company_id;
-		$invoice->user_id = $this->user->id;
-		$invoice->sale_id = $sale->id;
-		$invoice->location_id = $location->id;
-		$invoice->type = DocumentTypes::INVOICE;
-		$invoice->invoice_status = InvoiceStatuses::DRAFT;
-		$invoice->currency = $sale->currency;
-		$invoice->tax_rate = $sale->tax_rate;
-		$invoice->billing_address = $address_string;
-		$invoice->delivery_address = $address_string;
-		$invoice->number = Document::getNextNumber(DocumentTypes::INVOICE);
-		$invoice->date = date("Y-m-d");
-		$invoice->contact_name = $location->contact_name;
-		$invoice->contact_phone = $location->contact_phone;
-		$invoice->contact_email = $location->contact_email;
-		$invoice->dts_created = Database::dts();
-		$invoice->commit();
+		$document = new Document();
+		$document->company_id = $sale->company_id;
+		$document->user_id = $this->user->id;
+		$document->sale_id = $sale->id;
+		$document->location_id = $location->id;
+		$document->type = DocumentTypes::SALE_ORDER;
+		$document->invoice_status = SaleOrderStatuses::DRAFT;
+		$document->currency = $sale->currency;
+		$document->tax_rate = $sale->tax_rate;
+		$document->billing_address = $address_string;
+		$document->delivery_address = $address_string;
+		$document->number = Document::getNextNumber(DocumentTypes::SALE_ORDER);
+		$document->date = date("Y-m-d");
+		$document->contact_name = $location->contact_name;
+		$document->contact_phone = $location->contact_phone;
+		$document->contact_email = $location->contact_email;
+		$document->dts_created = Database::dts();
+		$document->commit();
 
 		foreach($sale_items as $sale_item) {
 			$product = $sale_item->getProduct();
 			$supplier = $product->getSupplier();
 
-			$invoice_item = new DocumentItem();
-			$invoice_item->document_id = $invoice->id;
-			$invoice_item->description = $product->name . " ($supplier->name)";
-			$invoice_item->quantity = $sale_item->quantity;
-			$invoice_item->unit_price = $sale_item->unit_price;
-			$invoice_item->dts_created = Database::dts();
-			$invoice_item->commit();
+			$item = new DocumentItem();
+			$item->document_id = $document->id;
+			$item->description = $product->name . " ($supplier->name)";
+			$item->quantity = $sale_item->quantity;
+			$item->unit_price = $sale_item->unit_price;
+			$item->dts_created = Database::dts();
+			$item->commit();
 		}
 
-		Session::addAlert("success", __("Invoice created successfully."));
-		Http::redirect($sale->getUrl() . "/invoices/" . $invoice->number);
+		Session::addAlert("success", __("Sale Order created successfully."));
+		Http::redirect($sale->getUrl() . "/sale-orders/" . $document->number);
 	}
 
 };
@@ -330,8 +330,8 @@ switch($action) {
 	case "items-batch-action":
 		$batch_action = $request->string("batch_action");
 		switch($batch_action) {
-			case "create-invoice":
-				$controller->createInvoiceFromItems();
+			case "create-sale-order":
+				$controller->createSaleOrderFromItems();
 				break;
 
 			case "delete":

+ 13 - 13
engine/Document.php

@@ -4,7 +4,7 @@ namespace App;
 
 use App\Enums\AruStatuses;
 use App\Enums\DocumentTypes;
-use App\Enums\InvoiceStatuses;
+use App\Enums\SaleOrderStatuses;
 use App\Traits\DateTimeTrait;
 use App\Traits\SoftDeleteTrait;
 use Carbon\CarbonImmutable;
@@ -131,21 +131,21 @@ class Document extends Model {
 	 * @throws Exception
 	 */
 	public function getUrl(): string {
-		if($this->isInvoice()) {
+		if($this->isSaleOrder()) {
 
-			// Sale Invoice
+			// Lead Sale Order
 
 			/** @var Sale $sale */
 			$sale = $this->getSale();
 			if($sale) {
-				return sprintf("%s/invoices/%s", $sale->getUrl(), $this->number);
+				return sprintf("%s/sale-orders/%s", $sale->getUrl(), $this->number);
 			}
 
-			// ARU invoice
+			// ARU Sale Order
 			$document = $this->getRelatedDocument();
 			if($document) {
 				if($document->isAru()) {
-					return sprintf("%s/invoices/%s", $document->getUrl(), $this->number);
+					return sprintf("%s/sale-orders/%s", $document->getUrl(), $this->number);
 				}
 			}
 		}
@@ -177,8 +177,8 @@ class Document extends Model {
 		throw new RuntimeException(__("Unimplemented getUrl for document type: $this->type"));
 	}
 
-	public function isInvoice(): bool {
-		return (int) $this->type === DocumentTypes::INVOICE;
+	public function isSaleOrder(): bool {
+		return (int) $this->type === DocumentTypes::SALE_ORDER;
 	}
 
 	public function isDeliveryNote(): bool {
@@ -189,8 +189,8 @@ class Document extends Model {
 		return (int) $this->type === DocumentTypes::GOODS_IN;
 	}
 
-	public function getDisplayInvoiceStatus(): string {
-		return InvoiceStatuses::enumToText($this->invoice_status);
+	public function getDisplaySaleOrderStatus(): string {
+		return SaleOrderStatuses::enumToText($this->invoice_status);
 	}
 
 	public function getDisplayAruStatus(): string {
@@ -289,7 +289,7 @@ class Document extends Model {
 	}
 
 	public function hasCosts(): bool {
-		return ($this->isInvoice() || $this->isAru());
+		return ($this->isSaleOrder() || $this->isAru());
 	}
 
 	/**
@@ -308,9 +308,9 @@ class Document extends Model {
 	 * Get invoices related to this ARU
 	 * @return Document[]
 	 */
-	public function getInvoices(): array {
+	public function getSaleOrders(): array {
 		return self::query([
-			"type" => DocumentTypes::INVOICE,
+			"type" => DocumentTypes::SALE_ORDER,
 			"related_document_id" => $this->id,
 			"dts_deleted" => null
 		]);

+ 2 - 2
engine/Enums/DocumentTypes.php

@@ -4,14 +4,14 @@ namespace App\Enums;
 
 class DocumentTypes extends AbstractEnum {
 
-	public const INVOICE = 0;
+	public const SALE_ORDER = 0;
 	public const DELIVERY_NOTE = 1;
 	public const GOODS_IN = 2;
 	public const ADVANCE_REPLACEMENT_UNIT = 3;
 	public const CREDIT_NOTE = 4;
 	public static function options(): array {
 		return [
-			self::INVOICE => __("Invoice"),
+			self::SALE_ORDER => __("Sale Order"),
 			self::DELIVERY_NOTE => __("Delivery Note"),
 			self::GOODS_IN => __("Goods-In"),
 			self::ADVANCE_REPLACEMENT_UNIT => __("ARU"),

+ 1 - 1
engine/Enums/InvoiceStatuses.php → engine/Enums/SaleOrderStatuses.php

@@ -2,7 +2,7 @@
 
 namespace App\Enums;
 
-class InvoiceStatuses extends AbstractEnum {
+class SaleOrderStatuses extends AbstractEnum {
 
 	public const DRAFT = 0;
 	public const OPEN = 1;

+ 2 - 2
engine/Sale.php

@@ -108,8 +108,8 @@ class Sale extends Model {
 	/**
 	 * @return Document[]
 	 */
-	public function getInvoices(): array {
-		return $this->getDocuments(["type" => DocumentTypes::INVOICE]);
+	public function getSaleOrders(): array {
+		return $this->getDocuments(["type" => DocumentTypes::SALE_ORDER]);
 	}
 
 	/**

+ 1 - 1
public/js/app.js

@@ -71,7 +71,7 @@ class AddressMap {
 }
 
 const DocumentTypes = Object.freeze({
-	Invoice: 0,
+	SaleOrder: 0,
 	DeliveryNote: 1,
 	GoodsIn: 2,
 	AdvancedReplacementUnit: 3,

+ 1 - 1
public/js/document-item-modal.js

@@ -44,7 +44,7 @@ class DocumentItemModal {
 				break;
 
 			case DocumentTypes.AdvancedReplacementUnit:
-			case DocumentTypes.Invoice:
+			case DocumentTypes.SaleOrder:
 				this.$unitPriceField.closest("div").show();
 				break;
 		}

+ 1 - 1
public/js/document-page.js

@@ -59,7 +59,7 @@ class DocumentPage {
 		return $.post(action, data).always(() => {
 			$submitElements.prop("disabled", false);
 		}).then(() => {
-			toastr.success("Invoice saved successfully.");
+			toastr.success("Sale Order saved successfully.");
 		});
 	}
 }

+ 4 - 4
routes/default.php

@@ -56,9 +56,9 @@ $this->addRoute("/^leads\/(submit)$/", "sale", ["action"], ["requireUser" => tru
 $this->addRoute("/^leads\/(\d+)$/", "sale", ["number"], ["requireUser" => true]);
 $this->addRoute("/^leads\/(\d+)\/(submit|submit-note|delete-note|submit-item|delete-item|items-batch-action)$/", "sale", ["number", "action"], ["requireUser" => true]);
 
-$this->addRoute("/^(?:leads|arus)\/\d+\/(invoices|delivery-notes)\/(\d+)$/", "document", ["document_type_string", "document_number"], ["requireUser" => true]);
-$this->addRoute("/^(?:leads|arus)\/\d+\/(invoices|delivery-notes)\/(\d+)\/(submit|submit-item|delete-item|items-batch-action|download-pdf)$/", "document", ["document_type_string", "document_number", "action"], ["requireUser" => true]);
-$this->addRoute("/^(?:leads|arus)\/\d+\/(invoices|delivery-notes)\/(\d+)\/(render-pdf)$/", "document", ["document_type_string", "document_number", "action"]);
+$this->addRoute("/^(?:leads|arus)\/\d+\/(sale-orders|delivery-notes)\/(\d+)$/", "document", ["document_type_string", "document_number"], ["requireUser" => true]);
+$this->addRoute("/^(?:leads|arus)\/\d+\/(sale-orders|delivery-notes)\/(\d+)\/(submit|submit-item|delete-item|items-batch-action|download-pdf)$/", "document", ["document_type_string", "document_number", "action"], ["requireUser" => true]);
+$this->addRoute("/^(?:leads|arus)\/\d+\/(sale-orders|delivery-notes)\/(\d+)\/(render-pdf)$/", "document", ["document_type_string", "document_number", "action"]);
 
 $this->addRoute("/^tickets$/", "tickets", [], ["requireUser" => true]);
 $this->addRoute("/^tickets\/(create)$/", "tickets_ajax", ["action"], ["requireUser" => true]);
@@ -66,7 +66,7 @@ $this->addRoute("/^tickets\/(\d+)$/", "ticket", ["id"], ["requireUser" => true])
 
 $this->addRoute("/^(goods-in|arus)\/(create)$/", "document", ["document_type_string", "action"], ["requireUser" => true]);
 
-$this->addRoute("/^(goods-in|arus|invoices|delivery-notes)$/", "documents", ["type_string"], ["requireUser" => true]);
+$this->addRoute("/^(goods-in|arus|sale-orders|delivery-notes)$/", "documents", ["type_string"], ["requireUser" => true]);
 
 $this->addRoute("/^(goods-in|arus)\/(\d+)$/", "document", ["document_type_string", "document_number"], ["requireUser" => true]);
 $this->addRoute("/^(goods-in|arus)\/(\d+)\/(submit|submit-item|delete-item|items-batch-action|download-pdf)$/", "document", ["document_type_string", "document_number", "action"], ["requireUser" => true]);

+ 10 - 10
views/aru_dn_pdf.php

@@ -19,11 +19,11 @@ $address_lines = explode("\n", (string) $address);
 
 $aru = $document->getRelatedDocument();
 $goods_in_documents = $aru->getGoodsInDocuments();
-$invoices = $aru->getInvoices();
+$sale_orders = $aru->getSaleOrders();
 
 $charges = "0.00";
-foreach($invoices as $invoice) {
-	$charges = bcadd($charges, $invoice->getSubtotal(), 2);
+foreach($sale_orders as $sale_order) {
+	$charges = bcadd($charges, $sale_order->getSubtotal(), 2);
 }
 
 $formatter = new NumberFormatter("en_GB", NumberFormatter::CURRENCY);
@@ -330,27 +330,27 @@ $render_card = static function(string $title, ?string $content): void {
 			<div class="col-4">
 				<div class="card mb-2">
 					<div class="card-header">
-						<strong>Invoices</strong>
+						<strong>Sale Orders</strong>
 					</div>
 					<div class="card-body">
 						<?php
-						if(empty($invoices)) {
+						if(empty($sale_orders)) {
 							?>
-							No Invoices
+							No Sale Orders
 							<?php
 						}
 
-						foreach($invoices as $invoice) {
+						foreach($sale_orders as $sale_order) {
 							?>
 							<div>
 								<strong>
-									INV <?=$invoice->number?>
+									INV <?=$sale_order->number?>
 								</strong>
 								<span class="px-1"></span>
-								<?=htmlspecialchars($invoice->getDisplayDate())?>
+								<?=htmlspecialchars($sale_order->getDisplayDate())?>
 								<span class="px-1"></span>
 								<strong>
-									<?=htmlspecialchars($formatter->formatCurrency($invoice->getSubtotal(), $aru->currency))?>
+									<?=htmlspecialchars($formatter->formatCurrency($sale_order->getSubtotal(), $aru->currency))?>
 								</strong>
 							</div>
 							<?php

+ 13 - 13
views/document.php

@@ -4,7 +4,7 @@ namespace App;
 
 use App\Enums\AruStatuses;
 use App\Enums\Currencies;
-use App\Enums\InvoiceStatuses;
+use App\Enums\SaleOrderStatuses;
 use App\Helpers\HtmlHelper;
 
 /**
@@ -48,7 +48,7 @@ $location = $document->getLocation();
 
 				<div class="row">
 					<?php
-					if($document->isInvoice()) {
+					if($document->isSaleOrder()) {
 						?>
 						<div class="col-sm-6">
 							<div class="mb-3">
@@ -57,7 +57,7 @@ $location = $document->getLocation();
 								</label>
 								<select class="form-control" name="invoice_status" id="invoice-status">
 									<?php
-									HtmlHelper::renderOptions(InvoiceStatuses::options(), $document->invoice_status);
+									HtmlHelper::renderOptions(SaleOrderStatuses::options(), $document->invoice_status);
 									?>
 								</select>
 							</div>
@@ -147,7 +147,7 @@ $location = $document->getLocation();
 
 				<div class="row">
 					<?php
-					if($document->isInvoice() || $document->isDeliveryNote()) {
+					if($document->isSaleOrder() || $document->isDeliveryNote()) {
 						?>
 						<div class="col-sm-6">
 							<div class="mb-3">
@@ -159,7 +159,7 @@ $location = $document->getLocation();
 						</div>
 						<?php
 					}
-					if($document->isInvoice()) {
+					if($document->isSaleOrder()) {
 						?>
 						<div class="col-sm-6">
 							<div class="mb-3">
@@ -186,7 +186,7 @@ $location = $document->getLocation();
 				<h4><?=htmlspecialchars(__("Additional Details"))?></h4>
 
 				<?php
-				if($document->isInvoice()) {
+				if($document->isSaleOrder()) {
 					?>
 					<div class="mb-3">
 						<label for="dts-finalised" class="form-label">
@@ -327,17 +327,17 @@ $location = $document->getLocation();
 							<?php
 						}
 
-						$invoices = $document->getInvoices();
+						$sale_orders = $document->getSaleOrders();
 
-						if($invoices) {
+						if($sale_orders) {
 							?>
-							<dt><?=htmlspecialchars(__("Invoices"))?></dt>
+							<dt><?=htmlspecialchars(__("Sale Orders"))?></dt>
 							<dd>
 								<?php
-								foreach($invoices as $invoice) {
+								foreach($sale_orders as $sale_order) {
 									?>
-									<a href="<?=htmlspecialchars($invoice->getUrl())?>">
-										<?=htmlspecialchars($invoice->getTitle())?>
+									<a href="<?=htmlspecialchars($sale_order->getUrl())?>">
+										<?=htmlspecialchars($sale_order->getTitle())?>
 									</a><br />
 									<?php
 								}
@@ -357,7 +357,7 @@ $location = $document->getLocation();
 		</button>
 
 		<?php
-		if($document->isInvoice()) {
+		if($document->isSaleOrder()) {
 			?>
 			<div class="dropdown d-inline-block">
 				<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">

+ 4 - 4
views/document_items_section.php

@@ -12,8 +12,8 @@ $items = $document->getItems();
 
 $title = __("Items");
 
-if($document->isInvoice()) {
-	$title = __("Invoice Items");
+if($document->isSaleOrder()) {
+	$title = __("Sale Order Items");
 }
 if($document->isDeliveryNote()) {
 	$title = __("Delivery Items");
@@ -191,9 +191,9 @@ if($document->isAru()) {
 			<?php
 			if($document->isAru()) {
 				?>
-				<button type="submit" class="btn btn-primary batch-action" name="batch_action" value="create-invoice" disabled>
+				<button type="submit" class="btn btn-primary batch-action" name="batch_action" value="create-sale-order" disabled>
 					<i class="fa fa-fw fa-file-invoice"></i>
-					<?=htmlspecialchars(__("Create Invoice"))?>
+					<?=htmlspecialchars(__("Create Sale Order"))?>
 				</button>
 				<button type="submit" class="btn btn-primary batch-action" name="batch_action" value="create-goods-in" disabled>
 					<i class="fa fa-fw fa-truck"></i>

+ 10 - 10
views/document_pdf.php

@@ -16,7 +16,7 @@ $type_name = $document->getDisplayType();
 $number_title = $type_name . " #";
 $delivery_note_number = null;
 
-if($document->isInvoice()) {
+if($document->isSaleOrder()) {
 	if($variant === "commercial") {
 		$background_colour = "#2e75b6";
 		$type_name = "Commercial Invoice";
@@ -158,7 +158,7 @@ $is_part_of_aru = $document->isPartOfAru();
 			<div class="col-6">
 
 				<?php
-				if($document->isInvoice() || $document->isDeliveryNote()) {
+				if($document->isSaleOrder() || $document->isDeliveryNote()) {
 					?>
 					<div class="card mb-2">
 						<div class="card-header bg-document">
@@ -207,7 +207,7 @@ $is_part_of_aru = $document->isPartOfAru();
 					$render_card($number_title, $document->number);
 					$render_card("Date", CarbonImmutable::parse($document->date)->format("d/m/Y"));
 
-					if($document->isInvoice()) {
+					if($document->isSaleOrder()) {
 						$render_card("Sales Order", $document->number);
 						$render_card("Terms", $document->terms ?? " ");
 					}
@@ -218,16 +218,16 @@ $is_part_of_aru = $document->isPartOfAru();
 					}
 
 					if(!$is_part_of_aru) {
-						if($document->isInvoice() || $document->isDeliveryNote()) {
+						if($document->isSaleOrder() || $document->isDeliveryNote()) {
 							$render_card("Client PO No.", $document->po_number);
 						}
 					}
 
-					if($document->isInvoice() && !$is_part_of_aru) {
+					if($document->isSaleOrder() && !$is_part_of_aru) {
 						$render_card("Delivery Note No.", $delivery_note_number);
 					}
 
-					if($document->isInvoice()) {
+					if($document->isSaleOrder()) {
 						$render_card("Currency", $document->currency);
 
 						if($company) {
@@ -259,7 +259,7 @@ $is_part_of_aru = $document->isPartOfAru();
 				<col style="width: 20%"/>
 				<col style="width: 10%"/>
 				<?php
-				if($document->isInvoice()) {
+				if($document->isSaleOrder()) {
 					?>
 					<col style="width: 15%"/>
 					<col style="width: 15%"/>
@@ -273,7 +273,7 @@ $is_part_of_aru = $document->isPartOfAru();
 				<th>S/N</th>
 				<th>Qty</th>
 				<?php
-				if($document->isInvoice()) {
+				if($document->isSaleOrder()) {
 					?>
 					<th>Unit Price</th>
 					<th>Amount</th>
@@ -299,7 +299,7 @@ $is_part_of_aru = $document->isPartOfAru();
 						<?=$item->quantity?>
 					</td>
 					<?php
-					if($document->isInvoice()) {
+					if($document->isSaleOrder()) {
 						$amount = $item->getAmount();
 						$subtotal = bcadd($amount, $subtotal, 2);
 						?>
@@ -318,7 +318,7 @@ $is_part_of_aru = $document->isPartOfAru();
 			?>
 			</tbody>
 			<?php
-			if($document->isInvoice()) {
+			if($document->isSaleOrder()) {
 				$tax = bcmul($subtotal, $document->tax_rate / 100, 2);
 				$total = bcadd($subtotal, $tax, 2);
 

+ 7 - 7
views/documents.php

@@ -4,7 +4,7 @@ namespace App;
 
 use App\Enums\AruStatuses;
 use App\Enums\DocumentTypes;
-use App\Enums\InvoiceStatuses;
+use App\Enums\SaleOrderStatuses;
 use App\Helpers\HtmlHelper;
 
 /**
@@ -21,7 +21,7 @@ use App\Helpers\HtmlHelper;
  * @var int $custom_filter
  */
 
-$is_invoice = ($type === DocumentTypes::INVOICE);
+$is_sale_order = ($type === DocumentTypes::SALE_ORDER);
 $is_goods_in = ($type === DocumentTypes::GOODS_IN);
 $is_aru = ($type === DocumentTypes::ADVANCE_REPLACEMENT_UNIT);
 $is_delivery_note = ($type === DocumentTypes::DELIVERY_NOTE);
@@ -29,10 +29,10 @@ $is_delivery_note = ($type === DocumentTypes::DELIVERY_NOTE);
 $status_options = [];
 $custom_filter_options = [];
 
-if($is_invoice) {
-	$status_options = InvoiceStatuses::options();
+if($is_sale_order) {
+	$status_options = SaleOrderStatuses::options();
 	$custom_filter_options = [
-		"open" => "Open Invoices",
+		"open" => "Open Sale Orders",
 	];
 }
 if($is_aru) {
@@ -227,10 +227,10 @@ else {
 				</td>
 				<?php
 				if($status_options) {
-					if($is_invoice) {
+					if($is_sale_order) {
 						?>
 						<td>
-							<?=htmlspecialchars($document->getDisplayInvoiceStatus())?>
+							<?=htmlspecialchars($document->getDisplaySaleOrderStatus())?>
 						</td>
 						<?php
 					}

+ 1 - 1
views/header.php

@@ -109,7 +109,7 @@ $google_api_key = $_ENV["GOOGLE_API_KEY"] ?? null;
 						<a class="list-group-item list-group-item-action" href="/leads"><?=htmlspecialchars(__("Leads"))?></a>
 						<a class="list-group-item list-group-item-action" href="/goods-in"><?=htmlspecialchars(__("Goods-In"))?></a>
 						<a class="list-group-item list-group-item-action" href="/arus"><?=htmlspecialchars(__("ARUs"))?></a>
-						<a class="list-group-item list-group-item-action" href="/invoices"><?=htmlspecialchars(__("Invoices"))?></a>
+						<a class="list-group-item list-group-item-action" href="/sale-orders"><?=htmlspecialchars(__("Sale Orders"))?></a>
 						<a class="list-group-item list-group-item-action" href="/delivery-notes"><?=htmlspecialchars(__("Delivery Notes"))?></a>
 					</div>
 				</div>

+ 12 - 12
views/sale_invoices_section.php

@@ -11,11 +11,11 @@ use App\Helpers\HtmlHelper;
 ?>
 
 <section class="mb-4">
-	<h3><?=htmlspecialchars(__("Invoices"))?></h3>
+	<h3><?=htmlspecialchars(__("Sale Orders"))?></h3>
 	<?php
-	$invoices = $sale->getInvoices();
-	if(empty($invoices)) {
-		HtmlHelper::renderInfoAlert(__("No invoices to display."));
+	$sale_orders = $sale->getSaleOrders();
+	if(empty($sale_orders)) {
+		HtmlHelper::renderInfoAlert(__("No sale orders to display."));
 	}
 	else {
 		?>
@@ -44,8 +44,8 @@ use App\Helpers\HtmlHelper;
 			</thead>
 			<tbody>
 			<?php
-			foreach($invoices as $index => $invoice) {
-				$items = $invoice->getItems();
+			foreach($sale_orders as $index => $sale_order) {
+				$items = $sale_order->getItems();
 				$rowspan = count($items);
 
 				$item = array_shift($items);
@@ -53,10 +53,10 @@ use App\Helpers\HtmlHelper;
 				?>
 				<tr class="<?=$row_class?>">
 					<td class="text-end" rowspan="<?=$rowspan?>">
-						<a href="<?=htmlspecialchars($invoice->getUrl())?>"><?=$invoice->number?></a>
+						<a href="<?=htmlspecialchars($sale_order->getUrl())?>"><?=$sale_order->number?></a>
 					</td>
 					<td rowspan="<?=$rowspan?>">
-						<?=htmlspecialchars($invoice->getDisplayInvoiceStatus())?>
+						<?=htmlspecialchars($sale_order->getDisplaySaleOrderStatus())?>
 					</td>
 					<td>
 						<?=htmlspecialchars($item->description)?>
@@ -72,16 +72,16 @@ use App\Helpers\HtmlHelper;
 						<?=htmlspecialchars($item->quantity)?>
 					</td>
 					<td class="text-end" rowspan="<?=$rowspan?>">
-						<?=htmlspecialchars($invoice->getDisplaySubtotal())?>
+						<?=htmlspecialchars($sale_order->getDisplaySubtotal())?>
 					</td>
 					<td class="text-end" rowspan="<?=$rowspan?>">
-						<?=htmlspecialchars($invoice->getDisplayTax())?>
+						<?=htmlspecialchars($sale_order->getDisplayTax())?>
 					</td>
 					<td class="text-end" rowspan="<?=$rowspan?>">
-						<?=htmlspecialchars($invoice->getDisplayTotal())?>
+						<?=htmlspecialchars($sale_order->getDisplayTotal())?>
 					</td>
 					<td class="p-1" rowspan="<?=$rowspan?>">
-						<a href="<?=htmlspecialchars($invoice->getUrl())?>" class="btn btn-sm btn-primary">
+						<a href="<?=htmlspecialchars($sale_order->getUrl())?>" class="btn btn-sm btn-primary">
 							<?=htmlspecialchars(__("View"))?>
 						</a>
 					</td>

+ 2 - 2
views/sale_items_section.php

@@ -129,9 +129,9 @@ use NumberFormatter;
 				<?=htmlspecialchars(__("With selected items:"))?>
 			</div>
 
-			<button type="submit" class="btn btn-primary batch-action" name="batch_action" value="create-invoice" disabled>
+			<button type="submit" class="btn btn-primary batch-action" name="batch_action" value="create-sale-order" disabled>
 				<i class="fa fa-fw fa-file-invoice"></i>
-				<?=htmlspecialchars(__("Create Invoice"))?>
+				<?=htmlspecialchars(__("Create Sale Order"))?>
 			</button>
 			<button type="submit" class="btn btn-danger batch-action" name="batch_action" value="delete" disabled>
 				<i class="fa fa-fw fa-trash"></i>