nicolas/mmsc_app
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

suite

Browse Source
This commit is contained in:
Nicolas Bally 2020-06-24 18:08:53 +02:00
parent cac0790358
commit 3e7fabfbc9
17 changed files with 130 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/public.js.coffee
View File

@ -301,7 +301,7 @@ $ ->
resize()
$(".flashs .remove").click ->
$(this).parent().remove()
$(this).parent().parent().remove()
$(document).on "scroll", ->
scroll_ajust()

29
app/assets/stylesheets/public.scss
View File

@ -10479,4 +10479,33 @@ a.sp-video {
.align_center{
text-align:center;
}
.flashs{
background: #F9F1E4;
color: #333f48;
padding: 30px 20px;
font-size: 14px;
position: relative;
.notice, .error, .alert{
margin:0;
padding:0;
max-width:1000px;
margin:auto;
}
.error{
color:red;
}
.remove{
position:absolute;
top:6px;
right:8px;
cursor:pointer;
}
}

6
app/controllers/admin/m_odr_remises_controller.rb
View File

@ -19,9 +19,9 @@ class Admin::MOdrRemisesController < ApplicationController
@prelevement_date = Time.now
@iban = @m_odr.iban.to_s
@bic = @m_odr.bic.to_s
@name = @m_odr.bank_name.to_s
@iban = "FR7616807001133638997621962"
@bic = "CCBPFRPPGRE"
@name = "Banque Populaire Auvergne Rhone Alpes"

2
app/controllers/admin/m_odr_rep_ribs_controller.rb
View File

@ -45,6 +45,8 @@ class Admin::MOdrRepRibsController < ApplicationController
@m_odr_rep_rib = MOdrRepRib.new(params.require(:m_odr_rep_rib).permit!)
if @m_odr_rep_rib.save
#@m_odr_rep_rib.m_odr_rep.change_state("En cours de traitement")
else
render action: "new"

2
app/models/m_event.rb
View File

@ -22,7 +22,7 @@ class MEvent < ApplicationRecord
belongs_to :image_file
def member_label
self.start_at.to_s+" - "+self.title.to_s+" - "+(self.organisateur.name if self.organisateur).to_s
self.start_at.to_date.to_s+" - "+self.title.to_s+" - "+(self.organisateur.name if self.organisateur).to_s
end

17
app/models/m_odr_file.rb
View File

@ -28,6 +28,23 @@ class MOdrFile < ApplicationRecord
end
def new_nbr_primes
self.m_odr_file_roulages.count if self.m_odr_file_type_id == 1
end
def new_nbr_primes_useds
MOdrPrime.where(:m_odr_file_roulage_id => self.m_odr_file_roulages.ids).count if self.m_odr_file_type_id == 1
end
def new_nbr_primes_not_useds
(self.new_nbr_primes - self.new_nbr_primes_useds) if self.m_odr_file_type_id == 1
end
after_save do
#self.p_customer.generate_prime if self.p_customer
end

1
app/models/m_odr_rep_rib.rb
View File

@ -30,6 +30,7 @@ class MOdrRepRib < ApplicationRecord
def update_prime_status
if self.admin_ok and self.p_customer
self.p_customer.m_odr_primes.where(:state => "Manque RIB").all.each do |m_odr_prime|
m_odr_prime.state = "Validé"
m_odr_prime.save

6
app/views/admin/m_odr_file_products/_form.html.haml
View File

@ -1,6 +1,10 @@
%tr.m_odr_file_product_form.field
%td= form.input :m_odr_product_size, :label => "Produit :", :collection => MOdrProductSize.all, :as => :select, :include_blank => false, :member_label => :member_label
%td
= form.input :m_odr_product_size_id, :label => "Produit :", :collection => option_groups_from_collection_for_select(MOdrProduct.all, :m_odr_product_sizes, :name, :id, :name, form.object.m_odr_product_size_id), :as => :select, :include_blank => false, :member_label => :member_label, :include_blank => "Choisissez le profil et la dimension"
%td= form.input :qte, :label => "Qté :", :input_html => {:style => "width:60px;"}
%td= form.input :price, :label => "Prix :"

7
app/views/admin/m_odr_file_roulages/_form.html.haml
View File

@ -1,6 +1,11 @@
%tr.m_odr_file_roulage_form.field
%td= form.input :date, :label => "date :" , :as => :date
%td= form.input :m_event_id, :label => "Journée de roulage :", :as => :date, :collection => MEvent.all, :member_label => :member_label, :as => :select
-if form.object.date?
%td= form.input :m_event_id, :label => "Journée de roulage :", :as => :date, :collection => MEvent.order("start_at").where("start_at <= ? and end_at >= ?", form.object.date, form.object.date).all, :member_label => :member_label, :as => :select
-else
%td= form.input :m_event_id, :label => "Journée de roulage :", :as => :date, :collection => MEvent.all, :member_label => :member_label, :as => :select
%td.actions=link_to_remove_fields ic(:"trash-o"), form

9
app/views/admin/m_odr_files/_m_odr_file.html.haml
View File

@ -12,16 +12,17 @@
-tr[:nbr_primes] = capture do
%td
=m_odr_file.m_odr_file_roulages.count if m_odr_file.m_odr_file_type_id == 1
=m_odr_file.new_nbr_primes
-tr[:nbr_primes_useds] = capture do
%td
=MOdrPrime.where(:m_odr_file_roulage_id => m_odr_file.m_odr_file_roulages.ids).count if m_odr_file.m_odr_file_type_id == 1
=m_odr_file.new_nbr_primes_useds
-tr[:nbr_primes_not_useds] = capture do
%td
=(m_odr_file.m_odr_file_roulages.count - MOdrPrime.where(:m_odr_file_roulage_id => m_odr_file.m_odr_file_roulages.ids).count) if m_odr_file.m_odr_file_type_id == 1
=m_odr_file.new_nbr_primes_not_useds
-tr[:admin_ok] = capture do

12
app/views/admin/m_odr_primes/show.html.haml
View File

@ -34,12 +34,16 @@
-m_odr_file = @m_odr_prime.m_odr_file_roulage.m_odr_file
%td
=m_odr_file.nbr_primes
=m_odr_file.new_nbr_primes
%td
=m_odr_file.nbr_primes_useds
=m_odr_file.new_nbr_primes_useds
%td
=m_odr_file.nbr_primes_not_useds
=m_odr_file.new_nbr_primes_not_useds
%td
= link_to i(:pencil), edit_admin_m_odr_file_path(m_odr_file), :remote => false
@ -70,7 +74,7 @@
= link_to i(:pencil), edit_admin_m_odr_file_path(m_odr_prime_file.m_odr_file), :remote => false
-if @m_odr_prime.state = "A traiter" and @m_odr_prime.m_odr_virements.where(:refused => false).count == 0
-if @m_odr_prime.state == "A traiter" and @m_odr_prime.m_odr_virements.where(:refused => false).count == 0
=link_to "Générer le virement", generate_virement_admin_m_odr_prime_path(@m_odr_prime), :class => "btn btn-primary"
%hr

2
app/views/admin/m_odr_remises/show.html.haml
View File

@ -7,7 +7,7 @@
%br
.qi_side_padding
.right_actions
.right.right_actions
-if !@m_odr_remise.confirmed
=link_to ic(:envelope)+" Confirmer maintenant TOUS les virements", confirm_admin_m_odr_remise_path(@m_odr_remise) , :class => "btn btn-success"
.qi_help

4
app/views/admin/m_odr_rep_ribs/_form.html.haml
View File

@ -2,7 +2,9 @@
.content
=f.inputs do
= f.hidden_field :p_customer_id
= render :partial => "qi/autocomplete", :locals => {:form => f, :field => :p_customer, :label => "Utilisateur :"}
= f.input :iban, :label => "iban :" , :input_html => {:class => "iban_input"}
= f.input :bic, :label => "bic :"

38
app/views/layouts/public.html.haml
View File

@ -84,20 +84,7 @@
%body.pageAccueil
-if flash[:error] or flash[:notice] or flash[:alert]
.flashs
-if flash[:error]
.error
%span.remove=ic :times
=flash[:error]
-if flash[:notice]
.notice
%span.remove=ic :times
=flash[:notice]
-if flash[:alert]
.alert
%span.remove=ic :times
=flash[:alert]
%span.fond_body_1
%span.fond_body_2
#conteneur
@ -169,14 +156,33 @@
%span.icon-bar
%span.icon-bar
#contenu
/
-if flash[:error] or flash[:notice] or flash[:alert]
.flashs
-if flash[:error]
.error
%span.remove=ic :times
=flash[:error]
-if flash[:notice]
.notice
%span.remove=ic :times
=flash[:notice]
-if flash[:alert]
.alert
%span.remove=ic :times
=flash[:alert]
#centreetdroite
=yield
/
#pied
#conteneur_pied
.row

23
app/views/public/circuits/show.html.haml
View File

@ -46,22 +46,28 @@
-if @circuit.facebook?
=link_to raw(ic(:'facebook-f')), @circuit.facebook, :target => "_blank", :class => "new_btn"
%p.localisation
<img src="https://www.mamotosurcircuit.com/images/interface/picto_pointer.png">
=@circuit.address2
=@circuit.address3 if @circuit.address3?
=@circuit.cp
=@circuit.city
=@circuit.country
.clear
.clear
%br
%br
%p.localisation
<img src="https://www.mamotosurcircuit.com/images/interface/picto_pointer.png">
=@circuit.address2
=@circuit.address3 if @circuit.address3?
=@circuit.cp
=@circuit.city
=@circuit.country
-@m_events = MEvent.where("start_at >= ? or end_at >= ?", Date.today.beginning_of_day, Date.today.beginning_of_day).where(:circuit_id => @circuit.id)
-params[:search][:per_page] = params[:search][:per_page] || 4
-per_page = params[:search][:per_page]
-page = (params[:page] and params[:page] != "") ? params[:page] : 1
-@m_events = @m_events.page(page).per(per_page)
-if @m_events.count > 0
%h3 Les prochaines journées :
@ -71,3 +77,4 @@
=render @m_events
.prevnext= paginate @m_events

2
app/views/public/m_odr_file_products/_form.html.haml
View File

@ -1,7 +1,7 @@
%tr.m_odr_file_product_form.field
%td
= form.input :m_odr_product_size, :label => "Produit :", :collection => option_groups_from_collection_for_select(MOdrProduct.all, :m_odr_product_sizes, :name, :id, :name), :as => :select, :include_blank => false, :member_label => :member_label, :include_blank => "Choisissez le profil et la dimension"
= form.input :m_odr_product_size_id, :label => "Produit :", :collection => option_groups_from_collection_for_select(MOdrProduct.all, :m_odr_product_sizes, :name, :id, :name, form.object.m_odr_product_size_id), :as => :select, :include_blank => false, :member_label => :member_label, :include_blank => "Choisissez le profil et la dimension"
&nbsp;
%td{:style => "width:60px;"}
= form.input :qte, :label => "Qté :"

12
app/views/public/organisateurs/show.html.haml
View File

@ -44,8 +44,7 @@
%p.localisation{:style => "text-align:center !important;"}
=#@organisateur.address2
=#@organisateur.address3 if @organisateur.address3?
=@organisateur.cp
=@organisateur.city
=@organisateur.country
@ -55,6 +54,12 @@
-@m_events = MEvent.where("start_at >= ? or end_at >= ?", Date.today.beginning_of_day, Date.today.beginning_of_day).where(:organisateur_id => @organisateur.id)
-params[:search][:per_page] = params[:search][:per_page] || 4
-per_page = params[:search][:per_page]
-page = (params[:page] and params[:page] != "") ? params[:page] : 1
-@m_events = @m_events.page(page).per(per_page)
-if @m_events.count > 0
%h3 Les prochaines journées :
@ -63,4 +68,7 @@
=render @m_events
.prevnext= paginate @m_events