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

update add subcategory in addorder

Browse Source
This commit is contained in:
Aung Myo
2017-12-13 13:18:53 +06:30
parent f908c8e036
commit f497957a56
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/addorder.js
View File

@@ -949,7 +949,7 @@ $(function() {
$(sub_category).removeClass('hidden'); $(sub_category).removeClass('hidden');
for(var i in data) { for(var i in data) {
row = '<li class="menu_category" data-id="'+data[i].id+'">' row = '<li class="menu_category fadeInTop animated" data-id="'+data[i].id+'">'
+'<a class="nav-link" data-toggle="tab" href="" role="tab">'+ data[i].name+'</a>' +'<a class="nav-link" data-toggle="tab" href="" role="tab">'+ data[i].name+'</a>'
+'</li>' ; +'</li>' ;
$(sub_category).append(row); $(sub_category).append(row);

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

@@ -31,6 +31,7 @@ class Origami::PaymentsController < BaseOrigamiController
rebate = MembershipSetting.find_by_rebate(1) rebate = MembershipSetting.find_by_rebate(1)
if customer.membership_id != nil && rebate if customer.membership_id != nil && rebate
member_info = Customer.get_member_account(customer) member_info = Customer.get_member_account(customer)
current_balance = SaleAudit.paymal_search(sale_id)
end end
# get printer info # get printer info
print_settings=PrintSetting.find_by_unique_code(unique_code) print_settings=PrintSetting.find_by_unique_code(unique_code)
@@ -44,7 +45,7 @@ class Origami::PaymentsController < BaseOrigamiController
printer = Printer::ReceiptPrinter.new(print_settings) printer = Printer::ReceiptPrinter.new(print_settings)
printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt") printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance)
end end
def create def create

2
app/views/origami/addorders/detail.html.erb
View File

@@ -12,7 +12,7 @@
<li class="nav-item menu_category sub_click" data-id="<%=menu.id%>"> <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
<p class="hidden menu-id"><%= menu.id %></p> <p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%> <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
<ul class=" sub_category_list hidden" id="sub_category_list"> <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
</ul> </ul>
</a> </a>