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

Merge branch 'adminbsb_material_ui'

Browse Source
This commit is contained in:
Aung Myo
2018-04-26 13:35:41 +06:30
parent 172c2136cc 3a85481dcd
commit 390c9b2dca
9 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/origami/dinga_controller.rb
View File

@@ -86,11 +86,12 @@ def create
# saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new
status, @sale = sale_payment.process_payment(saleObj, @user, cash, "dinga",account_no)
if status == true
status, @sale,@membership_data = sale_payment.process_payment(saleObj, @user, cash, "dinga",account_no)
if status == true && @membership_data["status"] == true
@out = true, "Success!"
else
@out =false, "Please try again payment!"
@out =false, @membership_data["message"]
end
end
end

6
app/controllers/origami/paymal_controller.rb
View File

@@ -88,11 +88,11 @@ def create
# saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new
status, @sale = sale_payment.process_payment(saleObj, @user, cash, "paymal",account_no)
if status == true
status, @sale,@membership_data = sale_payment.process_payment(saleObj, @user, cash, "paymal",account_no)
if status == true && @membership_data["status"] == true
@out = true, "Success!"
else
@out =false, "Please try again payment!"
@out =false, @membership_data["message"]
end
end
end

2
app/controllers/reports/receipt_no_controller.rb
View File

@@ -20,7 +20,7 @@ authorize_resource :class => false
payment_type = params[:payment_type]
@sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type)
@sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type)
@tax_profiles = TaxProfile.order('order_by asc')
@tax_profiles = TaxProfile.order('order_by asc').limit(2)
@from = from
@to = to
# get printer info