spree_backend 2.0.3 → 2.0.4

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

@@ -2,7 +2,7 @@ module Spree
   module Admin
     class TaxCategoriesController < ResourceController
       def destroy
-        if @object.mark_deleted!
+        if @object.destroy
           flash[:success] = flash_message_for(@object, :successfully_removed)
           respond_with(@object) do |format|
             format.html { redirect_to collection_url }

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

@@ -8,8 +8,7 @@ module Spree
       # instead of actually deleting the product.
       def destroy
         @variant = Variant.find(params[:id])
-        @variant.deleted_at = Time.now()
-        if @variant.save
+        if @variant.destroy
           flash[:success] = Spree.t('notice_messages.variant_deleted')
         else
           flash[:success] = Spree.t('notice_messages.variant_not_deleted')

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

@@ -14,6 +14,10 @@ module Spree
         end
         links.join(' ').html_safe
       end
+
+      def line_item_shipment_price(line_item, quantity)
+        Spree::Money.new(line_item.price * quantity, { currency: line_item.currency })
+      end
     end
   end
 end

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_mail_method_form_fields">
   <div class="row">
-      
+
     <div class="alpha six columns" data-hook="general">
       <fieldset class="no-border-bottom">
         <legend align="center"><%= Spree.t(:general) %></legend>
@@ -56,15 +56,11 @@
         </div>
         <div class="field">
           <%= label_tag :secure_connection_type, Spree.t(:secure_connection_type) %><br />
-          <%= select_tag(:secure_connection_type, 
-                         options_from_collection_for_select(Spree::Core::MailSettings::SECURE_CONNECTION_TYPES, :to_s, :to_s, Spree::Config[:secure_connection_type]),
-                         :class => 'select2 fullwidth') %>
+          <%= select_tag(:secure_connection_type, options_from_collection_for_select(Spree::Core::MailSettings::SECURE_CONNECTION_TYPES.map{|w| Spree.t(w.downcase.to_sym, :default => w)}, :to_s, :to_s, Spree::Config[:secure_connection_type]), :class => 'select2 fullwidth') %>
         </div>
         <div class="field">
           <%= label_tag :mail_auth_type, Spree.t(:smtp_authentication_type) %><br />
-          <%= select_tag(:mail_auth_type,
-                         options_from_collection_for_select(Spree::Core::MailSettings::MAIL_AUTH, :to_s, :to_s, Spree::Config[:mail_auth_type]),
-                         :class => 'select2 fullwidth') %>
+          <%= select_tag(:mail_auth_type, options_from_collection_for_select(Spree::Core::MailSettings::MAIL_AUTH.map{|w| Spree.t(w.downcase.to_sym, :default => w)}, :to_s, :to_s, Spree::Config[:mail_auth_type]), :class => 'select2 fullwidth') %>
         </div>
         <div class="field">
           <%= label_tag :smtp_username, Spree.t(:smtp_username) %><br />

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

@@ -1,150 +1,120 @@
-<%= 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>
-    -
-    <span class="shipment-state"><%= shipment.state %></span>
-    <%= Spree.t(:package_from) %>
-    <strong class="stock-location-name" data-hook="stock-location-name">'<%= shipment.stock_location.name %>'</strong>
-    <% if shipment.ready? and can? :update, shipment %>
+<div id="<%= "shipment_#{shipment.id}" %>">
+  <%= 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>
       -
-      <%= link_to 'ship', '#', :class => 'ship button icon-arrow-right', :data => {'shipment-number' => shipment.number} %>
-    <% end %>
-  </legend>
-</fieldset>
+      <span class="shipment-state"><%= Spree.t("shipment_states.#{shipment.state}") %></span>
+      <%= Spree.t(:package_from) %>
+      <strong class="stock-location-name" data-hook="stock-location-name">'<%= shipment.stock_location.name %>'</strong>
+      <% if shipment.ready? and can? :update, shipment %>
+        -
+        <%= link_to 'ship', '#', :class => 'ship button icon-arrow-right', :data => {'shipment-number' => shipment.number} %>
+      <% end %>
+    </legend>
+  </fieldset>
 
-<table class="stock-contents index" data-hook="stock-contents">
-  <colgroup>
-    <col style="width: 10%;" />
-    <col style="width: 30%;" />
-    <col style="width: 15%;" />
-    <col style="width: 15%;" />
-    <col style="width: 15%;" />
-    <col style="width: 15%;" />
-  </colgroup>
+  <table class="stock-contents index" data-hook="stock-contents">
+    <colgroup>
+      <col style="width: 10%;" />
+      <col style="width: 30%;" />
+      <col style="width: 15%;" />
+      <col style="width: 15%;" />
+      <col style="width: 15%;" />
+      <col style="width: 15%;" />
+    </colgroup>
 
-  <thead>
-    <th colspan="2"><%= Spree.t(:item_description) %></th>
-    <th><%= Spree.t(:price) %></th>
-    <th><%= Spree.t(:quantity) %></th>
-    <th><%= Spree.t(:total) %></th>
-    <th class="orders-actions actions" data-hook="admin_order_form_line_items_header_actions"></th>
-  </thead>
+    <thead>
+      <th colspan="2"><%= Spree.t(:item_description) %></th>
+      <th><%= Spree.t(:price) %></th>
+      <th><%= Spree.t(:quantity) %></th>
+      <th><%= Spree.t(:total) %></th>
+      <th class="orders-actions actions" data-hook="admin_order_form_line_items_header_actions"></th>
+    </thead>
 
-  <tbody data-shipment-number="<%= shipment.number %>" data-order-number="<%= order.number %>">
-    <% shipment.manifest.each do |item| %>
-      <% line_item = order.find_line_item_by_variant(item.variant) %>
+    <tbody data-shipment-number="<%= shipment.number %>" data-order-number="<%= order.number %>">
+      <%= render 'spree/admin/orders/shipment_manifest', order: order, shipment: shipment %>
 
-      <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
-        <td class="item-image"><%= mini_image(item.variant) %></td>
-        <td class="item-name">
-          <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
-        </td>
-        <td class="item-price align-center"><%= line_item.single_money.to_html %></td>
-        <td class="item-qty-show align-center">
-            <% item.states.each do |state,count| %>
-              <%= count %> x <%= state.humanize.downcase %>
+      <% unless shipment.shipped? %>
+        <tr class="edit-method hidden total">
+          <td colspan="5">
+            <div class="field alpha five columns">
+              <%= label_tag 'selected_shipping_rate_id', Spree.t(:shipping_method) %>
+              <%= select_tag :selected_shipping_rate_id,
+                    options_for_select(shipment.shipping_rates.backend.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
+                    {:class => 'select2 fullwidth', :data => {'shipment-number' => shipment.number } } %>
+            </div>
+
+            <% if shipment.adjustment && shipment.adjustment.closed? %>
+              <div class="field omega four columns">
+                <label><%= Spree.t(:associated_adjustment_closed) %></label>
+                <ul>
+                  <li><%= radio_button_tag :open_adjustment, 'yes', false, :data => {'shipment-number' => shipment.number } %> Yes</li>
+                  <li><%= radio_button_tag :open_adjustment, 'no', true, :data => {'shipment-number' => shipment.number } %> No</li>
+                </ul>
+              </div>
             <% end %>
-        </td>
-        <% unless shipment.shipped? %>
-          <td class="item-qty-edit hidden">
-            <%= number_field_tag :quantity, item.quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
           </td>
-        <% end %>
-        <td class="item-total align-center"><%= line_item.display_amount.to_html %></td>
-        <% unless shipment.shipped? %>
-          <td class="cart-item-delete actions" data-hook="cart_item_delete">
-            <% if can? :update, item %>
-              <%= link_to '', '#', :class => 'save-item icon_link icon-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
-              <%= link_to '', '#', :class => 'cancel-item icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
-              <%= link_to '', '#', :class => 'edit-item icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
-              <%= link_to '', '#', :class => 'split-item icon_link icon-resize-horizontal no-text with-tip', :data => {:action => 'split', 'variant-id' => item.variant.id}, :title => Spree.t('split') %>
-              <%= link_to '', '#', :class => 'delete-item icon-trash no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => Spree.t('delete') %>
+          <td class="actions">
+            <% if can? :update, shipment %>
+              <%= link_to '', '#', :class => 'save-method icon_link icon-ok no-text with-tip',
+                :data => {'shipment-number' => shipment.number, :action => 'save'}, title: Spree.t('actions.save') %>
+              <%= link_to '', '#', :class => 'cancel-method icon_link icon-cancel no-text with-tip',
+                :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel') %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+
+      <tr class="show-method total">
+        <td colspan="4">
+          <% if shipment.adjustment.present? %>
+            <strong><%= shipment.adjustment.label %>: <%= shipment.shipping_method.name %></strong>
+          <% else %>
+            <%= Spree.t(:cannot_set_shipping_method_without_address) %>
+          <% end %>
+        </td>
+        <td class="total" align="center">
+          <% if shipment.adjustment.present? %>
+            <span><%= shipment.adjustment.display_amount %></span>
+          <% end %>
+        </td>
+        <% if shipment.adjustment.present? && !shipment.shipped? %>
+          <td class="actions">
+            <% if can? :update, shipment %>
+              <%= link_to '', '#', :class => 'edit-method icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
             <% end %>
           </td>
         <% end %>
       </tr>
-    <% end %>
 
-    <% unless shipment.shipped? %>
-      <tr class="edit-method hidden total">
+      <tr class="edit-tracking hidden total">
         <td colspan="5">
-          <div class="field alpha five columns">
-            <%= label_tag 'selected_shipping_rate_id', Spree.t(:shipping_method) %>
-            <%= select_tag :selected_shipping_rate_id,
-                  options_for_select(shipment.shipping_rates.backend.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
-                  {:class => 'select2 fullwidth', :data => {'shipment-number' => shipment.number } } %>
-          </div>
-
-          <% if shipment.adjustment && shipment.adjustment.closed? %>
-            <div class="field omega four columns">
-              <label><%= Spree.t(:associated_adjustment_closed) %></label>
-              <ul>
-                <li><%= radio_button_tag :open_adjustment, 'yes', false, :data => {'shipment-number' => shipment.number } %> Yes</li>
-                <li><%= radio_button_tag :open_adjustment, 'no', true, :data => {'shipment-number' => shipment.number } %> No</li>
-              </ul>
-            </div>
-          <% end %>
+          <label><%= Spree.t(:tracking_number) %>:</label>
+          <%= text_field_tag :tracking, shipment.tracking %>
         </td>
         <td class="actions">
           <% if can? :update, shipment %>
-            <%= link_to '', '#', :class => 'save-method icon_link icon-ok no-text with-tip',
-              :data => {'shipment-number' => shipment.number, :action => 'save'}, title: Spree.t('actions.save') %>
-            <%= link_to '', '#', :class => 'cancel-method icon_link icon-cancel no-text with-tip',
-              :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel') %>
+            <%= link_to '', '#', :class => 'save-tracking icon_link icon-ok no-text with-tip', :data => {'shipment-number' => shipment.number, :action => 'save'}, :title => Spree.t('actions.save') %>
+            <%= link_to '', '#', :class => 'cancel-tracking icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel') %>
           <% end %>
         </td>
       </tr>
-    <% end %>
 
-    <tr class="show-method total">
-      <td colspan="4">
-        <% if shipment.adjustment.present? %>
-          <strong><%= shipment.adjustment.label %>: <%= shipment.shipping_method.name %></strong>
-        <% else %>
-          <%= Spree.t(:cannot_set_shipping_method_without_address) %>
-        <% end %>
-      </td>
-      <td class="total" align="center">
-        <% if shipment.adjustment.present? %>
-          <span><%= shipment.adjustment.display_amount %></span>
-        <% end %>
-      </td>
-      <% if shipment.adjustment.present? && !shipment.shipped? %>
+      <tr class="show-tracking total">
+        <td colspan="5">
+          <% if shipment.tracking.present? %>
+            <strong><%= Spree.t(:tracking) %>:</strong> <%= shipment.tracking %>
+          <% else %>
+            <%= Spree.t(:no_tracking_present) %>
+          <% end %>
+        </td>
         <td class="actions">
           <% if can? :update, shipment %>
-            <%= link_to '', '#', :class => 'edit-method icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
+            <%= link_to '', '#', :class => 'edit-tracking icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
           <% end %>
         </td>
-      <% end %>
-    </tr>
-
-    <tr class="edit-tracking hidden total">
-      <td colspan="5">
-        <label><%= Spree.t(:tracking_number) %>:</label>
-        <%= text_field_tag :tracking, shipment.tracking %>
-      </td>
-      <td class="actions">
-        <% if can? :update, shipment %>
-          <%= link_to '', '#', :class => 'save-tracking icon_link icon-ok no-text with-tip', :data => {'shipment-number' => shipment.number, :action => 'save'}, :title => Spree.t('actions.save') %>
-          <%= link_to '', '#', :class => 'cancel-tracking icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel') %>
-        <% end %>
-      </td>
-    </tr>
-
-    <tr class="show-tracking total">
-      <td colspan="5">
-        <% if shipment.tracking.present? %>
-          <strong><%= Spree.t(:tracking) %>:</strong> <%= shipment.tracking %>
-        <% else %>
-          <%= Spree.t(:no_tracking_present) %>
-        <% end %>
-      </td>
-      <td class="actions">
-        <% if can? :update, shipment %>
-          <%= link_to '', '#', :class => 'edit-tracking icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
-        <% end %>
-      </td>
-    </tr>
-  </tbody>
-</table>
+      </tr>
+    </tbody>
+  </table>
+</div>

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

@@ -0,0 +1,33 @@
+<% 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) %></td>
+    <td class="item-name">
+      <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+    </td>
+    <td class="item-price align-center"><%= line_item.single_money.to_html %></td>
+    <td class="item-qty-show align-center">
+        <% item.states.each do |state,count| %>
+          <%= count %> x <%= state.humanize.downcase %>
+        <% end %>
+    </td>
+    <% unless shipment.shipped? %>
+      <td class="item-qty-edit hidden">
+        <%= 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>
+    <% unless shipment.shipped? %>
+      <td class="cart-item-delete actions" data-hook="cart_item_delete">
+        <% if can? :update, item %>
+          <%= link_to '', '#', :class => 'save-item icon_link icon-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
+          <%= link_to '', '#', :class => 'cancel-item icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
+          <%= link_to '', '#', :class => 'edit-item icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
+          <%= link_to '', '#', :class => 'split-item icon_link icon-resize-horizontal no-text with-tip', :data => {:action => 'split', 'variant-id' => item.variant.id}, :title => Spree.t('split') %>
+          <%= link_to '', '#', :class => 'delete-item icon-trash no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove', :confirm => Spree.t(:are_you_sure)}, :title => Spree.t('delete') %>
+        <% end %>
+      </td>
+    <% end %>
+  </tr>
+<% end %>

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

@@ -1,8 +1,14 @@
 <%= csrf_meta_tags %>
 <% content_for :page_actions do %>
-  <li><%= event_links %></li>
-  <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'icon-email' %></li>
-  <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
+  <% if can?(:fire, @order) %>
+    <li><%= event_links %></li>
+  <% end %>
+  <% if can?(:resend, @order) %>
+    <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'icon-email' %></li>
+  <% end %>
+  <% if can?(:admin, Spree::Order) %>
+    <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
+  <% end %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Order Details' } %>
@@ -11,7 +17,7 @@
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
 </div>
 
-<%= render :partial => 'add_product' %>
+<%= render :partial => 'add_product' if can?(:update, @order) %>
 
 <% if @order.line_items.empty? %>
   <div class="no-objects-found">

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

@@ -6,7 +6,7 @@
   <li>
     <%= button_link_to Spree.t(:new_order), new_admin_order_url, :icon => 'icon-plus', :id => 'admin_new_order' %>
   </li>
-<% end %>
+<% end if can? :edit, Spree::Order.new %>
 
 <% content_for :table_filter_title do %>
   <%= Spree.t(:search) %>

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

@@ -20,7 +20,9 @@
       </ul>
       <div class="payment-method-settings">
         <% @payment_methods.each do |method| %>
-          <%= render :partial => "spree/admin/payments/source_forms/#{method.method_type}", :locals => { :payment_method => method } %>
+          <% if method.source_required? %>
+            <%= render :partial => "spree/admin/payments/source_forms/#{method.method_type}", :locals => { :payment_method => method } %>
+          <% end %>
         <% end %>
       </div>
     </div>

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

@@ -22,7 +22,7 @@
     <div class="add_product_properties" data-hook="add_product_properties"></div>
     
     <div id="prototypes" data-hook></div>
-    <%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
+    <%= image_tag 'select2-spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
     
     <table class="index sortable" data-hook data-sortable-link="<%= update_positions_admin_product_product_properties_url %>">
       <thead>

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

@@ -1,6 +1,35 @@
-<%= form_for [:admin, Spree::StockMovement.new] do |f| %>
+<%= form_for [:admin, Spree::StockMovement.new], url: admin_stock_items_path do |f| %>
   <fieldset>
     <legend align="center"><%= Spree.t(:add_stock_management) %></legend>
-    <%= render :partial => 'spree/admin/shared/stock_movement_form', :locals => { :f => f } %>
+
+    <div data-hook="admin_stock_movements_form_fields" class="row">
+      <div class="alpha two columns">
+        <%= f.field_container :quantity do %>
+          <%= f.label :quantity, Spree.t(:quantity) %>
+          <%= f.number_field :quantity, class: 'fullwidth', value: 1 %>
+        <% end %>
+      </div>
+      <div class="five columns">
+        <%= f.field_container :stock_location do %>
+          <%= label_tag :stock_location_id, Spree.t(:stock_location) %>
+          <%= select_tag 'stock_location_id', options_from_collection_for_select(@stock_locations, :id, :name),
+            class: 'select2 fullwidth' %>
+        <% end %>
+      </div>
+
+      <div class="five columns omega">
+        <%= f.field_container :variant_id do %>
+          <%= label_tag 'variant_id', Spree.t(:variant) %>
+          <%= select_tag 'variant_id', options_from_collection_for_select(@variants, :id, :sku),
+            class: 'select2 fullwidth' %>
+        <% end %>
+      </div>
+    </div>
+
+    <div class="form-buttons filter-actions actions" data-hook="buttons">
+      <%= button Spree.t(:add_stock), 'icon-plus' %>
+      <span class="or"><%= Spree.t(:or) %></span>
+      <%= link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %>
+    </div>
   </fieldset>
 <% end %>

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

@@ -78,13 +78,13 @@
 
     <%= 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 => 'None' }, { :class => 'select2' }) %>
+      <%= 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 %>
 
     <%= 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 => 'None' }, { :class => 'select2' }) %>
+      <%= 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>