Skip to content

Commit 4903c18

Browse files
aafaaafa
committed
Conflicts resolution fixes
1 parent 720a47f commit 4903c18

28 files changed

+75
-695
lines changed

‎phoenix-scala/app/utils/apis/ApplePay.md

-12
This file was deleted.

‎phoenix-scala/phoenix/app/phoenix/failures/CaptureFailures.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package phoenix.failures
22

33
import core.failures.Failure
44
import phoenix.models.payment.creditcard._
5-
import models.payment.{ExternalCharge, ExternalChargeVals}
5+
import phoenix.models.payment.{ExternalCharge, ExternalChargeVals}
66

77
object CaptureFailures {
88

‎phoenix-scala/phoenix/app/phoenix/models/cord/OrderPayment.scala

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import failures.Failure
1010
import phoenix.models.cord.OrderPayments.filter
1111
import phoenix.models.payment.PaymentMethod
1212
import phoenix.models.payment.PaymentMethod.ExternalPayment
13-
import phoenix.models.payment.creditcard.{CreditCard, CreditCards}
13+
import phoenix.models.payment.creditcard.{CreditCard, CreditCardCharges, CreditCards}
1414
import phoenix.models.payment.applepay.{ApplePayCharge, ApplePayCharges, ApplePayment, ApplePayments}
1515
import phoenix.models.payment.giftcard.{GiftCard, GiftCards}
1616
import phoenix.models.payment.storecredit.{StoreCredit, StoreCredits}
@@ -55,6 +55,10 @@ case class OrderPayment(id: Int = 0,
5555
}
5656
}
5757

58+
case class StripeOrderPayment(stripeChargeId: String,
59+
amount: Int,
60+
currency: Currency = Currency.USD)
61+
5862
object OrderPayment {
5963
def fromStripeCustomer(stripeCustomer: StripeCustomer, cart: Cart): OrderPayment =
6064
OrderPayment(cordRef = cart.refNum,

‎phoenix-scala/app/models/payment/ExternalCharge.scala ‎phoenix-scala/phoenix/app/phoenix/models/payment/ExternalCharge.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package models.payment
1+
package phoenix.models.payment
22

33
import com.pellucid.sealerate
44
import failures.Failures
5-
import models.payment.ExternalCharge.State
5+
import phoenix.models.payment.ExternalCharge.State
66
import slick.ast.BaseTypedType
77
import slick.jdbc.JdbcType
88
import utils.db.FoxModel
9-
import utils.{ADT, FSM}
9+
import phoenix.utils.{ADT, FSM}
1010

1111
trait ExternalChargeVals {
1212
val stripeChargeId: String

‎phoenix-scala/app/models/payment/applepay/ApplePayCharge.scala ‎phoenix-scala/phoenix/app/phoenix/models/payment/applepay/ApplePayCharge.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package models.payment.applepay
1+
package phoenix.models.payment.applepay
22

33
import java.time.Instant
44

5-
import models.cord.OrderPayment
6-
import models.payment.ExternalCharge
7-
import models.payment.ExternalCharge._
5+
import phoenix.models.cord.OrderPayment
6+
import phoenix.models.payment.ExternalCharge._
7+
import phoenix.models.payment.ExternalCharge
8+
import phoenix.utils.aliases.stripe.StripeCharge
89
import shapeless.{Lens, lens}
910
import slick.jdbc.PostgresProfile.api._
1011
import slick.lifted._
1112
import utils.Money.Currency
12-
import utils.aliases.stripe.StripeCharge
1313
import utils.db._
1414

1515
case class ApplePayCharge(id: Int = 0,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package models.payment.applepay
1+
package phoenix.models.payment.applepay
22

33
import java.time.Instant
44

55
import cats.implicits._
66
import cats.data.ValidatedNel
77
import failures.Failure
8-
import models.payment.PaymentMethod
8+
import phoenix.models.payment.PaymentMethod
99
import shapeless.{Lens, lens}
1010
import slick.jdbc.PostgresProfile.api._
1111
import utils.Validation

‎phoenix-scala/phoenix/app/phoenix/models/payment/creditcard/CreditCardCharge.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import core.db._
77
import core.failures.Failures
88
import core.utils.Money.Currency
99
import phoenix.models.cord.{OrderPayment, OrderPayments}
10-
import models.payment.ExternalCharge
11-
import models.payment.ExternalCharge._
10+
import phoenix.models.payment.ExternalCharge
11+
import phoenix.models.payment.ExternalCharge._
1212
import phoenix.utils._
1313
import phoenix.utils.aliases.stripe._
1414
import shapeless._

‎phoenix-scala/app/models/returns/ReturnStripePayment.scala ‎phoenix-scala/phoenix/app/phoenix/models/returns/ReturnStripePayment.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package models.returns
1+
package phoenix.models.returns
22

3-
import models.payment.applepay.ApplePayCharges
4-
import models.payment.creditcard.CreditCardCharges
3+
import phoenix.models.payment.applepay.ApplePayCharges
4+
import phoenix.models.payment.creditcard.CreditCardCharges
55
import shapeless._
66
import slick.jdbc.PostgresProfile.api._
77
import utils.Money.Currency

‎phoenix-scala/phoenix/app/phoenix/payloads/EntityExportPayloads.scala

+5-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ import com.pellucid.sealerate
44
import com.sksamuel.elastic4s.SortDefinition
55
import java.nio.charset.StandardCharsets
66
import java.time.Instant
7+
78
import org.elasticsearch.common.bytes.BytesArray
89
import org.elasticsearch.common.xcontent.{ToXContent, XContentBuilder}
910
import org.elasticsearch.search.sort.{SortBuilder, SortOrder}
1011
import org.json4s.{CustomSerializer, Formats}
1112
import org.json4s.JsonAST._
1213
import org.json4s.jackson.JsonMethods._
1314
import phoenix.models.cord.CordPaymentState
14-
import phoenix.models.payment.InStorePaymentStates
15+
import phoenix.models.payment.{ExternalCharge, InStorePaymentStates}
1516
import phoenix.models.payment.creditcard.CreditCardCharge
1617
import phoenix.services.CordQueries
1718
import phoenix.utils.{ADT, ADTTypeHints, JsonFormatters}
@@ -78,12 +79,13 @@ object EntityExportPayloads {
7879
object PaymentState extends FieldCalculation {
7980
def extraFields: List[String] = List("payments")
8081

82+
// todo add apple pay here ? (this piece was merge in on rebase to master) @aafa
8183
lazy val calculate: PartialFunction[(String, JObject), String] = {
8284
def getState(jv: JValue): Option[CordPaymentState.State] =
8385
(jv \ "creditCardState")
8486
.extractOpt[String]
85-
.flatMap(CreditCardCharge.State.read)
86-
.map(CordPaymentState.fromCCState) orElse
87+
.flatMap(ExternalCharge.State.read)
88+
.map(CordPaymentState.fromExternalState) orElse
8789
(jv \ "giftCardState")
8890
.extractOpt[String]
8991
.flatMap(InStorePaymentStates.State.read)

‎phoenix-scala/phoenix/app/phoenix/services/CartValidator.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import core.failures.{Failure, Failures}
66
import objectframework.services.ObjectManager
77
import phoenix.failures.CartFailures._
88
import phoenix.models.cord._
9-
import models.payment.applepay.ApplePayCharges
9+
import phoenix.models.payment.applepay.ApplePayCharges
1010
import phoenix.models.cord.lineitems.CartLineItems
1111
import phoenix.models.inventory.{IlluminatedSku, Skus}
1212
import phoenix.models.payment.giftcard.{GiftCardAdjustments, GiftCards}

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,28 @@ import objectframework.ObjectUtils
1010
import objectframework.models._
1111
import org.json4s.JsonAST._
1212
import phoenix.failures.AddressFailures.NoDefaultAddressForCustomer
13+
import phoenix.failures.CartFailures.NoCartFound
1314
import phoenix.failures.CouponFailures.CouponWithCodeCannotBeFound
1415
import phoenix.failures.CreditCardFailures.NoDefaultCreditCardForCustomer
16+
import phoenix.failures.OrderFailures.OnlyOneExternalPaymentIsAllowed
1517
import phoenix.failures.PromotionFailures.PromotionNotFoundForContext
16-
import phoenix.failures.ShippingMethodFailures.NoDefaultShippingMethod
1718
import phoenix.models.account._
1819
import phoenix.models.cord._
1920
import phoenix.models.cord.lineitems.CartLineItems
2021
import phoenix.models.cord.lineitems.CartLineItems.scope._
2122
import phoenix.models.coupon._
2223
import phoenix.models.inventory.Skus
2324
import phoenix.models.location.Addresses
25+
import phoenix.models.payment.applepay.{ApplePayCharge, ApplePayCharges}
2426
import phoenix.models.payment.creditcard._
2527
import phoenix.models.payment.giftcard._
2628
import phoenix.models.payment.storecredit._
2729
import phoenix.models.promotion._
2830
import phoenix.models.shipping.DefaultShippingMethods
2931
import phoenix.payloads.CartPayloads.CheckoutCart
3032
import phoenix.payloads.LineItemPayloads.UpdateLineItemsPayload
33+
import phoenix.payloads.PaymentPayloads.CreateApplePayPayment
3134
import phoenix.responses.cord.OrderResponse
32-
3335
import phoenix.services.carts._
3436
import phoenix.services.coupon.CouponUsageService
3537
import phoenix.services.inventory.SkuManager

‎phoenix-scala/phoenix/app/phoenix/services/CordQueries.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import phoenix.models.payment.creditcard.CreditCardCharges
88
import phoenix.models.payment.giftcard.GiftCardAdjustments
99
import phoenix.models.payment.storecredit.StoreCreditAdjustments
1010
import phoenix.utils.aliases.EC
11-
import models.payment.applepay.ApplePayCharges
11+
import phoenix.models.payment.applepay.ApplePayCharges
1212
import slick.dbio.DBIO
1313
import utils.db._
1414

‎phoenix-scala/phoenix/app/phoenix/services/carts/CartPaymentUpdater.scala

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ import phoenix.responses.cord.CartResponse
2020
import phoenix.services.{CartValidator, LogActivity}
2121
import slick.jdbc.PostgresProfile.api._
2222
import phoenix.utils.aliases._
23-
import utils.apis.Apis
23+
import phoenix.utils.apis.Apis
2424
import core.db._
25-
import failures.ApplePayFailures._
26-
import models.payment.PaymentMethod.ApplePay
27-
import models.payment.applepay._
25+
import phoenix.models.payment.PaymentMethod.ApplePay
26+
import phoenix.models.payment.applepay._
2827

2928
object CartPaymentUpdater {
3029

‎phoenix-scala/phoenix/app/phoenix/utils/apis/FoxStripe.scala

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package phoenix.utils.apis
22

3-
43
import cats.implicits._
54
import core.db._
65
import core.utils.Money._

‎phoenix-scala/phoenix/app/phoenix/utils/apis/FoxStripeApi.scala

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import phoenix.models.location.Address
77
import phoenix.models.payment.creditcard.CreditCard
88
import phoenix.payloads.PaymentPayloads.CreateCreditCardFromSourcePayload
99
import phoenix.utils.aliases.stripe._
10+
import utils.Money.Currency
1011
import utils.db._
1112

1213
/**

‎phoenix-scala/phoenix/app/phoenix/utils/json.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import phoenix.models.inventory.SkuType
1515
import phoenix.models.payment.creditcard.CreditCardCharge
1616
import phoenix.models.payment.giftcard.GiftCard
1717
import phoenix.models.payment.storecredit.StoreCredit
18-
import phoenix.models.payment.{InStorePaymentStates, PaymentMethod}
18+
import phoenix.models.payment.{ExternalCharge, InStorePaymentStates, PaymentMethod}
1919
import phoenix.models.plugins.PluginSettings
2020
import phoenix.models.promotion.Promotion
2121
import phoenix.models.returns._

‎phoenix-scala/test/integration/ApplePayIntegrationTest.scala ‎phoenix-scala/phoenix/test/integration/ApplePayIntegrationTest.scala

+17-15
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
import cats.implicits._
22
import failures.GeneralFailure
3-
import failures.OrderFailures.OnlyOneExternalPaymentIsAllowed
3+
import phoenix.failures.OrderFailures.OnlyOneExternalPaymentIsAllowed
4+
import phoenix.models.location.Region
5+
import phoenix.models.shipping._
6+
import phoenix.payloads.AddressPayloads.CreateAddressPayload
7+
import phoenix.payloads.CapturePayloads.{Capture, CaptureLineItem, ShippingCost}
8+
import phoenix.payloads.CartPayloads.CreateCart
9+
import phoenix.payloads.CustomerPayloads.CreateCustomerPayload
10+
import phoenix.payloads.LineItemPayloads._
11+
import phoenix.payloads.PaymentPayloads.{CreateApplePayPayment, CreditCardPayment}
12+
import phoenix.payloads.UpdateShippingMethod
13+
import phoenix.responses.cord._
14+
import phoenix.responses.{CaptureResponse, CreditCardsResponse, CustomerResponse}
15+
import testutils.apis._
16+
import utils.MockedApis
17+
import phoenix.utils.seeds.{Factories, ShipmentSeeds}
18+
import testutils.{DefaultJwtAdminAuth, IntegrationTestBase, TestLoginData}
19+
import testutils.fixtures.api.{ApiFixtureHelpers, ApiFixtures}
420
import faker.Lorem
5-
import models.location.Region
6-
import models.shipping._
7-
import payloads.AddressPayloads.CreateAddressPayload
8-
import payloads.CapturePayloads.{Capture, CaptureLineItem, ShippingCost}
9-
import payloads.CartPayloads.CreateCart
10-
import payloads.CustomerPayloads.CreateCustomerPayload
11-
import payloads.LineItemPayloads._
12-
import payloads.PaymentPayloads.{CreateApplePayPayment, CreditCardPayment}
13-
import payloads.UpdateShippingMethod
14-
import responses.cord._
15-
import responses.{CaptureResponse, CreditCardsResponse, CustomerResponse}
1621
import testutils._
17-
import testutils.apis.PhoenixStorefrontApi
1822
import testutils.fixtures.PaymentFixtures.CreditCardsFixture
1923
import testutils.fixtures.api._
20-
import utils.MockedApis
21-
import utils.seeds.{Factories, ShipmentSeeds}
2224

2325
class ApplePayIntegrationTest
2426
extends IntegrationTestBase

‎phoenix-scala/phoenix/test/integration/CartIntegrationTest.scala

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import phoenix.failures.ShippingMethodFailures._
77
import phoenix.models.cord.{CordPaymentState, _}
88
import phoenix.models.cord.lineitems._
99
import phoenix.models.location._
10+
import phoenix.models.payment.ExternalCharge
1011
import phoenix.models.payment.creditcard._
1112
import phoenix.models.product.Mvp
1213
import phoenix.models.rules.QueryStatement

‎phoenix-scala/phoenix/test/integration/CustomerIntegrationTest.scala

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import phoenix.models.cord.OrderPayments.scope._
1414
import phoenix.models.cord._
1515
import phoenix.models.customer._
1616
import phoenix.models.location.{Addresses, Regions}
17+
import phoenix.models.payment.ExternalCharge
1718
import phoenix.models.payment.creditcard._
1819
import phoenix.models.shipping.Shipment.Shipped
1920
import phoenix.models.shipping.{Shipment, Shipments}

‎phoenix-scala/phoenix/test/integration/testutils/apis/PhoenixStorefrontApi.scala

+14-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import akka.http.scaladsl.model.HttpResponse
44
import cats.implicits._
55
import phoenix.payloads.CartPayloads.CheckoutCart
66
import phoenix.payloads.LineItemPayloads.UpdateLineItemsPayload
7-
import phoenix.payloads.PaymentPayloads.CreateCreditCardFromTokenPayload
7+
import phoenix.payloads.PaymentPayloads.{CreateApplePayPayment, CreateCreditCardFromTokenPayload}
88
import testutils._
99

1010
trait PhoenixStorefrontApi extends HttpSupport { self: FoxSuite ⇒
@@ -27,6 +27,10 @@ trait PhoenixStorefrontApi extends HttpSupport { self: FoxSuite ⇒
2727
def checkout(payload: CheckoutCart)(implicit ca: TestCustomerAuth): HttpResponse =
2828
POST(s"$cartPath/checkout", payload, ca.jwtCookie.some)
2929

30+
def applePayCheckout(payload: CreateApplePayPayment)(
31+
implicit ca: TestCustomerAuth): HttpResponse =
32+
POST(s"$cartPath/apple-pay-checkout", payload, ca.jwtCookie.some)
33+
3034
object lineItems {
3135
val lineItemsPath = s"$cartPath/line-items"
3236

@@ -60,6 +64,15 @@ trait PhoenixStorefrontApi extends HttpSupport { self: FoxSuite ⇒
6064
object storefrontPaymentsApi {
6165
val paymentPath = s"$rootPrefix/payment-methods"
6266

67+
object applePay {
68+
val path = s"$paymentPath/apple-pay"
69+
70+
def create(p: CreateApplePayPayment)(implicit ca: TestCustomerAuth): HttpResponse =
71+
POST(path, p, ca.jwtCookie.some)
72+
def get()(implicit ca: TestCustomerAuth): HttpResponse = GET(path, ca.jwtCookie.some)
73+
def delete()(implicit ca: TestCustomerAuth): HttpResponse = DELETE(path, ca.jwtCookie.some)
74+
}
75+
6376
object creditCards {
6477
val ccPath = s"$paymentPath/credit-cards"
6578

‎phoenix-scala/test/integration/testutils/fixtures/PaymentFixtures.scala ‎phoenix-scala/phoenix/test/integration/testutils/fixtures/PaymentFixtures.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package testutils.fixtures
33
import java.time.ZonedDateTime
44

55
import cats.implicits._
6-
import payloads.AddressPayloads.CreateAddressPayload
7-
import payloads.PaymentPayloads.CreateCreditCardFromTokenPayload
8-
import utils.TestStripeSupport
9-
import utils.seeds.Factories
6+
import phoenix.payloads.AddressPayloads.CreateAddressPayload
7+
import phoenix.payloads.PaymentPayloads.CreateCreditCardFromTokenPayload
8+
import phoenix.utils.TestStripeSupport
9+
import phoenix.utils.seeds.Factories
1010

1111
object PaymentFixtures {
1212

‎phoenix-scala/phoenix/test/integration/testutils/fixtures/api/ApiFixtureHelpers.scala

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import phoenix.responses.{CreditCardsResponse, CustomerResponse, GiftCardRespons
1212
import phoenix.utils.aliases._
1313
import testutils._
1414
import testutils.apis.PhoenixAdminApi
15-
import utils.aliases._
1615

1716
trait ApiFixtureHelpers extends PhoenixAdminApi with ApiFixtures { self: FoxSuite ⇒
1817
def api_newCustomer()(implicit sl: SL, sf: SF): CustomerResponse.Root = {

‎phoenix-scala/phoenix/test/unit/utils/JsonFormattersTest.scala

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import org.json4s.jackson.JsonMethods.parse
77
import org.json4s.jackson.Serialization.write
88
import phoenix.models.admin.AdminData
99
import phoenix.models.cord.Order
10+
import phoenix.models.payment.ExternalCharge
1011
import phoenix.models.payment.creditcard.CreditCardCharge
1112
import phoenix.models.payment.giftcard.GiftCard
1213
import phoenix.utils.JsonFormatters._

0 commit comments

Comments
 (0)