diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 60bcbcc3..e330015a 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -797,7 +797,7 @@ $(function() {
success:function(result){
console.log(result)
if (result.status) {
- window.location.href = "/origami/sale/"+result.data["sale_id"]+"/payment"
+ window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
}
// window.location.href = "/origami/quick_service"
}
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index b601a0e6..a6e9c737 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -136,9 +136,6 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
@status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
result = {:status=> @status, :data => @sale }
render :json => result.to_json
- puts @status
- puts @sale.to_json
- puts "ssssssssssssssssssss"
end
end
diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb
index 404b1506..d70ef870 100755
--- a/app/controllers/origami/credit_payments_controller.rb
+++ b/app/controllers/origami/credit_payments_controller.rb
@@ -1,6 +1,7 @@
class Origami::CreditPaymentsController < BaseOrigamiController
def index
@sale_id = params[:sale_id]
+ @cashier_type = params[:type]
# limit visa_amount
sale_data = Sale.find_by_sale_id(@sale_id)
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index b8c7e7e0..e17c773e 100755
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -2,7 +2,7 @@ class Origami::JcbController < BaseOrigamiController
def index
@sale_id = params[:sale_id]
-
+ @cashier_type = params[:type]
# limit jcb_amount
sale_data = Sale.find_by_sale_id(@sale_id)
total = sale_data.grand_total
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index b3813577..95710f11 100755
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -2,7 +2,7 @@ class Origami::MasterController < BaseOrigamiController
def index
@sale_id = params[:sale_id]
-
+ @cashier_type = params[:type]
# limit master_amount
sale_data = Sale.find_by_sale_id(@sale_id)
total = sale_data.grand_total
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index 7b7ef5a0..6eb2a0a0 100755
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -1,7 +1,7 @@
class Origami::MpuController < BaseOrigamiController
def index
@sale_id = params[:sale_id]
-
+ @cashier_type = params[:type]
# limit mpu_amount
sale_data = Sale.find_by_sale_id(@sale_id)
total = sale_data.grand_total
diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb
index 16c7edae..e4a39662 100755
--- a/app/controllers/origami/others_payments_controller.rb
+++ b/app/controllers/origami/others_payments_controller.rb
@@ -2,6 +2,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController
def index
@membership_rebate_balance = 0
@sale_id = params[:sale_id]
+ @cashier_type = params[:type]
@payment_method_setting = PaymentMethodSetting.all
@rebate = MembershipSetting.find_by_rebate(1)
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 6fa61bc7..0e3245ca 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -146,6 +146,7 @@ class Origami::PaymentsController < BaseOrigamiController
def show
sale_id = params[:sale_id]
+ @cashier_type = params[:type]
@member_discount = MembershipSetting.find_by_discount(1)
diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb
index 5a15aa8c..4a4944ca 100755
--- a/app/controllers/origami/paypar_payments_controller.rb
+++ b/app/controllers/origami/paypar_payments_controller.rb
@@ -1,6 +1,7 @@
class Origami::PayparPaymentsController < BaseOrigamiController
def create
sale_id = params[:sale_id]
+ @cashier_type = params[:type]
redeem_amount = params[:redeem_amount]
membership_id = params[:membership_id]
payment_method = "paypar"
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 2fdedf32..4b0c70f8 100755
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -2,6 +2,7 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
def index
@sale_id = params[:sale_id]
payment_method = params[:payment_method]
+ @cashier_type = params[:type]
@membership_rebate_balance=0
sale_data = Sale.find_by_sale_id(@sale_id)
diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb
index fc15b7f5..7f084fd4 100644
--- a/app/controllers/origami/unionpay_controller.rb
+++ b/app/controllers/origami/unionpay_controller.rb
@@ -1,7 +1,7 @@
class Origami::UnionpayController < BaseOrigamiController
def index
@sale_id = params[:sale_id]
-
+ @cashier_type = params[:type]
# limit unionpay_amount
sale_data = Sale.find_by_sale_id(@sale_id)
total = sale_data.grand_total
@@ -23,8 +23,6 @@ class Origami::UnionpayController < BaseOrigamiController
others = others + sale_payment.payment_amount
end
end
- puts "unionpaycount"
- puts @unionpaycount
@can_unionpay = total - @unionpaycount - others
@member_discount = MembershipSetting.find_by_discount(1)
@sub_total = sale_data.total_amount
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index b872aec3..f04ec001 100755
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -1,7 +1,7 @@
class Origami::VisaController < BaseOrigamiController
def index
@sale_id = params[:sale_id]
-
+ @cashier_type = params[:type]
# limit visa_amount
sale_data = Sale.find_by_sale_id(@sale_id)
total = sale_data.grand_total
diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb
index 82e66d7e..827ae6d4 100755
--- a/app/views/origami/credit_payments/index.html.erb
+++ b/app/views/origami/credit_payments/index.html.erb
@@ -115,6 +115,7 @@
+ <%=@cashier_type%>