iugusdk 1.0.0.alpha.21 → 1.0.0.alpha.22

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

@@ -1,25 +1,38 @@
 - content_for :title do "Account Users" end
 
-- @account_users.each do |account_user|
-  %div
-    - if account_user.user.name.blank?
-      = account_user.user.email
-    - else
-      = account_user.user.name
-    - if current_user.is?(:owner, @account) || current_user.is?(:admin, @account)
-      |
-      = link_to I18n.t("iugu.permissions"), account_roles_edit_path(@account, :user_id => account_user.user)
-      - unless account_user.destroying?
-        - unless account_user.is?(:owner) || account_user.user_id == current_user.id
-          |
-          = link_to I18n.t("iugu.remove"), account_users_destroy_path(@account, :user_id => account_user.user), :method => 'delete' 
-      - else
-        |
-        - if IuguSDK::delay_account_user_exclusion == 0
-          = I18n.t("iugu.removing")
-        - else
-          = link_to I18n.t("iugu.undo"), account_users_cancel_destruction_path(@account, :user_id => account_user.user), :method => 'delete' 
+%h3
+  Usuários
+
+%table.table
+  %thead
+    %tr
+      %th
+        Usuário
+      %th
+  %tbody
+    - @account_users.each do |account_user|
+      %tr
+        %td
+          - if account_user.user.name.blank?
+            = account_user.user.email
+          - else
+            = account_user.user.name
+        %td
+          - if current_user.is?(:owner, @account) || current_user.is?(:admin, @account)
+            = link_to I18n.t("iugu.permissions"), account_roles_edit_path(@account, :user_id => account_user.user), :class => "button small no-bottom-margin"
+            - unless account_user.destroying?
+              - unless account_user.is?(:owner) || account_user.user_id == current_user.id
+                |
+                = link_to I18n.t("iugu.remove"), account_users_destroy_path(@account, :user_id => account_user.user), :method => 'delete', :class => "button small no-bottom-margin"
+            - else
+              |
+              - if IuguSDK::delay_account_user_exclusion == 0
+                = I18n.t("iugu.removing")
+              - else
+                = link_to I18n.t("iugu.undo"), account_users_cancel_destruction_path(@account, :user_id => account_user.user), :method => 'delete', :class => "button small no-bottom-margin"
 
 - if current_user.is?(:owner, @account) || current_user.is?(:admin, @account)
   %div
-    = link_to I18n.t("iugu.invite"), new_invite_path(@account)
+    = link_to I18n.t("iugu.invite"), new_invite_path(@account), :class => "button full-width"
+
+= link_to I18n.t("iugu.back"), account_view_path(id: params[:account_id]), class: "button no-bottom-margin"

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

@@ -5,4 +5,9 @@
   = I18n.t("iugu.account")
   = @user_invitation.account.id.to_s
 %div
-  = link_to I18n.t("iugu.accept"), update_invite_path(:invitation_token => @user_invitation.id.to_s + @user_invitation.token), :method => :post
+  - if current_user
+    = link_to I18n.t("iugu.accept"), update_invite_path(:invitation_token => @user_invitation.id.to_s + @user_invitation.token), :method => :post
+  - else
+    Você não está logado!
+    = link_to "Já tenho conta", new_user_session_path(invitation_token: @user_invitation.id.to_s + @user_invitation.token)
+    = link_to "Criar conta", new_user_registration_path(invitation_token: @user_invitation.id.to_s + @user_invitation.token)

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

@@ -1,27 +1,33 @@
+%h3
+  Convidar um usuário
+
 = simple_form_for @user_invitation, :url => create_invite_path(@account.id), :method => :post do |f|
   - if @user_invitation.errors.any?
-    #error_explanation{ :style => "margin-bottom: 15px" }
+    .notice.notice-red{ :style => "margin-bottom: 15px" }
       %ul
         - @user_invitation.errors.full_messages.each do |msg|
           %li
             = msg
 
   %div
-    = f.label :email
-    = f.email_field :email
-  - if current_user.is?(:owner, @account)
-    - APP_ROLES['roles'].each do |role|
-      %div
-        = check_box_tag "user_invitation[roles][]", role, false, :id => "#{role}_checkbox"
-        = label_tag "#{role}_checkbox", I18n.t("iugu.#{role}")
-
-  - elsif current_user.is?(:admin, @account)
-    - APP_ROLES['roles'].each do |role|
-      - unless role == APP_ROLES['owner_role'] || role == APP_ROLES['admin_role'] 
-        %div
+    = f.email_field :email, :placeholder => "e-mail", :class => "full-width"
+  %div{ :style => "padding-top:20px;padding-bottom:10px" }
+    %h4
+      Permissões
+    - if current_user.is?(:owner, @account)
+      - APP_ROLES['roles'].each do |role|
+        %div{ :style => "margin-bottom: 5px" }
           = check_box_tag "user_invitation[roles][]", role, false, :id => "#{role}_checkbox"
           = label_tag "#{role}_checkbox", I18n.t("iugu.#{role}")
 
-  %div
-    = f.submit I18n.t("iugu.invite")
+    - elsif current_user.is?(:admin, @account)
+      - APP_ROLES['roles'].each do |role|
+        - unless role == APP_ROLES['owner_role'] || role == APP_ROLES['admin_role'] 
+          %div{ :style => "margin-bottom: 5px" }
+            = check_box_tag "user_invitation[roles][]", role, false, :id => "#{role}_checkbox"
+            = label_tag "#{role}_checkbox", I18n.t("iugu.#{role}")
+
+  %div{ :style => "margin-top: 10px" }
+    = f.submit I18n.t("iugu.invite"), :class => "button full-width"
 
+= link_to I18n.t("iugu.back"), account_users_index_path(account_id: params[:account_id]), class: "button no-bottom-margin"

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

@@ -1,25 +1,32 @@
-= I18n.t "iugu.available_plans"
-%br
-%br
+%h3
+  = I18n.t "iugu.available_plans"
+
 %table
   %tr
     %th
       = I18n.t "iugu.plan"
     %th
       = "#{I18n.t("iugu.price")} (#{@currency})"
+    %th
+      = I18n.t "iugu.duration"
     %th
     - @plans.reverse.each do |plan|
-      %tr
+      %tr{ :class => "#{ (plan.identifier == @subscription.plan_identifier) ? 'plan active_plan' : 'plan' }" }
         %td
           = plan.name
         %td
           - price = plan.price_by_currency @currency
-          = price.value_cents
+          = Money.new(price.value_cents, @currency).format
         %td
+          = "#{plan.interval} #{I18n.t("iugu.interval_type." + (plan.interval == 1 ? plan.interval_type.singularize : plan.interval_type))}"
+        %td{ :style => "text-align:center" }
           - if plan.identifier == @subscription.plan_identifier
-            = I18n.t "iugu.your_plan"
+            %strong
+              = I18n.t "iugu.your_plan"
           - else
             - text = "iugu.change_plan"
             - text = "iugu.upgrade" if price.value_cents > @subscription.price_cents
             - text = "iugu.downgrade" if price.value_cents < @subscription.price_cents
-            = link_to(I18n.t(text), plan_change_url(id: @account.id.to_param, plan: plan.identifier), method: :post)
+            = link_to(I18n.t(text), plan_change_url(id: @account.id.to_param, plan: plan.identifier), method: :post, :class => "button no-bottom-margin")
+
+= link_to I18n.t("iugu.back"), account_view_path(id: params[:id]), class: "button no-bottom-margin"

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

@@ -33,6 +33,8 @@
               = f.input :account_alias, :label => 'Alias'
             = render :partial => "iugu/shared/signup_fields", :locals => {:f => f}
             = f.hidden_field :locale, :value => @matched_locale_from_browser
+            - if params[:invitation_token].blank?
+              = f.hidden_field :user_invitation, :value => params[:invitation_token].blank?
             - if IuguSDK::enable_subscription_features
               = f.hidden_field :plan_identifier, value: @plan_identifier
               = f.hidden_field :currency, value: @currency

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

@@ -24,6 +24,8 @@
 
               = f.input :password, :required => false, :placeholder => I18n.t("activerecord.attributes.password"), :label => false
               // = f.input :remember_me, :as => :boolean, :label => I18n.t("activerecord.attributes.remember_me") if devise_mapping.rememberable?
+              - if !params[:invitation_token].blank?
+                = f.input :user_invitation, as: :hidden, input_html: { value: params[:invitation_token] }
             .actions
               = f.button :submit, I18n.t("iugu.sign_in"), :class => "full-width default"
 

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

@@ -1,10 +1,28 @@
 - content_for :title do I18n.t("iugu.account") + " #{@account.id}" end
 
-%h2.no-bottom-margin
+%h2
   = I18n.t("iugu.account_settings")
   
-%h4
-  = "##{@account.id}"
+%table
+  %tr
+    %td
+      = "##{@account.id}"
+
+- if @has_subscription
+  - if @subscription.suspended
+    %div{ :style => "border: 2px solid #F00; padding: 20px;text-align:center;background:#FFCCCC" }
+      %h1.no-bottom-margin
+        Esta conta está suspensa
+      %p.no-bottom-margin
+        Você pode reativar esta conta clicando em ativar ou quitando seus débitos.
+  - elsif @subscription.in_trial
+    %div{ :style => "border: 2px solid #185277; padding: 20px;text-align:center;background:#A6D0E8" }
+      %h1.no-bottom-margin
+        = "Período de testes."
+      %p.no-bottom-margin
+        = "#{@subscription.trial_expires_at.to_date.mjd - Date.today.mjd} dia(s)"
+
+%hr
 
 - if current_user.is?(:owner, @account)
   - if flash[:group] == :account_update
@@ -13,35 +31,39 @@
   = simple_form_for @account, :url => account_update_path(@account), :method => :put do |f|
     = f.text_field :name, :placeholder => I18n.t("activerecord.attributes.name")
 
-    = f.submit I18n.t("iugu.save"), :class => "button default"
+    = f.submit I18n.t("iugu.save"), :class => "button default no-bottom-margin"
+
+- if IuguSDK::enable_multiple_users_per_account
+  = link_to I18n.t("iugu.users_and_roles"), account_users_index_path(@account), class: "button full-width"
+
+%hr
+
+- if @has_subscription
+  %table.table
+    %thead
+      %tr
+        %th
+          = I18n.t "iugu.plan"
+        %th
+    %tbody
+      %tr
+        %td{ :style => "width: 60%" }
+          %h3{ :style => "margin:0px;padding-top:10px;padding-left:10px" }
+            = @plan_name
+        %td{ :style => "width: 40%" }
+          .group.horizontal_stacking
+            = link_to I18n.t("iugu.change"), plan_index_url(@account), class: "button"
+  = link_to I18n.t("iugu.payment_history"), account_payment_history_path(@account), class: "button full-width"
 
-- if IuguSDK::enable_subscription_features
-  = "#{I18n.t "iugu.plan"}: #{@plan_name} "
-  = link_to I18n.t("iugu.change"), plan_index_url
+  %hr
 
 - unless IuguSDK::enable_custom_domain == false && IuguSDK::enable_account_alias == false
-  %br
-  %br
-  = I18n.t("iugu.custom_domains")
-  - if current_user.is?(:owner, @account) || current_user.is?(:admin, @account)
-    = link_to I18n.t("iugu.manage"), account_domains_index_path(@account)
-  %br
-  - if @primary_domain
-    = I18n.t("iugu.primary") + ":"
-    = @primary_domain.url
 
-- if IuguSDK::enable_multiple_users_per_account
-  %br
-  %br
-  = link_to I18n.t("iugu.users_and_roles"), account_users_index_path(@account)
+  - if current_user.is?(:owner, @account) || current_user.is?(:admin, @account)
+    = link_to I18n.t("iugu.custom_domains"), account_domains_index_path(@account), :class => "button full-width"
 
-- if IuguSDK::enable_subscription_features
-  %br
-  %br
-  %div
-    = link_to I18n.t("iugu.payment_history"), account_payment_history_path(@account)
+    %hr
 
-%br
 - if IuguSDK::enable_account_api
   - if current_user.is?(:owner, @account)
     %h2
@@ -66,8 +88,10 @@
                 = token.description
               %td
                 = l token.created_at, :format => :short
+              %td
+                = link_to I18n.t("iugu.remove"), account_remove_token_path(@account, token), :class => "button no-bottom-margin", :confirm => I18n.t("iugu.are_you_sure?"), :method => :delete
             %tr
-              %td{ :colspan => 3 }
+              %td{ :colspan => 4 }
                 = token.token
       = form_tag(account_generate_new_token_path(@account), :method => :post) do
         %h3
@@ -79,11 +103,19 @@
         = submit_tag I18n.t("iugu.create"), :class => "button default"
 
 - if current_user.is?(:owner, @account)
+  - if @has_subscription
+    - if @subscription.suspended
+      = link_to I18n.t("iugu.activate"), account_activate_path(@account), :method => :post, class: "button full-width"
+    - else
+      = link_to I18n.t("iugu.suspend"), account_suspend_path(@account), :method => :post, class: "button full-width"
   - unless @account.destroying?
     - if IuguSDK::enable_account_cancel
-      = link_to I18n.t("iugu.cancel_account"), account_destroy_path(@account), :method => :delete
+      = link_to I18n.t("iugu.cancel_account"), account_destroy_path(@account), :method => :delete, class: "button full-width no-bottom-margin"
   - else
     - if IuguSDK::delay_account_exclusion > 0
-      = link_to I18n.t("iugu.undo"), account_cancel_destruction_path(@account), :method => :delete
+      = link_to I18n.t("iugu.undo"), account_cancel_destruction_path(@account), :method => :delete, class: "button full-width"
     - else
       = I18n.t("iugu.account_destruction_in") + @account.destruction_job.run_at.to_s
+
+- if current_user.accounts.count > 1
+  = link_to I18n.t("iugu.back"), account_settings_path, class: "button"

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

@@ -1,35 +1,31 @@
 - content_for :title do I18n.t("iugu.account_settings") end
 
-%h3
-  = I18n.t "iugu.account_settings"
+- if @accounts.count > 0
 
-- if current_user.accounts.count > 0
-
-  %h3 
-    - if IuguSDK::enable_multiple_accounts
-      = I18n.t("iugu.accounts")
-    - else
-      - if current_user.accounts.count > 1
-        = I18n.t("iugu.accounts")
-      - else
-        = I18n.t("iugu.account")
-
-  - current_user.accounts.each do |account|
-    %div
-      = account.name
-      - if current_user_account.account_id == account.id
-        |
-        = I18n.t("iugu.active")
-      - else
-        |
-        = link_to I18n.t("iugu.select"), account_select_path(account)
-      |
-      = link_to I18n.t("iugu.settings"), account_view_path(account)
+  %table
+    %thead
+      %th
+        Conta
+      %th
+         
+    %tbody
+      - @accounts.each do |account|
+        %tr
+          %td
+            = account.name
+          %td
+            .group.horizontal_stacking
+              - if current_user_account.account_id == account.id
+                = link_to I18n.t("iugu.active"), "javascript:function(){}", :class => "button no-bottom-margin disabled", :style => "width: 50%"
+              - else
+                = link_to I18n.t("iugu.select"), account_select_path(account), :class => "button no-bottom-margin", :style => "width: 50%"
+              = link_to I18n.t("iugu.settings"), account_view_path(account), :class => "button no-bottom-margin", :style => "width: 50%"
 
 - else
   %h2
     = I18n.t("iugu.i_dont_have_any_accounts")
 
+
 - if IuguSDK::enable_multiple_accounts == true
   %div
-    = link_to I18n.t("iugu.create_account"), account_create_path, :method => :post
+    = link_to I18n.t("iugu.create_account"), account_create_path, :method => :post, :class => "button full-width no-bottom-margin default" 

data/config/locales/iugu.en.yml

@@ -1,4 +1,11 @@
 en:
+  invoice_status:
+    pending: "Pending"
+    canceled: "Canceled"
+    paid: "Paid"
+  emails:
+    user_invitation: "You have been invited to %{account_name}"
+    user_welcome: "Welcome to %{application_title}"
   errors:
     messages:
       only_owners_can_destroy_accounts: "Only owners can destroy Accounts"
@@ -7,6 +14,11 @@ en:
       email_already_in_use: "This email is already in use"
       not_supported_api_type: "not supported api type"
   iugu:
+    interval_type:
+      month: "Month"
+      months: "Months"
+      week: "Week"
+      weeks: "Weeks"
     welcome: "Welcome"
     edit: "Edit"
     update: "Update"
@@ -23,6 +35,8 @@ en:
     no_account_action: "Sign up"
     add: "Add"
     active: "Active"
+    activate: "Activate"
+    suspend: "Suspend"
     unnamed: "Unnamed"
     back_to: "Back to"
     back: "Back"
@@ -95,6 +109,7 @@ en:
     plan_name: "Plan name"
     plan: "Plan"
     plans: "Plans"
+    duration: "Duration"
     price: "Price"
     available_plans: "Available Plans"
     your_plan: "Your Plan"
@@ -115,11 +130,16 @@ en:
     guest: "guest"
     become_user: "Become an User"
     notices:
+      account_activated: "Account successfully activated"
+      error_activating_account: "Error activating account"
+      account_suspended: "Account successfully suspended"
+      error_suspending_account: "Error suspending account"
       congrats_for_becoming_user: "Congratulations for becoming an user"
       guest_login: "Guest successfully login"
       subdomain_updated: "Subdomain successfully updated"
       you_are_already_member_of_this_account: "You already member of this account"
       new_token_generated: "New token generated"
+      token_removed: "Token removed"
       account_updated: "Account was successfully updated"
       account_not_found: "Account not found"
       user_invited: "User invited"

data/config/locales/iugu.pt-BR.yml

@@ -1,4 +1,11 @@
 pt-BR:
+  invoice_status:
+    pending: "Pendente"
+    canceled: "Cancelada"
+    paid: "Paga"
+  emails:
+    user_invitation: "Convite para %{account_name}"
+    user_welcome: "Bem-vindo a %{application_title}"
   errors:
     messages:
       only_owners_can_destroy_accounts: "Apenas donos podem remover contas"
@@ -7,6 +14,11 @@ pt-BR:
       email_already_in_use: "Esse email já foi utilizado"
       not_supported_api_type: "tipo de api não suportado"
   iugu:
+    interval_type:
+      month: "Mês"
+      months: "Meses"
+      week: "Semana"
+      weeks: "Semanas"
     welcome: "Bem vindo"
     edit: "Editar"
     update: "Atualizar"
@@ -23,6 +35,8 @@ pt-BR:
     no_account_action: "Registre-se"
     add: "Adicionar"
     active: "Ativa"
+    activate: "Ativar"
+    suspend: "Desativar"
     unnamed: "Sem nome"
     back_to: "Voltar para"
     back: "Voltar"
@@ -98,13 +112,14 @@ pt-BR:
     plan_name: "Nome do Plano"
     plan: "Plano"
     plans: "Planos"
+    duration: "Duração"
     price: "Preço"
     available_plans: "Planos Disponíveis"
     your_plan: "Seu Plano"
     change_plan: "Alterar Plano"
     downgrade: "Rebaixar"
     upgrade: "Aprimorar"
-    custom_domains: "Dominios customizados"
+    custom_domains: "Dominios personalizados"
     api_tokens: "Tokens da API"
     api_type: "Tipo de API"
     api_access: "Acesso via API"
@@ -118,11 +133,16 @@ pt-BR:
     guest: "convidado"
     become_user: "Tornar-se um usuário"
     notices:
+      account_activated: "Conta ativada com sucesso"
+      error_activating_account: "Erro ativando conta"
+      account_suspended: "Conta desativada com sucesso"
+      error_suspending_account: "Erro desativando conta"
       congrats_for_becoming_user: "Parabens por se tornar um usuário!"
       guest_login: "Convidado logado com sucesso"
       subdomain_updated: "Subdominio atualizado com sucesso"
       you_are_already_member_of_this_account: "Você já é membro dessa conta"
       new_token_generated: "Novo token gerado"
+      token_removed: "Token removido"
       account_updated: "Conta atualizada com sucesso."
       account_not_found: "Conta não encontrada"
       user_invited: "Usuário convidado"

data/config/routes.rb

@@ -13,6 +13,9 @@ Rails.application.routes.draw do
     delete "settings/account/(:id)" => "iugu/account#destroy", :as => "account_destroy"
     delete "settings/account/(:id)/cancel" => "iugu/account#cancel_destruction", :as => "account_cancel_destruction"
     post "settings/account/(:account_id)/generate_new_token" => "iugu/account#generate_new_token", :as => "account_generate_new_token"
+    post "settings/account/(:account_id)/activate" => "iugu/account#activate", :as => "account_activate"
+    post "settings/account/(:account_id)/suspend" => "iugu/account#suspend", :as => "account_suspend"
+    delete "settings/account/(:account_id)/remove_token/:token" => "iugu/account#remove_token", :as => "account_remove_token"
     put "settings/account/(:id)" => "iugu/account#update", :as => "account_update"
     post "settings/account" => "iugu/account#create", :as => "account_create"
 

data/db/migrate/20130723173704_add_used_to_user_invitation.rb

@@ -0,0 +1,5 @@
+class AddUsedToUserInvitation < ActiveRecord::Migration
+  def change
+    add_column :user_invitations, :used, :boolean, default: false
+  end
+end

data/lib/iugusdk/version.rb

@@ -1,3 +1,3 @@
 module IuguSDK
-  VERSION = "1.0.0.alpha.21"
+  VERSION = "1.0.0.alpha.22"
 end

data/lib/iugusdk.rb

@@ -18,6 +18,7 @@ require 'koala'
 require 'default_value_for'
 require 'activeuuid'
 require 'iugu-api'
+require 'money'
 require 'iugusdk/uuid_mass_assignment_fix'
 require 'iugusdk/uuid_operators_extensions.rb'
 
@@ -129,7 +130,6 @@ module IuguSDK
   self.default_layout = "settings"
   self.alternative_layout = "iugu-sdk"
 
-
   def initialize
   end