Commit graph

3239 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
Artur Beljajev
0f6a47d73d Refactor registrars
#765
2018-03-26 07:00:54 +03:00
Artur Beljajev
f2e8bebab2 Disable spell checking globally
#759
2018-03-18 01:41:29 +02:00
Artur Beljajev
7266662fac Drop uniqueness validation
#776
2018-03-15 17:01:37 +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
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
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
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
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
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
Artur Beljajev
f7301c3aea Remove unused attribute
Closes #747
2018-03-08 14:36:19 +02:00
Artur Beljajev
6406e6116e Revert "Use standard page header"
This reverts commit 6393e4b
2018-03-08 14:25:54 +02:00
Artur Beljajev
fcc89769cf Revert "Use human_attribute_name"
This reverts commit 4a41984
2018-03-08 14:23:26 +02:00
Artur Beljajev
6949b684eb Revert "Remove unused HTML"
This reverts commit d2e84d2
2018-03-08 14:22:39 +02:00
Artur Beljajev
d53a7f9c47 Revert "Extract partial"
This reverts commit 955dc10
2018-03-08 14:22:28 +02:00
Artur Beljajev
ffc32b66de Merge branch 'master' into registry-623
# Conflicts:
#	db/structure.sql
2018-03-08 13:04:11 +02:00
Timo Võhmar
7f2ad25ee6
Merge pull request #760 from internetee/registry-756
Remove unused database tables
2018-03-07 18:01:17 +02:00
Artur Beljajev
b68391ca80 Do not check IP in bank link callback URL
#642
2018-03-07 17:21:42 +02:00
Artur Beljajev
ed0af5033e Remove unused database tables
#756
2018-03-07 08:31:13 +02:00
Artur Beljajev
afd135ff15 Remove unused method
#746
2018-03-06 18:05:30 +02:00
Artur Beljajev
046b9e96ce Improve readability
#746
2018-03-06 13:11:22 +02:00
Artur Beljajev
bfbee65a49 Remove duplicate method
#746
2018-03-06 12:26:35 +02:00
Artur Beljajev
ecc68f083d Enhance identical contact lookup
#746
2018-03-06 10:39:32 +02:00
Artur Beljajev
c733c0910d Merge branch 'master' into registry-746
# Conflicts:
#	test/fixtures/contacts.yml
2018-03-06 07:04:06 +02:00
Timo Võhmar
fbbada1c37
Merge pull request #740 from internetee/registry-661
Registry 661
2018-03-05 12:28:43 +02:00
Artur Beljajev
53a34ee2d6 Reuse identical contacts
#746
2018-03-05 10:59:14 +02:00
Timo Võhmar
b331c8003d
Merge pull request #748 from internetee/registry-731
Do not validate Contact#country_code if address processing is off
2018-03-02 15:03:55 +02:00
Timo Võhmar
62f3938de2
Merge pull request #745 from internetee/registry-744
Remove jquery-validation-rails gem
2018-03-01 16:46:58 +02:00
Timo Võhmar
e04ca2d532
Merge pull request #742 from internetee/registry-727
Fix domain force delete JS
2018-03-01 12:03:21 +02:00
Artur Beljajev
3e2a24ca62 Do not validate Contact#country_code if address processing is off
#731
2018-03-01 10:46:21 +02:00