fix discount with selected
This commit is contained in:
@@ -124,7 +124,8 @@ class Origami::DiscountsController < BaseOrigamiController
|
||||
# Member Discount
|
||||
def member_discount
|
||||
sale_id = params[:sale_id]
|
||||
account_types = JSON.parse(params[:account_types])
|
||||
# account_types = JSON.parse(params[:account_types])
|
||||
account_types = Account.where("discount=?",true)
|
||||
sub_total = params[:sub_total]
|
||||
sale = Sale.find(sale_id)
|
||||
price = SaleItem.calculate_price_by_accounts(sale.sale_items)
|
||||
@@ -133,7 +134,7 @@ class Origami::DiscountsController < BaseOrigamiController
|
||||
|
||||
account_types.each do |at|
|
||||
price.each do |pc|
|
||||
if pc[:name].to_s == at["name"].to_s && pc[:price]>0
|
||||
if pc[:name] == at.title && pc[:price]>0
|
||||
str={type:pc[:name],amount:pc[:price]}
|
||||
arr.push(str)
|
||||
end
|
||||
|
||||
@@ -497,11 +497,13 @@ $(document).ready(function(){
|
||||
var ajax_url = "/origami/" + sale_id + "/member_discount";
|
||||
|
||||
// Selected Account
|
||||
var account_types = JSON.stringify(get_selected_account_types());
|
||||
//var account_types = JSON.stringify(get_selected_account_types());
|
||||
|
||||
if($('.accounts-type').hasClass('selected-account') == true){
|
||||
// if($('.accounts-type').hasClass('selected-account') == true){
|
||||
|
||||
var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types };
|
||||
// var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types };
|
||||
|
||||
var params = {'sale_id':sale_id, 'sub_total':sub_total };
|
||||
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
@@ -541,16 +543,17 @@ $(document).ready(function(){
|
||||
|
||||
}
|
||||
});
|
||||
}else{
|
||||
$.alert({
|
||||
title: 'Alert!',
|
||||
content: 'Please Select Account',
|
||||
type: 'red',
|
||||
typeAnimated: true,
|
||||
btnClass: 'btn-danger',
|
||||
});
|
||||
// }
|
||||
// else{
|
||||
// $.alert({
|
||||
// title: 'Alert!',
|
||||
// content: 'Please Select Account',
|
||||
// type: 'red',
|
||||
// typeAnimated: true,
|
||||
// btnClass: 'btn-danger',
|
||||
// });
|
||||
|
||||
}
|
||||
// }
|
||||
|
||||
});//end member discount
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user