diff --git a/app/assets/stylesheets/admin/orders.css.scss b/app/assets/stylesheets/admin/orders.css.scss index 33c5a4a3e8..0955d9fd46 100644 --- a/app/assets/stylesheets/admin/orders.css.scss +++ b/app/assets/stylesheets/admin/orders.css.scss @@ -91,3 +91,15 @@ th.actions { table.index td.actions { text-align: left; } + +.orders-loading { + margin-top: 1em; + + img { + width: 85px; + } + + span { + font-size: 1.2em; + } +} diff --git a/app/views/spree/admin/orders/index.html.haml b/app/views/spree/admin/orders/index.html.haml index 35c0ad5009..1191846869 100644 --- a/app/views/spree/admin/orders/index.html.haml +++ b/app/views/spree/admin/orders/index.html.haml @@ -101,6 +101,14 @@ %div{'ng-if' => 'order.pending_payments'} %a.icon-capture.icon_link.no-text{'ng-href' => '{{::order.capture_path}}', 'data-action' => 'capture', 'data-method' => 'put', rel: 'nofollow', 'ofn-with-tip' => t(:capture)} +.orders-loading{'ng-show' => 'RequestMonitor.loading'} + .row + .small-12.columns.fullwidth.text-center + %img.spinner{ src: "/assets/spinning-circles.svg" } + .row + .small-12.columns.fullwidth.text-center + %span= t(:loading) + %div{'ng-show' => "!RequestMonitor.loading && orders.length > 0" } = render partial: 'angular_pagination' diff --git a/config/locales/en.yml b/config/locales/en.yml index 16a85986b1..e0a9863c03 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -622,6 +622,7 @@ en: last: "Last" previous: "Previous" next: "Next" + loading: "Loading" invoice_email_sent: 'Invoice email has been sent' order_email_resent: 'Order email has been resent' bulk_management: