Added a lot of functionality; Fixed a large number of bugs; Removed Bootstrap from the mix and replaced it with SimpleGrid and some choice bits from the bootstrap system; Pricing, Sales, and Product management all now function at basic levels.
This commit is contained in:
Wynne Crisman
@@ -5,16 +5,16 @@
|
||||
{{>InsertSale}}
|
||||
</div>
|
||||
<div class="grid">
|
||||
<table class="dataTable table table-striped table-hover">
|
||||
<table class="table table-striped table-hover">
|
||||
<thead>
|
||||
<tr class="headers">
|
||||
<th class="tdLarge noselect nonclickable" style="width: 80px">Amount</th>
|
||||
<th class="tdLarge noselect nonclickable">Product</th>
|
||||
<th class="tdLarge noselect nonclickable" style="width: 140px">Price</th>
|
||||
<th class="tdLarge noselect nonclickable" style="width: 90px">Measure</th>
|
||||
<th class="tdLarge noselect nonclickable" style="width: 140px">Date (Week)</th>
|
||||
<th class="tdLarge noselect nonclickable" style="width: 120px">Venue</th>
|
||||
<th class="tdLarge noselect nonclickable" style="width: 90px">Actions</th>
|
||||
<th class="amount noselect nonclickable">Amount</th>
|
||||
<th class="product noselect nonclickable">Product</th>
|
||||
<th class="price noselect nonclickable">Price</th>
|
||||
<th class="measure noselect nonclickable">Measure</th>
|
||||
<th class="date noselect nonclickable">Date (Week)</th>
|
||||
<th class="venue noselect nonclickable">Venue</th>
|
||||
<th class="actions noselect nonclickable">Actions</th>
|
||||
</tr>
|
||||
<tr class="footers">
|
||||
<th>{{>SaleSearch columnName='amount' width='90%'}}</th>
|
||||
@@ -33,6 +33,10 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="pagination">
|
||||
<span class="prevButton noselect {{#if disablePrev}}disabled{{/if}}"><i class="fa fa-long-arrow-left" aria-hidden="true"></i> Prev</span>
|
||||
<span class="nextButton noselect {{#if disableNext}}disabled{{/if}}">Next <i class="fa fa-long-arrow-right" aria-hidden="true"></i></span>
|
||||
</div>
|
||||
{{else}}
|
||||
{{/if}}
|
||||
</div>
|
||||
@@ -40,38 +44,13 @@
|
||||
|
||||
<template name="Sale">
|
||||
<tr>
|
||||
<!--{{#if editable}}-->
|
||||
<td class="tdLarge noselect nonclickable center">{{amount}}</td>
|
||||
<td class="tdLarge noselect nonclickable left">{{productName productId}}</td>
|
||||
<td class="tdLarge noselect nonclickable left">{{formatPrice price}}{{#if showTotalPrice amount}} ({{formatTotalPrice price amount}}){{/if}}</td>
|
||||
<td class="tdLarge noselect nonclickable left">{{measureName measureId}}</td>
|
||||
<td class="tdLarge noselect nonclickable left">{{formatDate date}}</td>
|
||||
<td class="tdLarge noselect nonclickable left">{{venueName venueId}}</td>
|
||||
<td class="tdLarge noselect left"><i class="fa fa-times-circle fa-lg saleRemove clickable" aria-hidden="true"></i></td>
|
||||
<!--<a class="saleEdit" href="javascript:"><i class="fa fa-pencil-square-o fa-lg" aria-hidden="true"></i></a>/-->
|
||||
<!--{{else}}-->
|
||||
<!--<form class="editSaleForm" autocomplete="off">-->
|
||||
<!--<td><input name="amount" class="form-control" type="number" min="0" data-schema-key='amount' value="{{amount}}" required></td>-->
|
||||
<!--<td><input name="product" class="form-control" type="text" required/></td>-->
|
||||
<!--<td><input name="price" class="form-control" type="number" min="0" data-schema-key='currency' value="{{price}}" required></td>-->
|
||||
<!--<td>-->
|
||||
<!--<select name="measure" class="form-control" required>-->
|
||||
<!--{{#each measures}}-->
|
||||
<!--<option value="{{this._id}}">{{this.name}}</option>-->
|
||||
<!--{{/each}}-->
|
||||
<!--</select>-->
|
||||
<!--</td>-->
|
||||
<!--<td><input type="date" class="form-control" name="date" data-schema-key='date' value="{{date}}" required></td>-->
|
||||
<!--<td>-->
|
||||
<!--<select name="venue" class="form-control" required>-->
|
||||
<!--{{#each venues}}-->
|
||||
<!--<option value="{{this._id}}">{{this.name}}</option>-->
|
||||
<!--{{/each}}-->
|
||||
<!--</select>-->
|
||||
<!--</td>-->
|
||||
<!--<td><a class="editorSave" href="javascript:"><i class="fa fa-check-square-o fa-lg" aria-hidden="true"></i></a>/<a class="editorCancel" href="javascript:"><i class="fa fa-times-circle fa-lg" aria-hidden="true"></i></a></td>-->
|
||||
<!--</form>-->
|
||||
<!--{{/if}}-->
|
||||
<td class="tdLarge noselect nonclickable center">{{amount}}</td>
|
||||
<td class="tdLarge noselect nonclickable left">{{productName productId}}</td>
|
||||
<td class="tdLarge noselect nonclickable left">{{formatPrice price}}{{#if showTotalPrice amount}} ({{formatTotalPrice price amount}}){{/if}}</td>
|
||||
<td class="tdLarge noselect nonclickable left">{{measureName measureId}}</td>
|
||||
<td class="tdLarge noselect nonclickable left">{{formatDate date}}</td>
|
||||
<td class="tdLarge noselect nonclickable left">{{venueName venueId}}</td>
|
||||
<td class="tdLarge noselect left"><i class="fa fa-times-circle fa-lg saleRemove clickable" aria-hidden="true"></i></td>
|
||||
</tr>
|
||||
</template>
|
||||
|
||||
@@ -80,27 +59,27 @@
|
||||
</template>
|
||||
|
||||
<template name="InsertSale">
|
||||
<form id="insertSale" autocomplete="off">
|
||||
<div class="row">
|
||||
<div class="col-md-4 col-sm-6">
|
||||
<form class="insertSaleForm" autocomplete="off">
|
||||
<div class="grid">
|
||||
<div class="col-4-12">
|
||||
<div class="formGroupHeading">New Sale</div>
|
||||
<div class="form-group">
|
||||
<label for='InsertSaleDate' class='control-label'>Date</label>
|
||||
<label class='control-label'>Date</label>
|
||||
<input type="date" class="form-control" name="date" data-schema-key='date' required>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for='InsertSaleProduct' class='control-label'>Product</label>
|
||||
<label class='control-label'>Product</label>
|
||||
<input name="product" class="form-control" type="text" required/>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for='InsertSaleVenue' class='control-label'>Venue</label>
|
||||
<label class='control-label'>Venue</label>
|
||||
<input name="venue" class="form-control" type="text" required/>
|
||||
</div>
|
||||
</div>
|
||||
{{#each productMeasures}}
|
||||
{{>InsertSaleMeasure this}}
|
||||
{{/each}}
|
||||
<div class="col-md-12">
|
||||
<div class="col-1-1">
|
||||
<div class="form-group">
|
||||
<input type="submit" class="btn btn-success" value="Save Sale">
|
||||
</div>
|
||||
@@ -110,7 +89,7 @@
|
||||
</template>
|
||||
|
||||
<template name="InsertSaleMeasure">
|
||||
<div class="col-md-4 col-sm-6 insertSaleMeasure">
|
||||
<div class="col-2-12 insertSaleMeasure">
|
||||
<div class="formGroupHeading">{{name}}</div>
|
||||
<input type="hidden" class="measureId" value="{{this._id}}">
|
||||
<div class="form-group">
|
||||
@@ -123,7 +102,7 @@
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class='control-label'>Total</label>
|
||||
<input type="number" class="form-control total" name="total" tabindex="-1" data-schema-key='currency' value="{{total}}" readonly>
|
||||
<input type="number" class="form-control total" name="total" data-schema-key='currency' value="{{total}}" tabindex="-1" readonly>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
Reference in New Issue
Block a user