Skip to content

Commit

Permalink
Latest changes
Browse files Browse the repository at this point in the history
  • Loading branch information
demuskov committed Apr 22, 2018
1 parent c367512 commit b5f4d0f
Show file tree
Hide file tree
Showing 22 changed files with 6,566 additions and 1,091 deletions.
29 changes: 28 additions & 1 deletion app/assets/javascripts/funds/models/withdraw.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Withdraw extends PeatioModel.Model
when 'bitg' then 'bitcoingreens'
when 'crft' then 'craftrs'
when 'env' then 'enviromints'
when 'sng' then 'snowgems'
when 'xsg' then 'snowgems'
when 'nyc' then 'newyorkcoins'
when 'zoc' then 'zeroonecoins'
when 'btcz' then 'bitcoinzs'
Expand Down Expand Up @@ -148,6 +148,33 @@ class Withdraw extends PeatioModel.Model
when 'varius' then 'variuscoins'
when 'cyr' then 'cyphercoins'
when 'bbrc' then 'blooddonationcoins'
when 'ikt' then 'innoketcoins'
when 'bsl' then 'bitsolocoins'
when 'bff' then 'bffcoins'
when 'toba' then 'tobacoins'
when 'alps' then 'alpenschillingcoins'
when 'rlm' then 'relariumcoins'
when 'vzh' then 'vizehcoins'
when 'rco' then 'rampantcoins'
when 'cbc' then 'cubiscoins'
when 'exam' then 'examinationcoins'
when 'nah' then 'strayacoins'
when 'slash' then 'slashcoins'
when 'adr' then 'adirondackcoins'
when 'htrc' then 'hightemperaturecoins'
when 'ice' then 'frozencoins'
when 'ebs' then 'elbruscoins'
when 'xeh' then 'xerumcashcoins'
when 'krm' then 'kickerroomcoins'
when 'cgur' then 'allcoingurucoins'
when 'vre' then 'versuscoins'
when 'her' then 'heracoins'
when 'bzm' then 'blazariumcoins'
when 'itis' then 'itisnetworkcoins'
when 'hpp' then 'hppcoins'
when 'dsn' then 'designcoins'
when 'demos' then 'demoscoins'
when 'jagar' then 'jagaricoinrs'
#currency

window.Withdraw = Withdraw
27 changes: 27 additions & 0 deletions app/assets/javascripts/locales/en.js.erb
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,33 @@

































Expand Down
29 changes: 28 additions & 1 deletion app/assets/stylesheets/market.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ left_side_tabs_wrapper {
&.bitg { tr.quote-bitg { display: block; } }
&.crft { tr.quote-crft { display: block; } }
&.env { tr.quote-env { display: block; } }
&.sng { tr.quote-sng { display: block; } }
&.xsg { tr.quote-xsg { display: block; } }
&.nyc { tr.quote-nyc { display: block; } }
&.zoc { tr.quote-zoc { display: block; } }
&.btcz { tr.quote-btcz { display: block; } }
Expand Down Expand Up @@ -785,6 +785,33 @@ left_side_tabs_wrapper {
&.varius { tr.quote-varius { display: block; } }
&.cyr { tr.quote-cyr { display: block; } }
&.bbrc { tr.quote-bbrc { display: block; } }
&.ikt { tr.quote-ikt { display: block; } }
&.bsl { tr.quote-bsl { display: block; } }
&.bff { tr.quote-bff { display: block; } }
&.toba { tr.quote-toba { display: block; } }
&.alps { tr.quote-alps { display: block; } }
&.rlm { tr.quote-rlm { display: block; } }
&.vzh { tr.quote-vzh { display: block; } }
&.rco { tr.quote-rco { display: block; } }
&.cbc { tr.quote-cbc { display: block; } }
&.exam { tr.quote-exam { display: block; } }
&.nah { tr.quote-nah { display: block; } }
&.slash { tr.quote-slash { display: block; } }
&.adr { tr.quote-adr { display: block; } }
&.htrc { tr.quote-htrc { display: block; } }
&.ice { tr.quote-ice { display: block; } }
&.ebs { tr.quote-ebs { display: block; } }
&.xeh { tr.quote-xeh { display: block; } }
&.krm { tr.quote-krm { display: block; } }
&.cgur { tr.quote-cgur { display: block; } }
&.vre { tr.quote-vre { display: block; } }
&.her { tr.quote-her { display: block; } }
&.bzm { tr.quote-bzm { display: block; } }
&.itis { tr.quote-itis { display: block; } }
&.hpp { tr.quote-hpp { display: block; } }
&.dsn { tr.quote-dsn { display: block; } }
&.demos { tr.quote-demos { display: block; } }
&.jagar { tr.quote-jagar { display: block; } }
/*markets*/
}
}
Expand Down
6 changes: 6 additions & 0 deletions app/controllers/listing_requests_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ def create

def update
@listing_request = ListingRequest.find(params[:id])

if @listing_request.aasm_state != "void"
render nothing: true
return
end

@listing_request.update_attributes(listing_request_params)

if !simple_captcha_valid?
Expand Down
58 changes: 56 additions & 2 deletions app/controllers/private/assets_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def index
@bitg_proof = Proof.current :bitg
@crft_proof = Proof.current :crft
@env_proof = Proof.current :env
@sng_proof = Proof.current :sng
@xsg_proof = Proof.current :xsg
@nyc_proof = Proof.current :nyc
@zoc_proof = Proof.current :zoc
@btcz_proof = Proof.current :btcz
Expand Down Expand Up @@ -135,6 +135,33 @@ def index
@varius_proof = Proof.current :varius
@cyr_proof = Proof.current :cyr
@bbrc_proof = Proof.current :bbrc
@ikt_proof = Proof.current :ikt
@bsl_proof = Proof.current :bsl
@bff_proof = Proof.current :bff
@toba_proof = Proof.current :toba
@alps_proof = Proof.current :alps
@rlm_proof = Proof.current :rlm
@vzh_proof = Proof.current :vzh
@rco_proof = Proof.current :rco
@cbc_proof = Proof.current :cbc
@exam_proof = Proof.current :exam
@nah_proof = Proof.current :nah
@slash_proof = Proof.current :slash
@adr_proof = Proof.current :adr
@htrc_proof = Proof.current :htrc
@ice_proof = Proof.current :ice
@ebs_proof = Proof.current :ebs
@xeh_proof = Proof.current :xeh
@krm_proof = Proof.current :krm
@cgur_proof = Proof.current :cgur
@vre_proof = Proof.current :vre
@her_proof = Proof.current :her
@bzm_proof = Proof.current :bzm
@itis_proof = Proof.current :itis
@hpp_proof = Proof.current :hpp
@dsn_proof = Proof.current :dsn
@demos_proof = Proof.current :demos
@jagar_proof = Proof.current :jagar
#proof

if current_user
Expand All @@ -160,7 +187,7 @@ def index
@bitg_account = current_user.accounts.with_currency(:bitg).first
@crft_account = current_user.accounts.with_currency(:crft).first
@env_account = current_user.accounts.with_currency(:env).first
@sng_account = current_user.accounts.with_currency(:sng).first
@xsg_account = current_user.accounts.with_currency(:xsg).first
@nyc_account = current_user.accounts.with_currency(:nyc).first
@zoc_account = current_user.accounts.with_currency(:zoc).first
@btcz_account = current_user.accounts.with_currency(:btcz).first
Expand Down Expand Up @@ -270,6 +297,33 @@ def index
@varius_account = current_user.accounts.with_currency(:varius).first
@cyr_account = current_user.accounts.with_currency(:cyr).first
@bbrc_account = current_user.accounts.with_currency(:bbrc).first
@ikt_account = current_user.accounts.with_currency(:ikt).first
@bsl_account = current_user.accounts.with_currency(:bsl).first
@bff_account = current_user.accounts.with_currency(:bff).first
@toba_account = current_user.accounts.with_currency(:toba).first
@alps_account = current_user.accounts.with_currency(:alps).first
@rlm_account = current_user.accounts.with_currency(:rlm).first
@vzh_account = current_user.accounts.with_currency(:vzh).first
@rco_account = current_user.accounts.with_currency(:rco).first
@cbc_account = current_user.accounts.with_currency(:cbc).first
@exam_account = current_user.accounts.with_currency(:exam).first
@nah_account = current_user.accounts.with_currency(:nah).first
@slash_account = current_user.accounts.with_currency(:slash).first
@adr_account = current_user.accounts.with_currency(:adr).first
@htrc_account = current_user.accounts.with_currency(:htrc).first
@ice_account = current_user.accounts.with_currency(:ice).first
@ebs_account = current_user.accounts.with_currency(:ebs).first
@xeh_account = current_user.accounts.with_currency(:xeh).first
@krm_account = current_user.accounts.with_currency(:krm).first
@cgur_account = current_user.accounts.with_currency(:cgur).first
@vre_account = current_user.accounts.with_currency(:vre).first
@her_account = current_user.accounts.with_currency(:her).first
@bzm_account = current_user.accounts.with_currency(:bzm).first
@itis_account = current_user.accounts.with_currency(:itis).first
@hpp_account = current_user.accounts.with_currency(:hpp).first
@dsn_account = current_user.accounts.with_currency(:dsn).first
@demos_account = current_user.accounts.with_currency(:demos).first
@jagar_account = current_user.accounts.with_currency(:jagar).first
#account
end
end
Expand Down
54 changes: 54 additions & 0 deletions app/models/admin/ability.rb
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,33 @@ def initialize(user)
can :manage, ::Deposits::Variuscoin
can :manage, ::Deposits::Cyphercoin
can :manage, ::Deposits::Blooddonationcoin
can :manage, ::Deposits::Innoketcoin
can :manage, ::Deposits::Bitsolocoin
can :manage, ::Deposits::Bffcoin
can :manage, ::Deposits::Tobacoin
can :manage, ::Deposits::Alpenschillingcoin
can :manage, ::Deposits::Relariumcoin
can :manage, ::Deposits::Vizehcoin
can :manage, ::Deposits::Rampantcoin
can :manage, ::Deposits::Cubiscoin
can :manage, ::Deposits::Examinationcoin
can :manage, ::Deposits::Strayacoin
can :manage, ::Deposits::Slashcoin
can :manage, ::Deposits::Adirondackcoin
can :manage, ::Deposits::Hightemperaturecoin
can :manage, ::Deposits::Frozencoin
can :manage, ::Deposits::Elbruscoin
can :manage, ::Deposits::Xerumcashcoin
can :manage, ::Deposits::Kickerroomcoin
can :manage, ::Deposits::Allcoingurucoin
can :manage, ::Deposits::Versuscoin
can :manage, ::Deposits::Heracoin
can :manage, ::Deposits::Blazariumcoin
can :manage, ::Deposits::Itisnetworkcoin
can :manage, ::Deposits::Hppcoin
can :manage, ::Deposits::Designcoin
can :manage, ::Deposits::Demoscoin
can :manage, ::Deposits::Jagaricoinr
#deposit

can :menu, Withdraw
Expand Down Expand Up @@ -285,6 +312,33 @@ def initialize(user)
can :manage, ::Withdraws::Variuscoin
can :manage, ::Withdraws::Cyphercoin
can :manage, ::Withdraws::Blooddonationcoin
can :manage, ::Withdraws::Innoketcoin
can :manage, ::Withdraws::Bitsolocoin
can :manage, ::Withdraws::Bffcoin
can :manage, ::Withdraws::Tobacoin
can :manage, ::Withdraws::Alpenschillingcoin
can :manage, ::Withdraws::Relariumcoin
can :manage, ::Withdraws::Vizehcoin
can :manage, ::Withdraws::Rampantcoin
can :manage, ::Withdraws::Cubiscoin
can :manage, ::Withdraws::Examinationcoin
can :manage, ::Withdraws::Strayacoin
can :manage, ::Withdraws::Slashcoin
can :manage, ::Withdraws::Adirondackcoin
can :manage, ::Withdraws::Hightemperaturecoin
can :manage, ::Withdraws::Frozencoin
can :manage, ::Withdraws::Elbruscoin
can :manage, ::Withdraws::Xerumcashcoin
can :manage, ::Withdraws::Kickerroomcoin
can :manage, ::Withdraws::Allcoingurucoin
can :manage, ::Withdraws::Versuscoin
can :manage, ::Withdraws::Heracoin
can :manage, ::Withdraws::Blazariumcoin
can :manage, ::Withdraws::Itisnetworkcoin
can :manage, ::Withdraws::Hppcoin
can :manage, ::Withdraws::Designcoin
can :manage, ::Withdraws::Demoscoin
can :manage, ::Withdraws::Jagaricoinr
#withdraw

end
Expand Down
4 changes: 2 additions & 2 deletions app/models/two_factor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ def set_require_signin
end

def reset_require_signin
update require_signin: 0
update require_signin: nil
end

def deactive!
update activated: false
update activated: false, require_signin: nil
end

private
Expand Down
Loading

0 comments on commit b5f4d0f

Please sign in to comment.