nimbleshop_simply 0.0.7 → 0.0.8

data/app/assets/javascripts/nimbleshop_simply/load_states.js.coffee

@@ -1,40 +1,24 @@
-window.App = window.App || {}
+window.NimbleshopSimply = window.NimbleshopSimply || {}
 
-class window.App.toggleStates
+class NimbleshopSimply.manageStates
 
-	toggleVisibility: (country) ->
-		if @hasRegions country
-			@stateNameField(country).val('').parents('.control-group').hide()
-			@stateCodeField(country).val('').parents('.control-group').show()
-		else
-			@stateNameField(country).val('').parents('.control-group').show()
-			@stateCodeField(country).val('').parents('.control-group').hide()
-
-	hasRegions: ($element) ->
-		window.countryStateCodes[$element.val()].length > 0
-
-	stateNameField: ($element) ->
-		$element.parents("div.well").find("[name$='[state_name]']")
-
-	stateCodeField: ($element) ->
-		$element.parents("div.well").find("[name$='[state_code]']")
+	stateCodeField: ($country) ->
+		$country.parents("div.well").find("[name$='[state_code]']")
 
 	createOption: (state) ->
 		($ "<option />", text: state[0], value: state[1])
 
-	updateStates: ($element) ->
-		$stateCode = @stateCodeField($element).html('')
-		for state in window.countryStateCodes[$element.val()]
+	updateStates: ($country) ->
+		$stateCode = @stateCodeField($country).html('')
+		for state in window.countryStateCodes[$country.val()]
 			$stateCode.append @createOption(state)
 
 	handler: (evt) =>
 		$country = $(evt.target)
-		if @hasRegions $country
-			@updateStates $country
-		@toggleVisibility $country
+		@updateStates $country
 		false
 
 	constructor:  ->
 		($ "select[name$='[country_code]']").bind('change', @handler)
-		for country in  ($ "select[name$='[country_code]']")
-			$(country).triggerHandler 'change'
+		#for country in  ($ "select[name$='[country_code]']")
+			#$(country).triggerHandler 'change'

data/app/assets/javascripts/nimbleshop_simply/mobile.simply.js

@@ -0,0 +1,4 @@
+//= require jquery
+//= require jquery_ujs
+//= require jquery.mobile
+

data/app/assets/javascripts/nimbleshop_simply/order.js.coffee

@@ -1,2 +1,2 @@
 $ ->
-	new window.App.toggleStates()
+	new window.NimbleshopSimply.manageStates()

data/app/assets/javascripts/nimbleshop_simply/shipping_address_same_as_billing_address.js.coffee

@@ -1,10 +1,10 @@
-window.NimbleshopSimply = {} if typeof(NimbleshopSimply) == 'undefined'
+window.NimbleshopSimply = window.NimbleshopSimply || {}
 
 NimbleshopSimply.toggleBillingAddress = class ToggleBillingAddress
   constructor: ->
     @handleToggleCheckBox()
     $("#order_shipping_address_attributes_use_for_billing").on 'click', =>
-      this.handleToggleCheckBox()
+      @handleToggleCheckBox()
 
   handleToggleCheckBox: ->
     if $("#order_shipping_address_attributes_use_for_billing").is(':checked')

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

@@ -51,3 +51,7 @@ $bottomColorLight: opacify($bottomColor, 0.5);
     text-decoration: none;
   }
 }
+
+.light-link {
+  color: #999;
+}

data/app/assets/stylesheets/nimbleshop_simply/mobile.simply.css

@@ -0,0 +1,7 @@
+p {
+  color: red;
+}
+
+p.price {
+  color: red;
+}

data/app/assets/stylesheets/nimbleshop_simply/mobile_simply.css

@@ -0,0 +1,4 @@
+p.price {
+  margin-top: 10px;
+  font-size: 16px;
+}

data/app/controllers/nimbleshop_simply/carts_controller.rb

@@ -3,12 +3,6 @@ module NimbleshopSimply
 
     respond_to :html
 
-    # this is mostly used for development purpose
-    def reset
-      reset_session
-      redirect_to root_url
-    end
-
     def show
       @line_items = current_order.blank? ? [] : current_order.line_items(include: :product).order('id')
       respond_with @line_items

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

@@ -8,6 +8,7 @@ module NimbleshopSimply
     def new
       @page_sub_title = 'All payments are secure and encrypted. We never store your credit card information.'
       @creditcard = Creditcard.new
+      @show_shipping_and_tax_info = true
       render text: 'No payment method has been setup. Please setup atleast one payment method.' if PaymentMethod.count == 0
     end
 

data/app/views/layouts/simply.mobile.erb

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title> <%= display_page_title %> </title>
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <%= stylesheet_link_tag 'nimbleshop_simply/mobile_simply' %>
+    <link rel="stylesheet" href="http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.css" />
+    <script type="text/javascript" src="http://code.jquery.com/jquery-1.6.4.min.js"></script>
+    <script type="text/javascript" src="http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.js"></script>
+
+    <%= csrf_meta_tag %>
+  </head>
+
+  <body>
+    <div data-role="page">
+      <div data-role="header">
+        <h1>nimbleShop</h1>
+      </div>
+
+      <%= yield %>
+
+
+      <div data-role="footer">
+        <h4>Page Footer</h4>
+      </div>
+    </div>
+
+  </body>
+</html>

data/app/views/nimbleshop_simply/checkout/shipping_addresses/_billing_address.html.erb

@@ -49,13 +49,6 @@
         </div>
       </div>
 
-      <div class='control-group state-name'>
-        <%= billing_form.label :state_name, 'State/Province', class: 'control-label' %>
-        <div class='controls'>
-          	<%= billing_form.text_field :state_name, class: 'input-xlarge' %>
-        </div>
-      </div>
-
       <div class='control-group state-code'>
         <%= billing_form.label :state_code, class: 'control-label' %>
         <div class='controls'>

data/app/views/nimbleshop_simply/checkout/shipping_addresses/_shipping_address.html.erb

@@ -55,13 +55,6 @@
       </div>
     </div>
 
-    <div class='control-group'>
-      <%= shipping_form.label :state_name, class: 'control-label' %>
-      <div class='controls'>
-        <%= shipping_form.text_field :state_name, class: 'input-xlarge' %>
-      </div>
-    </div>
-
     <div class='control-group'>
       <%= shipping_form.label :zipcode, class: 'control-label' %>
       <div class='controls'>
@@ -72,7 +65,7 @@
     <div class='control-group'>
       <div class='controls'>
         <label class='checkbox'>
-          <%= shipping_form.check_box :use_for_billing %> 
+          <%= shipping_form.check_box :use_for_billing %>
           Use this address as billing address too
         </label>
       </div>

data/app/views/nimbleshop_simply/checkout/shipping_methods/_no_shipping_method.html.erb

@@ -1,4 +1,5 @@
-<div class="well" style="margin-top:20px;text-align: center;">
-  <h4>  unable to complete your order (no shipping method available)</h4>
-  <%= link_to "Edit Shipping Address", [:edit, current_order]%>
-</div>
+<h4> No shipping method is available for the shipping address you have chosen</h4>
+<br />
+<p>
+  <%= link_to "Change shipping address", new_checkout_shipping_address_path %>
+</p>

data/app/views/nimbleshop_simply/products/_products.mobile.erb

@@ -0,0 +1,15 @@
+<div class='span10'>
+  <% products.in_groups_of(3) do |group| %>
+     <ul class="unstyled row">
+        <% group.each do |product| %>
+            <% if product.blank? %>
+              &nbsp;
+            <% else %>
+              <li class="span3">
+                <%= render 'nimbleshop_simply/products/product', product: product %>
+              </li>
+            <% end %>
+        <% end %>
+     </ul>
+  <% end %>
+</div>

data/app/views/nimbleshop_simply/products/index.mobile.erb

@@ -0,0 +1,15 @@
+<div data-role="content" data-theme="d">
+  <ul data-role="listview">
+      <% @products.each do |product| %>
+        <li>
+          <%= link_to product do %>
+            <%= product_main_picture(product, :small_plus) %>
+            <%= truncate(product.name, length: 50) %>
+            <p class='price'>
+              <%= number_to_currency(product.price) %>
+            </p>
+          <% end %>
+        </li>
+      <% end %>
+  </ul>
+</div>

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

@@ -3,7 +3,7 @@
     <h3>
       Order summary
       <small>
-        <%= link_to 'Edit', cart_path, id: 'edit_cart', title: 'edit cart' %>
+        <%= link_to 'change', cart_path, id: 'edit_cart', title: 'edit cart', class: 'light-link' %>
       </small>
     </h3>
 

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

@@ -4,7 +4,7 @@
       <h3>
         Shipping address
         <small>
-          <%= link_to 'Edit', new_checkout_shipping_address_path, title: 'Edit Shipping Address', id: 'edit_shipping_address' %>
+          <%= 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'>

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

@@ -4,7 +4,7 @@
       <h3>
         Shipping method
         <small>
-          <%= link_to 'Edit', new_checkout_shipping_method_path, id: 'edit_shipping_method', title: 'edit shipping method' %>
+          <%= link_to 'change', new_checkout_shipping_method_path, id: 'edit_shipping_method', title: 'edit shipping method', class: 'light-link' %>
         </small>
       </h3>
       <address class='shipping-method'>

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

@@ -1,4 +1,4 @@
-<% if params[:controller] == 'checkout/payments' %>
+<% if @show_shipping_and_tax_info %>
   <tr>
     <td>
       <div class='lhs order-shipping-cost-amount'>

data/config/initializers/add_mime_type.rb

@@ -0,0 +1 @@
+Mime::Type.register_alias "text/html", :mobile

data/test/integration/checkout/cart_acceptance_test.rb

@@ -111,3 +111,26 @@ class CartWithOrderExpiredAcceptanceTest < ActionDispatch::IntegrationTest
     assert page.has_content?('powered by')
   end
 end
+
+class CartWithOrderAlreadyAuthorizedAcceptanceTest < ActionDispatch::IntegrationTest
+  include ::ShippingMethodTestHelper
+  include ::CheckoutTestHelper
+
+  setup do
+    create(:product, name: 'Bracelet Set', price: 25)
+    create(:product, name: 'Necklace Set', price: 14)
+    create(:country_shipping_method)
+  end
+
+  test 'on cart page' do
+    visit root_path
+    add_item_to_cart('Bracelet Set')
+    assert_equal 1, Order.last.line_items.size
+    old_order_id = Order.last.id
+    Order.last.update_column(:payment_status, 'authorized')
+    add_item_to_cart('Bracelet Set')
+    assert_equal 1, Order.last.line_items.size
+    refute old_order_id == Order.last.id
+  end
+
+end

data/test/integration/checkout/shipping_method_acceptance_test.rb

@@ -27,6 +27,19 @@ class ShippingMethodAcceptanceTest < ActionDispatch::IntegrationTest
     assert page.has_content?('Please select a shipping method')
   end
 
+  test 'no shipping method available message' do
+    visit root_path
+    add_item_to_cart('Bracelet Set')
+    click_link 'Checkout'
+
+    enter_valid_email_address
+    enter_valid_shipping_address
+    ShippingMethod.delete_all
+    click_button 'Submit'
+
+    assert page.has_content?('No shipping method is available for the shipping address you have chosen')
+  end
+
   test "ability to change shipping method" do
     visit root_path
     add_item_to_cart('Bracelet Set')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nimbleshop_simply
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -60,6 +60,7 @@ files:
 - app/assets/images/nimbleshop_simply/twitter.png
 - app/assets/javascripts/nimbleshop_simply/enable_fancybox.js.coffee
 - app/assets/javascripts/nimbleshop_simply/load_states.js.coffee
+- app/assets/javascripts/nimbleshop_simply/mobile.simply.js
 - app/assets/javascripts/nimbleshop_simply/order.js.coffee
 - app/assets/javascripts/nimbleshop_simply/remove_item_from_cart.js.coffee
 - app/assets/javascripts/nimbleshop_simply/shipping_address_same_as_billing_address.js.coffee
@@ -68,6 +69,8 @@ files:
 - app/assets/stylesheets/nimbleshop_simply/cart.css.scss
 - app/assets/stylesheets/nimbleshop_simply/cart_button.css.scss
 - app/assets/stylesheets/nimbleshop_simply/custom.css.scss
+- app/assets/stylesheets/nimbleshop_simply/mobile.simply.css
+- app/assets/stylesheets/nimbleshop_simply/mobile_simply.css
 - app/assets/stylesheets/nimbleshop_simply/override_bootstrap.css
 - app/assets/stylesheets/nimbleshop_simply/simply.css
 - app/assets/stylesheets/nimbleshop_simply/themed_bootstrap_and_overrides.css.less
@@ -88,6 +91,7 @@ files:
 - app/views/layouts/_twitter.html.erb
 - app/views/layouts/nimbleshop_simply/mailer.text.erb
 - app/views/layouts/simply.html.erb
+- app/views/layouts/simply.mobile.erb
 - app/views/nimbleshop_simply/carts/_empty_cart.html.erb
 - app/views/nimbleshop_simply/carts/_line_item.html.erb
 - app/views/nimbleshop_simply/carts/show.html.erb
@@ -117,15 +121,19 @@ files:
 - app/views/nimbleshop_simply/products/_breadcrumb.html.erb
 - app/views/nimbleshop_simply/products/_link_group.html.erb
 - app/views/nimbleshop_simply/products/_product.html.erb
+- app/views/nimbleshop_simply/products/_product.mobile.erb
 - app/views/nimbleshop_simply/products/_products.html.erb
+- app/views/nimbleshop_simply/products/_products.mobile.erb
 - app/views/nimbleshop_simply/products/_sidebar.html.erb
 - app/views/nimbleshop_simply/products/index.html.erb
+- app/views/nimbleshop_simply/products/index.mobile.erb
 - app/views/nimbleshop_simply/products/show.html.erb
 - app/views/nimbleshop_simply/shared/_order_summary.html.erb
 - app/views/nimbleshop_simply/shared/_order_summary_line_items.html.erb
 - app/views/nimbleshop_simply/shared/_order_summary_shipping_address.html.erb
 - app/views/nimbleshop_simply/shared/_order_summary_shipping_method.html.erb
 - app/views/nimbleshop_simply/shared/_shipping_and_tax_info.html.erb
+- config/initializers/add_mime_type.rb
 - config/routes.rb
 - lib/nimbleshop_simply/engine.rb
 - lib/nimbleshop_simply.rb
@@ -154,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1282583842987372000
+      hash: 1098292971187762910
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -163,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1282583842987372000
+      hash: 1098292971187762910
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24