From 975dd523689658c5fc78ddaceaf3a04b73a70d81 Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Mon, 18 Jan 2016 20:26:03 +0200 Subject: [PATCH] Story#105852786 - Sales agent is set by config --- app/models/directo.rb | 2 +- app/views/admin/settings/index.haml | 1 + config/initializers/initial_settings.rb | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/directo.rb b/app/models/directo.rb index 73b88e0ae..e51313b5b 100644 --- a/app/models/directo.rb +++ b/app/models/directo.rb @@ -13,7 +13,7 @@ class Directo < ActiveRecord::Base mappers[num] = transaction xml.invoice( - "SalesAgent" => transaction.invoice.seller_name, + "SalesAgent" => Setting.directo_sales_agent, "Number" => num, "InvoiceDate" => (transaction.paid_at||transaction.created_at).strftime("%Y-%m-%dT%H:%M:%S"), "PaymentTerm" => Setting.directo_receipt_payment_term, diff --git a/app/views/admin/settings/index.haml b/app/views/admin/settings/index.haml index 52430eb2a..e09e48396 100644 --- a/app/views/admin/settings/index.haml +++ b/app/views/admin/settings/index.haml @@ -73,6 +73,7 @@ = render 'setting_row', var: :minimum_deposit = render 'setting_row', var: :directo_receipt_payment_term = render 'setting_row', var: :directo_receipt_product_name + = render 'setting_row', var: :directo_sales_agent = render 'setting_row', var: :registry_billing_email = render 'setting_row', var: :registry_invoice_contact = render 'setting_row', var: :registry_vat_no diff --git a/config/initializers/initial_settings.rb b/config/initializers/initial_settings.rb index 8309d299a..1b25ddeb3 100644 --- a/config/initializers/initial_settings.rb +++ b/config/initializers/initial_settings.rb @@ -35,6 +35,7 @@ if con.present? && con.table_exists?('settings') Setting.save_default(:minimum_deposit, 0.0) Setting.save_default(:directo_receipt_payment_term, "R") Setting.save_default(:directo_receipt_product_name, "ETTEM06") + Setting.save_default(:directo_sales_agent, "JAANA") Setting.save_default(:days_to_renew_domain_before_expire, 90) Setting.save_default(:expire_warning_period, 15)