From 3475282c3f4e53e4786ff421dd4165d47cb0f2d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A9?= Date: Thu, 18 Nov 2021 13:52:50 +0100 Subject: [PATCH] Hide stats + bugfix FDP --- app/controllers/application_controller.rb | 2 +- app/models/price_line_block.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5ada2fe..032fe7b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -186,7 +186,7 @@ class ApplicationController < ActionController::Base if current_admin.has_permission?("stats-commercial") - set_big_menu :statistiques, "Stats", commercial_admin_dashboards_path, "bar-chart", "#6C5B7B" + # set_big_menu :statistiques, "Stats", commercial_admin_dashboards_path, "bar-chart", "#6C5B7B" end diff --git a/app/models/price_line_block.rb b/app/models/price_line_block.rb index 03bab55..38c425b 100644 --- a/app/models/price_line_block.rb +++ b/app/models/price_line_block.rb @@ -638,6 +638,7 @@ class PriceLineBlock < ApplicationRecord def default_tot_fdp_ht + return 0.0 # Skip default FDP if self.p_customer_cat_id == 2 if (self.tot_lines_ht + self.tot_discount_ht) >= 290.0 0.0