diff --git a/lib/store/accounts.ex b/lib/store/accounts.ex
index 489327c..9a1c673 100644
--- a/lib/store/accounts.ex
+++ b/lib/store/accounts.ex
@@ -7,7 +7,6 @@ defmodule Store.Accounts do
   alias Store.Repo
   alias Store.Accounts.{User, UserToken, UserNotifier}
   alias StoreWeb.Emails.AuthEmails
-  alias Store.Mailer
 
   ## Database getters
 
@@ -32,6 +31,25 @@ defmodule Store.Accounts do
     |> then(fn user -> user.email end)
   end
 
+  @doc """
+   Gets a user email by id.
+
+  ## Examples
+
+      iex> get_user_email(id)
+      "foo@example.com"
+
+      iex> get_user_email(nil)
+      nil
+
+  """
+  def get_user_email(nil), do: nil
+
+  def get_user_email(id) do
+    Repo.get_by(User, id: id)
+    |> then(fn user -> user.email end)
+  end
+
   @doc """
   Gets a user by email and password.
 
@@ -291,7 +309,6 @@ defmodule Store.Accounts do
       Repo.insert!(user_token)
 
       AuthEmails.confirm_account_email(confirmation_url_fun.(encoded_token), to: user.email)
-      |> Mailer.deliver()
     end
   end
 
diff --git a/lib/store/accounts/user_notifier.ex b/lib/store/accounts/user_notifier.ex
index a2db100..105a3c8 100644
--- a/lib/store/accounts/user_notifier.ex
+++ b/lib/store/accounts/user_notifier.ex
@@ -4,18 +4,18 @@ defmodule Store.Accounts.UserNotifier do
   alias Store.Mailer
 
   # Delivers the email using the application mailer.
-  defp deliver(recipient, _, body) do
+  defp deliver(recipient, subject, body) do
     email =
       new()
       |> to(recipient)
       |> from({"CeSIUM - Store", "noreply@store.cesium.di.uminho.pt"})
-      |> subject("[CeSIUM - Store] Verifique a sua conta")
+      |> subject("[CeSIUM - Store] #{subject}")
       |> reply_to("noreply@store.cesium.di.uminho.pt")
       |> text_body(body)
 
-    with {:ok, _metadata} <- Mailer.deliver(email) do
-      {:ok, email}
-    end
+    Task.start(fn -> {:ok, _metadata} = Mailer.deliver(email) end)
+
+    {:ok, email}
   end
 
   @doc """
diff --git a/lib/store/inventory.ex b/lib/store/inventory.ex
index 684b4f9..007df5a 100644
--- a/lib/store/inventory.ex
+++ b/lib/store/inventory.ex
@@ -4,12 +4,15 @@ defmodule Store.Inventory do
   """
   use Store.Context
 
-  alias StoreWeb.Accounts.User
-  alias StoreWeb.Inventory.Product
+  alias Store.Accounts.User
+  alias Store.Inventory.Product
   alias Store.Inventory.Order
+  alias Store.Inventory.OrderHistory
   alias Store.Inventory.OrdersProducts
   alias Store.Inventory
 
+  # PRODUCTS
+
   @doc """
   Returns the list of products.
 
@@ -74,7 +77,7 @@ defmodule Store.Inventory do
       {:error, %Ecto.Changeset{}}
 
   """
-  def update_product(%Product{} = product, attrs, after_save \\ &{:ok, &1}) do
+  def update_product(%Product{} = product, attrs \\ %{}, after_save \\ &{:ok, &1}) do
     product
     |> Product.changeset(attrs)
     |> Repo.update()
@@ -98,6 +101,10 @@ defmodule Store.Inventory do
     |> Repo.update()
   end
 
+  def change_product(%Product{} = product, attrs \\ %{}) do
+    Product.changeset(product, attrs)
+  end
+
   @doc """
   Deletes a product.
 
@@ -121,21 +128,6 @@ defmodule Store.Inventory do
     |> broadcast(:deleted)
   end
 
-  @doc """
-  Returns an `%Ecto.Changeset{}` for tracking product changes.
-
-  ## Examples
-
-      iex> change_product(product)
-      %Ecto.Changeset{data: %Product{}}
-
-  """
-  def change_product(%Product{} = product, attrs \\ %{}) do
-    Product.changeset(product, attrs)
-  end
-
-  alias Store.Inventory.Order
-
   def list_orders(params \\ %{})
 
   @doc """
@@ -180,12 +172,6 @@ defmodule Store.Inventory do
 
   defp status_filter(q, status), do: where(q, [o], o.status in ^status)
 
-  def update_status(order, attrs) do
-    order
-    |> Order.changeset(attrs)
-    |> Repo.update()
-  end
-
   @doc """
   Returns the list of orders_products.
     iex> list_orders_products()
@@ -217,7 +203,11 @@ defmodule Store.Inventory do
       ** (Ecto.NoResultsError)
 
   """
-  def get_order!(id), do: Repo.get!(Order, id)
+  def get_order!(id, opts) when is_list(opts) do
+    Order
+    |> apply_filters(opts)
+    |> Repo.get!(id)
+  end
 
   @doc """
   Creates a order.
@@ -291,6 +281,10 @@ defmodule Store.Inventory do
     |> Repo.update()
   end
 
+  def change_order(%Order{} = order, attrs \\ %{}) do
+    Order.changeset(order, attrs)
+  end
+
   @doc """
   Deletes a order.
 
@@ -307,19 +301,6 @@ defmodule Store.Inventory do
     Repo.delete(order)
   end
 
-  @doc """
-  Returns an `%Ecto.Changeset{}` for tracking order changes.
-
-  ## Examples
-
-      iex> change_order(order)
-      %Ecto.Changeset{data: %Order{}}
-
-  """
-  def change_order(%Order{} = order, attrs \\ %{}) do
-    Order.changeset(order, attrs)
-  end
-
   @doc """
     Returns a function that can be used to broadcast the given event.
 
@@ -341,21 +322,20 @@ defmodule Store.Inventory do
     iex> purchase(user, product)
     {:error, %Ecto.Changeset{}}
   """
-  alias Store.Accounts.User
 
   def purchase(%User{} = user, %Product{} = product, product_params) do
     order = get_order_draft_by_id(user.id, preloads: [])
 
     case order do
       %Order{} ->
-        handle_existing_order(order, product, product_params)
+        handle_existing_order(order, product, product_params, user.partnership)
 
       nil ->
         handle_new_order(user, product, product_params)
     end
   end
 
-  defp handle_existing_order(order, product, product_params) do
+  defp handle_existing_order(order, product, product_params, partnership) do
     quantity = String.to_integer(product_params["quantity"])
 
     order_products =
@@ -374,30 +354,46 @@ defmodule Store.Inventory do
           order_product.size == String.to_existing_atom(product_params["size"])
         end)
 
+      price =
+        case partnership do
+          true -> product.price_partnership
+          false -> product.price
+        end
+
       if size_found do
-        update_order_products(order_products, product_params, quantity)
+        update_order_products(order_products, price, product_params, quantity)
       else
-        add_product_to_order(order, product, product_params)
+        add_product_to_order(order, product, price, product_params)
       end
 
       {:ok, product}
     end
   end
 
-  defp update_order_products(order_products, product_params, quantity) do
+  defp update_order_products(order_products, price, product_params, quantity) do
     Enum.each(order_products, fn order_product ->
       if order_product.size == String.to_existing_atom(product_params["size"]) do
-        update_order_product(order_product, %{quantity: order_product.quantity + quantity})
+        update_order_product(order_product, %{
+          quantity: order_product.quantity + quantity,
+          price: order_product.price + price * quantity
+        })
       end
     end)
   end
 
-  defp handle_new_order(user, product, product_params) do
+  defp handle_new_order(%User{} = user, %Product{} = product, product_params) do
     {:ok, order} = create_order(%{user_id: user.id})
-    add_product_to_order(order, product, product_params)
+
+    price =
+      case user.partnership do
+        true -> product.price_partnership
+        false -> product.price
+      end
+
+    add_product_to_order(order, product, price, product_params)
   end
 
-  def add_product_to_order(%Order{} = order, %Product{} = product, product_params) do
+  def add_product_to_order(%Order{} = order, %Product{} = product, price, product_params) do
     quantity = String.to_integer(product_params["quantity"])
     size = product_params["size"]
 
@@ -408,7 +404,8 @@ defmodule Store.Inventory do
         order_id: order.id,
         product_id: product.id,
         quantity: quantity,
-        size: size
+        size: size,
+        price: price * quantity
       })
     end
   end
@@ -452,17 +449,6 @@ defmodule Store.Inventory do
     {:ok, "Product added to cart"}
   end
 
-  @doc """
-
-
-  """
-
-  def checkout_order(order) do
-    order
-    |> Order.changeset(%{status: :ordered})
-    |> Repo.update()
-  end
-
   @doc """
   Function which verifies that the user has 1 or more of each product in his cart.
   ## Examples
@@ -490,12 +476,6 @@ defmodule Store.Inventory do
     end
   end
 
-  def capitalize_status(status) do
-    status
-    |> Atom.to_string()
-    |> String.capitalize()
-  end
-
   def total_price(order) do
     Enum.reduce(order.products, 0, fn product, acc -> acc + product.price end)
   end
@@ -508,21 +488,9 @@ defmodule Store.Inventory do
     total_price(order) - total_price_with_partnership(order)
   end
 
-  def total_price_cart(id) do
-    order =
-      Order
-      |> where(user_id: ^id)
-      |> where(status: :draft)
-      |> Repo.one()
-
-    order_products =
-      OrdersProducts
-      |> where(order_id: ^order.id)
-      |> preload([:product])
-      |> Repo.all()
-
+  def total_price_cart(order_products) do
     Enum.reduce(order_products, 0, fn order_product, acc ->
-      acc + order_product.quantity * order_product.product.price
+      acc + order_product.price
     end)
   end
 
@@ -552,12 +520,10 @@ defmodule Store.Inventory do
     |> Repo.update()
   end
 
-  def discount_cart(id) do
-    total_price_cart(id) - total_price_partnership_cart(id)
+  def discount_cart(id, order_products) do
+    total_price_cart(order_products) - total_price_partnership_cart(id)
   end
 
-  alias Store.Inventory.OrderHistory
-
   def create_orders_history(order) do
     %OrderHistory{}
     |> OrderHistory.changeset(order)
@@ -612,6 +578,10 @@ defmodule Store.Inventory do
     |> Repo.preload(:order)
   end
 
+  def delete_order_product(%OrdersProducts{} = order_product) do
+    Repo.delete(order_product)
+  end
+
   defp broadcast({:error, _reason} = error, _event), do: error
 
   defp broadcast({:ok, %Product{} = product}, event)
diff --git a/lib/store/inventory/order.ex b/lib/store/inventory/order.ex
index dcf44c6..119a6b1 100644
--- a/lib/store/inventory/order.ex
+++ b/lib/store/inventory/order.ex
@@ -2,7 +2,7 @@ defmodule Store.Inventory.Order do
   use Store.Schema
 
   alias Store.Accounts.User
-  alias StoreWeb.Inventory.Product
+  alias Store.Inventory.Product
   alias Store.Inventory.OrdersProducts
 
   @required_fields ~w(user_id)a
diff --git a/lib/store/inventory/orders_products.ex b/lib/store/inventory/orders_products.ex
index e5eef0c..4a796dc 100644
--- a/lib/store/inventory/orders_products.ex
+++ b/lib/store/inventory/orders_products.ex
@@ -1,7 +1,7 @@
 defmodule Store.Inventory.OrdersProducts do
   use Store.Schema
 
-  alias StoreWeb.Inventory.Product
+  alias Store.Inventory.Product
   alias Store.Inventory.Order
 
   schema "orders_products" do
@@ -10,6 +10,7 @@ defmodule Store.Inventory.OrdersProducts do
 
     belongs_to :order, Order
     belongs_to :product, Product
+    field :price, :integer
 
     timestamps()
   end
@@ -17,7 +18,7 @@ defmodule Store.Inventory.OrdersProducts do
   @doc false
   def changeset(orders_products, attrs) do
     orders_products
-    |> cast(attrs, [:order_id, :product_id, :quantity, :size])
-    |> validate_required([:order_id, :product_id, :quantity, :size])
+    |> cast(attrs, [:order_id, :product_id, :quantity, :size, :price])
+    |> validate_required([:order_id, :product_id, :quantity, :size, :price])
   end
 end
diff --git a/lib/store/inventory/product.ex b/lib/store/inventory/product.ex
index ad4aaf1..2a1a7ef 100644
--- a/lib/store/inventory/product.ex
+++ b/lib/store/inventory/product.ex
@@ -1,4 +1,4 @@
-defmodule StoreWeb.Inventory.Product do
+defmodule Store.Inventory.Product do
   @moduledoc """
   A product.
   """
diff --git a/lib/store/uploaders/product_image.ex b/lib/store/uploaders/product_image.ex
index 975f106..ac3b557 100644
--- a/lib/store/uploaders/product_image.ex
+++ b/lib/store/uploaders/product_image.ex
@@ -6,7 +6,7 @@ defmodule Store.Uploaders.ProductImage do
   use Waffle.Definition
   use Waffle.Ecto.Definition
 
-  alias StoreWeb.Inventory.Product
+  alias Store.Inventory.Product
 
   @versions [:original, :medium, :thumb]
   @extension_whitelist ~w(.jpg .jpeg .png)
diff --git a/lib/store/utils.ex b/lib/store/utils.ex
new file mode 100644
index 0000000..7f9b140
--- /dev/null
+++ b/lib/store/utils.ex
@@ -0,0 +1,32 @@
+defmodule Store.Utils do
+  alias StoreWeb.Router.Helpers, as: Routes
+
+  def capitalize_status(status) do
+    status
+    |> Atom.to_string()
+    |> String.capitalize()
+  end
+
+  def draw_qr_code(order) do
+    internal_route = Routes.admin_order_show_path(StoreWeb.Endpoint, :show, order.id)
+    url = build_url() <> internal_route
+
+    url
+    |> QRCodeEx.encode()
+    |> QRCodeEx.svg(color: "#1F2937", width: 295, background_color: :transparent)
+  end
+
+  def draw_qr_code_base64(order_id) do
+    internal_route = Routes.admin_order_show_path(StoreWeb.Endpoint, :show, order_id)
+    url = build_url() <> internal_route
+
+    url
+    |> QRCodeEx.encode()
+    |> QRCodeEx.png(color: <<0, 0, 0>>, width: 140)
+    |> Base.encode64()
+  end
+
+  defp build_url do
+    "https://#{Application.fetch_env!(:store, StoreWeb.Endpoint)[:url][:host]}"
+  end
+end
diff --git a/lib/store_web/emails/auth_email.ex b/lib/store_web/emails/auth_email.ex
index 527d90a..d58ae68 100644
--- a/lib/store_web/emails/auth_email.ex
+++ b/lib/store_web/emails/auth_email.ex
@@ -4,26 +4,33 @@ defmodule StoreWeb.Emails.AuthEmails do
   """
 
   use Phoenix.Swoosh, view: StoreWeb.EmailView, layout: {StoreWeb.LayoutView, :email}
+  alias Store.Mailer
 
   def reset_password_email(id, to: email) do
     frontend_url = Application.fetch_env!(:store, StoreWeb.Endpoint)[:frontend_url]
 
-    new()
-    |> from({"CeSIUM - Store", "noreply@store.cesium.di.uminho.pt"})
-    |> to(email)
-    |> subject("[CeSIUM - Store] Instruções para repor a password")
-    |> reply_to("noreply@store.cesium.di.uminho.pt")
-    |> assign(:link, frontend_url <> "/users/reset_password/" <> id)
+    email =
+      new()
+      |> from({"CeSIUM - Store", "noreply@store.cesium.di.uminho.pt"})
+      |> to(email)
+      |> subject("[CeSIUM - Store] Instruções para repor a password")
+      |> reply_to("noreply@store.cesium.di.uminho.pt")
+      |> assign(:link, frontend_url <> "/users/reset_password/" <> id)
+
+    Task.start(fn -> {:ok, _metadata} = Mailer.deliver(email) end)
   end
 
   def confirm_account_email(id, to: email) do
-    new()
-    |> from({"CeSIUM - Store", "noreply@store.cesium.di.uminho.pt"})
-    |> to(email)
-    |> subject("[CeSIUM - Store] Confirmação da conta")
-    |> reply_to("noreply@store.cesium.di.uminho.pt")
-    |> assign(:link, id)
-    |> assign(:user, Store.Accounts.get_user_by_email(email))
-    |> render_body("confirm_account.html")
+    email =
+      new()
+      |> from({"CeSIUM - Store", "noreply@store.cesium.di.uminho.pt"})
+      |> to(email)
+      |> subject("[CeSIUM - Store] Confirmação da conta")
+      |> reply_to("noreply@store.cesium.di.uminho.pt")
+      |> assign(:link, id)
+      |> assign(:user, Store.Accounts.get_user_by_email(email))
+      |> render_body("confirm_account.html")
+
+    Task.start(fn -> {:ok, _metadata} = Mailer.deliver(email) end)
   end
 end
diff --git a/lib/store_web/emails/order_email.ex b/lib/store_web/emails/order_email.ex
index 29479fd..1b8c9c6 100644
--- a/lib/store_web/emails/order_email.ex
+++ b/lib/store_web/emails/order_email.ex
@@ -1,82 +1,101 @@
 defmodule StoreWeb.Emails.OrdersEmail do
   use Phoenix.Swoosh, view: StoreWeb.EmailView, layout: {StoreWeb.LayoutView, :email}
+
   alias Store.Inventory
-  alias Store.Repo
-  alias StoreWeb.Router.Helpers, as: Routes
+  alias Store.Mailer
+  alias Store.Utils
 
   def ready(id, to: email) do
     frontend_url = Application.fetch_env!(:store, StoreWeb.Endpoint)[:frontend_url]
 
-    new()
-    |> from({"CeSIUM - Store", "noreply@store.cesium.di.uminho.pt"})
-    |> to(email)
-    |> subject("[CeSIUM - Store] A tua encomenda encontra-se pronta para levantamento!")
-    |> reply_to("noreply@store.cesium.di.uminho.pt")
-    |> assign(:link, frontend_url <> "/orders/" <> id)
-    |> assign(:order, Inventory.get_order!(id) |> Repo.preload(:products))
-    |> assign(:qr_code_base64, draw_qr_code_base64(id))
-    |> render_body("order_status_ready.html")
+    email =
+      new()
+      |> from({"CeSIUM - Store", "noreply@store.cesium.di.uminho.pt"})
+      |> to(email)
+      |> subject("[CeSIUM - Store] A tua encomenda encontra-se pronta para levantamento!")
+      |> reply_to("noreply@store.cesium.di.uminho.pt")
+      |> assign(:link, frontend_url <> "/orders/" <> id)
+      |> assign(:order, Inventory.get_order!(id, preloads: [:products]))
+      |> assign(:qr_code_base64, Utils.draw_qr_code_base64(id))
+      |> render_body("order_status_ready.html")
+
+    Task.start(fn -> {:ok, _metadata} = Mailer.deliver(email) end)
+
+    {:ok, email}
   end
 
   def ordered(id, to: email) do
     frontend_url = Application.fetch_env!(:store, StoreWeb.Endpoint)[:frontend_url]
 
-    new()
-    |> from({"CeSIUM - Store", "noreply@store.cesium.di.uminho.pt"})
-    |> to(email)
-    |> subject("[CeSIUM - Store] A tua encomenda foi realizada com sucesso!")
-    |> reply_to("noreply@store.cesium.di.uminho.pt")
-    |> assign(:link, frontend_url <> "/orders/" <> id)
-    |> assign(:order, Inventory.get_order!(id) |> Repo.preload(:products))
-    |> assign(:qr_code_base64, draw_qr_code_base64(id))
-    |> render_body("order_status_ordered.html")
+    email =
+      new()
+      |> from({"CeSIUM - Store", "noreply@store.cesium.di.uminho.pt"})
+      |> to(email)
+      |> subject("[CeSIUM - Store] A tua encomenda foi realizada com sucesso!")
+      |> reply_to("noreply@store.cesium.di.uminho.pt")
+      |> assign(:link, frontend_url <> "/orders/" <> id)
+      |> assign(:order, Inventory.get_order!(id, preloads: [:products]))
+      |> assign(:qr_code_base64, Utils.draw_qr_code_base64(id))
+      |> render_body("order_status_ordered.html")
+
+    Task.start(fn -> {:ok, _metadata} = Mailer.deliver(email) end)
+
+    {:ok, email}
   end
 
   def paid(id, to: email) do
     frontend_url = Application.fetch_env!(:store, StoreWeb.Endpoint)[:frontend_url]
 
-    new()
-    |> from({"CeSIUM - Store", "noreply@store.cesium.di.uminho.pt"})
-    |> to(email)
-    |> subject("[CeSIUM - Store] A tua encomenda foi paga com sucesso!")
-    |> reply_to("noreply@store.cesium.di.uminho.pt")
-    |> assign(:link, frontend_url <> "/orders/" <> id)
-    |> assign(:order, Inventory.get_order!(id) |> Repo.preload(:products))
-    |> assign(:qr_code_base64, draw_qr_code_base64(id))
-    |> render_body("order_status_paid.html")
+    email =
+      new()
+      |> from({"CeSIUM - Store", "noreply@store.cesium.di.uminho.pt"})
+      |> to(email)
+      |> subject("[CeSIUM - Store] A tua encomenda foi paga com sucesso!")
+      |> reply_to("noreply@store.cesium.di.uminho.pt")
+      |> assign(:link, frontend_url <> "/orders/" <> id)
+      |> assign(:order, Inventory.get_order!(id, preloads: [:products]))
+      |> assign(:qr_code_base64, Utils.draw_qr_code_base64(id))
+      |> render_body("order_status_paid.html")
+
+    Task.start(fn -> {:ok, _metadata} = Mailer.deliver(email) end)
+
+    {:ok, email}
   end
 
   def delivered(id, to: email) do
     frontend_url = Application.fetch_env!(:store, StoreWeb.Endpoint)[:frontend_url]
 
-    new()
-    |> from({"CeSIUM - Store", "noreply@store.cesium.di.uminho.pt"})
-    |> to(email)
-    |> subject("[CeSIUM - Store] A tua encomenda foi entregue com sucesso!")
-    |> reply_to("noreply@store.cesium.di.uminho.pt")
-    |> assign(:link, frontend_url <> "/orders/" <> id)
-    |> assign(:order, Inventory.get_order!(id) |> Repo.preload(:products))
-    |> render_body("order_status_delivered.html")
+    email =
+      new()
+      |> from({"CeSIUM - Store", "noreply@store.cesium.di.uminho.pt"})
+      |> to(email)
+      |> subject("[CeSIUM - Store] A tua encomenda foi entregue com sucesso!")
+      |> reply_to("noreply@store.cesium.di.uminho.pt")
+      |> assign(:link, frontend_url <> "/orders/" <> id)
+      |> assign(:order, Inventory.get_order!(id, preloads: [:products]))
+      |> render_body("order_status_delivered.html")
+
+    Task.start(fn -> {:ok, _metadata} = Mailer.deliver(email) end)
+
+    {:ok, email}
   end
 
   def canceled(id, to: email) do
     frontend_url = Application.fetch_env!(:store, StoreWeb.Endpoint)[:frontend_url]
 
-    new()
-    |> from({"CeSIUM - Store", "noreply@store.cesium.di.uminho.pt"})
-    |> to(email)
-    |> subject("[CeSIUM - Store] A tua encomenda foi cancelada!")
-    |> reply_to("noreply@store.cesium.di.uminho.pt")
-    |> assign(:link, frontend_url <> "/orders/" <> id)
-    |> assign(:order, Inventory.get_order!(id) |> Repo.preload(:products))
-    |> assign(:qr_code_base64, draw_qr_code_base64(id))
-    |> render_body("order_status_canceled.html")
-  end
+    email =
+      new()
+      |> from({"CeSIUM - Store", "noreply@store.cesium.di.uminho.pt"})
+      |> to(email)
+      |> subject("[CeSIUM - Store] A tua encomenda foi cancelada!")
+      |> reply_to("noreply@store.cesium.di.uminho.pt")
+      |> assign(:link, frontend_url <> "/orders/" <> id)
+      |> assign(:order, Inventory.get_order!(id, preloads: [:products]))
+      |> assign(:qr_code_base64, Utils.draw_qr_code_base64(id))
+      |> render_body("order_status_canceled.html")
+
+    Task.start(fn -> {:ok, _metadata} = Mailer.deliver(email) end)
 
-  defp draw_qr_code_base64(order_id) do
-    Routes.admin_order_show_path(StoreWeb.Endpoint, :show, order_id)
-    |> QRCodeEx.encode()
-    |> QRCodeEx.png(color: <<0, 0, 0>>, width: 140)
-    |> Base.encode64()
+    {:ok, email}
   end
 end
diff --git a/lib/store_web/live/backoffice/dashboard_live/index.ex b/lib/store_web/live/backoffice/dashboard_live/index.ex
index c066528..33861b4 100644
--- a/lib/store_web/live/backoffice/dashboard_live/index.ex
+++ b/lib/store_web/live/backoffice/dashboard_live/index.ex
@@ -1,7 +1,10 @@
 defmodule StoreWeb.Backoffice.DashboardLive.Index do
   use StoreWeb, :live_view
-  import Store.Inventory
+
   alias Store.Accounts
+  alias Store.Inventory
+  alias Store.Utils
+
   import StoreWeb.Components.Pagination
 
   @impl true
@@ -26,7 +29,7 @@ defmodule StoreWeb.Backoffice.DashboardLive.Index do
   end
 
   defp list_history(params) do
-    case list_displayable_orders_history(params, preloads: [:order, :admin]) do
+    case Inventory.list_displayable_orders_history(params, preloads: [:order, :admin]) do
       {:ok, {orders, meta}} ->
         %{orders: orders, meta: meta}
 
@@ -34,12 +37,4 @@ defmodule StoreWeb.Backoffice.DashboardLive.Index do
         %{orders: [], meta: flop}
     end
   end
-
-  defp user_email(id) do
-    if id == nil do
-      nil
-    else
-      Accounts.get_user!(id).email
-    end
-  end
 end
diff --git a/lib/store_web/live/backoffice/dashboard_live/index.html.heex b/lib/store_web/live/backoffice/dashboard_live/index.html.heex
index 1b40ff1..9fa7f96 100644
--- a/lib/store_web/live/backoffice/dashboard_live/index.html.heex
+++ b/lib/store_web/live/backoffice/dashboard_live/index.html.heex
@@ -16,11 +16,11 @@
                 </div>
                 <div>
                   <dt class="font-semibold uppercase">Order User</dt>
-                  <dd class="mt-1"><%= user_email(order.order.user_id) %></dd>
+                  <dd class="mt-1"><%= Accounts.get_user_email(order.order.user_id) %></dd>
                 </div>
                 <div>
                   <dt class="font-semibold uppercase">Order Manager</dt>
-                  <dd class="mt-1"><%= user_email(order.admin_id) %></dd>
+                  <dd class="mt-1"><%= Accounts.get_user_email(order.admin_id) %></dd>
                 </div>
                 <div class="hidden sm:block">
                   <dt class="font-semibold uppercase">Date placed</dt>
@@ -36,7 +36,7 @@
                 </div>
                 <div>
                   <dt class="font-semibold uppercase">Status</dt>
-                  <dd class="mt-1 font-medium"><%= capitalize_status(order.status) %></dd>
+                  <dd class="mt-1 font-medium"><%= Utils.capitalize_status(order.status) %></dd>
                 </div>
               </dl>
             </div>
diff --git a/lib/store_web/live/backoffice/order_live/index.ex b/lib/store_web/live/backoffice/order_live/index.ex
index 2d13622..9c5adb0 100644
--- a/lib/store_web/live/backoffice/order_live/index.ex
+++ b/lib/store_web/live/backoffice/order_live/index.ex
@@ -1,11 +1,13 @@
 defmodule StoreWeb.Backoffice.OrderLive.Index do
   use StoreWeb, :live_view
-  import Store.Inventory, except: [list_orders: 1]
+
+  import StoreWeb.Components.Pagination
+
+  alias Store.Accounts
   alias Store.Inventory
   alias Store.Inventory.Order
   alias Store.Uploaders
-  alias Store.Accounts
-  import StoreWeb.Components.Pagination
+  alias Store.Utils
 
   @impl true
   def mount(params, _session, socket) do
@@ -25,7 +27,7 @@ defmodule StoreWeb.Backoffice.OrderLive.Index do
   defp apply_action(socket, :edit, %{"id" => id}) do
     socket
     |> assign(:page_title, "Edit Order")
-    |> assign(:order, Inventory.get_order!(id))
+    |> assign(:order, Inventory.get_order!(id, preloads: []))
   end
 
   defp apply_action(socket, :new, _params) do
@@ -49,8 +51,4 @@ defmodule StoreWeb.Backoffice.OrderLive.Index do
         %{orders: [], meta: flop}
     end
   end
-
-  defp user_email(id) do
-    Accounts.get_user!(id).email
-  end
 end
diff --git a/lib/store_web/live/backoffice/order_live/index.html.heex b/lib/store_web/live/backoffice/order_live/index.html.heex
index 4c3e637..4035f1a 100644
--- a/lib/store_web/live/backoffice/order_live/index.html.heex
+++ b/lib/store_web/live/backoffice/order_live/index.html.heex
@@ -12,7 +12,7 @@
               <dl class="grid flex-1 grid-cols-1 grid-rows-4 lg:grid-cols-3 lg:grid-rows-1 xl:grid-cols-4 xl:grid-rows-1">
                 <div class="flex flex-col items-center">
                   <dt class="font-semibold uppercase">Order User</dt>
-                  <dd class="mt-1"><%= user_email(order.user_id) %></dd>
+                  <dd class="mt-1"><%= Accounts.get_user_email(order.user_id) %></dd>
                 </div>
                 <div class="flex flex-col items-center">
                   <dt class="font-semibold uppercase">Date placed</dt>
@@ -23,14 +23,16 @@
                 <div class="flex flex-col items-center">
                   <dt class="font-semibold uppercase">Total amount</dt>
                   <%= if order.user.partnership == false do %>
-                    <dd class="mt-1 font-medium"><%= total_price(order) %> €</dd>
+                    <dd class="mt-1 font-medium"><%= Inventory.total_price(order) %> €</dd>
                   <% else %>
-                    <dd class="mt-1 font-medium"><%= total_price_with_partnership(order) %> €</dd>
+                    <dd class="mt-1 font-medium">
+                      <%= Inventory.total_price_with_partnership(order) %> €
+                    </dd>
                   <% end %>
                 </div>
                 <div class="flex flex-col items-center">
                   <dt class="font-semibold uppercase">Status</dt>
-                  <dd class="mt-1 font-medium"><%= capitalize_status(order.status) %></dd>
+                  <dd class="mt-1 font-medium"><%= Utils.capitalize_status(order.status) %></dd>
                 </div>
               </dl>
               <!-- Add a button at the final at the grid -->
diff --git a/lib/store_web/live/backoffice/order_live/show.ex b/lib/store_web/live/backoffice/order_live/show.ex
index 4f9d9b5..a3ff274 100644
--- a/lib/store_web/live/backoffice/order_live/show.ex
+++ b/lib/store_web/live/backoffice/order_live/show.ex
@@ -1,16 +1,16 @@
 defmodule StoreWeb.Backoffice.OrderLive.Show do
   use StoreWeb, :live_view
-  import Store.Inventory
+
   alias Phoenix.LiveView.JS
-  alias Store.Repo
+  alias Store.Accounts
   alias Store.Inventory
   alias Store.Uploaders
-  alias Store.Accounts
+  alias Store.Utils
   alias StoreWeb.Emails.OrdersEmail
-  alias Store.Mailer
+
   @impl true
   def mount(%{"id" => id}, _session, socket) do
-    {:ok, assign(socket, order: Inventory.get_order!(id), confirm_event: "")}
+    {:ok, assign(socket, order: Inventory.get_order!(id, preloads: []), confirm_event: "")}
   end
 
   @impl true
@@ -20,25 +20,25 @@ defmodule StoreWeb.Backoffice.OrderLive.Show do
      |> assign(:current_page, :orders)
      |> assign(:page_title, page_title(socket.assigns.live_action))
      |> assign(:confirm_event, "")
-     |> assign(:order, Inventory.get_order!(id) |> Repo.preload(:products))}
+     |> assign(:order, Inventory.get_order!(id, preloads: [:products]))}
   end
 
   @impl true
   def handle_event("paid", _payload, socket) do
     order = socket.assigns.order
     admin = socket.assigns.current_user
-    Inventory.update_status(order, %{status: :paid})
+
+    Inventory.update_order(order, %{status: :paid})
 
     Inventory.create_orders_history(%{status: :paid, admin_id: admin.id, order_id: order.id})
 
     user = Accounts.get_user!(order.user_id)
-    OrdersEmail.paid(order.id, to: user.email) |> Mailer.deliver()
+    OrdersEmail.paid(order.id, to: user.email)
 
     {:noreply,
      socket
      |> assign(:confirm_event, "")
-     |> put_flash(:info, "Order status updated successfly.")
-     |> push_redirect(to: socket.assigns.return_to)}
+     |> put_flash(:info, "Order status updated successfly.")}
   end
 
   @impl true
@@ -50,13 +50,12 @@ defmodule StoreWeb.Backoffice.OrderLive.Show do
     Inventory.create_orders_history(%{status: :delivered, admin_id: admin.id, order_id: order.id})
 
     user = Accounts.get_user!(order.user_id)
-    OrdersEmail.delivered(order.id, to: user.email) |> Mailer.deliver()
+    OrdersEmail.delivered(order.id, to: user.email)
 
     {:noreply,
      socket
      |> assign(:confirm_event, "")
-     |> put_flash(:info, "Order status updated successfly.")
-     |> push_redirect(to: socket.assigns.return_to)}
+     |> put_flash(:info, "Order status updated successfly.")}
   end
 
   def handle_event("ready", _payload, socket) do
@@ -66,7 +65,7 @@ defmodule StoreWeb.Backoffice.OrderLive.Show do
     Inventory.create_orders_history(%{status: :ready, admin_id: admin.id, order_id: order.id})
 
     user = Accounts.get_user!(order.user_id)
-    OrdersEmail.ready(order.id, to: user.email) |> Mailer.deliver()
+    OrdersEmail.ready(order.id, to: user.email)
 
     {:noreply,
      socket
@@ -81,10 +80,6 @@ defmodule StoreWeb.Backoffice.OrderLive.Show do
      |> assign(:confirm_event, confirm_event)}
   end
 
-  defp user_email(id) do
-    Accounts.get_user!(id).email
-  end
-
   defp page_title(:show), do: "Show Order"
   defp page_title(:edit), do: "Edit Order"
 end
diff --git a/lib/store_web/live/backoffice/order_live/show.html.heex b/lib/store_web/live/backoffice/order_live/show.html.heex
index af53c0b..8ae8c8e 100644
--- a/lib/store_web/live/backoffice/order_live/show.html.heex
+++ b/lib/store_web/live/backoffice/order_live/show.html.heex
@@ -12,7 +12,7 @@
             <dl class="grid flex-1 grid-cols-2 flex-col gap-x-6 text-sm sm:col-span-3 sm:grid-cols-4 lg:col-span-2">
               <div>
                 <dt class="font-semibold uppercase">Order User</dt>
-                <dd class="mt-1"><%= user_email(@order.user_id) %></dd>
+                <dd class="mt-1"><%= Accounts.get_user_email(@order.user_id) %></dd>
               </div>
               <div class="hidden sm:block">
                 <dt class="font-semibold uppercase">Date placed</dt>
@@ -22,11 +22,11 @@
               </div>
               <div>
                 <dt class="font-semibold uppercase">Total amount</dt>
-                <dd class="mt-1 font-medium"><%= total_price(@order) %> €</dd>
+                <dd class="mt-1 font-medium"><%= Inventory.total_price(@order) %> €</dd>
               </div>
               <div>
                 <dt class="font-semibold uppercase">Status</dt>
-                <dd class="mt-1 font-medium"><%= capitalize_status(@order.status) %></dd>
+                <dd class="mt-1 font-medium"><%= Utils.capitalize_status(@order.status) %></dd>
               </div>
             </dl>
             <!-- Add a button at the final at the grid -->
@@ -133,6 +133,7 @@
     </div>
   </section>
 </main>
+
 <.modal hide_close_button={true}>
   <%= if @confirm_event != "" do %>
     <button
diff --git a/lib/store_web/live/backoffice/product_live/form_component.ex b/lib/store_web/live/backoffice/product_live/form_component.ex
index cd9f23e..f21b1cd 100644
--- a/lib/store_web/live/backoffice/product_live/form_component.ex
+++ b/lib/store_web/live/backoffice/product_live/form_component.ex
@@ -14,7 +14,7 @@ defmodule StoreWeb.Backoffice.ProductLive.FormComponent do
 
   @impl true
   def update(%{product: product} = assigns, socket) do
-    changeset = Inventory.change_product(product)
+    changeset = Inventory.change_product(product, %{})
 
     {:ok,
      socket
diff --git a/lib/store_web/live/backoffice/product_live/form_component.html.heex b/lib/store_web/live/backoffice/product_live/form_component.html.heex
index 7977131..197699a 100644
--- a/lib/store_web/live/backoffice/product_live/form_component.html.heex
+++ b/lib/store_web/live/backoffice/product_live/form_component.html.heex
@@ -61,7 +61,9 @@
                 class: "mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-red-500 focus:ring-red-500 sm:text-sm"
               ) %>
             </div>
-            <p class="text-xs text-red-500"><%= error_tag(f, :price) %></p>
+            <p class="text-xs text-red-500">
+              <%= error_tag(f, :price) %>
+            </p>
             <div class="mt-4">
               <label for="street-address" class="block text-sm font-medium text-gray-700">
                 Description
@@ -71,7 +73,9 @@
                 class: "mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-red-500 focus:ring-red-500 sm:text-sm"
               ) %>
             </div>
-            <p class="text-xs text-red-500"><%= error_tag(f, :description) %></p>
+            <p class="text-xs text-red-500">
+              <%= error_tag(f, :description) %>
+            </p>
             <div class="mt-4">
               <label for="street-address" class="block text-sm font-medium text-gray-700">
                 Stock
@@ -81,7 +85,9 @@
                 class: "mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-red-500 focus:ring-red-500 sm:text-sm"
               ) %>
             </div>
-            <p class="text-xs text-red-500"><%= error_tag(f, :stock) %></p>
+            <p class="text-xs text-red-500">
+              <%= error_tag(f, :stock) %>
+            </p>
             <div class="mt-4">
               <label for="street-address" class="block text-sm font-medium text-gray-700">
                 Maximum purchases per user
@@ -91,7 +97,9 @@
                 class: "mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-red-500 focus:ring-red-500 sm:text-sm"
               ) %>
             </div>
-            <p class="text-xs text-red-500"><%= error_tag(f, :max_per_user) %></p>
+            <p class="text-xs text-red-500">
+              <%= error_tag(f, :max_per_user) %>
+            </p>
             <%= for product_sizes <- inputs_for(f, :sizes) do %>
               <div class="mt-4">
                 <label for="street-address" class="block text-sm font-medium text-gray-700">
@@ -103,7 +111,9 @@
                   class: "mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-red-500 focus:ring-red-500 sm:text-sm"
                 ) %>
               </div>
-              <p class="text-xs text-red-500"><%= error_tag(product_sizes, :xs_size) %></p>
+              <p class="text-xs text-red-500">
+                <%= error_tag(product_sizes, :xs_size) %>
+              </p>
               <div class="mt-4">
                 <label for="street-address" class="block text-sm font-medium text-gray-700">
                   S Quantity
@@ -114,7 +124,9 @@
                   class: "mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-red-500 focus:ring-red-500 sm:text-sm"
                 ) %>
               </div>
-              <p class="text-xs text-red-500"><%= error_tag(product_sizes, :s_size) %></p>
+              <p class="text-xs text-red-500">
+                <%= error_tag(product_sizes, :s_size) %>
+              </p>
               <div class="mt-4">
                 <label for="street-address" class="block text-sm font-medium text-gray-700">
                   M Quantity
@@ -125,7 +137,9 @@
                   class: "mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-red-500 focus:ring-red-500 sm:text-sm"
                 ) %>
               </div>
-              <p class="text-xs text-red-500"><%= error_tag(product_sizes, :m_size) %></p>
+              <p class="text-xs text-red-500">
+                <%= error_tag(product_sizes, :m_size) %>
+              </p>
               <div class="mt-4">
                 <label for="street-address" class="block text-sm font-medium text-gray-700">
                   L Quantity
@@ -136,7 +150,9 @@
                   class: "mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-red-500 focus:ring-red-500 sm:text-sm"
                 ) %>
               </div>
-              <p class="text-xs text-red-500"><%= error_tag(product_sizes, :l_size) %></p>
+              <p class="text-xs text-red-500">
+                <%= error_tag(product_sizes, :l_size) %>
+              </p>
               <div class="mt-4">
                 <label for="street-address" class="block text-sm font-medium text-gray-700">
                   XL Quantity
@@ -147,7 +163,9 @@
                   class: "mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-red-500 focus:ring-red-500 sm:text-sm"
                 ) %>
               </div>
-              <p class="text-xs text-red-500"><%= error_tag(product_sizes, :xl_size) %></p>
+              <p class="text-xs text-red-500">
+                <%= error_tag(product_sizes, :xl_size) %>
+              </p>
 
               <div class="mt-4">
                 <label for="street-address" class="block text-sm font-medium text-gray-700">
@@ -159,7 +177,9 @@
                   class: "mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-red-500 focus:ring-red-500 sm:text-sm"
                 ) %>
               </div>
-              <p class="text-xs text-red-500"><%= error_tag(product_sizes, :xxl_size) %></p>
+              <p class="text-xs text-red-500">
+                <%= error_tag(product_sizes, :xxl_size) %>
+              </p>
             <% end %>
             <div class="mt-4">
               <label for="street-address" class="block text-sm font-medium text-gray-700">
@@ -169,7 +189,9 @@
                 class: "mt-1 block h-10 w-10 rounded-md border-gray-300 shadow-sm focus:border-red-500 focus:ring-red-500 sm:text-sm"
               ) %>
             </div>
-            <p class="text-xs text-red-500"><%= error_tag(f, :max_per_user) %></p>
+            <p class="text-xs text-red-500">
+              <%= error_tag(f, :max_per_user) %>
+            </p>
           </div>
           <!-- Product image -->
           <div class="mt-10 lg:col-start-2 lg:row-span-2 lg:mt-0 lg:self-center">
@@ -180,7 +202,7 @@
                   <div
                     class={
                       "#{if length(@uploads.image.entries) != 0 do
-                        "hidden"
+                        " hidden"
                       end} border-2 border-gray-300 border-dashed rounded-md"
                     }
                     phx-drop-target={@uploads.image.ref}
@@ -225,7 +247,9 @@
                   <section>
                     <%= for entry <- @uploads.image.entries do %>
                       <%= for err <- upload_errors(@uploads.image, entry) do %>
-                        <p class="alert alert-danger"><%= Phoenix.Naming.humanize(err) %></p>
+                        <p class="alert alert-danger">
+                          <%= Phoenix.Naming.humanize(err) %>
+                        </p>
                       <% end %>
                       <article class="upload-entry">
                         <figure class="w-[400px]">
@@ -259,6 +283,7 @@
         </div>
       </div>
     </div>
+
     <.modal hide_close_button={false}>
       <div class="p-6 text-center">
         <svg
diff --git a/lib/store_web/live/backoffice/product_live/new.ex b/lib/store_web/live/backoffice/product_live/new.ex
index 0f4797f..9533201 100644
--- a/lib/store_web/live/backoffice/product_live/new.ex
+++ b/lib/store_web/live/backoffice/product_live/new.ex
@@ -1,7 +1,7 @@
 defmodule StoreWeb.Backoffice.ProductLive.New do
   @moduledoc false
   use StoreWeb, :live_view
-  alias StoreWeb.Inventory.Product
+  alias Store.Inventory.Product
 
   @impl true
   def mount(_params, _session, socket) do
diff --git a/lib/store_web/live/cart_live/index.ex b/lib/store_web/live/cart_live/index.ex
index eb911ef..7d53ece 100644
--- a/lib/store_web/live/cart_live/index.ex
+++ b/lib/store_web/live/cart_live/index.ex
@@ -1,19 +1,25 @@
 defmodule StoreWeb.CartLive.Index do
   @moduledoc false
   use StoreWeb, :live_view
-  import Store.Inventory
-  alias Store.Repo
-  alias Store.Mailer
+
+  alias Store.Inventory
   alias StoreWeb.Emails.OrdersEmail
 
   @impl true
   def mount(_params, _session, socket) do
-    order = list_user_draft_order(socket.assigns.current_user.id)
+    user_id = socket.assigns.current_user.id
+    order = Inventory.list_user_draft_order(user_id)
 
-    {:ok,
-     socket
-     |> assign(:order, order)
-     |> assign(:order_products, list_order_products(order.id))}
+    order_products =
+      case order do
+        nil ->
+          []
+
+        _ ->
+          Inventory.list_order_products(order.id)
+      end
+
+    {:ok, socket |> assign(:order, order) |> assign(:order_products, order_products)}
   end
 
   @impl true
@@ -27,12 +33,11 @@ defmodule StoreWeb.CartLive.Index do
   def handle_event("checkout", _payload, socket) do
     current_user = socket.assigns.current_user
 
-    order = get_order_draft_by_id(current_user.id, preloads: [])
+    order = Inventory.get_order_draft_by_id(current_user.id, preloads: [])
 
-    order
-    |> update_order(%{status: :ordered})
+    Inventory.update_order(order, %{status: :ordered})
 
-    OrdersEmail.ordered(order.id, to: current_user.email) |> Mailer.deliver()
+    OrdersEmail.ordered(order.id, to: current_user.email)
 
     {:noreply,
      socket
@@ -44,12 +49,12 @@ defmodule StoreWeb.CartLive.Index do
     current_user = socket.assigns.current_user
 
     size = String.to_existing_atom(size)
-    order = get_order_draft_by_id(current_user.id, preloads: [])
-    order_product = get_order_product_by_ids(order.id, id, size)
+    order = Inventory.get_order_draft_by_id(current_user.id, preloads: [])
+    order_product = Inventory.get_order_product_by_ids(order.id, id, size)
 
-    product = get_product!(order_product.product_id, preloads: [])
-    update_stock(product, size, order_product.quantity)
-    Repo.delete(order_product)
+    product = Inventory.get_product!(order_product.product_id, preloads: [])
+    Inventory.update_stock(product, size, order_product.quantity)
+    Inventory.delete_order_product(order_product)
 
     {:noreply,
      socket
diff --git a/lib/store_web/live/cart_live/index.html.heex b/lib/store_web/live/cart_live/index.html.heex
index 5597399..7e0927a 100644
--- a/lib/store_web/live/cart_live/index.html.heex
+++ b/lib/store_web/live/cart_live/index.html.heex
@@ -47,7 +47,6 @@
                   class="-m-2 inline-flex p-2 text-gray-400 hover:text-gray-500"
                 >
                   <span class="sr-only">Remove</span>
-                  <!-- Heroicon name: mini/x-mark -->
                   <svg
                     class="h-5 w-5"
                     xmlns="http://www.w3.org/2000/svg"
@@ -63,7 +62,6 @@
           <% end %>
         </ul>
       </section>
-      <!-- Order summary -->
       <section
         aria-labelledby="summary-heading"
         class="mt-16 rounded-lg bg-gray-50 px-4 py-6 sm:p-6 lg:col-span-5 lg:mt-0 lg:p-8"
@@ -75,7 +73,7 @@
             <dt class="text-sm text-gray-600">Subtotal</dt>
             <%= if @current_user do %>
               <dd class="text-sm font-medium text-gray-900">
-                <%= total_price_cart(@current_user.id) %> €
+                <%= Inventory.total_price_cart(@order_products) %> €
               </dd>
             <% else %>
               0
@@ -86,7 +84,7 @@
               <span class="text-sm text-gray-600">Desconto Sócio</span>
               <%= if @current_user do %>
                 <dd class="text-sm font-medium text-gray-900">
-                  - <%= discount_cart(@current_user.id) %> €
+                  - <%= Inventory.discount_cart(@current_user.id, @order_products) %> €
                 </dd>
               <% else %>
                 0
@@ -97,7 +95,7 @@
             <dt class="text-sm text-gray-600">
               <span class="text-sm text-gray-600">Sócio</span>
               <dd class="text-base font-medium text-gray-900">
-                <%= if @current_user && @current_user.partnership==true do %>
+                <%= if @current_user && @current_user.partnership do %>
                   <input type="checkbox" name="socio" value="true" disabled checked />
                 <% else %>
                   <input type="checkbox" name="socio" value="false" disabled />
@@ -107,15 +105,9 @@
           </div>
           <div class="flex items-center justify-between border-t border-gray-200 pt-4">
             <dt class="text-base font-medium text-gray-900">Total</dt>
-            <%= if @current_user && @current_user.partnership do %>
-              <dd class="text-base font-medium text-gray-900">
-                <%= total_price_partnership_cart(@current_user.id) %> €
-              </dd>
-            <% else %>
-              <dd class="text-base font-medium text-gray-900">
-                <%= total_price_cart(@current_user.id) %> €
-              </dd>
-            <% end %>
+            <dd class="text-base font-medium text-gray-900">
+              <%= Inventory.total_price_cart(@order_products) %> €
+            </dd>
           </div>
         </dl>
 
diff --git a/lib/store_web/live/order_live/index.ex b/lib/store_web/live/order_live/index.ex
index 821674e..15f2af2 100644
--- a/lib/store_web/live/order_live/index.ex
+++ b/lib/store_web/live/order_live/index.ex
@@ -1,13 +1,12 @@
 defmodule StoreWeb.OrderLive.Index do
-  @moduledoc false
-  import Ecto.Query
   use StoreWeb, :live_view
-  alias Store.Repo
-  import Store.Inventory, except: [list_displayable_user_orders: 2]
+
+  import StoreWeb.Components.Pagination
+
   alias Store.Inventory
   alias Store.Inventory.Order
   alias Store.Uploaders
-  import StoreWeb.Components.Pagination
+  alias Store.Utils
 
   @impl true
   def mount(params, _socket, socket) do
@@ -25,37 +24,12 @@ defmodule StoreWeb.OrderLive.Index do
      |> apply_action(socket.assigns.live_action, params)}
   end
 
-  defp apply_action(socket, :edit, %{"id" => id}) do
-    socket
-    |> assign(:page_title, "Edit Order")
-    |> assign(:order, Inventory.get_order!(id))
-  end
-
-  defp apply_action(socket, :new, _params) do
-    socket
-    |> assign(:page_title, "New Order")
-    |> assign(:order, %Order{})
-  end
-
-  defp apply_action(socket, :index, _params) do
-    socket
-    |> assign(:page_title, "Listing Orders")
-    |> assign(:order, nil)
-  end
-
   @impl true
   def handle_event("checkout", _payload, socket) do
     current_user = socket.assigns.current_user
 
-    order =
-      Order
-      |> where(status: :draft)
-      |> where(user_id: ^current_user.id)
-      |> Repo.one()
-
-    order
-    |> Order.changeset(%{status: :ordered})
-    |> Repo.update!()
+    Inventory.list_user_draft_order(current_user.id)
+    |> Inventory.update_order(%{status: :ordered})
 
     {:noreply, socket}
   end
@@ -73,9 +47,21 @@ defmodule StoreWeb.OrderLive.Index do
     end
   end
 
-  defp draw_qr_code(order) do
-    Routes.admin_order_show_path(StoreWeb.Endpoint, :show, order.id)
-    |> QRCodeEx.encode()
-    |> QRCodeEx.svg(color: "#1F2937", width: 295, background_color: :transparent)
+  defp apply_action(socket, :edit, %{"id" => id}) do
+    socket
+    |> assign(:page_title, "Edit Order")
+    |> assign(:order, Inventory.get_order!(id, preloads: []))
+  end
+
+  defp apply_action(socket, :new, _params) do
+    socket
+    |> assign(:page_title, "New Order")
+    |> assign(:order, %Order{})
+  end
+
+  defp apply_action(socket, :index, _params) do
+    socket
+    |> assign(:page_title, "Listing Orders")
+    |> assign(:order, nil)
   end
 end
diff --git a/lib/store_web/live/order_live/index.html.heex b/lib/store_web/live/order_live/index.html.heex
index 952dd98..acecd43 100644
--- a/lib/store_web/live/order_live/index.html.heex
+++ b/lib/store_web/live/order_live/index.html.heex
@@ -24,15 +24,15 @@
                 <div class="flex flex-col items-center">
                   <dt class="font-semibold uppercase">Total amount</dt>
                   <%= if @current_user.partnership do %>
-                    <dd class="mt-1"><%= total_price_with_partnership(order) %> €</dd>
+                    <dd class="mt-1"><%= Inventory.total_price_with_partnership(order) %> €</dd>
                   <% else %>
-                    <dd class="mt-1"><%= total_price(order) %> €</dd>
+                    <dd class="mt-1"><%= Inventory.total_price(order) %> €</dd>
                   <% end %>
                 </div>
               </dl>
 
               <div class="flex lg:col-span-2 lg:flex lg:items-center lg:justify-end lg:space-x-4">
-                <%= draw_qr_code(order) |> raw %>
+                <%= Utils.draw_qr_code(order) |> raw %>
               </div>
             </div>
             <!-- Products -->
diff --git a/lib/store_web/live/order_live/show.ex b/lib/store_web/live/order_live/show.ex
index 7448455..d4f03b3 100644
--- a/lib/store_web/live/order_live/show.ex
+++ b/lib/store_web/live/order_live/show.ex
@@ -1,15 +1,22 @@
 defmodule StoreWeb.OrderLive.Show do
   use StoreWeb, :live_view
 
-  import Store.Inventory
-  alias Store.Repo
+  alias Store.Accounts
   alias Store.Inventory
   alias Store.Uploaders
-  alias Store.Accounts
+  alias Store.Utils
 
   @impl true
   def mount(%{"id" => id}, _session, socket) do
-    {:ok, assign(socket, order: Inventory.get_order!(id))}
+    order = Inventory.get_order!(id, preloads: [:products])
+
+    {:ok,
+     socket
+     |> assign(:order, order)
+     |> assign(:user_email, Accounts.get_user_email(order.user_id))
+     |> assign(:total_price, Inventory.total_price(order))
+     |> assign(:inserted_at, NaiveDateTime.to_string(order.inserted_at))
+     |> assign(:order_status, Utils.capitalize_status(order.status))}
   end
 
   @impl true
@@ -18,13 +25,13 @@ defmodule StoreWeb.OrderLive.Show do
      socket
      |> assign(:current_page, :orders)
      |> assign(:page_title, page_title(socket.assigns.live_action))
-     |> assign(:order, Inventory.get_order!(id) |> Repo.preload(:products))}
+     |> assign(:order, Inventory.get_order!(id, preloads: [:products]))}
   end
 
   @impl true
   def handle_event("canceled", _payload, socket) do
     order = socket.assigns.order
-    Inventory.update_status(order, %{status: :canceled})
+    Inventory.update_order(order, %{status: :canceled})
 
     {:noreply,
      socket
@@ -32,10 +39,6 @@ defmodule StoreWeb.OrderLive.Show do
      |> redirect(to: Routes.order_index_path(socket, :index))}
   end
 
-  defp user_email(id) do
-    Accounts.get_user!(id).email
-  end
-
   defp page_title(:show), do: "Show Order"
   defp page_title(:edit), do: "Edit Order"
 end
diff --git a/lib/store_web/live/order_live/show.html.heex b/lib/store_web/live/order_live/show.html.heex
index b4ecbfc..159b580 100644
--- a/lib/store_web/live/order_live/show.html.heex
+++ b/lib/store_web/live/order_live/show.html.heex
@@ -12,24 +12,23 @@
             <dl class="grid flex-1 grid-cols-2 gap-x-6 text-sm sm:col-span-3 sm:grid-cols-4 lg:col-span-2">
               <div>
                 <dt class="font-semibold uppercase">Order User</dt>
-                <dd class="mt-1"><%= user_email(@order.user_id) %></dd>
+                <dd class="mt-1"><%= @user_email %></dd>
               </div>
               <div class="hidden sm:block">
                 <dt class="font-semibold uppercase">Date placed</dt>
                 <dd class="mt-1">
-                  <time datetime=""><%= NaiveDateTime.to_string(@order.inserted_at) %></time>
+                  <time datetime=""><%= @inserted_at %></time>
                 </dd>
               </div>
               <div>
                 <dt class="font-semibold uppercase">Total amount</dt>
-                <dd class="mt-1 font-medium"><%= total_price(@order) %> €</dd>
+                <dd class="mt-1 font-medium"><%= @total_price %> €</dd>
               </div>
               <div>
                 <dt class="font-semibold uppercase">Status</dt>
-                <dd class="mt-1 font-medium"><%= capitalize_status(@order.status) %></dd>
+                <dd class="mt-1 font-medium"><%= @order_status %></dd>
               </div>
             </dl>
-            <!-- Add a button at the final at the grid -->
             <div class="hidden lg:col-span-2 lg:flex lg:items-center lg:justify-end lg:space-x-4">
               <%= if @order.status == :ordered do %>
                 <button
diff --git a/lib/store_web/live/product_live/form_component.ex b/lib/store_web/live/product_live/form_component.ex
index 7370fd2..a44b92a 100644
--- a/lib/store_web/live/product_live/form_component.ex
+++ b/lib/store_web/live/product_live/form_component.ex
@@ -2,9 +2,10 @@ defmodule StoreWeb.ProductLive.FormComponent do
   @moduledoc false
   use StoreWeb, :live_component
 
-  import Store.Inventory
+  alias Store.Accounts
+  alias Store.Inventory
   alias Store.Uploaders
-  import Store.Accounts
+  alias Store.Utils
 
   def mount(%{"id" => id}, _session, socket) do
     {:ok,
@@ -15,13 +16,13 @@ defmodule StoreWeb.ProductLive.FormComponent do
   def handle_params(%{"id" => id}, _, socket) do
     {:noreply,
      socket
-     |> assign(:product, get_product!(id, preloads: :order))
+     |> assign(:product, Inventory.get_product!(id, preloads: :order))
      |> assign(:current_page, :products)}
   end
 
   @impl true
   def update(%{product: product} = assigns, socket) do
-    changeset = change_product(product)
+    changeset = Inventory.change_product(product, %{})
 
     {:ok,
      socket
@@ -34,7 +35,7 @@ defmodule StoreWeb.ProductLive.FormComponent do
     product = socket.assigns.product
     user = socket.assigns.user
 
-    case purchase(user, product, product_params) do
+    case Inventory.purchase(user, product, product_params) do
       {:ok, _product} ->
         {:noreply,
          socket
@@ -68,6 +69,6 @@ defmodule StoreWeb.ProductLive.FormComponent do
   end
 
   defp orders_for_product(product_id) do
-    list_orders_for_product(product_id)
+    Inventory.list_orders_for_product(product_id)
   end
 end
diff --git a/lib/store_web/live/product_live/form_component.html.heex b/lib/store_web/live/product_live/form_component.html.heex
index e8f7725..3217969 100644
--- a/lib/store_web/live/product_live/form_component.html.heex
+++ b/lib/store_web/live/product_live/form_component.html.heex
@@ -181,10 +181,10 @@
                         <%= order_for_product.id %>
                       </td>
                       <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                        <%= get_email_by_user_id(order_for_product.order.user_id) %>
+                        <%= Accounts.get_email_by_user_id(order_for_product.order.user_id) %>
                       </td>
                       <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                        <%= capitalize_status(order_for_product.order.status) %>
+                        <%= Utils.capitalize_status(order_for_product.order.status) %>
                       </td>
                       <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
                         <%= order_for_product.size %>
diff --git a/priv/repo/migrations/20220919224505_create_order_products.exs b/priv/repo/migrations/20220919224505_create_order_products.exs
index c2317d9..9761625 100644
--- a/priv/repo/migrations/20220919224505_create_order_products.exs
+++ b/priv/repo/migrations/20220919224505_create_order_products.exs
@@ -6,6 +6,7 @@ defmodule Store.Repo.Migrations.OrdersAndProducts do
       add :id, :binary_id, primary_key: true
       add :order_id, references(:orders, on_delete: :nothing, type: :binary_id)
       add :product_id, references(:products, on_delete: :nothing, type: :binary_id)
+      add :price, :integer
       add :quantity, :integer, default: 1
       add :size, :string
       timestamps()
diff --git a/priv/repo/seeds/accounts.exs b/priv/repo/seeds/accounts.exs
index 5a0cf1b..2f9e112 100644
--- a/priv/repo/seeds/accounts.exs
+++ b/priv/repo/seeds/accounts.exs
@@ -55,6 +55,7 @@ defmodule Store.Repo.Seeds.Accounts do
     |> User.registration_changeset(attrs)
     |> Repo.insert!()
   end
+
 end
 
 Store.Repo.Seeds.Accounts.run()
diff --git a/priv/repo/seeds/inventory.exs b/priv/repo/seeds/inventory.exs
index c1d80cc..93f0652 100644
--- a/priv/repo/seeds/inventory.exs
+++ b/priv/repo/seeds/inventory.exs
@@ -1,7 +1,7 @@
 defmodule Store.Repo.Seeds.Inventory do
   alias Store.Repo
 
-  alias StoreWeb.Inventory.Product
+  alias Store.Inventory.Product
 
   def run do
     seed_products()
@@ -10,72 +10,26 @@ defmodule Store.Repo.Seeds.Inventory do
   def seed_products do
     case Repo.all(Product) do
       [] ->
-        [
-          %{
-            name: "Saco",
-            description: "É um saco",
-            price: 200,
-            price_partnership: 100,
-            stock: 3,
-            max_per_user: 1,
-            sizes: %{
-              xs_size: 1,
-              s_size: 1,
-              m_size: 1,
-              l_size: 1,
-              xl_size: 1,
-              xxl_size: 1
-            }
-          },
-          %{
-            name: "Caderno",
-            description: "É um caderno",
-            price: 200,
-            price_partnership: 100,
-            stock: 3,
-            max_per_user: 1,
-            sizes: %{
-              xs_size: 1,
-              s_size: 1,
-              m_size: 1,
-              l_size: 1,
-              xl_size: 1,
-              xxl_size: 1
-            }
-          },
-          %{
-            name: "Caneta",
-            description: "É uma caneta",
-            price: 200,
-            price_partnership: 100,
-            stock: 3,
-            max_per_user: 1,
-            sizes: %{
-              xs_size: 1,
-              s_size: 1,
-              m_size: 1,
-              l_size: 1,
-              xl_size: 1,
-              xxl_size: 1
-            }
-          },
+        for i <- 10..100 do
+
           %{
-            name: "Lápis",
-            description: "É um lápis",
-            price: 200,
-            price_partnership: 100,
-            stock: 3,
-            max_per_user: 1,
+            name: "Product #{i}",
+            description: "Product #{Enum.random(1..100)}",
+            price: Enum.random(1000..10000),
+            price_partnership: Enum.random(100..999),
+            stock: Enum.random(100..1000),
+            max_per_user: Enum.random(10..100),
+            pre_order: Enum.random([true, false]),
             sizes: %{
-              xs_size: 1,
-              s_size: 1,
-              m_size: 1,
-              l_size: 1,
-              xl_size: 1,
-              xxl_size: 1
+              xs_size: Enum.random(10..100),
+              s_size: Enum.random(10..100),
+              m_size: Enum.random(10..100),
+              l_size: Enum.random(10..100),
+              xl_size: Enum.random(10..100),
+              xxl_size: Enum.random(10..100),
             }
           }
-        ]
+        end
         |> Enum.each(&insert_product/1)
 
       _ ->
diff --git a/priv/repo/seeds/orders_products.exs b/priv/repo/seeds/orders_products.exs
index fed9c41..4865005 100644
--- a/priv/repo/seeds/orders_products.exs
+++ b/priv/repo/seeds/orders_products.exs
@@ -23,11 +23,14 @@ defmodule Store.Repo.Seeds.OrdersProducts do
 
     for _ <- 1..count do
       %{id: order_id} = Enum.random(orders)
-      %{id: product_id} = Enum.random(products)
+      product = Enum.random(products)
+      quantity = Enum.random(1..3)
       %{
         order_id: order_id,
-        product_id: product_id,
-        size: Enum.random(~w(XS S M L XL XXL)a)
+        product_id: product.id,
+        size: Enum.random(~w(XS S M L XL XXL)a),
+        quantity: quantity,
+        price: product.price * quantity,
       }
     end
   end
diff --git a/test/store/inventory_test.exs b/test/store/inventory_test.exs
index bad1de3..7a1304a 100644
--- a/test/store/inventory_test.exs
+++ b/test/store/inventory_test.exs
@@ -4,7 +4,7 @@ defmodule Store.InventoryTest do
   alias Store.Inventory
 
   describe "products" do
-    alias StoreWeb.Inventory.Product
+    alias Store.Inventory.Product
     import Store.InventoryFixtures
     import Store.AccountsFixtures
 
@@ -102,7 +102,7 @@ defmodule Store.InventoryTest do
 
     test "get_order!/1 returns the order with given id" do
       order = order_fixture()
-      assert Inventory.get_order!(order.id) == order
+      assert Inventory.get_order!(order.id, preloads: []) == order
     end
 
     test "create_order/1 with valid data creates a order" do
@@ -128,13 +128,13 @@ defmodule Store.InventoryTest do
     test "update_order/2 with invalid data returns error changeset" do
       order = order_fixture()
       assert {:error, %Ecto.Changeset{}} = Inventory.update_order(order, @invalid_attrs)
-      assert order == Inventory.get_order!(order.id)
+      assert order == Inventory.get_order!(order.id, preloads: [])
     end
 
     test "delete_order/1 deletes the order" do
       order = order_fixture()
       assert {:ok, %Order{}} = Inventory.delete_order(order)
-      assert_raise Ecto.NoResultsError, fn -> Inventory.get_order!(order.id) end
+      assert_raise Ecto.NoResultsError, fn -> Inventory.get_order!(order.id, preloads: []) end
     end
 
     test "change_order/1 returns a order changeset" do