siva3395

When we access recievables page for eg: 

http://localhost:3000/receivables or http://localhost:3000/advertisers/24/receivables

we are facing below error

"NetworkError: 404 Not Found  - http://localhost:3000/javascripts/jquery.tableDnD"

jquery.tableDnD

siva3395

Removing app/views/zones/show.html.erb
Removing app/views/zones/new.html.erb
Removing app/views/zones/edit.html.erb
Removing app/views/zones/_context.html.erb
Removing app/views/zone_groups/show.html.erb
Removing app/views/zone_groups/new.html.erb
Removing app/views/zone_groups/index.html.erb
Removing app/views/zone_groups/edit.html.erb
CONFLICT (modify/delete): app/views/zone_groups/_table.html.erb deleted in eb50ea9b0bfe59b27d90a6020992630293927d26 and modified in HEAD. Version HEAD of app/views/zone_groups/_table.html.erb left in tree.
Removing app/views/zone_groups/_context.html.erb

siva3395

sh-4.2$ gitg
sh-4.2$ git rebase upstream/master
First, rewinding head to replay your work on top of it...
Applying: RZ-3203 -- As a developer, I want to migrate the remaining ERB views to HAML
Using index info to reconstruct a base tree...
<stdin>:787: trailing whitespace.
          
<stdin>:3073: trailing whitespace.
 
<stdin>:6150: trailing whitespace.

siva3395

sh-4.2$ git pull venkat RZ-3456
remote: Counting objects: 1779, done.
remote: Compressing objects: 100% (424/424), done.
remote: Total 1560 (delta 1118), reused 1493 (delta 1117)
Receiving objects: 100% (1560/1560), 306.38 KiB | 148 KiB/s, done.
Resolving deltas: 100% (1118/1118), completed with 151 local objects.
From github.com:venkatab/redzone
 * branch            RZ-3456    -> FETCH_HEAD
Removing spec/controllers/campaign_deployments_controller_spec.rb
Removing spec/controllers/ad_deployments_controller_spec.rb

siva3395

sh-4.2$ git rebase master

It seems that there is already a rebase-apply directory, and
I wonder if you are in the middle of another rebase.  If that is the
case, please try
  git rebase (--continue | --abort | --skip)
If that is not the case, please
	rm -fr /home/local/PENNYWISE/sivaa/projects/redzone/.git/rebase-apply
and run me again.  I am stopping in case you still have something
valuable there.

siva3395

DEPRECATION WARNING: The InstanceMethods module inside ActiveSupport::Concern will be no longer included automatically. Please define instance methods directly in MMPlugins::DirtyChildren instead. (called from block in included at /home/local/PENNYWISE/sivaa/projects/redzone-media-planning/app/lib/base_document.rb:6)
DEPRECATION WARNING: The InstanceMethods module inside ActiveSupport::Concern will be no longer included automatically. Please define instance methods directly in MMPlugins::DirtyChildren instead. (called from block in included at /home/local/PENNYWISE/sivaa/projects/redzone-media-planning/app/lib/base_document.rb:6)
DEPRECATION WARNING: The InstanceMethods module inside ActiveSupport::Concern will be no longer included automatically. Please define instance methods directly in MMPlugins::DirtyChildren instead. (called from block in included at /home/local/PENNYWISE/sivaa/projects/redzone-media-planning/app/lib/base_document.rb:6)
DEPRECATION WARNING: ActiveSupport::Memoizable is deprecated and wi

siva3395

class CustomChannel < ActiveRecord::Base
  include Roo
  
  def self.import_websites
    s = Excelx.new("#{Rails.root}/db/data/simple_media_plan.xlsx")

    #load custom channel sheet
    s = s.sheet("Custom Channel")

    # Iterate through each column

siva3395

List of all controllers

1.geo_targets_controller
2.markets_controller ----------------------- completed
3.media_plan_request_controller ------------ completed
4.offers_controller ------------------------ completed
5.receivables_controller ------------------  IN Progress
6.sales_rep_controller---------------------- completed
7.sites_controller-------------------------- IN Progress
8.subs_controller