git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update OQS and cashier

Browse Source
This commit is contained in:
Aung Myo
2017-11-14 09:43:13 +06:30
parent 8db96beca0
commit f1a28d64e1
31 changed files with 378 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
app/views/oqs/edit/index.html.erb
View File

@@ -1,5 +1,5 @@
<div class="page-header">
<!-- <div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item active">OQS</li>
@@ -7,9 +7,9 @@
<%= link_to 'Back', oqs_root_path %>
</span>
</ol>
</div>
</div> -->
<div class="row">
<div class="col-md-12">
<div class="col-md-5">
<div class="card">
<div class="card-header">Update Quantity</div>
<div class="card-body">
@@ -32,36 +32,74 @@
</div>
</div> -->
<div class="row clearfix">
<div class="col-lg-2 col-md-2 col-sm-4 col-xs-5 form-control-label">
<label for="">Quantity :</label>
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-6 form-control-label">
<label for="">QTY :</label>
</div>
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-6">
<input type="text" name="qty_weight" class="text-right form-control" value="<%= @order_item[0].qty %>" />
<input type="text" name="qty_weight" class="text-center form-control qty" id="qty" value="<%= @order_item[0].qty %>" />
<!-- <input type="text" id="email_address_2" class="form-control" placeholder="Enter your email address"> -->
</div>
</div>
<div class="row clearfix">
<div class="col-lg-2 col-md-2 col-sm-4 col-xs-5 form-control-label">
<label for="">Remark :</label>
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 form-control-label">
<label class ="m-t-20">Remark :</label>
</div>
<div class="col-lg-10 col-md-10 col-sm-8 col-xs-7">
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-7">
<textarea name="remarks" class="form-control"></textarea>
<!-- <input type="text" id="email_address_2" class="form-control" placeholder="Enter your email address"> -->
</div>
</div>
<button id="qty-update" class="btn btn-info" data-id="<%= @order_item[0].order_items_id %>">Update</button>
<br><br>
<button id="qty-update" class="btn btn-info float-right" data-id="<%= @order_item[0].order_items_id %>">Update</button>
</div>
</div>
</div>
<div class="col-md-5">
<div class="m-t- p-l-20">
<div class="row">
<div class="col-lg-11 col-md-11 col-sm-11">
<div class="row bottom">
<div class="col-md-4 cashier_number border-left" data-value="1" data-type="num">1</div>
<div class="col-md-4 cashier_number border-left" data-value="2" data-type="num">2</div>
<div class="col-md-4 cashier_number border-left" data-value="3" data-type="num">3</div>
</div>
<div class="row bottom">
<div class="col-md-4 cashier_number border-left" data-value="4" data-type="num">4</div>
<div class="col-md-4 cashier_number border-left" data-value="5" data-type="num">5</div>
<div class="col-md-4 cashier_number border-left" data-value="6" data-type="num">6</div>
</div>
<div class="row bottom">
<div class="col-md-4 cashier_number border-left" data-value="7" data-type="num">7</div>
<div class="col-md-4 cashier_number border-left" data-value="8" data-type="num">8</div>
<div class="col-md-4 cashier_number border-left" data-value="9" data-type="num">9</div>
</div>
<div class="row bottom">
<div class="col-md-4 cashier_number border-left" data-value="0" data-type="num">0</div>
<div class="col-md-4 cashier_number red border-left" data-type="del">Del</div>
<div class="col-md-4 cashier_number orange border-left" data-type="clr">Clr</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-1">
<button type="button" class="btn btn-block btn-default waves-effect" id='back'>
<i class="material-icons m-t--10">reply</i>
Back
</button>
</div>
</div>
<script type="text/javascript">
$(document).ready(function(){
// Qty update for OQS Edit Controller
original_value = $('#qty').val();
$('#qty-update').on('click', function(){
var qty_weight = $("input[name='qty_weight']").val();
var remarks = $("textarea[name='remarks']").val();
@@ -77,6 +115,35 @@ $(document).ready(function(){
}
});
});
$('#back').on('click', function () {
window.location.href = '/oqs/';
})
// number key pad
$(document).on('click', '.cashier_number', function(event){
qty = $('#qty').val();
var input_value = $(this).attr("data-value");
var input_type = $(this).attr("data-type");
switch (input_type) {
case 'num':
if (original_value == qty){
$('#qty').val(input_value);
}else{
$('#qty').val(qty+input_value);
}
break;
break;
case 'clr':
$('#qty').val(original_value);
break;
case 'del' :
$('#qty').val(original_value);
break;
}
});
});
</script>

63
app/views/oqs/home/index.html.erb
View File

@@ -1,14 +1,14 @@
<div class="page-header">
<!-- <div class="page-header">
<ul class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item active"><%= t :OQS %></li>
<!-- <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li> -->
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<span class="float-right">
<%= link_to 'Back', dashboard_path %>
</span>
</ul>
</div>
</div> -->
<!-- Column One -->
<div class="row clearfix">
@@ -83,32 +83,33 @@
%>
<div class="card queue_station">
<div class="card-block">
<!-- <h5 class="card-"> -->
<span class="order-zone-type font-14"><%= qid.type %> - </span>
<span class="order-zone font-14"><%= qid.zone %></span>
<small class="pull-right font-14"><%= qid.order_id %></small>
<!-- </h5> -->
<!-- <h5> -->
<div class="row">
<span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
<span class="order-zone hidden font-13"><%= qid.zone %></span>
<span class="col-md-8"><small class="float-right font-13"><%= qid.order_id %></small></span>
</div>
<p class="m-b--10">
<span class="order-item font-16">
<%= qid.item_name %>
</span> [x
<span class="order-qty">
<%= qid.qty %>
</span> ]
<!-- </h5> -->
</p>
<p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p>
<p class="card-text">
<span class="text-muted">Order at
<span class="order-at">
<span class="card-text">
<span class="text-muted">Order at -
<span class="order-at font-13">
<%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
</span> -
<span class="order-by">
<%= qid.item_order_by %>
</span> <br>
Order By - <span class="order-by font-13">
<%= qid.item_order_by %>
</span>
</span>
</p>
</span>
<p class="hidden order-status">completed</p>
<p class="hidden order-customer"><%= qid.customer_name %></p>
<p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>
@@ -133,27 +134,27 @@
<div class="col-lg-3 col-md-3 col-sm-3">
<div class="card" >
<div class="card-header">
<div><strong id="order-title">ORDER DETAILS - Table</strong></div>
<div><strong id="order-title">ORDER DETAILS</strong></div>
</div>
<div class="card-block">
<div class="card-title">
<table class="table">
<table class="">
<thead>
<tr>
<th style="width:; text-align:left">Order By</th>
<th style="width:; text-align:right">Order At</td>
<th style="width:; text-align:right">Customer</td>
</tr>
</thead>
<tbody>
<tr>
<td id="order-by" style="width:33%; text-align:left"></td>
<td id="order-at" style="width:33%; text-align:right"></td>
<td id="order-customer" style="width:33%; text-align:right"></td>
<th style="width:33%; text-align:">Order By</th>
<th style="width:33%; text-align:">Order At</th>
<!-- <th style="width:33%; text-align:">Customer</th> -->
</tr>
</thead>
<tbody>
<tr>
<td id="order-by" style="width:33%; text-align:"></td>
<td id="order-at" style="width:33%; text-align:"></td>
<!-- <td id="order-customer" style="width:33%; text-align:"></td> -->
</tr>
<tr>
<td><strong>Table/Room</strong></td>
<td id="order-from" colspan="2"></td>
<td><strong class="hidden cus_name">Customer</strong></td>
<td id="order-customer" colspan="2"></td>
</tr>
</tbody>
</table>