RubyGems - solidus_frontend - Versions diffs - 1.0.0.pre2 → 1.0.0.pre3 - Mend

solidus_frontend 1.0.0.pre2 → 1.0.0.pre3

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.

Potentially problematic release.

This version of solidus_frontend might be problematic. Click here for more details.

Files changed (11) hide show

checksums.yaml +4 -4
data/app/controllers/spree/checkout_controller.rb +0 -13
data/app/views/spree/address/_form_hidden.html.erb +12 -0
data/app/views/spree/checkout/_delivery.html.erb +2 -2
data/app/views/spree/checkout/edit.html.erb +0 -1
data/app/views/spree/checkout/payment/_gateway.html.erb +6 -0
data/app/views/spree/orders/_line_item.html.erb +1 -1
data/app/views/spree/products/_image.html.erb +2 -2
data/app/views/spree/shared/_order_details.html.erb +1 -1
data/app/views/spree/shared/_products.html.erb +18 -18
metadata +7 -6

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a6e06ed9140c22fcf312ab7d73c11184bc32f28
-  data.tar.gz: c992f73902237da237019aa3dc1baaf21a038a8d
+  metadata.gz: 085baf546e7975f13d9ff5235b9f3a6056bcb838
+  data.tar.gz: 79bcb30a3cb8f77e660fdbc905faa2ea74c18664
 SHA512:
-  metadata.gz: 40b42af6e6cbe5c83ec01353341f9814bc0702b97c918127db13b760e05f02b64c590ae26af8e1e86b7ff3350f4e6d59b6d50b041e063b15956734580ec05767
-  data.tar.gz: 5cdf9492be39d71824fe7ab45dd064eee5568731bd3489343673be9698ac25f3280b6b9792cfce5d6b0d989f9bc7526a4269efb816b9f2eb95818c85d9482fce
+  metadata.gz: 4a127ff5986ea7ea33f77094999fc0796e0bb14c54006cce4be4cbb9875b38a6e24aff1f75959c6eec34b9b9fd03e4bd4fbbcf745a1fd73eaa58bfac5d3aced5
+  data.tar.gz: 93f19710482d788ab6e29fffa3f90daae9999eaf4623b37bf0dd990429c166a02779d2dda59e5580989a506167f559d49ea666a80dd41f9d22c3dce6c6b5b1fa

data/app/controllers/spree/checkout_controller.rb CHANGED Viewed

@@ -6,7 +6,6 @@ module Spree
   class CheckoutController < Spree::StoreController
     before_filter :load_order
     around_filter :lock_order
-    before_filter :ensure_valid_state_lock_version, only: [:update]
     before_filter :set_state_if_present
     before_action :ensure_order_not_completed
@@ -80,18 +79,6 @@ module Spree
         redirect_to spree.cart_path and return unless @order
       end
-      def ensure_valid_state_lock_version
-        if params[:order] && params[:order][:state_lock_version]
-          @order.with_lock do
-            unless @order.state_lock_version == params[:order].delete(:state_lock_version).to_i
-              flash[:error] = Spree.t(:order_already_updated)
-              redirect_to checkout_state_path(@order.state) and return
-            end
-            @order.increment!(:state_lock_version)
-          end
-        end
-      end
       def set_state_if_present
         if params[:state]
           redirect_to checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state]) && !skip_state_validation?

data/app/views/spree/address/_form_hidden.html.erb ADDED Viewed

@@ -0,0 +1,12 @@
+<%= form.hidden_field :firstname %>
+<%= form.hidden_field :lastname %>
+<%= form.hidden_field :company %>
+<%= form.hidden_field :address1 %>
+<%= form.hidden_field :address2 %>
+<%= form.hidden_field :city %>
+<%= form.hidden_field :country_id %>
+<%= form.hidden_field :state_id %>
+<%= form.hidden_field :state_name %>
+<%= form.hidden_field :zipcode %>
+<%= form.hidden_field :phone %>
+<%= form.hidden_field :alternative_phone %>

data/app/views/spree/checkout/_delivery.html.erb CHANGED Viewed

@@ -26,7 +26,7 @@
             <tbody>
               <% ship_form.object.manifest.each do |item| %>
                 <tr class="stock-item">
-                  <td class="item-image"><%= mini_image(item.variant) %></td>
+                  <td class="item-image"><%= image_tag item.variant.display_image.attachment(:mini) %></td>
                   <td class="item-name"><%= item.variant.name %></td>
                   <td class="item-qty"><%= item.quantity %></td>
                   <td class="item-price"><%= display_price(item.variant) %></td>
@@ -72,7 +72,7 @@
             <tbody>
               <% @differentiator.missing.each do |variant, quantity| %>
                 <tr class="stock-item">
-                  <td class="item-image"><%= mini_image(variant) %></td>
+                  <td class="item-image"><%= image_tag variant.display_image.attachment(:mini) %></td>
                   <td class="item-name"><%= variant.name %></td>
                   <td class="item-qty"><%= quantity %></td>
                   <td class="item-price"><%= display_price(variant) %></td>

data/app/views/spree/checkout/edit.html.erb CHANGED Viewed

@@ -15,7 +15,6 @@
             <%= form.text_field :email %>
           </p>
         <% end %>
-        <%= form.hidden_field :state_lock_version %>
         <%= render @order.state, :form => form %>
       <% end %>
     </div>

data/app/views/spree/checkout/payment/_gateway.html.erb CHANGED Viewed

@@ -29,4 +29,10 @@
   <%= link_to "(#{Spree.t(:what_is_this)})", spree.content_path('cvv'), :target => '_blank', "data-hook" => "cvv_link", :id => "cvv_link" %>
 </p>
+<% if @order.bill_address %>
+  <%= fields_for "#{param_prefix}[address_attributes]", @order.bill_address do |f| %>
+    <%= render :partial => 'spree/address/form_hidden', :locals => { :form => f } %>
+  <% end %>
+<% end %>
 <%= hidden_field_tag "#{param_prefix}[cc_type]", '', :id => "cc_type", :class => 'ccType' %>

data/app/views/spree/orders/_line_item.html.erb CHANGED Viewed

@@ -3,7 +3,7 @@
   <tr class="<%= cycle('', 'alt') %> line-item">
     <td class="cart-item-image" data-hook="cart_item_image">
       <% if variant.images.length == 0 %>
-        <%= link_to small_image(variant.product), variant.product %>
+        <%= link_to image_tag(variant.product.display_image.attachment(:small)), variant.product %>
       <% else %>
         <%= link_to image_tag(variant.images.first.attachment.url(:small)), variant.product %>
       <% end %>

data/app/views/spree/products/_image.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <% if defined?(image) && image %>
-  <%= image_tag image.attachment.url(:product), :itemprop => "image" %>
+  <%= image_tag image.attachment.url(:product), itemprop: "image" %>
 <% else %>
-  <%= product_image(@product, :itemprop => "image") %>
+  <%= image_tag @product.display_image.attachment(:product), itemprop: "image" %>
 <% end %>

data/app/views/spree/shared/_order_details.html.erb CHANGED Viewed

@@ -62,7 +62,7 @@
       <tr data-hook="order_details_line_item_row">
         <td data-hook="order_item_image">
           <% if item.variant.images.length == 0 %>
-            <%= link_to small_image(item.variant.product), item.variant.product %>
+            <%= link_to image_tag(item.variant.product.display_image.attachment(:small)), item.variant.product %>
           <% else %>
             <%= link_to image_tag(item.variant.images.first.attachment.url(:small)), item.variant.product %>
           <% end %>

data/app/views/spree/shared/_products.html.erb CHANGED Viewed

@@ -16,29 +16,29 @@
     </div>
   <% elsif params.key?(:keywords) %>
     <div data-hook="products_search_results_heading_results_found">
-      <h6 class="search-results-title"><%= Spree.t(:search_results, :keywords => h(params[:keywords])) %></h6>
+      <h6 class="search-results-title"><%= Spree.t(:search_results, keywords: h(params[:keywords])) %></h6>
     </div>
   <% end %>
 </div>
 <% if products.any? %>
-<ul id="products" class="inline product-listing" data-hook>
-  <% products.each do |product| %>
-    <% url = spree.product_path(product, :taxon_id => @taxon.try(:id)) %>
-    <li id="product_<%= product.id %>" class="columns three <%= cycle("alpha", "secondary", "", "omega secondary", :name => "classes") %>" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
-      <% cache(@taxon.present? ? [I18n.locale, current_currency, @taxon, product] : [I18n.locale, current_currency, product]) do %>
-        <div class="product-image">
-          <%= link_to small_image(product, :itemprop => "image"), url, :itemprop => 'url' %>
-        </div>
-        <%= link_to truncate(product.name, :length => 50), url, :class => 'info', :itemprop => "name", :title => product.name %>
-        <span itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-          <span class="price selling" itemprop="price"><%= display_price(product) %>
-        </span>
-      <% end %>
-    </li>
-  <% end %>
-  <% reset_cycle("classes") %>
-</ul>
+  <ul id="products" class="inline product-listing" data-hook>
+    <% products.each do |product| %>
+      <% url = spree.product_path(product, taxon_id: @taxon.try(:id)) %>
+      <li id="product_<%= product.id %>" class="columns three <%= cycle("alpha", "secondary", "", "omega secondary", name: "classes") %>" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
+        <% cache(@taxon.present? ? [I18n.locale, current_currency, @taxon, product] : [I18n.locale, current_currency, product]) do %>
+          <div class="product-image">
+            <%= link_to image_tag(product.display_image.attachment(:small), itemprop: "image"), url, itemprop: 'url' %>
+          </div>
+          <%= link_to truncate(product.name, length: 50), url, class: 'info', itemprop: "name", title: product.name %>
+          <span itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+            <span class="price selling" itemprop="price"><%= display_price(product) %>
+          </span>
+        <% end %>
+      </li>
+    <% end %>
+    <% reset_cycle("classes") %>
+  </ul>
 <% end %>
 <% if paginated_products.respond_to?(:num_pages) %>

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre2
+  version: 1.0.0.pre3
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
+        version: 1.0.0.pre3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
+        version: 1.0.0.pre3
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
+        version: 1.0.0.pre3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
+        version: 1.0.0.pre3
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,7 @@ files:
 - app/controllers/spree/taxons_controller.rb
 - app/models/spree/frontend_configuration.rb
 - app/views/spree/address/_form.html.erb
+- app/views/spree/address/_form_hidden.html.erb
 - app/views/spree/checkout/_address.html.erb
 - app/views/spree/checkout/_confirm.html.erb
 - app/views/spree/checkout/_delivery.html.erb