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.

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

New blade with prices for product #5

Merged
merged 8 commits into from
Sep 8, 2017
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Inline styles moved to stylesheet file
megafreeman committed Sep 6, 2017
commit 5684105930089a7448ae2d1de7a004b7a77543d8
20 changes: 20 additions & 0 deletions VirtoCommerce.PricingModule.Web/Content/css/pricing.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.head-label {
font-size: 17px;
margin-bottom: 15px;
}

.head-select {
width: calc(100% - 120px);
}

button.btn.head-button {
background: #43b0e6;
color: #fff;
height: 30px;
line-height: 28px;
padding: 0 10px;
}

button.btn.head-button:hover {
background: #43b0e6;
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<div class="blade-static __expanded">
<div class="form-group">
<label class="form-label" style="font-size:17px; margin-bottom: 15px;">{{'pricing.blades.item-prices.head-label' | translate}} <a href="" ng-click="createNewPricelist()" class="form-edit" va-permission="pricing:read"><i class="form-ico fa fa-pencil"></i></a></label>
<label class="form-label head-label">{{'pricing.blades.item-prices.head-label' | translate}} <a href="" ng-click="createNewPricelist()" class="form-edit" va-permission="pricing:read"><i class="form-ico fa fa-pencil"></i></a></label>

<div class="form-input">
<ui-select ng-model="blade.selectedPricelist" required style="width: calc(100% - 120px);">
<ui-select ng-model="blade.selectedPricelist" class="head-select" required>
<ui-select-match placeholder="{{'pricing.blades.item-prices.pricelist-select-placeholder' | translate}}">{{$select.selected.code}}</ui-select-match>
<ui-select-choices repeat="x in blade.pricelistList | filter: $select.search">
<span ng-bind-html="x.code | highlight: $select.search"></span>
</ui-select-choices>
</ui-select>

<button class="btn __other" style="background: #43b0e6; color: #fff; height: 30px; line-height: 28px; padding: 0 10px;" type="button" ng-disabled="!blade.selectedPricelist" ng-click="blade.addNewPrice(blade.selectedPricelist)">Add new price</button>
<button class="btn head-button" type="button" ng-disabled="!blade.selectedPricelist" ng-click="blade.addNewPrice(blade.selectedPricelist)">Add new price</button>
</div>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -139,6 +139,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<Content Include="Content\css\pricing.css" />
<Content Include="Content\logo.png" />
<Content Include="Localizations\en.VirtoCommerce.Pricing.json" />
<Content Include="Localizations\de.VirtoCommerce.Pricing.json" />
5 changes: 4 additions & 1 deletion VirtoCommerce.PricingModule.Web/module.manifest
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<platformVersion>2.13.9</platformVersion>
<dependencies>
<dependency id="VirtoCommerce.Core" version="2.23.0" />
<dependency id="VirtoCommerce.Catalog" version="2.17.0" />
<dependency id="VirtoCommerce.Catalog" version="2.17.0" />
</dependencies>

<title>Pricing module</title>
@@ -25,6 +25,9 @@
<assemblyFile>VirtoCommerce.PricingModule.Web.dll</assemblyFile>
<moduleType>VirtoCommerce.PricingModule.Web.Module, VirtoCommerce.PricingModule.Web</moduleType>

<styles>
<directory virtualPath="$/Content/css" searchPattern="*.css" searchSubdirectories="true" />
</styles>
<scripts>
<directory virtualPath="$/Scripts" searchPattern="*.js" searchSubdirectories="true" />
</scripts>