spree_backend 3.0.0.rc4 → 3.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (24) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/backend/option_type_autocomplete.js.erb +2 -1
  3. data/app/assets/javascripts/spree/backend/option_value_picker.js +2 -1
  4. data/app/assets/javascripts/spree/backend/payments/edit.js.coffee +1 -1
  5. data/app/assets/javascripts/spree/backend/{progress.coffee → progress.js.coffee} +0 -0
  6. data/app/assets/javascripts/spree/backend/taxon_autocomplete.js.erb +6 -5
  7. data/app/assets/stylesheets/spree/backend/components/_labels.scss +2 -1
  8. data/app/assets/stylesheets/spree/backend/components/_progress.scss +22 -0
  9. data/app/assets/stylesheets/spree/backend/components/_spinner.scss +95 -0
  10. data/app/assets/stylesheets/spree/backend/spree_admin.css.scss +2 -0
  11. data/app/controllers/spree/admin/refunds_controller.rb +1 -1
  12. data/app/controllers/spree/admin/zones_controller.rb +1 -1
  13. data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +4 -4
  14. data/app/views/spree/admin/customer_returns/edit.html.erb +11 -11
  15. data/app/views/spree/admin/orders/_line_items.html.erb +1 -1
  16. data/app/views/spree/admin/orders/_shipment_manifest.html.erb +1 -0
  17. data/app/views/spree/admin/promotion_rules/create.js.erb +1 -1
  18. data/app/views/spree/admin/reimbursements/edit.html.erb +3 -3
  19. data/app/views/spree/admin/return_authorizations/_form.html.erb +1 -1
  20. data/app/views/spree/admin/return_authorizations/edit.html.erb +3 -7
  21. data/app/views/spree/admin/roles/index.html.erb +1 -1
  22. data/app/views/spree/admin/variants/_split.js.erb +4 -4
  23. data/app/views/spree/layouts/admin.html.erb +6 -6
  24. metadata +11 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c830b0a478d89e82b4dcf34c843707d5d974fd26
4
- data.tar.gz: cbee1596932e60b0916c42810631bb22bf768f78
3
+ metadata.gz: 904c2d7aa7ad04ef04f43b66932a20141ecb2574
4
+ data.tar.gz: d3e1964db7c727aad1cd2dca55d644df560c7237
5
5
  SHA512:
6
- metadata.gz: bcc6c7c2b33851b52ec086e45389f8c9f1a374b605270704311b072cb79640f1d79740f13779eafa3df6a008fa53f4c5e2966b8c0a5a9926b99297ca57cebee6
7
- data.tar.gz: a21a2a1aee9751be825199134d671e43f21c870e1e33c7a7dc4eeab2bd6d7934878342a3641dfcbff389614db86ffedef57c8092c1f4eb956e1659a7943d5aad
6
+ metadata.gz: fc7f2928231bfca670836473cf8163ee4f260b94c5617cd38298884eb84a376d95b728318c7aa854d1e963f8009464afe7ffa6afac267f2d159c3c2acf18eed1
7
+ data.tar.gz: 7e5a0f2589d75f4c010c3d40b6a29a8bc07300f580f851436df2dfa9e25eca2c90ccdc21c92b4d0eb9810d73c8300d1b67b1aa06c4d7fe19eae0e8107dc97226
@@ -7,7 +7,8 @@ $(document).ready(function () {
7
7
  multiple: true,
8
8
  initSelection: function (element, callback) {
9
9
  var url = Spree.url(Spree.routes.option_type_search, {
10
- ids: element.val()
10
+ ids: element.val(),
11
+ token: Spree.api_key
11
12
  });
12
13
  return $.getJSON(url, null, function (data) {
13
14
  return callback(data);
@@ -12,7 +12,8 @@ $.fn.optionValueAutocomplete = function (options) {
12
12
  multiple: multiple,
13
13
  initSelection: function (element, callback) {
14
14
  $.get(Spree.routes.option_value_search, {
15
- ids: element.val().split(',')
15
+ ids: element.val().split(','),
16
+ token: Spree.api_key
16
17
  }, function (data) {
17
18
  callback(multiple ? data : data[0]);
18
19
  });
@@ -3,7 +3,7 @@ jQuery ($) ->
3
3
  order_id = $('#payments').data('order-id')
4
4
  class Payment
5
5
  constructor: (id) ->
6
- @url = Spree.url("#{Spree.routes.payments_api(order_id)}/#{id}.json")
6
+ @url = Spree.url("#{Spree.routes.payments_api(order_id)}/#{id}.json" + '?token=' + Spree.api_key)
7
7
  @json = $.getJSON @url.toString(), (data) =>
8
8
  @data = data
9
9
 
@@ -1,13 +1,14 @@
1
1
  'use strict';
2
2
 
3
- var set_taxon_select = function(){
4
- if ($('#product_taxon_ids').length > 0) {
5
- $('#product_taxon_ids').select2({
3
+ var set_taxon_select = function(selector){
4
+ if ($(selector).length > 0) {
5
+ $(selector).select2({
6
6
  placeholder: Spree.translations.taxon_placeholder,
7
7
  multiple: true,
8
8
  initSelection: function (element, callback) {
9
9
  var url = Spree.url(Spree.routes.taxons_search, {
10
- ids: element.val()
10
+ ids: element.val(),
11
+ token: Spree.api_key
11
12
  });
12
13
  return $.getJSON(url, null, function (data) {
13
14
  return callback(data['taxons']);
@@ -46,5 +47,5 @@ var set_taxon_select = function(){
46
47
  }
47
48
 
48
49
  $(document).ready(function () {
49
- set_taxon_select()
50
+ set_taxon_select('#product_taxon_ids')
50
51
  });
@@ -19,7 +19,8 @@
19
19
  // Red
20
20
  .label-failed,
21
21
  .label-considered_risky,
22
- .label-error {
22
+ .label-error,
23
+ .label-invalid {
23
24
  background-color: $brand-danger;
24
25
  }
25
26
 
@@ -0,0 +1,22 @@
1
+ // The progress loader which is positioned at the bottom of the page
2
+ #progress {
3
+ display: none;
4
+ width: 100%;
5
+ position: fixed;
6
+ left: 0;
7
+ bottom: 0;
8
+ z-index: 1001;
9
+ .alert {
10
+ box-shadow: none;
11
+ margin: 0;
12
+ border-radius: 0;
13
+ .progress-message {
14
+ color: #31708f;
15
+ font-weight: bold;
16
+ text-align: center;
17
+ }
18
+ .spinner {
19
+ float: right;
20
+ }
21
+ }
22
+ }
@@ -0,0 +1,95 @@
1
+ @-webkit-keyframes spinner {
2
+ 0% {
3
+ -webkit-transform: rotate(0deg);
4
+ -moz-transform: rotate(0deg);
5
+ -ms-transform: rotate(0deg);
6
+ -o-transform: rotate(0deg);
7
+ transform: rotate(0deg);
8
+ }
9
+
10
+ 100% {
11
+ -webkit-transform: rotate(360deg);
12
+ -moz-transform: rotate(360deg);
13
+ -ms-transform: rotate(360deg);
14
+ -o-transform: rotate(360deg);
15
+ transform: rotate(360deg);
16
+ }
17
+ }
18
+
19
+ @-moz-keyframes spinner {
20
+ 0% {
21
+ -webkit-transform: rotate(0deg);
22
+ -moz-transform: rotate(0deg);
23
+ -ms-transform: rotate(0deg);
24
+ -o-transform: rotate(0deg);
25
+ transform: rotate(0deg);
26
+ }
27
+
28
+ 100% {
29
+ -webkit-transform: rotate(360deg);
30
+ -moz-transform: rotate(360deg);
31
+ -ms-transform: rotate(360deg);
32
+ -o-transform: rotate(360deg);
33
+ transform: rotate(360deg);
34
+ }
35
+ }
36
+
37
+ @-o-keyframes spinner {
38
+ 0% {
39
+ -webkit-transform: rotate(0deg);
40
+ -moz-transform: rotate(0deg);
41
+ -ms-transform: rotate(0deg);
42
+ -o-transform: rotate(0deg);
43
+ transform: rotate(0deg);
44
+ }
45
+
46
+ 100% {
47
+ -webkit-transform: rotate(360deg);
48
+ -moz-transform: rotate(360deg);
49
+ -ms-transform: rotate(360deg);
50
+ -o-transform: rotate(360deg);
51
+ transform: rotate(360deg);
52
+ }
53
+ }
54
+
55
+ @keyframes spinner {
56
+ 0% {
57
+ -webkit-transform: rotate(0deg);
58
+ -moz-transform: rotate(0deg);
59
+ -ms-transform: rotate(0deg);
60
+ -o-transform: rotate(0deg);
61
+ transform: rotate(0deg);
62
+ }
63
+
64
+ 100% {
65
+ -webkit-transform: rotate(360deg);
66
+ -moz-transform: rotate(360deg);
67
+ -ms-transform: rotate(360deg);
68
+ -o-transform: rotate(360deg);
69
+ transform: rotate(360deg);
70
+ }
71
+ }
72
+
73
+ /* :not(:required) hides this rule from IE9 and below */
74
+ .spinner:not(:required) {
75
+ -webkit-animation: spinner 1500ms infinite linear;
76
+ -moz-animation: spinner 1500ms infinite linear;
77
+ -ms-animation: spinner 1500ms infinite linear;
78
+ -o-animation: spinner 1500ms infinite linear;
79
+ animation: spinner 1500ms infinite linear;
80
+ -webkit-border-radius: 0.5em;
81
+ -moz-border-radius: 0.5em;
82
+ -ms-border-radius: 0.5em;
83
+ -o-border-radius: 0.5em;
84
+ border-radius: 0.5em;
85
+ -webkit-box-shadow: rgba(0, 0, 51, 0.3) 1.5em 0 0 0, rgba(0, 0, 51, 0.3) 1.1em 1.1em 0 0, rgba(0, 0, 51, 0.3) 0 1.5em 0 0, rgba(0, 0, 51, 0.3) -1.1em 1.1em 0 0, rgba(0, 0, 51, 0.3) -1.5em 0 0 0, rgba(0, 0, 51, 0.3) -1.1em -1.1em 0 0, rgba(0, 0, 51, 0.3) 0 -1.5em 0 0, rgba(0, 0, 51, 0.3) 1.1em -1.1em 0 0;
86
+ -moz-box-shadow: rgba(0, 0, 51, 0.3) 1.5em 0 0 0, rgba(0, 0, 51, 0.3) 1.1em 1.1em 0 0, rgba(0, 0, 51, 0.3) 0 1.5em 0 0, rgba(0, 0, 51, 0.3) -1.1em 1.1em 0 0, rgba(0, 0, 51, 0.3) -1.5em 0 0 0, rgba(0, 0, 51, 0.3) -1.1em -1.1em 0 0, rgba(0, 0, 51, 0.3) 0 -1.5em 0 0, rgba(0, 0, 51, 0.3) 1.1em -1.1em 0 0;
87
+ box-shadow: rgba(0, 0, 51, 0.3) 1.5em 0 0 0, rgba(0, 0, 51, 0.3) 1.1em 1.1em 0 0, rgba(0, 0, 51, 0.3) 0 1.5em 0 0, rgba(0, 0, 51, 0.3) -1.1em 1.1em 0 0, rgba(0, 0, 51, 0.3) -1.5em 0 0 0, rgba(0, 0, 51, 0.3) -1.1em -1.1em 0 0, rgba(0, 0, 51, 0.3) 0 -1.5em 0 0, rgba(0, 0, 51, 0.3) 1.1em -1.1em 0 0;
88
+ display: inline-block;
89
+ font-size: 6px;
90
+ width: 0.8em;
91
+ height: 0.8em;
92
+ margin: 1.5em;
93
+ overflow: hidden;
94
+ text-indent: 100%;
95
+ }
@@ -15,6 +15,8 @@
15
15
  @import 'components/panels';
16
16
  @import 'components/navigation';
17
17
  @import 'components/taxon_products_view';
18
+ @import 'components/progress';
19
+ @import 'components/spinner';
18
20
 
19
21
  @import 'sections/account';
20
22
 
@@ -1,7 +1,7 @@
1
1
  module Spree
2
2
  module Admin
3
3
  class RefundsController < ResourceController
4
- belongs_to 'spree/payment'
4
+ belongs_to 'spree/payment', find_by: :number
5
5
  before_action :load_order
6
6
 
7
7
  helper_method :refund_reasons
@@ -11,7 +11,7 @@ module Spree
11
11
 
12
12
  def collection
13
13
  params[:q] ||= {}
14
- params[:q][:s] ||= "ascend_by_name"
14
+ params[:q][:s] ||= "name asc"
15
15
  @search = super.ransack(params[:q])
16
16
  @zones = @search.result.page(params[:page]).per(params[:per_page])
17
17
  end
@@ -36,11 +36,11 @@
36
36
  </td>
37
37
  <% if show_decision %>
38
38
  <td class='actions actions-2'>
39
- <%= button_to [:admin, return_item], { class: 'icon icon-thumbs-up icon_link no-text with-tip display-inline', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
40
- Spree.t(:accept)
39
+ <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-success btn-sm', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
40
+ <%= Spree.t(:accept) %>
41
41
  <% end if can?(:accept, return_item) %>
42
- <%= button_to [:admin, return_item], { class: 'icon icon-thumbs-down icon_link no-text with-tip display-inline', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
43
- Spree.t(:reject)
42
+ <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-danger btn-sm', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
43
+ <%= Spree.t(:reject) %>
44
44
  <% end if can?(:reject, return_item) %>
45
45
  </td>
46
46
  <% end %>
@@ -32,6 +32,17 @@
32
32
  </fieldset>
33
33
  <% end %>
34
34
 
35
+ <fieldset data-hook="reimbursements">
36
+ <legend><%= plural_resource_name(Spree::Reimbursement) %></legend>
37
+ <% if @customer_return.reimbursements.any? %>
38
+ <%= render partial: 'reimbursements_table', locals: {reimbursements: @customer_return.reimbursements} %>
39
+ <% else %>
40
+ <div class="alert alert-info no-objects-found">
41
+ <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Reimbursement)) %>
42
+ </div>
43
+ <% end %>
44
+ </fieldset>
45
+
35
46
  <% if !@customer_return.fully_reimbursed? && @pending_reimbursements.empty? && can?(:create, Spree::Reimbursement) %>
36
47
  <fieldset data-hook="reimbursements" class="marginb">
37
48
  <% if @customer_return.completely_decided? %>
@@ -48,14 +59,3 @@
48
59
  <% end %>
49
60
  </fieldset>
50
61
  <% end %>
51
-
52
- <fieldset data-hook="reimbursements">
53
- <legend><%= plural_resource_name(Spree::Reimbursement) %></legend>
54
- <% if @customer_return.reimbursements.any? %>
55
- <%= render partial: 'reimbursements_table', locals: {reimbursements: @customer_return.reimbursements} %>
56
- <% else %>
57
- <div class="alert alert-info no-objects-found">
58
- <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Reimbursement)) %>
59
- </div>
60
- <% end %>
61
- </fieldset>
@@ -32,8 +32,8 @@
32
32
  <td class="line-item-total text-center"><%= line_item_shipment_price(item, item.quantity) %></td>
33
33
  <td class="cart-line-item-delete actions actions-4 text-center" data-hook="cart_line_item_delete">
34
34
  <% if can? :update, item %>
35
+ <%= link_to_with_icon 'arrow-left', Spree.t('actions.cancel'), "#", :class => 'cancel-line-item btn btn-default btn-sm', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none', :no_text => true %>
35
36
  <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", :class => 'save-line-item btn btn-success btn-sm', :no_text => true, :data => { :'line-item-id' => item.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
36
- <%= link_to_with_icon 'delete', Spree.t('actions.cancel'), "#", :class => 'cancel-line-item btn btn-danger btn-sm', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none', :no_text => true %>
37
37
  <%= link_to_with_icon 'edit', Spree.t('edit'), "#", :class => 'edit-line-item btn btn-primary btn-sm', :data => {:action => 'edit'}, :title => Spree.t('edit'), :no_text => true %>
38
38
  <%= link_to_with_icon 'delete', Spree.t('delete'), "#", :class => 'delete-line-item btn btn-danger btn-sm', :data => { 'line-item-id' => item.id, :action => 'remove'}, :title => Spree.t('delete'), :no_text => true %>
39
39
  <% end %>
@@ -31,6 +31,7 @@
31
31
 
32
32
  <td class="cart-item-delete actions actions-3 text-center" data-hook="cart_item_delete">
33
33
  <% if((!shipment.shipped?) && can?(:update, item.line_item)) %>
34
+ <%= link_to_with_icon 'pencil', Spree.t('actions.edit'), "#", class: 'edit-item btn btn-default btn-sm', title: Spree.t('actions.edit'), no_text: true %>
34
35
  <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-item btn btn-primary btn-sm', data: { action: 'cancel' }, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
35
36
  <%= link_to_with_icon 'ok', Spree.t('actions.save'), "#", class: 'save-item btn btn-success btn-sm', data: {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none', no_text: true %>
36
37
  <%= link_to_with_icon 'split', Spree.t('split'), "#", class: 'split-item btn btn-primary btn-sm', data: {action: 'split', 'variant-id' => item.variant.id}, title: Spree.t('split'), no_text: true %>
@@ -7,4 +7,4 @@ $('.user_picker').userAutocomplete();
7
7
  $('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');
8
8
  $('#promotion_rule_type').select2();
9
9
 
10
- set_taxon_select()
10
+ set_taxon_select('#product_taxon_ids')
@@ -74,7 +74,7 @@
74
74
  </thead>
75
75
  <tbody>
76
76
  <% @reimbursement_objects.each do |reimbursement_object| %>
77
- <tr id="<%= spree_dom_id(reimbursement_object) %>" data-hook="reimbursement_reimbursement_object_row">
77
+ <tr data-hook="reimbursement_reimbursement_object_row">
78
78
  <td><%= reimbursement_object.class.name.demodulize %></td>
79
79
  <td><%= reimbursement_object.description %></td>
80
80
  <td><%= reimbursement_object.display_amount %></td>
@@ -84,9 +84,9 @@
84
84
  </table>
85
85
 
86
86
  <% if @order.has_non_reimbursement_related_refunds? %>
87
- <span class="alert alert-danger">
87
+ <div class="alert alert-danger">
88
88
  <%= "#{Spree.t('note')}: #{Spree.t('this_order_has_already_received_a_refund')}. #{Spree.t('make_sure_the_above_reimbursement_amount_is_correct')}." %>
89
- </span>
89
+ </div>
90
90
  <% end %>
91
91
 
92
92
  <div class="form-actions" data-hook="reimburse-buttons">
@@ -63,7 +63,7 @@
63
63
  </tbody>
64
64
  </table>
65
65
 
66
- <%= f.field_container :amount, class: ['form-group'] do %>
66
+ <%= f.field_container :amount, class: ['alert alert-info'] do %>
67
67
  <%= Spree.t(:total_pre_tax_refund) %>: <span id="total_pre_tax_refund">0.00</span>
68
68
  <% end %>
69
69
 
@@ -1,12 +1,8 @@
1
1
  <% content_for :page_actions do %>
2
2
  <% if @return_authorization.can_cancel? %>
3
- <li>
4
- <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: Spree.t(:are_you_sure) }, :icon => "delete" %>
5
- </li>
3
+ <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: Spree.t(:are_you_sure) }, :icon => "delete" %>
6
4
  <% end %>
7
- <li>
8
- <%= button_link_to Spree.t(:back), spree.admin_order_return_authorizations_url(@order), icon: 'arrow-left' %>
9
- </li>
5
+ <%= button_link_to Spree.t(:back), spree.admin_order_return_authorizations_url(@order), icon: 'arrow-left' %>
10
6
  <% end %>
11
7
 
12
8
  <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
@@ -15,8 +11,8 @@
15
11
  / <%= Spree.t(:return_authorization) %> <%= @return_authorization.number %> (<%= Spree.t(@return_authorization.state.downcase) %>)
16
12
  <% end %>
17
13
 
18
-
19
14
  <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @return_authorization } %>
15
+
20
16
  <%= form_for [:admin, @order, @return_authorization] do |f| %>
21
17
  <fieldset>
22
18
  <%= render :partial => 'form', :locals => { :f => f } %>
@@ -3,7 +3,7 @@
3
3
  <% end %>
4
4
 
5
5
  <% content_for :page_actions do %>
6
- <%= button_link_to Spree.t(:new_role), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_role_link' if can? :create, Spree::Role %>
6
+ <%= button_link_to Spree.t(:new_role), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_role_link' %>
7
7
  <% end if can? :create, Spree::Role %>
8
8
 
9
9
  <% if @roles.any? %>
@@ -22,11 +22,11 @@
22
22
  <input class="quantity form-control" id="item_quantity" type="number" min="1" value="1" max="{{max_quantity}}">
23
23
  </td>
24
24
  <td class='actions'>
25
- <a href='#' class='save-split with-tip btn btn-sm btn-default' title='Save'>
26
- <span class="icon icon-save"></span>
27
- </a>
28
25
  <a href='#' class='cancel-split with-tip btn btn-sm btn-default' title='Cancel'>
29
- <span class="icon icon-delete"></span>
26
+ <span class="icon icon-arrow-left"></span>
27
+ </a>
28
+ <a href='#' class='save-split with-tip btn btn-sm btn-success' title='Save'>
29
+ <span class="icon icon-save"></span>
30
30
  </a>
31
31
  </td>
32
32
  </tr>
@@ -4,12 +4,12 @@
4
4
  <%= render partial: 'spree/admin/shared/head' %>
5
5
  </head>
6
6
 
7
- <body class="admin skin-blue">
7
+ <body class="admin">
8
8
 
9
9
  <%#-------------------------------------------------%>
10
10
  <%# Loading progress bars %>
11
11
  <%#-------------------------------------------------%>
12
- <div id="progress" class="hidden">
12
+ <div id="progress">
13
13
  <div class="alert alert-info alert-progress">
14
14
  <div class="spinner"><%= Spree.t(:loading) %>...</div>
15
15
  <div class="progress-message"><%= Spree.t(:loading) %>...</div>
@@ -43,7 +43,7 @@
43
43
  <%# Content header (page title/actions) %>
44
44
  <%#-------------------------------------------------%>
45
45
  <%= render partial: 'spree/admin/shared/content_header' %>
46
-
46
+
47
47
  <div class="row">
48
48
  <%#-------------------------------------------------%>
49
49
  <%# Alerts %>
@@ -64,12 +64,12 @@
64
64
  <%#-------------------------------------------------%>
65
65
  <% if content_for?(:sidebar) %>
66
66
  <div class="col-md-3 col-sm-4">
67
- <%= render partial: 'spree/admin/shared/sidebar' %>
67
+ <%= render partial: 'spree/admin/shared/sidebar' %>
68
68
  </div>
69
69
  <% end %>
70
70
  </div>
71
-
72
-
71
+
72
+
73
73
  </div>
74
74
  </div>
75
75
  </div>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_backend
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0.rc4
4
+ version: 3.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-03 00:00:00.000000000 Z
11
+ date: 2015-03-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_api
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.0.0.rc4
19
+ version: 3.0.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 3.0.0.rc4
26
+ version: 3.0.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: spree_core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 3.0.0.rc4
33
+ version: 3.0.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 3.0.0.rc4
40
+ version: 3.0.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bootstrap-sass
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ files:
137
137
  - app/assets/javascripts/spree/backend/payments/edit.js.coffee
138
138
  - app/assets/javascripts/spree/backend/payments/new.js
139
139
  - app/assets/javascripts/spree/backend/product_picker.js
140
- - app/assets/javascripts/spree/backend/progress.coffee
140
+ - app/assets/javascripts/spree/backend/progress.js.coffee
141
141
  - app/assets/javascripts/spree/backend/promotions.js
142
142
  - app/assets/javascripts/spree/backend/returns/expedited_exchanges_warning.coffee
143
143
  - app/assets/javascripts/spree/backend/returns/return_item_selection.js
@@ -166,7 +166,9 @@ files:
166
166
  - app/assets/stylesheets/spree/backend/components/_navigation.scss
167
167
  - app/assets/stylesheets/spree/backend/components/_page_header.scss
168
168
  - app/assets/stylesheets/spree/backend/components/_panels.scss
169
+ - app/assets/stylesheets/spree/backend/components/_progress.scss
169
170
  - app/assets/stylesheets/spree/backend/components/_sidebar.scss
171
+ - app/assets/stylesheets/spree/backend/components/_spinner.scss
170
172
  - app/assets/stylesheets/spree/backend/components/_tables.scss
171
173
  - app/assets/stylesheets/spree/backend/components/_taxon_products_view.scss
172
174
  - app/assets/stylesheets/spree/backend/components/_variables.scss
@@ -548,9 +550,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
548
550
  version: '0'
549
551
  required_rubygems_version: !ruby/object:Gem::Requirement
550
552
  requirements:
551
- - - ">"
553
+ - - ">="
552
554
  - !ruby/object:Gem::Version
553
- version: 1.3.1
555
+ version: '0'
554
556
  requirements:
555
557
  - none
556
558
  rubyforge_project: spree_backend