spree_frontend 2.4.1 → 2.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/spree/shared/_order_details.html.erb +11 -13
  3. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e7e0a6d3ca61e676d93d936d6325adde4ddfee4e
4
- data.tar.gz: 0504c254e435578151de06eb66bdf89867d97059
3
+ metadata.gz: 4380d44a0d3c015f99fd313bc6ccfafed323f926
4
+ data.tar.gz: ca86d1414d1d1824611d985f67999a87f58f6be6
5
5
  SHA512:
6
- metadata.gz: 8ea5e73715306d023d90eef47a1d8aad024629d57dd33e60502b9d80d14872f938a9ded32f9368c716b7d02236897cd363e8b92fdb4d0da7855f58fc2e835148
7
- data.tar.gz: afa1d4d7eca16d329f98818fa593810b7193ec0520b73a43e8e1e69690440e54c06ca6fbcbd8031c183044dc7fa571356872b54f6571bf477d2be3d25893063a
6
+ metadata.gz: a52e0862ef06b43580f01a11ee35fd0f5f6f8ed4273fe590c57a0c0ce27dd87bb22d3e48fcd445a6218b548f142cbec36429f6b3df233588ba7489934b16704e
7
+ data.tar.gz: 687b29727b1b0d66f3978fe2e43581e3ec45b9f2d2230ea6d67b8ed7c846449eb7d6f0ef9b0e61d3343f07155cba67c1dc4ebea5be9a2c474d94e2d71092e9e0
data/app/views/spree/shared/_order_details.html.erb CHANGED
@@ -3,20 +3,18 @@
3
3
  <% if order.has_step?("address") %>
4
4
 
5
5
  <div class="columns alpha four" data-hook="order-bill-address">
6
- <h6><%= Spree.t(:billing_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
6
+ <h6><%= Spree.t(:billing_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless order.completed? %></h6>
7
7
  <%= render :partial => 'spree/shared/address', :locals => { :address => order.bill_address } %>
8
8
  </div>
9
9
 
10
10
  <% if order.has_step?("delivery") %>
11
11
  <div class="columns alpha four" data-hook="order-ship-address">
12
- <h6><%= Spree.t(:shipping_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
12
+ <h6><%= Spree.t(:shipping_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless order.completed? %></h6>
13
13
  <%= render :partial => 'spree/shared/address', :locals => { :address => order.ship_address } %>
14
14
  </div>
15
- <% end %>
16
15
 
17
- <% if @order.has_step?("delivery") %>
18
- <div class="columns alpha four">
19
- <h6><%= Spree.t(:shipments) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:delivery) unless @order.completed? %></h6>
16
+ <div class="columns alpha four" data-hook="order-shipment">
17
+ <h6><%= Spree.t(:shipments) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:delivery) unless order.completed? %></h6>
20
18
  <div class="delivery">
21
19
  <% order.shipments.each do |shipment| %>
22
20
  <div>
@@ -25,13 +23,13 @@
25
23
  </div>
26
24
  <% end %>
27
25
  </div>
28
- <%= render(:partial => 'spree/shared/shipment_tracking', :locals => {:order => @order}) if @order.shipped? %>
26
+ <%= render(:partial => 'spree/shared/shipment_tracking', :locals => {:order => order}) if order.shipped? %>
29
27
  </div>
30
28
  <% end %>
31
29
  <% end %>
32
30
 
33
31
  <div class="columns omega four">
34
- <h6><%= Spree.t(:payment_information) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:payment) unless @order.completed? %></h6>
32
+ <h6><%= Spree.t(:payment_information) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:payment) unless order.completed? %></h6>
35
33
  <div class="payment-info">
36
34
  <% order.payments.valid.each do |payment| %>
37
35
  <%= render payment%><br/>
@@ -60,7 +58,7 @@
60
58
  </thead>
61
59
 
62
60
  <tbody data-hook>
63
- <% @order.line_items.each do |item| %>
61
+ <% order.line_items.each do |item| %>
64
62
  <tr data-hook="order_details_line_item_row">
65
63
  <td data-hook="order_item_image">
66
64
  <% if item.variant.images.length == 0 %>
@@ -83,18 +81,18 @@
83
81
  <tfoot id="order-total" data-hook="order_details_total">
84
82
  <tr class="total">
85
83
  <td colspan="4"><b><%= Spree.t(:order_total) %>:</b></td>
86
- <td class="total"><span id="order_total"><%= @order.display_total.to_html %></span></td>
84
+ <td class="total"><span id="order_total"><%= order.display_total.to_html %></span></td>
87
85
  </tr>
88
86
  </tfoot>
89
87
 
90
88
  <tfoot id="subtotal" data-hook="order_details_subtotal">
91
89
  <tr class="total" id="subtotal-row">
92
90
  <td colspan="4"><b><%= Spree.t(:subtotal) %>:</b></td>
93
- <td class="total"><span><%= @order.display_item_total.to_html %></span></td>
91
+ <td class="total"><span><%= order.display_item_total.to_html %></span></td>
94
92
  </tr>
95
93
  </tfoot>
96
94
 
97
- <% if @order.line_item_adjustments.exists? %>
95
+ <% if order.line_item_adjustments.exists? %>
98
96
  <% if order.all_adjustments.promotion.eligible.exists? %>
99
97
  <tfoot id="price-adjustments" data-hook="order_details_price_adjustments">
100
98
  <% order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
@@ -128,7 +126,7 @@
128
126
  <% end %>
129
127
 
130
128
  <tfoot id="order-charges" data-hook="order_details_adjustments">
131
- <% @order.adjustments.eligible.each do |adjustment| %>
129
+ <% order.adjustments.eligible.each do |adjustment| %>
132
130
  <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
133
131
  <tr class="total">
134
132
  <td colspan="4"><strong><%= adjustment.label %></strong></td>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_frontend
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.1
4
+ version: 2.4.2
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-11-22 00:00:00.000000000 Z
11
+ date: 2014-12-05 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: 2.4.1
19
+ version: 2.4.2
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.4.1
26
+ version: 2.4.2
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.4.1
33
+ version: 2.4.2
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.4.1
40
+ version: 2.4.2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: canonical-rails
43
43
  requirement: !ruby/object:Gem::Requirement