PR suggestions addressed

Author: aafa

phoenix-scala/app/models/payment/applepay/ApplePayment.scala

@@ -25,7 +25,7 @@ case class ApplePayment(
   import Validation._
 
   override def validate: ValidatedNel[Failure, ApplePayment] = {
-    (validExpr(stripeTokenId.startsWith("tok_"), "stripeTokenId should start with 'tok_'") |@| super.validate).map {
+    (validExpr(stripeTokenId.startsWith("tok_"), "Stripe token should start with 'tok_'") |@| super.validate).map {
       case _ ⇒ this
     }
   }

phoenix-scala/phoenix/app/phoenix/failures/CartFailures.scala

@@ -20,6 +20,10 @@ object CartFailures {
     override def description = s"order with referenceNumber=$refNum is an empty cart"
   }
 
+  case class NoCartFound(customerId: Int) extends Failure {
+    override def description = s"no cart was found for a customer with id=$customerId"
+  }
+
   case class NoShipAddress(refNum: String) extends Failure {
     override def description = s"order with referenceNumber=$refNum has no shipping address"
   }

phoenix-scala/phoenix/app/phoenix/services/Checkout.scala

@@ -127,7 +127,7 @@ object Checkout {
       cart ← * <~ Carts
               .findByAccountId(customer.accountId)
               .one
-              .mustFindOr(GeneralFailure("Cart not found!"))
+              .mustFindOr(NoCartFound(customer.accountId))
       order ← * <~ Checkout(cart, CartValidator(cart)).checkout
     } yield order
 

phoenix-scala/test/integration/ApplePayIntegrationTest.scala

@@ -59,7 +59,7 @@ class ApplePayIntegrationTest
     val api = cartsApi(api_newCustomerCart(customer.id).referenceNumber)
     api.payments.applePay
       .add(payment)(defaultAdminAuth)
-      .mustFailWith400(GeneralFailure("stripeTokenId should start with 'tok_'"))
+      .mustFailWith400(GeneralFailure("Stripe token should start with 'tok_'"))
   }
 
   "Capture of Apple Pay payments" - {