diff --git a/app/controllers/admin/product_order_documents_controller.rb b/app/controllers/admin/product_order_documents_controller.rb index da5414c..fcd7e16 100755 --- a/app/controllers/admin/product_order_documents_controller.rb +++ b/app/controllers/admin/product_order_documents_controller.rb @@ -1,9 +1,9 @@ # -*- encoding : utf-8 -*- class Admin::ProductOrderDocumentsController < ApplicationController - before_filter :auth_admin + #before_filter :auth_admin - layout "admin" + #layout "admin" diff --git a/app/models/product_order_document.rb b/app/models/product_order_document.rb index 65d802e..2ac461c 100644 --- a/app/models/product_order_document.rb +++ b/app/models/product_order_document.rb @@ -37,6 +37,7 @@ class ProductOrderDocument < ActiveRecord::Base self.data_file_id = self.product_order_document_type.data_file_id self.reseaux_id = self.product_order_document_type.reseaux_id self.fournisseur_id = self.product_order_document_type.fournisseur_id + self.name = self.product_order_document_type.name last_number = 0 last_dt = ProductOrderDocument.where("d_number is not null").where(:d_year => self.d_year,:product_order_document_type_id => self.product_order_document_type_id).order("d_index DESC").first diff --git a/app/views/admin/product_order_document_types/_form.html.haml b/app/views/admin/product_order_document_types/_form.html.haml index 58a327e..dc4d6e9 100755 --- a/app/views/admin/product_order_document_types/_form.html.haml +++ b/app/views/admin/product_order_document_types/_form.html.haml @@ -2,6 +2,7 @@ .content = form.input :label, :label => "Label :" + = form.input :name, :label => "Nom :" = form.input :prefix, :label => "Prefix :" = form.input :reseaux_id, :label => "Réseau :", :collection => Reseaux.where(:parent_id => nil).all, :as => :select, :include_blank => true =form.input :fournisseur_id, :label => "Fournisseur :", :collection => Fournisseur.all, :as => :select, :include_blank => true diff --git a/app/views/public/product_orders/payment_instructions.html.haml b/app/views/public/product_orders/payment_instructions.html.haml index 5ba7b88..c2c61d5 100644 --- a/app/views/public/product_orders/payment_instructions.html.haml +++ b/app/views/public/product_orders/payment_instructions.html.haml @@ -5,7 +5,17 @@ %p Votre pré-commande a bien été enregistrée %br - =link_to "Téléchargez votre bon de commande", bl_admin_product_order_path(@product_order_ar.token) + + Téléchargez dès maintenant vos documents : + %table.table + -@product_order_ar.product_order_documents.each do |product_order_document| + %tr + %td{:style => "width:300px;"} + =product_order_document.name + %td + =link_to product_order_document.d_number, admin_product_order_document_path(product_order_document.token) + + =#link_to "Téléchargez votre bon de commande", bl_admin_product_order_path(@product_order_ar.token) %br %br =#%p Si vous souhaitez finalement payer cette commande par carte banque vous pouvez la retrouver dans votre compte client.