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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Philippe 2021-11-18 19:41:14 +01:00
commit e4c91dcf7a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/price_documents/_price_document.html.haml
View File

@ -145,7 +145,7 @@
-tr[:actions] = capture do -tr[:actions] = capture do
%td.actions %td.actions
-if price_document.price_document_type.label == "Demande prix" -if price_document.price_document_type.label == "Demande prix"
=link_to i("bar-chart"), analyse_reponses_admin_price_document_path(price_document) =#link_to i("bar-chart"), analyse_reponses_admin_price_document_path(price_document)
-if !price_document.imported -if !price_document.imported
-if current_admin.has_permission?("payments") -if current_admin.has_permission?("payments")
-if !price_document.d_number? -if !price_document.d_number?

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

@ -1,7 +1,7 @@
.qi_header .qi_header
.right .right
-if @price_document.price_document_type_id == 1 -if @price_document.price_document_type_id == 1
=link_to ic("bar-chart")+" analyse des réponses", analyse_reponses_admin_price_document_path(@price_document), class: "btn btn-primary" =#link_to ic("bar-chart")+" analyse des réponses", analyse_reponses_admin_price_document_path(@price_document), class: "btn btn-primary"
-if @price_document.price_document_type_id == 6 and !@price_document.stock_ok -if @price_document.price_document_type_id == 6 and !@price_document.stock_ok
= link_to i(:pencil), edit_admin_price_document_path(:id => @price_document.id, :public_edit => true) if !@price_document.stock_ok = link_to i(:pencil), edit_admin_price_document_path(:id => @price_document.id, :public_edit => true) if !@price_document.stock_ok