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

data/app/assets/stylesheets/iugu-sdk.css.sass

@@ -88,7 +88,7 @@
         float: none
         display: inline
         text-decoration: underline
-        color: #090
+        font-weight: bold
 
     .text
       display: block
@@ -141,6 +141,14 @@
     .tabbed .container
       overflow: hidden
 
+.form_no_margin_bottom
+  form
+    margin-bottom: 20px
+
+.plan
+  td
+    line-height: 44px
+
 @include for-small-screens(390px)
   .iugu-ui,.iugu-ui.settings
     .wrapper

data/app/assets/stylesheets/settings.sass

@@ -1,3 +1,6 @@
+@import "iugu-ux/core"
+@import "compass/utilities/general/clearfix"
+
 .container
   .header
     position: relative
@@ -9,4 +12,13 @@
       position: absolute
       top: 18px
       right: 18px
-      width: 160px
+      width: 180px
+
+@include for-small-screens(390px)
+  .container
+    .header
+      #btn-settings-back
+        display: block
+        width: 100%
+        top: -53px
+        left: 0px

data/app/controllers/iugu/account_controller.rb

@@ -4,6 +4,7 @@ class Iugu::AccountController < Iugu::AccountSettingsController
   before_filter(:only => [:generate_new_token]) { |c| c.must_be :owner, :account_id }
   
   def index
+    @accounts = current_user.accounts.order(:created_at)
     render 'iugu/settings/accounts'
   end
 
@@ -13,10 +14,16 @@ class Iugu::AccountController < Iugu::AccountSettingsController
     else
       @account = current_user_account.account
     end
+
+    @has_subscription = false
+
     if IuguSDK::enable_subscription_features
-      subscription = Iugu::Api::Subscription.find @account.subscription_id
-      plan = Iugu::Api::Plan.find_by_identifier subscription.plan_identifier
-      @plan_name = plan.try :name
+      unless @account.subscription_id.blank?
+        @has_subscription = true
+        @subscription = @account.subscription
+        plan = Iugu::Api::Plan.find_by_identifier @subscription.plan_identifier
+        @plan_name = plan.try :name
+      end
     end
     @primary_domain = @account.account_domains.where(:primary => true).first if @account
     render 'iugu/settings/account'
@@ -54,7 +61,13 @@ class Iugu::AccountController < Iugu::AccountSettingsController
   end
 
   def create
-    current_user.accounts << Account.create
+    create_parameters = {}
+    if IuguSDK::enable_subscription_features
+      plan_identifier = params[:plan] || IuguSDK::default_subscription_name
+      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
   end
 
@@ -72,22 +85,59 @@ class Iugu::AccountController < Iugu::AccountSettingsController
     else
       raise ActionController::RoutingError.new('Not found')
     end
+  end
 
+  def remove_token
+    if IuguSDK::enable_account_api
+      account = current_user.accounts.find params[:account_id]
+      token = account.tokens.find params[:token] 
+      if token.destroy
+        notice = I18n.t("iugu.notices.token_removed")
+      else
+        notice = token.errors.full_messages
+      end
+      flash[:group] = :api_token
+      redirect_to account_view_path(params[:account_id]), :notice => notice
+    else
+      raise ActionController::RoutingError.new('Not found')
+    end
   end
 
   def payment_history
     get_account
-    subscription = Iugu::Api::Subscription.find @account.subscription_id
+    subscription = Iugu::Api::Subscription.find @account.subscription_id.to_uuid.to_s
     customer = Iugu::Api::Customer.find subscription.customer_id
-    @invoices = customer.invoices({status_filter: ["pending", "paid"]})
+    @invoices = Iugu::Api::Invoice.find :all, params: {hl: current_user.locale, customer_id: customer.id.to_param, status_filter: ["pending", "paid"], limit: 10}
     render 'iugu/account/payment_history'
   end
 
+  def activate
+    get_account
+    if @account.subscription.try :activate 
+      notice = I18n.t("iugu.notices.account_activated")
+      @account.clear_cached_subscription_active
+    else
+      notice = I18n.t("iugu.notices.error_activating_account")
+    end
+    redirect_to account_view_path(params[:account_id]), :notice => notice
+  end
+
+  def suspend
+    get_account
+    if @account.subscription.try :suspend 
+      notice = I18n.t("iugu.notices.account_suspended")
+      @account.clear_cached_subscription_active
+    else
+      notice = I18n.t("iugu.notices.error_suspending_account")
+    end
+    redirect_to account_view_path(params[:account_id]), :notice => notice
+  end
+
   private
 
   def get_account
-    if params[:id]
-      @account = current_user.accounts.find(params[:id])
+    if params[:account_id]
+      @account = current_user.accounts.find(params[:account_id])
     else
       @account = current_user_account.account
     end

data/app/controllers/iugu/invitations_controller.rb

@@ -1,6 +1,8 @@
 class Iugu::InvitationsController < Iugu::SettingsController
 
+  skip_before_filter :authenticate_user!, :only => :edit
   before_filter(:only => [:new, :create]) { |c| c.must_be [:owner, :admin], :account_id } 
+  after_filter :select_account, :only => [:update]
 
   def new
     @user_invitation = UserInvitation.new
@@ -21,17 +23,14 @@ class Iugu::InvitationsController < Iugu::SettingsController
   end
 
   def edit
-    if @user_invitation = UserInvitation.find_by_invitation_token(params[:invitation_token])
-      @inviter = User.find(@user_invitation.invited_by)
-    else
-      raise ActionController::RoutingError.new('Not Found')
-    end
+    raise ActionController::RoutingError.new('Not Found') unless @user_invitation = UserInvitation.find_by_invitation_token(params[:invitation_token])
+    @inviter = User.find(@user_invitation.invited_by)
   end
 
   def update
     if @user_invitation = UserInvitation.find_by_invitation_token(params[:invitation_token])
       if @user_invitation.accept(current_user)
-        redirect_to root_path
+        redirect_to IuguSDK::app_main_url
       else
         redirect_to root_path, :notice => I18n.t("iugu.notices.you_are_already_member_of_this_account")
       end
@@ -39,5 +38,4 @@ class Iugu::InvitationsController < Iugu::SettingsController
       raise ActionController::RoutingError.new('Not Found')
     end
   end
-
 end

data/app/controllers/iugu/plan_controller.rb

@@ -9,8 +9,8 @@ class Iugu::PlanController < Iugu::AccountSettingsController
     return unless params[:plan]
     params[:id] ? @account = current_user.accounts.find(params[:id]) : @account = current_user_account.account
 
-    subscription = Iugu::Api::Subscription.find @account.subscription_id
-    subscription.change_plan params[:plan]
+    subscription = Iugu::Api::Subscription.find @account.subscription_id.to_uuid.to_s
+    @account.clear_cached_subscription_features if subscription.change_plan params[:plan]
 
     get_index_data
     render 'iugu/plan/index'
@@ -21,6 +21,7 @@ class Iugu::PlanController < Iugu::AccountSettingsController
   def get_index_data
     @currency = locale_to_currency I18n.locale
     @plans = Iugu::Api::Plan.with_currency @currency
-    @subscription = Iugu::Api::Subscription.find @account.subscription_id
+
+    @subscription = Iugu::Api::Subscription.find @account.subscription_id.to_uuid.to_s
   end
 end

data/app/controllers/iugu/pricing_controller.rb

@@ -2,7 +2,7 @@ class Iugu::PricingController < ApplicationController
   before_filter :verify_api_key, :only => [ :index ]
 
   def index
-    @plans = Iugu::Api::Plan.all
+    @plans = Iugu::Api::Plan.all params: {hl: current_user.locale}
   end
   
 end

data/app/controllers/iugu/registrations_controller.rb

@@ -17,6 +17,10 @@ class Iugu::RegistrationsController < Devise::RegistrationsController
   end
 
   def create
+    if !params[:user][:user_invitation].blank? 
+      invite = UserInvitation.find_by_invitation_token(params[:user][:user_invitation])
+      return invalid_invitation if !invite or invite.try(:used)
+    end
     params[:user][:locale] = @matched_locale_from_browser unless params[:user][:locale]
     super
   end
@@ -29,7 +33,6 @@ class Iugu::RegistrationsController < Devise::RegistrationsController
       select_account
       flash[:notice] = I18n.t("iugu.notices.guest_login")
       redirect_to IuguSDK::app_main_url
-      #respond_with @user, :location => sign_up_path_for(@user)
     else
       raise ActionController::RoutingError.new("Not found")
     end
@@ -41,6 +44,10 @@ class Iugu::RegistrationsController < Devise::RegistrationsController
 
   private
 
+  def invalid_invitation
+    redirect_to new_user_registration_path
+  end
+
   def verify_private_api_secret
     if request.format.json?
       render :json=>{:errors=>"Unauthorized"}, :status=>401 unless params[:private_api_secret] == IuguSDK::private_api_secret 

data/app/controllers/iugu/sessions_controller.rb

@@ -1,13 +1,21 @@
 class Iugu::SessionsController < Devise::SessionsController
   after_filter :select_account, :only => :create 
 
+  layout IuguSDK.alternative_layout
+
   def after_sign_in_path_for(resource_or_scope)
-    IuguSDK::app_main_url
+    puts params
+    params[:user].try(:[], :user_invitation).blank? ? IuguSDK::app_main_url : invitation_url
   end
 
   def after_sign_out_path_for(resource_or_scope)
     IuguSDK::app_root_url
   end
 
-  layout IuguSDK.alternative_layout
+  private
+
+  def invitation_url
+    edit_invite_url(:invitation_token => params[:user][:user_invitation])
+  end
+
 end

data/app/mailers/iugu_mailer.rb

@@ -1,7 +1,7 @@
 class IuguMailer < Devise::Mailer
 
-  default from: "iugu <do-not-respond@iugu.com>",
-          reply_to: "iugu <do-not-respond@iugu.com>"
+  default from: "Iugu <no-reply@iugu.com>",
+          reply_to: "Iugu <no-reply@iugu.com>"
 
   def template_paths
     "iugu/mailer"
@@ -17,7 +17,7 @@ class IuguMailer < Devise::Mailer
     user = User.find(user_invitation.invited_by)
     set_locale(user)
     @user_invitation = user_invitation
-    mail(to: @user_invitation.email, :subject => I18n.t("user_invitation")) do |format|
+    mail(to: @user_invitation.email, :subject => I18n.t("user_invitation", account_name: @user_invitation.account.try(:name))) do |format|
       format.html { render "iugu/mailer/invitation" }
     end
     set_default_locale
@@ -26,7 +26,7 @@ class IuguMailer < Devise::Mailer
   def welcome(user)
     set_locale(user)
     @user = user
-    mail(to: @user.email, :subject => I18n.t("user_welcome")) do |format|
+    mail(to: @user.email, :subject => I18n.t("user_welcome", application_title: IuguSDK::application_title)) do |format|
       format.html { render "iugu/mailer/welcome" }
     end
     set_default_locale

data/app/models/account.rb

@@ -53,6 +53,43 @@ class Account < ActiveRecord::Base
   def name
     (super.blank? ? "#{I18n.t('iugu.account')} ##{id}" : super)
   end
+
+  def subscription
+    return nil unless subscription_id
+    Iugu::Api::Subscription.find subscription_id.to_uuid.to_s
+  end
+
+  def cached_subscription_active?
+    key = [self, "subscription_active?"]
+    if Rails.cache.exist? key
+      Rails.cache.read key
+    else
+      active = subscription_active?
+      active ? time = 1.day : time = 5.minutes
+      Rails.cache.write key, active, expires_in: time
+      active
+    end
+  end
+
+  def clear_cached_subscription_active
+    Rails.cache.delete [self, "subscription_active?"]
+  end
+
+  def cached_subscription_features
+    Rails.cache.fetch([self, "subscription_features"], expires_in: 1.day) { JSON.parse(subscription_features.to_json) || {} }
+  end
+
+  def clear_cached_subscription_features
+    Rails.cache.delete [self, "subscription_features"]
+  end
+
+  def subscription_active?
+    subscription.try :active 
+  end
+
+  def subscription_features
+    subscription.try :features
+  end
   
   private
 

data/app/models/user.rb

@@ -20,11 +20,11 @@ class User < ActiveRecord::Base
          :recoverable, :rememberable, :validatable, :omniauthable
 
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me, :locale, :name, :birthdate, :guest, :account_alias, :plan_identifier, :currency
+  attr_accessible :email, :password, :password_confirmation, :remember_me, :locale, :name, :birthdate, :guest, :account_alias, :plan_identifier, :currency, :user_invitation
 
   attr_accessor :plan_identifier, :currency
 
-  mattr_accessor :account_alias
+  mattr_accessor :account_alias, :user_invitation
   
   before_destroy :destroy_private_accounts
 
@@ -32,10 +32,16 @@ class User < ActiveRecord::Base
 
   after_create :init_token, :if => Proc.new { IuguSDK::enable_user_api }
 
-  after_create :create_account_for_user
+  after_create :create_account_for_user, :if => Proc.new { accountable? && !user_invitation }
+
+  after_create :accept_invitation, :if => Proc.new { |user| !user.user_invitation.blank? }
 
   after_create :send_welcome_mail, :if => Proc.new { |r| IuguSDK::enable_welcome_mail && !r.email.blank? }
 
+  after_rollback do
+    Rails.logger.info errors.full_messages
+  end
+
   before_save :skip_reconfirmation!, :unless => Proc.new { IuguSDK::enable_email_reconfirmation }
 
   validates :email, :email => true, :unless => :guest?
@@ -155,8 +161,20 @@ class User < ActiveRecord::Base
 
   private
 
+  def accept_invitation
+    @invite = UserInvitation.find_by_invitation_token(user_invitation)
+    @invite.accept(self) if @invite
+  end
+
   def init_token
-    self.token = ApiToken.create(tokenable: self, api_type: "USER", description: "User")
+    for i in 0..256 do
+      begin
+        self.token = ApiToken.create(tokenable: self, api_type: "USER", description: "User")
+        break unless token.nil?
+      rescue
+        next
+      end
+    end
   end
 
   def destroy_private_accounts
@@ -181,11 +199,8 @@ class User < ActiveRecord::Base
   @reconfirmable = true
   
   def create_account_for_user
-    if accountable?
-      new_account = Account.create( :subdomain => account_alias, plan_identifier: plan_identifier, currency: currency, email: email)
-      account_user = new_account.account_users.create( { :user => self } )
-    end
+    new_account = Account.create( :subdomain => account_alias, plan_identifier: plan_identifier, currency: currency, email: email)
+    account_user = new_account.account_users.create( { :user => self } )
   end
 
-
 end

data/app/models/user_invitation.rb

@@ -28,6 +28,8 @@ class UserInvitation < ActiveRecord::Base
     if account.account_users.where(:user_id => user.id).empty?
       account_user = account.account_users.create(:user => user)
       account_user.set_roles(roles.split(',')) if roles
+      self.used = true
+      save
       true
     else
       false

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

@@ -1,13 +1,21 @@
+%h3
+  Histórico de Pagamentos
+
 %table
   %tr
     %th ID
     %th Total
+    %th Vencimento
     %th Status
   - @invoices.each do |invoice|
     %tr
       %td
-        = invoice.id
+        = link_to invoice.id[-8,8], invoice.secure_url, :target => "_blank"
       %td
         = invoice.total
       %td
-        = invoice.status
+        = I18n.l invoice.due_date.to_date, format: :short
+      %td
+        = I18n.t "invoice_status.#{invoice.status}"
+
+= link_to I18n.t("iugu.back"), account_view_path(id: params[:account_id]), class: "button no-bottom-margin"

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

@@ -1,59 +1,77 @@
 %h2
-  = I18n.t("iugu.account_domains") + " (##{@account.id})"
+  = I18n.t("iugu.account_domains")
+
 - if flash[:group] == :account_domain
-  = flash[:notice]
+  .notice.notice-green
+    = flash[:notice]
 
 - if IuguSDK::enable_account_alias == true
   %div
     = simple_form_for @account, :url => update_subdomain_path(:id => @account.id), :method => :put do |f|
       - if @account.errors.any?
-        #error_explanation{ :style => "margin-bottom: 15px" }
+        .notice.notice-red
           %ul
             - @account.errors.full_messages.each do |msg|
               %li
                 = msg
-  
-      = f.label :subdomain
-      = f.text_field :subdomain
-      = f.submit I18n.t("iugu.save")
+
+      .clearfix
+        .left{ :style => "width:60%;float:left" }
+          = f.label :subdomain, "Subdomínio"
+          = f.text_field :subdomain
+        .right{ :style => "width:40%;float:right;padding-top:30px" }
+          %div{ :style => "padding-left:10px" }
+            = "." + IuguSDK::application_main_host
+      = f.submit I18n.t("iugu.save"), :class => "button full-width"
 
 - if IuguSDK::enable_custom_domain == true
 
   %div
     = simple_form_for @account_domain, :url => create_domain_path(@account.id) do |f|
+
       - if @account_domain.errors.any?
-        #error_explanation{ :style => "margin-bottom: 15px" }
+        .notice.notice-red{ :style => "margin-bottom: 15px" }
           %ul
             - @account_domain.errors.full_messages.each do |msg|
               %li
                 = msg
 
-      = f.text_field :url
-      = f.submit I18n.t("iugu.add")
-  %br
-  %div
-    - @account_domains.each do |domain|
-      %div
-
-        = domain.url
+      = f.text_field :url, :placeholder => "Domínio"
+      = f.submit I18n.t("iugu.add"), :class => "button full-width no-margin-bottom"
 
-        - if domain.primary
-          |
-          = I18n.t("iugu.primary")
-        - else
-          - if domain.verified
-            |
-            = link_to I18n.t("iugu.set_primary"), primary_domain_path(:account_id => @account.id, :domain_id => domain.id), :method => :post
+  - if @account_domains.count > 0
+    %table.table
+      %thead
+        %tr
+          %th
+            Domínio
+          %th
 
-        |
-        - if domain.verified
-          = I18n.t("iugu.verified")
-        - else
-          = link_to I18n.t("iugu.not_verified"), account_domains_instructions_path(:account_id => @account.id, :domain_id => domain.id)
+      %tbody
+      - @account_domains.each do |domain|
+        %tr
+          %td{ :style => "text-align:center;width:60%" }
+            %h4.no-bottom-margin
+              = domain.url
+            %div{ :style => "color:#090;text-align:center;font-weight:bold;text-transform:uppercase;font-size:10px" }
+              - if domain.primary
+                = "#{I18n.t("iugu.primary")}"
 
-        - if current_user.is?(:owner, @account)
-          |
-          = link_to I18n.t("iugu.remove"), account_domains_destroy_path(:account_id => @account.id, :domain_id => domain.id), :method => :delete
+              - if domain.verified
+                = I18n.t("iugu.verified")
+            - unless domain.verified
+              %div{ :style => "color:#900;text-align:center;font-weight:bold;text-transform:uppercase;font-size:10px" }
+                = I18n.t("iugu.not_verified")
+          %td{ :style => "width:40%" }
+            .group
+              - unless domain.primary
+                - if domain.verified
+                  = link_to I18n.t("iugu.set_primary"), primary_domain_path(:account_id => @account.id, :domain_id => domain.id), :method => :post, :class => "button small"
 
+              - unless domain.verified
+                = link_to I18n.t("iugu.verify_domain"), account_domains_instructions_path(:account_id => @account.id, :domain_id => domain.id), :class => "button small"
 
+              - if current_user.is?(:owner, @account)
+                = link_to I18n.t("iugu.remove"), account_domains_destroy_path(:account_id => @account.id, :domain_id => domain.id), :method => :delete, :class => "button small"
 
+= link_to I18n.t("iugu.back"), account_view_path(id: params[:account_id]), class: "button no-bottom-margin"

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

@@ -1,7 +1,26 @@
 %div
-  Token:
-  = @domain.calculate_token
+  %h3
+    Confirmar a propriedade do domínio
+
+  %table
+    %tr
+      %td{ :style => "text-align:center" }
+        = @domain.url
+
+  %p
+    Para podermos ativar o domínio no #{IuguSDK::application_title}, precisamos confirmar se você é o proprietário. Fazemos isto por meio da confirmação da propriedade do domínio. Isso protege seu domínio, garantindo que somente sua organização possa ativar o uso em nosso sistema.
+
+  %p
+    Para confirmar seu domínio, você deve criar um registro CNAME em seu painel de gerenciamento de domínios (Consulte seu provedor de serviços DNS). Adicione uma entrada CNAME com token abaixo:
+  %table
+    %tr
+      %td{ :style => "text-align:center" }
+        = @domain.calculate_token
+  %p
+    Após inserir o registro em seu painel. Você pode continuar com a verificação do domínio
+%div{ :style => "padding-bottom: 5px" }
+  = link_to I18n.t("iugu.verify_domain"), verify_domain_path(:account_id => @account.id, :domain_id => @domain.id), :method => :post, :class => "button full-width no-bottom-margin"
 %div
-  = link_to I18n.t("iugu.verify_domain"), verify_domain_path(:account_id => @account.id, :domain_id => @domain.id), :method => :post
-%div
-  = link_to I18n.t("iugu.verify_later"), account_domains_index_path(@account.id)
+  = link_to I18n.t("iugu.verify_later"), account_domains_index_path(@account.id), :class => "button full-width"
+
+= link_to I18n.t("iugu.back"), account_domains_index_path(id: params[:account_id]), class: "button no-bottom-margin"

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

@@ -1,17 +1,29 @@
 = form_tag(account_roles_update_path(@account, :user_id => @account_user.user)) do
 
-  - if current_user.is?(:owner, @account)
-    - APP_ROLES['roles'].each do |role|
-      %div
-        = check_box_tag "roles[]", role, @account_user.is?(role), :id => "#{role}_checkbox"
-        = label_tag "#{role}_checkbox", I18n.t("iugu.#{role}")
+  %h3
+    Permissões
 
-  - elsif current_user.is?(:admin, @account)
-    - APP_ROLES['roles'].each do |role|
-      - unless role == APP_ROLES['owner_role'] || role == APP_ROLES['admin_role']
-        %div
+  %table
+    %tbody
+      %tr
+        %td
+          = @account_user.user.email
+
+  %div{ :style => "margin-bottom:20px" }
+    - if current_user.is?(:owner, @account)
+      - APP_ROLES['roles'].each do |role|
+        %div{ :style => "margin-bottom: 5px" }
           = check_box_tag "roles[]", role, @account_user.is?(role), :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{ :style => "margin-bottom: 5px" }
+            = check_box_tag "roles[]", role, @account_user.is?(role), :id => "#{role}_checkbox"
+            = label_tag "#{role}_checkbox", I18n.t("iugu.#{role}")
     
   %div
-    = submit_tag I18n.t("iugu.save")
+    = submit_tag I18n.t("iugu.save"), :class => "button full-width"
+
+= link_to I18n.t("iugu.back"), account_users_index_path(account_id: params[:id]), class: "button no-bottom-margin"