app/controllers/spree/api/payments_controller.rb in spree_api-2.4.10 vs app/controllers/spree/api/payments_controller.rb in spree_api-3.0.0.rc1

@@ -10,11 +10,11 @@
         respond_with(@payments)
       end
 
       def new
         @payment_methods = Spree::PaymentMethod.available
-        respond_with(@payment_method)
+        respond_with(@payment_methods)
       end
 
       def create
         @payment = @order.payments.build(payment_params)
         if @payment.save
@@ -24,11 +24,11 @@
         end
       end
 
       def update
         authorize! params[:action], @payment
-        if !@payment.editable?
+        if ! @payment.pending?
           render 'update_forbidden', status: 403
         elsif @payment.update_attributes(payment_params)
           respond_with(@payment, default_template: :show)
         else
           invalid_resource!(@payment)
@@ -56,19 +56,19 @@
       end
 
       private
 
         def find_order
-          @order = Spree::Order.find_by(number: order_id)
+          @order = Spree::Order.friendly.find(order_id)
           authorize! :read, @order, order_token
         end
 
         def find_payment
-          @payment = @order.payments.find(params[:id])
+          @payment = @order.payments.friendly.find(params[:id])
         end
 
         def perform_payment_action(action, *args)
-          authorize! action, Spree::Payment
+          authorize! action, Payment
           @payment.send("#{action}!", *args)
           respond_with(@payment, default_template: :show)
         end
 
         def payment_params