Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

AddOrderNote - popup added

DanielŻuławskia6c0ee9da0f8
diff --git a/src/Web/Grand.Web/Views/Order/AddOrderNote.cshtml b/src/Web/Grand.Web/Views/Order/AddOrderNote.cshtml
deleted file mode 100644
index 0837d3368..000000000
--- a/src/Web/Grand.Web/Views/Order/AddOrderNote.cshtml
+++ /dev/null
@@ -1,44 +0,0 @@
-@model AddOrderNoteModel
-@inject IPageHeadBuilder pagebuilder
-@{
- Layout = "_SingleColumn";
-
- //title
- pagebuilder.AddTitleParts(Loc["Title.OrderDetails"]);
-}
-<div class="page order-details-page mb-3">
- <h1 class="generalTitle h2 text-center">@Loc["Order.AddOrdernote"]</h1>
- <div class="write-review" id="review-form">
- <validation-observer v-slot="{ handleSubmit }">
- <form asp-route="AddOrderNote" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">
- <input asp-for="OrderId" type="hidden" />
- <div asp-validation-summary="ModelOnly" class="message-error alert alert-info my-3"></div>
- <fieldset>
- <div class="form-fields">
- <div class="form-group">
- <validation-provider tag="div" rules="required" name="Note" v-slot="{ errors, classes }">
- <label asp-for="Note" class="col-form-label">@Loc["OrderNote.Fields.Title"]:</label>
- <textarea asp-for="Note" v-model="ordernote.Note" v-bind:class="[classes , 'form-control']" autofocus="autofocus" rows="4"></textarea>
- <span class="field-validation-error">{{ errors[0] }}</span>
- </validation-provider>
- </div>
- </div>
- </fieldset>
- <div class="buttons text-left my-3">
- <input type="submit" class="btn btn-info write-product-review-button" value="@Loc["OrderNote.SubmitButton"]" />
- </div>
- </form>
- </validation-observer>
- </div>
-</div>
-<script asp-location="Footer" asp-order="300">
- var ordernote = new Vue({
- data: () => ({
- @{
- <text>
- Note: '',
- </text>
- }
- })
- });
-</script>
\ No newline at end of file
diff --git a/src/Web/Grand.Web/Views/Order/Details.cshtml b/src/Web/Grand.Web/Views/Order/Details.cshtml
index 98ee9bcc4..9ea1f0c4a 100644
--- a/src/Web/Grand.Web/Views/Order/Details.cshtml
+++ b/src/Web/Grand.Web/Views/Order/Details.cshtml
@@ -41,7 +41,12 @@
@if (Model.ShowAddOrderNote)
{
- <a href="@Url.RouteUrl("AddOrderNote", new { orderId = Model.Id })" class="btn btn-outline-secondary">@Loc["Order.AddOrderNote"]</a>
+ <a @@click="$bvModal.show('ModalAddOrderNote')" class="btn btn-outline-secondary">@Loc["Order.AddOrderNote"]</a>
+
+ var notemodel = new AddOrderNoteModel();
+ notemodel.OrderId = Model.Id;
+
+ <partial name="_AddOrderNote" model="@notemodel"/>
}
</div>
}
diff --git a/src/Web/Grand.Web/Views/Order/_AddOrderNote.cshtml b/src/Web/Grand.Web/Views/Order/_AddOrderNote.cshtml
new file mode 100644
index 000000000..2c4aa3da8
--- /dev/null
+++ b/src/Web/Grand.Web/Views/Order/_AddOrderNote.cshtml
@@ -0,0 +1,36 @@
+@model AddOrderNoteModel
+<b-modal id="ModalAddOrderNote" ref="ModalAddOrderNote" :dark-theme="darkMode" size="xl" centered hide-footer hide-header>
+ <a class="modal-close" @@click="$bvModal.hide('ModalAddOrderNote')"><b-icon icon="x"></b-icon></a>
+ <h1 class="generalTitle h2 text-center">@Loc["Order.AddOrdernote"]</h1>
+ <validation-observer v-slot="{ handleSubmit }">
+ <form asp-route="AddOrderNote" asp-route-OrderId="@Model.OrderId" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">
+ <input asp-for="OrderId" type="hidden" />
+ <div asp-validation-summary="ModelOnly" class="message-error alert alert-info my-3"></div>
+ <fieldset>
+ <div class="form-fields">
+ <div class="form-group">
+ <validation-provider tag="div" rules="required" name="Note" v-slot="{ errors, classes }">
+ <label asp-for="Note" class="col-form-label">@Loc["OrderNote.Fields.Title"]:</label>
+ <textarea asp-for="Note" v-model="ordernote.Note" v-bind:class="[classes , 'form-control']" autofocus="autofocus" rows="4"></textarea>
+ <span class="field-validation-error">{{ errors[0] }}</span>
+ </validation-provider>
+ </div>
+ </div>
+ </fieldset>
+ <div class="buttons text-left my-3">
+ <input type="submit" class="btn btn-info write-product-review-button" value="@Loc[" OrderNote.SubmitButton"]" />
+ </div>
+ </form>
+ </validation-observer>
+</b-modal>
+<script asp-location="Footer" asp-order="300">
+ var ordernote = new Vue({
+ data: () => ({
+ @{
+ <text>
+ Note: '',
+ </text>
+ }
+ })
+ });
+</script>
\ No newline at end of file