spree_api 1.3.5 → 2.0.0.rc1

data/app/controllers/spree/api/shipments_controller.rb

@@ -4,7 +4,39 @@ module Spree
       respond_to :json
 
       before_filter :find_order
-      before_filter :find_and_update_shipment, :only => [:ship, :ready]
+      before_filter :find_and_update_shipment, :only => [:ship, :ready, :add, :remove]
+
+      def create
+        variant = Spree::Variant.find(params[:variant_id])
+        quantity = params[:quantity].to_i
+        @shipment = @order.shipments.create(:stock_location_id => params[:stock_location_id])
+        @order.contents.add(variant, quantity, nil, @shipment)
+
+        @shipment.refresh_rates
+        @shipment.save!
+
+        respond_with(@shipment.reload, :default_template => :show)
+      end
+
+      def update
+        authorize! :read, Shipment
+        @shipment = @order.shipments.find_by_number!(params[:id])
+
+        unlock = params[:shipment].delete(:unlock)
+
+        if unlock == 'yes'
+          @shipment.adjustment.open
+        end
+
+        @shipment.update_attributes(params[:shipment])
+
+        if unlock == 'yes'
+          @shipment.adjustment.close
+        end
+
+        @shipment.reload
+        respond_with(@shipment, :default_template => :show)
+      end
 
       def ready
         authorize! :read, Shipment
@@ -26,6 +58,24 @@ module Spree
         respond_with(@shipment, :default_template => :show)
       end
 
+      def add
+        variant = Spree::Variant.find(params[:variant_id])
+        quantity = params[:quantity].to_i
+
+        @order.contents.add(variant, quantity, nil, @shipment)
+
+        respond_with(@shipment, :default_template => :show)
+      end
+
+      def remove
+        variant = Spree::Variant.find(params[:variant_id])
+        quantity = params[:quantity].to_i
+
+        @order.contents.remove(variant, quantity, @shipment)
+
+        respond_with(@shipment, :default_template => :show)
+      end
+
       private
 
       def find_order

data/app/controllers/spree/api/states_controller.rb

@@ -0,0 +1,32 @@
+module Spree
+  module Api
+    class StatesController < Spree::Api::BaseController
+
+      def index
+        @states = scope.ransack(params[:q]).result.
+                    includes(:country).order('name ASC')
+
+        if params[:page] || params[:per_page]
+          @states = @states.page(params[:page]).per(params[:per_page])
+        end
+
+        respond_with(@states)
+      end
+
+      def show
+        @state = scope.find(params[:id])
+        respond_with(@state)
+      end
+
+      private
+        def scope
+          if params[:country_id]
+            @country = Country.find(params[:country_id])
+            return @country.states
+          else
+            return State.scoped
+          end
+        end
+    end
+  end
+end

data/app/controllers/spree/api/stock_items_controller.rb

@@ -0,0 +1,70 @@
+module Spree
+  module Api
+    class StockItemsController < Spree::Api::BaseController
+      before_filter :stock_location, except: [:update, :destroy]
+
+      def index
+        @stock_items = scope.ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+        respond_with(@stock_items)
+      end
+
+      def show
+        @stock_item = scope.find(params[:id])
+        respond_with(@stock_item)
+      end
+
+      def create
+        authorize! :create, StockItem
+
+        count_on_hand = 0
+        if params[:stock_item].has_key?(:count_on_hand)
+          count_on_hand = params[:stock_item][:count_on_hand].to_i
+          params[:stock_item].delete(:count_on_hand)
+        end
+
+        @stock_item = scope.new(params[:stock_item])
+        if @stock_item.save
+          @stock_item.adjust_count_on_hand(count_on_hand)
+          respond_with(@stock_item, status: 201, default_template: :show)
+        else
+          invalid_resource!(@stock_item)
+        end
+      end
+
+      def update
+        authorize! :update, StockItem
+        @stock_item = StockItem.find(params[:id])
+
+        count_on_hand = 0
+        if params[:stock_item].has_key?(:count_on_hand)
+          count_on_hand = params[:stock_item][:count_on_hand].to_i
+          params[:stock_item].delete(:count_on_hand)
+        end
+
+        if @stock_item.adjust_count_on_hand(count_on_hand)
+          respond_with(@stock_item, status: 200, default_template: :show)
+        else
+          invalid_resource!(@stock_item)
+        end
+      end
+
+      def destroy
+        authorize! :delete, StockItem
+        @stock_item = StockItem.find(params[:id])
+        @stock_item.destroy
+        respond_with(@stock_item, status: 204)
+      end
+
+      private
+
+      def stock_location
+        render 'spree/api/shared/stock_location_required', status: 422 and return unless params[:stock_location_id]
+        @stock_location ||= StockLocation.find(params[:stock_location_id])
+      end
+
+      def scope
+        @stock_location.stock_items.includes(:variant => :product)
+      end
+    end
+  end
+end

data/app/controllers/spree/api/stock_locations_controller.rb

@@ -0,0 +1,45 @@
+module Spree
+  module Api
+    class StockLocationsController < Spree::Api::BaseController
+      def index
+        @stock_locations = StockLocation.order('name ASC').ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+        respond_with(@stock_locations)
+      end
+
+      def show
+        respond_with(stock_location)
+      end
+
+      def create
+        authorize! :create, StockLocation
+        @stock_location = StockLocation.new(params[:stock_location])
+        if @stock_location.save
+          respond_with(@stock_location, status: 201, default_template: :show)
+        else
+          invalid_resource!(@stock_location)
+        end
+      end
+
+      def update
+        authorize! :update, StockLocation
+        if stock_location.update_attributes(params[:stock_location])
+          respond_with(stock_location, status: 200, default_template: :show)
+        else
+          invalid_resource!(stock_location)
+        end
+      end
+
+      def destroy
+        authorize! :delete, StockLocation
+        stock_location.destroy
+        respond_with(stock_location, :status => 204)
+      end
+
+      private
+
+      def stock_location
+        @stock_location ||= StockLocation.find(params[:id])
+      end
+    end
+  end
+end

data/app/controllers/spree/api/stock_movements_controller.rb

@@ -0,0 +1,55 @@
+module Spree
+  module Api
+    class StockMovementsController < Spree::Api::BaseController
+      before_filter :stock_location, except: [:update, :destroy]
+
+      def index
+        @stock_movements = scope.ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+        respond_with(@stock_movements)
+      end
+
+      def show
+        @stock_movement = scope.find(params[:id])
+        respond_with(@stock_movement)
+      end
+
+      def create
+        authorize! :create, StockMovement
+        @stock_movement = scope.new(params[:stock_movement])
+        if @stock_movement.save
+          respond_with(@stock_movement, status: 201, default_template: :show)
+        else
+          invalid_resource!(@stock_movement)
+        end
+      end
+
+      def update
+        authorize! :update, StockMovement
+        @stock_movement = StockMovement.find(params[:id])
+        if @stock_movement.update_attributes(params[:stock_movement])
+          respond_with(@stock_movement, status: 200, default_template: :show)
+        else
+          invalid_resource!(@stock_movement)
+        end
+      end
+
+      def destroy
+        authorize! :delete, StockMovement
+        @stock_movement = StockMovement.find(params[:id])
+        @stock_movement.destroy
+        respond_with(@stock_movement, status: 204)
+      end
+
+      private
+
+      def stock_location
+        render 'spree/api/shared/stock_location_required', status: 422 and return unless params[:stock_location_id]
+        @stock_location ||= StockLocation.find(params[:stock_location_id])
+      end
+
+      def scope
+        @stock_location.stock_movements
+      end
+    end
+  end
+end

data/app/controllers/spree/api/taxonomies_controller.rb

@@ -15,6 +15,11 @@ module Spree
         respond_with(@taxonomy)
       end
 
+      # Because JSTree wants parameters in a *slightly* different format
+      def jstree
+        show
+      end
+
       def create
         authorize! :create, Taxonomy
         @taxonomy = Taxonomy.new(params[:taxonomy])

data/app/controllers/spree/api/taxons_controller.rb

@@ -4,7 +4,15 @@ module Spree
       respond_to :json
 
       def index
-        @taxons = taxonomy.root.children
+        if taxonomy
+          @taxons = taxonomy.root.children
+        else
+          if params[:ids]
+            @taxons = Taxon.where(:id => params[:ids].split(","))
+          else
+            @taxons = Taxon.ransack(params[:q]).result
+          end
+        end
         respond_with(@taxons)
       end
 
@@ -13,6 +21,10 @@ module Spree
         respond_with(@taxon)
       end
 
+      def jstree
+        show
+      end
+
       def create
         authorize! :create, Taxon
         @taxon = Taxon.new(params[:taxon])
@@ -51,7 +63,9 @@ module Spree
       private
 
       def taxonomy
-        @taxonomy ||= Taxonomy.find(params[:taxonomy_id])
+        if params[:taxonomy_id].present?
+          @taxonomy ||= Taxonomy.find(params[:taxonomy_id])
+        end
       end
 
       def taxon

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

@@ -68,7 +68,7 @@ module Spree
               variants = variants.active
             end
           end
-          variants.readonly(false)
+          variants
         end
     end
   end

data/app/controllers/spree/api/zones_controller.rb

@@ -1,7 +1,6 @@
 module Spree
   module Api
     class ZonesController < Spree::Api::BaseController
-      respond_to :json
 
       def index
         @zones = Zone.order('name ASC').ransack(params[:q]).result.page(params[:page]).per(params[:per_page])

data/app/helpers/spree/api/api_helpers.rb

@@ -12,8 +12,7 @@ module Spree
       end
 
       def product_attributes
-        [:id, :name, :description, :price, :available_on, :permalink,
-          :count_on_hand, :meta_description, :meta_keywords, :taxon_ids]
+        [:id, :name, :description, :price, :available_on, :permalink, :meta_description, :meta_keywords, :taxon_ids]
       end
 
       def product_property_attributes
@@ -21,7 +20,7 @@ module Spree
       end
 
       def variant_attributes
-        [:id, :name, :count_on_hand, :sku, :price, :weight, :height, :width, :depth, :is_master, :cost_price, :permalink, :product_id, :lock_version]
+        [:id, :name, :sku, :price, :weight, :height, :width, :depth, :is_master, :cost_price, :permalink]
       end
 
       def image_attributes
@@ -33,7 +32,7 @@ module Spree
       end
 
       def order_attributes
-        [:id, :number, :item_total, :total, :state, :adjustment_total, :user_id, :created_at, :updated_at, :completed_at, :payment_total, :shipment_state, :payment_state, :email, :special_instructions, :channel]
+        [:id, :number, :item_total, :total, :state, :adjustment_total, :user_id, :created_at, :updated_at, :completed_at, :payment_total, :shipment_state, :payment_state, :email, :special_instructions]
       end
 
       def line_item_attributes
@@ -61,12 +60,11 @@ module Spree
       end
 
       def taxon_attributes
-        [:id, :name, :permalink, :position, :parent_id, :taxonomy_id]
+        [:id, :name, :pretty_name, :permalink, :position, :parent_id, :taxonomy_id]
       end
 
       def inventory_unit_attributes
-        [:id, :lock_version, :state, :variant_id, :order_id,
-         :shipment_id, :return_authorization_id]
+        [:id, :lock_version, :state, :variant_id, :shipment_id, :return_authorization_id]
       end
 
       def return_authorization_attributes
@@ -77,9 +75,38 @@ module Spree
         [:id, :iso_name, :iso, :iso3, :name, :numcode]
       end
 
+      def state_attributes
+        [:id, :name, :abbr, :country_id]
+      end
+
+      def adjustment_attributes
+        [:id, :source_type, :source_id, :adjustable_type, :adjustable_id, :originator_type, :originator_id, :amount, :label, :mandatory, :locked, :eligible,  :created_at, :updated_at]
+      end
+
+      def creditcard_attributes
+        [:id, :month, :year, :cc_type, :last_digits, :first_name, :last_name, :gateway_customer_profile_id, :gateway_payment_profile_id]
+      end
+
       def user_attributes
         [:id, :email, :created_at, :updated_at]
       end
+
+      def property_attributes
+        [:id, :name, :presentation]
+      end
+
+      def stock_location_attributes
+        [:id, :name, :address1, :address2, :city, :state_id, :state_name, :country_id, :zipcode, :phone, :active]
+      end
+
+      def stock_movement_attributes
+        [:id, :quantity, :stock_item_id]
+      end
+
+      def stock_item_attributes
+        [:id, :count_on_hand, :backorderable, :lock_version, :stock_location_id, :variant_id]
+      end
     end
   end
 end
+

data/app/models/spree/api_configuration.rb

@@ -1,6 +1,5 @@
 module Spree
   class ApiConfiguration < Preferences::Configuration
-    # Make sure the api requires authentication by default to prevent unwanted access
-    preference :requires_authentication, :boolean, :default => true
+    preference :requires_authentication, :boolean, :default => false
   end
 end

data/app/models/spree/line_item_decorator.rb

@@ -1,3 +1,3 @@
 Spree::LineItem.class_eval do
-  attr_accessible :quantity, :variant_id, :sku, :as => :api
+  attr_accessible :quantity, :variant_id, :as => :api
 end

data/app/models/spree/order_decorator.rb

@@ -1,176 +1,13 @@
 Spree::Order.class_eval do
-  attr_accessible :channel, :as => :api_admin
-
   def self.build_from_api(user, params)
-    begin
-      ensure_country_id_from_api params[:ship_address_attributes]
-      ensure_state_id_from_api params[:ship_address_attributes]
-      ensure_country_id_from_api params[:bill_address_attributes]
-      ensure_state_id_from_api params[:bill_address_attributes]
-
-      order = create!
-
-      order.create_shipments_from_api params.delete(:shipments_attributes) || []
-      order.create_line_items_from_api params.delete(:line_items_attributes) || {}
-      order.create_adjustments_from_api params.delete(:adjustments_attributes) || []
-      order.create_payments_from_api params.delete(:payments_attributes) || []
-      order.complete_from_api params.delete(:completed_at)
-
-      destroy_automatic_taxes_on_import(order, params)
-
-      if user.has_spree_role? "admin"
-        order.update_attributes!(params, without_protection: true)
-      else
-        order.update_attributes!(params)
-      end
-
-      order.reload
-    rescue Exception => e
-      order.destroy if order && order.persisted?
-      raise e.message
-    end
-  end
-
-  def self.destroy_automatic_taxes_on_import(order, params)
-    if params.delete :import
-      order.adjustments.tax.destroy_all
-    end
-  end
-
-  def complete_from_api(completed_at)
-    if completed_at
-      self.completed_at = completed_at
-      self.state = 'complete'
-    end
-  end
-
-  def create_shipments_from_api(shipments_hash)
-    shipments_hash.each do |s|
-      begin
-        shipment = shipments.build
-        shipment.tracking = s[:tracking]
-
-        inventory_units = s[:inventory_units] || []
-        inventory_units.each do |iu|
-          self.class.ensure_variant_id_from_api(iu)
-
-          unit = shipment.inventory_units.build
-          unit.order = self
-          unit.variant_id = iu[:variant_id]
-        end
-
-        shipment.shipping_method = Spree::ShippingMethod.find_by_name!(s[:shipping_method])
-        shipment.save!
-
-        shipment.adjustment.locked = true
-        shipment.adjustment.amount = s[:cost].to_f
-        shipment.adjustment.save
-      rescue Exception => e
-        raise "Order import shipments: #{e.message} #{s}"
-      end
-    end
-  end
-
-  def create_payments_from_api(payments_hash)
-    payments_hash.each do |p|
-      begin
-        payment = payments.build
-        payment.amount = p[:amount].to_f
-        payment.state = p.fetch(:state, 'completed')
-        payment.payment_method = Spree::PaymentMethod.find_by_name!(p[:payment_method])
-        payment.save!
-      rescue Exception => e
-        raise "Order import payments: #{e.message} #{p}"
-      end
-    end
-  end
-
-  def create_line_items_from_api(line_items_hash)
-    line_items_hash.each_key do |k|
-      begin
-        line_item = line_items_hash[k]
-        self.class.ensure_variant_id_from_api(line_item)
-
-        item = self.add_variant(Spree::Variant.find(line_item[:variant_id]), line_item[:quantity].to_i)
-
-        if line_item.key? :price
-          item.price = line_item[:price]
-          item.save!
-        end
-      rescue Exception => e
-        raise "Order import line items: #{e.message} #{line_item}"
-      end
-    end
-  end
-
-  def create_adjustments_from_api(adjustments)
-    adjustments.each do |a|
-      begin
-        adjustment = self.adjustments.build(:amount => a['amount'].to_f,
-                                            :label => a['label'])
-        adjustment.locked = true
-        adjustment.save!
-      rescue Exception => e
-        raise "Order import adjustments: #{e.message} #{a}"
-      end
-    end
-  end
-
-  def self.ensure_variant_id_from_api(hash)
-    begin
-      unless hash[:variant_id].present?
-        hash[:variant_id] = Spree::Variant.active.find_by_sku!(hash[:sku]).id
-        hash.delete(:sku)
-      end
-    rescue Exception => e
-      raise "Ensure order import variant: #{e.message} #{hash}"
-    end
-  end
-
-  def self.ensure_country_id_from_api(address)
-    return if address.nil? or address[:country_id].present? or address[:country].nil?
-
-    begin
-      search = {}
-      if name = address[:country]['name']
-        search[:name] = name
-      elsif iso_name = address[:country]['iso_name']
-        search[:iso_name] = iso_name.upcase
-      elsif iso = address[:country]['iso']
-        search[:iso] = iso.upcase
-      elsif iso3 = address[:country]['iso3']
-        search[:iso3] = iso3.upcase
+    order = create
+    params[:line_items_attributes] ||= []
+    unless params[:line_items_attributes].empty?
+      params[:line_items_attributes].each_key do |k|
+        order.contents.add(Spree::Variant.find(params[:line_items_attributes][k][:variant_id]), params[:line_items_attributes][k][:quantity])
       end
-
-      address.delete(:country)
-      address[:country_id] = Spree::Country.where(search).first!.id
-
-    rescue Exception => e
-      raise "Ensure order import address country: #{e.message} #{search}"
     end
-  end
 
-  def self.ensure_state_id_from_api(address)
-    return if address.nil? or address[:state_id].present? or address[:state].nil?
-
-    begin
-      search = {}
-      if name = address[:state]['name']
-        search[:name] = name
-      elsif abbr = address[:state]['abbr']
-        search[:abbr] = abbr.upcase
-      end
-
-      address.delete(:state)
-      search[:country_id] = address[:country_id]
-
-      if state = Spree::State.where(search).first
-        address[:state_id] = state.id
-      else
-        address[:state_name] = search[:name] || search[:abbr]
-      end
-    rescue Exception => e
-      raise "Ensure order import address state: #{e.message} #{search}"
-    end
+    order
   end
 end