diff --git a/ruby/lib/jam_ruby/models/affiliate_payment.rb b/ruby/lib/jam_ruby/models/affiliate_payment.rb index 81c36a977..1aa29f1c8 100644 --- a/ruby/lib/jam_ruby/models/affiliate_payment.rb +++ b/ruby/lib/jam_ruby/models/affiliate_payment.rb @@ -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') diff --git a/web/app/assets/javascripts/wizard/gear/step_select_gear.js b/web/app/assets/javascripts/wizard/gear/step_select_gear.js index eda4bbe9b..88f07f295 100644 --- a/web/app/assets/javascripts/wizard/gear/step_select_gear.js +++ b/web/app/assets/javascripts/wizard/gear/step_select_gear.js @@ -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 { diff --git a/web/app/assets/javascripts/wizard/gear_utils.js b/web/app/assets/javascripts/wizard/gear_utils.js index 193bc05ed..d50238724 100644 --- a/web/app/assets/javascripts/wizard/gear_utils.js +++ b/web/app/assets/javascripts/wizard/gear_utils.js @@ -197,7 +197,7 @@ } var devices = context.jamClient.FTUEGetAudioDevices(); - logger.debug("FTUEGetAudioDevices: " + JSON.stringify(devices)); + //logger.debug("FTUEGetAudioDevices: " + JSON.stringify(devices)); var loadedDevices = {};