diff --git a/wrenchboard/email/ALERT/alert_contact.mailfile b/wrenchboard/email/ALERT/alert_contact.mailfile index 63fb4d7a..cdce9b76 100644 --- a/wrenchboard/email/ALERT/alert_contact.mailfile +++ b/wrenchboard/email/ALERT/alert_contact.mailfile @@ -7,36 +7,28 @@ Subject: System Alert : {{subject}} {{subject}} diff --git a/wrenchboard/email/ALERT/alert_daily_stats.mailfile b/wrenchboard/email/ALERT/alert_daily_stats.mailfile index 288c2a0b..aec9f776 100644 --- a/wrenchboard/email/ALERT/alert_daily_stats.mailfile +++ b/wrenchboard/email/ALERT/alert_daily_stats.mailfile @@ -8,19 +8,25 @@ Subject: System Alert-WrenchBoard Report {{site_name}} diff --git a/wrenchboard/email/ALERT/alert_jobs_created.mailfile b/wrenchboard/email/ALERT/alert_jobs_created.mailfile index 42b22b9b..7dad2f46 100644 --- a/wrenchboard/email/ALERT/alert_jobs_created.mailfile +++ b/wrenchboard/email/ALERT/alert_jobs_created.mailfile @@ -9,35 +9,26 @@ Subject: System Alert : {{subject}} diff --git a/wrenchboard/email/ALERT/alert_signup.mailfile b/wrenchboard/email/ALERT/alert_signup.mailfile index 5dd72774..41f32ba2 100644 --- a/wrenchboard/email/ALERT/alert_signup.mailfile +++ b/wrenchboard/email/ALERT/alert_signup.mailfile @@ -9,18 +9,25 @@ Subject: System Alert-WrenchBoard Signup Pending ALERT diff --git a/wrenchboard/email/ALERT/alert_signupcompleted.mailfile b/wrenchboard/email/ALERT/alert_signupcompleted.mailfile index df21c8e0..2ec36e82 100644 --- a/wrenchboard/email/ALERT/alert_signupcompleted.mailfile +++ b/wrenchboard/email/ALERT/alert_signupcompleted.mailfile @@ -9,36 +9,27 @@ Subject: System Alert-{{site_name}} - Completed Signup ALERT diff --git a/wrenchboard/email/ALERT/template.mailfile b/wrenchboard/email/ALERT/template.mailfile index 89cd1ca9..5adb64ad 100644 --- a/wrenchboard/email/ALERT/template.mailfile +++ b/wrenchboard/email/ALERT/template.mailfile @@ -7,37 +7,28 @@ Subject: System Alert-{{subject}} A Simple Responsive HTML Email diff --git a/wrenchboard/email/JOB/job_due_reviewreminder.mailfile b/wrenchboard/email/JOB/job_due_reviewreminder.mailfile index 137c8b2a..f12bed35 100644 --- a/wrenchboard/email/JOB/job_due_reviewreminder.mailfile +++ b/wrenchboard/email/JOB/job_due_reviewreminder.mailfile @@ -9,18 +9,25 @@ Subject: {{subject}} @@ -109,7 +116,7 @@ Please contact us at https://www.wrenchboard.com/contact if you have any questio diff --git a/wrenchboard/email/JOB/job_duereminder.mailfile b/wrenchboard/email/JOB/job_duereminder.mailfile index 741b3b85..ad9fd876 100644 --- a/wrenchboard/email/JOB/job_duereminder.mailfile +++ b/wrenchboard/email/JOB/job_duereminder.mailfile @@ -9,35 +9,26 @@ Subject: {{subject}} @@ -189,7 +180,7 @@ Please contact us at https://www.wrenchboard.com/contact if you have any questi
-® {{site_name}} 2022
+® {{site_name}} {{YYYY}}
You received this email because you subscribe to {{site_name}}. If you get this email in error, please contact us.
diff --git a/wrenchboard/email/JOB/job_interest_member.mailfile b/wrenchboard/email/JOB/job_interest_member.mailfile index b1dfb21b..2f36d2cf 100644 --- a/wrenchboard/email/JOB/job_interest_member.mailfile +++ b/wrenchboard/email/JOB/job_interest_member.mailfile @@ -9,35 +9,27 @@ Subject: {{subject}} - {{title}} @@ -212,7 +204,7 @@ Please contact us at https://www.wrenchboard.com/contact if you have any questi
-® {{site_name}} 2022
+® {{site_name}} {{YYYY}}
You received this email because a subscriber to {{site_name}}. If you get this email in error, please contact us.
diff --git a/wrenchboard/email/JOB/job_interest_message.mailfile b/wrenchboard/email/JOB/job_interest_message.mailfile index 5a39bec0..c36b2cb9 100644 --- a/wrenchboard/email/JOB/job_interest_message.mailfile +++ b/wrenchboard/email/JOB/job_interest_message.mailfile @@ -7,37 +7,28 @@ Subject: {{subject}} {{subject}} @@ -171,7 +162,7 @@ You have received a messager from a diff --git a/www-api/app/Controllers/BaseController.php b/www-api/app/Controllers/BaseController.php index cb71e68f..63a447ca 100644 --- a/www-api/app/Controllers/BaseController.php +++ b/www-api/app/Controllers/BaseController.php @@ -99,7 +99,6 @@ abstract class BaseController extends Controller return $wrenchboard->cfgReadChar($config_item); } - public function endPointList(){ $endpoints = [ @@ -197,5 +196,59 @@ abstract class BaseController extends Controller ]; return $endpoints; } + public function procOfferInterest($in) { + $proc = $in['proc']; + $in['interest'] = 0; + switch ($proc) { + case 'ACCEPT': + $in['interest'] = JOB_INTEREST_ACCEPT; + break; + case 'REJECT': + $in['interest'] = JOB_INTEREST_REJECT; + break; + + case 'CANCEL': + $in['interest'] = JOB_INTEREST_CANCEL; + break; + } + $in["action"] = WRENCHBOARD_JOB_PROC_INTEREST; + return $in; + + } + public function processJobStatus($data) { + + /*$data['member_id'] = $_SESSION['member_id']; // = $ret->email; + $data['proc'] = $this->input->get('proc'); + $data['job_id'] = $this->input->get('jobID'); + $data['job_contract'] = $this->input->get('job_contract'); + $data['extension'] + */ + + $data['job_action'] = 0; + switch ($data['job_action']) { + case 'NOTIFY_COMPLETE': // notify completed + $data['job_action'] = CONTRACT_NOTIFY_COMPLETE; + break; + case 'REQUEST_CANCEL': // request cancel + $data['job_action'] = CONTRACT_REQUEST_CANCEL; + break; + + case 'ACCEPT_COMPLETE': + $data['job_action'] = CONTRACT_ACCEPT_COMPLETE; + break; + case 'REJECT_COMPLETE': + $data['job_action'] = CONTRACT_REJECT_COMPLETE; + break; + case 'EXTEND_TIMELINE': + $data['job_action'] = CONTRACT_EXTEND_TIMELINE; + break; + case 'CANCEL_CONTRACT': + $data['job_action'] = CONTRACT_CANCEL_CONTRACT; + break; + } + $data['action'] = WRENCHBOARD_CONTRACT_STATUS; + + return $data; + } } diff --git a/www-api/app/Controllers/WrenchApi.php b/www-api/app/Controllers/WrenchApi.php index 29454525..1dbcc2c7 100644 --- a/www-api/app/Controllers/WrenchApi.php +++ b/www-api/app/Controllers/WrenchApi.php @@ -15,9 +15,7 @@ class WrenchApi extends BaseController } public function index() { - $data['envID'] = getenv('ENV_ID'); - $data['home_background'] = getenv('HOME_PAGE_BACKGROUND'); - return view('welcome_message',$data); + return []; } private function prepareEndPointData($endpoint, $in, &$call_backend=true,&$local_out=[]){ switch ($endpoint) { @@ -509,67 +507,5 @@ class WrenchApi extends BaseController // } return 0; } - private function procOfferInterest($in) { - $proc = $in['proc']; - $in['interest'] = 0; - switch ($proc) { - case 'ACCEPT': - $in['interest'] = JOB_INTEREST_ACCEPT; - break; - case 'REJECT': - $in['interest'] = JOB_INTEREST_REJECT; - break; - - case 'CANCEL': - $in['interest'] = JOB_INTEREST_CANCEL; - break; - } - $in["action"] = WRENCHBOARD_JOB_PROC_INTEREST; - return $in; - - } - private function processJobStatus($data) { - - /*$data['member_id'] = $_SESSION['member_id']; // = $ret->email; - $data['proc'] = $this->input->get('proc'); - $data['job_id'] = $this->input->get('jobID'); - $data['job_contract'] = $this->input->get('job_contract'); - $data['extension'] - */ - - $data['job_action'] = 0; - switch ($data['job_action']) { - case 'NOTIFY_COMPLETE': // notify completed - $data['job_action'] = CONTRACT_NOTIFY_COMPLETE; - break; - case 'REQUEST_CANCEL': // request cancel - $data['job_action'] = CONTRACT_REQUEST_CANCEL; - break; - - case 'ACCEPT_COMPLETE': - $data['job_action'] = CONTRACT_ACCEPT_COMPLETE; - break; - case 'REJECT_COMPLETE': - $data['job_action'] = CONTRACT_REJECT_COMPLETE; - break; - case 'EXTEND_TIMELINE': - $data['job_action'] = CONTRACT_EXTEND_TIMELINE; - break; - case 'CANCEL_CONTRACT': - $data['job_action'] = CONTRACT_CANCEL_CONTRACT; - break; - } - $data['action'] = WRENCHBOARD_CONTRACT_STATUS; - - return $data; - } - private function dummyData($raw_array) - { - return [ - 'internal_return' => 0, - 'msg' => 'Not implemented yet', - 'raw_data' => $raw_array, - ]; - } } diff --git a/www-api/app/Controllers/WrenchGetResources.php b/www-api/app/Controllers/WrenchGetResources.php new file mode 100644 index 00000000..1ab1e7a1 --- /dev/null +++ b/www-api/app/Controllers/WrenchGetResources.php @@ -0,0 +1,28 @@ +request = $request = \Config\Services::request(); + } + + public function index() + { + $envID = getenv('ENV_ID'); + } + + public function apigate(){ + log_message('critical', "Oauth-Gate"); + + return []; + } + +} \ No newline at end of file
-® {{site_name}} 2022
+® {{site_name}} {{YYYY}}
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us.
- ® {{site_name}} 2022
+ ® {{site_name}} {{YYYY}}
You received this email because of your interest in a task @ {{site_name}}. If you get this email in error, please contact us.