Merge pull request #3169 from aitbw/aitbw/remove-conditional

Remove conditional when searching an order when creating a shipment
solidusio · Apr 15, 2019 · ec6d58c · ec6d58c
2 parents 4d53bdc + f16bf46
commit ec6d58c
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/api/app/controllers/spree/api/shipments_controller.rb b/api/app/controllers/spree/api/shipments_controller.rb
@@ -131,11 +131,8 @@ def load_transfer_params
       end
 
       def find_order_on_create
-        # TODO: Can remove conditional here once deprecated #find_order is removed.
-        unless @order.present?
-          @order = Spree::Order.find_by!(number: params[:shipment][:order_id])
-          authorize! :read, @order
-        end
+        @order = Spree::Order.find_by!(number: params[:shipment][:order_id])
+        authorize! :read, @order
       end
 
       def find_shipment