From abef25dd19964622461d10ae718a3c60c163c70d Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Fri, 8 Jun 2018 02:16:25 +0300 Subject: [PATCH 1/6] Add "uglifier" gem for es6 compression --- Gemfile | 1 + Gemfile.lock | 3 +++ config/environments/production.rb | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 0af80fddf..6a5b53522 100644 --- a/Gemfile +++ b/Gemfile @@ -13,6 +13,7 @@ gem 'SyslogLogger', '2.0', require: 'syslog/logger' gem 'iso8601', '0.8.6' # for dates and times gem 'rails', '4.2.10' # when update, all initializers eis_custom files needs check/update gem 'rest-client' +gem 'uglifier' # load env gem 'figaro', '1.1.1' diff --git a/Gemfile.lock b/Gemfile.lock index b12b28a2d..b819c245b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -439,6 +439,8 @@ GEM tilt (1.4.1) tzinfo (1.2.5) thread_safe (~> 0.1) + uglifier (4.1.11) + execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.2) @@ -536,6 +538,7 @@ DEPENDENCIES simpleidn (= 0.0.7) spring spring-commands-rspec + uglifier uuidtools (= 2.1.5) validates_email_format_of (= 1.6.3) webmock diff --git a/config/environments/production.rb b/config/environments/production.rb index 7d77b7220..b0c13f491 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -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.new(harmony: true) # config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. From ec76a6bbc00c45f7969b377dde43a35ecd1353da Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 9 Jun 2018 07:57:38 +0300 Subject: [PATCH 2/6] Remove monkey patch --- app/views/admin/billing/prices/_form.html.erb | 4 ++-- config/initializers/datetime.rb | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 config/initializers/datetime.rb diff --git a/app/views/admin/billing/prices/_form.html.erb b/app/views/admin/billing/prices/_form.html.erb index e1a65280a..44bf00484 100644 --- a/app/views/admin/billing/prices/_form.html.erb +++ b/app/views/admin/billing/prices/_form.html.erb @@ -41,10 +41,10 @@
- <%= f.text_field :valid_from, value: f.object.valid_from.try(:to_s, :dshort), + <%= f.text_field :valid_from, value: f.object.valid_from.try(:to_date), class: 'form-control js-datepicker' %> - - <%= f.text_field :valid_to, value: f.object.valid_to.try(:to_s, :dshort), + <%= f.text_field :valid_to, value: f.object.valid_to.try(:to_date), class: 'form-control js-datepicker' %>
diff --git a/config/initializers/datetime.rb b/config/initializers/datetime.rb deleted file mode 100644 index cf4f747e2..000000000 --- a/config/initializers/datetime.rb +++ /dev/null @@ -1,3 +0,0 @@ -# Some handy day formats -Date::DATE_FORMATS[:dshort] = "%d.%m.%Y" -Time::DATE_FORMATS[:dshort] = "%d.%m.%Y" From ccf1ea198cf3be8ccbc07dd71a74255d58deb525 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Fri, 15 Jun 2018 08:42:32 +0300 Subject: [PATCH 3/6] Do not send `TotalVAT` and `VATCode` params to Directo Partly reverts 169c67839e37a77e6a8dc584f31ab54e6bd46647 --- app/models/directo.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/models/directo.rb b/app/models/directo.rb index 3e4e93e2c..1269e7033 100644 --- a/app/models/directo.rb +++ b/app/models/directo.rb @@ -29,14 +29,12 @@ class Directo < ActiveRecord::Base "InvoiceDate" => invoice.created_at.strftime("%Y-%m-%dT%H:%M:%S"), "PaymentTerm" => Setting.directo_receipt_payment_term, "Currency" => invoice.currency, - "CustomerCode"=> invoice.buyer.accounting_customer_code, - 'TotalVAT' => ActionController::Base.helpers.number_with_precision(invoice.vat_amount, precision: 2, separator: '.') + "CustomerCode"=> invoice.buyer.accounting_customer_code ){ xml.line( "ProductID" => Setting.directo_receipt_product_name, "Quantity" => 1, - "UnitPriceWoVAT" => ActionController::Base.helpers.number_with_precision(invoice.subtotal, precision: 2, separator: '.'), - 'VATCode' => invoice.buyer_vat_no, + "UnitPriceWoVAT" => ActionController::Base.helpers.number_with_precision(invoice.subtotal, precision: 2, separator: "."), "ProductName" => invoice.order ) } From 843dc8edcbaabae87dd040f6715352ca3ee92f21 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Mon, 18 Jun 2018 10:30:23 +0300 Subject: [PATCH 4/6] Add new links to registrant page layout --- app/controllers/registrant/whois_controller.rb | 11 ----------- .../layouts/registrant/application.html.erb | 16 +++++++++------- test/integration/registrant/layout_test.rb | 5 +++-- 3 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 app/controllers/registrant/whois_controller.rb diff --git a/app/controllers/registrant/whois_controller.rb b/app/controllers/registrant/whois_controller.rb deleted file mode 100644 index 2936477eb..000000000 --- a/app/controllers/registrant/whois_controller.rb +++ /dev/null @@ -1,11 +0,0 @@ -# As non-GDPR compliant, this controller is deprecated. Needs to be replaced with one that relies -# on the REST WHOIS API. -class Registrant::WhoisController < RegistrantController - def index - authorize! :view, :registrant_whois - - if params[:domain_name].present? - @domain = WhoisRecord.find_by(name: params[:domain_name]); - end - end -end diff --git a/app/views/layouts/registrant/application.html.erb b/app/views/layouts/registrant/application.html.erb index f38f8fcea..f8108d0e0 100644 --- a/app/views/layouts/registrant/application.html.erb +++ b/app/views/layouts/registrant/application.html.erb @@ -42,14 +42,16 @@
    <% if can? :view, Depp::Domain %> <% active_class = %w(registrant/domains registrant/check registrant/renew registrant/tranfer registrant/keyrelays).include?(params[:controller]) ? 'active' :nil %> -
  • - <%= link_to t(:domains), registrant_domains_path %> -
    • +
  • + <%= link_to t(:domains), registrant_domains_path %> +
    • +
  • + <%= link_to 'WHOIS', 'https://whois.internet.ee' %> +
    • +
  • + <%= link_to 'Internet.ee', 'https://internet.ee' %> +
    • <% end %> - <% active_class = %w(registrant/whois).include?(params[:controller]) ? 'active' :nil %> -
  • - <%= link_to 'Internet.ee', 'https://internet.ee' %> -
    <% if user_signed_in? %> diff --git a/test/integration/registrant/layout_test.rb b/test/integration/registrant/layout_test.rb index 82b8026b7..deabaee20 100644 --- a/test/integration/registrant/layout_test.rb +++ b/test/integration/registrant/layout_test.rb @@ -9,9 +9,10 @@ class RegistrantLayoutTest < ActionDispatch::IntegrationTest travel_to Time.zone.parse('2010-07-05') end - def test_has_link_to_rest_whois + def test_has_link_to_rest_whois_and_internet_ee visit registrant_domains_url + assert(has_link?('Internet.ee', href: 'https://internet.ee')) - refute(has_link?('WHOIS', href: 'registrant/whois')) + assert(has_link?('WHOIS', href: 'https://whois.internet.ee')) end end From 4e181c51cae35d7bfe2b477edce0eef41bf4951b Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Mon, 18 Jun 2018 10:31:29 +0300 Subject: [PATCH 5/6] Move from 2 to 4 spaces indentation in registrant/application.html.erb --- .../layouts/registrant/application.html.erb | 162 +++++++++--------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/app/views/layouts/registrant/application.html.erb b/app/views/layouts/registrant/application.html.erb index f8108d0e0..075ac4652 100644 --- a/app/views/layouts/registrant/application.html.erb +++ b/app/views/layouts/registrant/application.html.erb @@ -1,86 +1,86 @@ - - - - <% if content_for? :head_title %> - <%= yield :head_title %> - <% else %> - - <%= t(:registrant_head_title) %> - - <% end %> - <%= csrf_meta_tags %> - <%= stylesheet_link_tag 'registrant-manifest', media: 'all' %> - <%= favicon_link_tag 'favicon.ico' %> - - - - -
    - <%= render 'shared/flash' %> - <%= yield %> -
    -
    -
    -
    -
    - <%= image_tag 'eis-logo-et.png' %> -
    -
    - Version - <%= CURRENT_COMMIT_HASH %> -
    + <%= csrf_meta_tags %> + <%= stylesheet_link_tag 'registrant-manifest', media: 'all' %> + <%= favicon_link_tag 'favicon.ico' %> + + + + +
    + <%= render 'shared/flash' %> + <%= yield %>
    -
    -
    - <%= javascript_include_tag 'registrant-manifest', async: true %> - +
    +
    +
    +
    + <%= image_tag 'eis-logo-et.png' %> +
    +
    + Version + <%= CURRENT_COMMIT_HASH %> +
    +
    +
    +
    + <%= javascript_include_tag 'registrant-manifest', async: true %> + From 7e88a96f27271ec8dd7c318f4898cbda8142cd18 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Mon, 18 Jun 2018 10:34:24 +0300 Subject: [PATCH 6/6] Add missed `travel_back` callback in teardown --- test/integration/registrant/layout_test.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/integration/registrant/layout_test.rb b/test/integration/registrant/layout_test.rb index deabaee20..fa811694f 100644 --- a/test/integration/registrant/layout_test.rb +++ b/test/integration/registrant/layout_test.rb @@ -9,6 +9,12 @@ class RegistrantLayoutTest < ActionDispatch::IntegrationTest travel_to Time.zone.parse('2010-07-05') end + def teardown + super + + travel_back + end + def test_has_link_to_rest_whois_and_internet_ee visit registrant_domains_url