diff --git a/app/assets/stylesheets/contact_us.scss b/app/assets/stylesheets/contact_us.scss index 532802a..930e847 100644 --- a/app/assets/stylesheets/contact_us.scss +++ b/app/assets/stylesheets/contact_us.scss @@ -70,9 +70,12 @@ $ph-letter-spacing: 1px; /* Contact Us From Design */ .contact-us-wrapper { - background: image-url("map-image.png") no-repeat; + background-image: image-url("m_4.png"); + background-repeat: no-repeat; background-size: cover; - background-position: center center; + //background: image-url("map-image.png") no-repeat; + //background-size: cover; + //background-position: center center; background-color: #222; //border: 8px solid #fff; .contact-us-bg-opacity { diff --git a/app/assets/stylesheets/pricing.scss b/app/assets/stylesheets/pricing.scss index 403d566..98a4a1d 100644 --- a/app/assets/stylesheets/pricing.scss +++ b/app/assets/stylesheets/pricing.scss @@ -10,9 +10,9 @@ $accent_hover: darkslategray; #pp { .pricing { border-radius: 5px; - background: $accent; - padding: 40px 0 20px; - color: #fff; + //background: $accent; + //padding: 40px 0 20px; + //color: #fff; -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, .3); -moz-box-shadow: 0 0 3px rgba(0, 0, 0, .3); box-shadow: 0 0 3px rgba(0, 0, 0, .3); @@ -34,14 +34,14 @@ $accent_hover: darkslategray; } } & .title { - background: $accent_hover; - margin: 40px 0 0; + //background: $accent_hover; + //margin: 40px 0 0; padding: 10px; font-size: 18px; text-align: center; text-transform: uppercase; font-weight: 700; - color: #ffffff; + //color: #ffffff; } & .content { //display: none; @@ -82,6 +82,6 @@ $accent_hover: darkslategray; } } } - margin-bottom: 20px; + //margin-bottom: 20px; } } \ No newline at end of file diff --git a/app/models/app_settings.rb b/app/models/app_settings.rb index 3e2ef71..ef945a8 100644 --- a/app/models/app_settings.rb +++ b/app/models/app_settings.rb @@ -4,9 +4,9 @@ class AppSettings MONTHS_SHORT_NAME = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'June', 'July', 'Aug', 'Sept', 'Oct', 'Nov', 'Dec'] REGISTRATION_PROGRESS = { - create_account: 'Create Account', - company_profile: 'Company Profile', - select_module: 'Select Module', + create_account: 'User Info', + company_profile: 'Company Info', + select_module: 'Select Services', # finalize: 'Finalize' } diff --git a/app/models/billing/invoice.rb b/app/models/billing/invoice.rb index a60218e..bce3367 100644 --- a/app/models/billing/invoice.rb +++ b/app/models/billing/invoice.rb @@ -53,6 +53,8 @@ # module Billing class Invoice < ActiveRecord::Base + self.table_name = 'billing_invoices' + # include ::OSB DISCOUNT_TYPE = %w(% FLAT) include DateFormats diff --git a/app/views/employees/registrations/new.html.erb b/app/views/employees/registrations/new.html.erb index a29674d..d01f494 100644 --- a/app/views/employees/registrations/new.html.erb +++ b/app/views/employees/registrations/new.html.erb @@ -5,18 +5,18 @@
<%= render 'shared/account_progress_bar', step_value: 0 %> -

+

To create your Company account provide your personal and company's profile information. This information can be changed at anytime once your Company account is activated.

-
+
<%= form_for(resource, as: resource_name,html: { id: 'company-registration' }) do |f| %>
-
-

Your Profile

+
+

Profile Info

diff --git a/app/views/employees/sessions/new.html.erb b/app/views/employees/sessions/new.html.erb index defc90d..f7ee154 100644 --- a/app/views/employees/sessions/new.html.erb +++ b/app/views/employees/sessions/new.html.erb @@ -1,9 +1,10 @@
-