* VRFS-3220 - estimated taxes fixed

This commit is contained in:
Seth Call 2015-05-07 14:48:16 -05:00
parent 4df95f45fe
commit 2495f58bf5
7 changed files with 58 additions and 4 deletions

View File

@ -4,8 +4,6 @@ ActiveAdmin.register_page "Fake Purchaser" do
page_action :bulk_jamtrack_purchase, :method => :post do
puts params.inspect
user_field = params[:jam_ruby_jam_track_right][:user]
if user_field.blank?

View File

@ -0,0 +1,25 @@
ActiveAdmin.register_page "Test Jobs" do
menu :parent => 'Misc'
page_action :long_running, :method => :post do
puts params.inspect
time = params[:long_running][:time]
Resque.enqueue(LongRunning, time)
redirect_to admin_test_jobs_path, :notice => "Long Running job enqueued."
end
content do
semantic_form_for LongRunning.new, :url => admin_test_jobs_long_running_path, :builder => ActiveAdmin::FormBuilder do |f|
f.inputs "Queue a long running job" do
f.input :time
end
f.actions
end
end
end

View File

@ -55,7 +55,8 @@ class Cohort < ActiveRecord::Base
end
def self.earliest_cohort
starting = User.where(admin: false).order(:created_at).first.created_at
user = User.where(admin: false).order(:created_at).first
starting = user.created_at if user
starting = EARLIEST_DATE if starting.nil? || starting < EARLIEST_DATE
starting # this is necessary to always return not null
end

View File

@ -63,6 +63,7 @@ require "jam_ruby/resque/jam_tracks_builder"
require "jam_ruby/resque/scheduled/stats_maker"
require "jam_ruby/resque/google_analytics_event"
require "jam_ruby/resque/batch_email_job"
require "jam_ruby/resque/long_running"
require "jam_ruby/mq_router"
require "jam_ruby/recurly_client"
require "jam_ruby/base_manager"

View File

@ -0,0 +1,25 @@
require 'resque'
require 'resque-retry'
module JamRuby
class LongRunning
extend JamRuby::ResqueStats
attr_accessor :time
@queue = :long_running
def model_name
'long_running'
end
def log
@log || Logging.logger[LongRunning]
end
def self.perform(time)
sleep(time)
end
end
end

View File

@ -183,6 +183,7 @@
var totalTax = 0;
var totalPrice = 0;
logger.debug("pricing", pricing)
var unitTax = Number(pricing.price.now.tax) * effectiveQuantity;
totalTax += unitTax;

View File

@ -127,6 +127,9 @@ script type='text/template' id='template-order-content'
.recurly-data.hidden
.plan.jamtrack data-plan-code="{{gon.recurly_tax_estimate_jam_track_plan}}"
input data-recurly="plan" type="text" value="{{gon.recurly_tax_estimate_jam_track_plan}}"
input data-recurly="currency" type="text" value="USD"
input data-recurly="postal_code" type="text" value="{{data.billing_info.zip}}"
input data-recurly="country" type="text" value="{{data.billing_info.country}}"
.order-summary
.place-order-center
a.button-orange.place-order href="#" PLACE YOUR ORDER
@ -143,7 +146,7 @@ script type='text/template' id='template-order-content'
.order-items-header.sub-total Total before tax:
.order-items-value.sub-total= "{{data.sub_total}}"
.clearall
.order-items-header.taxes Taxes:
.order-items-header.taxes Estimated Taxes:
.order-items-value.taxes= "{{data.taxes}}"
.clearall
.line