From 09e202bb7095bd5b1750770f6801ec4c67b7f762 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 7 Jul 2017 17:33:14 +0630 Subject: [PATCH] remove deving member dis --- app/views/origami/discounts/index.html.erb | 50 +++++++++++----------- config/routes.rb | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 6e8b26a8..d2fd5db8 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -190,8 +190,8 @@ -
- + @@ -422,31 +422,31 @@ $(document).ready(function(){ }); // Pay Discount for membership - $("#member-discount").on('click', function(e){ - e.preventDefault(); - var sale_id = $('#sale-id').text(); - var sub_total = $('#order-sub-total').text(); - var ajax_url = "/origami/" + sale_id + "/member_discount"; + // $("#member-discount").on('click', function(e){ + // e.preventDefault(); + // var sale_id = $('#sale-id').text(); + // var sub_total = $('#order-sub-total').text(); + // var ajax_url = "/origami/" + sale_id + "/member_discount"; - // Selected Account - var account_types = JSON.stringify(get_selected_account_types()); - var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types }; + // // Selected Account + // var account_types = JSON.stringify(get_selected_account_types()); + // var params = {'sale_id':sale_id, 'sub_total':sub_total, 'account_types':account_types }; - $.ajax({ - type: "POST", - url: ajax_url, - data: params, - success:function(result){ - alert("Successfully Discount!"); - if(result.table_type == "Table"){ - window.location.href = "/origami/table/" + result.table_id - } - else { - window.location.href = "/origami/room/" + result.table_id - } - } - }); - }); + // $.ajax({ + // type: "POST", + // url: ajax_url, + // data: params, + // success:function(result){ + // alert("Successfully Discount!"); + // if(result.table_type == "Table"){ + // window.location.href = "/origami/table/" + result.table_id + // } + // else { + // window.location.href = "/origami/room/" + result.table_id + // } + // } + // }); + // }); }); /* Remove Selection */ diff --git a/config/routes.rb b/config/routes.rb index f4dd5b13..eb07de30 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -105,7 +105,7 @@ Rails.application.routes.draw do post "/:id/remove_discount_items" => "discounts#remove_discount_items" # Discount for Member - post "/:id/member_discount" => "discounts#member_discount" + # post "/:id/member_discount" => "discounts#member_discount" get "/:id/request_bills" => "request_bills#print",:as => "request_bill" get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' }