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

update back buttom in cashier default

Browse Source
This commit is contained in:
Aung Myo
2017-11-14 15:33:06 +06:30
parent 6f06e7a9d7
commit 937576856f
22 changed files with 154 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/origami/in_duties/_assign_in_duty.html.erb
View File

@@ -16,7 +16,7 @@
<%= f.button :submit, "Update", :class => 'btn btn-primary ', :disabled => '', :id => 'update' %>
<%= f.button :button, "Reset", :class => 'btn btn-danger ', :id => 'reset' %>
<button type="button" class="btn btn-inverse pull-right" id='back'><i class="fa fa-arrow-left"></i> Back</button>
<button type="button" class="btn btn-inverse pull-right" id='back'> <button type="button" class="btn bg-default btn-block" onclick="window.location.href = "origami_index_in_duty_path(@table.id)"><i class="material-icons">reply</i> Back </button>Back</button>
</div>
<% end %>

10
app/views/origami/in_duties/index_in_duty.html.erb
View File

@@ -49,14 +49,14 @@
<%= paginate @duties_in %>
</div>
</div>
<div class="col-md-3 partial">
<%= render 'form', in_duty: @in_duty, table: @table %>
</div>
<div class="col-md-1">
<br>
<button type="button" class="form-control btn btn-default btn-block" id='back'>Back</button>
<button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami/<%=@table.type.downcase%>/<%=@table.id%>'"><i class="material-icons m-t--5">reply</i> Back </button>
<button class="form-control btn btn-info btn-block" id="reset">New</button>
</div>
</div>
@@ -103,9 +103,9 @@
});
});
$('#back').on('click', function () {
window.location.href = '/origami/table/' + "<%= @table.id %>";
});
// $('#back').on('click', function () {
// window.location.href = '/origami/table/' + "<%= @table.id %>";
// });
$('#reset').click(function () {
location.reload();
/*var url = "<%= origami_index_in_duty_path %>";