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-05-29 10:44:49 +06:30
parent 089630616d a062c5574a
commit 3527ef17d9
4 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/origami/payments_controller.rb
View File

@@ -164,6 +164,7 @@ class Origami::PaymentsController < BaseOrigamiController
if customer.membership_id != nil && rebate && credit_data.nil?
member_info = Customer.get_member_account(customer)
if member_info["status"] == true
rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no)
current_balance = SaleAudit.paymal_search(sale_id)

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

@@ -1,8 +1,8 @@
class Reports::ReceiptNoController < BaseReportController
authorize_resource :class => false
def index
@payments = [["All Payment",''], ["Cash Payment","cash"], ["Credit Payment","creditnote"], ["FOC Payment","foc"], ["Other Payment","card"]]
@payments = [["All Payment",''], ["Cash Payment","cash"], ["Credit Payment","creditnote"], ["FOC Payment","foc"]]
@payment_method = PaymentMethodSetting.all
from, to = get_date_range_from_params
@shift_sale_range = ''