Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

SD-1371 fix show only current store's store credits in Admin UI

Damian Legawiec8340c6cccafc
diff --git a/backend/app/controllers/spree/admin/store_credits_controller.rb b/backend/app/controllers/spree/admin/store_credits_controller.rb
index 82ff262faa..f6291237ce 100644
--- a/backend/app/controllers/spree/admin/store_credits_controller.rb
+++ b/backend/app/controllers/spree/admin/store_credits_controller.rb
@@ -9,7 +9,7 @@ module Spree
before_action :ensure_unused_store_credit, only: [:update]
def index
- @store_credits = @user.store_credits.includes(:credit_type, :category).reverse_order
+ @store_credits = @user.store_credits.for_store(current_store).includes(:credit_type, :category).reverse_order
end
def create
@@ -46,7 +46,7 @@ module Spree
end
def destroy
- @store_credit = @user.store_credits.find(params[:id])
+ @store_credit = @user.store_credits.for_store(current_store).find(params[:id])
ensure_unused_store_credit
if @store_credit.destroy
@@ -82,7 +82,11 @@ module Spree
end
def load_store_credit
- @store_credit = Spree::StoreCredit.find_by(id: params[:id]) || Spree::StoreCredit.new
+ @store_credit = scope.find_by(id: params[:id]) || scope.new
+ end
+
+ def scope
+ current_store.store_credits
end
def ensure_unused_store_credit
diff --git a/backend/spec/controllers/spree/admin/store_credits_controller_spec.rb b/backend/spec/controllers/spree/admin/store_credits_controller_spec.rb
index 8315aa44e0..7935fa07e8 100644
--- a/backend/spec/controllers/spree/admin/store_credits_controller_spec.rb
+++ b/backend/spec/controllers/spree/admin/store_credits_controller_spec.rb
@@ -5,14 +5,15 @@ module Spree
describe StoreCreditsController, type: :controller do
stub_authorization!
+ let(:store) { Spree::Store.default }
let(:user) { create(:user) }
describe '#index' do
- let!(:store_credit_1) { create(:store_credit, user: user) }
- let!(:store_credit_2) { create(:store_credit, user: user, amount_used: 10) }
- let!(:store_credit_3) { create(:store_credit) }
+ let!(:store_credit_1) { create(:store_credit, user: user, store: store) }
+ let!(:store_credit_2) { create(:store_credit, user: user, amount_used: 10, store: store) }
+ let!(:store_credit_3) { create(:store_credit, user: user) }
- it 'should assign only the store credits for user' do
+ it 'should assign only the store credits for user and current store' do
get :index, params: { user_id: user.id }
expect(assigns(:store_credits)).to include store_credit_1
expect(assigns(:store_credits)).to include store_credit_2
@@ -26,7 +27,7 @@ module Spree
end
context 'will successfully destroy store credit' do
- let(:store_credit_to_destroy) { create(:store_credit, user: user) }
+ let(:store_credit_to_destroy) { create(:store_credit, user: user, store: store) }
describe 'returns response' do
before { send_request }
@@ -43,8 +44,14 @@ module Spree
it { expect { send_request }.to raise_error(ActiveRecord::RecordNotFound) }
end
+ context 'cannot destroy store credit from another store' do
+ let(:store_credit_to_destroy) { create(:store_credit, user: user, store:create(:store)) }
+
+ it { expect { send_request }.to raise_error(ActiveRecord::RecordNotFound) }
+ end
+
context 'cannot destroy store credit with used amount' do
- let(:store_credit_to_destroy) { create(:store_credit, user: user, amount_used: 10) }
+ let(:store_credit_to_destroy) { create(:store_credit, store: store, user: user, amount_used: 10) }
it { expect { send_request }.to raise_error(Spree::Admin::StoreCreditError) }
end
diff --git a/backend/spec/features/admin/store_credits_spec.rb b/backend/spec/features/admin/store_credits_spec.rb
index 4f800122a2..3a9f621b6a 100644
--- a/backend/spec/features/admin/store_credits_spec.rb
+++ b/backend/spec/features/admin/store_credits_spec.rb
@@ -3,8 +3,9 @@ require 'spec_helper'
describe 'Store credits admin', type: :feature do
stub_authorization!
+ let(:store) { Spree::Store.default }
let!(:admin_user) { create(:admin_user) }
- let!(:store_credit) { create(:store_credit) }
+ let!(:store_credit) { create(:store_credit, store: store) }
before do
allow(Spree.user_class).to receive(:find_by).and_return(store_credit.user)