seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* VRFS-3226 - default WDM to 48000 on selection. fix bad filter logic for monthly payments (VRFS-3030)

This commit is contained in:
Seth Call 2015-05-28 08:53:24 -05:00
parent d959a17be4
commit 31a0803019
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruby/lib/jam_ruby/models/affiliate_payment.rb
View File

@ -31,7 +31,7 @@ module JamRuby
query = AffiliatePayment
.includes(affiliate_quarterly_payment: [], affiliate_monthly_payment:[])
.where(affiliate_partner_id: affiliate_partner_id)
.where("payment_type='quarterly' AND closed = true")
.where("(payment_type='quarterly' AND closed = true) OR payment_type='monthly'")
.where('(paid = TRUE or due_amount_in_cents < 10000 or paid is NULL)')
.paginate(:page => page, :per_page => limit)
.order('year ASC, time_sort ASC, payment_type ASC')

6
web/app/assets/javascripts/wizard/gear/step_select_gear.js
View File

@ -884,7 +884,11 @@
// deal with sample rate
if(selectedDeviceInfo && context.jamClient.FTUESetPreferredMixerSampleRate) {
// get the preferred sample rate for the device, and set that as the initial value of the sample rate dropdown
if (selectedDeviceInfo.input.info.port_audio_name != 'Default Input') {
// except for WKS; we just default to 48
if (selectedDeviceInfo.input.info.type == 'Win32_wdm') {
var inputSampleRate = 48000;
}
else if (selectedDeviceInfo.input.info.port_audio_name != 'Default Input') {
var inputSampleRate = context.jamClient.FTUEgetInputDeviceSampleRate(selectedDeviceInfo.input.info.port_audio_name);
}
else {

2
web/app/assets/javascripts/wizard/gear_utils.js
View File

@ -197,7 +197,7 @@
}
var devices = context.jamClient.FTUEGetAudioDevices();
logger.debug("FTUEGetAudioDevices: " + JSON.stringify(devices));
//logger.debug("FTUEGetAudioDevices: " + JSON.stringify(devices));
var loadedDevices = {};