solidus_marketplace 0.1.0

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

@@ -0,0 +1,198 @@
+<div data-hook="admin_product_form_fields">
+
+  <div class="row">
+
+    <div class="left col-9" data-hook="admin_product_form_left">
+      <div data-hook="admin_product_form_name">
+        <%= f.field_container :name do %>
+          <%= f.label :name, class: 'required' %>
+          <%= f.text_field :name, class: 'fullwidth title', required: true %>
+          <%= f.error_message_on :name %>
+        <% end %>
+      </div>
+
+      <div data-hook="admin_product_form_slug">
+        <%= f.field_container :slug do %>
+          <%= f.label :slug, class: 'required' %>
+          <%= f.text_field :slug, class: 'fullwidth title', required: true %>
+          <%= f.error_message_on :slug %>
+        <% end %>
+      </div>
+
+      <div data-hook="admin_product_form_description">
+        <%= f.field_container :description do %>
+          <%= f.label :description %>
+          <%= f.text_area :description, {rows: "#{unless @product.has_variants? then '22' else '15' end}", class: 'fullwidth'} %>
+          <%= f.error_message_on :description %>
+        <% end %>
+      </div>
+    </div>
+
+    <div class="right col-3" data-hook="admin_product_form_right">
+      <div data-hook="admin_product_form_price">
+        <%= f.field_container :price do %>
+          <%= f.label :price, class: 'required' %>
+          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price,
+                     currency: Spree::Config.default_pricing_options.currency %>
+          <%= f.error_message_on :price %>
+        <% end %>
+      </div>
+
+      <% if show_rebuild_vat_checkbox? %>
+        <%= render "spree/admin/shared/rebuild_vat_prices_checkbox", form: f, model_name: "product" %>
+        <div class="clearfix"></div>
+      <% end %>
+
+      <div class="row">
+
+        <div data-hook="admin_product_form_cost_price" class="col-12">
+          <%= f.field_container :cost_price do %>
+            <%= f.label :cost_price %>
+
+            <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :cost_price, currency_attr: :cost_currency %>
+
+            <%= f.error_message_on :cost_price %>
+            <%= f.error_message_on :cost_currency %>
+          <% end %>
+        </div>
+      </div>
+
+      <div class="clear"></div>
+
+      <div data-hook="admin_product_form_available_on">
+        <%= f.field_container :available_on do %>
+          <%= f.label :available_on %>
+          <%= f.error_message_on :available_on %>
+          <%= f.text_field :available_on, value: datepicker_field_value(@product.available_on), class: 'datepicker' %>
+        <% end %>
+      </div>
+
+      <div data-hook="admin_product_form_promotionable">
+        <%= f.field_container :promotionable do %>
+          <%= f.label :promotionable do %>
+            <%= f.check_box :promotionable %> <%= Spree::Product.human_attribute_name(:promotionable) %>
+          <% end %>
+          <%= f.field_hint :promotionable %>
+        <% end %>
+      </div>
+
+      <% if @product.has_variants? %>
+        <div data-hook="admin_product_form_multiple_variants">
+          <%= f.label :skus, Spree.t(:skus) %>
+          <span class="info">
+            <%= Spree.t(:info_product_has_multiple_skus, count: @product.variants.count) %>
+            <ul class="text_list">
+              <% @product.variants.first(5).each do |variant| %>
+                <li><%= link_to variant.sku, spree.edit_admin_product_variant_path(@product, variant) %></li>
+              <% end %>
+            </ul>
+            <% if @product.variants.count > 5 %>
+              <%= Spree.t(:info_number_of_skus_not_shown, count: @product.variants.count - 5) %>
+            <% end %>
+          </span>
+          <div class="info-actions">
+            <% if can?(:admin, Spree::Variant) %>
+              <%= link_to_with_icon 'th-large', Spree.t(:manage_variants), admin_product_variants_url(@product) %>
+            <% end %>
+          </div>
+        </div>
+      <% else %>
+        <div data-hook="admin_product_form_sku">
+          <%= f.field_container :sku do %>
+            <%= f.label :sku, Spree::Variant.human_attribute_name(:sku) %>
+            <%= f.text_field :sku, size: 16 %>
+          <% end %>
+        </div>
+
+        <div id="shipping_specs" class="row">
+          <% [:height, :width, :depth, :weight].each_with_index do |field, index| %>
+            <div id="shipping_specs_<%= field %>_field" class="col-6">
+              <div class="field">
+                <%= f.label field %>
+                <%= f.text_field field, value: number_with_precision(@product.send(field), precision: 2) %>
+              </div>
+            </div>
+          <% end %>
+        </div>
+
+      <% end %>
+
+      <div data-hook="admin_product_form_shipping_categories">
+        <%= f.field_container :shipping_categories do %>
+          <%= f.label :shipping_category_id, Spree::ShippingCategory.model_name.human %>
+          <%= f.field_hint :shipping_category %>
+          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select' }) %>
+          <%= f.error_message_on :shipping_category %>
+        <% end %>
+      </div>
+
+      <div data-hook="admin_product_form_tax_category">
+        <%= f.field_container :tax_category do %>
+          <%= f.label :tax_category_id, Spree::TaxCategory.model_name.human %>
+          <%= f.field_hint :tax_category %>
+          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select' }) %>
+          <%= f.error_message_on :tax_category %>
+        <% end %>
+      </div>
+    </div>
+
+  </div>
+
+  <div class="row">
+
+    <div class="col-9">
+      <% if try_spree_current_user.market_maker? %>
+        <div data-hook="admin_product_form_suppliers">
+          <%= f.field_container :suppliers do %>
+            <%= f.label :supplier_ids, plural_resource_name(Spree::Supplier) %><br />
+            <%= f.hidden_field :supplier_ids, value: @product.supplier_ids.join(',') %>
+          <% end %>
+        </div>
+      <% end %>
+
+      <div data-hook="admin_product_form_taxons">
+        <%= f.field_container :taxons do %>
+          <%= f.label :taxon_ids, plural_resource_name(Spree::Taxon) %><br />
+          <%= f.hidden_field :taxon_ids, value: @product.taxon_ids.join(',') %>
+        <% end %>
+      </div>
+
+      <div data-hook="admin_product_form_option_types">
+        <%= f.field_container :option_types do %>
+          <%= f.label :option_type_ids, plural_resource_name(Spree::OptionType) %>
+          <%= f.hidden_field :option_type_ids, value: @product.option_type_ids.join(',') %>
+        <% end %>
+      </div>
+
+      <div data-hook="admin_product_form_meta">
+        <div data-hook="admin_product_form_meta_title">
+          <%= f.field_container :meta_title do %>
+            <%= f.label :meta_title %>
+            <%= f.text_field :meta_title, class: 'fullwidth' %>
+          <% end %>
+        </div>
+
+        <div data-hook="admin_product_form_meta_keywords">
+          <%= f.field_container :meta_keywords do %>
+            <%= f.label :meta_keywords %>
+            <%= f.text_field :meta_keywords, class: 'fullwidth' %>
+          <% end %>
+        </div>
+
+        <div data-hook="admin_product_form_meta_description">
+          <%= f.field_container :meta_description do %>
+            <%= f.label :meta_description %>
+            <%= f.text_field :meta_description, class: 'fullwidth' %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+
+  </div>
+
+  <div class="clear"></div>
+
+  <div data-hook="admin_product_form_additional_fields"></div>
+
+  <div class="clear"></div>
+</div>

data/app/views/spree/admin/reports/earnings.html.erb

@@ -0,0 +1,34 @@
+<% admin_breadcrumb(link_to t('spree.reports'), spree.admin_reports_path) %>
+<% admin_breadcrumb(t('spree.earnings')) %>
+
+<% content_for :page_actions do %>
+<% end %>
+
+<% content_for :table_filter_title do %>
+  <%= t('spree.date_range') %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <%= render partial: 'spree/admin/shared/report_order_criteria', locals: { action: :earnings } %>
+<% end %>
+
+<table class="admin-report" data-hook="earnings">
+  <thead>
+    <tr>
+      <th><%= t('spree.supplier') %></th>
+      <th><%= t('spree.supplier_paypal_email') %></th>
+      <th><%= t('spree.supplier_earnings') %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @supplier_earnings.each do |supplier_earnings| %>
+      <tr>
+        <td><%= supplier_earnings[:name] %></td>
+        <td><%= supplier_earnings[:paypal_email] %></td>
+        <td><%= supplier_earnings[:earnings].to_html %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= link_to "Export Earnings CSV", earnings_admin_reports_url(format: "csv") %>

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

@@ -0,0 +1 @@
+<%= configurations_sidebar_menu_item Spree.t(:marketplace_settings), spree.edit_admin_marketplace_settings_path %>

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

@@ -0,0 +1,4 @@
+<% if try_spree_current_user && try_spree_current_user.supplier? %>
+  <%= tab :profile, url: spree.edit_admin_supplier_url(spree_current_user.supplier_id), match_path: '/suppliers', icon: 'user' %>
+<% end %>
+

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,93 @@
+<% admin_breadcrumb(plural_resource_name(Spree::Shipment)) %>
+
+<% 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! %>
+<%= paginate @shipments, theme: "solidus_admin" %>
+
+<% 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! %>
+<%= paginate @shipments, theme: "solidus_admin" %>

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

@@ -0,0 +1,75 @@
+<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 :paypal_email, class: ['form-group'] do %>
+      <%= form.label :paypal_email, Spree::Supplier.human_attribute_name(:paypal_email) %>:<br />
+      <%= form.email_field :paypal_email, :class => 'form-control' %>
+      <%# email validation %>
+      <%= error_message_on :user, :paypal_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 fullwidth' %>
+      <% 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 %>
+
+