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

Convert submit actions of document and sale forms to be AJAX

Alan Lam 3 лет назад
Родитель
Сommit
30012c32b8
5 измененных файлов с 59 добавлено и 15 удалено
  1. 7 4
      controllers/document.php
  2. 7 3
      controllers/sale.php
  3. 23 7
      public/js/document-page.js
  4. 21 0
      public/js/sale-page.js
  5. 1 1
      views/sale.php

+ 7 - 4
controllers/document.php

@@ -264,10 +264,13 @@ $controller = new class($document_type, $document_number) {
 
 		$document->commit();
 
-		Session::addAlert("success", __("%s document updated successfully.", $document->getDisplayType()));
-
-		Http::redirect($document->getUrl());
-
+		if(Http::isAjax()) {
+			JSON::success();
+		}
+		else {
+			Session::addAlert("success", __("%s document updated successfully.", $document->getDisplayType()));
+			Http::redirect($document->getUrl());
+		}
 	}
 
 	public function submitItem(): void {

+ 7 - 3
controllers/sale.php

@@ -135,9 +135,13 @@ $controller = new class($number) {
 
 		$sale->commit();
 
-		Session::addAlert("success", $success_message);
-
-		Http::redirect($sale->getUrl());
+		if(Http::isAjax()) {
+			JSON::success();
+		}
+		else {
+			Session::addAlert("success", $success_message);
+			Http::redirect($sale->getUrl());
+		}
 	}
 
 	public function delete(): void {

+ 23 - 7
public/js/document-page.js

@@ -1,4 +1,11 @@
 class DocumentPage {
+	static InitForm() {
+		const $form = $("#document-form");
+		$form.on("submit", event => {
+			event.preventDefault();
+			DocumentPage.SaveForm();
+		})
+	}
 	static InitItemsSection() {
 		const $table = $("#document-items-section table");
 		const $checkboxes = $table.find("input[type=checkbox]");
@@ -31,25 +38,34 @@ class DocumentPage {
 	}
 
 	static InitPdfActions() {
-		const $form = $("#document-form");
-		const action = $form.get(0).action;
-
 		const $elements = $(".pdf-action");
 		$elements.on("click", event => {
 			event.preventDefault();
-
 			const $element = $(event.currentTarget);
-			const data = $form.serialize();
 
-			$.post(action, data).then(() => {
-				toastr.success("Invoice saved successfully.");
+			DocumentPage.SaveForm().then(() => {
 				window.open($element.attr("href"));
 			});
 		});
 	}
+
+	static SaveForm() {
+		const $form = $("#document-form");
+		const action = $form.get(0).action;
+		const data = $form.serialize();
+		const $submitElements = $form.find("[type=submit]");
+		$submitElements.prop("disabled", true);
+
+		return $.post(action, data).always(() => {
+			$submitElements.prop("disabled", false);
+		}).then(() => {
+			toastr.success("Invoice saved successfully.");
+		});
+	}
 }
 
 $(() => {
+	DocumentPage.InitForm();
 	DocumentPage.InitItemsSection();
 	DocumentPage.InitPdfActions();
 });

+ 21 - 0
public/js/sale-page.js

@@ -1,4 +1,11 @@
 class SalePage {
+	static InitForm() {
+		const $form = $("#sale-form");
+		$form.on("submit", event => {
+			event.preventDefault();
+			SalePage.SaveForm();
+		})
+	}
 	static InitSaleItemSection() {
 		const $table = $("#sale-items-section table");
 		const $checkboxes = $table.find("tbody input[type=checkbox]");
@@ -29,8 +36,22 @@ class SalePage {
 			}
 		});
 	}
+	static SaveForm() {
+		const $form = $("#sale-form");
+		const action = $form.get(0).action;
+		const data = $form.serialize();
+		const $submitElements = $form.find("[type=submit]");
+		$submitElements.prop("disabled", true);
+
+		return $.post(action, data).always(() => {
+			$submitElements.prop("disabled", false);
+		}).then(() => {
+			toastr.success("Sale saved successfully.");
+		});
+	}
 }
 
 $(() => {
 	SalePage.InitSaleItemSection();
+	SalePage.InitForm();
 });

+ 1 - 1
views/sale.php

@@ -18,7 +18,7 @@ $user = $core->getUser();
 <section class="mb-4">
 	<h3><?=htmlspecialchars($sale->getTitle())?></h3>
 
-	<form class="mb-4" action="<?=htmlspecialchars($sale->getUrl())?>/submit" method="post">
+	<form id="sale-form" class="mb-4" action="<?=htmlspecialchars($sale->getUrl())?>/submit" method="post">
 
 		<div class="row">