date de roulage

app/models/p_customer.rb

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

app/views/admin/m_odr_primes/show.html.haml

@@ -11,6 +11,21 @@
 
 .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
@@ -112,18 +127,7 @@
     =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}
-
 
 
 

app/views/layouts/admin.html.haml

@@ -69,7 +69,14 @@
               =ic :"file-text-o"
               Documents
               
-      -if current_admin.has_permission?("virements.view")        
+      
+      -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")        
         .element
           =link_to admin_m_odr_virements_path do
             .cat#big_cat_payments

app/views/public/menu_items/index.html.haml

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