solidus_backend 1.0.7 → 1.1.0.beta1

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

@@ -15,8 +15,8 @@ module Spree
         obj = object.respond_to?(:errors) ? object : instance_variable_get("@#{object}")
 
         if obj && obj.errors[method].present?
-          errors = safe_join(obj.errors[method], "<br />".html_safe)
-          content_tag(:span, errors, class: 'formError')
+          errors = obj.errors[method].map { |err| h(err) }.join('<br />').html_safe
+          content_tag(:span, errors, :class => 'formError')
         else
           ''
         end
@@ -132,11 +132,12 @@ module Spree
 
       def preference_fields(object, form)
         return unless object.respond_to?(:preferences)
-        fields = object.preferences.keys.map { |key|
+        object.preferences.keys.map{ |key|
+
           form.label("preferred_#{key}", Spree.t(key) + ": ") +
-            preference_field_for(form, "preferred_#{key}", type: object.preference_type(key))
-        }
-        safe_join(fields, "<br />".html_safe)
+            preference_field_for(form, "preferred_#{key}", :type => object.preference_type(key))
+
+        }.join("<br />").html_safe
       end
 
       def link_to_add_fields(name, target, options = {})

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

@@ -74,7 +74,7 @@ module Spree
         options[:class] = (options[:class].to_s + " fa fa-#{icon_name} icon_link with-tip").strip
         options[:class] += ' no-text' if options[:no_text]
         options[:title] = text if options[:no_text]
-        text = options[:no_text] ? '' : content_tag(:span, text, class: 'text')
+        text = options[:no_text] ? '' : raw("<span class='text'>#{text}</span>")
         options.delete(:no_text)
         link_to(text, url, options)
       end
@@ -107,10 +107,16 @@ module Spree
           if html_options[:icon]
             html_options[:class] += " fa fa-#{html_options[:icon]}"
           end
-          link_to(text, url, html_options)
+          link_to(text_for_button_link(text, html_options), url, html_options)
         end
       end
 
+      def text_for_button_link(text, html_options)
+        s = ''
+        s << text
+        raw(s)
+      end
+
       def configurations_menu_item(link_text, url, description = '')
         %(<tr>
           <td>#{link_to(link_text, url)}</td>

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

@@ -12,7 +12,7 @@ module Spree
                                     :data => { :confirm => Spree.t(:order_sure_want_to, :event => Spree.t(event)) })
           end
         end
-        safe_join(links, ' '.html_safe)
+        links.join(' ').html_safe
       end
 
       def line_item_shipment_price(line_item, quantity)

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

@@ -9,8 +9,7 @@ module Spree
                       :selected => ('selected' if selected)) do
             (taxon.ancestors.pluck(:name) + [taxon.name]).join(" -> ")
           end
-        end
-        safe_join(options)
+        end.join("").html_safe
       end
 
       def option_types_options_for(product)
@@ -21,8 +20,7 @@ module Spree
                       :selected => ('selected' if selected)) do
             option_type.name
           end
-        end
-        safe_join(options)
+        end.join("").html_safe
       end
     end
   end

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

@@ -15,9 +15,9 @@ module Spree
 
       def display_variant(stock_movement)
         variant = stock_movement.stock_item.variant
-        output = [variant.name]
-        output << variant.options_text unless variant.options_text.blank?
-        safe_join(output, "<br />".html_safe)
+        output = variant.name
+        output += "<br>(#{variant.options_text})" unless variant.options_text.blank?
+        output.html_safe
       end
     end
   end

data/app/views/spree/admin/adjustments/_adjustment.html.erb

@@ -8,7 +8,7 @@
   <td class="align-center"><%= adjustment.display_amount.to_html %></td>
   <td class="align-center"><%= adjustment_state(adjustment) %></td>
   <td class='actions'>
-    <% if adjustment.open? %>
+    <% unless adjustment.finalized? %>
       <% if can?(:update, adjustment) %>
         <%= link_to_edit adjustment, :no_text => true %>
       <% end %>

data/app/views/spree/admin/orders/_add_line_item.html.erb

@@ -1,8 +1,3 @@
-<%= render :partial => "spree/admin/variants/autocomplete", :formats => :js %>
-
-<%= render :partial => "spree/admin/variants/autocomplete_line_items_stock", :formats => :js %>
-
-
 <div id="add-line-item" data-hook>
   <fieldset class="no-border-bottom">
     <legend align="center"><%= Spree.t(:add_product) %></legend>

data/app/views/spree/admin/orders/_add_product.html.erb

@@ -1,6 +1,3 @@
-<%= render :partial => "spree/admin/variants/autocomplete", :formats => :js %>
-<%= render :partial => "spree/admin/variants/autocomplete_stock", :formats => :js %>
-
 <div id="add-line-item" data-hook>
   <fieldset class="no-border-bottom">
     <legend align="center"><%= Spree.t(:add_product) %></legend>

data/app/views/spree/admin/orders/_carton.html.erb

@@ -1,5 +1,4 @@
 <div id="<%= dom_id(carton) %>" data-hook="admin_carton_form">
-  <%= render :partial => "spree/admin/variants/split", :formats => :js %>
   <fieldset class="no-border-bottom">
     <legend align="center" class="stock-location" data-hook="stock-location">
       <span class="carton-number"><%= carton.number %></span>

data/app/views/spree/admin/orders/_shipment.html.erb

@@ -2,7 +2,6 @@
 
 <% unless manifest_items.empty? %>
   <div id="<%= "shipment_#{shipment.id}" %>" data-hook="admin_shipment_form">
-    <%= render :partial => "spree/admin/variants/split", :formats => :js %>
     <fieldset class="no-border-bottom">
       <legend align="center" class="stock-location" data-hook="stock-location">
         <span class="shipment-number"><%= shipment.number %></span>

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

@@ -1,5 +1,4 @@
 <div id="<%= "shipment_#{shipment.id}" %>" data-hook="admin_shipment_form">
-  <%= render :partial => "spree/admin/variants/split", :formats => :js %>
   <fieldset class="no-border-bottom">
     <legend align="center" class="stock-location" data-hook="stock-location">
       <%= Spree.t(:shipment) %>

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -43,7 +43,7 @@
         <% if Spree::Config[:order_bill_address_used] %>
           <div class="field" style="position: absolute;margin-top: -15px;left: 0;">
             <span data-hook="use_billing">
-              <%= check_box_tag 'order[use_billing]', '1', ((@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
+              <%= check_box_tag 'order[use_billing]', '1', ((@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address == @order.ship_address) %>
               <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
             </span>
           </div>

data/app/views/spree/admin/orders/customer_details/edit.html.erb

@@ -12,7 +12,6 @@
   <fieldset class="no-border-bottom">
     <legend align="center"><%= Spree.t(:customer_search) %></legend>
     <%= hidden_field_tag :customer_search,  nil, :class => 'fullwidth title' %>
-    <%= render :partial => "spree/admin/orders/customer_details/autocomplete", :formats => :js %>
   </fieldset>
 </div>
 

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

@@ -40,7 +40,7 @@
         </div>
 
         <div class="field">
-          <%= label_tag nil, "Shipment Number" %>
+          <%= label_tag nil, Spree.t(:shipment_number) %>
           <%= f.text_field :shipments_number_cont %>
         </div>
 
@@ -82,7 +82,6 @@
         <div class="field" data-hook="sku-select">
           <%= label_tag :q_line_items_variant_id_in, Spree.t(:variant) %>
           <%= f.text_field :line_items_variant_id_in, class: "variant_autocomplete fullwidth" %>
-          <%= render partial: "spree/admin/variants/autocomplete", formats: :js %>
         </div>
       </div>
 

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

@@ -24,10 +24,6 @@
 
         <div class="info warning js-gateway-settings-warning"><%= Spree.t(:provider_settings_warning) %></div>
       </div>
-      <div data-hook="environment" class="field">
-        <%= label_tag :payment_method_environment, Spree.t(:environment) %>
-        <%= collection_select(:payment_method, :environment, rails_environments, :to_s, :titleize, {}, {:id => 'gtwy-env', :class => 'select2 fullwidth'}) %>
-      </div>
       <div data-hook="display" class="field">
         <%= label_tag :payment_method_display_on, Spree.t(:display) %>
         <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'}) %>

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

@@ -26,7 +26,6 @@
       <tr data-hook="admin_payment_methods_index_headers">
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:provider) %></th>
-        <th><%= Spree.t(:environment) %></th>
         <th><%= Spree.t(:display) %></th>
         <th><%= Spree.t(:active) %></th>
         <th data-hook="admin_payment_methods_index_header_actions" class="actions"></th>
@@ -37,7 +36,6 @@
         <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows" class="<%= cycle('odd', 'even')%>">
           <td class="align-center"><%= method.name %></td>
           <td class="align-center"><%= method.type %></td>
-          <td class="align-center"><%= method.environment.to_s.titleize %></td>
           <td class="align-center"><%= method.display_on.blank? ? Spree.t(:both) : Spree.t(method.display_on) %></td>
           <td class="align-center"><%= method.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td data-hook="admin_payment_methods_index_row_actions" class="actions">

data/app/views/spree/admin/payments/source_views/_gateway.html.erb

@@ -16,6 +16,9 @@
         <dt><%= Spree.t(:expiration) %>:</dt>
         <dd><%= payment.source.month %>/<%= payment.source.year %></dd>
       </dl>
+      <% if payment.source.address %>
+        <%= render partial: 'spree/admin/shared/address', locals: {address: payment.source.address} %>
+      <% end %>
     </div>
   </div>
 </fieldset>

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

@@ -18,7 +18,8 @@
 <% end %>
 
 <%= form_for @product, :url => admin_product_url(@product), :method => :put do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
+    <legend align="center"><%= Spree.t(:product_properties) %></legend>
     <div class="add_product_properties" data-hook="add_product_properties"></div>
 
     <div id="prototypes" data-hook></div>
@@ -47,9 +48,58 @@
   </fieldset>
 <% end %>
 
+<%= form_tag admin_product_product_properties_path, method: :get, id: 'variant_option_value_selections' do %>
+  <fieldset class='no-border-bottom'>
+    <legend align="center"><%= Spree.t(:variant_properties) %></legend>
+    <fieldset class='no-border-top'>
+      <% @option_types.each do |option_type, option_values| %>
+        <div class="field">
+          <%= label :option_type_presentation, option_type.presentation %>
+          <%= select_tag "ovi[]", options_from_collection_for_select(option_values, :id, :presentation, params[:ovi]), class: 'select2 fullwidth', include_blank: true, id: "#{option_type.name}_option_type_select" %>
+        </div>
+      <% end %>
+      <div class="form-buttons filter-actions actions">
+        <%= button Spree.t(:filter_results) %>
+        <% if @option_value_ids.present? %>
+          <span class="or"><%= Spree.t(:or) %></span>
+          <%= link_to_add_fields Spree.t(:add_variant_properties), 'tbody#variant_property_values', class: 'plus button' %>
+        <% end %>
+      </div>
+    </fieldset>
+  </fieldset>
+<% end %>
+
+<%= form_for @product, url: admin_product_url(@product), method: :put do |f| %>
+  <%= f.fields_for :variant_property_rules, @variant_property_rule do |rule_form| %>
+    <%= rule_form.hidden_field 'id', value: @variant_property_rule.id %>
+    <%= rule_form.hidden_field 'option_value_ids', value: @option_value_ids.join(',') %>
+    <% if @option_value_ids.present? %>
+      <fieldset class='no-border-top'>
+        <table class="index sortable" data-hook data-sortable-link="<%= update_positions_admin_product_variant_property_rule_values_url %>">
+          <thead>
+            <tr data-hook="variant_property_values_header">
+              <th colspan="2"><%= Spree.t(:property) %></th>
+              <th><%= Spree.t(:value) %></th>
+              <th class="actions"></th>
+            </tr>
+          </thead>
+          <tbody id="variant_property_values" data-hook>
+            <%= rule_form.fields_for :values do |values_form| %>
+              <%= render 'product_property_fields', f: values_form %>
+            <% end %>
+          </tbody>
+        </table>
+        <% if can?([:create, :update], Spree::VariantPropertyRule) %>
+          <%= render 'spree/admin/shared/edit_resource_links' %>
+        <% end %>
+      </fieldset>
+    <% end %>
+  <% end %>
+<% end %>
+
 <%= javascript_tag do -%>
   var properties = <%= raw(@properties.to_json) %>;
-  $('#product_properties').on('keydown', 'input.autocomplete', function() {
+  $('#product_properties, #variant_property_values').on('keydown', 'input.autocomplete', function() {
     already_auto_completed = $(this).is('ac_input');
     if (!already_auto_completed) {
       $(this).autocomplete({source: properties});

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

@@ -4,13 +4,15 @@
     <% options = options_for_select(  Rails.application.config.spree.promotions.actions.map(&:name).map {|name| [ Spree.t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
     <fieldset>
       <legend align="center"><%= Spree.t(:promotion_actions) %></legend>
-      <div class="field">
-        <%= label_tag :action_type, Spree.t(:add_action_of_type)%>
-        <%= select_tag 'action_type', options, :class => 'select2 fullwidth' %>  
-      </div>
-      <div class="filter-actions actions">
-        <%= button Spree.t(:add), 'plus' %>
-      </div>
+      <% if can?(:update, @promotion) %>
+        <div class="field">
+          <%= label_tag :action_type, Spree.t(:add_action_of_type)%>
+          <%= select_tag 'action_type', options, :class => 'select2 fullwidth' %>
+        </div>
+        <div class="filter-actions actions">
+          <%= button Spree.t(:add), 'plus' %>
+        </div>
+      <% end %>
     </fieldset>
   <% end %>
 
@@ -24,9 +26,11 @@
         </div>
       <% end %>
     </div>
-    <div class="filter-actions actions promotion-update">
-      <%= button Spree.t('actions.update'), 'refresh' %>
-    </div>
+    <% if can?(:update, @promotion) %>
+      <div class="filter-actions actions promotion-update">
+        <%= button Spree.t('actions.update'), 'refresh' %>
+      </div>
+    <% end %>
   <% end %>
 
 </fieldset>

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

@@ -1,11 +1,13 @@
 <div class="promotion_action promotion-block <%= promotion_action.type.to_s.demodulize.underscore %>" id="<%= dom_id promotion_action %>">
   <% type_name = promotion_action.class.name.demodulize.underscore %>
   <h6 class="promotion-title"><%= Spree.t("promotion_action_types.#{type_name}.description") %></h6>
-  <%= link_to_with_icon 'trash', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), :remote => true, :method => :delete, :class => 'delete' %>
-  
+  <% if can?(:destroy, promotion_action) %>
+    <%= link_to_with_icon 'trash', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), :remote => true, :method => :delete, :class => 'delete' %>
+  <% end %>
+
   <% param_prefix = "promotion[promotion_actions_attributes][#{promotion_action.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>
-  
+
   <%= render :partial => "spree/shared/error_messages", :locals => { :target => promotion_action } %>
   <%= render :partial => "spree/admin/promotions/actions/#{type_name}",
              :locals => { :promotion_action => promotion_action, :param_prefix => param_prefix } %>

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

@@ -1,10 +1,12 @@
 <div class="promotion_rule promotion-block alpha omega eight columns" id="<%= dom_id promotion_rule %>">
   <% type_name = promotion_rule.class.name.demodulize.underscore %>
   <h6 class='promotion-title <%= 'no-text' if type_name == 'user_logged_in' || type_name == 'first_order'%>'><%= Spree.t("promotion_rule_types.#{type_name}.description") %></h6>
-  <%= link_to_with_icon 'trash', '', spree.admin_promotion_promotion_rule_path(@promotion, promotion_rule), :remote => true, :method => :delete, :class => 'delete' %>
-  
+  <% if can?(:destroy, promotion_rule) %>
+    <%= link_to_with_icon 'trash', '', spree.admin_promotion_promotion_rule_path(@promotion, promotion_rule), :remote => true, :method => :delete, :class => 'delete' %>
+  <% end %>
+
   <% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
-  <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>  
+  <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>
   <%= render :partial => "spree/shared/error_messages", :locals => { :target => promotion_rule } %>
   <%= render :partial => "spree/admin/promotions/rules/#{type_name}", :locals => { :promotion_rule => promotion_rule, :param_prefix => param_prefix } %>
 </div>

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

@@ -4,27 +4,29 @@
     <fieldset>
       <legend align="center"><%= Spree.t(:rules) %></legend>
 
-      <div class="field">
-        <%= label_tag :promotion_rule_type, Spree.t(:add_rule_of_type) %>  
-        <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), :class => 'select2 fullwidth') %>
-      </div>
-      <div class="filter-actions actions">
-        <%= button Spree.t(:add), 'plus' %>
-      </div>
+      <% if can?(:update, @promotion) %>
+        <div class="field">
+          <%= label_tag :promotion_rule_type, Spree.t(:add_rule_of_type) %>
+          <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), :class => 'select2 fullwidth') %>
+        </div>
+        <div class="filter-actions actions">
+          <%= button Spree.t(:add), 'plus' %>
+        </div>
+      <% end %>
     </fieldset>
   <% end %>
 
-  
+
     <%= form_for @promotion, :url => object_url, :method => :put do |f| %>
       <fieldset class="no-border-top">
         <div id="promotion-pilicy-select" class="align-center row">
           <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
             <div class="alpha four columns">
-              <label><%= f.radio_button :match_policy, policy %> <%= Spree.t "promotion_form.match_policies.#{policy}" %></label>  
+              <label><%= f.radio_button :match_policy, policy %> <%= Spree.t "promotion_form.match_policies.#{policy}" %></label>
             </div>
           <% end %>
         </div>
-        
+
         <div id="rules" class="filter_list row">
           <% if @promotion.rules.any? %>
             <%= render :partial => 'promotion_rule', :collection => @promotion.rules, :locals => {} %>
@@ -35,11 +37,13 @@
           <% end %>
         </div>
 
-        <div class="promotion-update filter-actions actions">
-          <%= button Spree.t('actions.update'), 'refresh' %>
-        </div>
+        <% if can?(:update, @promotion) %>
+          <div class="promotion-update filter-actions actions">
+            <%= button Spree.t('actions.update'), 'refresh' %>
+          </div>
+        <% end %>
       </fieldset>
     <% end %>
-  
+
 
 </fieldset>

data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb

@@ -6,32 +6,9 @@
   type: calculator.preference_type(:base_amount)) %>
 
 <%= label_tag nil, Spree.t(:tiers) %>
-<%= content_tag :div, nil, class: "hidden js-original-tiers",
-  data: { :'original-tiers' => Hash[calculator.preferred_tiers.sort] } %>
-<div class="js-tiers"></div>
+<%= content_tag :div, nil, class: "js-tiers", data: {
+  'original-tiers' => Hash[calculator.preferred_tiers.sort],
+  'form-prefix' => prefix,
+  'calculator' => 'tiered_flat_rate'
+} %>
 <button class="fa fa-plus button js-add-tier"><%= Spree.t(:add) %></button>
-
-<script type="text/x-handlebars-template" id="tier-input-name">
-  <%= prefix %>[calculator_attributes][preferred_tiers][{{base}}]
-</script>
-
-<script type="text/x-handlebars-template" id="tier-fields-template">
-  <div class="fullwidth tier">
-    <a class="fa fa-trash remove js-remove-tier"></a>
-    <div class="two columns alpha omega">
-      <div class="input-group">
-        <span class="input-group-addon">$</span>
-        <input class="js-base-input form-control" type="text" value={{baseField.value}}>
-      </div>
-    </div>
-    <div class="two columns alpha omega right">
-      <div class="input-group">
-        <span class="input-group-addon">$</span>
-        <input class="js-value-input form-control"
-          name="{{valueField.name}}" type="text" value={{valueField.value}}>
-      </div>
-    </div>
-    <div class="clear"></div>
-  </div>
-</script>
-