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

suite

Browse Source
This commit is contained in:
Nicolas Bally 2020-07-30 16:31:19 +02:00
parent 551d8bbf25
commit 0672c2ef1e
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/m_odr_rep.rb
View File

@ -178,6 +178,7 @@ file_admin_ok remise particular_civilite particular_name particular_firstname pa
end
self.reduc_code = self.reduc_code.upcase
if self.m_odr.reduc_code_needed and self.m_odr.m_odr_coupons.count > 0 and !self.m_odr.m_odr_coupons.where("name LIKE ?", self.reduc_code).first

2
app/views/admin/m_odr_reps/_form.html.haml
View File

@ -21,6 +21,8 @@
=f.input :m_odr_place, :label => "Point de vente :", :as => :select, :collection => f.object.m_odr.m_odr_places.order(:name), :include_blank => true
=f.input :reduc, :label => "Remise manuelle :"
=f.input :reduc_code, :label => "Code de réduction :"

6
app/views/admin/m_odr_reps/_left_column.html.haml
View File

@ -25,6 +25,12 @@
%td Date d'achat
%td
=l @m_odr_rep.buy_at if @m_odr_rep.buy_at
%tr
%td Code de réduction
%td
=@m_odr_rep.reduc_code

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

@ -16,7 +16,7 @@
-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_reps = MOdrRep.where(:m_odr_id => @m_odr_rep.m_odr_id).where("cc_particular_name LIKE ? or cc_particular_firstname LIKE ? or cc_particular_name LIKE ? or cc_particular_firstname LIKE ? or cc_particular_email LIKE ? or cc_particular_address_2 LIKE ?","%#{@m_odr_rep.cc_particular_firstname}%", "%#{@m_odr_rep.cc_particular_firstname}%", "%#{@m_odr_rep.cc_particular_name}%", "%#{@m_odr_rep.cc_particular_name}%", "%#{@m_odr_rep.cc_particular_email}%", "%#{@m_odr_rep.cc_particular_address_2}%").where("id != ?",@m_odr_rep.id)
-m_odr_reps = MOdrRep.where(:m_odr_id => @m_odr_rep.m_odr_id).where("cc_particular_name LIKE ? or cc_particular_firstname LIKE ? or cc_particular_name LIKE ? or cc_particular_firstname LIKE ? or cc_particular_email LIKE ? or cc_particular_address_2 LIKE ? or reduc_code LIKE ?","%#{@m_odr_rep.cc_particular_firstname}%", "%#{@m_odr_rep.cc_particular_firstname}%", "%#{@m_odr_rep.cc_particular_name}%", "%#{@m_odr_rep.cc_particular_name}%", "%#{@m_odr_rep.cc_particular_email}%", "%#{@m_odr_rep.cc_particular_address_2}%", "%#{@m_odr_rep.reduc_code}%").where("id != ?",@m_odr_rep.id)
-m_odr_reps = sort_by_sorting(m_odr_reps, "created_at DESC")
-m_odr_reps = m_odr_reps.page(page).per(per_page)