spree_backend 2.1.12 → 2.2.0

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

@@ -1,5 +1,4 @@
 <% shipment.manifest.each do |item| %>
-  <% line_item = order.find_line_item_by_variant(item.variant) %>
   <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
     <td class="item-image">
       <%= mini_image(item.variant) %>
@@ -10,7 +9,7 @@
         <strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>
       <% end %>
     </td>
-    <td class="item-price align-center"><%= line_item.single_money.to_html %></td>
+    <td class="item-price align-center"><%= item.line_item.single_money.to_html %></td>
     <td class="item-qty-show align-center">
         <% item.states.each do |state,count| %>
           <%= count %> x <%= Spree.t(state).downcase %>
@@ -21,7 +20,7 @@
         <%= number_field_tag :quantity, item.quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
       </td>
     <% end %>
-    <td class="item-total align-center"><%= line_item_shipment_price(line_item, item.quantity) %></td>
+    <td class="item-total align-center"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
     <% unless shipment.shipped? %>
       <td class="cart-item-delete actions" data-hook="cart_item_delete">
         <% if can? :update, item %>

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

@@ -14,16 +14,22 @@
         <div class="field">
           <%= label_tag nil, Spree.t(:guest_checkout) %>
           <ul>
-            <% guest = @order.user.nil? %>
-            <li>
-              <%= radio_button_tag :guest_checkout, true, guest %>
-              <%= label_tag :guest_checkout_true, Spree.t(:say_yes) %>
-            </li>
-            <li>
-              <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
-              <%= label_tag :guest_checkout_false, Spree.t(:say_no) %>
-            </li>
-            <%= hidden_field_tag :user_id, @order.user_id %>
+            <% if @order.completed? %>
+              <li>
+                <%= @order.user.nil? ? Spree.t(:say_yes) : Spree.t(:say_no) %>
+              </li>
+            <% else %>
+              <% guest = @order.user.nil? %>
+              <li>
+                <%= radio_button_tag :guest_checkout, true, guest %>
+                <%= label_tag :guest_checkout_true, Spree.t(:say_yes) %>
+              </li>
+              <li>
+                <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
+                <%= label_tag :guest_checkout_false, Spree.t(:say_no) %>
+              </li>
+              <%= hidden_field_tag :user_id, @order.user_id %>
+            <% end %>
           </ul>
         </div>
       </div>
@@ -45,7 +51,7 @@
       <%= f.fields_for :ship_address do |sa_form| %>
         <div class="field" style="position: absolute;margin-top: -15px;right: 0;">
           <span data-hook="use_billing">
-            <%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address? %>
+            <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
             <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
           </span>
         </div>
@@ -62,6 +68,6 @@
   </div>
 
   <% content_for :head do %>
-    <%= javascript_include_tag 'admin/address_states.js' %>
+    <%= javascript_include_tag 'spree/backend/address_states.js' %>
   <% end %>
 </fieldset>

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

@@ -17,6 +17,10 @@
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
 </div>
 
+<% if @order.payments.exists? && @order.considered_risky? %>
+  <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.order("created_at DESC").first %>
+<% end %>
+
 <%= render :partial => 'add_product' if can?(:update, @order) %>
 
 <% if @order.line_items.empty? %>

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

@@ -33,6 +33,7 @@
           <%= label_tag nil, Spree.t(:status) %>
           <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {:include_blank => true}, :class => 'select2' %>
         </div>
+
       </div>
 
       <div class="four columns">
@@ -64,7 +65,10 @@
             <%= Spree.t(:show_only_complete_orders) %>
           </label>
         </div>
-
+        <div class="field">
+          <%= label_tag nil, Spree.t(:promotion) %>
+          <%= f.select :promotions_id_in, Spree::Promotion.all.collect {|p| [p.name, p.id]}, {:include_blank => true}, :class => 'select2' %>
+        </div>
       </div>
 
       <div class="clearfix"></div>

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

@@ -0,0 +1,19 @@
+<% if @payment.capture_events.exists? %>
+  <h3><%= Spree.t(:capture_events) %></h3>
+  <table class="index" id="capture_events">
+    <thead>
+      <tr data-hook="payments_header">
+        <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
+        <th><%= Spree.t(:amount) %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @payment.capture_events.each do |capture_event| %>
+        <tr id="<%= dom_id(capture_event) %>" data-hook="capture_events_row" class="<%= cycle('odd', 'even')%>">
+          <td><%= pretty_time(capture_event.created_at) %></td>
+          <td><%= capture_event.display_amount %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>

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

@@ -10,7 +10,7 @@
       <label><%= Spree.t(:payment_method) %></label>
       <ul>
         <% @payment_methods.each do |method| %>
-          <li data-id="<%= Spree.t(method.name, :scope => :payment_methods, :default => method.name).parameterize %>">
+          <li>
             <label data-hook="payment_method_field">
               <%= radio_button_tag 'payment[payment_method_id]', method.id, method == @payment_method %>
               <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>

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

@@ -5,6 +5,10 @@
   <%= I18n.t(:one, scope: "activerecord.models.spree/payment") %>
   <i class="icon-arrow-right"></i>
   <%= payment_method_name(@payment) %>
+  &nbsp;
+  <span class="state <%= @payment.state %>">
+    <%= Spree.t(@payment.state, :scope => :payment_states, :default => @payment.state.capitalize) %>
+  </span>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -16,4 +20,6 @@
 
 <div data-hook="amount" class="align-center">
   <h5><%= label_tag nil, Spree.t(:amount) %>: <span class="green"><%= @payment.display_amount.to_html %></span> </h5>
-</div>
+</div>
+
+<%= render 'spree/admin/payments/capture_events' %>

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

@@ -28,9 +28,17 @@
         </div>
       </div>
     </div>
+    <div class="alpha four columns">
+      <div data-hook="card_name">
+        <div class="field">
+          <%= label_tag 'card_name', raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
+          <%= text_field_tag "#{param_prefix}[name]", '', :class => 'required fullwidth', :id => 'card_name', :maxlength => 19 %>
+        </div>
+      </div>
+    </div>
     <div class="three columns">
       <div data-hook="card_expiration" class="field">
-        <%= label_tag 'card_month', raw(t(:expiration) + content_tag(:span, ' *', :class => 'required')) %><br>
+        <%= label_tag 'card_expiry', raw(Spree.t(:expiration) + content_tag(:span, ' *', :class => 'required')) %><br>
         <%= text_field_tag "#{param_prefix}[expiry]", '', :id => 'card_expiry', :class => "required", :placeholder => "MM / YY" %>
       </div>
     </div>

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

@@ -4,6 +4,9 @@
   <div class="row">
     <div class="alpha six columns">
       <dl>
+        <dt><%= Spree.t(:name_on_card) %>:</dt>
+        <dd><%= payment.source.name %></dd>
+
         <dt><%= Spree.t(:card_type) %>:</dt>
         <dd><%= payment.source.cc_type %></dd>
 
@@ -15,5 +18,4 @@
       </dl>
     </div>
   </div>
-
 </fieldset>

data/app/views/spree/admin/products/_autocomplete.js.erb

@@ -0,0 +1,14 @@
+<script type='text/template' id='product_template'>
+  <li id="product_{{ product.id }}" data-product-id="{{product.id }}" class="columns three alpha small_product">
+    <div class="product-image">
+      {{#if product.image }}
+        <img src='{{product.image}}' alt='{{ product.name }}' />
+      {{ else }}
+        <img src='<%= image_path("noimage/small.png") %>' alt='{{product.name }}' />
+      {{/if}}
+    </div>
+    <a class="name">{{ product.name }}</a><br>
+    <span class="price">{{ product.display_price }}</span>
+  </li>
+</script>
+

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

@@ -1,48 +1,40 @@
 <div data-hook="admin_product_form_fields">
+  
+  <div class="left eight columns alpha" data-hook="admin_product_form_left">    
+    <%= f.field_container :name do %>
+      <%= f.label :name, raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
+      <%= f.text_field :name, :class => 'fullwidth title' %>
+      <%= f.error_message_on :name %>
+    <% end %>
 
-  <div class="left eight columns alpha" data-hook="admin_product_form_left">
-    <div data-hook="admin_product_form_name">
-      <%= f.field_container :name do %>
-        <%= f.label :name, raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
-        <%= f.text_field :name, :class => 'fullwidth title' %>
-        <%= f.error_message_on :name %>
-      <% end %>
-    </div>
-
-    <div data-hook="admin_product_form_permalink">
-      <%= f.field_container :permalink do %>
-        <%= f.label :permalink, raw(Spree.t(:permalink) + content_tag(:span, ' *',  :class => "required")) %>
-        <%= f.text_field :permalink, :class => 'fullwidth title' %>
-        <%= f.error_message_on :permalink %>
-      <% end %>
-    </div>
+    <%= f.field_container :slug do %>
+      <%= f.label :slug, raw(Spree.t(:slug) + content_tag(:span, ' *',  :class => "required")) %>
+      <%= f.text_field :slug, :class => 'fullwidth title' %>
+      <%= f.error_message_on :slug %>
+    <% end %>
 
-    <div data-hook="admin_product_form_description">
-      <%= f.field_container :description do %>
-        <%= f.label :description, Spree.t(:description) %>
-        <%= f.text_area :description, {:rows => "#{unless @product.has_variants? then '20' else '13' end}", :class => 'fullwidth'} %>
-        <%= f.error_message_on :description %>
-      <% end %>
-    </div>
+    <%= f.field_container :description do %>
+      <%= f.label :description, Spree.t(:description) %>
+      <%= f.text_area :description, {:rows => "#{unless @product.has_variants? then '20' else '13' end}", :class => 'fullwidth'} %>
+      <%= f.error_message_on :description %>
+    <% end %>
   </div>
 
   <div class="right four columns omega" data-hook="admin_product_form_right">
-    <div data-hook="admin_product_form_price">
     <%= f.field_container :price do %>
       <%= f.label :price, raw(Spree.t(:master_price) + content_tag(:span, ' *', :class => "required")) %>
       <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => '') %>
       <%= f.error_message_on :price %>
     <% end %>
-    </div>
 
-    <div data-hook="admin_product_form_cost_price" class="alpha two columns">
+    <div class="alpha two columns">
       <%= f.field_container :cost_price do %>
         <%= f.label :cost_price, Spree.t(:cost_price) %>
         <%= f.text_field :cost_price, :value => number_to_currency(@product.cost_price, :unit => '') %>
         <%= f.error_message_on :cost_price %>
       <% end %>
     </div>
-    <div data-hook="admin_product_form_cost_currency" class="omega two columns">
+    <div class="omega two columns">
       <%= f.field_container :cost_currency do %>
         <%= f.label :cost_currency, Spree.t(:cost_currency) %>
         <%= f.text_field :cost_currency %>
@@ -52,89 +44,73 @@
 
     <div class="clear"></div>
 
-    <div data-hook="admin_product_form_available_on">
-      <%= f.field_container :available_on do %>
-        <%= f.label :available_on, Spree.t(:available_on) %>
-        <%= f.error_message_on :available_on %>
-        <%= f.text_field :available_on, :value => datepicker_field_value(@product.available_on), :class => 'datepicker' %>
-      <% end %>
-    </div>
+    <%= f.field_container :available_on do %>
+      <%= f.label :available_on, Spree.t(:available_on) %>
+      <%= f.error_message_on :available_on %>
+      <%= f.text_field :available_on, :value => datepicker_field_value(@product.available_on), :class => 'datepicker' %>
+    <% end %>
 
     <% unless @product.has_variants? %>
-      <div data-hook="admin_product_form_sku">
-        <%= f.field_container :sku do %>
-          <%= f.label :sku, Spree.t(:sku) %>
-          <%= f.text_field :sku, :size => 16 %>
-        <% end %>
-      </div>
+      <%= f.field_container :sku do %>
+        <%= f.label :sku, Spree.t(:sku) %>
+        <%= f.text_field :sku, :size => 16 %>
+      <% end %>
 
       <ul id="shipping_specs">
-        <li id="shipping_specs_weight_field" data-hook="admin_product_form_weight" class="field alpha two columns">
+        <li id="shipping_specs_weight_field" class="field alpha two columns">
           <%= f.label :weight, Spree.t(:weight) %>
           <%= f.text_field :weight, :size => 4 %>
         </li>
-        <li id="shipping_specs_height_field" data-hook="admin_product_form_height" class="field omega two columns">
+        <li id="shipping_specs_height_field" class="field omega two columns">
           <%= f.label :height, Spree.t(:height) %>
           <%= f.text_field :height, :size => 4 %>
         </li>
-        <li id="shipping_specs_width_field" data-hook="admin_product_form_width" class="field alpha two columns">
+        <li id="shipping_specs_width_field" class="field alpha two columns">
           <%= f.label :width, Spree.t(:width) %>
           <%= f.text_field :width, :size => 4 %>
         </li>
-        <li id="shipping_specs_depth_field" data-hook="admin_product_form_depth" class="field omega two columns">
+        <li id="shipping_specs_depth_field" class="field omega two columns">
           <%= f.label :depth, Spree.t(:depth) %>
           <%= f.text_field :depth, :size => 4 %>
         </li>
       </ul>
     <% end %>
 
-    <div data-hook="admin_product_form_shipping_categories">
-      <%= f.field_container :shipping_categories do %>
-        <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %>
-        <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
-        <%= f.error_message_on :shipping_category %>
-      <% end %>
-    </div>
+    <%= f.field_container :shipping_categories do %>
+      <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %>
+      <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
+      <%= f.error_message_on :shipping_category %>
+    <% end %>
 
-    <div data-hook="admin_product_form_tax_category">
-      <%= f.field_container :tax_category do %>
-        <%= f.label :tax_category_id, Spree.t(:tax_category) %>
-        <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
-        <%= f.error_message_on :tax_category %>
-      <% end %>
-    </div>
+    <%= f.field_container :tax_category do %>
+      <%= f.label :tax_category_id, Spree.t(:tax_category) %>
+      <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
+      <%= f.error_message_on :tax_category %>
+    <% end %>
   </div>
 
   <div class="twelve columns alpha omega">
-    <div data-hook="admin_product_form_taxons">
-      <%= f.field_container :taxons do %>
-        <%= f.label :taxon_ids, Spree.t(:taxons) %><br />
-        <%= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') %>
-      <% end %>
-    </div>
+    <%= f.field_container :taxons do %>
+      <%= f.label :taxon_ids, Spree.t(:taxons) %><br />
+      <%= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') %>
+    <% end %>
 
-    <div data-hook="admin_product_form_option_types">
-      <%= f.field_container :option_types do %>
-        <%= f.label :option_type_ids, Spree.t(:option_types) %>
-        <%= f.hidden_field :option_type_ids, :value => @product.option_type_ids.join(',') %>
-      <% end %>
-    </div>
+    <%= f.field_container :option_types do %>
+      <%= f.label :option_type_ids, Spree.t(:option_types) %>
+      <%= f.hidden_field :option_type_ids, :value => @product.option_type_ids.join(',') %>
+    <% end %>
   </div>
 
   <div data-hook="admin_product_form_meta" class="alpha omega twelve columns">
-    <div data-hook="admin_product_form_meta_keywords">
-      <%= f.field_container :meta_keywords do %>
-        <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
-        <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
-      <% end %>
-    </div>
+    <%= f.field_container :meta_keywords do %>
+      <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
+      <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
+    <% end %>
 
-    <div data-hook="admin_product_form_meta_description">
-      <%= f.field_container :meta_description do %>
-        <%= f.label :meta_description, Spree.t(:meta_description) %>
-        <%= f.text_field :meta_description, :class => 'fullwidth' %>
-      <% end %>
-    </div>
+    <%= f.field_container :meta_description do %>
+      <%= f.label :meta_description, Spree.t(:meta_description) %>
+      <%= f.text_field :meta_description, :class => 'fullwidth' %>
+    <% end %>
   </div>
 
   <div class="clear"></div>

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

@@ -15,7 +15,7 @@
 
     <div data-hook="new_product_attrs" class="row">
       <% unless @product.has_variants? %>
-        <div data-hook="new_product_sku" class="alpha four columns">
+        <div class="alpha four columns">
           <%= f.field_container :sku do %>
             <%= f.label :sku, Spree.t(:sku) %><br />
             <%= f.text_field :sku, :size => 16, :class => 'fullwidth' %>
@@ -24,14 +24,14 @@
         </div>
       <% end %>
 
-      <div data-hook="new_product_prototype" class="four columns">
+      <div class="four columns">
         <%= f.field_container :prototype do %>
           <%= f.label :prototype_id, Spree.t(:prototype) %><br />
           <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth'} %>
         <% end %>
       </div>
 
-      <div data-hook="new_product_price" class="four columns">
+      <div class="four columns">
         <%= f.field_container :price do %>
           <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span><br />
           <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :class => 'fullwidth' %>
@@ -39,7 +39,7 @@
         <% end %>
       </div>
 
-      <div data-hook="new_product_available_on" class="omega four columns">
+      <div class="omega four columns">
         <%= f.field_container :available_on do %>
           <%= f.label :available_on, Spree.t(:available_on) %>
           <%= f.error_message_on :available_on %>
@@ -50,7 +50,7 @@
     </div>
 
     <div class='row'>
-      <div data-hook="new_product_shipping_category" class="alpha four columns">
+      <div class="alpha four columns">
         <%= f.field_container :shipping_category do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span><br />
           <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth' }) %>