From 70a0c2156725ad5ff9d591b10be9dae279e82233 Mon Sep 17 00:00:00 2001 From: Myat Zin Wai Maw Date: Mon, 3 Feb 2020 14:37:25 +0630 Subject: [PATCH] sale void --- app/models/ability.rb | 1 + app/models/customer.rb | 2 + app/models/sale_payment.rb | 2 +- .../foodcourt/orders/app_orders.html.erb | 32 ------- .../layouts/_foodcourt_left_sidebar.html.erb | 3 + app/views/transactions/sales/index.html.erb | 10 -- app/views/transactions/sales/show.html.erb | 94 +++++++++++++++++++ config/initializers/assets.rb | 1 + 8 files changed, 102 insertions(+), 43 deletions(-) diff --git a/app/models/ability.rb b/app/models/ability.rb index 64f783bd..5b74c312 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -204,6 +204,7 @@ class Ability can :item_edit, :sale_edit can :overall_void, :void + can :manage, Sale elsif user.role == "account" diff --git a/app/models/customer.rb b/app/models/customer.rb index 4f007b88..c2317ce5 100755 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -67,6 +67,8 @@ class Customer < ApplicationRecord 'Accept' => 'application/json; version=3' }, :timeout => 10) + rescue Errno::ECONNREFUSED + response = {status: false, message: "Can't open membership server " } rescue HTTParty::Error response = {status: false, message: "Server Error"} diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 3c02111e..e7c89f5a 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -649,7 +649,7 @@ class SalePayment < ApplicationRecord sale.sale_status = "completed" - if MembershipSetting.find_by_rebate(1) && is_foc == 0 && is_credit == 0 + if MembershipSetting.find_by_rebate(1) && !is_foc && !is_credit response = rebat(sale) #record an payment in sale-audit diff --git a/app/views/foodcourt/orders/app_orders.html.erb b/app/views/foodcourt/orders/app_orders.html.erb index a202958c..5ad4af5d 100644 --- a/app/views/foodcourt/orders/app_orders.html.erb +++ b/app/views/foodcourt/orders/app_orders.html.erb @@ -188,38 +188,6 @@ - diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 08464b45..b8f11cb4 100755 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -64,3 +64,4 @@ Rails.application.config.assets.precompile += %w( reservation.js ) Rails.application.config.assets.precompile += %w( custom.js ) Rails.application.config.assets.precompile += %w( foodcourt.js ) +Rails.application.config.assets.precompile += %w( foodcourt.css )