Pull from master

This commit is contained in:
San Wai Lwin
2018-08-20 11:26:07 +06:30
parent 3c2faf5970
commit d1852d24c3
28 changed files with 464 additions and 216 deletions

View File

@@ -176,12 +176,15 @@
<!-- OQS Buttons -->
<br>
<a href="<%= dashboard_path %>" class="btn btn-sm btn-block btn-default waves-effect" role="button" aria-haspopup="true"><i class="material-icons">reply</i> Back </a>
<% if ENV["SERVER_MODE"] != "cloud" %>
<button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
<button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>
<% if ENV["SERVER_MODE"] != "cloud" %>
<%end%>
</div>
</div>
<input type="hidden" id="server_mode" value="<%=ENV["SERVER_MODE"]%>">
<script type="text/javascript">
$(document).on('turbolinks:load', function() {