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

update discount message

Browse Source
This commit is contained in:
Aung Myo
2017-07-11 15:45:01 +06:30
parent 1e329d1c5f
commit 28c51300cf
2 changed files with 64 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/origami/discounts_controller.rb
View File

@@ -185,10 +185,14 @@ class Origami::DiscountsController < BaseOrigamiController
table_type = DiningFacility.find(table_id).type
# Re-calc All Amount in Sale
if response["status"] == true
if response["status"] == true
sale.compute_by_sale_items(sale_id, sale.sale_items, response["rebate_earned"].to_f,"member_discount")
result = {:status=> "Success", :table_id => table_id, :table_type => table_type,:table_type => table_type }
end
if response[:status] == false
result = {:status=> "Success", :table_id => table_id, :table_type => table_type,:table_type => table_type,:url_status => response[:status],:url_message => response[:message] }
end
result = {:status=> "Success", :table_id => table_id, :table_type => table_type,:table_type => table_type,:url_status => response[:status],:url_message => response[:message] }
render :json => result.to_json
end

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

@@ -491,42 +491,66 @@ $(document).ready(function(){
// 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){
if($('.accounts-type').hasClass('selected-account') == true){
if (result.url_status == false) {
status = result.url_message
}else{
status = result.status
}
var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types };
$.confirm({
title: 'Infomation!',
content: status,
buttons: {
confirm: {
text: 'Ok',
btnClass: 'btn-green',
action: function(){
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){
}
});
});
if (result.url_status == false) {
status = result.url_message
type = 'red'
btn_color = 'btn-red'
}else{
status = result.status
type = ''
btn_color = 'btn-green'
}
$.confirm({
title: 'Infomation!',
content: status,
columnClass: 'small',
type: type,
buttons: {
confirm: {
text: 'Ok',
btnClass: btn_color,
action: function(){
if(result.table_type == "Table"){
window.location.href = "/origami/table/" + result.table_id
}
else {
window.location.href = "/origami/room/" + result.table_id
}
}
}
}
});
}
});
}else{
$.confirm({
title: 'Alert !',
content: 'Please Select Account',
type: 'red',
typeAnimated: true,
buttons: {
confirm: {
text: 'Ok',
btnClass: 'btn-danger',
}
}
});
}
});//end member discount
});
/* Remove Selection */