spree_drop_ship 3.1.0.1

data/app/models/spree/stock_location_decorator.rb

@@ -0,0 +1,18 @@
+Spree::StockLocation.class_eval do
+
+  belongs_to :supplier, class_name: 'Spree::Supplier'
+
+  scope :by_supplier, -> (supplier_id) { where(supplier_id: supplier_id) }
+
+  # Wrapper for creating a new stock item respecting the backorderable config and supplier
+  durably_decorate :propagate_variant, mode: 'soft', sha: 'f35b0d8a811311d4886d53024a9aa34e3aa5f8cb' do |variant|
+    if self.supplier_id.blank? || variant.suppliers.pluck(:id).include?(self.supplier_id)
+      self.stock_items.create!(variant: variant, backorderable: self.backorderable_default)
+    end
+  end
+
+  def available?(variant)
+    stock_item(variant).try(:available?)
+  end
+
+end

data/app/models/spree/supplier.rb

@@ -0,0 +1,117 @@
+class Spree::Supplier < Spree::Base
+  extend FriendlyId
+  friendly_id :name, use: :slugged
+
+  attr_accessor :password, :password_confirmation
+
+  #==========================================
+  # Associations
+
+  belongs_to :address, class_name: 'Spree::Address'
+  accepts_nested_attributes_for :address
+
+  if defined?(Ckeditor::Asset)
+    has_many :ckeditor_pictures
+    has_many :ckeditor_attachment_files
+  end
+  has_many   :products, through: :variants
+  has_many   :shipments, through: :stock_locations
+  has_many   :stock_locations
+  has_many   :supplier_variants
+  has_many   :users, class_name: Spree.user_class.to_s
+  has_many   :variants, through: :supplier_variants
+
+  #==========================================
+  # Validations
+
+  validates :commission_flat_rate,   presence: true
+  validates :commission_percentage,  presence: true
+  validates :email,                  presence: true, email: true, uniqueness: true
+  validates :name,                   presence: true, uniqueness: true
+  validates :url,                    format: { with: URI::regexp(%w(http https)), allow_blank: true }
+
+  #==========================================
+  # Callbacks
+
+  after_create :assign_user
+  after_create :create_stock_location
+  after_create :send_welcome, if: -> { SpreeDropShip::Config[:send_supplier_email] }
+  before_create :set_commission
+  before_validation :check_url
+
+  #==========================================
+  # Instance Methods
+  scope :active, -> { where(active: true) }
+
+  def deleted?
+    deleted_at.present?
+  end
+
+  def user_ids_string
+    user_ids.join(',')
+  end
+
+  def user_ids_string=(s)
+    self.user_ids = s.to_s.split(',').map(&:strip)
+  end
+
+  # Retreive the stock locations that has available
+  # stock items of the given variant
+  def stock_locations_with_available_stock_items(variant)
+    stock_locations.select { |sl| sl.available?(variant) }
+  end
+
+  #==========================================
+  # Protected Methods
+
+  protected
+
+    def assign_user
+      if self.users.empty?
+        if user = Spree.user_class.find_by_email(self.email)
+          self.users << user
+          self.save
+        end
+      end
+    end
+
+    def check_url
+      unless self.url.blank? or self.url =~ URI::regexp(%w(http https))
+        self.url = "http://#{self.url}"
+      end
+    end
+
+    def create_stock_location
+      if self.stock_locations.empty?
+        location = self.stock_locations.build(
+          active: true,
+          country_id: self.address.try(:country_id),
+          name: self.name,
+          state_id: self.address.try(:state_id)
+        )
+        # It's important location is always created.  Some apps add validations that shouldn't break this.
+        location.save validate: false
+      end
+    end
+
+    def send_welcome
+      begin
+        Spree::SupplierMailer.welcome(self.id).deliver_later!
+        # Specs raise error for not being able to set default_url_options[:host]
+      rescue => ex #Errno::ECONNREFUSED => ex
+        Rails.logger.error ex.message
+        Rails.logger.error ex.backtrace.join("\n")
+        return true # always return true so that failed email doesn't crash app.
+      end
+    end
+
+    def set_commission
+      unless changes.has_key?(:commission_flat_rate)
+        self.commission_flat_rate = SpreeDropShip::Config[:default_commission_flat_rate]
+      end
+      unless changes.has_key?(:commission_percentage)
+        self.commission_percentage = SpreeDropShip::Config[:default_commission_percentage]
+      end
+    end
+
+end

data/app/models/spree/supplier_ability.rb

@@ -0,0 +1,28 @@
+module Spree
+  class SupplierAbility
+    include CanCan::Ability
+
+    def initialize(user)
+      user ||= Spree.user_class.new
+
+      if user.supplier
+        # TODO: Want this to be inline like:
+        # can [:admin, :read, :stock], Spree::Product, suppliers: { id: user.supplier_id }
+        # can [:admin, :read, :stock], Spree::Product, supplier_ids: user.supplier_id
+        can [:admin, :read, :stock], Spree::Product do |product|
+          product.supplier_ids.include?(user.supplier_id)
+        end
+        can [:admin, :index, :manage, :create], Spree::Product
+        can [:admin, :manage, :read, :ready, :ship], Spree::Shipment, order: { state: 'complete' }, stock_location: { supplier_id: user.supplier_id }
+        can [:admin, :create, :update], :stock_items
+        can [:admin, :manage], Spree::StockItem, stock_location_id: user.supplier.stock_locations.pluck(:id)
+        can [:admin, :manage], Spree::StockLocation, supplier_id: user.supplier_id
+        can :create, Spree::StockLocation
+        can [:admin, :manage], Spree::StockMovement, stock_item: { stock_location_id: user.supplier.stock_locations.pluck(:id) }
+        can :create, Spree::StockMovement
+        can [:admin, :update], Spree::Supplier, id: user.supplier_id
+      end
+
+    end
+  end
+end

data/app/models/spree/supplier_variant.rb

@@ -0,0 +1,6 @@
+module Spree
+  class SupplierVariant < Spree::Base
+    belongs_to :supplier
+    belongs_to :variant
+  end
+end

data/app/models/spree/user_decorator.rb

@@ -0,0 +1,11 @@
+Spree.user_class.class_eval do
+
+  belongs_to :supplier, class_name: 'Spree::Supplier'
+
+  has_many :variants, through: :supplier
+
+  def supplier?
+    supplier.present?
+  end
+
+end

data/app/models/spree/variant_decorator.rb

@@ -0,0 +1,24 @@
+module Spree
+  Variant.class_eval do
+
+    has_many :suppliers, through: :supplier_variants
+    has_many :supplier_variants
+
+    before_create :populate_for_suppliers
+
+    private
+
+    durably_decorate :create_stock_items, mode: 'soft', sha: '98704433ac5c66ba46e02699f3cf03d13d4f1281' do
+      StockLocation.all.each do |stock_location|
+        if stock_location.supplier_id.blank? || self.suppliers.pluck(:id).include?(stock_location.supplier_id)
+          stock_location.propagate_variant(self) if stock_location.propagate_all_variants?
+        end
+      end
+    end
+
+    def populate_for_suppliers
+      self.suppliers = self.product.suppliers
+    end
+
+  end
+end

data/app/models/spree.rb

@@ -0,0 +1,5 @@
+module Spree
+  def self.table_name_prefix
+    'spree_'
+  end
+end

data/app/overrides/spree/admin/products/_form/converted_admin_product_form_right.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_bottom "[data-hook='admin_product_form_right'], #admin_product_form_right[data-hook]" -->
+
+<% if can? :manage, Spree::Supplier %>
+  <!-- TODO allow assignment to variants -->
+<% end %>

data/app/overrides/spree/admin/products/index/override_rows.html.erb.deface

@@ -0,0 +1,22 @@
+<!-- replace_contents '[data-hook="admin_products_index_rows"]' -->
+
+<%# Changed classes to new like https://github.com/spree/spree/blob/master/backend/app/views/spree/admin/stock_locations/_form.html.erb %>
+<td class="sku"><%= product.sku rescue '' %></td>
+<td class="image"><%= mini_image product, class: "thumbnail" %></td>
+<td>
+  <% if try_spree_current_user && try_spree_current_user.supplier? %>
+    <%= link_to product.try(:name), stock_admin_product_path(product)%>
+  <% else %>
+    <%= link_to product.try(:name), edit_admin_product_path(product) %>
+  <% end %>
+</td>
+<td><%= product.display_price.to_html rescue '' %></td>
+<td class="actions" data-hook="admin_products_index_row_actions">
+  <% if try_spree_current_user && try_spree_current_user.supplier? %>
+    <%= link_to 'SM', stock_admin_product_path(product), title:'Stock Management', class: 'btn btn-default btn-sm with-tip without-textdecor' if can?(:stock, product) && !product.deleted? %>
+  <% else %>
+    <%= link_to_edit product, :no_text => true, :class => 'edit' if can?(:edit, product) && !product.deleted? %>
+  <% end %>
+  <%= link_to_clone product, :no_text => true, :class => 'clone' if can?(:clone, product) %>
+  <%= link_to_delete product, :no_text => true if can?(:delete, product) && !product.deleted? %>
+</td>

data/app/overrides/spree/admin/shared/sub_menu/_configuration/add_drop_ship_settings.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_bottom "[data-hook='admin_configurations_sidebar_menu'], #admin_configurations_sidebar_menu[data-hook]" -->
+
+<%= configurations_sidebar_menu_item Spree.t(:drop_ship_settings), spree.edit_admin_drop_ship_settings_path %>

data/app/overrides/spree/admin/stock_locations/_form/add_supplier.html.erb.deface

@@ -0,0 +1,12 @@
+<!-- insert_bottom "[data-hook=admin_stock_locations_form_fields]" -->
+
+<%# Remove extra div and change classes %>
+<% if spree_current_user.admin? %>
+    <div class='form-group'>
+      <%= f.field_container :supplier do %>
+        <%= f.label :supplier_id, Spree.t(:supplier) %>
+        <%= f.collection_select(:supplier_id, Spree::Supplier.all, :id, :name, { :include_blank => 'None' }, { :class => 'select2' }) %>
+        <%= f.error_message_on :supplier %>
+      <% end %>
+    </div>
+<% end %>

data/app/overrides/spree/admin/stock_movements/_form/fix_bootstrap_form.html.erb.deface

@@ -0,0 +1,11 @@
+<!-- replace_contents '[data-hook="admin_stock_movements_form_fields"]' -->
+
+<%# Fix markup form bug %>
+<%= f.field_container :quantity, class: ['form-group'] do %>
+    <%= f.label :quantity, Spree.t(:quantity) %>
+    <%= f.text_field :quantity , class: 'form-control'%>
+<% end %>
+<%= f.field_container :stock_item_id, class: ['form-group'] do %>
+    <%= f.label :stock_item_id, Spree.t(:stock_item_id) %>
+    <%= f.text_field 'stock_item_id', :class => 'select2', :'data-stock-location-id' => params[:stock_location_id] %>
+<% end %>

data/app/overrides/spree/layouts/admin/add_profile_admin_tabs.html.erb.deface

@@ -0,0 +1,8 @@
+<!-- insert_top "div#main-sidebar" -->
+
+<%# Add tab "profile to admin tabs" %>
+<% if try_spree_current_user && try_spree_current_user.supplier? %>
+<ul class="nav nav-sidebar">
+  <%= tab :profile, url: spree.edit_admin_supplier_url(spree_current_user.supplier_id), match_path: '/suppliers', icon: 'user' %>
+</ul>
+<% end %>

data/app/overrides/spree/layouts/admin/converted_admin_tabs.html.erb.deface

@@ -0,0 +1,18 @@
+<!-- insert_bottom "div#main-sidebar" -->
+
+<%# Add sidebar's items for supplier %>
+<% if can? :index, Spree::Supplier %>
+<ul class="nav nav-sidebar">
+  <%= tab :suppliers, label: Spree.t(:suppliers), match_path: '/suppliers', icon: 'home' %>
+</ul>
+<% end %>
+<% if can? :index, Spree::Shipment %>
+<ul class="nav nav-sidebar">
+  <%= tab :shipments, label: Spree.t(:shipments), match_path: '/shipments', icon: 'plane' %>
+</ul>
+<% end %>
+<% if try_spree_current_user.try(:supplier?) and can? :index, Spree::StockLocation %>
+<ul class="nav nav-sidebar">
+  <%= tab :stock_locations, label: Spree.t(:stock_locations), match_path: '/stock_locations', icon: 'globe' %>
+</ul>
+<% end %>

data/app/views/spree/admin/drop_ship_settings/edit.html.erb

@@ -0,0 +1,21 @@
+<% content_for :page_title do %>
+    <%= Spree.t("drop_ship_settings") %>
+<% end %>
+
+<%= form_tag(spree.admin_drop_ship_settings_path, :method => :put) do %>
+    <fieldset class="general no-border-top">
+      <% %w( default_commission_flat_rate default_commission_percentage automatically_deliver_orders_to_supplier send_supplier_email).each do |key|
+        type = SpreeDropShip::Config.preference_type(key) %>
+          <div class="field col-md-6">
+            <%= label_tag(key, Spree.t(key) + ': ') + tag(:br) if type != :boolean %>
+            <%= preference_field_tag(key, SpreeDropShip::Config[key], :type => type ,:class => 'form-control')%>
+            <%= label_tag(key, Spree.t(key)) + tag(:br) if type == :boolean %>
+          </div>
+      <% end %>
+      <div class="form-buttons" data-hook="buttons">
+        <%= button Spree.t(:update), 'update' %>
+        <span class="or"><%= Spree.t(:or) %></span>
+        <%= button_link_to Spree.t(:cancel), spree.edit_admin_drop_ship_settings_url, :icon => 'cancel' %>
+      </div>
+    </fieldset>
+<% end %>

data/app/views/spree/admin/shared/_header.html.erb

@@ -0,0 +1,24 @@
+<%# Override header for supplier %>
+<% admin = try_spree_current_user.try(:supplier?) || try_spree_current_user.try(:has_spree_role?, "admin") %>
+
+<header class="header <%= admin ? "logged-in" : "logged-out" %>">
+
+  <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+    <div class="container-fluid">
+      <div class="navbar-header">
+        <%= link_to image_tag(Spree::Config[:admin_interface_logo], id: 'logo', height: '100%'), spree.admin_path, class: "logo navbar-brand" %>
+      </div>
+
+      <% if admin %>
+          <a href="#" class="navbar-btn sidebar-toggle" data-toggle="offcanvas" role="button">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </a>
+          <div class="navbar-right" data-hook="admin_login_navigation_bar"></div>
+      <% end %>
+    </div>
+  </nav>
+
+</header>

data/app/views/spree/admin/shipments/edit.html.erb

@@ -0,0 +1,24 @@
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:back_to_shipments_list), spree.admin_shipments_path, icon: 'arrow-left' %>
+<% end %>
+
+<% if spree_current_user.admin? && @shipment.supplier.present? %>
+  <div data-hook="admin_shipment_supplier" class="row">
+    <fieldset class="col-md-12 no-border-bottom">
+      <legend align="center"><%= Spree.t(:supplier_information) %></legend>
+      <div>
+        <b><%= Spree::Supplier.human_attribute_name(:name) %>:</b> <%= @shipment.supplier.name %><br/>
+        <b><%= Spree::Supplier.human_attribute_name(:email) %>:</b> <%= @shipment.supplier.email %><br/>
+        <b><%= Spree::Supplier.human_attribute_name(:url) %>:</b> <%= link_to @shipment.supplier.url, @shipment.supplier.url if @shipment.supplier.url.present? %><br/>
+      </div>
+      <div>
+        <b><%= Spree.t('contact_information') %>:</b>
+      </div>
+      <%= render partial: 'spree/shared/address', locals: { address: @shipment.supplier.address } %>
+    </fieldset>
+  </div>
+<% end %>
+
+<div data-hook="admin_shipment_form_fields">
+  <%= render partial: "spree/admin/orders/shipment", locals: { order: @shipment.order, shipment: @shipment } %>
+</div>

data/app/views/spree/admin/shipments/index.html.erb

@@ -0,0 +1,95 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:listing_shipments) %>
+<% end %>
+
+<% content_for :table_filter_title do %>
+  <%= Spree.t(:search) %>
+<% end %>
+
+<%# Update search form with new markup %>
+<% content_for :table_filter do %>
+  <div data-hook="admin_shipments_index_search">
+    <%= search_form_for [:admin, @search] do |f| %>
+    <div class="row">
+      <div class="date-range-filter col-md-6">
+        <div class="form-group">
+          <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
+          <div class="row">
+            <div class="col-md-6">
+              <%= f.text_field :created_at_gt, :class => 'datepicker datepicker-from form-control', :value => params[:q][:created_at_gt], :placeholder => Spree.t(:start) %>
+            </div>
+            <div class="col-md-6">
+              <%= f.text_field :created_at_lt, :class => 'datepicker datepicker-to form-control', :value => params[:q][:created_at_lt], :placeholder => Spree.t(:stop) %>
+            </div>
+          </div>
+        </div>
+      </div>
+      </div>
+      <div class="row">
+      <div class="col-md-4">
+        <div class="form-group">
+          <%= label_tag nil, Spree.t(:shipment_number) %>
+          <%= f.text_field :number_cont , class: 'form-control js-quick-search-target'%>
+        </div>
+      </div>
+
+      <div class="col-md-4">
+        <div class="form-group">
+          <%= label_tag nil, Spree.t(:status) %><br/>
+          <%= f.select :state_eq, Spree::Shipment.state_machines[:state].states.collect {|s| [Spree.t("shipment_state.#{s.name}"), s.value]}, {:include_blank => true}, :class => 'select2' %>
+        </div>
+      </div>
+      </div>
+
+        <div data-hook="admin_shipments_index_search_buttons" class="form-actions">
+          <%= button Spree.t(:filter_results), 'search' %>
+        </div>
+    <% end %>
+  </div>
+<% end %>
+
+<%# This is a new paginate! %>
+<%= render :partial => 'spree/admin/shared/index_table_options', :locals => { :collection => @shipments } %>
+
+<% unless @shipments.empty? %>
+  <table class="table" id="listing_shipments" data-hook>
+    <thead>
+      <tr data-hook="admin_orders_index_headers">
+        <th><%= sort_link @search, :created_at,  Spree::Shipment.human_attribute_name(:created_at) %></th>
+        <th><%= sort_link @search, :number,  Spree::Shipment.human_attribute_name(:number) %></th>
+        <th><%= sort_link @search, :state,  Spree::Shipment.human_attribute_name(:state) %></th>
+        <th><%= sort_link @search, :item_cost,  Spree::Shipment.human_attribute_name(:item_cost) %></th>
+        <th><%= sort_link @search, :shipping_total,  Spree::Shipment.human_attribute_name(:cost) %></th>
+        <th><%= sort_link @search, :tax_total,  Spree::Shipment.human_attribute_name(:tax_total) %></th>
+        <th><%= sort_link @search, :total,  Spree::Shipment.human_attribute_name(:final_price) %></th>
+        <th><%= sort_link @search, :supplier_commission,  Spree::Shipment.human_attribute_name(:supplier_commission) %></th>
+        <th data-hook="admin_shipments_index_header_actions" class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+    <% @shipments.each do |shipment| %>
+      <tr data-hook="admin_shipments_index_rows" class="state-<%= shipment.state.downcase %> <%= cycle('odd', 'even') %>">
+        <td><%= l shipment.created_at.to_date %></td>
+        <td><%= link_to shipment.number, spree.edit_admin_shipment_path(shipment) %></td>
+        <td><span class="state <%= shipment.state.downcase %>"><%= Spree.t("shipment_state.#{shipment.state.downcase}") %></span></td>
+        <td> <%= shipment.display_item_cost.to_html %></td>
+        <td ><%= shipment.display_cost.to_html %></td>
+        <td><%= Spree::Money.new(shipment.tax_total, currency: shipment.currency).to_html %></td>
+        <td><%= Spree::Money.new(shipment.final_price_with_items, currency: shipment.currency).to_html %></td>
+        <td><%= Spree::Money.new(shipment.supplier_commission, currency: shipment.currency).to_html %></td>
+        <td data-hook="admin_shipments_index_row_actions">
+          <%= link_to_edit_url spree.edit_admin_shipment_path(shipment), :title => "admin_edit_#{dom_id(shipment)}", :no_text => true %>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+<% else %>
+    <%# New alert 'Not Found' with i18n %>
+    <div class="alert alert-info no-objects-found">
+      <%= Spree.t(:no_resource_found, resource: Spree::Shipment.model_name.human(count: :many)) %>,
+    </div>
+<% end %>
+
+<%# This is a new paginate! %>
+<%= render :partial => 'spree/admin/shared/index_table_options', :locals => { :collection => @shipments } %>

data/app/views/spree/admin/suppliers/_form.html.erb

@@ -0,0 +1,69 @@
+<div data-hook="supplier_address_wrapper" class="col-md-6">
+  <fieldset class="no-border-bottom">
+    <legend align="center"><%= Spree.t('contact_address') %></legend>
+    <%= form.fields_for :address do |contact_form| %>
+      <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => contact_form, :name => Spree.t(:contact_address), :type => "shipping" } %>
+    <% end %>
+  </fieldset>
+</div>
+
+<%# added bootstrap classes for 'field_container' and '' %>
+<div data-hook="supplier_details_wrapper" class="col-md-6">
+  <fieldset class="no-border-bottom">
+    <legend align="center" ><%= Spree.t('supplier_details') %></legend>
+    <%= form.field_container :name, class: ['form-group'] do %>
+      <%= form.label :name, Spree::Supplier.human_attribute_name(:name) %>:<br />
+      <%= form.text_field :name, :class => 'form-control' %>
+    <% end %>
+    <%= form.field_container :email, class: ['form-group'] do %>
+      <%= form.label :email, Spree::Supplier.human_attribute_name(:email) %>:<br />
+      <%= form.email_field :email, :class => 'form-control' %>
+      <%# email validation %>
+      <%= error_message_on :user, :email %>
+    <% end %>
+    <%= form.field_container :url, class: ['form-group'] do %>
+      <%= form.label :url, Spree::Supplier.human_attribute_name(:url) %>:<br />
+      <%= form.text_field :url, :class => 'form-control' %>
+    <% end %>
+    <%= form.field_container :tax_id, class: ['form-group'] do %>
+      <%= form.label :tax_id, Spree::Supplier.human_attribute_name(:tax_id) %>:<br />
+      <%= form.text_field :tax_id, :class => 'form-control' %>
+    <% end %>
+    <% if spree_current_user.admin? %>
+      <%= form.field_container :commission_flat_rate, class: ['form-group'] do %>
+        <%= form.label :commission_flat_rate, Spree::Supplier.human_attribute_name(:commission_flat_rate) %>:<br />
+        <%= form.text_field :commission_flat_rate, :class => 'form-control' %>
+      <% end %>
+      <%= form.field_container :commission_percentage , class: ['form-group'] do %>
+        <%= form.label :commission_percentage, Spree::Supplier.human_attribute_name(:commission_percentage) %>:<br />
+        <%= form.text_field :commission_percentage, :class => 'form-control' %>
+      <% end %>
+      <%= form.field_container :users, class: ['form-group'] do %>
+        <%= form.label :users %><br/>
+        <%= hidden_field_tag 'supplier[user_ids_string]', form.object.user_ids.join(','), class: 'user_picker' %>
+      <% end %>
+      <%= form.field_container :active, class: ['form-group'] do %>
+        <div class="checkbox">
+        <%= label_tag :active do %>
+            <%= form.check_box :active %>
+            <%= Spree::Supplier.human_attribute_name(:active) %>
+        <% end %>
+        </div>
+      <% end %>
+    <% end %>
+    <%# This moved to _edit(new)_resource_links.html.erb %>
+    <!--<div class='center'>-->
+      <%# if form.object.new_record? %>
+        <%#= button Spree.t('create') %>
+      <%# else %>
+        <%#= button Spree.t('update') %>
+      <%# end %>
+      <%#= Spree.t('or') %>
+      <%# if can? :index, Spree::Supplier %>
+        <%#= link_to Spree.t('cancel'), collection_url %>
+      <%# else %>
+        <%#= link_to Spree.t('cancel'), spree.account_path %>
+      <%# end %>
+    <!--</div>-->
+  </fieldset>
+</div>

data/app/views/spree/admin/suppliers/edit.html.erb

@@ -0,0 +1,22 @@
+<% if can? :index, Spree::Supplier %>
+  <% content_for :page_actions do %>
+    <%= button_link_to Spree.t('back_to_suppliers'), spree.admin_suppliers_path, icon: 'arrow-left' %>
+  <% end %>
+<% end %>
+
+<% content_for :page_title do %>
+  <%== Spree.t(:editing_supplier) + " &ldquo;#{@object.name}&rdquo;".html_safe %>
+<% end %>
+
+<%= render 'spree/shared/error_messages', target: @object %>
+
+<%= form_for [:admin, @object] do |f| %>
+  <%= render "form", form: f %>
+  <div data-hook="supplier_right_column_wrapper" class="col-md-4"></div>
+  <%# render 'update' and 'cancel'  buttons %>
+  <div class="col-md-8">
+  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+  </div>
+<% end %>
+
+

data/app/views/spree/admin/suppliers/index.html.erb

@@ -0,0 +1,71 @@
+<%# Updated icon %>
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t('new_supplier'), new_object_url, icon: 'add', class: 'btn-success' %>
+<% end %>
+
+<% content_for :page_title do %>
+  <%= Spree.t(:listing_suppliers) %>
+<% end %>
+
+<% content_for :table_filter_title do %>
+  <%= Spree.t(:search) %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <div data-hook='admin_suppliers_filter'>
+    <%= search_form_for [:admin, @search] do |f| %>
+        <div class="form-group">
+          <%= f.label :name_cont, Spree.t(:name) %>
+          <%= f.text_field :name_cont, :size => 15, class: "form-control" %>
+        </div>
+      <div class="clear"></div>
+      <div class="form-actions" data-hook="admin_suppliers_index_search_buttons">
+        <%= button Spree.t(:search), 'search' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<%# This is a new paginate! %>
+<%= render :partial => 'spree/admin/shared/index_table_options', :locals => { :collection => @collection } %>
+
+<% if @collection.any? %>
+  <table class="table" id="listing_suppliers">
+    <thead>
+      <tr data-hook='admin_suppliers_index_headers'>
+        <th><%= sort_link @search, :name,  Spree::Supplier.human_attribute_name(:name) %></th>
+        <th><%= sort_link @search, :email, Spree::Supplier.human_attribute_name(:email) %></th>
+        <th><%= Spree.t(:users) %></th>
+        <th><%= sort_link @search, :active, Spree::Supplier.human_attribute_name(:active) %></th>
+        <th data-hook="admin_suppliers_index_header_actions" class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+    <%# Updated classes! %>
+      <%- @collection.each do |supplier| %>
+        <tr <%= "style='color: red;'" if supplier.deleted? %> id="<%= spree_dom_id supplier %>" data-hook="admin_suppliers_index_rows" class="<%= cycle('odd', 'even') %>">
+          <!--todo: Fix this link!-->
+          <td><%= link_to supplier.name, edit_object_url(supplier) %></td>
+          <td><%= mail_to supplier.email %></td>
+          <td><%= supplier.users.pluck(:email).join(', ') %></td>
+          <td><%= supplier.active %></td>
+          <td class='actions actions-3' data-hook='admin_suppliers_index_row_actions'>
+            <% unless supplier.deleted? %>
+              <%= link_to_edit supplier, :no_text => true, :class => 'edit' %>
+              <%= link_to_delete supplier, :no_text => true %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <%# New alert with link to add new supplier %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::Supplier.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), spree.new_admin_supplier_path %>!
+  </div>
+<% end %>
+
+<%# This is a new paginate! %>
+<%= render :partial => 'spree/admin/shared/index_table_options', :locals => { :collection => @collection } %>