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

no print for cloud

Browse Source
This commit is contained in:
Yan
2017-12-12 18:51:13 +06:30
parent dcb3a37a81
commit c660097d28
14 changed files with 242 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/views/origami/home/show.html.erb
View File

@@ -389,7 +389,7 @@
<button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
<button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
<button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
<!-- <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button> -->
<button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
<button type="button" id="void" class="btn btn-block bg-blue waves-effect" active="<%= can? :overall_void, :void %>"> Void</button>
<% end %>
@@ -472,12 +472,12 @@
});
$('#re-print').click(function () {
var sale_id = $('#sale_id').val();
window.location.href = '/origami/' + sale_id + "/reprint"
// $('#re-print').click(function () {
// var sale_id = $('#sale_id').val();
// window.location.href = '/origami/' + sale_id + "/reprint"
return false;
});
// return false;
// });
// Add Other Charges
$('#other-charges').click(function () {
@@ -519,18 +519,18 @@
});
// Print for first bill
$("#first_bill").on('click', function () {
var sale_id = $('#sale_id').val();
var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
// $("#first_bill").on('click', function () {
// var sale_id = $('#sale_id').val();
// var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
$.ajax({
type: "GET",
url: ajax_url,
success: function (result) {
location.reload();
}
});
});
// $.ajax({
// type: "GET",
// url: ajax_url,
// success: function (result) {
// location.reload();
// }
// });
// });
// $('#pay').on('click', function () {
// var sale_id = $('#sale_id').val();

2
app/views/origami/rooms/show.html.erb
View File

@@ -369,7 +369,7 @@
<button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
<!-- <button type="button" class="btn bg-blue btn-block" id='move' disabled="">Move</button> -->
<!-- <button type="button" id="request_bills" class="btn bg-blue btn-block" disabled> Req.Bill</button> -->
<button type="button" id="first_bill" class="btn bg-blue btn-block">First Bill</button>
<!-- <button type="button" id="first_bill" class="btn bg-blue btn-block">First Bill</button> -->
<button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
<button type="button" id="void" class="btn bg-blue btn-block" > Void </button>
<% end %>

12
app/views/origami/sales/show.html.erb
View File

@@ -201,7 +201,7 @@
<% if @sale.sale_status != 'void' %>
<button type="button" id="void" class="btn bg-danger btn-block">VOID</button>
<% end %>
<button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button>
<!-- <button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button> -->
</div>
</div>
</div>
@@ -271,10 +271,10 @@ $('#back').on('click',function(){
});
});
$('#re-print').click(function() {
var sale_id = $('#sale_id').val();
window.location.href = '/origami/'+ sale_id + "/reprint"
// $('#re-print').click(function() {
// var sale_id = $('#sale_id').val();
// window.location.href = '/origami/'+ sale_id + "/reprint"
return false;
});
// return false;
// });
</script>