diff --git a/www/application/config/constants.php b/www/application/config/constants.php index 9d6e568f..f253371e 100644 --- a/www/application/config/constants.php +++ b/www/application/config/constants.php @@ -104,7 +104,9 @@ define('OFFER_CANCEL',222); define('OFFER_EXPIRE',444); define('OFFER_EXTEND',555); -define('OFFER_SENDTOME',777); +define('OFFER_SENDTOME',777); +define('OFFER_RESEND',888); + define('WEBSITE_LOGIN', 1100); diff --git a/www/application/controllers/Jobs.php b/www/application/controllers/Jobs.php index cfde0b17..9b045cdd 100644 --- a/www/application/controllers/Jobs.php +++ b/www/application/controllers/Jobs.php @@ -1226,6 +1226,12 @@ Indexes: $this->concludeOffer(OFFER_SENDTOME); } + public function viewjob_resend() + { + $this->concludeOffer(OFFER_RESEND); + } + + public function viewjob_extend() { $this->concludeOffer(OFFER_EXTEND); @@ -1241,7 +1247,10 @@ Indexes: $in['action'] = WRENCHBOARD_JOB_OFFER_CONCLUDE; $this->load->model('backend_model'); $out = array(); - $res = $this->backend_model->wrenchboard_api($in, $out); + if ( $in['member_id']!= 0){ + $res = $this->backend_model->wrenchboard_api($in, $out); + } + if ($out["result"] == "OK") { switch ($offer_result) { diff --git a/www/application/views/jobs/view_viewmyjoboffer.php b/www/application/views/jobs/view_viewmyjoboffer.php index 0bea2c55..c012f678 100644 --- a/www/application/views/jobs/view_viewmyjoboffer.php +++ b/www/application/views/jobs/view_viewmyjoboffer.php @@ -78,19 +78,23 @@ -
- -
- + + +
+
-
- -
- -
-
@@ -171,8 +175,24 @@ }); return false; } - - function cancelOffer() { + +function resendOffer() { + + $('#mailsent_sent').html('Processing...'); + $('#sendjob_resend').prop('disabled', true); + //alert(element.value); + $.ajax({ + url: "/jobs/viewjob_resend?jobOfferID=" + }).done(function( data ) { + $('#mailsent_sent').html(data); + //document.offer_group.job_group.value = ''; + $('#sendjob_resend').prop('disabled', false); + }); + return false; +} + + +function cancelOffer() { $('#offer_result').html('Processing...'); $('#reject_submit').prop('disabled', true);