solidus_backend 1.1.0.pre1 → 1.1.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb921f3d0b7526ed305a05749e2b1c79247a9b91
-  data.tar.gz: 14a684162867e5b18c9c417ab76f1b4ea2dd5753
+  metadata.gz: 3f6d121e26b92751779de7aace0d4e77e75560dd
+  data.tar.gz: 6ae2f4576db3c13f393ffaa8b3a4da8a4b1e1e1f
 SHA512:
-  metadata.gz: ba12ed2db0769423911a50b66d9e96eedfddf9c7ed4bb64149aa96be53e40235b6685e6b1b058b6abb58e89a12a192a626b426c0f77b77f65fae8977f26e22c5
-  data.tar.gz: 8fdd0ee6abcd6593e2280428f1a81cbbe215721ab35043197303684b7d353e6c5a5718380373dcbc2c7369d7b8098159f0eff5426d82ec23b53bc5e07e821d5f
+  metadata.gz: f21748bda471f57c7aba52f32f6bcfcbc852a4f88c97dea5d9569cc39a96a35593fc82322ce7bc66bfa7e1f00e7579ef4eb4505625c13945f2e96bd106c6a376
+  data.tar.gz: 0be3e5b0cd73bd5d382e6d2675ccadff7ba339e5b44e540c0186b77cb1391d87ff3b487de6f0253e0f85b66044eb30346e4addd66f122b7d5c812917cb540b15

data/app/controllers/spree/admin/stock_transfers_controller.rb

@@ -7,8 +7,9 @@ module Spree
         { translation_key: :name, attr_name: :name }
       ]
 
-      before_filter :load_transferable_stock_locations, only: [:index, :new]
+      before_filter :load_transferable_stock_locations, only: :index
       before_filter :load_variant_display_attributes, only: [:receive, :edit, :show, :tracking_info]
+      before_filter :load_source_stock_locations, only: :new
       before_filter :load_destination_stock_locations, only: :edit
       before_filter :ensure_access_to_stock_location, only: :create
       before_filter :ensure_receivable_stock_transfer, only: :receive
@@ -99,16 +100,16 @@ module Spree
         authorize! :create, duplicate
       end
 
-      def transferable_stock_locations
-        Spree::StockLocation.accessible_by(current_ability, :transfer)
+      def load_transferable_stock_locations
+        @stock_locations = accessible_source_stock_locations | accessible_destination_stock_locations
       end
 
-      def load_transferable_stock_locations
-        @stock_locations = transferable_stock_locations
+      def load_source_stock_locations
+        @source_stock_locations = accessible_source_stock_locations
       end
 
       def load_destination_stock_locations
-        @destination_stock_locations = transferable_stock_locations.where.not(id: @stock_transfer.source_location_id)
+        @destination_stock_locations = accessible_destination_stock_locations.where.not(id: @stock_transfer.source_location_id)
       end
 
       def load_variant_display_attributes
@@ -141,6 +142,14 @@ module Spree
           @stock_transfer.destination_location.move(transfer_item.variant, transfer_item.received_quantity, @stock_transfer)
         end
       end
+
+      def accessible_source_stock_locations
+        @source_locations ||= Spree::StockLocation.accessible_by(current_ability, :transfer_from)
+      end
+
+      def accessible_destination_stock_locations
+        @destination_locations ||= Spree::StockLocation.accessible_by(current_ability, :transfer_to)
+      end
     end
   end
 end

data/app/controllers/spree/admin/users_controller.rb

@@ -109,10 +109,11 @@ module Spree
         end
 
         def user_params
-          attributes = permitted_user_attributes | [
-            ship_address_attributes: permitted_address_attributes,
-            bill_address_attributes: permitted_address_attributes
-          ]
+          attributes = permitted_user_attributes
+
+          if action_name == "create" || can?(:update_email, @user)
+            attributes |= [:email]
+          end
 
           if can? :manage, Spree::Role
             attributes += [{ spree_role_ids: [] }]

data/app/helpers/spree/admin/base_helper.rb

@@ -159,12 +159,6 @@ module Spree
         dom_id(record, 'spree')
       end
 
-      def rails_environments
-        @@rails_environments ||= Dir.glob("#{Rails.root}/config/environments/*.rb")
-                                    .map { |f| File.basename(f, ".rb") }
-                                    .sort
-      end
-
       private
         def attribute_name_for(field_name)
           field_name.gsub(' ', '_').downcase

data/app/views/spree/admin/log_entries/index.html.erb

@@ -24,7 +24,9 @@
       <tbody>
         <tr>
           <td>Message</td>
-          <td><%= entry.parsed_details.message %></td>
+          <td>
+            <pre><%= entry.parsed_details.message %></pre>
+          </td>
         </tr>
       </tbody>
   <% end %>

data/app/views/spree/admin/orders/confirm/_payments.html.erb

@@ -15,7 +15,7 @@
       <% payments.each do |payment| %>
         <tr>
           <td>
-            <%= link_to payment.identifier, spree.admin_order_payment_path(@order, payment) %>
+            <%= link_to payment.number, spree.admin_order_payment_path(@order, payment) %>
           </td>
           <td>
             <%= pretty_time(payment.created_at) %>

data/app/views/spree/admin/payments/_list.html.erb

@@ -13,7 +13,7 @@
   <tbody>
     <% payments.each do |payment| %>
       <tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="<%= cycle('odd', 'even', name: 'payment_table_cycle')%>">
-        <td><%= link_to payment.identifier, spree.admin_order_payment_path(@order, payment) %></td>
+        <td><%= link_to payment.number, spree.admin_order_payment_path(@order, payment) %></td>
         <td><%= pretty_time(payment.created_at) %></td>
         <td class="align-center amount"><%= payment.display_amount.to_html %></td>
         <td class="align-center"><%= payment_method_name(payment) %></td>

data/app/views/spree/admin/promotions/_form.html.erb

@@ -33,6 +33,11 @@
         <%= f.check_box :advertise %>
         <%= f.label :advertise %>
       <% end %>
+
+      <%= f.field_container :apply_automatically do %>
+        <%= f.check_box :apply_automatically %>
+        <%= f.label :apply_automatically %>
+      <% end %>
     </div>
 
     <div class="omega nine columns">

data/app/views/spree/admin/promotions/rules/_first_repeat_purchase_since.html.erb

@@ -0,0 +1,7 @@
+<div class="field alpha four columns">
+  <%= Spree.t(:form_text, scope: "promotion_rule_types.first_repeat_purchase_since")  %>
+</div>
+
+<div class="field omega four columns">
+  <%= number_field_tag "#{param_prefix}[preferred_days_ago]", promotion_rule.preferred_days_ago, :class => 'fullwidth' %>
+</div>

data/app/views/spree/admin/stock_transfers/new.html.erb

@@ -14,7 +14,7 @@
   <fieldset class="no-border-top">
     <%= f.field_container :source_location do %>
       <%= f.label nil, Spree.t(:source_location) %>
-      <%= f.select :source_location_id, options_from_collection_for_select(@stock_locations, :id, :name), {include_blank: true}, {class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
+      <%= f.select :source_location_id, options_from_collection_for_select(@source_stock_locations, :id, :name), {include_blank: true}, {class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
       <%= f.error_message_on :source_location %>
     <% end %>
     <%= f.field_container :description do %>

data/app/views/spree/admin/trackers/_form.html.erb

@@ -5,12 +5,6 @@
       <%= text_field :tracker, :analytics_id, :class => 'fullwidth' %>
     </div>
   </div>
-  <div class="four columns">
-    <div data-hook="environment" class="field">
-      <%= label_tag :tracker_environment, Spree.t(:environment) %>
-      <%= collection_select(:tracker, :environment, rails_environments, :to_s, :titleize, {}, {:id => 'tracker-env', :class => 'select2 fullwidth'}) %>
-    </div>
-  </div>
   <div class="omega four columns">
     <div data-hook="active" class="field">
       <%= label_tag nil, Spree.t(:active) %>

data/app/views/spree/admin/trackers/index.html.erb

@@ -23,7 +23,6 @@
     <thead>
       <tr data-hook="admin_trackers_index_headers">
         <th><%= Spree.t(:google_analytics_id) %></th>
-        <th><%= Spree.t(:environment) %></th>
         <th><%= Spree.t(:active) %></th>
         <th class="actions"></th>
       </tr>
@@ -32,7 +31,6 @@
       <% @trackers.each do |tracker|%>
         <tr id="<%= spree_dom_id tracker %>" data-hook="admin_trackers_index_rows" class="<%= cycle('odd', 'even')%>">
           <td class="align-center"><%= tracker.analytics_id %></td>
-          <td class="align-center"><%= tracker.environment.to_s.titleize %></td>
           <td class="align-center"><%= tracker.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td class="actions">
             <% if can?(:update, tracker) %>

data/app/views/spree/admin/users/_form.html.erb

@@ -2,7 +2,12 @@
   <div class="alpha six columns">
     <%= f.field_container :email do %>
       <%= f.label :email, Spree.t(:email) %>
-      <%= f.email_field :email, :class => 'fullwidth' %>
+      <% if can?(:update_email, @user) %>
+        <%= f.email_field :email, :class => 'fullwidth' %>
+      <% else %>
+        <span title="<%= Spree.t(:cannot_update_email) %>" class="fa fa-question-circle icon_link no-text with-tip"></span>
+        <%= f.email_field :email, :class => 'fullwidth', disabled: true %>
+      <% end %>
       <%= error_message_on :user, :email %>
     <% end %>
 

data/app/views/spree/admin/users/index.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <% if can?([:admin, :create], Spree.user_class) %>
+  <% if can?(:admin, Spree.user_class) && can?(:create, Spree.user_class) %>
     <li>
       <%= button_link_to Spree.t(:new_user), new_admin_user_url, :icon => 'plus', :id => 'admin_new_user_link' %>
     </li>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre1
+  version: 1.1.0.pre2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-11-03 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.1.0.pre1
+        version: 1.1.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.pre1
+        version: 1.1.0.pre2
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.pre1
+        version: 1.1.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.pre1
+        version: 1.1.0.pre2
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
@@ -409,6 +409,7 @@ files:
 - app/views/spree/admin/promotions/index.html.erb
 - app/views/spree/admin/promotions/new.html.erb
 - app/views/spree/admin/promotions/rules/_first_order.html.erb
+- app/views/spree/admin/promotions/rules/_first_repeat_purchase_since.html.erb
 - app/views/spree/admin/promotions/rules/_item_total.html.erb
 - app/views/spree/admin/promotions/rules/_landing_page.html.erb
 - app/views/spree/admin/promotions/rules/_nth_order.html.erb