solidus_backend 1.1.4 → 1.2.0.beta1

data/app/views/spree/admin/style_guide/topics/forms/_validation.html.erb

@@ -0,0 +1,14 @@
+<div class="errorExplanation">
+  <h2>2 errors prohibited this record from being saved:</h2>
+  <p>There were problems with the following fields:</p>
+  <ul>
+    <li>Email can't be blank</li>
+    <li>Password can't be blank</li>
+  </ul>
+</div>
+
+<div class="field withError">
+  <span class="field_with_errors"><label for="user_name">Name</label></span>
+    <span class="field_with_errors"><input class="fullwidth" type="text" name="user[name]" id="user_name"></span>
+  <span class="formError">can't be blank</span>
+</div>

data/app/views/spree/admin/style_guide/topics/messaging/_flashes.html.erb

@@ -0,0 +1,13 @@
+<button class="trigger-flash" data-flash-type="success">Success</button>
+<button class="trigger-flash" data-flash-type="notice">Warning</button>
+<button class="trigger-flash" data-flash-type="error">Error</button>
+
+<script>
+  $('.trigger-flash').on('click', function(){
+    type = $(this).data('flashType');
+    flash = $("<div class='flash'>")
+      .text(type)
+      .addClass(type)
+      .appendTo('.js-flash-wrapper');
+  });
+</script>

data/app/views/spree/admin/style_guide/topics/messaging/_loading.html.erb

@@ -0,0 +1,20 @@
+<%- snippet = capture do %>
+  <div id="progress">
+    <div class="wrapper">
+      <div id="spinner" class="spinner"></div>
+      <div class="progress-message"><%= Spree.t(:loading) %>...</div>
+    </div>
+  </div>
+<%- end %>
+
+<div class="style-guide-result">
+  <%= snippet %>
+</div>
+
+<button id="loading-test-button">Toggle Loading</button>
+
+<script>
+  $('#loading-test-button').on('click', function(){
+    $("#progress").toggle()
+  });
+</script>

data/app/views/spree/admin/style_guide/topics/messaging/_tooltips.html.erb

@@ -0,0 +1,16 @@
+<%- snippet = capture do %>
+  <a class="with-tip" title="This will be the tooltip text." href="#">Some Link With Tip</a>
+<%- end %>
+
+<p>
+  We are using <a href="http://stevenbenner.github.io/jquery-powertip/">jQuery PowerTip</a>
+  with the class <code>.with-tip</code> as a trigger.
+</p>
+
+<p class="style-guide-result">
+  <%= snippet %>
+</p>
+
+<div class="style-guide-code">
+  <pre><code class="language-html"><%= escape_once snippet %></code></pre>
+</div>

data/app/views/spree/admin/style_guide/topics/tables/_building_tables.html.erb

@@ -0,0 +1,44 @@
+<%- snippet = capture do %>
+  <table>
+    <thead>
+      <tr>
+        <th colspan="2">Item Description</th>
+        <th>Price</th>
+        <th>Quantity</th>
+        <th>Total</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <tr>
+        <td class="item-image">
+          <img src="http://placehold.it/50x50">
+        </td>
+        <td>
+          Ruby on Rails Bag<br>
+          SKU: ROR-00012
+        </td>
+        <td class="align-center">$22.99</td>
+        <td class="align-center">1 x on hand</td>
+        <td class="align-center">$22.99</td>
+      </tr>
+      <tr>
+        <td colspan="4">UPS Ground (USD)</td>
+        <td class="align-center">
+          <span>$5.00</span>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="5">No tracking details provided.</td>
+      </tr>
+    </tbody>
+  </table>
+<%- end %>
+
+<div class="style-guide-result">
+  <%= snippet %>
+</div>
+
+<div class="style-guide-code">
+  <pre><code class="language-html"><%= escape_once snippet %></code></pre>
+</div>

data/app/views/spree/admin/style_guide/topics/tables/_pagination.html.erb

@@ -0,0 +1,11 @@
+<nav class="pagination">
+  <span class="first"><a href="#">« First</a></span>
+  <span class="prev"><a href="#">‹ Prev</a></span>
+  <span class="page"><a href="#">1</a></span>
+  <span class="page"><a href="#">2</a></span>
+  <span class="page current">3</span>
+  <span class="page"><a href="#">4</a></span>
+  <span class="page"><a href="#">5</a></span>
+  <span class="next"><a href="#">Next ›</a></span>
+  <span class="last"><a href="#">Last »</a></span>
+</nav>

data/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb

@@ -0,0 +1,64 @@
+<%- snippet = capture do %>
+  <p>where the html example goes</p>
+<%- end %>
+
+<p>
+  The Solidus UI is made up mostly of a grey color palette with blue being used for interactive elements and red, green and yellow being used to give visual context to messaging.
+</p>
+
+<%-
+colors = [
+  {
+    name: '$color-1',
+    value: '#FFFFFF',
+    used_for: 'Backgrounds.'
+  },
+  {
+    name: '$color-2',
+    value: '#9FC820',
+    used_for: 'Active states.'
+  },
+  {
+    name: '$color-3',
+    value: '#5498DA',
+    used_for: 'Buttons, links, form text.'
+  },
+  {
+    name: '$color-4',
+    value: '#6788A2',
+    used_for: 'Non-interactive text outside of form fields.'
+  },
+  {
+    name: '$color-5',
+    value: '#C60F13',
+    used_for: 'Errors, destructive action warnings.'
+  },
+  {
+    name: '$color-6',
+    value: '#FF9300',
+    used_for: 'Warnings'
+  },
+  {
+    name: '$color-7',
+    value: '#F4F4F4',
+    used_for: 'Disabled states'
+  }
+]
+
+%>
+
+<div class="color-variables">
+  <%- colors.each do |color| %>
+    <div class="color-variable">
+      <div class="color-swatch" style="background-color: <%= color[:value] %>"></div>
+      <dl class="color-variable-details">
+        <dt>Color:</dt>
+        <dd><%= color[:value] %></dd>
+        <dt>Sass:</dt>
+        <dd><code><%= color[:name] %></code></dd>
+        <dt>For:</dt>
+        <dd><%= color[:used_for] %></dd>
+      </dl>
+    </div>
+  <%- end %>
+</div>

data/app/views/spree/admin/style_guide/topics/typography/_fonts.html.erb

@@ -0,0 +1,19 @@
+<div class="half">
+  <p>
+    The typography base is "Open Sans" and Helvetica which we leave to the browser to provide.
+    Set at 13px with no specified line-height.
+  </p>
+
+  <p>
+    Headings use the same font stack of the body text. They are bold with a line-height of 1.1.
+  </p>
+</div>
+
+<div class="half">
+  <h1>h1. This is a very large header.</h1>
+  <h2>h2. This is a large header.</h2>
+  <h3>h3. This is a medium header.</h3>
+  <h4>h4. This is a moderate header.</h4>
+  <h5>h5. This is a small header.</h5>
+  <h6>h6. This is a tiny header.</h6>
+</div>

data/app/views/spree/admin/style_guide/topics/typography/_icons.html.erb

@@ -0,0 +1,13 @@
+<div class="half">
+  <p>Icons are provided by <a href="https://fortawesome.github.io/Font-Awesome/cheatsheet/">
+  Font Awesome</a>. There are also a number of helpers for inserting icons, links, and buttons. </p>
+</div>
+
+<div class="style-guide-code half">
+  <pre><code class="language-ruby">
+    icon('fa fa-user')
+    link_to_with_icon('send', 'link text', '#')
+    button('button text', 'trash')
+    button_link_to('button link text', '#', icon: 'globe')
+  </code></pre>
+</div>

data/app/views/spree/admin/style_guide/topics/typography/_lists.html.erb

@@ -0,0 +1,25 @@
+<p>
+  Unordered lists have been stripped of all padding and margin.
+</p>
+
+<ul>
+  <li>Unordered list of things</li>
+  <li>List item
+  <ul>
+    <li>Nested list item</li>
+    <li>Nested list item</li>
+  </ul>
+  </li>
+  <li>List item</li>
+</ul>
+
+<p>
+  Definition lists have a fluid 40%/60% layout with some font changes.
+</p>
+
+<dl>
+  <dt>Description</dt>
+  <dd>List</dd>
+  <dt>Term</dt>
+  <dd>Description</dd>
+</ul>

data/app/views/spree/admin/style_guide/topics/typography/_tags.html.erb

@@ -0,0 +1,25 @@
+<%- snippet = capture do %>
+  <span class="state ready">ready</span>
+  <span class="state paid">paid</span>
+  <span class="state complete">complete</span>
+  <span class="state completed">completed</span>
+  <span class="state balance_due">balance due</span>
+  <span class="state pending">pending</span>
+  <span class="state checkout">checkout</span>
+  <span class="state credit_owed">credit owed</span>
+  <span class="state void">void</span>
+  <span class="state address">address</span>
+<%- end %>
+
+<div class="half">
+  <p>
+    3 different visual states to describe ok/success, warnings and errors.
+  </p>
+  <p class="tags">
+    <%= snippet %>
+  </p>
+</div>
+
+<div class="style-guide-code half">
+  <pre><code class="language-html"><%= escape_once snippet %></code></pre>
+</div>

data/app/views/spree/admin/taxonomies/edit.erb

@@ -1,5 +1,6 @@
 <%= render :partial => 'spree/admin/shared/configuration_menu' %>
 
+<%= render :partial => 'spree/admin/taxons/list_template' %>
 <%= render :partial => 'js_head' %>
 
 <% content_for :page_title do %>
@@ -10,10 +11,11 @@
   <li>
     <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'arrow-left' %>
   </li>
+  <li>
+    <%= button_link_to Spree.t(:add_taxon), spree.admin_taxonomies_path, { icon: 'plus', class: 'add-taxon-button' } %>
+  </li>
 <% end %>
 
-<div id="ajax_error" class="errorExplanation" style="display:none;"></div>
-
 <%= form_for [:admin, @taxonomy] do |f| %>
   <fieldset class="no-border-top">
     <%= render :partial => 'form', :locals => { :f => f } %>
@@ -26,14 +28,11 @@
 
 
   <div>
-    <%= label_tag nil, Spree.t(:tree) %><br />
     <script>
+      Spree.routes.taxonomy_path = "<%= spree.api_taxonomy_path(@taxonomy) %>";
       Spree.routes.taxonomy_taxons_path = "<%= spree.api_taxonomy_taxons_path(@taxonomy) %>";
       Spree.routes.admin_taxonomy_taxons_path = "<%= spree.admin_taxonomy_taxons_path(@taxonomy) %>";
-      Spree.routes.jstree_theme_path = "<%= stylesheet_path("jquery.jstree/themes/apple/style.css") %>";
     </script>
     <div id="taxonomy_tree" class="tree"></div>
-
-    <div class="info"><%= Spree.t(:taxonomy_tree_instruction) %></div>
   </div>
 <% end %>

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

@@ -12,8 +12,6 @@
   <% end %>
 <% end %>
 
-<%= render 'spree/admin/shared/product_sub_menu' %>
-
 <% if @taxonomies.any? %>
 <div id="list-taxonomies" data-hook>
   <%= render 'list' %>

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

@@ -10,8 +10,6 @@
   </li>
 <% end %>
 
-<%= render 'spree/admin/shared/product_sub_menu' %>
-
 <%= form_for [:admin, @taxonomy] do |f| %>
 
   <%= render :partial => 'form', :locals => { :f => f } %>

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

@@ -38,7 +38,7 @@
       <%= f.text_field :meta_description, :class => 'fullwidth', :rows => 6 %>
     <% end %>
 
-    <%= f.field_container :meta_description do %>
+    <%= f.field_container :meta_keywords do %>
       <%= f.label :meta_keywords, Spree.t(:meta_keywords) %><br />
       <%= f.text_field :meta_keywords, :class => 'fullwidth', :rows => 6 %>
     <% end %>

data/app/views/spree/admin/taxons/_list_template.html.erb

@@ -0,0 +1,17 @@
+<script type="text/template" id="taxons-list-template">
+  {{#each taxons}}
+  <li data-taxon-id="{{id}}" data-taxon-taxonomy-id="{{taxonomy_id}}">
+    <div  class="sortable-handle">
+      {{#if (isRootTaxon) }}{{else}}<i class="fa fa-arrows"></i>{{/if}}
+      {{name}}
+      <div class="actions right">
+        <a href="/admin/taxonomies/{{taxonomy_id}}/taxons/{{id}}/edit" class="fa fa-edit icon_link with-tip no-text"></a>
+        <a href="#" class="delete-taxon-button fa fa-trash icon_link with-tip no-text"></a>
+      </div>
+    </div>
+    <ul>
+      {{> taxons}}
+    </ul>
+  </li>
+  {{/each}}
+</script>

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

@@ -12,9 +12,6 @@
   </div>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <div class='sixteen columns'>
   <div id='taxon_products' class='list-group'></div>
 </div>
-

data/app/views/spree/admin/users/orders.html.erb

@@ -12,7 +12,7 @@
 
   <% if @orders.any? %>
     <%# TODO add search interface %>
-    <table class="index responsive" id="listing_orders" data-hook>
+    <table class="index" id="listing_orders" data-hook>
       <colgroup>
          <col style="width: 25%;">
          <col style="width: 25%;">

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

@@ -1,5 +1,3 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Variants' } %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @variant } %>

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

@@ -1,5 +1,3 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => {:current => 'Variants'} %>
 
 <%# Place for new variant form %>

data/app/views/spree/layouts/admin.html.erb

@@ -9,7 +9,9 @@
   </head>
 
   <body class='admin'>
-    <div id='wrapper' data-hook>
+    <%= render partial: 'spree/admin/shared/navigation' %>
+
+    <div class='main-content' id='wrapper' data-hook>
 
       <div class="flash-wrapper js-flash-wrapper">
         <% if flash[:error] %>
@@ -30,9 +32,6 @@
         </div>
       </div>
 
-      <%= render :partial => 'spree/admin/shared/header' %>
-      <%= render :partial => 'spree/admin/shared/menu' %>
-      <%= render :partial => 'spree/admin/shared/sub_menu' %>
       <%= render :partial => 'spree/admin/shared/content_header' %>
 
       <div class="container">

data/app/views/spree/layouts/admin_style_guide.html.erb

@@ -0,0 +1,58 @@
+<!doctype html>
+<html lang="<%= I18n.locale %>">
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+    <title>Solidus Style Guide</title>
+
+    <%= stylesheet_link_tag "spree/backend/all" %>
+    <%= javascript_include_tag "spree/backend/all" %>
+    <%= render "spree/admin/shared/translations" %>
+  </head>
+
+  <body class="admin style-guide">
+
+    <div class="style-guide-sidebar">
+      <header>
+        <%= link_to spree.admin_path, class: 'brand-link' do %>
+          <%- image_tag('solidus-style-guide-logo.png') %>
+        <%- end %>
+      </header>
+      <ul class="style-guide-nav" data-sticky>
+        <%- @topics.each do |topic, subjects| %>
+          <li>
+            <%= link_to topic, "##{topic}" %>
+            <ul>
+              <%- subjects.each do |subject| %>
+                <li>
+                  <%= link_to subject.titleize, "##{subject}" %>
+                </li>
+              <%- end %>
+            </ul>
+          </li>
+        <%- end %>
+      </ul>
+    </div>
+
+    <div class="style-guide-main-content">
+      <div class="flash-wrapper js-flash-wrapper"></div>
+
+      <div class="container">
+        <div class="style-guide-intro">
+          <%= yield %>
+        </div>
+
+        <%- @topics.each do |topic, subjects| %>
+          <h2><%= link_to '', "#", id: "#{topic}" %></h2>
+          <%- subjects.each do |subject| %>
+            <section class="style-guide-section">
+              <h3 class="style-guide-section-header">
+                <span><%= link_to subject.titleize, "#", id: "#{subject}" %></span>
+              </h3>
+              <%= render partial: "spree/admin/style_guide/topics/#{topic}/#{subject}" %>
+            </section>
+          <%- end %>
+        <%- end %>
+      </div>
+    </div>
+  </body>
+</html>

data/config/routes.rb

@@ -87,8 +87,8 @@ Spree::Core::Engine.add_routes do
         get :confirm
         put :complete
         post :resend
-        get :open_adjustments
-        get :close_adjustments
+        get "/adjustments/unfinalize", to: "orders#unfinalize_adjustments"
+        get "/adjustments/finalize", to: "orders#finalize_adjustments"
         put :approve
         put :cancel
         put :resume
@@ -208,6 +208,8 @@ Spree::Core::Engine.add_routes do
         end
       end
     end
+
+    resources :style_guide
   end
 
   get '/admin', to: 'admin/root#index', as: :admin

data/lib/spree/backend/engine.rb

@@ -20,7 +20,6 @@ module Spree
           spree/backend/address_states.js
           jqPlot/excanvas.min.js
           spree/backend/images/new.js
-          jquery.jstree/themes/apple/*
           fontawesome-webfont*
           select2_locale*
         ]

data/lib/spree/backend.rb

@@ -1,10 +1,7 @@
 require 'rails/all'
 require 'jquery-rails'
 require 'jquery-ui-rails'
-require 'coffee-rails'
-require 'sass-rails'
 require 'bourbon'
-require 'deface'
 require 'select2-rails'
 require 'handlebars_assets'
 

data/solidus_backend.gemspec

@@ -1,10 +1,10 @@
 # encoding: UTF-8
-version = File.read(File.expand_path("../../SOLIDUS_VERSION", __FILE__)).strip
+require_relative '../core/lib/spree/core/version.rb'
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'solidus_backend'
-  s.version     = version
+  s.version     = Spree.solidus_version
   s.summary     = 'Admin interface for the Solidus e-commerce framework.'
   s.description = s.summary
 
@@ -18,12 +18,10 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'solidus_api', version
-  s.add_dependency 'solidus_core', version
+  s.add_dependency 'solidus_api', s.version
+  s.add_dependency 'solidus_core', s.version
 
-  s.add_dependency 'bourbon'
-  s.add_dependency 'sass-rails'
-  s.add_dependency 'coffee-rails'
+  s.add_dependency 'bourbon', '>= 4', '< 6'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails', '~> 5.0.0'
   s.add_dependency 'select2-rails',   '3.5.9.1' # 3.5.9.2 breaks forms

data/spec/controllers/spree/admin/missing_products_controller_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe Spree::Admin::ProductsController, :type => :controller do
   stub_authorization!
 
-  # Regression test for GH #538
+  # Regression test for GH https://github.com/spree/spree/issues/538
   it "cannot find a non-existent product" do
     spree_get :edit, :id => "non-existent-product"
     expect(response).to redirect_to(spree.admin_products_path)

data/spec/controllers/spree/admin/orders_controller_spec.rb

@@ -66,7 +66,7 @@ describe Spree::Admin::OrdersController, :type => :controller do
       end
     end
 
-    # Test for #3346
+    # Test for https://github.com/spree/spree/issues/3346
     context "#new" do
       let(:user) { create(:user) }
       before do
@@ -112,7 +112,7 @@ describe Spree::Admin::OrdersController, :type => :controller do
       end
     end
 
-    # Regression test for #3684
+    # Regression test for https://github.com/spree/spree/issues/3684
     context "#edit" do
       it "does not refresh rates if the order is completed" do
         allow(order).to receive_messages :completed? => true
@@ -275,7 +275,7 @@ describe Spree::Admin::OrdersController, :type => :controller do
       end
     end
 
-    # Test for #3919
+    # Test for https://github.com/spree/spree/issues/3919
     context "search" do
       let(:user) { create(:user) }
 
@@ -299,38 +299,38 @@ describe Spree::Admin::OrdersController, :type => :controller do
       let(:order) { create(:order) }
       let!(:finalized_adjustment) { create(:adjustment, finalized: true, adjustable: order, order: order) }
 
-      it "changes all the closed adjustments to open" do
-        spree_post :open_adjustments, id: order.number
+      it "changes all the finalized adjustments to unfinalized" do
+        spree_post :unfinalize_adjustments, id: order.number
         expect(finalized_adjustment.reload.finalized).to eq(false)
       end
 
       it "sets the flash success message" do
-        spree_post :open_adjustments, id: order.number
-        expect(flash[:success]).to eql('All adjustments successfully opened!')
+        spree_post :unfinalize_adjustments, id: order.number
+        expect(flash[:success]).to eql('All adjustments successfully unfinalized!')
       end
 
       it "redirects back" do
-        spree_post :open_adjustments, id: order.number
+        spree_post :unfinalize_adjustments, id: order.number
         expect(response).to redirect_to(:back)
       end
     end
 
-    context "#close_adjustments" do
+    context "#finalize_adjustments" do
       let(:order) { create(:order) }
       let!(:not_finalized_adjustment) { create(:adjustment, finalized: false, adjustable: order, order: order) }
 
-      it "changes all the open adjustments to closed" do
-        spree_post :close_adjustments, id: order.number
+      it "changes all the unfinalized adjustments to finalized" do
+        spree_post :finalize_adjustments, id: order.number
         expect(not_finalized_adjustment.reload.finalized).to eq(true)
       end
 
       it "sets the flash success message" do
-        spree_post :close_adjustments, id: order.number
-        expect(flash[:success]).to eql('All adjustments successfully closed!')
+        spree_post :finalize_adjustments, id: order.number
+        expect(flash[:success]).to eql('All adjustments successfully finalized!')
       end
 
       it "redirects back" do
-        spree_post :close_adjustments, id: order.number
+        spree_post :finalize_adjustments, id: order.number
         expect(response).to redirect_to(:back)
       end
     end