spree_api 3.4.6 → 3.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5c775a337b7b88a78b9bc3640d9916e7222dab2531a0e2d21ddbc00de81b3209
-  data.tar.gz: f0012e6e408f4d6d949d7bb0f8560865ad2fb031ffc57386481c089f513e245d
+SHA1:
+  metadata.gz: 677ea538aa5d07cafe028a25887601a469365457
+  data.tar.gz: cc58aa18f3e4507b4a8c9a883a7b286d9983d304
 SHA512:
-  metadata.gz: 44b279d33f77d975be6b7f1f1e7d8b9eef9e665a5e095e62e81ff58af89eb556757b319c531b5f6759e7cd89a01c7c886a57a5e6f49f1ee2ef6435e6470c5ff6
-  data.tar.gz: 4c7b349bca39e9939d635fd4fa0ef24a216937f140ca77410adb847b19beb31ea3faa5ac5e9cb154155e273cfaf7a6ab293b28816e682c7fecb1071e737f4cd7
+  metadata.gz: 345475efd8e9059130c97dea2f4fb067138ae666a92818e24c3de83aa9a6f5848c205ce061ac2f406ea1a8be5297baa092ad365e96b66c3d5adac4d757ae9ddb
+  data.tar.gz: aad528fa2543e85a9b722e9dc2d60c4337b25ef13acbd8ee9d28b8c8a61510b772712e334834cea2cffa7c2240736e3ab37570a59c93fb36492ecaf653a0bb8d

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

@@ -123,9 +123,10 @@ module Spree
       end
 
       def find_product(id)
-        product_scope.friendly.distinct(false).find(id.to_s)
+        @product = product_scope.friendly.distinct(false).find(id.to_s)
       rescue ActiveRecord::RecordNotFound
-        product_scope.find(id)
+        @product = product_scope.find_by(id: id)
+        not_found unless @product
       end
 
       def product_scope

data/app/controllers/spree/api/v1/product_properties_controller.rb

@@ -2,7 +2,7 @@ module Spree
   module Api
     module V1
       class ProductPropertiesController < Spree::Api::BaseController
-        before_action :find_product
+        before_action :find_product, :authorize_product!
         before_action :product_property, only: [:show, :update, :destroy]
 
         def index
@@ -47,7 +47,10 @@ module Spree
         private
 
         def find_product
-          @product = super(params[:product_id])
+          super(params[:product_id])
+        end
+
+        def authorize_product!
           authorize! :read, @product
         end
 

data/app/controllers/spree/api/v1/products_controller.rb

@@ -2,6 +2,8 @@ module Spree
   module Api
     module V1
       class ProductsController < Spree::Api::BaseController
+        before_action :find_product, only: [:update, :show, :destroy]
+
         def index
           if params[:ids]
             @products = product_scope.where(id: params[:ids].split(',').flatten)
@@ -16,7 +18,6 @@ module Spree
         end
 
         def show
-          @product = find_product(params[:id])
           expires_in 15.minutes, public: true
           headers['Surrogate-Control'] = "max-age=#{15.minutes}"
           headers['Surrogate-Key'] = 'product_id=1'
@@ -74,7 +75,6 @@ module Spree
         end
 
         def update
-          @product = find_product(params[:id])
           authorize! :update, @product
 
           options = { variants_attrs: variants_params, options_attrs: option_types_params }
@@ -88,7 +88,6 @@ module Spree
         end
 
         def destroy
-          @product = find_product(params[:id])
           authorize! :destroy, @product
           @product.destroy
           respond_with(@product, status: 204)
@@ -116,6 +115,10 @@ module Spree
           params[:product].fetch(:option_types, [])
         end
 
+        def find_product
+          super(params[:id])
+        end
+
         def set_up_shipping_category
           if shipping_category = params[:product].delete(:shipping_category)
             id = ShippingCategory.find_or_create_by(name: shipping_category).id

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

@@ -80,7 +80,7 @@ module Spree
           @stock_location = Spree::StockLocation.find(params[:stock_location_id])
 
           unless @quantity > 0
-            unprocessable_entity('ArgumentError')
+            unprocessable_entity("#{Spree.t(:shipment_transfer_errors_occured, scope: 'api')} \n #{Spree.t(:negative_quantity, scope: 'api')}")
             return
           end
 
@@ -91,13 +91,21 @@ module Spree
         def transfer_to_shipment
           @target_shipment = Spree::Shipment.find_by!(number: params[:target_shipment_number])
 
-          if @quantity < 0 || @target_shipment == @original_shipment
-            unprocessable_entity('ArgumentError')
-            return
-          end
+          error =
+            if @quantity < 0 && @target_shipment == @original_shipment
+              "#{Spree.t(:negative_quantity, scope: 'api')}, \n#{Spree.t('wrong_shipment_target', scope: 'api')}"
+            elsif @target_shipment == @original_shipment
+              Spree.t(:wrong_shipment_target, scope: 'api')
+            elsif @quantity < 0
+              Spree.t(:negative_quantity, scope: 'api')
+            end
 
-          @original_shipment.transfer_to_shipment(@variant, @quantity, @target_shipment)
-          render json: { success: true, message: Spree.t(:shipment_transfer_success) }, status: 201
+          if error
+            unprocessable_entity("#{Spree.t(:shipment_transfer_errors_occured, scope: 'api')} \n#{error}")
+          else
+            @original_shipment.transfer_to_shipment(@variant, @quantity, @target_shipment)
+            render json: { success: true, message: Spree.t(:shipment_transfer_success) }, status: 201
+          end
         end
 
         private

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

@@ -34,6 +34,11 @@ module Spree
         def update
           @stock_item = StockItem.accessible_by(current_ability, :update).find(params[:id])
 
+          if params[:stock_item].key?(:backorderable)
+            @stock_item.backorderable = params[:stock_item][:backorderable]
+            @stock_item.save
+          end
+
           count_on_hand = 0
           if params[:stock_item].key?(:count_on_hand)
             count_on_hand = params[:stock_item][:count_on_hand].to_i
@@ -41,7 +46,7 @@ module Spree
           end
 
           updated = params[:stock_item][:force] ? @stock_item.set_count_on_hand(count_on_hand)
-                                                : @stock_item.adjust_count_on_hand(count_on_hand)
+          : @stock_item.adjust_count_on_hand(count_on_hand)
 
           if updated
             respond_with(@stock_item, status: 200, default_template: :show)

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

@@ -3,16 +3,14 @@ module Spree
     module V1
       class TaxonsController < Spree::Api::BaseController
         def index
-          if taxonomy
-            @taxons = taxonomy.root.children
-          else
-            if params[:ids]
-              @taxons = Spree::Taxon.includes(:children).accessible_by(current_ability, :read).where(id: params[:ids].split(','))
-            else
-              @taxons = Spree::Taxon.includes(:children).accessible_by(current_ability, :read).order(:taxonomy_id, :lft).ransack(params[:q]).result
-            end
-          end
-
+          @taxons = if taxonomy
+                      taxonomy.root.children
+                    elsif params[:ids]
+                      Spree::Taxon.includes(:children).accessible_by(current_ability, :read).where(id: params[:ids].split(','))
+                    else
+                      Spree::Taxon.includes(:children).accessible_by(current_ability, :read).order(:taxonomy_id, :lft)
+                    end
+          @taxons = @taxons.ransack(params[:q]).result
           @taxons = @taxons.page(params[:page]).per(params[:per_page])
           respond_with(@taxons)
         end

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

@@ -24,7 +24,7 @@ module Spree
         # we render on the view so we better update it any time a node is included
         # or removed from the views.
         def index
-          @variants = scope.includes({ option_values: :option_type }, :product, :default_price, :images, stock_items: :stock_location).
+          @variants = scope.includes(*variant_includes).for_currency_and_available_price_amount.
                       ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
           respond_with(@variants)
         end
@@ -32,8 +32,7 @@ module Spree
         def new; end
 
         def show
-          @variant = scope.includes({ option_values: :option_type }, :option_values, :product, :default_price, :images, stock_items: :stock_location).
-                     find(params[:id])
+          @variant = scope.includes(*variant_includes).find(params[:id])
           respond_with(@variant)
         end
 
@@ -49,7 +48,8 @@ module Spree
         private
 
         def product
-          @product ||= Spree::Product.accessible_by(current_ability, :read).friendly.find(params[:product_id]) if params[:product_id]
+          @product ||= Spree::Product.accessible_by(current_ability, :read).
+                       friendly.find(params[:product_id]) if params[:product_id]
         end
 
         def scope
@@ -69,6 +69,10 @@ module Spree
         def variant_params
           params.require(:variant).permit(permitted_variant_attributes)
         end
+
+        def variant_includes
+          [{ option_values: :option_type }, :product, :default_price, :images, { stock_items: :stock_location }]
+        end
       end
     end
   end

data/app/views/spree/api/v1/orders/insufficient_quantity.v1.rabl

@@ -0,0 +1,2 @@
+object false
+node(:error) { Spree.t(:insufficient_quantity, scope: [:api, :order]) }

data/app/views/spree/api/v1/shipments/show.v1.rabl

@@ -13,7 +13,7 @@ child selected_shipping_rate: :selected_shipping_rate do
 end
 
 child shipping_methods: :shipping_methods do
-  attributes :id, :name
+  attributes :id, :name, :tracking_url
   child zones: :zones do
     attributes :id, :name, :description
   end

data/config/locales/en.yml

@@ -18,6 +18,7 @@ en:
       order:
         could_not_transition: "The order could not be transitioned. Please fix the errors and try again."
         invalid_shipping_method: "Invalid shipping method specified."
+        insufficient_quantity: An item in your cart has become unavailable.
       payment:
         credit_over_limit: "This payment can only be credited up to %{limit}. Please specify an amount less than or equal to this number."
         update_forbidden: "This payment cannot be updated because it is %{state}."
@@ -25,3 +26,6 @@ en:
         cannot_ready: "Cannot ready shipment."
       stock_location_required: "A stock_location_id parameter must be provided in order to retrieve stock movements."
       invalid_taxonomy_id: "Invalid taxonomy id."
+      shipment_transfer_errors_occured: "Following errors occured while attempting this action:"
+      negative_quantity: "quantity is negative"
+      wrong_shipment_target: "target shipment is the same as original shipment"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 3.4.6
+  version: 3.5.0.rc1
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.6
+        version: 3.5.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.6
+        version: 3.5.0.rc1
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,7 @@ files:
 - app/views/spree/api/v1/orders/could_not_apply_coupon.v1.rabl
 - app/views/spree/api/v1/orders/could_not_transition.v1.rabl
 - app/views/spree/api/v1/orders/index.v1.rabl
+- app/views/spree/api/v1/orders/insufficient_quantity.v1.rabl
 - app/views/spree/api/v1/orders/invalid_shipping_method.v1.rabl
 - app/views/spree/api/v1/orders/mine.v1.rabl
 - app/views/spree/api/v1/orders/order.v1.rabl
@@ -230,11 +231,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Spree's API