zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 17:59:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Show specific error on invoice generation in admin #2802

Browse source
This commit is contained in:
Martin Lensment 2015-07-31 16:30:38 +03:00
parent 0f652aedc1
commit 9f42784d33
6 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/invoices_controller.rb
View file

@ -12,7 +12,7 @@ class Admin::InvoicesController < AdminController
@deposit = Deposit.new(deposit_params.merge(registrar: r)) @deposit = Deposit.new(deposit_params.merge(registrar: r))
@invoice = @deposit.issue_prepayment_invoice @invoice = @deposit.issue_prepayment_invoice
if @invoice.persisted? if @invoice && @invoice.persisted?
flash[:notice] = t(:record_created) flash[:notice] = t(:record_created)
redirect_to [:admin, @invoice] redirect_to [:admin, @invoice]
else else

2
app/controllers/registrar/deposits_controller.rb
View file

@ -9,7 +9,7 @@ class Registrar::DepositsController < RegistrarController
@deposit = Deposit.new(deposit_params.merge(registrar: current_user.registrar)) @deposit = Deposit.new(deposit_params.merge(registrar: current_user.registrar))
@invoice = @deposit.issue_prepayment_invoice @invoice = @deposit.issue_prepayment_invoice
if @invoice.persisted? if @invoice && @invoice.persisted?
flash[:notice] = t(:please_pay_the_following_invoice) flash[:notice] = t(:please_pay_the_following_invoice)
redirect_to [:registrar, @invoice] redirect_to [:registrar, @invoice]
else else

2
app/models/invoice.rb
View file

@ -29,7 +29,7 @@ class Invoice < ActiveRecord::Base
return if number <= Setting.invoice_number_max.to_i return if number <= Setting.invoice_number_max.to_i
errors.add(:base, I18n.t('failed_to_generate_invoice')) errors.add(:base, I18n.t('failed_to_generate_invoice_invoice_number_limit_reached'))
logger.error('INVOICE NUMBER LIMIT REACHED, COULD NOT GENERATE INVOICE') logger.error('INVOICE NUMBER LIMIT REACHED, COULD NOT GENERATE INVOICE')
false false
end end

1
app/views/admin/invoices/index.haml
View file

@ -1,7 +1,6 @@
- content_for :actions do - content_for :actions do
= link_to(t(:add), new_admin_invoice_path, class: 'btn btn-primary') = link_to(t(:add), new_admin_invoice_path, class: 'btn btn-primary')
= render 'shared/title', name: t(:invoices) = render 'shared/title', name: t(:invoices)
.row .row
.col-md-12 .col-md-12
.table-responsive .table-responsive

3
app/views/admin/invoices/new.haml
View file

@ -4,7 +4,8 @@
= form_for([:admin, @deposit], url: admin_invoices_path, method: :post, html: { class: 'form-horizontal' }) do |f| = form_for([:admin, @deposit], url: admin_invoices_path, method: :post, html: { class: 'form-horizontal' }) do |f|
= render 'shared/full_errors', object: @deposit = render 'shared/full_errors', object: @deposit
- if @invoice
= render 'shared/full_errors', object: @invoice
.row .row
.col-md-8 .col-md-8
.form-group .form-group

1
config/locales/en.yml
View file

@ -893,3 +893,4 @@ en:
results_per_page: 'Results per page' results_per_page: 'Results per page'
nameserver_hostname: 'Nameserver hostname' nameserver_hostname: 'Nameserver hostname'
result_count: '%{count} results' result_count: '%{count} results'
failed_to_generate_invoice_invoice_number_limit_reached: 'Failed to generate invoice - invoice number limit reached'