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

update shift close print

Browse Source
This commit is contained in:
Aung Myo
2017-07-01 20:05:26 +06:30
parent 740f585a31 b0ec03f591
commit c26b80066b
20 changed files with 379 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/views/origami/cash_ins/new.html.erb
View File

@@ -24,26 +24,21 @@
<button class='btn btn-primary payment-type' data-id='jcb' id='jcb'>JCB</button>
</td>
</tr>
<tr>
<td> Reference Number
</td>
<td><input type='text' id='payment_method_reference'/></td>
</tr>
<tr>
<td> Amount
</td>
<td><input type='text' id='amount'/></td>
</tr>
</table>
<div class='row'>
<div class='col-md-2'></div>
<div class='col-md-2'>Reference Number </div>
<div class='col-md-4'><input type='text' id='payment_method_reference'/> </div>
</div>
<br>
<div class='row'>
<div class='col-md-2'></div>
<div class='col-md-2'>Amount</div>
<div class='col-md-4'><input type='text' id='amount'/></div>
</div>
<br><br>
<div class='row'>
<div class='col-md-3'></div>
<div class='col-md-4'><button class='btn btn-primary btn-lg' id='cash_in' style='width:200px;'> Cash In</button></div>
</div>
</div>
<div class="col-lg-1 col-md-1 col-sm-1">
<button class='btn btn-primary ' id='cash_in' style='width:100px;'> Back </button>
<button type="button" class="btn btn-primary btn-block" id='back'> Back </button>
<button type="button" class="btn btn-primary btn-block" id='cash_in'> Cash In </button>
</div>
</div>
@@ -76,4 +71,7 @@ $('#cash_in').on('click',function(){
}
});
})
$('#back').on('click',function(){
window.location.href = '/origami';
})
</script>

21
app/views/origami/cash_outs/new.html.erb
View File

@@ -1,6 +1,8 @@
<h2>Payment Debit</h2>
<div class='row'>
<div class='col-md-9'>
<div class="col-lg-11 col-md-11 col-sm-11">
<h2>Payment Debit</h2>
<table class='table table-striped'>
<tr>
<td> Payment Reference
@@ -20,13 +22,12 @@
</table>
</div>
<div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-primary btn-block" id='back'> Back </button>
<button type="button" class="btn btn-primary btn-block" id='cash_out'> Cash Out </button>
</div>
</div>
</div>
<br><br>
<div class='row'>
<div class='col-md-3'></div>
<div class='col-md-4'><button class='btn btn-primary btn-lg' id='cash_out'> Cash Out</button></div>
</div>
<script>
$('#cash_out').on('click',function(){
@@ -41,4 +42,8 @@ $('#cash_out').on('click',function(){
}
});
})
$('#back').on('click',function(){
window.location.href = '/origami';
})
</script>

6
app/views/origami/payments/show.html.erb
View File

@@ -194,10 +194,10 @@
<div class="col-md-4" id="mastercount">0.0</div>
</div>
<% end %>
<hr class="style2">
<br>
<div class="row">
<div class="col-md-8">Balance</div>
<div class="col-md-4"><span id='balance'><%= @sale_data.grand_total %></span></div>
<div class="col-md-8"><strong style="font-size:18px;">Balance</strong></div>
<div class="col-md-4"><strong style="font-size:18px;"><span id='balance'><%= @sale_data.grand_total %></span></strong></div>
</div>
<br>

17
app/views/origami/sale_edit/edit.html.erb
View File

@@ -49,18 +49,18 @@
<tr>
<td><%= count %></td>
<td class='item-name'><%= sale_item.product_name %></td>
<% if sale_item.remark != 'void' %>
<td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" /></td>
<td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" /></td>
<% if sale_item.remark != 'void' && sale_item.remark != 'edit' %>
<td class='item-attr-edit'><input id="<%= sale_item.id%>_qty" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" /></td>
<td class='item-attr-edit'><input id="<%= sale_item.id%>_price" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" /></td>
<td class='item-attr'>
<button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-sm update'>Update</button>
<button data-id ="<%= sale_item.id %>" class='btn btn-danger btn-sm void'>Void</button></td>
</td>
<% elsif sale_item.qty.to_i < 0 %>
<% elsif sale_item.qty.to_i < 0 || sale_item.remark == 'edit' %>
<td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" disabled/></td>
<td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" disabled/></td>
<td class='item-attr'>
<button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-sm cancel'>Cancel Void</button>
<button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-sm cancel'>Cancel Void/Update</button>
</td>
<% else %>
<td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" disabled/></td>
@@ -101,11 +101,14 @@
$(document).ready(function(){
$(".update").on('click',function() {
var sale_item_id = $(this).attr('data-id');
var ajax_url = "/origami/item_void";
var qty = $('#'+sale_item_id + "_qty").val();
var price = $('#'+ sale_item_id + "_price").val();
console.log(qty + "|" + price)
var ajax_url = "/origami/item_edit";
$.ajax({
type: "POST",
url: ajax_url,
data: 'order_id='+ order_id,
data: 'sale_item_id='+ sale_item_id + "&update_qty="+qty + "&update_price="+ price,
success:function(result){
location.reload();
}

83
app/views/origami/shifts/new.html.erb
View File

@@ -1,16 +1,23 @@
<h1>Open Cashier</h1>
<br>
<div class="row">
<div class="col-md-12">
</div>
</div>
<div class="row">
<div class="col-md-4">
<table class='table table-striped'>
<tr>
<th>Cashier Terminal</th>
<th>
<select class='form-control' id='cashier_terminal'>
<% @terminal.each do |ter| %>
<option value="<%= ter.id %>"><%= ter.name %></option>
<% end %>
</select>
</th>
</tr>
<% @float.each do |float| %>
<tr>
<th><%= float.name %></th>
<th><input class='float-value' type='text' data-value ="<%= float.value %>" value='' /></th>
<th><input class='float-value' type='text' data-value ="<%= float.value %>" value='0' id='<%= float.value %>'></input></th>
</tr>
<% end %>
<tr>
@@ -18,12 +25,7 @@
<th><div id='total'></div></th>
</tr>
</table>
<div class="row">
<div class='col-md-4'></div>
<div class='col-md-2'>
<button class='btn btn-primary' id='open_cashier'>Open Cashier</button>
</div>
</div>
</div>
<div class='col-md-8'>
<div class="row">
@@ -49,9 +51,9 @@
<div class=" cashier_number left" data-value="00" data-type="num">00</div>
</div>
<div class="row bottom">
<div class=" cashier_number red" data-type="del" >Del</div>
<div class=" cashier_number orange left" data-type="clr">Clr</div>
<div class=" cashier_number purple left" data-type="ent">Ent</div>
<div class=" cashier_number orange " data-type="clr">Clr</div>
<div class=" cashier_number left" data-type='ent' >Calculate</div>
<div class=" cashier_number purple left" id="open_cashier">Open Cashier</div>
</div>
</div>
@@ -60,19 +62,58 @@
</div>
<script>
var total = 0
$(document).on('focusout', '.float-value', function(event){
var input_type = $(this).attr("data-value");
var count = $(this).val();
total += input_type * count
$('#total').text(total)
var float_value = ""
var total = 0
$(document).on('focusout', '.float-value', function(event){
float_value = $(this).attr("data-value");
$(document).on('click', '.cashier_number', function(event){
if(event.handled !== true) {
var input_type = $(this).attr("data-type");
switch (input_type) {
case 'num':
var input_value = $(this).attr("data-value");
var original = $('#'+float_value).val();
if (original == "0"){
$('#'+float_value).val(input_value);
}else{
$('#'+float_value).val(original + input_value);
}
break;
case 'clr':
$('#'+float_value).val("0");
break;
case 'ent':
var sum = 0
<%
sum = 0
@float.each do |float|
%>
var float = "<%= float.value %>"
console.log(float)
var cal = $('#'+ float).val() * float
sum += cal;
<%
end
%>
total = sum
$('#total').text(total)
break;
}
event.handled = true;
} else {
return false;
}
});
})
$('#open_cashier').on('click',function(){
var cashier_terminal = $('#cashier_terminal').val();
var amount = $('#total').text();
$.ajax({type: "POST",
url: "<%= origami_shifts_path %>",
data: "opening_balance=" + amount,
data: "opening_balance=" + amount + "&cashier_terminal="+ cashier_terminal,
success:function(result){
if(result){
window.location.href = '/origami';