Compare commits

..

No commits in common. "7c71bcda55adbdf52f7c5cd447b8a517d2d4d6fb" and "c9b2379531a7b7b29827a9098d046616d4f08399" have entirely different histories.

4 changed files with 15 additions and 25 deletions

View File

@ -499,8 +499,9 @@ class PCustomer < ApplicationRecord
if self.particular
n = ""
n += self.particular.organisation+" " if self.particular.organisation?
n += self.particular.name+" " if self.particular.name?
n += self.particular.firstname+" " if self.particular.firstname?
n += self.particular.name+" " if self.particular.name?
return n
end
end

View File

@ -11,21 +11,6 @@
.qi_row
.qi_pannel.qi_plain.padding
Dernières primes versées au client
-params[:search][:per_page] = params[:search][:per_page] || 50
-per_page = params[:search][:per_page]
-page = (params[:page] and params[:page] != "") ? params[:page] : 1
-@m_odr_primes = @m_odr_prime.p_customer.m_odr_primes.where("id != ? ", @m_odr_prime.id)
-@m_odr_primes = sort_by_sorting(@m_odr_primes, "created_at DESC")
-@m_odr_primes = @m_odr_primes.page(page).per(per_page)
=render :partial => "qi/qi_ordered_table", :locals => {:qi_ordered_table_collection => @m_odr_primes}
%hr
#head=render :partial => "admin/m_odr_primes/head"
%h3
@ -127,6 +112,17 @@
=render :partial => "qi/qi_ordered_table", :locals => {:qi_ordered_table_collection => @mail_hists}
%hr
Dernières primes versées au client
-params[:search][:per_page] = params[:search][:per_page] || 50
-per_page = params[:search][:per_page]
-page = (params[:page] and params[:page] != "") ? params[:page] : 1
-@m_odr_primes = @m_odr_prime.p_customer.m_odr_primes.where("id != ? ", @m_odr_prime.id)
-@m_odr_primes = sort_by_sorting(@m_odr_primes, "created_at DESC")
-@m_odr_primes = @m_odr_primes.page(page).per(per_page)
=render :partial => "qi/qi_ordered_table", :locals => {:qi_ordered_table_collection => @m_odr_primes}

View File

@ -69,14 +69,7 @@
=ic :"file-text-o"
Documents
-if current_admin.has_permission?("primes")
.element
=link_to admin_m_odr_primes_path do
.cat#big_cat_payments
=ic :"eur"
Primes
-elsif current_admin.has_permission?("virements.view")
-if current_admin.has_permission?("virements.view")
.element
=link_to admin_m_odr_virements_path do
.cat#big_cat_payments

View File

@ -41,7 +41,7 @@
.col-xs-12.col-md-6.col-lg-3
%span.chiffre
-r = 0
-MEvent.where("start_at >= ? and start_at <= ? ", Date.today.beginning_of_year.beginning_of_year, Date.today.beginning_of_year.end_of_year).all.each do |m_event|
-MEvent.where("start_at > ?", Date.today.beginning_of_year.beginning_of_year).all.each do |m_event|
-r+=(m_event.end_at - m_event.start_at ).to_i / (24 * 60 * 60) +1
=r
%span.label-chiffre Dates