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

remove deving member dis

Browse Source
This commit is contained in:
Yan
2017-07-07 17:33:14 +06:30
parent 3fe0f708bd
commit 09e202bb70
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/views/origami/discounts/index.html.erb
View File

@@ -190,8 +190,8 @@
<button id="remove-item-discount" class="btn btn-warning btn-block action-btn">RemoveItem Discount</button>
<button id="remove-all" class="btn btn-warning btn-block action-btn">Remove All</button>
<button id="pay-discount" class="btn btn-danger btn-block action-btn">Enter</button>
<hr />
<button id="member-discount" class="btn btn-success btn-block action-btn">Member Discount</button>
<!-- <hr />
<button id="member-discount" class="btn btn-success btn-block action-btn">Member Discount</button> -->
</div>
</div>
</div>
@@ -422,31 +422,31 @@ $(document).ready(function(){
});
// Pay Discount for membership
$("#member-discount").on('click', function(e){
e.preventDefault();
var sale_id = $('#sale-id').text();
var sub_total = $('#order-sub-total').text();
var ajax_url = "/origami/" + sale_id + "/member_discount";
// $("#member-discount").on('click', function(e){
// e.preventDefault();
// var sale_id = $('#sale-id').text();
// var sub_total = $('#order-sub-total').text();
// var ajax_url = "/origami/" + sale_id + "/member_discount";
// Selected Account
var account_types = JSON.stringify(get_selected_account_types());
var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types };
// // Selected Account
// var account_types = JSON.stringify(get_selected_account_types());
// var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types };
$.ajax({
type: "POST",
url: ajax_url,
data: params,
success:function(result){
alert("Successfully Discount!");
if(result.table_type == "Table"){
window.location.href = "/origami/table/" + result.table_id
}
else {
window.location.href = "/origami/room/" + result.table_id
}
}
});
});
// $.ajax({
// type: "POST",
// url: ajax_url,
// data: params,
// success:function(result){
// alert("Successfully Discount!");
// if(result.table_type == "Table"){
// window.location.href = "/origami/table/" + result.table_id
// }
// else {
// window.location.href = "/origami/room/" + result.table_id
// }
// }
// });
// });
});
/* Remove Selection */

2
config/routes.rb
View File

@@ -105,7 +105,7 @@ Rails.application.routes.draw do
post "/:id/remove_discount_items" => "discounts#remove_discount_items"
# Discount for Member
post "/:id/member_discount" => "discounts#member_discount"
# post "/:id/member_discount" => "discounts#member_discount"
get "/:id/request_bills" => "request_bills#print",:as => "request_bill"
get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' }