caboose-store 0.0.36 → 0.0.37

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTU2YzBkNGJlOTQ1NmM1OTkwYTExNmQ5ZDNlOWEyY2IwYzUwMmNmYg==
+    MDE0NjMyNTQwOGMyN2NmYTM1Nzg2NzI1NTZmZjE4YWVjZWRhMDljOQ==
   data.tar.gz: !binary |-
-    NzUwNTdhOTEzMzIxYzMyNzUzNzBkYWFkOWU1ZTYyODI0NGMzNDkyMA==
+    ZWJmMWVkZjg4ZjI1NWFjZjY3M2Q5MTM1ZDQzNTczYWFhNzE5MTVhZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmQ4ZTIzNTE0YjJiMzBmMjgxNGY4NTA2NTM4MjBmNzYzNzc3NDQxYmI2ZTI5
-    YTg5NDg1YTg2MWMxODY2ZTk2NGJmOTRiYTIyZDExNWZiMWZkNDI2ODhjNmE0
-    Zjc4ZDVkYWRjYzQyMWI0MDZhYWFlNmExNDEwMmJmM2JiZWY2ZDA=
+    NThmYzJhZTM5MWM5MjUzNGY4MTY3ZGMzNzZkNjJiYmM2ZTU2OWZmZjU2N2Rl
+    ZjkyOTE0MDU2OTc0MzkyMmYwMTQwZjU3OWE4OTI1NTQ2ZmQ4Mzc5YTdhMWYz
+    ZmM0MDM1NzE4NmYxMWFlZDFkMjM1YmJjNjRlNmQxOTA4NTgxYTc=
   data.tar.gz: !binary |-
-    OGM5Y2ExMDFmYTU2YmU0ODE5ZTY3OTNmZmM5YzM5YWNhMjc3MWJhZmNjY2U1
-    OWE3YTdlYTJlY2VhODM3MGYyY2Y4MTgyMzczMmZjNjg4YjNjZDJhNGE0Y2Ex
-    NjExNWEyMDJhZWI5NGVmZTM3OTFiZGUxZTRiNjlmZGE2MmIzN2U=
+    MzZjY2ZkMjM4OGEwZDQ4MjQ1YmQwMTVkNGRkNjI2YmIwYzE2YmUxYjU2OWVh
+    ZDcxMTdkOWE2YjljM2U1YjZmYmU5MGZlOWM5YzBhOWEzZDBjN2NkOTA3M2Fj
+    ZGI2ZDA2ODk1ODdmZDU5MjVmYmQwNzRjMTFjZDgzMDFlODIyOGY=

data/app/views/caboose_store/orders/admin_edit.html.erb

@@ -71,7 +71,7 @@ captured = @order.financial_status == 'captured'
 <% end %>
 <tr><td colspan='5' align='right'>Subtotal                </td><td align='right' id='subtotal'   ><%= number_to_currency(@order.subtotal ) %></td></tr>
 <tr><td colspan='5' align='right'>Tax                     </td><td align='right' id='tax'        ><%= number_to_currency(@order.tax      ) %></td></tr>
-<% if @order.shipping_method %>
+<% if !@order.shipping.nil? %>
 <tr><td colspan='5' align='right'><%= @order.shipping_method %> Shipping &amp; Handling </td><td align='right' id='shipping'   ><%= number_to_currency(@order.shipping + @order.handling) %></td></tr>
 <% end %>
 

data/lib/caboose-store/version.rb

@@ -1,3 +1,3 @@
 module CabooseStore
-  VERSION = '0.0.36'
+  VERSION = '0.0.37'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-store
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms