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

Hotfix 0.7.8 #141

Merged
merged 8 commits into from
Apr 28, 2016
Merged

Hotfix 0.7.8 #141

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e559ed4
minor cleanup to prevent the assign identifier quartz job from throwi…
jmiranda Apr 21, 2016
f14f1e3
removed unnecessarily verbose logging from inventory service
jmiranda Apr 21, 2016
d8b9e6a
Purchase Order UI changes to make it more consistent with other pages
jmiranda Apr 21, 2016
5ff9422
fixed #133: added ability to import order line items into an existing…
jmiranda Apr 22, 2016
f0eafbe
fixed #50: Illegal attempt to associate a collection with two open se…
jmiranda Apr 22, 2016
532b47e
Minor enhancements to make UI a little more consistent across entire app
jmiranda Apr 22, 2016
0c91983
bumped app version to 0.7.8
jmiranda Apr 22, 2016
238af64
removed annoying inventory sampling report constraint
jmiranda Apr 22, 2016
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
Purchase Order UI changes to make it more consistent with other pages
  • Loading branch information
@jmiranda
jmiranda committed Apr 21, 2016
commit d8b9e6aa276a61a741c827148c9c581afb56ecbf
19 changes: 10 additions & 9 deletions grails-app/views/order/_filters.gsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@

<div>
<g:form id="listForm" action="list" method="GET">
<g:hiddenField name="type" value="${params.type}"/>
<g:hiddenField name="max" value="${params.max?:10 }"/>
<g:hiddenField name="max" value="${params.max ?: 10}"/>
<div class="box">
<h2><warehouse:message code="default.filters.label"/></h2>
<table>
Expand Down Expand Up @@ -49,8 +48,8 @@
<div>
<g:select id="status" name="status"
from="${org.pih.warehouse.order.OrderStatus.list()}" class="chzn-select-deselect"
optionValue="${{format.metadata(obj:it)}}" value="${status}"
noSelection="['':warehouse.message(code:'default.all.label')]" />
optionValue="${{ format.metadata(obj: it) }}" value="${status}"
noSelection="['': warehouse.message(code: 'default.all.label')]"/>

</div>
</td>
Expand All @@ -74,19 +73,20 @@
<g:select id="origin" name="origin" class="chzn-select-deselect"
from="${suppliers}"
optionKey="id" optionValue="name" value="${origin}"
noSelection="['':warehouse.message(code:'default.all.label')]" />
noSelection="['': warehouse.message(code: 'default.all.label')]"/>
</div>
</td>
</tr>

<tr class="prop">
<td>
<label><warehouse:message code="order.orderedBy.label"/></label>

<div>
<g:select id="orderedById" name="orderedById" class="chzn-select-deselect"
from="${orderedByList}"
optionKey="id" optionValue="name" value="${params?.orderedById}"
noSelection="['':warehouse.message(code:'default.all.label')]" />
noSelection="['': warehouse.message(code: 'default.all.label')]"/>
</div>
</td>
</tr>
Expand All @@ -96,7 +96,8 @@

<label class="block">${warehouse.message(code: 'default.lastUpdateAfter.label', default: 'Last updated after')}</label>
<div>
<g:jqueryDatePicker id="statusStartDate" name="statusStartDate" placeholder="Start date" size="40" numberOfMonths="2" changeMonthAndYear="false"
<g:jqueryDatePicker id="statusStartDate" name="statusStartDate" placeholder="Start date"
size="40" numberOfMonths="2" changeMonthAndYear="false"
value="${statusStartDate}" format="MM/dd/yyyy"/>
</div>
<a href="javascript:void(0);" id="clearStartDate">clear</a>
Expand All @@ -106,12 +107,12 @@
<td>
<label class="block">${warehouse.message(code: 'default.lastUpdatedBefore.label', default: 'Last updated before')}</label>
<div>
<g:jqueryDatePicker id="statusEndDate" name="statusEndDate" placeholder="End date" size="40" numberOfMonths="2" changeMonthAndYear="true"
<g:jqueryDatePicker id="statusEndDate" name="statusEndDate" placeholder="End date" size="40"
numberOfMonths="2" changeMonthAndYear="true"
value="${statusEndDate}" format="MM/dd/yyyy"/>
</div>
<a href="javascript:void(0);" id="clearEndDate">clear</a>


</td>
</tr>

Expand Down
30 changes: 14 additions & 16 deletions grails-app/views/order/_summary.gsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</g:if>
--%>

<div class="summary box">
<div id="order-summary" class="summary">
<g:if test="${orderInstance?.id}">
<g:set var="isAddingComment" value="${request.request.requestURL.toString().contains('addComment')}"/>
<g:set var="isAddingDocument" value="${request.request.requestURL.toString().contains('addDocument')}"/>
Expand Down Expand Up @@ -90,48 +90,46 @@
<tr>
<td>
<div class="order-number">
<label class="fade"><warehouse:message code="order.orderNumber.label"/></label>
<b>${orderInstance?.orderNumber}</b>
<label><warehouse:message code="order.orderNumber.label"/></label>
${orderInstance?.orderNumber}
</div>
</td>
<td>
<div class="ordered-date">
<label class="fade"><warehouse:message code="order.dateOrdered.label"/></label>
<b><format:date obj="${orderInstance?.dateOrdered}"/></b>
<label><warehouse:message code="order.dateOrdered.label"/></label>
<format:date obj="${orderInstance?.dateOrdered}"/>
</div>
</td>
<td>
<g:if test="${orderInstance?.orderedBy }">
<div class="ordered-by">
<label class="fade"><warehouse:message code="order.orderedBy.label"/></label>
<b>${orderInstance?.orderedBy?.name }</b>
<label><warehouse:message code="order.orderedBy.label"/></label>
${orderInstance?.orderedBy?.name }
</div>
</g:if>
</td>
</tr>
<tr>
<td>
<div class="total-price">
<label class="fade"><warehouse:message code="order.totalPrice.label"/></label>
<b><g:formatNumber number="${orderInstance?.totalPrice()?:0 }"/>
${grailsApplication.config.openboxes.locale.defaultCurrencyCode}</b>
<label><warehouse:message code="order.totalPrice.label"/></label>
<g:formatNumber number="${orderInstance?.totalPrice()?:0 }"/>
${grailsApplication.config.openboxes.locale.defaultCurrencyCode}
</div>


</td>
<td>
<g:if test="${orderInstance?.destination }">
<div class="destination">
<label class="fade"><warehouse:message code="order.destination.label"/></label>
<b>${orderInstance?.destination?.name }</b>
<label><warehouse:message code="order.destination.label"/></label>
${orderInstance?.destination?.name }
</div>
</g:if>

</td>
<td>
<div class="origin">
<label class="fade"><warehouse:message code="order.origin.label"/></label>
<b>${orderInstance?.origin?.name }</b>
<label><warehouse:message code="order.origin.label"/></label>
${orderInstance?.origin?.name }
</div>

</td>
Expand Down