iugusdk 1.0.4 → 1.0.5

data/app/controllers/iugu/account_controller.rb

@@ -47,7 +47,8 @@ class Iugu::AccountController < Iugu::AccountSettingsController
 
   def select
     set_account(current_user, params[:id])
-    redirect_to :back
+    #redirect_to :back
+    redirect_to IuguSDK::app_main_url
   rescue ActionController::RedirectBackError
     redirect_to(account_settings_path, :notice => "Account selected")
   end
@@ -67,8 +68,11 @@ class Iugu::AccountController < Iugu::AccountSettingsController
       currency = locale_to_currency I18n.locale
       create_parameters = {plan_identifier: plan_identifier, currency: currency, email: current_user.email}
     end
-    current_user.accounts << Account.create(create_parameters)
-    redirect_to account_settings_path
+    acc = Account.create(create_parameters)
+    current_user.accounts << acc
+    #redirect_to account_view_path(acc)
+    set_account(current_user, acc.id.to_param)
+    redirect_to IuguSDK::app_main_url
   end
 
   def generate_new_token

data/app/controllers/iugu/account_domains_controller.rb

@@ -53,10 +53,10 @@ class Iugu::AccountDomainsController < Iugu::AccountSettingsController
       if @domain.verify 
         redirect_to account_domains_index_path(params[:account_id]), :notice => I18n.t("iugu.notices.domain_verified")
       else
-        redirect_to account_domains_instructions_path(:account_id => params[:account_id], :domain_id => params[:domain_id]), :notice => I18n.t("iugu.notices.domain_not_verified")
+        redirect_to account_domains_instructions_path(:account_id => params[:account_id], :domain_id => params[:domain_id]), flash: { :error => I18n.t("iugu.notices.domain_not_verified") }
       end
     rescue
-      redirect_to account_domains_index_path(params[:account_id]), :notice => I18n.t("iugu.notices.domain_not_found")
+      redirect_to account_domains_index_path(params[:account_id]), flash: { :error => I18n.t("iugu.notices.domain_not_found") }
     end
   end
 

data/app/controllers/iugu/invitations_controller.rb

@@ -10,11 +10,13 @@ class Iugu::InvitationsController < Iugu::SettingsController
   end
 
   def create
+    flash[:group] = :user_invitation
     params[:user_invitation][:roles] = params[:user_invitation][:roles].try(:join, ',')
     params[:user_invitation][:account_id] = params[:account_id]
     params[:user_invitation][:invited_by] = current_user.id
     @user_invitation = UserInvitation.create(params[:user_invitation])
     unless @user_invitation.new_record?
+      flash[:group] = :general
       redirect_to account_users_index_path(params[:account_id]), :notice => I18n.t("iugu.notices.user_invited")
     else
       @account = Account.find(params[:account_id])

data/app/views/iugu/account_domains/index.html.haml

@@ -2,21 +2,23 @@
   = I18n.t("iugu.account_domains")
 
 - if flash[:group] == :account_domain
-  .notice.notice-green
+  .alert.alert-success
     = flash[:notice]
 
 - if IuguSDK::enable_account_alias == true
   = simple_form_for @account, :url => update_subdomain_path(:id => @account.id), :method => :put do |f|
     - if @account.errors.any?
-      .notice.notice-red
+      .alert.alert-danger
         %ul
           - @account.errors.full_messages.each do |msg|
             %li
               = msg
 
-    .form-group
+    %div{ class: "input-group #{ "has-error" if @account.errors[:subdomain].present? }" }
       = f.text_field :subdomain, class: "form-control"
-      = "." + IuguSDK::application_main_host
+      %span.input-group-addon
+        = "." + IuguSDK::application_main_host
+    %br
     = f.submit I18n.t("iugu.save"), :class => "btn btn-block btn-primary"
 
 - if IuguSDK::enable_custom_domain == true
@@ -26,13 +28,13 @@
     = simple_form_for @account_domain, :url => create_domain_path(@account.id) do |f|
 
       - if @account_domain.errors.any?
-        .notice.notice-red{ :style => "margin-bottom: 15px" }
+        .alert.alert-danger{ :style => "margin-bottom: 15px" }
           %ul
             - @account_domain.errors.full_messages.each do |msg|
               %li
                 = msg
 
-      .form-group
+      %div{ class: "form-group #{ "has-error" if @account_domain.errors[:url].present? }" }
         = f.text_field :url, :placeholder => "Domínio", class: "form-control"
       = f.submit I18n.t("iugu.add"), :class => "btn btn-primary btn-block"
 

data/app/views/iugu/account_users/index.html.haml

@@ -1,5 +1,4 @@
 - content_for :title do "Account Users" end
-
 %h1
   Usuários
 

data/app/views/iugu/invitations/new.html.haml

@@ -2,14 +2,9 @@
   Convidar um usuário
 
 = simple_form_for @user_invitation, role: "form", :url => create_invite_path(@account.id), :method => :post do |f|
-  - if @user_invitation.errors.any?
-    .notice.notice-red{ :style => "margin-bottom: 15px" }
-      %ul
-        - @user_invitation.errors.full_messages.each do |msg|
-          %li
-            = msg
+  = render partial: "iugu/shared/notices", locals: { group: :user_invitation, resource: @user_invitation }
 
-  .form-group
+  .form-group{ class: "#{ "has-error" if @user_invitation.errors[:email].present? }" }
     = f.email_field :email, :placeholder => "e-mail", :class => "form-control"
 
   %div

data/app/views/iugu/plan/index.html.haml

@@ -1,5 +1,5 @@
 - if @account.errors.any?
-  .notice.notice-red{ :style => "margin-bottom: 15px" }
+  .alert.alert-danger{ :style => "margin-bottom: 15px" }
     %ul
       - @account.errors.full_messages.each do |msg|
         %li

data/app/views/iugu/settings/account.html.haml

@@ -25,11 +25,10 @@
 %hr
 
 - if current_user.is?(:owner, @account)
-  - if flash[:group] == :account_update
-    = flash[:notice]
+  = render partial: "iugu/shared/notices", locals: { group: :account_update, resource: @account }
 
   = simple_form_for @account, role: "form", :url => account_update_path(@account), :method => :put do |f|
-    .form-group
+    .form-group{ class: "#{ "has-error" if @account.errors[:name].present? }" }
       = f.text_field :name, :placeholder => I18n.t("activerecord.attributes.name"), class: "form-control"
 
     = f.submit I18n.t("iugu.save"), :class => "btn btn-lg btn-primary btn-block"

data/app/views/iugu/shared/_notices.html.haml

@@ -1,26 +1,20 @@
-%div{ :style => "position:relative;height:1px;width:1px;display:inline"}
-  %a{ name: group, :style => "display: block; position: absolute; top: -80px; width: 2px; height: 2px" }
+- flash[:group] = :general if flash[:group].blank?
 - if flash[:group] == group
 
   - [:notice, :warning, :error, :info].each do |flash_type|
     - color = nil
-    - color = "green" if flash_type == :notice
-    - color = "red"   if flash_type == :error
-    - color = "blue"  if flash_type == :info
+    - color = "success" if flash_type == :notice
+    - color = "danger" if flash_type == :error
+    - color = "info" if flash_type == :info
+    - color = "warning" if flash_type == :warning
 
     - if flash[flash_type]
-      %div{ class: (color ? "notice notice-#{color}" : "notice") }
-        %button.close{ :'data-dismiss' => "notice" }
-          ×
-        %h4.notice-heading
-          = flash[flash_type]
+      %div{ class: (color ? "alert alert-#{color}" : "alert") }
+        = flash[flash_type]
 
   - resource = nil unless resource
   - if resource && resource.errors.any?
-    .notice.notice-red
-      %h4.notice-heading
-        = I18n.t "simple_form.error_notification.default_message"
-
+    .alert.alert-danger
       - if resource.errors.any?
         %ul 
           - resource.errors.full_messages.each do |msg|

data/lib/iugusdk/version.rb

@@ -1,3 +1,3 @@
 module IuguSDK
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iugusdk
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -940,7 +940,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 350128318697639413
+      hash: -856814466176584110
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -949,7 +949,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 350128318697639413
+      hash: -856814466176584110
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24