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

Merge branch 'registry-765' into registry-623

Browse source
This commit is contained in:
Artur Beljajev 2018-03-10 13:28:39 +02:00
commit f1fb17a42c
8 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Gemfile.lock
View file

@ -301,12 +301,12 @@ GEM
erubis
que (~> 0.8)
sinatra
rack (1.6.8)
rack (1.6.9)
rack-accept (0.4.5)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-protection (1.5.3)
rack-protection (1.5.5)
rack
rack-test (0.6.3)
rack (>= 1.0)

1
app/controllers/admin/registrars_controller.rb
View file

@ -60,7 +60,6 @@ module Admin
:city,
:state,
:zip,
:billing_address,
:country_code,
:email,
:phone,

4
app/views/admin/registrars/show.html.erb
View file

@ -119,10 +119,10 @@
<%= @registrar.email %>
</dd>
<dt>
<%= t(:billing_address) %>
<%= t(:billing_email) %>
</dt>
<dd>
<%= @registrar.billing_address %>
<%= @registrar.billing_email %>
</dd>
</dl>
</div>

3
config/locales/en.yml
View file

@ -19,7 +19,6 @@ en:
time:
formats:
default: "%Y-%m-%d %H:%M"
longer: "%a, %e. %b %Y, %H:%M"
long: "%A, %e. %B %Y, %H:%M"
short: "%d.%m.%y, %H:%M"
date: "%Y-%m-%d"
@ -28,7 +27,6 @@ en:
date:
formats:
default: "%Y-%m-%d"
year_and_month: "%Y %B"
activerecord:
errors:
@ -388,7 +386,6 @@ en:
choose: 'Choose...'
created_before: 'Created before'
created_after: 'Created after'
billing_address: 'Billing address'
billing_email: 'Billing e-mail'
contact_phone: 'Contact phone'
contact_email: 'Contact e-mail'

5
db/migrate/20180308123240_remove_registrar_billing_address.rb Normal file
View file

@ -0,0 +1,5 @@
class RemoveRegistrarBillingAddress < ActiveRecord::Migration
def change
remove_column :registrars, :billing_address
end
end

3
db/structure.sql
View file

@ -2139,7 +2139,6 @@ CREATE TABLE registrars (
name character varying NOT NULL,
reg_no character varying NOT NULL,
vat_no character varying,
billing_address character varying,
created_at timestamp without time zone,
updated_at timestamp without time zone,
creator_str character varying,
@ -4706,6 +4705,8 @@ INSERT INTO schema_migrations (version) VALUES ('20180306183540');
INSERT INTO schema_migrations (version) VALUES ('20180306183549');
INSERT INTO schema_migrations (version) VALUES ('20180308123240');
INSERT INTO schema_migrations (version) VALUES ('20180309053424');
INSERT INTO schema_migrations (version) VALUES ('20180309053921');

1
doc/models_complete.svg
View file

@ -1475,7 +1475,6 @@
<text text-anchor="start" x="1600.5" y="-2624.3" font-family="Times,serif" font-size="14.00">name :string</text>
<text text-anchor="start" x="1600.5" y="-2609.3" font-family="Times,serif" font-size="14.00">reg_no :string</text>
<text text-anchor="start" x="1600.5" y="-2594.3" font-family="Times,serif" font-size="14.00">vat_no :string</text>
<text text-anchor="start" x="1600.5" y="-2579.3" font-family="Times,serif" font-size="14.00">billing_address :string</text>
<text text-anchor="start" x="1600.5" y="-2564.3" font-family="Times,serif" font-size="14.00">created_at :datetime</text>
<text text-anchor="start" x="1600.5" y="-2549.3" font-family="Times,serif" font-size="14.00">updated_at :datetime</text>
<text text-anchor="start" x="1600.5" y="-2534.3" font-family="Times,serif" font-size="14.00">creator_str :string</text>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 220 KiB

After

Width:  |  Height:  |  Size: 220 KiB

Before After
Before After

1
lib/tasks/import.rake
View file

@ -77,7 +77,6 @@ namespace :import do
name: x.organization.try(:strip).presence || x.name.try(:strip).presence || x.handle.try(:strip).presence,
reg_no: x.ico.try(:strip),
vat_no: x.dic.try(:strip),
billing_address: nil,
phone: x.telephone.try(:strip),
email: x.email.try(:strip),
billing_email: x.billing_address.try(:strip),