Skip to content

Commit fe4666b

Browse files
committed
Merge branch 'issue-8020-clearing-order-notes-form' into develop
2 parents 24084c1 + 8f24af1 commit fe4666b

File tree

1 file changed

+21
-10
lines changed

1 file changed

+21
-10
lines changed

src/Presentation/Nop.Web/Areas/Admin/Views/Order/_OrderDetails.Notes.cshtml

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,19 +120,18 @@
120120
<script>
121121
$(function() {
122122
$('#addOrderNote').click(function() {
123-
var orderNoteMessage = $("#@Html.IdFor(model => model.AddOrderNoteMessage)").val();
124-
var orderNoteDownloadId = 0;
125-
if ($('#@Html.IdFor(model => model.AddOrderNoteHasDownload)').is(':checked')) {
126-
orderNoteDownloadId = $("#@Html.IdFor(model => model.AddOrderNoteDownloadId)").val();
127-
}
128-
var orderNoteDisplayToCustomer =
129-
$("#@Html.IdFor(model => model.AddOrderNoteDisplayToCustomer)").is(':checked');
123+
124+
const orderNoteMessageInput = $("#@Html.IdFor(model => model.AddOrderNoteMessage)");
125+
const orderNoteDownloadCheckbox = $("#@Html.IdFor(model => model.AddOrderNoteHasDownload)");
126+
const orderNoteDisplayToCustomerCheckbox = $("#@Html.IdFor(model => model.AddOrderNoteDisplayToCustomer)");
127+
const orderNoteDownloadIdInput = $("#@Html.IdFor(model => model.AddOrderNoteDownloadId)");
128+
130129
$('#addOrderNote').attr('disabled', true);
131130
132131
var postData = {
133-
DisplayToCustomer: orderNoteDisplayToCustomer,
134-
message: orderNoteMessage,
135-
downloadId: orderNoteDownloadId,
132+
DisplayToCustomer: orderNoteDisplayToCustomerCheckbox.is(':checked'),
133+
message: orderNoteMessageInput.val(),
134+
downloadId: orderNoteDownloadCheckbox.is(':checked') ? orderNoteDownloadIdInput.val() : 0,
136135
orderId: '@Model.Id'
137136
};
138137
addAntiForgeryToken(postData);
@@ -146,6 +145,18 @@
146145
if (data.Result) {
147146
//reload grid
148147
updateTable('#ordernotes-grid');
148+
149+
//clear input value
150+
orderNoteMessageInput.val('');
151+
orderNoteDisplayToCustomerCheckbox.prop('checked', false);
152+
orderNoteDownloadIdInput.val('');
153+
154+
const filePondEl = $("#pnlAddOrderNoteDownloadId .filepond--root");
155+
if (filePondEl.length)
156+
FilePond.find(filePondEl[0]).removeFiles()
157+
158+
orderNoteDownloadCheckbox.prop('checked', false);
159+
orderNoteDownloadCheckbox.trigger("change")
149160
} else {
150161
//display errors if returned
151162
display_nop_error(data);

0 commit comments

Comments
 (0)