Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

As an admin user, i want to display in contact page the warehouse information #798 #1067

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

As an admin user, i want to display in contact page the warehouse information #798 #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Modules/SimplCommerce.Module.Catalog/Areas/Catalog/Views/Product/ProductDetail.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,8 @@
@await Component.InvokeAsync("Comment", new { entityId = Model.Id, entityTypeId = "Product" })
</div>



@section scripts {
<partial name="_ValidationScriptsPartial" />
<script simpl-append-version="true" src="~/lib/smoothproducts/js/smoothproducts.js"></script>
Expand Down
54 changes: 39 additions & 15 deletions src/Modules/SimplCommerce.Module.Contacts/wwwroot/admin/contact-area/contact-area-list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,45 @@ <h2>{{ ::vm.translate.get('Contact Areas')}}</h2>

<table class="table table-striped">
<thead>
<tr>
<th>{{ ::vm.translate.get('Name')}}</th>
<th>{{ ::vm.translate.get('Actions')}}</th>
</tr>
<tr>
<th>{{ ::vm.translate.get('Name')}}</th>
<th>{{ ::vm.translate.get('Actions')}}</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="contactArea in vm.contactAreas">
<td>{{contactArea.name}}</td>
<td>
<a ui-sref="contact-area-edit({id: contactArea.id})" title="Edit" class="btn btn-primary btn-xs"> <span class="glyphicon glyphicon-pencil"></span></a>
<button ng-click="vm.deleteContactArea(contactArea)" class="btn btn-danger btn-xs delete"> <span class="glyphicon glyphicon-remove"></span></button>
<a ui-sref="contact-area-translation({id: contactArea.id, culture: culture})" class="btn btn-default btn-xs btn-translate" ng-repeat="culture in vm.enableCultures">
<span class="flag flag-{{culture.substr(culture.length - 2).toLowerCase()}}" alt="{{culture}}" title="{{culture}}"></span>
</a>
</td>
</tr>
<tr ng-repeat="contactArea in vm.contactAreas">
<td>{{contactArea.name}}</td>
<td>
<a ui-sref="contact-area-edit({id: contactArea.id})" title="Edit" class="btn btn-primary btn-xs"> <span class="glyphicon glyphicon-pencil"></span></a>
<button ng-click="vm.deleteContactArea(contactArea)" class="btn btn-danger btn-xs delete"> <span class="glyphicon glyphicon-remove"></span></button>
<a ui-sref="contact-area-translation({id: contactArea.id, culture: culture})" class="btn btn-default btn-xs btn-translate" ng-repeat="culture in vm.enableCultures">
<span class="flag flag-{{culture.substr(culture.length - 2).toLowerCase()}}" alt="{{culture}}" title="{{culture}}"></span>
</a>
</td>
</tr>

</tbody>
</table>
</table>

<br />
<br />
<p style="text-align:center ; font-size:20px;">Our points of Sale</p>
<br /><br />

<div class="row">

<div class="card col-md-4" style=" box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2); transition: 0.3s; width: 30%; margin-left: 30px;border-radius:5px">
<img src="https://i.pinimg.com/originals/ee/60/00/ee6000997058733b905fb06978f1bf8a.jpg" alt="hello" style="width: 350px; height: 220px" />
<p style="font-size:18px">Default warehouse</p>

<p>364 Cong Hoa,Hồ Chí Minh</p>
<p>&#x260E &nbsp; +32(0)&nbsp;34&nbsp;87&nbsp;54&nbsp; 23</p>
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-envelope-fill" viewBox="0 0 16 16">
<path d="M.05 3.555A2 2 0 0 1 2 2h12a2 2 0 0 1 1.95 1.555L8 8.414.05 3.555ZM0 4.697v7.104l5.803-3.558zM6.761 8.83l-6.57 4.027A2 2 0 0 0 2 14h12a2 2 0 0 0 1.808-1.144l-6.57-4.027L8 9.586l-1.239-.757Zm3.436-.586L16 11.801V4.697l-5.803 3.546Z" />
</svg>


</div>

</div>

Binary file added src/Modules/SimplCommerce.Module.Contacts/wwwroot/admin/contact-area/warehouse.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/SimplCommerce.WebHost/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"ConnectionStrings": {
"DefaultConnection": "Server=.;Database=SimplCommerce;Trusted_Connection=True;TrustServerCertificate=true;MultipleActiveResultSets=true"
"DefaultConnection": "server=DotNetFSD\\SQLEXPRESS;database = SimplCommerce;user id = sa; password = pass@123;trustservercertificate = true;MultipleActiveResultSets=true"
},
"Authentication" : {
"Facebook" : {
Expand Down