diff --git a/app/frontend/src/javascript/components/store/order-item.tsx b/app/frontend/src/javascript/components/store/order-item.tsx index 513d6e868..b1afd5bbf 100644 --- a/app/frontend/src/javascript/components/store/order-item.tsx +++ b/app/frontend/src/javascript/components/store/order-item.tsx @@ -50,7 +50,7 @@ export const OrderItem: React.FC = ({ order, currentUser }) => {

{FormatLib.date(order.created_at)}

{t('app.shared.store.order_item.total')} -

{FormatLib.price(order?.paid_total)}

+

{FormatLib.price(order.state === 'cart' ? order.total : order.paid_total)}

showOrder(order)} icon={} className="is-black" /> diff --git a/app/frontend/src/javascript/components/store/show-order.tsx b/app/frontend/src/javascript/components/store/show-order.tsx index eff12c5e2..0e84cae01 100644 --- a/app/frontend/src/javascript/components/store/show-order.tsx +++ b/app/frontend/src/javascript/components/store/show-order.tsx @@ -147,7 +147,7 @@ export const ShowOrder: React.FC = ({ orderId, currentUser, onEr {isPrivileged() && order.user &&
{t('app.shared.store.show_order.client')} -

order.user.name

+

{order.user.name}

}
diff --git a/app/frontend/src/javascript/controllers/admin/orders.js b/app/frontend/src/javascript/controllers/admin/orders.js index ba2b00cce..fb28f9465 100644 --- a/app/frontend/src/javascript/controllers/admin/orders.js +++ b/app/frontend/src/javascript/controllers/admin/orders.js @@ -9,7 +9,7 @@ Application.Controllers.controller('AdminShowOrdersController', ['$rootScope', ' /* PRIVATE SCOPE */ /* PUBLIC SCOPE */ - $scope.orderToken = $transition$.params().token; + $scope.orderId = $transition$.params().id; /** * Callback triggered in case of error diff --git a/app/frontend/templates/admin/orders/show.html b/app/frontend/templates/admin/orders/show.html index e2274ce0c..289a14aaa 100644 --- a/app/frontend/templates/admin/orders/show.html +++ b/app/frontend/templates/admin/orders/show.html @@ -15,5 +15,5 @@ {{ 'app.admin.store.back_to_list' }}
- - \ No newline at end of file + + diff --git a/app/services/orders/order_service.rb b/app/services/orders/order_service.rb index da86f15f3..184d79987 100644 --- a/app/services/orders/order_service.rb +++ b/app/services/orders/order_service.rb @@ -15,6 +15,8 @@ class Orders::OrderService orders = orders.where(statistic_profile_id: statistic_profile_id) elsif current_user.member? orders = orders.where(statistic_profile_id: current_user.statistic_profile.id) + else + orders = orders.where.not(statistic_profile_id: nil) end orders = orders.where.not(state: 'cart') if current_user.member? orders = orders.order(created_at: filters[:page].present? ? filters[:sort] : 'DESC')