From 5e7bfc05d20802d4ae7832c80d837b1b374fa79c Mon Sep 17 00:00:00 2001 From: binarygit Date: Wed, 6 Jul 2022 15:13:13 +0545 Subject: [PATCH] Remove link from order number in open/past orders table --- app/views/spree/users/_open_orders.html.haml | 3 +-- app/views/spree/users/_past_orders.html.haml | 3 +-- spec/system/consumer/account_spec.rb | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/views/spree/users/_open_orders.html.haml b/app/views/spree/users/_open_orders.html.haml index 45f1426cb3..7b45058b2f 100644 --- a/app/views/spree/users/_open_orders.html.haml +++ b/app/views/spree/users/_open_orders.html.haml @@ -11,8 +11,7 @@ %th.order7.show-for-large-up.text-right= t('.cancel') %tbody.transaction-group{"ng-repeat" => "order in Orders.changeable", "ng-class-odd"=>"'odd'", "ng-class-even"=>"'even'"} %tr.order-row - %td.order1 - %a{"ng-href" => "{{::order.path}}", "ng-bind" => "::order.number"} + %td.order1{"ng-bind" => "::order.number"} %td.order2 %a{"ng-href" => "{{::Orders.shopsByID[order.shop_id].hash}}#{main_app.shop_path}", "ng-bind" => "::Orders.shopsByID[order.shop_id].name"} %td.order3.show-for-large-up{"ng-bind" => "::order.changes_allowed_until"} diff --git a/app/views/spree/users/_past_orders.html.haml b/app/views/spree/users/_past_orders.html.haml index 4ded53858d..903baf853c 100644 --- a/app/views/spree/users/_past_orders.html.haml +++ b/app/views/spree/users/_past_orders.html.haml @@ -11,8 +11,7 @@ %th.order7.text-right= t('.view') %tbody.transaction-group{"ng-repeat" => "order in Orders.all | filter:{changes_allowed:false} as pastOrders", "ng-class-odd"=>"'odd'", "ng-class-even"=>"'even'"} %tr.order-row - %td.order1 - %a{"ng-href" => "{{::order.path}}", "ng-bind" => "::order.number"} + %td.order1{"ng-bind" => "::order.number"} %td.order2 %a{"ng-href" => "{{::Orders.shopsByID[order.shop_id].hash}}#{main_app.shop_path}", "ng-bind" => "::Orders.shopsByID[order.shop_id].name"} %td.order3.show-for-large-up{"ng-bind" => "::order.completed_at"} diff --git a/spec/system/consumer/account_spec.rb b/spec/system/consumer/account_spec.rb index f108006c6f..9e8f89b37a 100644 --- a/spec/system/consumer/account_spec.rb +++ b/spec/system/consumer/account_spec.rb @@ -93,8 +93,8 @@ describe ' visit '/account' expect(page).to have_content I18n.t('spree.users.orders.open_orders') - expect(page).to have_link d1o1.number, href: order_path(d1o1) - expect(page).to have_link d1o2.number, href: order_path(d1o2) + expect(page).to have_link 'Edit', href: order_path(d1o1) + expect(page).to have_link 'Edit', href: order_path(d1o2) expect(page).to have_link(distributor1.name, href: "#{distributor1.permalink}/shop", count: 2) expect(page).to have_link I18n.t('spree.users.open_orders.cancel'),