spree_backend 2.0.13 → 2.1.0

metadata

@@ -1,97 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.1.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: spree_core
+  name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: spree_api
+  name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: deface
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.7
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
 description: Required dependency for Spree
@@ -100,11 +114,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/fonts/FontAwesome.otf
 - app/assets/fonts/fontawesome-webfont.eot
 - app/assets/fonts/fontawesome-webfont.svg
 - app/assets/fonts/fontawesome-webfont.ttf
 - app/assets/fonts/fontawesome-webfont.woff
+- app/assets/fonts/FontAwesome.otf
 - app/assets/images/admin/payment_banner.png
 - app/assets/images/admin/progress.gif
 - app/assets/images/credit_cards/credit_card.gif
@@ -116,12 +130,10 @@ files:
 - app/assets/javascripts/admin/image_settings.js.erb
 - app/assets/javascripts/admin/images/index.js.coffee
 - app/assets/javascripts/admin/images/new.js.coffee
-- app/assets/javascripts/admin/line_items.js.coffee
 - app/assets/javascripts/admin/nested-attribute.js
 - app/assets/javascripts/admin/option_type_autocomplete.js.erb
 - app/assets/javascripts/admin/orders/edit.js
 - app/assets/javascripts/admin/orders/edit_form.js
-- app/assets/javascripts/admin/payments/edit.js.coffee
 - app/assets/javascripts/admin/payments/new.js
 - app/assets/javascripts/admin/product_picker.js
 - app/assets/javascripts/admin/progress.coffee
@@ -131,7 +143,6 @@ files:
 - app/assets/javascripts/admin/spree_backend.js
 - app/assets/javascripts/admin/states.js
 - app/assets/javascripts/admin/stock_management.js.coffee
-- app/assets/javascripts/admin/stock_movement.js.coffee
 - app/assets/javascripts/admin/stock_transfer.js.coffee
 - app/assets/javascripts/admin/taxon_autocomplete.js.erb
 - app/assets/javascripts/admin/taxon_tree_menu.js.coffee
@@ -139,9 +150,7 @@ files:
 - app/assets/javascripts/admin/underscore-min.js
 - app/assets/javascripts/admin/user_picker.js
 - app/assets/javascripts/admin/variant_autocomplete.js.erb
-- app/assets/javascripts/admin/variant_management.js.coffee
 - app/assets/javascripts/admin/zone.js.coffee
-- app/assets/javascripts/spree/backend/select_payments.js.coffee
 - app/assets/javascripts/store/backend.js
 - app/assets/stylesheets/admin/components/_actions.scss
 - app/assets/stylesheets/admin/components/_date-picker.scss
@@ -173,6 +182,7 @@ files:
 - app/assets/stylesheets/admin/sections/_overview.scss
 - app/assets/stylesheets/admin/sections/_products.scss
 - app/assets/stylesheets/admin/sections/_promotions.scss
+- app/assets/stylesheets/admin/sections/_tax_zones.scss
 - app/assets/stylesheets/admin/shared/_forms.scss
 - app/assets/stylesheets/admin/shared/_icons.scss
 - app/assets/stylesheets/admin/shared/_layout.scss
@@ -223,7 +233,6 @@ files:
 - app/controllers/spree/admin/taxons_controller.rb
 - app/controllers/spree/admin/trackers_controller.rb
 - app/controllers/spree/admin/variants_controller.rb
-- app/controllers/spree/admin/variants_including_master_controller.rb
 - app/controllers/spree/admin/zones_controller.rb
 - app/helpers/spree/admin/base_helper.rb
 - app/helpers/spree/admin/general_settings_helper.rb
@@ -267,7 +276,6 @@ files:
 - app/views/spree/admin/orders/_add_product.html.erb
 - app/views/spree/admin/orders/_form.html.erb
 - app/views/spree/admin/orders/_line_item.html.erb
-- app/views/spree/admin/orders/_line_items.html.erb
 - app/views/spree/admin/orders/_shipment.html.erb
 - app/views/spree/admin/orders/_shipment_manifest.html.erb
 - app/views/spree/admin/orders/customer_details/_form.html.erb
@@ -347,9 +355,12 @@ files:
 - app/views/spree/admin/shared/_alert.html.erb
 - app/views/spree/admin/shared/_calculator_fields.html.erb
 - app/views/spree/admin/shared/_configuration_menu.html.erb
+- app/views/spree/admin/shared/_content_header.html.erb
 - app/views/spree/admin/shared/_destroy.js.erb
 - app/views/spree/admin/shared/_edit_resource_links.html.erb
 - app/views/spree/admin/shared/_head.html.erb
+- app/views/spree/admin/shared/_header.html.erb
+- app/views/spree/admin/shared/_menu.html.erb
 - app/views/spree/admin/shared/_new_resource_links.html.erb
 - app/views/spree/admin/shared/_order_details.html.erb
 - app/views/spree/admin/shared/_order_tabs.html.erb
@@ -358,6 +369,9 @@ files:
 - app/views/spree/admin/shared/_report_criteria.html.erb
 - app/views/spree/admin/shared/_routes.html.erb
 - app/views/spree/admin/shared/_show_resource_links.html.erb
+- app/views/spree/admin/shared/_sidebar.html.erb
+- app/views/spree/admin/shared/_sub_menu.html.erb
+- app/views/spree/admin/shared/_table_filter.html.erb
 - app/views/spree/admin/shared/_tabs.html.erb
 - app/views/spree/admin/shared/_translations.html.erb
 - app/views/spree/admin/shared/_update_order_state.js
@@ -415,14 +429,12 @@ files:
 - app/views/spree/admin/trackers/index.html.erb
 - app/views/spree/admin/trackers/new.html.erb
 - app/views/spree/admin/variants/_autocomplete.js.erb
-- app/views/spree/admin/variants/_autocomplete_stock.js.erb
 - app/views/spree/admin/variants/_form.html.erb
 - app/views/spree/admin/variants/_split.js.erb
 - app/views/spree/admin/variants/edit.html.erb
 - app/views/spree/admin/variants/index.html.erb
 - app/views/spree/admin/variants/new.html.erb
 - app/views/spree/admin/variants/new.js.erb
-- app/views/spree/admin/variants/update.js.erb
 - app/views/spree/admin/zones/_country_members.html.erb
 - app/views/spree/admin/zones/_form.html.erb
 - app/views/spree/admin/zones/_state_members.html.erb
@@ -433,9 +445,9 @@ files:
 - app/views/spree/test_mailer/test_email.text.erb
 - config/initializers/form_builder.rb
 - config/routes.rb
-- lib/spree/backend.rb
 - lib/spree/backend/action_callbacks.rb
 - lib/spree/backend/engine.rb
+- lib/spree/backend.rb
 - lib/spree_backend.rb
 - vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png
 - vendor/assets/images/jquery-ui/ui-bg_flat_0_eeeeee_40x100.png
@@ -473,7 +485,6 @@ files:
 - vendor/assets/javascripts/responsive-tables.js
 - vendor/assets/javascripts/spin.js
 - vendor/assets/javascripts/trunk8.js
-- vendor/assets/stylesheets/AdminLTE.css
 - vendor/assets/stylesheets/jquery-ui.datepicker.css.erb
 - vendor/assets/stylesheets/jquery.alerts/jquery.alerts.css.erb
 - vendor/assets/stylesheets/jquery.alerts/jquery.alerts.spree.css
@@ -488,18 +499,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.2.2
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.

data/app/assets/javascripts/admin/line_items.js.coffee

@@ -1,61 +0,0 @@
-$(document).ready ->
-  #handle edit click
-  $('a.edit-line-item').click toggleLineItemEdit
-
-  #handle cancel click
-  $('a.cancel-line-item').click toggleLineItemEdit
-
-  #handle save click
-  $('a.save-line-item').click ->
-    save = $ this
-    line_item_id = save.data('line-item-id')
-    quantity = parseInt(save.parents('tr').find('input.line_item_quantity').val())
-
-    toggleItemEdit()
-    adjustLineItem(line_item_id, quantity)
-    false
-
-  # handle delete click
-  $('a.delete-line-item').click ->
-    if confirm(Spree.translations.are_you_sure_delete)
-      del = $(this);
-      line_item_id = del.data('line-item-id');
-
-      toggleItemEdit()
-      deleteLineItem(line_item_id)
-
-toggleLineItemEdit = ->
-  link = $(this);
-  link.parent().find('a.edit-line-item').toggle();
-  link.parent().find('a.cancel-line-item').toggle();
-  link.parent().find('a.save-line-item').toggle();
-  link.parent().find('a.delete-line-item').toggle();
-  link.parents('tr').find('td.line-item-qty-show').toggle();
-  link.parents('tr').find('td.line-item-qty-edit').toggle();
-
-  false
-
-lineItemURL = (line_item_id) ->
-  url = Spree.routes.orders_api + "/" + order_number + "/line_items/" + line_item_id + ".json"
-
-adjustLineItem = (line_item_id, quantity) ->
-  url = lineItemURL(line_item_id)
-  $.ajax(
-    type: "PUT",
-    url: Spree.url(url),
-    data:
-      line_item:
-        quantity: quantity
-  ).done (msg) ->
-    advanceOrder()
-
-deleteLineItem = (line_item_id) ->
-  url = lineItemURL(line_item_id)
-  $.ajax(
-    type: "DELETE"
-    url: Spree.url(url)
-  ).done (msg) ->
-    $('#line-item-' + line_item_id).remove()
-    if $('.line-items tr.line-item').length == 0
-      $('.line-items').remove()
-    advanceOrder()

data/app/assets/javascripts/admin/payments/edit.js.coffee

@@ -1,148 +0,0 @@
-jQuery ($) ->
-  # Payment model
-  class Payment
-    constructor: (id) ->
-      @url  = Spree.url("#{Spree.routes.payments_api}/#{id}.json")
-      @json = $.getJSON @url.toString(), (data) =>
-        @data = data
-
-    if_pending: (callback) ->
-      @json.done (data) ->
-        callback() if data.state is 'pending'
-
-    update: (attributes, success) ->
-      jqXHR = $.ajax
-        type: 'PUT'
-        url:  @url.toString()
-        data: { payment: attributes }
-      jqXHR.done (data) =>
-        @data = data
-      jqXHR.fail ->
-        response = $.parseJSON(jqXHR.responseText)
-        show_flash('error', response.error)
-
-    amount:         -> @data.amount
-    display_amount: -> @data.display_amount
-
-  # Payment base view
-  class PaymentView
-    constructor: (@$el, @payment) ->
-      @render()
-
-    render: ->
-      @add_action_button()
-
-    show: ->
-      @remove_buttons()
-      new ShowPaymentView(@$el, @payment)
-
-    edit: ->
-      @remove_buttons()
-      new EditPaymentView(@$el, @payment)
-
-    add_action_button: ->
-      @$actions().prepend @$new_button(@action)
-
-    remove_buttons: ->
-      @$buttons().remove()
-
-    $new_button: (action) ->
-      $('<a />')
-        .attr
-          class: "icon-#{action} icon_link no-text with-tip"
-          title: Spree.translations[action]
-        .data
-          action: action
-        .one
-          click: (event) ->
-            event.preventDefault()
-          mousedown: ->
-            $(@).data('clicked', true)
-          mouseup: =>
-            @[action]()
-        .powerTip
-          smartPlacement: true
-          fadeInTime:     50
-          fadeOutTime:    50
-
-    $buttons: ->
-      @$actions().find(".icon-#{@action}, .icon-cancel")
-
-    $actions: ->
-      @$el.find('.actions')
-
-    $amount: ->
-      @$el.find('td.amount')
-
-  # Payment show view
-  class ShowPaymentView extends PaymentView
-    action: 'edit'
-
-    render: ->
-      super
-      @set_actions_display()
-      @show_actions()
-      @show_amount()
-
-    set_actions_display: ->
-      width = @$actions().width()
-      @$actions().width(width).css('text-align', 'left')
-
-    show_actions: ->
-      @$actions().find('a').show()
-
-    show_amount: ->
-      amount = $('<span />')
-        .html(@payment.display_amount())
-        .one('click', => @edit().$input().focus())
-      @$amount().html(amount)
-
-  # Payment edit view
-  class EditPaymentView extends PaymentView
-    action: 'save'
-
-    render: ->
-      super
-      @hide_actions()
-      @edit_amount()
-      @add_cancel_button()
-
-    add_cancel_button: ->
-      @$actions().append @$new_button('cancel')
-
-    hide_actions: ->
-      @$actions().find('a').not(@$buttons()).hide()
-
-    edit_amount: ->
-      amount = @$amount()
-      amount.html(@$new_input(amount.find('span').width()))
-
-    save: (event) ->
-      @payment.update(amount: @$input().val())
-        .done(=> @show())
-
-    cancel: @::show
-
-    $new_input: (width) ->
-      amount = @constructor.normalize_amount(@payment.display_amount())
-      $('<input />')
-        .attr(id: 'amount', value: amount)
-        .width(width)
-        .one
-          blur: =>
-            clicked = (@$buttons().filter -> $(@).data('clicked')).length
-            @save() unless clicked
-        .css('text-align': 'right')
-
-    $input: ->
-      @$amount().find('input')
-
-    @normalize_amount: (amount) ->
-      separator = Spree.translations.currency_separator
-      amount.replace(///[^\d#{separator}]///g, '')
-
-  # Attach ShowPaymentView to each pending payment in the table
-  $('.admin tr[data-hook=payments_row]').each ->
-    $el = $(@)
-    payment = new Payment($el.attr('id').match(/\d+$/))
-    payment.if_pending -> new ShowPaymentView($el, payment)

data/app/assets/javascripts/admin/stock_movement.js.coffee

@@ -1,17 +0,0 @@
-jQuery ->
-  $('#stock_movement_stock_item_id').select2
-    placeholder: "Find a stock item" # translate
-    ajax:
-      url: Spree.url(Spree.routes.stock_items_api)
-      data: (term, page) ->
-        q:
-          variant_product_name_cont: term
-        per_page: 50
-        page: page
-      results: (data, page) ->
-        more = (page * 50) < data.count
-        return { results: data.stock_items, more: more }
-    formatResult: (stock_item) ->
-      variantTemplate({ variant: stock_item.variant })
-    formatSelection: (stock_item) ->
-      "#{stock_item.variant.name} (#{stock_item.variant.options_text})"

data/app/assets/javascripts/admin/variant_management.js.coffee

@@ -1,10 +0,0 @@
-jQuery ->
-  $('.track_inventory_checkbox').on 'click', ->
-    $(@).siblings('.variant_track_inventory').val($(@).is(':checked'))
-    $(@).parent('form').submit()
-  $('.toggle_variant_track_inventory').on 'submit', ->
-    $.ajax
-      type: @method
-      url: @action
-      data: $(@).serialize()
-    false

data/app/assets/javascripts/spree/backend/select_payments.js.coffee

@@ -1,7 +0,0 @@
-$ ->
-  if $('.new_payment').is('*')
-    $('.payment-method-settings fieldset').addClass('hidden').first().removeClass('hidden')
-    $('input[name="payment[payment_method_id]"]').click ()->
-      $('.payment-method-settings fieldset').addClass('hidden')
-      id = $(this).parents('li').data('id')
-      $("fieldset##{id}").removeClass('hidden')

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

@@ -1,15 +0,0 @@
-module Spree
-  module Admin
-    class VariantsIncludingMasterController < VariantsController
-
-      def model_class
-        Spree::Variant
-      end
-
-      def object_name
-        "variant"
-      end
-
-    end
-  end
-end

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

@@ -1,46 +0,0 @@
-<% if order.line_items.exists? %>
-  <table class="line-items index" data-hook="line-items">
-    <colgroup>
-      <col style="width: 10%;" />
-      <col style="width: 20%;" />
-      <col style="width: 20%;" />
-      <col style="width: 15%;" />
-    </colgroup>
-
-    <thead>
-      <th colspan="2"><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:price) %></th>
-      <th><%= Spree.t(:quantity) %></th>
-      <th><%= Spree.t(:total_price) %></th>
-      <th class="orders-actions actions" data-hook="admin_order_form_line_items_header_actions">&nbsp;</th>
-    </thead>
-
-    <tbody>
-      <% order.line_items.each do |item| %>
-        
-        <tr class="line-item" id="line-item-<%= item.id %>">
-          <td class="line-item-image"><%= mini_image(item.variant) %></td>
-          <td class="line-item-name">
-            <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
-          </td>
-          <td class="line-item-price align-center"><%= item.single_money.to_html %></td>
-          <td class="line-item-qty-show align-center">
-            <%= item.quantity %>
-          </td>
-          <td class="line-item-qty-edit hidden">
-            <%= number_field_tag :quantity, item.quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
-          </td>
-          <td class="line-item-total align-center"><%= line_item_shipment_price(item, item.quantity) %></td>
-          <td class="cart-line-item-delete actions" data-hook="cart_line_item_delete">
-            <% if can? :update, item %>
-              <%= link_to '', '#', :class => 'save-line-item icon_link icon-ok no-text with-tip', :data => { 'line-item-id' => item.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
-              <%= link_to '', '#', :class => 'cancel-line-item icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
-              <%= link_to '', '#', :class => 'edit-line-item icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
-              <%= link_to '', '#', :class => 'delete-line-item icon-trash no-text with-tip', :data => { 'line-item-id' => item.id, :action => 'remove'}, :title => Spree.t('delete') %>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-<% end %>

data/app/views/spree/admin/variants/_autocomplete_stock.js.erb

@@ -1,41 +0,0 @@
-
-<script type='text/template' id='variant_autocomplete_stock_template'>
-  <fieldset>
-    <legend align="center"><%= Spree.t(:select_stock) %></legend>
-      <table class="stock-levels" data-hook="stock-levels">
-        <colgroup>
-          <col style="width: 30%;" />
-          <col style="width: 40%;" />
-          <col style="width: 20%;" />
-          <col style="width: 10%;" />
-        </colgroup>
-        <thead>
-          <th><%= Spree.t(:location) %></th>
-          <th><%= Spree.t(:count_on_hand) %></th>
-          <th><%= Spree.t(:quantity) %></th>
-          <th class="actions"></th>
-        </thead>
-        <tbody>
-          {{#each variant.stock_items}}
-            <tr>
-              <td>{{this.stock_location_name}}</td>
-              {{#if this.available}}
-                <td>
-                  {{this.count_on_hand}}
-                  {{#if this.backorderable}} (<%= Spree.t(:backorders_allowed) %>) {{/if}}
-                </td>
-                <td>
-                  <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
-                </td>
-                <td class="actions">
-                  <button class="add_variant no-text icon-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
-                </td>
-              {{else}}
-                <td><%= Spree.t(:out_of_stock) %></td>
-                <td>0</td>
-              {{/if}}
-            </tr>
-          {{/each}}
-        </tbody>
-  </fieldset>
-</script>

data/app/views/spree/admin/variants/update.js.erb

@@ -1 +0,0 @@
-<%= @object.as_json %>