diff --git a/app/frontend/src/javascript/components/store/order-actions.tsx b/app/frontend/src/javascript/components/store/order-actions.tsx
index e86c66839..0afdeea9a 100644
--- a/app/frontend/src/javascript/components/store/order-actions.tsx
+++ b/app/frontend/src/javascript/components/store/order-actions.tsx
@@ -100,7 +100,7 @@ export const OrderActions: React.FC<OrderActionsProps> = ({ order, onSuccess, on
 
   return (
     <>
-      {buildOptions.length > 0 &&
+      {buildOptions().length > 0 &&
         <Select
           options={buildOptions()}
           onChange={option => handleAction(option)}
diff --git a/app/models/notification_type.rb b/app/models/notification_type.rb
index 4d0fec54a..ed14b37be 100644
--- a/app/models/notification_type.rb
+++ b/app/models/notification_type.rb
@@ -71,6 +71,7 @@ class NotificationType
     notify_admin_user_proof_of_identity_refusal
     notify_user_order_is_ready
     notify_user_order_is_canceled
+    notify_user_order_is_refunded
   ]
   # deprecated:
   # - notify_member_subscribed_plan_is_changed
diff --git a/app/services/orders/order_refunded_service.rb b/app/services/orders/order_refunded_service.rb
index e69de29bb..0935ee1c0 100644
--- a/app/services/orders/order_refunded_service.rb
+++ b/app/services/orders/order_refunded_service.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# Provides methods for refund an order
+class Orders::OrderRefundedService
+  def call(order, current_user)
+    raise ::UpdateOrderStateError if %w[cart payment_error refunded delivered].include?(order.state)
+
+    order.state = 'refunded'
+    ActiveRecord::Base.transaction do
+      activity = order.order_activities.create(activity_type: 'refunded', operator_profile_id: current_user.invoicing_profile.id)
+      order.save
+      NotificationCenter.call type: 'notify_user_order_is_refunded',
+                              receiver: order.statistic_profile.user,
+                              attached_object: activity
+    end
+    order.reload
+  end
+end
diff --git a/app/services/orders/order_service.rb b/app/services/orders/order_service.rb
index c801bbb63..622acade9 100644
--- a/app/services/orders/order_service.rb
+++ b/app/services/orders/order_service.rb
@@ -48,6 +48,7 @@ class Orders::OrderService
     return ::Orders::OrderReadyService.new.call(order, current_user, note) if state == 'ready'
     return ::Orders::OrderCanceledService.new.call(order, current_user) if state == 'canceled'
     return ::Orders::OrderDeliveredService.new.call(order, current_user) if state == 'delivered'
+    return ::Orders::OrderRefundedService.new.call(order, current_user) if state == 'refunded'
   end
 
   def in_stock?(order, stock_type = 'external')
diff --git a/app/views/api/notifications/_notify_user_order_is_refunded.json.jbuilder b/app/views/api/notifications/_notify_user_order_is_refunded.json.jbuilder
new file mode 100644
index 000000000..832b8604b
--- /dev/null
+++ b/app/views/api/notifications/_notify_user_order_is_refunded.json.jbuilder
@@ -0,0 +1,2 @@
+json.title notification.notification_type
+json.description t('.order_refunded', REFERENCE: notification.attached_object.order.reference)
diff --git a/app/views/notifications_mailer/notify_user_order_is_refunded.erb b/app/views/notifications_mailer/notify_user_order_is_refunded.erb
new file mode 100644
index 000000000..1f4f74271
--- /dev/null
+++ b/app/views/notifications_mailer/notify_user_order_is_refunded.erb
@@ -0,0 +1,5 @@
+<%= render 'notifications_mailer/shared/hello', recipient: @recipient %>
+
+<p>
+  <%= t('.body.notify_user_order_is_refunded', REFERENCE: @attached_object.order.reference) %>
+</p>
diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml
index dc6adc2b6..263d061ff 100644
--- a/config/locales/app.shared.en.yml
+++ b/config/locales/app.shared.en.yml
@@ -628,6 +628,8 @@ en:
           order_delivered_success: "Order is delivered"
           confirm_order_canceled: "Do you want to cancel this order ? You can modify product stock in stock manage."
           order_canceled_success: "Order is canceled"
+          confirm_order_refunded: "Do you want to refund this order ? You can modify product stock in stock manage."
+          order_refunded_success: "Order is refunded"
       unsaved_form_alert:
         modal_title: "You have some unsaved changes"
         confirmation_message: "If you leave this page, your changes will be lost. Are you sure you want to continue?"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0eb43b7f7..432dbe0af 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -411,6 +411,8 @@ en:
         order_ready: "Your command %{REFERENCE} is ready"
       notify_user_order_is_canceled:
         order_canceled: "Your command %{REFERENCE} is canceled"
+      notify_user_order_is_refunded:
+        order_refunded: "Your command %{REFERENCE} is refunded"
   #statistics tools for admins
   statistics:
     subscriptions: "Subscriptions"
diff --git a/config/locales/mails.en.yml b/config/locales/mails.en.yml
index 8040a7ef8..c438ef62d 100644
--- a/config/locales/mails.en.yml
+++ b/config/locales/mails.en.yml
@@ -381,4 +381,8 @@ en:
     notify_user_order_is_canceled:
       subject: "Your command is canceled"
       body:
-        notify_user_order_is_canceled: "Your command %{REFERENCE} is canceled:"
+        notify_user_order_is_canceled: "Your command %{REFERENCE} is canceled."
+    notify_user_order_is_refunded:
+      subject: "Your command is refunded"
+      body:
+        notify_user_order_is_refunded: "Your command %{REFERENCE} is refunded:"