spree_backend 2.1.12 → 2.2.0

data/app/assets/stylesheets/admin/spree_admin.scss

@@ -1,42 +0,0 @@
-@import 'globals/functions';
-@import 'globals/variables_override';
-@import 'globals/variables';
-@import 'globals/mixins';
-
-@import 'shared/typography';
-@import 'shared/tables';
-@import 'shared/icons';
-@import 'shared/forms';
-@import 'shared/layout';
-
-@import 'components/states';
-@import 'components/actions';
-@import 'components/date-picker';
-@import 'components/messages';
-@import 'components/pagination';
-@import 'components/progress';
-@import 'components/table-filter';
-@import 'components/navigation';
-@import 'components/sidebar';
-@import 'components/product_autocomplete';
-
-@import 'plugins/font-awesome';
-@import 'plugins/powertip';
-@import 'plugins/select2';
-@import 'plugins/token-input';
-@import 'plugins/jstree';
-
-@import 'sections/alerts';
-@import 'sections/image_settings';
-@import 'sections/orders';
-@import 'sections/overview';
-@import 'sections/products';
-@import 'sections/promotions';
-@import 'sections/edit_checkouts';
-@import 'sections/bulk_transfer';
-@import 'sections/tax_zones';
-@import 'sections/log_entries';
-
-@import 'hacks/mozilla';
-@import 'hacks/opera';
-@import 'hacks/ie';

data/app/controllers/spree/admin/image_settings_controller.rb

@@ -1,64 +0,0 @@
-module Spree
-  module Admin
-    class ImageSettingsController < Spree::Admin::BaseController
-      def edit
-        @styles = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
-        @headers = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
-      end
-
-      def update
-        update_styles(params)
-        update_headers(params) if Spree::Config[:use_s3]
-
-        Spree::Config.set(params[:preferences])
-        update_paperclip_settings
-
-        respond_to do |format|
-          format.html {
-            flash[:success] = Spree.t(:image_settings_updated)
-            redirect_to spree.edit_admin_image_settings_path
-          }
-        end
-      end
-
-      private
-
-      def update_styles(params)
-        params[:new_attachment_styles].each do |index, style|
-          params[:attachment_styles][style[:name]] = style[:value] unless style[:value].empty?
-        end if params[:new_attachment_styles].present?
-
-        styles = params[:attachment_styles]
-
-        Spree::Config[:attachment_styles] = ActiveSupport::JSON.encode(styles) unless styles.nil?
-      end
-
-      def update_headers(params)
-        params[:new_s3_headers].each do |index, header|
-          params[:s3_headers][header[:name]] = header[:value] unless header[:value].empty?
-        end if params[:new_s3_headers].present?
-
-        headers = params[:s3_headers]
-
-        Spree::Config[:s3_headers] = ActiveSupport::JSON.encode(headers) unless headers.nil?
-      end
-
-      def update_paperclip_settings
-        if Spree::Config[:use_s3]
-          s3_creds = { :access_key_id => Spree::Config[:s3_access_key], :secret_access_key => Spree::Config[:s3_secret], :bucket => Spree::Config[:s3_bucket] }
-          Spree::Image.attachment_definitions[:attachment][:storage] = :s3
-          Spree::Image.attachment_definitions[:attachment][:s3_credentials] = s3_creds
-          Spree::Image.attachment_definitions[:attachment][:s3_headers] = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
-          Spree::Image.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
-        else
-          Spree::Image.attachment_definitions[:attachment].delete :storage
-        end
-
-        Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).symbolize_keys!
-        Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
-        Spree::Image.attachment_definitions[:attachment][:default_url] = Spree::Config[:attachment_default_url]
-        Spree::Image.attachment_definitions[:attachment][:default_style] = Spree::Config[:attachment_default_style]
-      end
-    end
-  end
-end

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

@@ -1,126 +0,0 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
-<% content_for :page_title do %>
-  <%= Spree.t(:image_settings) %>
-<% end %>
-
-<%= form_tag admin_image_settings_path, :method => :put do %>
-  <% destroy = Spree.t(:destroy) %> 
-  
-  <fieldset class="no-border-top">
-    <fieldset class="no-border-bottom">
-      <legend align="center"><%= Spree.t(:general_settings)%></legend>
-      
-      <div class="field">
-        <div class="warning note"><%= Spree.t(:image_settings_warning) %></div>
-      </div>    
-
-      <div data-hook="attachment_path" class="field">
-        <%= label_tag 'preferences[attachment_path]', Spree.t(:attachment_path) %>
-        <%= preference_field_tag 'preferences[attachment_path]', Spree::Config[:attachment_path], :type => :string %>
-      </div>
-
-      <div class="alpha eight columns">
-        <div data-hook="attachment_default_url" class="field">
-          <%= label_tag 'preferences[attachment_default_url]', Spree.t(:attachment_default_url) %>
-          <%= preference_field_tag 'preferences[attachment_default_url]', Spree::Config[:attachment_default_url], :type => :string %>
-        </div>
-      </div>
-
-      <div class="alpha eight columns">
-        <div data-hook="attachment_url" class="field">
-          <%= label_tag 'preferences[attachment_url]', Spree.t(:attachment_url) %>
-          <%= preference_field_tag 'preferences[attachment_url]', Spree::Config[:attachment_url], :type => :string %>
-        </div>
-      </div>
-
-      <div class="omega four columns">
-        <div data-hook="attachment_default_style" class="field">
-          <%= label_tag 'preferences[attachment_default_style]', Spree.t(:attachment_default_style) %>
-          <%= collection_select 'preferences', 'attachment_default_style', @styles, :first, :first, {:selected => Spree::Config[:attachment_default_style] }, :class => 'select2 fullwidth' %> 
-        </div>
-      </div>
-
-      <div class="clear"></div>
-
-      <div data-hook="use_s3" class="field">
-        <%= preference_field_tag 'preferences[use_s3]', Spree::Config[:use_s3], :type => :boolean %>
-        <%= label_tag 'preferences[use_s3]', Spree.t(:use_s3) %>      
-      </div>
-
-    </fieldset>
-
-    <fieldset class="no-border-bottom" id="attachment_styles" data-hook="attachment_styles">
-      <legend align="center"><%= Spree.t(:attachment_styles) %></legend>
-
-      <div id="styles_list" class="row frameless">      
-        <% @styles.each_with_index do |(style_name, style_value), index| %>        
-          <div class="field three columns">
-            <%= label_tag "attachment_styles[#{style_name}]", style_name %>
-            <a href='#' alt="<%= destroy %>" title="<%= destroy %>" class='destroy_style with-tip'><i class='icon-trash'></i></a>
-            <%= text_field_tag "attachment_styles[#{style_name}]", style_value, :class => 'fullwidth' %>
-          </div>
-        <% end %>
-      </div>
-
-      <div id="new-styles" class="row frameless"></div>
-
-      <div class="field">
-        <%= link_to_with_icon 'icon-plus', Spree.t(:add_new_style), '#', :class => 'add_new_style button' %>
-      </div>
-    </fieldset>
-    
-    <div class="row">
-      <div class="alpha six columns" id="s3_settings" data-hook="s3_settings" style="display: none">
-        <fieldset class="no-border-bottom">
-          <legend align="center"><%= Spree.t(:configure_s3) %></legend>
-
-          <div data-hook="s3_access_key" class="field">
-            <%= label_tag 'preferences[s3_access_key]', Spree.t(:s3_access_key) %>
-            <%= preference_field_tag 'preferences[s3_access_key]', Spree::Config[:s3_access_key], :type => :string %>
-          </div>
-
-          <div data-hook="s3_secret" class="field">
-            <%= label_tag 'preferences[s3_secret]', Spree.t(:s3_secret) %>
-            <%= preference_field_tag 'preferences[s3_secret]', Spree::Config[:s3_secret], :type => :string %>
-          </div>
-
-          <div data-hook="s3_bucket" class="field">
-            <%= label_tag 'preferences[s3_bucket]', Spree.t(:s3_bucket) %>
-            <%= preference_field_tag 'preferences[s3_bucket]', Spree::Config[:s3_bucket], :type => :string %>
-          </div>
-
-          <div data-hook="s3_protocol" class="field">
-            <%= label_tag 'preferences[s3_protocol]', Spree.t(:s3_protocol) %>
-            <%= preference_field_tag 'preferences[s3_protocol]', Spree::Config[:s3_protocol], :type => :string %>
-          </div>
-        </fieldset>
-      </div>
-
-      <div class="omega six columns" id="s3_headers" data-hook="s3_headers" style="display: none">
-        <fieldset class="no-border-bottom">
-          <legend align="center"><%= Spree.t(:s3_headers) %></legend>
-
-          <div id="headers_list">
-            <% @headers.each do |header_name, header_value| %>
-              <div class="field">
-                <%= label_tag "s3_headers[#{header_name}]", header_name %>
-                <a href="#" alt="<%= destroy %>" title="<%= destroy %>" class="destroy_header with-tip"><i class="icon-trash"></i></a>
-                <%= text_field_tag "s3_headers[#{header_name}]", header_value, :class => 'fullwidth' %>
-              </div>
-            <% end %>
-          </div>
-
-          <%= link_to_with_icon 'icon-plus', Spree.t(:add_new_header), '#', :class => 'add_header button' %>
-          
-        </fiedlset>  
-      </div>
-    </div>
-    
-
-    <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('actions.update'), 'icon-refresh' %>
-    </div>
-  </fieldset>
-
-<% end %>

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

@@ -1,56 +0,0 @@
-<table class="stock-contents" data-hook="stock-contents">
-  <colgroup>
-    <col style="width: 10%;" />
-    <col style="width: 40%;" />
-    <col style="width: 20%;" />
-    <col style="width: 10%;" />
-    <col style="width: 20%;" />
-  </colgroup>
-  <thead>
-    <th colspan="2"><%= Spree.t(:item_description) %></th>
-    <th><%= Spree.t(:price) %></th>
-    <th><%= Spree.t(:quantity) %></th>
-    <th><%= Spree.t(:total) %></th>
-  </thead>
-  <% order.shipments.each do |shipment| %>
-    <tbody>
-      <tr class="stock-location" data-hook="stock-location">
-        <td colspan="5" style="background-color: #eff5fc;">
-          <%= shipment.state.capitalize %>
-          <%= Spree.t(:package_from) %>
-          <strong class="stock-location-name" data-hook="stock-location-name">'<%= shipment.stock_location.name %>'</strong>
-        </td>
-      </tr>
-      <% shipment.manifest.each do |item| %>
-        <% line_item = order.find_line_item_by_variant(item.variant) %>
-        <tr class="stock-item">
-          <td class="item-image"><%= mini_image(item.variant) %></td>
-          <td class="item-name"><%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %></td>
-          <td class="item-price"><%= line_item.display_amount.to_html %></td>
-          <td class="item-qty"><%= item.quantity %></td>
-          <td class="item-total"><%= line_item.display_amount %></td>
-        </tr>
-      <% end %>
-      <tr class="total">
-        <td colspan="4"><strong><%= shipment.adjustment.label %>:</strong></td>
-        <td class="total"><span><%= shipment.adjustment.display_amount %></span></td>
-      </tr>
-    </tbody>
-  <% end %>
-
-  <tbody id="order-charges" data-hook="order_details_adjustments"  class="with-border">
-    <% order.adjustments.eligible.each do |adjustment| %>
-      <% next if ((adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0)) || adjustment.originator_type == 'Spree::ShippingMethod' %>
-      <tr class="total">
-        <td colspan="4"><strong><%= adjustment.label %>:</strong></td>
-        <td class="total"><span><%= adjustment.display_amount %></span></td>
-      </tr>
-    <% end %>
-  </tbody>
-  <tbody id="order-total" data-hook="order_details_total" class="with-border grand-total">
-    <tr>
-      <td colspan="4" ><%= Spree.t(:order_total) %>:</td>
-      <td class="total" id="order-total"><span id="order_total"><%= order.display_total %></span></td>
-    </tr>
-  </tbody>
-</table>