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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fixed gift card batch form and added specs
Damian Legawiec00945eee6527
diff --git a/admin/app/views/spree/admin/gift_card_batches/_form.html.erb b/admin/app/views/spree/admin/gift_card_batches/_form.html.erbindex c89984044d..6f7bd522cc 100644--- a/admin/app/views/spree/admin/gift_card_batches/_form.html.erb+++ b/admin/app/views/spree/admin/gift_card_batches/_form.html.erb@@ -1,34 +1,30 @@-<div class="row">- <div class="col-lg-6 offset-lg-3">- <div class="card mb-4">- <div class="card-header">- <h5 class="card-title">- <%= Spree.t(:gift_card_batch) %>- </h5>- </div>+<div class="card mb-4">+ <div class="card-header">+ <h5 class="card-title">+ <%= Spree.t(:gift_card_batch) %>+ </h5>+ </div>- <div class="card-body">- <div class="form-group">- <%= f.label :prefix, raw(Spree.t('admin.gift_card_batches.prefix') + required_span_tag)%>- <%= f.text_field :prefix, class: 'form-control', disabled: f.object.persisted? %>- <%= f.error_message_on :prefix %>- </div>- <div class="form-group">- <%= f.label :amount, raw(Spree.t(:amount) + required_span_tag) %>- <%= f.number_field :amount, class: 'form-control', disabled: f.object.persisted?, required: true %>- <%= f.error_message_on :amount %>- </div>- <div class="form-group">- <%= f.label :codes_count, raw(Spree.t('admin.gift_card_batches.codes_count') + required_span_tag) %>- <%= f.number_field :codes_count, class: 'form-control', disabled: f.object.persisted?, required: true, min: 1, max: Spree::Config[:gift_card_batch_limit] %>- <%= f.error_message_on :codes_count %>- </div>- <div class="form-group">- <%= f.label :expires_at, Spree.t(:expires_at) %>- <%= f.date_field :expires_at, class: 'form-control', disabled: f.object.persisted? %>- <%= f.error_message_on :expires_at %>- </div>- </div>+ <div class="card-body">+ <div class="form-group">+ <%= f.label :prefix, raw(Spree.t('admin.gift_card_batches.prefix') + required_span_tag)%>+ <%= f.text_field :prefix, class: 'form-control', disabled: f.object.persisted? %>+ <%= f.error_message_on :prefix %>+ </div>+ <div class="form-group">+ <%= f.label :amount, raw(Spree.t(:amount) + required_span_tag) %>+ <%= f.number_field :amount, class: 'form-control', disabled: f.object.persisted?, required: true %>+ <%= f.error_message_on :amount %>+ </div>+ <div class="form-group">+ <%= f.label :codes_count, raw(Spree.t('admin.gift_card_batches.codes_count') + required_span_tag) %>+ <%= f.number_field :codes_count, class: 'form-control', disabled: f.object.persisted?, required: true, min: 1, max: Spree::Config[:gift_card_batch_limit] %>+ <%= f.error_message_on :codes_count %>+ </div>+ <div class="form-group">+ <%= f.label :expires_at, Spree.t(:expires_at) %>+ <%= f.date_field :expires_at, class: 'form-control', disabled: f.object.persisted? %>+ <%= f.error_message_on :expires_at %></div></div></div>diff --git a/admin/app/views/spree/admin/gift_card_batches/new.html.erb b/admin/app/views/spree/admin/gift_card_batches/new.html.erbindex ff8406e5b9..8045f704cf 100644--- a/admin/app/views/spree/admin/gift_card_batches/new.html.erb+++ b/admin/app/views/spree/admin/gift_card_batches/new.html.erb@@ -3,12 +3,13 @@<%= Spree.t('admin.gift_card_batches.new_gift_card_batch') %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>-<%= form_for [:admin, @object] do |f| %>- <fieldset>- <%= render 'form', f: f %>+ <div class="row">+ <div class="col-lg-6 offset-lg-3">+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>- <%= render 'spree/admin/shared/new_resource_links' %>- </fieldset>+ <%= render 'form', f: f %>+ <%= render 'spree/admin/shared/new_resource_links' %>+ </div>+ </div><% end %>diff --git a/admin/spec/controllers/spree/admin/gift_card_batches_controller_spec.rb b/admin/spec/controllers/spree/admin/gift_card_batches_controller_spec.rbnew file mode 100644index 0000000000..94827a3e51--- /dev/null+++ b/admin/spec/controllers/spree/admin/gift_card_batches_controller_spec.rb@@ -0,0 +1,88 @@+require 'spec_helper'++describe Spree::Admin::GiftCardBatchesController, type: :controller do+ stub_authorization!+ render_views++ let(:store) { @default_store }++ describe '#new' do+ subject { get :new }++ it 'renders the new template' do+ subject+ expect(response).to render_template(:new)+ expect(response).to have_http_status(:ok)+ end++ it 'assigns a new gift card batch' do+ subject+ expect(assigns(:object)).to be_a_new(Spree::GiftCardBatch)+ end+ end++ describe '#create' do+ let(:valid_params) do+ {+ gift_card_batch: {+ prefix: 'BATCH001',+ amount: 10,+ currency: 'USD',+ codes_count: 20,+ expires_at: 1.year.from_now.to_date+ }+ }+ end++ subject { post :create, params: valid_params }++ context 'with valid parameters' do+ it 'creates a new gift card batch' do+ expect { subject }.to change(Spree::GiftCardBatch, :count).by(1)++ gift_card_batch = Spree::GiftCardBatch.last+ expect(gift_card_batch.prefix).to eq('BATCH001')+ expect(gift_card_batch.amount).to eq(10)+ expect(gift_card_batch.currency).to eq('USD')+ expect(gift_card_batch.codes_count).to eq(20)+ expect(gift_card_batch.expires_at).to eq(1.year.from_now.to_date)+ expect(gift_card_batch.store).to eq(store)++ expect(gift_card_batch.gift_cards.count).to eq(20)+ end++ it 'redirects to the gift cards index with batch filter' do+ subject+ expect(response).to redirect_to(spree.admin_gift_cards_path(q: { batch_prefix_eq: 'BATCH001' }))+ end++ it 'sets a success flash message' do+ subject+ expect(flash[:success]).to be_present+ end+ end++ context 'with invalid parameters' do+ let(:invalid_params) do+ {+ gift_card_batch: {+ amount: -100,+ currency: 'USD'+ }+ }+ end++ subject { post :create, params: invalid_params }++ it 'does not create a gift card batch' do+ expect { subject }.not_to change(Spree::GiftCardBatch, :count)+ end++ it 'renders the new template' do+ subject+ expect(response).to render_template(:new)+ expect(response).to have_http_status(:unprocessable_entity)+ end+ end+ end+end