nimbleshop_simply 0.0.16 → 0.0.17

data/app/assets/stylesheets/nimbleshop_simply/cart.css.scss

@@ -53,5 +53,15 @@ $bottomColorLight: opacify($bottomColor, 0.5);
 }
 
 .light-link {
-  color: #999;
+  color: #cfcfcf;
+}
+
+.purchase-success {
+  ul {
+    padding-top: 10px;
+  }
+  li {
+    font-size: 16px;
+    line-height: 28px;
+  }
 }

data/app/controllers/nimbleshop_simply/checkout/payments_controller.rb

@@ -1,7 +1,7 @@
 module NimbleshopSimply
   class Checkout::PaymentsController < SimplyController
 
-    before_filter :verify_current_order
+    before_filter :verify_current_order, :set_show_shipping_billing_address, :set_contact_email
 
     force_ssl if: :ssl_configured?
 
@@ -17,5 +17,15 @@ module NimbleshopSimply
       PaymentMethod.all.find { |i| i.use_ssl? }
     end
 
+    private
+
+    def set_show_shipping_billing_address
+      @show_shipping_billing_address = true
+    end
+
+    def set_contact_email
+      @show_contact_email = true
+    end
+
   end
 end

data/app/controllers/nimbleshop_simply/checkout/shipping_addresses_controller.rb

@@ -1,7 +1,7 @@
 module NimbleshopSimply
   class Checkout::ShippingAddressesController < SimplyController
 
-    before_filter :verify_current_order
+    before_filter :verify_current_order, :unset_show_shipping_billing_address, :unset_contact_email
 
     def new
       current_order.initialize_addresses
@@ -27,5 +27,15 @@ module NimbleshopSimply
       end
     end
 
+    private
+
+    def unset_show_shipping_billing_address
+      @show_shipping_billing_address = false
+    end
+
+    def unset_contact_email
+      @show_contact_email = false
+    end
+
   end
 end

data/app/controllers/nimbleshop_simply/checkout/shipping_methods_controller.rb

@@ -1,7 +1,7 @@
 module NimbleshopSimply
   class Checkout::ShippingMethodsController < SimplyController
 
-    before_filter :verify_current_order, :load_shipping_methods
+    before_filter :verify_current_order, :load_shipping_methods, :set_show_shipping_billing_address, :set_contact_email
 
     def new
       render
@@ -21,5 +21,15 @@ module NimbleshopSimply
       @shipping_methods = Array.wrap(current_order.available_shipping_methods)
     end
 
+    private
+
+    def set_show_shipping_billing_address
+      @show_shipping_billing_address = true
+    end
+
+    def set_contact_email
+      @show_contact_email = true
+    end
+
   end
 end

data/app/views/nimbleshop_simply/orders/show.html.erb

@@ -1,7 +1,7 @@
 <br />
 
-<div class='alert alert-success'>
-  <p><strong> You have successfully completed the purchase. </strong> </p>
+<div class='alert alert-success purchase-success'>
+  <h3><strong> You have successfully completed the purchase. </strong> </h3>
   <ul>
     <li>
       An email is being sent to <strong><%= @order.email %></strong> with full information regarding

data/app/views/nimbleshop_simply/shared/_order_summary_shipping_address.html.erb

@@ -1,30 +1,36 @@
-<% if current_order.shipping_address.persisted? && params[:controller] != "checkout/shipping_addresses" %>
+<% if @show_shipping_billing_address || @show_contact_email %>
   <div class='row'>
     <div class='span4' style='min-height:150px;'>
-      <h3>
-        Shipping address
-        <small>
-          <%= link_to 'change', new_checkout_shipping_address_path, title: 'Edit Shipping Address', id: 'edit_shipping_address', class: 'light-link' %>
-        </small>
-      </h3>
-      <address class='shipping-address'>
-        <%= display_address(current_order.shipping_address) %>
-      </address>
 
-      <h3> Billing address </h3>
+      <% if @show_shipping_billing_address %>
+        <h3>
+          Shipping address
+          <small>
+            <%= link_to 'change', new_checkout_shipping_address_path, title: 'Edit Shipping Address', id: 'edit_shipping_address', class: 'light-link' %>
+          </small>
+        </h3>
+        <address class='shipping-address'>
+          <%= display_address(current_order.shipping_address) %>
+        </address>
 
-      <address class='billing-address'>
-      <% if current_order.shipping_address.use_for_billing %>
-        <i>Same as shipping address</i>
-      <% else %>
-        <%= display_address(current_order.billing_address) %>
+        <h3> Billing address </h3>
+
+        <address class='billing-address'>
+        <% if current_order.shipping_address.use_for_billing %>
+          <i>Same as shipping address</i>
+        <% else %>
+          <%= display_address(current_order.billing_address) %>
+        <% end %>
+        </address>
+      <% end %>
+
+      <% if @show_contact_email %>
+        <h3>Contact email</h3>
+        <address>
+          <%= current_order.email %>
+        </address>
       <% end %>
-      </address>
 
-      <h3>Contact email</h3>
-      <address>
-        <%= current_order.email %>
-      </address>
     </div>
   </div>
 <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nimbleshop_simply
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2582335854368255739
+      hash: -257683429584870324
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2582335854368255739
+      hash: -257683429584870324
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24