mirror of
https://github.com/internetee/registry.git
synced 2025-08-04 08:52:04 +02:00
Merge branch 'master' into registry-569
This commit is contained in:
Artur Beljajev
commit
8a04fa793d
30 changed files with 83 additions and 80 deletions
7
Gemfile
7
Gemfile
|
|
@ -32,7 +32,7 @@ gem 'rails-settings-cached', '0.4.1' # for settings
|
|||
|
||||
# html-xml
|
||||
gem 'haml-rails', '0.9.0' # haml for views
|
||||
gem 'nokogiri', '~> 1.7'
|
||||
gem 'nokogiri'
|
||||
|
||||
# style
|
||||
gem 'bootstrap-sass', '3.3.5.1' # bootstrap style
|
||||
|
|
@ -41,12 +41,10 @@ gem 'sass-rails', '5.0.6' # sass style
|
|||
# js
|
||||
|
||||
gem 'coffee-rails', '4.1.0' # coffeescript support
|
||||
gem 'uglifier', '2.7.2' # minifies js
|
||||
gem 'jquery-rails', '4.0.4' # jquery
|
||||
gem 'turbolinks', '2.5.3' # faster page load
|
||||
gem 'selectize-rails', '0.12.1' # include selectize.js for select
|
||||
gem 'jquery-validation-rails', '1.13.1' # validate on client side
|
||||
gem 'therubyracer', '0.12.2', platforms: :ruby
|
||||
|
||||
# view helpers
|
||||
gem 'kaminari', '0.16.3' # pagination
|
||||
|
|
@ -54,7 +52,6 @@ gem 'coderay', '1.1.0' # xml console visualize
|
|||
gem 'html5_validators', '1.2.2' # model requements now automatically on html form
|
||||
gem 'nprogress-rails', '0.1.6.7' # visual loader
|
||||
gem 'select2-rails', '3.5.9.3' # for autocomplete
|
||||
gem 'bootstrap-datepicker-rails', '1.3.1.1' # datepicker
|
||||
gem 'liquid', '3.0.6' # for email templates
|
||||
|
||||
# rights
|
||||
|
|
@ -106,8 +103,6 @@ gem 'activerecord-import', '0.7.0' # for inserting dummy data
|
|||
|
||||
# for generating pdf
|
||||
gem 'pdfkit', '0.6.2'
|
||||
|
||||
# for datepicker
|
||||
gem 'jquery-ui-rails', '5.0.5'
|
||||
gem 'active_model-errors_details' # Backport from Rails 5, https://github.com/rails/rails/pull/18322
|
||||
|
||||
|
|
|
|||
23
Gemfile.lock
23
Gemfile.lock
|
|
@ -121,8 +121,6 @@ GEM
|
|||
ice_nine (~> 0.11.0)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
bcrypt (3.1.11)
|
||||
bootstrap-datepicker-rails (1.3.1.1)
|
||||
railties (>= 3.0)
|
||||
bootstrap-sass (3.3.5.1)
|
||||
autoprefixer-rails (>= 5.0.0.1)
|
||||
sass (>= 3.3.0)
|
||||
|
|
@ -258,12 +256,11 @@ GEM
|
|||
activesupport (>= 3.0.0)
|
||||
launchy (2.4.3)
|
||||
addressable (~> 2.3)
|
||||
libv8 (3.16.14.19)
|
||||
libxml-ruby (3.0.0)
|
||||
liquid (3.0.6)
|
||||
loofah (2.0.3)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.6.5)
|
||||
mail (2.6.6)
|
||||
mime-types (>= 1.16, < 4)
|
||||
method_source (0.8.2)
|
||||
mime-types (3.1)
|
||||
|
|
@ -272,7 +269,7 @@ GEM
|
|||
mina (0.3.1)
|
||||
open4 (~> 1.3.4)
|
||||
rake
|
||||
mini_portile2 (2.1.0)
|
||||
mini_portile2 (2.3.0)
|
||||
minitest (5.10.2)
|
||||
monetize (1.6.0)
|
||||
money (~> 6.8)
|
||||
|
|
@ -287,8 +284,8 @@ GEM
|
|||
multi_json (1.12.1)
|
||||
multi_xml (0.6.0)
|
||||
netrc (0.11.0)
|
||||
nokogiri (1.7.2)
|
||||
mini_portile2 (~> 2.1.0)
|
||||
nokogiri (1.8.1)
|
||||
mini_portile2 (~> 2.3.0)
|
||||
nori (2.6.0)
|
||||
nprogress-rails (0.1.6.7)
|
||||
open4 (1.3.4)
|
||||
|
|
@ -365,7 +362,6 @@ GEM
|
|||
i18n
|
||||
polyamorous (~> 1.1)
|
||||
rdoc (4.3.0)
|
||||
ref (2.0.0)
|
||||
request_store (1.1.0)
|
||||
responders (2.3.0)
|
||||
railties (>= 4.2.0, < 5.1)
|
||||
|
|
@ -453,9 +449,6 @@ GEM
|
|||
sprockets (>= 3.0.0)
|
||||
sys-uname (0.9.0)
|
||||
ffi (>= 1.0.0)
|
||||
therubyracer (0.12.2)
|
||||
libv8 (~> 3.16.14.0)
|
||||
ref
|
||||
thor (0.19.4)
|
||||
thread_safe (0.3.6)
|
||||
tilt (1.4.1)
|
||||
|
|
@ -463,9 +456,6 @@ GEM
|
|||
coffee-rails
|
||||
tzinfo (1.2.3)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (2.7.2)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.2)
|
||||
|
|
@ -506,7 +496,6 @@ DEPENDENCIES
|
|||
activerecord-import (= 0.7.0)
|
||||
airbrake
|
||||
autodoc
|
||||
bootstrap-datepicker-rails (= 1.3.1.1)
|
||||
bootstrap-sass (= 3.3.5.1)
|
||||
brakeman (= 3.6.1)
|
||||
bullet (= 4.14.7)
|
||||
|
|
@ -544,7 +533,7 @@ DEPENDENCIES
|
|||
liquid (= 3.0.6)
|
||||
mina (= 0.3.1)
|
||||
money-rails
|
||||
nokogiri (~> 1.7)
|
||||
nokogiri
|
||||
nprogress-rails (= 0.1.6.7)
|
||||
paper_trail!
|
||||
pdfkit (= 0.6.2)
|
||||
|
|
@ -572,9 +561,7 @@ DEPENDENCIES
|
|||
simpleidn (= 0.0.7)
|
||||
spring
|
||||
spring-commands-rspec
|
||||
therubyracer (= 0.12.2)
|
||||
turbolinks (= 2.5.3)
|
||||
uglifier (= 2.7.2)
|
||||
uuidtools (= 2.1.5)
|
||||
validates_email_format_of (= 1.6.3)
|
||||
webmock
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
#= require jquery-ui/datepicker
|
||||
#= require select2
|
||||
#= require jquery.doubleScroll
|
||||
#= require datepicker
|
||||
#= require admin/application
|
||||
#= require admin/app
|
||||
#= require_tree ./admin
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
$('.datepicker').datepicker({
|
||||
dateFormat: 'yy-mm-dd'
|
||||
});
|
||||
21
app/assets/javascripts/datepicker.js
Normal file
21
app/assets/javascripts/datepicker.js
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
(function() {
|
||||
$.datepicker.setDefaults({
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
duration: 'fast',
|
||||
firstDay: 1, // Monday
|
||||
dateFormat: 'yy-mm-dd',
|
||||
});
|
||||
|
||||
function attachDatePicker() {
|
||||
let dateFields = $('.js-datepicker');
|
||||
dateFields.datepicker();
|
||||
}
|
||||
|
||||
// For turbolinks
|
||||
document.addEventListener('page:change', function() {
|
||||
attachDatePicker();
|
||||
});
|
||||
|
||||
attachDatePicker();
|
||||
})();
|
||||
|
|
@ -8,7 +8,6 @@
|
|||
#= require shared/jquery.validate.bootstrap
|
||||
#= require jquery-ui/datepicker
|
||||
#= require select2
|
||||
|
||||
#= require datepicker
|
||||
#= require shared/general
|
||||
|
||||
#= require registrar/application
|
||||
|
|
|
|||
|
|
@ -6,8 +6,7 @@
|
|||
#= require jquery.nested_attributes
|
||||
#= require jquery-ui/datepicker
|
||||
#= require select2
|
||||
|
||||
#= require datepicker
|
||||
#= require shared/general
|
||||
|
||||
#= require registrar/autocomplete
|
||||
#= require registrar/application
|
||||
|
|
|
|||
|
|
@ -21,10 +21,6 @@ $(document).on 'page:change', ->
|
|||
tomorrow = new Date(today)
|
||||
tomorrow.setDate(today.getDate() + 1)
|
||||
|
||||
$('.datepicker').datepicker(
|
||||
dateFormat: "yy-mm-dd"
|
||||
)
|
||||
|
||||
if $('.js-combobox').length
|
||||
$('.js-combobox').select2
|
||||
width: "100%"
|
||||
|
|
|
|||
|
|
@ -9,6 +9,5 @@
|
|||
@import typeaheadjs
|
||||
@import selectize
|
||||
@import selectize.bootstrap3
|
||||
// @import bootstrap-datepicker3
|
||||
@import admin/admin
|
||||
@import admin/bootstrap-dialog-fix
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@
|
|||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:receipt_date_from)
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:receipt_date_from), autocomplete: 'off'
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_from)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:receipt_date_until)
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:receipt_date_until), autocomplete: 'off'
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_until)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= label_tag t(:results_per_page)
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
.form-group
|
||||
= x.label :paid_at, class: 'col-md-4 control-label required'
|
||||
.col-md-8
|
||||
= x.text_field(:paid_at, class: 'form-control datepicker', required: true)
|
||||
= x.text_field(:paid_at, class: 'form-control js-datepicker', required: true)
|
||||
|
||||
%hr
|
||||
.row
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
.form-group
|
||||
= f.label :paid_at, class: 'col-md-4 control-label required'
|
||||
.col-md-8
|
||||
= f.text_field(:paid_at, class: 'form-control datepicker', required: true)
|
||||
= f.text_field(:paid_at, class: 'form-control js-datepicker', required: true)
|
||||
|
||||
%hr
|
||||
.row
|
||||
|
|
|
|||
|
|
@ -42,10 +42,10 @@
|
|||
<div class="col-sm-6">
|
||||
<div class="input-group">
|
||||
<%= f.text_field :valid_from, value: f.object.valid_from.try(:to_s, :dshort),
|
||||
class: 'form-control datepicker' %>
|
||||
class: 'form-control js-datepicker' %>
|
||||
<span class="input-group-addon">-</span>
|
||||
<%= f.text_field :valid_to, value: f.object.valid_to.try(:to_s, :dshort),
|
||||
class: 'form-control datepicker' %>
|
||||
class: 'form-control js-datepicker' %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:created_at_from)
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_at_from)
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:created_at_until)
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_at_until)
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until)
|
||||
.row
|
||||
.col-md-3
|
||||
.form-group
|
||||
|
|
|
|||
|
|
@ -41,15 +41,15 @@
|
|||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:created_at_from)
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_at_from)
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:created_at_until)
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_at_until)
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:updated_at)
|
||||
= f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control datepicker', placeholder: t(:updated_at)
|
||||
= f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control js-datepicker', placeholder: t(:updated_at)
|
||||
.row
|
||||
.col-md-6
|
||||
.form-group
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@
|
|||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:valid_to_from)
|
||||
= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control datepicker', placeholder: t(:valid_to_from)
|
||||
= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:valid_to_until)
|
||||
= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control datepicker', placeholder: t(:valid_to_until)
|
||||
= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until)
|
||||
.row
|
||||
.col-md-6
|
||||
.form-group
|
||||
|
|
|
|||
|
|
@ -31,11 +31,11 @@
|
|||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:created_after)
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_after), autocomplete: 'off'
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_after)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:created_before)
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_before), autocomplete: 'off'
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_before)
|
||||
.col-md-3{style: 'padding-top: 25px;'}
|
||||
%button.btn.btn-primary
|
||||
|
||||
|
|
|
|||
|
|
@ -29,11 +29,11 @@
|
|||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:created_after)
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_after), autocomplete: 'off'
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_after)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:created_before)
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_before), autocomplete: 'off'
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_before)
|
||||
.col-md-3{style: 'padding-top: 25px;'}
|
||||
%button.btn.btn-primary
|
||||
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:created_at_from)
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_at_from)
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:created_at_until)
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_at_until)
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until)
|
||||
.row
|
||||
.col-md-3
|
||||
.form-group
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
Domeen <%= @domain.name %> on aegunud<br>
|
||||
Lugupeetud .ee domeeni kasutaja<br>
|
||||
<br>
|
||||
Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Alates <%= @domain.delete_date %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
|
||||
Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav.
|
||||
<br>
|
||||
Alates <%= @domain.delete_date %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
|
||||
<br><br>
|
||||
Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja:
|
||||
Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja poole:
|
||||
<%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
|
||||
<br><br>
|
||||
Domeeni <%= @domain.name %> kohta on registris järgmised andmed:
|
||||
|
|
@ -24,7 +26,9 @@ Eesti Interneti Sihtasutus
|
|||
The <%= @domain.name %> domain has expired<br>
|
||||
Dear user of .ee domain,<br>
|
||||
<br>
|
||||
The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= @domain.on_hold_date %>. From <%= @domain.delete_date %>, the <%= @domain.name %> domain will be available for registration on a first come first served basis.
|
||||
The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= @domain.on_hold_date %>.
|
||||
<br>
|
||||
From <%= @domain.delete_date %>, the <%= @domain.name %> domain will be available for registration on a first come first served basis.
|
||||
<br><br>
|
||||
To renew the domain registration, please contact your registrar:
|
||||
<%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
|
||||
|
|
@ -48,7 +52,9 @@ Estonian Internet Foundation
|
|||
Уважаемый пользователь домена .ee<br>
|
||||
<br>
|
||||
|
||||
Доменное имя <%= @domain.name %> устарело и с <%= @domain.on_hold_date %> недоступно в Интернете. С <%= @domain.delete_date %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".
|
||||
Доменное имя <%= @domain.name %> устарело и с <%= @domain.on_hold_date %> недоступно в Интернете.
|
||||
<br>
|
||||
С <%= @domain.delete_date %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".
|
||||
|
||||
<br><br>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
Domeen <%= @domain.name %> on aegunud
|
||||
Lugupeetud .ee domeeni kasutaja
|
||||
|
||||
Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Alates <%= @domain.delete_date %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
|
||||
Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav.
|
||||
Alates <%= @domain.delete_date %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
|
||||
|
||||
Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja:
|
||||
Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja poole:
|
||||
|
||||
<%= render 'mailers/shared/registrar/registrar.et.text', registrar: @registrar %>
|
||||
|
||||
|
|
@ -24,7 +25,8 @@ Eesti Interneti Sihtasutus
|
|||
The <%= @domain.name %> domain has expired
|
||||
Dear user of .ee domain,
|
||||
|
||||
The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= @domain.on_hold_date %>. From <%= @domain.delete_date %>, the <%= @domain.name %> domain will be available for registration on a first come first served basis.
|
||||
The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= @domain.on_hold_date %>.
|
||||
From <%= @domain.delete_date %>, the <%= @domain.name %> domain will be available for registration on a first come first served basis.
|
||||
|
||||
To renew the domain registration, please contact your registrar:
|
||||
|
||||
|
|
@ -47,7 +49,8 @@ Estonian Internet Foundation
|
|||
Домен <%= @domain.name %> устарел
|
||||
Уважаемый пользователь домена .ee
|
||||
|
||||
Доменное имя <%= @domain.name %> устарело и с <%= @domain.on_hold_date %> недоступно в Интернете. С <%= @domain.delete_date %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".
|
||||
Доменное имя <%= @domain.name %> устарело и с <%= @domain.on_hold_date %> недоступно в Интернете.
|
||||
С <%= @domain.delete_date %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".
|
||||
|
||||
Для продления регистрации домена просим обратиться к своему регистратору:
|
||||
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:valid_to_from)
|
||||
= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control datepicker', placeholder: t(:valid_to_from)
|
||||
= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:valid_to_until)
|
||||
= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control datepicker', placeholder: t(:valid_to_until)
|
||||
= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= label_tag t(:results_per_page)
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@
|
|||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:receipt_date_from)
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:receipt_date_from), autocomplete: 'off'
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_from)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:receipt_date_until)
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:receipt_date_until), autocomplete: 'off'
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_until)
|
||||
.col-md-6{style: 'padding-top: 25px;'}
|
||||
%button.btn.btn-default
|
||||
|
||||
|
|
|
|||
|
|
@ -43,15 +43,15 @@
|
|||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:created_at_from)
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_at_from)
|
||||
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:created_at_until)
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_at_until)
|
||||
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:updated_at)
|
||||
= f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control datepicker', placeholder: t(:updated_at)
|
||||
= f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control js-datepicker', placeholder: t(:updated_at)
|
||||
.row
|
||||
.col-md-6
|
||||
.form-group
|
||||
|
|
|
|||
|
|
@ -34,11 +34,11 @@
|
|||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:valid_to_from)
|
||||
= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control datepicker', placeholder: t(:valid_to_from)
|
||||
= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:valid_to_until)
|
||||
= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control datepicker', placeholder: t(:valid_to_until)
|
||||
= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until)
|
||||
.row
|
||||
.col-md-6
|
||||
.col-md-3
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@
|
|||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:due_date_from)
|
||||
= f.search_field :due_date_gteq, value: params[:q][:due_date_gteq], class: 'form-control datepicker', placeholder: t(:due_date_from), autocomplete: 'off'
|
||||
= f.search_field :due_date_gteq, value: params[:q][:due_date_gteq], class: 'form-control js-datepicker', placeholder: t(:due_date_from)
|
||||
.col-md-3
|
||||
.form-group
|
||||
= f.label t(:due_date_until)
|
||||
= f.search_field :due_date_lteq, value: params[:q][:due_date_lteq], class: 'form-control datepicker', placeholder: t(:due_date_until), autocomplete: 'off'
|
||||
= f.search_field :due_date_lteq, value: params[:q][:due_date_lteq], class: 'form-control js-datepicker', placeholder: t(:due_date_until)
|
||||
.row
|
||||
.col-md-3
|
||||
.form-group
|
||||
|
|
|
|||
|
|
@ -127,3 +127,5 @@ payments_lhv_url: 'https://www.seb.ee/cgi-bin/dv.sh/ipank.r'
|
|||
payments_lhv_bank_certificate: 'eyp_pub.pem'
|
||||
payments_lhv_seller_private: 'kaupmees_priv.pem'
|
||||
payments_lhv_seller_account: 'testvpos'
|
||||
|
||||
user_session_timeout: '3600' # 1 hour
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ Rails.application.configure do
|
|||
config.serve_static_files = false
|
||||
|
||||
# Compress JavaScripts and CSS.
|
||||
config.assets.js_compressor = :uglifier
|
||||
# config.assets.js_compressor = :uglifier
|
||||
# config.assets.css_compressor = :sass
|
||||
|
||||
# Do not fallback to assets pipeline if a precompiled asset is missed.
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ Devise.setup do |config|
|
|||
# ==> Configuration for :timeoutable
|
||||
# The time you want to timeout the user session without activity. After this
|
||||
# time the user will be asked for credentials again. Default is 30 minutes.
|
||||
config.timeout_in = (Rails.env.development? || Rails.env.staging?) ? 5.years : 8.hours
|
||||
config.timeout_in = ENV['user_session_timeout'].to_i.seconds if ENV['user_session_timeout']
|
||||
|
||||
# If true, expires auth token on session timeout.
|
||||
# config.expire_auth_token_on_timeout = false
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
required = %w(
|
||||
Figaro.require_keys(%w[
|
||||
app_name
|
||||
zonefile_export_dir
|
||||
secret_key_base
|
||||
|
|
@ -11,6 +11,4 @@ required = %w(
|
|||
legal_documents_dir
|
||||
bank_statement_import_dir
|
||||
time_zone
|
||||
)
|
||||
|
||||
Figaro.require_keys(required)
|
||||
])
|
||||
Loading…
Add table
Add a link
Reference in a new issue