app/controllers/admin/abonnements_controller.rb

@@ -1,108 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-class Admin::AbonnementsController < ApplicationController
-	before_filter :auth_admin
-
-	layout "admin"
-
-
-	before_filter :find_abonnements
-
-
-	def index 
-
-	end
-
-
-
-
-	
-	def new
-		@abonnement = Abonnement.new()
-    
-
-
-	end
-
-	def edit
-		@abonnement = Abonnement.find(params[:id])
-	end
-  
-	def show
-		@abonnement = Abonnement.find(params[:id])
-	end
-
-
-	def create
-		@abonnement = Abonnement.new(params.require(:abonnement).permit!)
-
-
-		if @abonnement.save
-      
-      find_abonnements
-			flash[:notice] = "La catégorie à été ajouté avec succès."
-		
-
-		else
-			render :action => "new" 
-		
-		end
-	
-	end
-	
-
-	def update
-		@abonnement = Abonnement.find(params[:id])
-
-
-		
-	
-		
-		
-		respond_to do |format|
-			if @abonnement.update_attributes(params.require(:abonnement).permit!)
-				
-
-			
-				flash[:notice] = "Le menu à été modifié avec succès."
-				
-				if @reorder
-					format.js { 
-						
-						render :action => "update" }
-				else
-					format.js { 
-					   @abonnement = Abonnement.find(@abonnement.id)
-						render :action => "update_row" }
-				end
-      end
-			
-		end
-    
-    
-    
-    
-
-	end
-
-
-	def destroy
-		@abonnement = Abonnement.find(params[:id])
-    @abonnement.destroy
-    find_abonnements
-  
-    flash[:notice] = "La catégorie à bien été supprimée."
-	end
-	
-	
-	protected
-	
-	def find_abonnements    
-    
-    @abonnements = Abonnement.order("created_at DESC").all
-		
-
-	
-  end
-  
-end

app/controllers/application_controller.rb

@@ -10,11 +10,7 @@ class ApplicationController < ActionController::Base
   
 
   def get_reseaux
-    if params[:reseaux_id] and current_customer and !params[:no_reseaux]
+    if session[:reseaux_id] and current_customer and !params[:no_reseaux]
-      @reseaux = current_customer.reseauxes.find(params[:reseaux_id])
-      @reseaux_layout = true
-      session[:reseaux_id] = @reseaux.id
-    elsif session[:reseaux_id] and current_customer and !params[:no_reseaux]
       @reseaux = current_customer.reseauxes.find(session[:reseaux_id])
       @reseaux_layout = true
     elsif !params[:no_reseaux]
@@ -76,8 +72,6 @@ class ApplicationController < ActionController::Base
   end
 
   def require_negos_abo
-    get_reseaux
-    
     if !current_abo and (!session[:reseaux_id] or (@reseaux and @reseaux.abo_needed))
       redirect_to new_public_abonnement_path
     end

app/controllers/public/customers_controller.rb

@@ -68,13 +68,9 @@ class Public::CustomersController < ApplicationController
     params[:step] = "login"
     @no_search = true
   	@customer = Customer.new(params.require(:customer).permit!)
-    @customer.account_validated = true
+
-    
     if @customer.save
-      @customer.reseauxes << Reseaux.find(16)
+
-      @customer.reseauxes << Reseaux.find(2)
-      @customer.domains << Domain.find(1)
-      
       CustomerMailer.confirm(@customer).deliver
       CustomerMailer.notify_ins(@customer).deliver
 
@@ -84,14 +80,12 @@ class Public::CustomersController < ApplicationController
       cookies[:customer_auth_token] = @customer.token
 
 
-      #if session[:for_annonce]
+      if session[:for_annonce]
-      #  redirect_to new_public_annonce_path(:ins => "ins_finish"), notice: "Vous êtes désormais inscrit."
+        redirect_to new_public_annonce_path(:ins => "ins_finish"), notice: "Vous êtes désormais inscrit."
-      #else
+      else
-      #  redirect_to public_my_account_path(:ins => "ins_finish"), notice: "Vous êtes désormais inscrit."
+        redirect_to public_my_account_path(:ins => "ins_finish"), notice: "Vous êtes désormais inscrit."
-      #end
+      end
-      redirect_to public_my_reseauxes_path(), notice: "Vous êtes désormais inscrit."
+
-    
-    
       if cookies[:video_read] == "true"
         flash[:read_video] = false
       else

app/controllers/public/needs_controller.rb

@@ -3,22 +3,13 @@ class Public::NeedsController < ApplicationController
   layout "public"
   before_filter :require_negos_abo
   before_filter :auth_customer
-  #before_filter :check_enabled
+  before_filter :check_enabled
 
 
   before_filter :build_category_tree, only:[:index,:new,:create,:edit,:update]
   before_filter :check_owner, only: [:destroy,:edit,:update]
 
   def index
-    #dsffsd = sdfd
-    
-    if params[:reseaux_id]
-      @reseaux = Reseaux.find(params[:reseaux_id])
-      session[:reseaux_id] = @reseaux.id 
-    elsif session[:reseaux_id]
-      @reseaux = Reseaux.find(session[:reseaux_id])
-    end
-    
     params[:type] = params[:type] || 1
     
     params[:type] = params[:type].to_i
@@ -34,7 +25,6 @@ class Public::NeedsController < ApplicationController
     else
       @needs = @needs.where(:reseaux_id => nil)
     end
-    
     @needs = @needs.domain_in(current_customer.domain_ids)
 
     # filters default value

app/controllers/public/products_controller.rb

@@ -3,7 +3,6 @@
 class Public::ProductsController < ApplicationController
 
   before_filter :auth_customer
-  before_filter :require_negos_abo
 	layout "public"
 
 	def show

app/models/abonnement.rb

@@ -1,6 +1,5 @@
 class Abonnement < ActiveRecord::Base
   belongs_to :reseaux
-  belongs_to :customer
   has_many :payments, :as => :element
   
   def after_paid

app/models/customer.rb

@@ -86,7 +86,7 @@ class Customer < ActiveRecord::Base
   validates :cp, :presence => true, :if => :step2
   validates :city, :presence => true, :if => :step2
 
-  #validates :need_1 , :presence => true, :if =>  :step3
+  validates :need_1 , :presence => true, :if =>  :step3
 
 
   # Geocoder
@@ -288,10 +288,6 @@ class Customer < ActiveRecord::Base
     "#{firstname.capitalize} #{name.upcase}"
   end
 
-  def name_for_label
-    "#{self.organisation} #{self.name.upcase} #{self.firstname.capitalize} - #{self.email}"
-  end
-
   def pseudo
     if self.pro
       self.organisation

app/views/admin/abonnements/_abonnement.html.haml

@@ -1,30 +0,0 @@
-
-%tr#abonnement.abonnement{:id => abonnement.id}
-
-  %td=abonnement.id
-  %td
-    -if abonnement.reseaux
-      =abonnement.reseaux.name
-  %td
-    -if abonnement.customer
-      =abonnement.customer.organisation
-      =abonnement.customer.name
-      =abonnement.customer.firstname
-    
-  %td=abonnement.slug
-  %td=l abonnement.start_at
-  %td=l abonnement.end_at
-  %td=number_to_currency abonnement.price
-  %td=ic :check if abonnement.paid
-  
-
-
-
-  %td.actions
-    =# link_to i(:"trash-o"), [:admin, abonnement], :data =>{:remote => true, :confirm => 'Voulez-vous vraiment supprimer cette taille ? Elle sera supprimée de tous les produits qui la contenait'}, :method => :delete 
-
-    = link_to i(:pencil), edit_admin_abonnement_path(abonnement), :data => {:remote => true}
-
-
-
-

app/views/admin/abonnements/_form.html.haml

@@ -1,19 +0,0 @@
-= semantic_form_for [:admin,@abonnement], :remote => true do |form| 
-  
-  .content
-    = form.input :reseaux_id, :label => "Réseau :", :collection => Reseaux.where(:parent_id => nil).all, :as => :select, :include_blank => true
-    =form.input :customer_id, :label => "Client :", :collection => Customer.order(:organisation, :name).all, :as => :select, :include_blank => true, :member_label => :name_for_label
-    
-    = form.input :start_at, :label => "Début", :as => :date
-    = form.input :end_at, :label => "Fin", :as => :date
-    
-    = form.input :price, :label => "Prix :"
-    = form.input :paid, :label => "Payé ?"
-    
-    
-    
-    
-    
-  .actions
-    = form.submit "Sauvegarder"
-  

app/views/admin/abonnements/create.js.erb

@@ -1,4 +0,0 @@
-close_pane_hover();
-
-$('#abonnements').html("<%= escape_javascript(render(@abonnements)) %>");
-

app/views/admin/abonnements/destroy.js.erb

@@ -1,5 +0,0 @@
-
-$('#abonnement_<%= @abonnement.id %>').remove();
-
-
-<%= flash_js %>

app/views/admin/abonnements/edit.js.erb

@@ -1 +0,0 @@
-show_pane_hover("<%= escape_javascript(render(:partial => "form"))%>",550,600);

app/views/admin/abonnements/index.html.haml

@@ -1,27 +0,0 @@
-.qi_header
-  .right= link_to 'Ajouter un abonnement manuellement', new_admin_abonnement_path, :class => "btn btn-primary", :remote => true
-  %h1 
-
-    Boutique
-    %span
-      Liste des documents
-
-  
-
-.qi_row
-  .qi_pannel.qi_plain.padding
-    %table.table
-
-      %tr
-        %th ID
-        %th Réseaux
-        %th Client
-        %th Slug
-        %th Début
-        %th Fin
-        %th Prix
-        %th Payé ?
-        
-        %th
-        
-      %tbody#abonnements=render @abonnements

app/views/admin/abonnements/new.js.erb

@@ -1 +0,0 @@
-show_pane_hover("<%= escape_javascript(render(:partial => "form"))%>",550,600);

app/views/admin/abonnements/update_row.js.erb

@@ -1,2 +0,0 @@
-close_pane_hover();
-$('#abonnement_<%= @abonnement.id %>').replaceWith("<%= escape_javascript(render(@abonnement))%>");

app/views/layouts/admin.html.haml

@@ -72,7 +72,6 @@
               %li= link_to "Type de documents", admin_product_order_document_types_path
               %li=# link_to "Codes de reduction", admin_vourcher_codes_path
           %li=link_to "Pages statiques", admin_menu_items_path(:menu_id => 1)
-          %li=link_to "Abos", admin_abonnements_path()
           
         %ul.nav.navbar-nav.navbar-right
           %li.dropdown

config/routes.rb

@@ -336,14 +336,6 @@ Rails.application.routes.draw do
     end
 
     namespace :admin do
-      resources :abonnements do 
-        
-        member do
-          get :force
-        end
-      end
-      
-      
       resources :fournisseurs
       resources :product_order_documents
       resources :product_order_document_types