orders_controller.rb in comable-backend-0.7.0.beta2

- old
+ new

@@ -57,21 +57,25 @@
         @order.payment.resume!
         redirect_to :back, notice: Comable.t('successful')
       end
 
       def ship
-        @order.shipment.ship!
+        if params[:shipment_id]
+          find_shipment.ship!
+        else
+          @order.ship!
+        end
         redirect_to :back, notice: Comable.t('successful')
       end
 
       def cancel_shipment
-        @order.shipment.cancel!
+        find_shipment.cancel!
         redirect_to :back, notice: Comable.t('successful')
       end
 
       def resume_shipment
-        @order.shipment.resume!
+        find_shipment.resume!
         redirect_to :back, notice: Comable.t('successful')
       end
 
       private
 
@@ -87,9 +91,13 @@
         )
       end
 
       def redirect_to_back_with_alert(exception)
         redirect_to :back, alert: exception.message
+      end
+
+      def find_shipment
+        @order.shipments.find(params[:shipment_id])
       end
     end
   end
 end