spree_multi_vendor 2.0.1

data/app/overrides/spree/admin/users/_form.rb

@@ -0,0 +1,13 @@
+Deface::Override.new(
+  virtual_path: 'spree/admin/users/_form',
+  name: 'Add vendor select in user form',
+  insert_bottom: 'div[data-hook="admin_user_form_roles"]',
+  text: <<-HTML
+          <% if current_spree_user.respond_to?(:has_spree_role?) && current_spree_user.has_spree_role?(:admin) %>
+            <%= f.field_container :vendor_ids, class: ['form-group'] do %>
+              <%= f.label :vendor_ids, Spree.t(plural_resource_name(Spree::Vendor)) %>
+              <%= f.collection_select(:vendor_ids, Spree::Vendor.all, :id, :name, { }, { class: 'select2', multiple: true }) %>
+            <% end %>
+          <% end %>
+        HTML
+)

data/app/serializers/spree/v2/storefront/vendor_image_serializer.rb

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Storefront
+      class VendorImageSerializer < BaseSerializer
+        set_type :vendor_image
+
+        attributes :styles
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/storefront/vendor_order_totals_serializer.rb

@@ -0,0 +1,18 @@
+module Spree
+  module V2
+    module Storefront
+      class VendorOrderTotalsSerializer < BaseSerializer
+        set_type :vendor_totals
+
+        attributes :name, :subtotal, :ship_total, :total, :display_subtotal,
+                   :display_ship_total, :display_total, :promo_total,
+                   :display_promo_total, :included_tax_total,
+                   :display_included_tax_total, :additional_tax_total,
+                   :display_additional_tax_total, :item_count,
+                   :pre_tax_item_amount, :display_pre_tax_item_amount,
+                   :pre_tax_ship_amount, :display_pre_tax_ship_amount,
+                   :pre_tax_total, :display_pre_tax_total
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/storefront/vendor_serializer.rb

@@ -0,0 +1,14 @@
+module Spree
+  module V2
+    module Storefront
+      class VendorSerializer < BaseSerializer
+        set_type :vendor
+
+        attributes :name, :about_us, :slug, :contact_us
+
+        has_one :image, serializer: :vendor_image
+        has_many :products
+      end
+    end
+  end
+end

data/app/serializers/spree_multi_vendor/cart_serializer_decorator.rb

@@ -0,0 +1,19 @@
+module SpreeMultiVendor
+  module CartSerializerDecorator
+    def self.prepended(base)
+      base.has_many :vendors,
+                    serializer: ::Spree::V2::Storefront::VendorSerializer,
+                    record_type: :vendor,
+                    id_method_name: :vendor_ids,
+                    object_method_name: :vendor_list
+
+      base.has_many :vendor_totals,
+                    serializer: ::Spree::V2::Storefront::VendorOrderTotalsSerializer,
+                    record_type: :vendor_totals,
+                    id_method_name: :vendor_ids,
+                    object_method_name: :vendor_totals
+    end
+  end
+end
+
+Spree::V2::Storefront::CartSerializer.prepend(SpreeMultiVendor::CartSerializerDecorator)

data/app/serializers/spree_multi_vendor/serializer_decorator.rb

@@ -0,0 +1,23 @@
+module SpreeMultiVendor
+  module SerializerDecorator
+    def self.prepended(base)
+      base.belongs_to :vendor, serializer: ::Spree::V2::Storefront::VendorSerializer
+    end
+  end
+end
+
+SpreeMultiVendor.vendorized_models.each do |model|
+  serializer_class_name = "Spree::V2::Storefront::#{model.to_s.demodulize}Serializer".constantize
+
+  serializer_class_name.prepend(SpreeMultiVendor::SerializerDecorator)
+rescue
+end
+
+# Variant model accesses Vendor via Product if not associated directly
+unless SpreeMultiVendor.vendorized_models.include?(Spree::Variant)
+  Spree::V2::Storefront::VariantSerializer.prepend(SpreeMultiVendor::SerializerDecorator)
+end
+
+unless SpreeMultiVendor.vendorized_models.include?(Spree::LineItem)
+  Spree::V2::Storefront::LineItemSerializer.prepend(SpreeMultiVendor::SerializerDecorator)
+end

data/app/services/spree/orders/generate_commissions.rb

@@ -0,0 +1,34 @@
+module Spree
+  module Orders
+    class GenerateCommissions
+      prepend Spree::ServiceModule::Base
+
+      def call(order:)
+        ActiveRecord::Base.transaction do
+          run :generate_order_commissions
+        end
+      end
+
+      private
+
+      def generate_order_commissions(order:)
+        return failure(order) unless order.state == 'complete'
+
+        order.vendor_list.each do |vendor|
+          amount = if vendor.commission_rate.zero?
+                     0.0
+                   else
+                     order.vendor_pre_tax_item_amount(vendor) * vendor.commission_rate / 100
+                   end
+
+          order.commissions.create!(
+            amount: amount,
+            vendor_id: vendor.id
+          )
+        end
+
+        success(order: order)
+      end
+    end
+  end
+end

data/app/views/spree/admin/translations/vendor.html.erb

@@ -0,0 +1,21 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:editing_resource, resource: Spree::Vendor.model_name.human) %>
+<% end %>
+
+<%= render 'settings' %>
+
+<div class="row translations">
+  <div class="col-md-4">
+    <%= render 'fields' %>
+  </div>
+  <div class="col-md-8">
+    <%= form_for [:admin, @resource.id, @resource], url: spree.admin_vendor_path(@vendor.id) do |f| %>
+      <%= render 'form_fields', f: f %>
+      <div class="form-actions" data-hook="buttons">
+        <%= button Spree.t(:update), 'update' %>
+        <span class="or"><%= Spree.t(:or) %></span>
+        <%= button_link_to Spree.t(:cancel), spree.edit_admin_vendor_url(@vendor.id), icon: 'remove' %>
+      </div>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,47 @@
+<% content_for :page_title do %>
+  <%= @vendor.name %>
+<% end %>
+
+<%= form_for [:admin, @vendor], url: admin_vendor_settings_url do |f| %>
+  <fieldset>
+    <%= render partial: 'spree/shared/error_messages', locals: { target: @vendor } %>
+    <div class="form-group">
+      <%= f.field_container :name do %>
+        <%= f.label :name %>
+        <%= f.text_field :name, class: 'form-control' %>
+      <% end %>
+    </div>
+    <% if Spree.version.to_f >= 3.6 %>
+      <div class="form-group">
+        <%= f.field_container :image do %>
+          <%= f.label :image %>
+          <%= f.file_field :image %>
+          <%= image_tag main_app.url_for(@vendor.image.url(:small)) if @vendor.image %>
+        <% end %>
+      </div>
+    <% end %>
+    <div class="form-group">
+      <%= f.field_container :about_us do %>
+        <%= f.label :about_us %>
+        <%= f.text_area :about_us, class: 'form-control' %>
+      <% end %>
+    </div>
+    <div class="form-group">
+      <%= f.field_container :contact_us do %>
+        <%= f.label :contact_us %>
+        <%= f.text_area :contact_us, class: 'form-control' %>
+      <% end %>
+    </div>
+    <div class="form-group">
+      <%= f.field_container :notification_email do %>
+        <%= f.label :notification_email %>
+        <%= f.email_field :notification_email, class: 'form-control' %>
+      <% end %>
+    </div>
+    <div class="form-actions" data-hook="buttons">
+      <%= button Spree.t('actions.update'), 'save' %>
+      <span class="or"><%= Spree.t(:or) %></span>
+      <%= button_link_to Spree.t('actions.cancel'), admin_vendor_settings_url, icon: 'delete' %>
+    </div>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,36 @@
+<%= render partial: 'spree/shared/error_messages', locals: { target: @vendor } %>
+<div class="form-group">
+  <%= f.field_container :name do %>
+    <%= f.label :name %>
+    <%= f.text_field :name, class: 'form-control' %>
+  <% end %>
+  <%= f.field_container :about_us do %>
+    <%= f.label :about_us %>
+    <%= f.text_area :about_us, class: 'form-control' %>
+  <% end %>
+  <%= f.field_container :contact_us do %>
+    <%= f.label :contact_us %>
+    <%= f.text_area :contact_us, class: 'form-control' %>
+  <% end %>
+  <%= f.field_container :state do %>
+    <%= f.label :state %>
+    <%= f.select :state,
+      options_for_select(vendor_state_options, selected: @vendor.state),
+      {}, class: 'select2', required: :required %>
+  <% end %>
+  <% if Spree.version.to_f >= 3.6 %>
+    <%= f.field_container :image do %>
+      <%= f.label :image %>
+      <%= f.file_field :image %>
+      <%= image_tag main_app.url_for(@vendor.image.url(:small)) if @vendor.image %>
+    <% end %>
+  <% end %>
+  <%= f.field_container :commission_rate do %>
+    <%= f.label :commission_rate %>
+    <%= f.number_field :commission_rate, step: '0.01', class: 'form-control' %>
+  <% end %>
+  <%= f.field_container :notification_email do%>
+    <%= f.label :notification_email %>
+    <%= f.email_field :notification_email, class: 'form-control' %>
+  <% end %>
+</div>

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

@@ -0,0 +1,11 @@
+<% content_for :page_title do %>
+  <%= link_to plural_resource_name(Spree::Vendor), spree.admin_vendors_url %> /
+  <%= @vendor.name %>
+<% end %>
+
+<%= form_for [:admin, @vendor] do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,83 @@
+<% content_for :page_title do %>
+  <%= Spree.t(plural_resource_name(Spree::Vendor)) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:new_vendor), new_object_url, { class: "btn-success", icon: 'add', id: 'admin_new_vendor' } %>
+<% end if can?(:create, Spree::Vendor) %>
+
+<% content_for :table_filter do %>
+  <div data-hook="admin_vendors_index_search">
+    <%= search_form_for [:admin, @search] do |f| %>
+      <div class="row">
+        <div class="col-md-6">
+          <div class="form-group">
+            <%= label_tag :q_name_cont, Spree.t(:name) %>
+            <%= f.text_field :name_cont, tabindex: 1, class: "form-control js-quick-search-target" %>
+          </div>
+        </div>
+        <div class="col-md-6">
+          <div class="form-group">
+            <%= label_tag :q_state_in, Spree.t(:state) %>
+            <%= f.select :state_in, options_for_select(vendor_state_options), { multiple: 'please select' }, class: 'select2', multiple: true %>
+          </div>
+        </div>
+      </div>
+      <div data-hook="admin_vendors_index_search_buttons" class="form-actions">
+        <%= button Spree.t(:filter_results), 'search' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %>
+
+<% if @vendors.any? %>
+  <table class="table sortable" data-hook="vendors_table" data-sortable-link="<%= update_positions_admin_vendors_url %>">
+    <thead>
+      <tr data-hook="vendors_header">
+        <th>
+          <%= Spree.t(:user) %>
+        </th>
+        <th>
+          <%= sort_link @search, :name, I18n.t(:name, scope: 'activerecord.attributes.spree/vendor') %>
+        </th>
+        <th>
+          <%= sort_link @search, :state, I18n.t(:state, scope: 'activerecord.attributes.spree/vendor') %>
+        </th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @vendors.each do |vendor| %>
+        <tr id="<%= spree_dom_id vendor %>" data-hook="vendors_row">
+          <td>
+            <%= vendor.users.first.email rescue nil %>
+          </td>
+          <td>
+            <%= vendor.name %>
+          </td>
+          <td>
+            <span class="label label-<%= vendor.state.downcase %>"><%= vendor.state.humanize.downcase %></span>
+            <span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_state_eq" data-ransack-value="<%= vendor.state %>"></span>
+          </td>
+          <td class="actions actions-2 text-right">
+            <%= link_to_edit vendor, no_text: true, class: 'edit' if can?(:edit, vendor) %>
+            <!-- Add translation icon support -->
+            <%= link_to_with_icon 'translate',
+                                  nil,
+                                  spree.admin_translations_path('vendor', vendor.id),
+                                  title: Spree.t(:'i18n.translations'),
+                                  class: 'btn btn-sm btn-primary' if defined? (SpreeGlobalize)%>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alert alert-info alpha twelve columns no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Vendor)) %>
+  </div>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %>

data/app/views/spree/admin/vendors/new.html.erb

@@ -0,0 +1,11 @@
+<% content_for :page_title do %>
+  <%= link_to plural_resource_name(Spree::Vendor), spree.admin_vendors_url %> /
+  <%= Spree.t(:new_vendor) %>
+<% end %>
+
+<%= form_for [:admin, @vendor] do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

data/app/views/spree/vendor_mailer/vendor_notification_email.html.erb

@@ -0,0 +1,81 @@
+<table class="row header">
+  <tr>
+    <td>
+      <p class="lede">
+        <%= Spree.t('order_mailer.vendor_notification_email.dear_vendor') %>
+      </p>
+      <p>
+        <%= Spree.t('order_mailer.vendor_notification_email.order_summary', number: @order.number) %>
+      </p>
+      <table class="container">
+        <tr>
+          <td class="wrapper last">
+            <table class="twelve columns">
+              <%= render collection: @line_items, partial: 'spree/shared/mailer_line_item', as: :line_item %>
+              <tr>
+                <td class="six sub-columns">
+                  <%= Spree.t('order_mailer.subtotal') %>
+                </td>
+                <td class="six sub-columns last right">
+                  <%= Spree::Money.new(@subtotal, currency: @order.currency) %>
+                </td>
+              </tr>
+              <% if @order.line_item_adjustments.exists? %>
+                <% if @order.all_adjustments.promotion.eligible.exists? %>
+                  <% @order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+                    <tr>
+                      <td class="six sub-columns">
+                        <%= Spree.t(:promotion) %> <%= label %>:
+                      </td>
+                      <td class="six sub-columns last right">
+                        <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
+                      </td>
+                    </tr>
+                  <% end %>
+                <% end %>
+              <% end %>
+              <% @order.shipments.for_vendor(@vendor).group_by { |s| s.selected_shipping_rate.try(:name) }.each do |name, shipments| %>
+                <tr>
+                  <td class="six sub-columns">
+                    <%= Spree.t(:shipping) %> <%= name %>:
+                  </td>
+                  <td class="six sub-columns last right">
+                    <%= Spree::Money.new(shipments.sum(&:discounted_cost), currency: @order.currency) %>
+                  </td>
+                </tr>
+              <% end %>
+              <% if @order.all_adjustments.eligible.tax.exists? %>
+                <% @order.all_adjustments.eligible.tax.group_by(&:label).each do |label, adjustments| %>
+                  <tr>
+                    <td class="six sub-columns">
+                      <%= Spree.t(:tax) %> <%= label %>:
+                    </td>
+                    <td class="six sub-columns last right">
+                      <%= Spree::Money.new(adjustments.sum(&:amount), currency: @order.currency) %>
+                    </td>
+                  </tr>
+                <% end %>
+              <% end %>
+              <% @order.adjustments.eligible.each do |adjustment| %>
+                <% next if (adjustment.source_type == 'Spree::TaxRate') || (adjustment.amount == 0) %>
+                <%= render 'spree/order_mailer/adjustment', adjustment: adjustment %>
+              <% end %>
+              <tr>
+                <td class="six sub-columns">
+                  <strong><%= Spree.t('order_mailer.total') %></strong>
+                </td>
+                <td class="six sub-columns last right">
+                  <strong><%= Spree::Money.new(@total, currency: @order.currency) %></strong>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+      <p>
+        <%= Spree.t('order_mailer.vendor_notification_email.thanks') %>
+      </p>
+    </td>
+    <td class="expander"></td>
+  </tr>
+</table>