Commit graph

5978 commits

Author SHA1 Message Date
Artur Beljajev
837f326ef6 Merge branch 'master' into registry-623
# Conflicts:
#	app/controllers/admin/registrars_controller.rb
#	app/models/registrar.rb
#	app/views/admin/registrars/_billing.html.erb
#	app/views/admin/registrars/show.html.erb
#	config/locales/admin/registrars.en.yml
#	config/locales/en.yml
#	db/migrate/20180309053424_add_registrars_unique_constraints.rb
#	db/structure.sql
#	test/fixtures/registrars.yml
#	test/integration/admin/registrars/delete_test.rb
#	test/integration/admin/registrars/new_test.rb
#	test/models/registrar_test.rb
2018-03-29 12:13:59 +03:00
Timo Võhmar
d501ee90e0
Merge pull request #761 from internetee/registry-642
Do not check IP in bank link callback URL
2018-03-28 13:17:29 +03:00
Timo Võhmar
7cff2bb4cf
Merge pull request #770 from internetee/registry-765
Refactor registrars
2018-03-28 11:47:40 +03:00
Timo Võhmar
1d2f8ca45d
Merge pull request #779 from internetee/registry-759
Disable spell checking globally
2018-03-27 17:29:20 +03:00
Timo Võhmar
de5979790f
Merge pull request #783 from internetee/update-loofah-gem
Update loofah gem
2018-03-27 12:43:27 +03:00
Artur Beljajev
0f6a47d73d Refactor registrars
#765
2018-03-26 07:00:54 +03:00
Artur Beljajev
e0de0943f5 Update loofah gem 2018-03-23 16:32:05 +02:00
Timo Võhmar
cee51e1ac5
Merge pull request #777 from internetee/registry-776
Drop uniqueness validation
2018-03-19 14:08:03 +02:00
Timo Võhmar
a04aa96724
Merge pull request #778 from internetee/Changelog_update_180319
Changelog update 180319
2018-03-19 11:04:03 +02:00
Artur Beljajev
f2e8bebab2 Disable spell checking globally
#759
2018-03-18 01:41:29 +02:00
Timo Võhmar
7e018265b1
Changelog update 180306 2018-03-16 13:40:08 +02:00
Artur Beljajev
7266662fac Drop uniqueness validation
#776
2018-03-15 17:01:37 +02:00
Artur Beljajev
69d0a20115 Fix tests
#623
2018-03-14 23:53:53 +02:00
Artur Beljajev
f8088df798 Fix tests
#623
2018-03-14 23:26:54 +02:00
Artur Beljajev
169c67839e Add "VATCode" and "TotalVAT" fields to Directo
#623
2018-03-14 14:48:20 +02:00
Artur Beljajev
1107dc67b8 Simplify method
#623
2018-03-14 14:30:20 +02:00
Artur Beljajev
094c06bee7 Fix directo
#623
2018-03-14 12:58:49 +02:00
Artur Beljajev
e1b0f3044e Fix invoice
#623
2018-03-14 12:19:44 +02:00
Artur Beljajev
fb35ec5cbb Require invoices.total
#623
2018-03-13 14:49:36 +02:00
Artur Beljajev
9a4380fd96 Fix invoice total calculation
#623
2018-03-13 14:32:38 +02:00
Artur Beljajev
ef6f482528 Format inline
#623
2018-03-13 14:32:17 +02:00
Artur Beljajev
a2c919b0fd Use standard translation
#623
2018-03-13 11:45:04 +02:00
Artur Beljajev
beba81bc6d Introduce helper method
#623
2018-03-13 11:39:18 +02:00
Artur Beljajev
3ed6416e50 Fix test
#623
2018-03-13 11:32:44 +02:00
Artur Beljajev
b3c4f794d0 Reformat
#623
2018-03-13 11:32:35 +02:00
Artur Beljajev
b68fe6e312 Rename attributes
#623
2018-03-13 11:32:15 +02:00
Artur Beljajev
3d107bd198 Set association instead of foreign key
#623
2018-03-13 09:39:32 +02:00
Artur Beljajev
a73a8a0b89 Fix VAT rate
#623
2018-03-13 09:02:08 +02:00
Artur Beljajev
6dfd57ee2e Remove tests
#623
2018-03-13 08:47:08 +02:00
Artur Beljajev
6b54dd520d Enhance test
#623
2018-03-12 12:19:20 +02:00
Artur Beljajev
8de70735f6 Fix spec
#623
2018-03-12 12:19:06 +02:00
Artur Beljajev
8d4b2d902b Convert specs to tests
#623
2018-03-12 11:36:07 +02:00
Artur Beljajev
7cc479c3fe Update fixtures
#623
2018-03-12 11:35:34 +02:00
Artur Beljajev
57ab19d86a Improve readability
#623
2018-03-12 11:34:41 +02:00
Artur Beljajev
4a63a60433 Return VAT rate as BigDecimal
#623
2018-03-12 10:17:15 +02:00
Artur Beljajev
7d72d9cb34 Fix vat rate
#623
2018-03-11 19:33:21 +02:00
Artur Beljajev
026c36d066 Fix vat rate form field constraints
#623
2018-03-11 13:35:33 +02:00
Artur Beljajev
cf2aa76cc6 Regenerate structure.sql
#623
2018-03-10 16:57:24 +02:00
Artur Beljajev
c129598d2b Improve VAT rate validation
#623
2018-03-10 16:51:11 +02:00
Artur Beljajev
7acd41595c Merge branch 'registry-772' into registry-623
# Conflicts:
#	app/models/invoice.rb
#	db/structure.sql
2018-03-10 16:48:47 +02:00
Artur Beljajev
efaac16cee Remove unused attribute
#772
2018-03-10 16:33:35 +02:00
Artur Beljajev
9ae08a1e6f Remove dead code
#623

(cherry picked from commit 49af8cc)
2018-03-10 13:44:07 +02:00
Artur Beljajev
f1fb17a42c Merge branch 'registry-765' into registry-623 2018-03-10 13:28:39 +02:00
Artur Beljajev
1b87c0bbc6 Merge branch 'master' into registry-765
# Conflicts:
#	app/views/admin/registrars/show.html.erb
#	db/structure.sql
2018-03-10 13:25:01 +02:00
Timo Võhmar
3704345d02
Merge pull request #769 from internetee/registry-768
Update rack, rack-protection gems
2018-03-10 00:09:33 +02:00
Timo Võhmar
56586886e3
Merge pull request #766 from internetee/registry-747
Remove unused attribute
2018-03-10 00:07:51 +02:00
Timo Võhmar
2abcd79a0b
Merge pull request #764 from internetee/remove-unused-date-formats
Remove unused date/time formats
2018-03-10 00:05:09 +02:00
Artur Beljajev
d6d20a81a9 Add registrar vat rate
#623
2018-03-09 13:08:36 +02:00
Artur Beljajev
4f51f6c736 Merge branch 'registry-765' into registry-623
# Conflicts:
#	app/models/registrar.rb
#	config/locales/en.yml
#	spec/models/registrar_spec.rb
#	test/models/registrar_test.rb
2018-03-09 09:30:05 +02:00
Artur Beljajev
a5869e0eca Refactor registrars
#765
2018-03-09 09:23:21 +02:00