Klarna clean up

packages/medusa-payment-klarna/.prettierrc

@@ -4,4 +4,4 @@
   "singleQuote": false,
   "tabWidth": 2,
   "trailingComma": "es5"
-}
+}

packages/medusa-payment-klarna/src/api/routes/hooks/address.js

@@ -5,6 +5,7 @@ export default async (req, res) => {
   try {
     const cartService = req.scope.resolve("cartService")
     const klarnaProviderService = req.scope.resolve("pp_klarna")
+    const shippingProfileService = req.scope.resolve("shippingProfileService")
 
     const cart = await cartService.retrieve(merchant_data)
 
@@ -23,6 +24,12 @@ export default async (req, res) => {
       await cartService.updateBillingAddress(cart._id, updatedAddress)
       await cartService.updateEmail(cart._id, shipping_address.email)
 
+      const shippingOptions = await shippingProfileService.fetchCartOptions(cart)
+      if (shippingOptions.length === 1) {
+        const option = shippingOptions[0]
+        await cartService.addShippingMethod(cart._id, option._id, option.data)
+      }
+
       // Fetch and return updated Klarna order
       const updatedCart = await cartService.retrieve(cart._id)
       const order = await klarnaProviderService.cartToKlarnaOrder(updatedCart)

packages/medusa-payment-klarna/src/api/routes/hooks/push.js

@@ -16,7 +16,7 @@ export default async (req, res) => {
 
     try {
       const order = await orderService.retrieveByCartId(cartId)
-      await klarnaProviderService.acknowledgeOrder(klarnaOrder.id, order._id)
+      await klarnaProviderService.acknowledgeOrder(klarnaOrder.order_id, order._id)
     } catch (err) {
       if (err.type === MeudsaError.Types.NOT_FOUND) {
         let cart = await cartService.retrieve(cartId)
@@ -24,7 +24,7 @@ export default async (req, res) => {
         cart = await cartService.setPaymentMethod(cart._id, method)
 
         const order = await orderService.createFromCart(cart)
-        await klarnaProviderService.acknowledgeOrder(klarnaOrder.id, order._id)
+        await klarnaProviderService.acknowledgeOrder(klarnaOrder.order_id, order._id)
       }
     }
 

packages/medusa-payment-klarna/src/api/routes/hooks/shipping.js

@@ -10,14 +10,11 @@ export default async (req, res) => {
     const cart = await cartService.retrieve(merchant_data)
     const shippingOptions = await shippingProfileService.fetchCartOptions(cart)
 
-    const option = shippingOptions.find(({ _id }) => _id === selected_shipping_option.id)
+    const option = shippingOptions.find(({ _id }) => _id.equals(selected_shipping_option.id))
 
     if (option) {
-      await cartService.addShippingMethod(cart._id, option._id, option.data)
-
-      // Fetch and return updated Klarna order
-      const updatedCart = await cartService.retrieve(cart._id)
-      const order = klarnaProviderService.cartToKlarnaOrder(updatedCart)
+      const newCart = await cartService.addShippingMethod(cart._id, option._id, option.data)
+      const order = await klarnaProviderService.cartToKlarnaOrder(newCart)
       res.json(order)
     } else {
       res.sendStatus(400)

packages/medusa-payment-klarna/src/services/klarna-provider.js

@@ -5,7 +5,10 @@ import { PaymentService } from "medusa-interfaces"
 class KlarnaProviderService extends PaymentService {
   static identifier = "klarna"
 
-  constructor({ shippingProfileService, totalsService, regionService }, options) {
+  constructor(
+    { shippingProfileService, totalsService, regionService },
+    options
+  ) {
     super()
 
     this.options_ = options
@@ -22,7 +25,8 @@ class KlarnaProviderService extends PaymentService {
 
     this.klarnaOrderManagementUrl_ = "/ordermanagement/v1/orders"
 
-    this.backendUrl_ = process.env.BACKEND_URL || "https://58721b1f44d9.ngrok.io"
+    this.backendUrl_ =
+      process.env.BACKEND_URL || "https://2fe4e28015f5.ngrok.io"
 
     this.totalsService_ = totalsService
 
@@ -77,7 +81,7 @@ class KlarnaProviderService extends PaymentService {
         const quantity = item.content.quantity
         const unit_price = item.content.unit_price * 100 * (taxRate + 1)
         const total_discount_amount = itemDiscount * (taxRate + 1) * 100
-        const total_amount = unit_price * quantity  - total_discount_amount
+        const total_amount = unit_price * quantity - total_discount_amount
         const total_tax_amount = total_amount * (taxRate / (1 + taxRate))
 
         order_lines.push({
@@ -98,6 +102,7 @@ class KlarnaProviderService extends PaymentService {
       order_lines.push({
         name: `${shippingMethod.name}`,
         quantity: 1,
+        type: "shipping_fee",
         unit_price: price * (1 + taxRate) * 100,
         tax_rate: taxRate * 10000,
         total_amount: price * (1 + taxRate) * 100,
@@ -141,8 +146,8 @@ class KlarnaProviderService extends PaymentService {
       order.purchase_country = "SE"
     }
 
-    order.order_amount = await this.totalsService_.getTotal(cart) * 100
-    order.order_tax_amount = await this.totalsService_.getTaxTotal(cart) * 100
+    order.order_amount = (await this.totalsService_.getTotal(cart)) * 100
+    order.order_tax_amount = (await this.totalsService_.getTaxTotal(cart)) * 100
     // TODO: Check if currency matches ISO
     order.purchase_currency = currency_code
 
@@ -155,45 +160,36 @@ class KlarnaProviderService extends PaymentService {
       address_update: `${this.backendUrl_}/klarna/address`,
     }
 
+    if (cart.shipping_address && cart.shipping_address.first_name) {
+      const shippingOptions = await this.shippingProfileService_.fetchCartOptions(
+        cart
+      )
 
-    const shippingOptions = await this.shippingProfileService_.fetchCartOptions(cart)
+      // If the cart does not have shipping methods yet, preselect one from
+      // shipping_options and set the selected shipping method
+      if (cart.shipping_methods.length) {
+        const shipping_method = cart.shipping_methods[0]
+        order.selected_shipping_option = {
+          id: shipping_method._id,
+          name: shipping_method.name,
+          price: shipping_method.price * (1 + tax_rate) * 100,
+          tax_amount: shipping_method.price * tax_rate * 100,
+          tax_rate: tax_rate * 10000,
+        }
+      }
 
-    // If the cart does not have shipping methods yet, preselect one from
-    // shipping_options and set the selected shipping method
-    if (!cart.shipping_methods.length) {
-      const shipping_method = shippingOptions[0]
-      order.selected_shipping_option = {
-        id: shipping_method._id,
-        name: shipping_method.name,
-        price: shipping_method.price * (1 + tax_rate) * 100,
-        tax_amount: shipping_method.price * tax_rate * 100,
-        // Medusa tax rate of e.g. 0.25 (25%) needs to be 2500 in Klarna
+      // If the cart does have shipping methods, set the selected shipping method
+
+      order.shipping_options = shippingOptions.map((so) => ({
+        id: so._id,
+        name: so.name,
+        price: so.price * (1 + tax_rate) * 100,
+        tax_amount: so.price * tax_rate * 100,
         tax_rate: tax_rate * 10000,
-      }
-    } else {
-      const shipping_method = cart.shipping_methods[0]
-      order.selected_shipping_option = {
-        id: shipping_method._id,
-        name: shipping_method.name,
-        price: shipping_method.price * (1 + tax_rate) * 100,
-        tax_amount: shipping_method.price * tax_rate * 100,
-        tax_rate: tax_rate * 10000,
-      }
+        preselected: shippingOptions.length === 1
+      }))
     }
 
-    // If the cart does have shipping methods, set the selected shipping method
-
-    order.shipping_options = shippingOptions.map((so) => ({
-      id: so._id,
-      name: so.name,
-      price: so.price * (1 + tax_rate) * 100,
-      tax_amount: so.price * tax_rate * 100,
-      tax_rate: tax_rate * 10000,
-      preselected:
-        cart.shipping_methods[0] &&
-        `${cart.shipping_methods[0].provider_id}` === `${so.provider_id}`,
-    }))
-
     return order
   }
 
@@ -204,11 +200,15 @@ class KlarnaProviderService extends PaymentService {
    */
   async getStatus(paymentData) {
     try {
-      const { id } = paymentData
-      const order = await this.klarna_.get(`${this.klarnaOrderUrl_}/${id}`)
-      // TODO: Klarna docs does not provide a list of statues, so we need to
-      // play around our selves to figure it out
+      const { order_id } = paymentData
+      const { data: order } = await this.klarna_.get(
+        `${this.klarnaOrderUrl_}/${order_id}`
+      )
+
       let status = "initial"
+      if (order.status === "checkout_complete") {
+        status = "authorized"
+      }
       return status
     } catch (error) {
       throw error
@@ -224,7 +224,8 @@ class KlarnaProviderService extends PaymentService {
   async createPayment(cart) {
     try {
       const order = await this.cartToKlarnaOrder(cart)
-      return this.klarna_.post(this.klarnaOrderUrl_, order)
+      return this.klarna_
+        .post(this.klarnaOrderUrl_, order)
         .then(({ data }) => data)
     } catch (error) {
       throw error
@@ -236,10 +237,10 @@ class KlarnaProviderService extends PaymentService {
    * @param {string} cart - the cart to retrieve order for
    * @returns {Object} Klarna order
    */
-  async retrievePayment(cart) {
+  async retrievePayment(paymentData) {
     try {
-      const { data } = cart.payment_method
-      return this.klarna_.get(`${this.klarnaOrderUrl_}/${data.id}`)
+      return this.klarna_.get(`${this.klarnaOrderUrl_}/${paymentData.order_id}`)
+        .then(({ data }) => data)
     } catch (error) {
       throw error
     }
@@ -306,8 +307,9 @@ class KlarnaProviderService extends PaymentService {
    */
   async updatePayment(paymentData, cart) {
     try {
-      const order = await this.cartToKlarnaOrder(cart)
-      return this.klarna_.post(`${this.klarnaOrderUrl_}/${paymentData.order_id}`, order)
+      const order = await this.cartToKlarnaOrder(cart, true)
+      return this.klarna_
+        .post(`${this.klarnaOrderUrl_}/${paymentData.order_id}`, order)
         .then(({ data }) => data)
     } catch (error) {
       throw error
@@ -321,17 +323,19 @@ class KlarnaProviderService extends PaymentService {
    */
   async capturePayment(paymentData) {
     try {
-      const { id } = paymentData
-      const orderData = await this.klarna_.get(`${this.klarnaOrderUrl_}/${id}`)
+      const { order_id } = paymentData
+      const orderData = await this.klarna_.get(
+        `${this.klarnaOrderUrl_}/${order_id}`
+      )
       const { order_amount } = orderData.order
 
       await this.klarna_.post(
-        `${this.klarnaOrderManagementUrl_}/${id}/captures`,
+        `${this.klarnaOrderManagementUrl_}/${order_id}/captures`,
         {
           captured_amount: order_amount,
         }
       )
-      return id
+      return order_id
     } catch (error) {
       throw error
     }
@@ -344,14 +348,14 @@ class KlarnaProviderService extends PaymentService {
    */
   async refundPayment(paymentData, amount) {
     try {
-      const { id } = paymentData
+      const { order_id } = paymentData
       await this.klarna_.post(
-        `${this.klarnaOrderManagementUrl_}/${id}/refunds`,
+        `${this.klarnaOrderManagementUrl_}/${order_id}/refunds`,
         {
           refunded_amount: amount,
         }
       )
-      return id
+      return order_id
     } catch (error) {
       throw error
     }
@@ -364,9 +368,9 @@ class KlarnaProviderService extends PaymentService {
    */
   async cancelPayment(paymentData) {
     try {
-      const { id } = paymentData
-      await this.klarna_.post(`${this.klarnaOrderUrl_}/${id}/cancel`)
-      return id
+      const { order_id } = paymentData
+      await this.klarna_.post(`${this.klarnaOrderUrl_}/${order_id}/cancel`)
+      return order_id
     } catch (error) {
       throw error
     }