spree_backend 2.2.5 → 2.2.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/backend/images/index.js.coffee +1 -0
  3. data/app/assets/stylesheets/spree/backend/globals/_variables.scss +19 -9
  4. data/app/controllers/spree/admin/payments_controller.rb +1 -1
  5. data/app/views/spree/admin/orders/index.html.erb +1 -1
  6. data/app/views/spree/admin/promotions/index.html.erb +4 -4
  7. metadata +10 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d2b51bd0bcd3317420ed383267011db6e1ac08ac
4
- data.tar.gz: f1ce52319ab952bb7971625fb0d37ed256198b7e
3
+ metadata.gz: e184877b7a2f35dd34344987bb3cbfb5ebfbf37c
4
+ data.tar.gz: e277a9c30e238faf1713d3ce7148b90231c64f01
5
5
  SHA512:
6
- metadata.gz: f8fc536ec2860dd54383b77abab18a9ade9f2edfe364dc32e22dcfd471ad555aa5407e849e038b2b5ffd09e686173adf1d5bb7a38d09cd1120e3402b482d5c53
7
- data.tar.gz: 5f7a3e06cf5c229f1536867e249046b96c6a27c6067d6836a7104f7d69265b1114182c37ea4a7182ff6c1bb349d5a3c68bf95b731ba5d102b8a14837e98c3714
6
+ metadata.gz: ca6afcbc07bb19b206dafac2cb65cdbcf0f528ad129d58c43bb4c81e1312440611e68a4cd507f274a43538d503fda9f18a333042dd0ad74b997ecec8d84732d7
7
+ data.tar.gz: 49d39b428ba01fcde54c1e5c5d5767c9af7de1e1f575e2e09f4afdaf1a8cb52fd7c8f2363357361e399a9e31c0ce4658a456a9cd06d00972594116996b72ba10
data/app/assets/javascripts/spree/backend/images/index.js.coffee CHANGED
@@ -13,3 +13,4 @@ $ ->
13
13
  )
14
14
  success: (r) ->
15
15
  ($ '#images').html r
16
+ ($ '.select2').select2()
data/app/assets/stylesheets/spree/backend/globals/_variables.scss CHANGED
@@ -104,6 +104,8 @@ $color-ste-void-bg: $color-error !default;
104
104
  $color-ste-void-text: $color-1 !default;
105
105
  $color-ste-canceled-bg: $color-error !default;
106
106
  $color-ste-canceled-text: $color-1 !default;
107
+ $color-ste-failed-bg: $color-error !default;
108
+ $color-ste-failed-text: $color-1 !default;
107
109
  $color-ste-address-bg: $color-error !default;
108
110
  $color-ste-address-text: $color-1 !default;
109
111
  $color-ste-checkout-bg: $color-notice !default;
@@ -122,20 +124,28 @@ $color-ste-inactive-bg: $color-notice !default;
122
124
  $color-ste-inactive-text: $color-1 !default;
123
125
  $color-ste-considered_risky-bg: $color-error !default;
124
126
  $color-ste-considered_risky-text:$color-1 !default;
127
+ $color-ste-success-bg: $color-success !default;
128
+ $color-ste-success-text: $color-1 !default;
129
+ $color-ste-notice-bg: $color-notice !default;
130
+ $color-ste-notice-text: $color-1 !default;
131
+ $color-ste-error-bg: $color-error !default;
132
+ $color-ste-error-text: $color-1 !default;
125
133
 
126
134
  // Available states
127
135
  $states: completed, complete, sold, pending, awaiting_return, returned, credit_owed, paid, shipped, balance_due, backorder, checkout, cart, address,
128
- delivery, payment, confirm, canceled, ready, void, active, inactive, considered_risky !default;
136
+ delivery, payment, confirm, canceled, failed, ready, void, active, inactive, considered_risky, success, notice, error !default;
129
137
 
130
138
  $states-bg-colors: $color-ste-completed-bg, $color-ste-complete-bg, $color-ste-sold-bg, $color-ste-pending-bg, $color-ste-awaiting_return-bg,
131
- $color-ste-returned-bg, $color-ste-credit_owed-bg, $color-ste-paid-bg, $color-ste-shipped-bg, $color-ste-balance_due-bg, $color-ste-backorder-bg,
132
- $color-ste-checkout-bg, $color-ste-cart-bg, $color-ste-address-bg, $color-ste-delivery-bg, $color-ste-payment-bg, $color-ste-confirm-bg,
133
- $color-ste-canceled-bg, $color-ste-ready-bg, $color-ste-void-bg, $color-ste-active-bg, $color-ste-inactive-bg, $color-ste-considered_risky-bg !default;
134
-
135
- $states-text-colors: $color-ste-completed-text, $color-ste-complete-text, $color-ste-sold-text, $color-ste-pending-text, $color-ste-awaiting_return-text,
136
- $color-ste-returned-text, $color-ste-credit_owed-text, $color-ste-paid-text, $color-ste-shipped-text, $color-ste-balance_due-text, $color-ste-backorder-text,
137
- $color-ste-checkout-text, $color-ste-cart-text, $color-ste-address-text, $color-ste-delivery-text, $color-ste-payment-text, $color-ste-confirm-text,
138
- $color-ste-canceled-text, $color-ste-ready-text, $color-ste-void-text, $color-ste-active-text, $color-ste-inactive-text, $color-ste-considered_risky-text !default;
139
+ $color-ste-returned-bg, $color-ste-credit_owed-bg, $color-ste-paid-bg, $color-ste-shipped-bg, $color-ste-balance_due-bg, $color-ste-backorder-bg,
140
+ $color-ste-checkout-bg, $color-ste-cart-bg, $color-ste-address-bg, $color-ste-delivery-bg, $color-ste-payment-bg, $color-ste-confirm-bg,
141
+ $color-ste-canceled-bg, $color-ste-failed-bg, $color-ste-ready-bg, $color-ste-void-bg, $color-ste-active-bg, $color-ste-inactive-bg, $color-ste-considered_risky-bg,
142
+ $color-ste-success-bg, $color-ste-notice-bg, $color-ste-error-bg !default;
143
+
144
+ $states-text-colors: $color-ste-completed-text, $color-ste-complete-text, $color-ste-sold-text, $color-ste-pending-text, $color-ste-awaiting_return-text,
145
+ $color-ste-returned-text, $color-ste-credit_owed-text, $color-ste-paid-text, $color-ste-shipped-text, $color-ste-balance_due-text, $color-ste-backorder-text,
146
+ $color-ste-checkout-text, $color-ste-cart-text, $color-ste-address-text, $color-ste-delivery-text, $color-ste-payment-text, $color-ste-confirm-text,
147
+ $color-ste-canceled-text, $color-ste-failed-text, $color-ste-ready-text, $color-ste-void-text, $color-ste-active-text, $color-ste-inactive-text, $color-ste-considered_risky-text,
148
+ $color-ste-success-text, $color-ste-notice-text, $color-ste-error-text !default;
139
149
 
140
150
  // Available actions
141
151
  $actions: edit, clone, remove, void, capture, save, cancel, mail !default;
data/app/controllers/spree/admin/payments_controller.rb CHANGED
@@ -22,7 +22,7 @@ module Spree
22
22
  def create
23
23
  invoke_callbacks(:create, :before)
24
24
  @payment ||= @order.payments.build(object_params)
25
- if params[:card].present? and params[:card] != 'new'
25
+ if @payment.payment_method.source_required? && params[:card].present? and params[:card] != 'new'
26
26
  @payment.source = @payment.payment_method.payment_source_class.find_by_id(params[:card])
27
27
  end
28
28
 
data/app/views/spree/admin/orders/index.html.erb CHANGED
@@ -43,7 +43,7 @@
43
43
  </div>
44
44
  <div class="field">
45
45
  <%= label_tag nil, Spree.t(:email) %>
46
- <%= f.email_field :email_cont %>
46
+ <%= f.text_field :email_cont %>
47
47
  </div>
48
48
  </div>
49
49
 
data/app/views/spree/admin/promotions/index.html.erb CHANGED
@@ -17,21 +17,21 @@
17
17
  <%= search_form_for [:admin, @search] do |f| %>
18
18
  <div class="five columns">
19
19
  <div class="field">
20
- <%= label_tag nil, 'name' %>
20
+ <%= label_tag nil, Spree.t(:name) %>
21
21
  <%= f.text_field :name_cont, tabindex: 1 %>
22
22
  </div>
23
23
  </div>
24
24
 
25
25
  <div class="five columns">
26
26
  <div class="field">
27
- <%= label_tag nil, 'code' %>
27
+ <%= label_tag nil, Spree.t(:code) %>
28
28
  <%= f.text_field :code_cont, tabindex: 1 %>
29
29
  </div>
30
30
  </div>
31
31
 
32
32
  <div class="five columns">
33
33
  <div class="field">
34
- <%= label_tag nil, 'path' %>
34
+ <%= label_tag nil, Spree.t(:path) %>
35
35
  <%= f.text_field :path_cont, tabindex: 1 %>
36
36
  </div>
37
37
  </div>
@@ -94,4 +94,4 @@
94
94
  <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/promotion')) %>,
95
95
  <%= link_to Spree.t(:add_one), spree.new_admin_promotion_path %>!
96
96
  </div>
97
- <% end %>
97
+ <% end %>
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: 2.2.5
4
+ version: 2.2.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-08-29 00:00:00.000000000 Z
11
+ date: 2014-09-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_api
@@ -16,42 +16,42 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 2.2.5
19
+ version: 2.2.6
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: 2.2.5
26
+ version: 2.2.6
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: 2.2.5
33
+ version: 2.2.6
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: 2.2.5
40
+ version: 2.2.6
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: jquery-rails
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '='
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 3.1.0
47
+ version: 3.1.2
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '='
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 3.1.0
54
+ version: 3.1.2
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: jquery-ui-rails
57
57
  requirement: !ruby/object:Gem::Requirement