From 9733bb3a7755ccfd0c52563204a96d8d98b95afd Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Fri, 26 May 2017 17:25:10 +1000 Subject: [PATCH] Renaming account#history to account#transactions --- .../users/{_history.html.haml => _transactions.html.haml} | 2 +- app/views/spree/users/show.html.haml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename app/views/spree/users/{_history.html.haml => _transactions.html.haml} (90%) diff --git a/app/views/spree/users/_history.html.haml b/app/views/spree/users/_transactions.html.haml similarity index 90% rename from app/views/spree/users/_history.html.haml rename to app/views/spree/users/_transactions.html.haml index 77ab67e74f..4006a72b50 100644 --- a/app/views/spree/users/_history.html.haml +++ b/app/views/spree/users/_transactions.html.haml @@ -1,4 +1,4 @@ -%script{ type: "text/ng-template", id: "account/history.html" } +%script{ type: "text/ng-template", id: "account/transactions.html" } .active_table.orders{"ng-controller" => "OrdersCtrl", "ng-cloak" => true} %h3.my-orders= t(:transaction_history) %distributor.active_table_node.row.animate-repeat{"ng-if" => "Orders.orders_by_distributor.length > 0", "ng-repeat" => "(key, distributor) in Orders.orders_by_distributor", diff --git a/app/views/spree/users/show.html.haml b/app/views/spree/users/show.html.haml index c7e685239c..c3e40708b8 100644 --- a/app/views/spree/users/show.html.haml +++ b/app/views/spree/users/show.html.haml @@ -15,7 +15,7 @@ = render 'orders' = render 'cards' - = render 'history' + = render 'transactions' = render 'cards' .row.tabset-ctrl#account-tabs{ style: 'margin-bottom: 100px', navigate: 'true', selected: 'orders', prefix: 'account' } @@ -23,7 +23,7 @@ %a{ href: 'javascript:void(0)' }=t('.tabs.orders') .small.12.medium-3.columns.tab{ name: "cards" } %a{ href: 'javascript:void(0)' }=t('.tabs.cards') - .small.12.medium-3.columns.tab{ name: "history" } + .small.12.medium-3.columns.tab{ name: "transactions" } %a{ href: 'javascript:void(0)' }=t('.tabs.transactions') .small.12.medium-3.columns.tab{ name: "details" } %a{ href: 'javascript:void(0)' }=t('.tabs.details')