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

some wrong in memberdiscount and no pay if any card payment

Browse Source
This commit is contained in:
Yan
2017-11-28 15:57:19 +06:30
parent 2e1ba833e8
commit 93db6130a1
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,7 +161,7 @@ class Origami::DiscountsController < BaseOrigamiController
sale = Sale.find(sale_id) sale = Sale.find(sale_id)
# Check for Card Payment # Check for Card Payment
is_card_payment = SaleItem.get_sale_payments_by_card(sale.sale_payments) is_card_payment = SalePayment.get_sale_payments_by_card(sale.sale_payments)
if is_card_payment != true if is_card_payment != true
account_types = Account.where("discount=?",true) account_types = Account.where("discount=?",true)

11
app/models/sale_item.rb
View File

@@ -145,17 +145,6 @@ class SaleItem < ApplicationRecord
return price,type return price,type
end end
# Check for Card Payment
def self.get_sale_payments_by_card(sale_payments)
# Check for Card Payment
sale_payments.each do |sp|
if sp.payment_method == "jcb" || sp.payment_method == "mpu" || sp.payment_method == "visa" || sp.payment_method == "master"
return true;
end
end
end
# def self.get_overall_discount(sale_id) # def self.get_overall_discount(sale_id)
# price = 0.0 # price = 0.0
# item=SaleItem.where("product_code=?", sale_id) # item=SaleItem.where("product_code=?", sale_id)

12
app/models/sale_payment.rb
View File

@@ -155,6 +155,16 @@ class SalePayment < ApplicationRecord
end end
# Check for Card Payment
def self.get_sale_payments_by_card(sale_payments)
# Check for Card Payment
sale_payments.each do |sp|
if sp.payment_method == "jcb" || sp.payment_method == "mpu" || sp.payment_method == "visa" || sp.payment_method == "master"
return true;
end
end
end
private private
def cash_payment def cash_payment
payment_status = false payment_status = false
@@ -497,8 +507,6 @@ class SalePayment < ApplicationRecord
end end
private private
def generate_custom_id def generate_custom_id
self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI") self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI")

2
app/views/origami/visa/index.html.erb
View File

@@ -167,7 +167,7 @@
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "/origami/" + sale_id + "/member_discount", url: "/origami/" + sale_id + "/member_discount",
data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':false }, data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
// success:function(result){ // success:function(result){
// } // }
}); });