return platidoma
replace simbirsoft logo
Merge branch 'develop'

* develop:
  fix test
  add cost to order
  add platidoma
  platidoma removed
  new logic of orders
  add order_pay_type
  realize logic of orders
  check travis
  tests passed
  no timepad
add user_has_paid_ticket method
add message about paid
update user pay_state with ticket_paid
add method
add promo_code visibility
Merge branch 'hotfix/fixes_to_pay_ticket' into develop

* hotfix/fixes_to_pay_ticket:
  add promo_code visibility
  add method
  update user pay_state with ticket_paid
  replace simbirsoft logo
  return platidoma
Merge branch 'develop' of github.com:ulmic/nastachku into develop

* 'develop' of github.com:ulmic/nastachku:
  delay into users mailer
  resque sheduler
  resque it's work
  resque
  add sidekiq to admin panel