Upstream sync

config/locales/en.yml

@@ -97,6 +97,13 @@ en:
     application:
       header:
         sign_out: Sign Out
+    task_requests:
+      index:
+        empty: Task requests will appear here
+      show:
+        empty: Attached files will appear here.
+      update:
+        notice: The task request has been updated successfully
     users:
       create:
         notice: The user was created
@@ -317,6 +324,8 @@ en:
       notice: The release has been updated
   helpers:
     help:
+      task_request:
+        time_allowed: Minimum of 2 hours, no partial hours allowed
       contract_template:
         fee: Leave at $0.00 for no-fee
         guardian_clause: Leave blank if not required for this contract
@@ -867,6 +876,7 @@ en:
       music_release: Music Releases (%{count})
       report: Reports
       talent_release: Talent Releases (%{count})
+      tasks: Tasks
   public:
     acquired_media_releases:
       new:
@@ -1118,6 +1128,7 @@ en:
     tag_multiple_releases: Add Tag
     tag_multiple_releases_form:
       submit: Add
+    task_me: Task
   tags:
     form:
       submit: Add
@@ -1159,6 +1170,54 @@ en:
         manage: Manage
     update:
       notice: The talent release has been updated
+  task_requests:
+    cancel:
+      notice: Task has been cancelled successfully.
+    create:
+      notice: Task request created succussfully.
+      success_message: Your task request was successfully submitted. Thank you. A chat window will pop up on the lower right in a few seconds.
+    edit:
+      heading:
+        Edit Task Request
+    form:
+      info_message: After submitting this task request, you'll be connected via chat with a ME Suite representative.
+      labels:
+        additional_notes: Please add any additional notes we should be aware of regarding this task.
+        deadline: What is the deadline for this task?
+        description: Please describe the task.
+        files: Please attach any files related to this task
+        time_allowed: How many hours would you like a TaskME representative to work on this task?
+    index:
+      actions:
+        new: Create Task Request
+      empty: Task requests will appear here.
+      table_headers:
+        task_request_created_on: Created On
+        task_request_deadline: Deadline
+        task_request_description: Description
+        task_request_results: Task Results
+        task_request_status: Status
+        task_request_time_allowed: Time Allowed
+    new:
+      heading: New Task Request
+    show:
+      empty: Attached files will appear here.
+    task_request:
+      actions:
+        manage: Manage
+        open_deliverable: Open Deliverable
+        read_more: read more
+    update:
+      notice: Task request updated successfully.
+  tasks:
+    index:
+      empty: Tasks will appear here.
+      table_headers:
+        task_request_created_on: Created On
+        task_request_deadline: Deadline
+        task_request_results: Task Results
+        task_request_status: Status
+        task_request_time_allowed: Time Allowed
   user_mailer: 
     existing_account: 
       subject: You've been added as a ME Suite Account Manager 

config/locales/es.yml

@@ -350,3 +350,16 @@ es:
           heading: Second Guardian Photo (ES)
         guardian_photo:
           heading: Guardian Photo (ES)
+  task_requests:
+    create:
+      success_message: Your task request was successfully submitted. Thank you. A chat window will pop up on the lower right in a few seconds. (ES)
+    form:
+      info_message: After submitting this task request, you'll be connected via chat with a ME Suite representative. (ES)
+    index:
+      table_headers:
+        task_request_description: Description (ES)
+    task_request:
+      actions:
+        manage: Manage (ES)
+        open_deliverable: Open Deliverable (ES)
+        read_more: read more (ES)

config/routes.rb

@@ -31,6 +31,7 @@ Rails.application.routes.draw do
       resources :users, only: [:index, :new, :create, :edit, :update, :destroy] do
         resource :masquerade, only: :create
       end
+      resources :task_requests, only: [:index, :edit, :update, :show]
 
       root to: "accounts#index", as: :signed_in_root
     end
@@ -99,6 +100,12 @@ Rails.application.routes.draw do
           delete :destroy_file
         end
       end
+      resources :task_requests, except: :destroy do
+        member do
+          post :cancel
+        end
+      end
+      resources :tasks, only: :index
     end
     resource :profile, only: [:show, :update]
     resources :videos, only: [] do