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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-06-15 11:25:49 +06:30
parent cca890ffdd 136ca65233
commit 061c06b3c3
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/origami.js
View File

@@ -11,6 +11,7 @@
// about supported directives. // about supported directives.
// //
//= require jquery //= require jquery
//= require tether
//= require bootstrap //= require bootstrap
//= require jquery_ujs //= require jquery_ujs
//= require turbolinks //= require turbolinks
@@ -26,7 +27,7 @@ $(document).ready(function(){
// For selected order return // For selected order return
var order_status = ""; var order_status = "";
order_status = $(".selected-item").children().find(".orders-order-status").text().substr(0,6).trim(); order_status = $(".selected-item").children().find(".orders-order-status").text().substr(0,6).trim();
// Enable/Disable Button // Enable/Disable Button
control_button(order_status); control_button(order_status);
@@ -220,7 +221,7 @@ $(document).ready(function(){
if(data["response_data"]["data"][i]["accountable_type"] == "RebateAccount"){ if(data["response_data"]["data"][i]["accountable_type"] == "RebateAccount"){
var balance = data["response_data"]["data"][i]["balance"]; var balance = data["response_data"]["data"][i]["balance"];
if (data["response_data"]["status"]==true) { if (data["response_data"]["status"]==true) {
$('.rebate_amount').removeClass('hide'); $('.rebate_amount').removeClass('hide');
row = row =
'<td class="charges-name">' + data["response_data"]["data"][i]["accountable_type"] +'</td>' '<td class="charges-name">' + data["response_data"]["data"][i]["accountable_type"] +'</td>'
+'<td class="item-attr">' + balance + '</td>'; +'<td class="item-attr">' + balance + '</td>';
@@ -290,8 +291,8 @@ $(document).ready(function(){
}); });
/* Button Control by Status */ /* Button Control by Status */
function control_button(order_status){ function control_button(order_status){
if(order_status=="billed"){ if(order_status=="billed"){
$("#customer").prop('disabled', false); $("#customer").prop('disabled', false);
$("#request_bills").prop('disabled', true); $("#request_bills").prop('disabled', true);
$("#discount").prop('disabled', false); $("#discount").prop('disabled', false);

1
app/views/origami/payments/show.html.erb
View File

@@ -237,6 +237,7 @@
<!-- Waiter Buttons --> <!-- Waiter Buttons -->
<button type="button" class="btn btn-primary btn-lg btn-block"> Foc </button> <button type="button" class="btn btn-primary btn-lg btn-block"> Foc </button>
<button type="button" class="btn btn-primary btn-lg btn-block"> Void </button> <button type="button" class="btn btn-primary btn-lg btn-block"> Void </button>
<button type="button" class="btn btn-primary btn-lg btn-block" onclick="window.location.href = '/origami';"> Back </button>
</div> </div>
</div> </div>

5
config/environments/production.rb
View File

@@ -8,11 +8,12 @@ Rails.application.configure do
# your application in memory, allowing both threaded web servers # your application in memory, allowing both threaded web servers
# and those relying on copy on write to perform better. # and those relying on copy on write to perform better.
# Rake tasks automatically ignore this option for performance. # Rake tasks automatically ignore this option for performance.
config.eager_load = true config.eager_load = false
# Full error reports are disabled and caching is turned on. # Full error reports are disabled and caching is turned on.
config.consider_all_requests_local = false config.consider_all_requests_local = false
config.action_controller.perform_caching = true config.action_controller.perform_caching = true
config.serve_staitc_assets = true
# Disable serving static files from the `/public` folder by default since # Disable serving static files from the `/public` folder by default since
# Apache or NGINX already handles this. # Apache or NGINX already handles this.
@@ -23,7 +24,7 @@ Rails.application.configure do
# config.assets.css_compressor = :sass # config.assets.css_compressor = :sass
# Do not fallback to assets pipeline if a precompiled asset is missed. # Do not fallback to assets pipeline if a precompiled asset is missed.
config.assets.compile = false config.assets.compile = true
# `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb