Alan Lam 3 лет назад
Родитель
Сommit
8fee28bc5d
8 измененных файлов с 157 добавлено и 77 удалено
  1. 48 39
      controllers/dashboard.php
  2. 7 5
      controllers/location_form.php
  3. 25 0
      engine/Aru.php
  4. 23 0
      engine/GoodsIn.php
  5. 12 0
      engine/Sale.php
  6. 25 0
      engine/SalesOrder.php
  7. 14 0
      engine/Ticket.php
  8. 3 33
      views/dashboard.php

+ 48 - 39
controllers/dashboard.php

@@ -1,65 +1,74 @@
-<?php
+<?php /** @noinspection \PhpUnhandledExceptionInspection */
 
 namespace App;
 
-use App\Constraint\Constraint;
-use App\Constraint\NotEqualsConstraint;
-use App\Constraint\NotInConstraint;
-use App\Enums\AruStatuses;
-use App\Enums\DocumentTypes;
-use App\Enums\SalesOrderStatuses;
-use App\Enums\SaleStatuses;
-use App\Enums\TicketStatuses;
-
 $core = Core::getInstance();
 $core->addBreadcrumb("/dashboard", __("Dashboard"));
 
 $cards = [];
 
-$open_ticket_count = Ticket::count([
-	"status" => new NotInConstraint(TicketStatuses::CLOSED, TicketStatuses::SOLVED),
-	"dts_deleted" => null
-]);
-
 $cards[] = [
 	"title" => "Unsolved Tickets",
-	"count" => $open_ticket_count,
+	"count" => Ticket::getOpenCount(),
 	"url" => "/tickets?custom_filter=unsolved",
+	"addUrl" => "/tickets?auto_click_target=%23new-ticket-button",
+	"addText" => __("Add Ticket"),
 ];
 
-$open_sale_count = Sale::count([
-	"status" => new NotEqualsConstraint(SaleStatuses::COMPLETED),
-	"dts_deleted" => null
-]);
-
 $cards[] = [
 	"title" => "Open Leads",
-	"count" => $open_sale_count,
-	"url" => "/leads?custom_filter=open"
+	"count" => Sale::getOpenCount(),
+	"url" => "/leads?custom_filter=open",
+	"addUrl" => "/leads?auto_click_target=%23new-sale-button",
+	"addText" => __("Add Lead"),
 ];
 
-$open_aru_count = Document::count([
-	"type" => DocumentTypes::ADVANCE_REPLACEMENT_UNIT,
-	"aru_status" => new NotInConstraint(AruStatuses::COMPLETED, AruStatuses::CANCELLED),
-	"dts_deleted" => null
-]);
-
 $cards[] = [
 	"title" => "Open ARUs",
-	"count" => $open_aru_count,
-	"url" => "/arus?custom_filter=open"
+	"count" => Aru::getOpenCount(),
+	"url" => "/arus?custom_filter=open",
+	"addUrl" => "/arus?auto_click_target=%23new-document-button",
+	"addText" => __("Add ARU"),
 ];
 
-$open_sales_order_count = Document::count([
-	"type" => DocumentTypes::SALES_ORDER,
-	"invoice_status" => new NotInConstraint(SalesOrderStatuses::VOID, SalesOrderStatuses::PAID),
-	"dts_deleted" => null
-]);
-
 $cards[] = [
 	"title" => "Open Sales Orders",
-	"count" => $open_sales_order_count,
-	"url" => "/sales-orders?custom_filter=open"
+	"count" => SalesOrder::getOpenCount(),
+	"url" => "/sales-orders?custom_filter=open",
+	"addUrl" => "/sales-orders?auto_click_target=%23new-document-button",
+	"addText" => __("Add Sales Order"),
+];
+
+$cards[] = [
+	"title" => "Goods-In",
+	"count" => GoodsIn::count(["dts_deleted" => null]),
+	"url" => "/goods-in",
+	"addUrl" => "/goods-in?auto_click_target=%23new-document-button",
+	"addText" => __("Add Goods-In"),
+];
+
+$cards[] = [
+	"title" => "Customers",
+	"count" => Customer::count(["dts_deleted" => null]),
+	"url" => "/customers",
+	"addUrl" => "/customers/add",
+	"addText" => __("Add Customer"),
+];
+
+$cards[] = [
+	"title" => "Locations",
+	"count" => Location::count(["dts_deleted" => null]),
+	"url" => "/locations",
+	"addUrl" => "/locations/add",
+	"addText" => __("Add Location"),
+];
+
+$cards[] = [
+	"title" => "Products",
+	"count" => Product::count(["dts_deleted" => null]),
+	"url" => "/products",
+	"addUrl" => "/products/add",
+	"addText" => __("Add Product"),
 ];
 
 View::include("header");

+ 7 - 5
controllers/location_form.php

@@ -27,16 +27,18 @@ if(isset($id)) {
 	$title = __("Update Location");
 }
 else {
+	$location = new Location();
+
 	$customer_id = $request->int("customer_id");
-	$customer = Customer::require($customer_id);
+	if($customer_id) {
+		$customer = Customer::require($customer_id);
+		$location->customer_id = $customer_id;
+		$core->addBreadcrumb($customer->getUrl(), $customer->name);
+	}
 
-	$location = new Location();
-	$location->customer_id = $customer_id;
 	$location->dts_created = Database::dts();
 
 	$title = __("Add Location");
-
-	$core->addBreadcrumb($customer->getUrl(), $customer->name);
 }
 
 $core->addBreadcrumb($_SERVER["REQUEST_URI"], $title);

+ 25 - 0
engine/Aru.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App;
+
+use App\Constraint\NotInConstraint;
+use App\Enums\AruStatuses;
+use App\Enums\DocumentTypes;
+
+class Aru extends Document {
+
+	// Static methods
+
+	/**
+	 * @return int
+	 * @throws \Exception
+	 */
+	public static function getOpenCount(): int {
+		return self::count([
+			"type" => DocumentTypes::ADVANCE_REPLACEMENT_UNIT,
+			"aru_status" => new NotInConstraint(AruStatuses::COMPLETED, AruStatuses::CANCELLED),
+			"dts_deleted" => null
+		]);
+	}
+
+}

+ 23 - 0
engine/GoodsIn.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App;
+
+use App\Enums\DocumentTypes;
+
+class GoodsIn extends Document {
+
+	// Static methods
+
+	/**
+	 * @param array $nvp
+	 * @return int
+	 * @throws \Exception
+	 */
+	public static function count(array $nvp = []): int {
+		return Document::count([
+			"type" => DocumentTypes::GOODS_IN,
+			"dts_deleted" => null
+		]);
+	}
+
+}

+ 12 - 0
engine/Sale.php

@@ -2,6 +2,7 @@
 
 namespace App;
 
+use App\Constraint\NotEqualsConstraint;
 use App\Enums\DocumentTypes;
 use App\Enums\SaleStatuses;
 use App\Traits\DateTimeTrait;
@@ -35,6 +36,17 @@ class Sale extends Model {
 
 	// Static methods
 
+	/**
+	 * @return int
+	 * @throws \Exception
+	 */
+	public static function getOpenCount(): int {
+		return self::count([
+			"status" => new NotEqualsConstraint(SaleStatuses::COMPLETED),
+			"dts_deleted" => null
+		]);
+	}
+
 	/**
 	 * @param int $number
 	 * @return Sale|null

+ 25 - 0
engine/SalesOrder.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App;
+
+use App\Constraint\NotInConstraint;
+use App\Enums\DocumentTypes;
+use App\Enums\SalesOrderStatuses;
+
+class SalesOrder extends Document {
+
+	// Static methods
+
+	/**
+	 * @return int
+	 * @throws \Exception
+	 */
+	public static function getOpenCount(): int {
+		return self::count([
+			"type" => DocumentTypes::SALES_ORDER,
+			"invoice_status" => new NotInConstraint(SalesOrderStatuses::VOID, SalesOrderStatuses::PAID),
+			"dts_deleted" => null
+		]);
+	}
+
+}

+ 14 - 0
engine/Ticket.php

@@ -2,6 +2,7 @@
 
 namespace App;
 
+use App\Constraint\NotInConstraint;
 use App\Enums\TicketPriorities;
 use App\Enums\TicketStatuses;
 use App\Traits\DateTimeTrait;
@@ -39,6 +40,19 @@ class Ticket extends Model {
 	use DateTimeTrait;
 	use SoftDeleteTrait;
 
+	// Static methods
+
+	/**
+	 * @return int
+	 * @throws Exception
+	 */
+	public static function getOpenCount(): int {
+		return self::count([
+			"status" => new NotInConstraint(TicketStatuses::CLOSED, TicketStatuses::SOLVED),
+			"dts_deleted" => null
+		]);
+	}
+
 	/**
 	 * @return Location
 	 * @throws Exception

+ 3 - 33
views/dashboard.php

@@ -17,47 +17,17 @@
 			$url = $card["url"] ?? "#";
 			?>
 			<div class="col-6 col-md-4 col-lg-3">
-				<a class="btn btn-light p-3 d-block" href="<?=htmlspecialchars($url)?>" style="box-shadow: 0 2px 4px rgba(0, 0, 0, 0.25);">
+				<a class="btn btn-light p-3 d-block mb-3" href="<?=htmlspecialchars($url)?>" style="box-shadow: 0 2px 4px rgba(0, 0, 0, 0.25);">
 					<?=htmlspecialchars($card["title"])?>
 					<br />
 					<div class="fa-2x">
 						<?=htmlspecialchars(number_format($card["count"]))?>
 					</div>
 				</a>
-			</div>
-			<?php
-		}
-		?>
-	</div>
-</section>
 
-<section class="mb-4">
-	<div class="row mb-3">
-		<div class="col">
-			<h3><?=htmlspecialchars(__("Shortcuts"))?></h3>
-		</div>
-	</div>
-
-	<?php
-	$shortcuts = [
-		["id" => "new-sale-button", "label" => __("New Lead"), "url" => "/leads"],
-		["id" => "new-document-button", "label" => __("New Goods-In"), "url" => "/goods-in"],
-		["id" => "new-document-button", "label" => __("New ARU"), "url" => "/arus"],
-		["id" => "new-ticket-button", "label" => __("New Ticket"), "url" => "/tickets"],
-	];
-	?>
-
-	<div class="row g-3">
-		<?php
-		foreach($shortcuts as $shortcut) {
-			$id = $shortcut["id"];
-			$label = $shortcut["label"];
-			$url = $shortcut["url"];
-			?>
-			<div class="col-6 col-md-4 col-lg-3">
-				<a href="<?=htmlspecialchars($url)?>?auto_click_target=%23<?=htmlspecialchars($id)?>" class="btn d-block btn-outline-dark">
+				<a href="<?=htmlspecialchars($card["addUrl"])?>" class="btn btn-outline-success d-block mb-4">
 					<i class="fa fa-fw fa-plus"></i>
-					<?=htmlspecialchars($label)?>
+					<?=htmlspecialchars($card["addText"])?>
 				</a>
 			</div>
 			<?php