WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-07-02 02:40:07 -04:00
parent 0548daa058
commit 666d63a8a2
10 changed files with 782 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/controllers/Jobs.php
+27 -12
View File
@@ -957,7 +957,22 @@ echo $this->getMarketInterestMessage( $in['offer_code'], $out['client_id'] );
$amountArray[] = [$i,$i,'Naira'];
}
$marketArray = [];
for ($i = 2; $i <= 6; $i = $i + 1) {
$marketArray[] = [$i,$i,'Days'];
}
for ($i = 7; $i <= 21; $i = $i + 7) {
$marketArray[] = [$i,$i,'Week(s)'];
}
for ($i = 30; $i <= 90; $i = $i + 30) {
$marketArray[] = [$i,$i,'Month(s)'];
}
$data['amount_array'] = $amountArray;
$data['timeline_array'] = $marketArray;
$mysqlJ = "SELECT id, title,created::date FROM members_jobs WHERE
member_id = " . $_SESSION['member_id'] . "
@@ -966,6 +981,7 @@ echo $this->getMarketInterestMessage( $in['offer_code'], $out['client_id'] );
$query = $this->db->query($mysqlJ);
$data['recentjobs'] = $query->result();
$data['recentjobs_count'] = $query->num_rows();
extract($_POST);
$redirected = false;
@@ -1005,6 +1021,7 @@ echo $this->getMarketInterestMessage( $in['offer_code'], $out['client_id'] );
$this->combo_model->defaultComboMessage = 'Select Job Country';
$data['country_job'] = $this->combo_model->getCountryJobCombo('country', $country);
$data['job_price'] = $this->combo_model->getJobPriceCombo('price','Naira', $price);
$data['timeline_combo'] = $this->combo_model->marketTimeline('timeline', $timeline);
$data['title'] = $title;
$data['description'] = $description;
@@ -1013,7 +1030,7 @@ echo $this->getMarketInterestMessage( $in['offer_code'], $out['client_id'] );
$data['price'] = $price;
$data['country'] = $country_job;
$data['page_title'] = "Create Job";
$data['page_title'] = "Create Job";
if ($redirected == false) {
$this->load->model('dash_model');
@@ -1022,11 +1039,6 @@ $data['page_title'] = "Create Job";
$data['active_pass_due'] = $out['active_pass_due'];
$data['current_balance'] = $out['current_balance'];
$data['new_message'] = $out['new_message'];
// $this->load->view('users/view_header_user', $data);
// $this->load->view('jobs/view_create', $data);
// $this->load->view('users/view_footer_user', $data);
$this->renderSecurePage('jobs/view_create', $data);
}
@@ -1052,18 +1064,21 @@ $data['page_title'] = "Create Job";
$in['member_id'] = $_SESSION['member_id'];
$this->load->model('backend_model');
$out = array();
$res = $this->backend_model->wrenchboard_api($in, $out);
if ($res == PHP_API_OK) {
redirect('/jobs/create');
$res = $this->backend_model->wrenchboard_api($in, $out);
//echo $res;
//exit;
if ($res == PHP_API_OK || $out["terms_update"]=='completed') {
redirect('/jobs/create',$data);
}
}
public function jobagree() {
$data = $this->getSessionArray();
//$this->agreejobterms();
if ($_POST) {
echo "Ameye";
exit;
$in = array();
$in['action'] = WRENCHBOARD_ACCOUNT_TERMS;
$in['action_item'] = ACCOUNT_AGREE_JOBS;
@@ -1072,7 +1087,7 @@ $data['page_title'] = "Create Job";
$out = array();
$res = $this->backend_model->wrenchboard_api($in, $out);
if ($res == PHP_API_OK) {
if ($res == PHP_API_OK || $out["terms_update"]=='completed') {
redirect('/jobs/create');
}
}
www/application/models/Combo_model.php
+35
View File
@@ -12,6 +12,40 @@ class Combo_model extends CI_Model {
}
public function marketTimeline($option_name, $curVal)
{
$marketArray = [];
for ($i = 2; $i <= 6; $i = $i + 1) {
$marketArray[] = [$i,$i,'Days'];
}
$ic=0;
for ($i = 7; $i <= 21; $i = $i + 7) {
$ic++;
$marketArray[] = [$i,$ic,'Week(s)'];
}
$ic=0;
for ($i = 30; $i <= 90; $i = $i + 30) {
$ic++;
$marketArray[] = [$i,$ic,'Month(s)'];
}
$cmbstr ="<option value='0'>Select Market Timeline for this job</option>";
foreach ($marketArray as $item) {
$i = $item[0];
$ii = $item[1];
$description =$item[2];
$selV = '';
if ($curVal == $i) {
$selV = " selected ";
}
$cmbstr .= "<option value='".$i."' ".$selV.">".$ii." ".$description."</option>";
}
return $this->comboFrame($option_name, $cmbstr);
}
public function getJobPriceCombo($option_name,$description, $curVal){
$this->defaultComboMessage ='Select Price...';
@@ -179,6 +213,7 @@ class Combo_model extends CI_Model {
if ($this->readOnlyMode == true) {
$addReaOnly = " disabled ";
}
//form-select form-select-solid form-select-lg
$style_line = "form-select form-select-solid form-select-lg";
return $cmb = "<select $style_line data-placeholder='".$this->defaultComboMessage."' class='" . $this->currentStyle . "' name='$option_name' $addReaOnly >$option_value</select>";
}
www/application/views/jobs/view_create.php
+23 -35
View File
@@ -88,30 +88,10 @@
<div class="fv-plugins-message-container invalid-feedback"></div></div>
<!--end::Input group-->
<!--begin::Input group-->
<div class="d-flex flex-column mb-5 fv-row">
<!--begin::Label-->
<label class="fs-5 fw-bold mb-2">Timeline</label>
<!--end::Label-->
<!--begin::Input-->
<select class="form-select form-select-solid form-select-lg" name='timeline'>
<option value="0">Select Market Timeline for this job</option>
<option value="2">2 days</option>
<option value="3">3 days</option>
<option value="4">4 days</option>
<option value="5">5 days</option>
<option value="6">6 days</option>
<option value="7">1 week</option>
<option value="14">2 weeks</option>
<option value="21">3 weeks</option>
<option value="30">1 Month</option>
<option value="60">2 Months</option>
</select>
<!--end::Input-->
<label class="fs-5 fw-bold mb-2">Timeline <span style="font-size:smaller;color: green;">(how long do you want to present this task to the public anytime) </span></label>
<?=$timeline_combo?>
</div>
<!--end::Input group-->
<div class="d-flex flex-column mb-5 fv-row">
<div class="row mb-5">
@@ -164,21 +144,29 @@
<div class="card-body pt-2">
<!--begin::Item-->
<?php
foreach ($recentjobs as $row)
{
?>
<div class="d-flex align-items-center mb-8" >
<!--begin::Description-->
<div class="flex-grow-1">
<a href="#" onclick="return post_nav_find_action('/jobs/processjob', '<?=$row->id?>')" class="text-gray-800 text-hover-primary fw-bolder fs-6"><?=$row->title?></a>
<span class="text-muted fw-bold d-block"><?=$row->created?></span>
</div>
<!--end::Description-->
<a href="#" onclick="return post_nav_find_action('/jobs/processjob', '<?=$row->id?>')" class="badge badge-light-success fs-8 fw-bolder">View</a>
</div>
if ($recentjobs_count > 0){
<?php
foreach ($recentjobs as $row)
{
?>
<div class="d-flex align-items-center mb-8" >
<!--begin::Description-->
<div class="flex-grow-1">
<a href="#" onclick="return post_nav_find_action('/jobs/processjob', '<?=$row->id?>')" class="text-gray-800 text-hover-primary fw-bolder fs-6"><?=$row->title?></a>
<span class="text-muted fw-bold d-block"><?=$row->created?></span>
</div>
<!--end::Description-->
<a href="#" onclick="return post_nav_find_action('/jobs/processjob', '<?=$row->id?>')" class="badge badge-light-success fs-8 fw-bolder">View</a>
</div>
<?php
}
}
else
{
}
?>
www/application/views/jobs/view_jobagree.php
+40 -25
View File
@@ -17,8 +17,7 @@
<!--begin::Body-->
<div class="card-body">
<div class="tab-content">
<!--begin::Tap pane-->
<div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
<div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
<!--begin::Table container-->
<h4>All terms of sale must follow WrenchBoard policies for buying and selling. Setting and meeting expectations in a listing's terms of sale ensure a smooth transaction and buyer satisfaction while helping WrenchBoard remain a reputable marketplace.</h4>
<br>
@@ -27,19 +26,19 @@
<h4> Task or Job owners should provide clear and accurate delivery terms and conditions required to meet the expectations they have set in their listings. These should include:</h4>
<ul class="list-group">
<li class="list-group-item">Delivery mode, timelines, and reviews</li>
<li class="list-group-item">The forms of payment available for the task </li>
<li class="list-group-item"> A returns policy:
<ul class="list-group">
<li class="list-group-item">Clearly stated criteria under which cancellation will be accepted.</li>
<li class="list-group-item">Clearly stated the time period in which the buyer must notify the seller about the delivery delay.</li>
<li class="list-group-item">How refunds/returns/cancellations will be issued</li>
</ul>
<li class="list-group-item">Delivery mode, timelines, and reviews</li>
<li class="list-group-item">The forms of payment available for the task </li>
<li class="list-group-item"> A returns policy:
<ul class="list-group">
<li class="list-group-item">Clearly stated criteria under which cancellation will be accepted.</li>
<li class="list-group-item">Clearly stated the time period in which the buyer must notify the seller about the delivery delay.</li>
<li class="list-group-item">How refunds/returns/cancellations will be issued</li>
</ul>
</li>
</li>
</ul>
<br>
<br>
<br>
@@ -48,24 +47,17 @@
<br>
<h4>Activity that doesn't follow WrenchBoard policy could result in a range of actions, including for example: administratively ending or canceling listings, hiding or demoting all listings from search results, lowering rating, buying or selling restrictions, and account suspension.
<br>
All fees paid or payable concerning listings or accounts on which we take any action will not be refunded or otherwise credited to your account.</h4>
All fees paid or payable concerning listings or accounts on which we take any action will not be refunded or otherwise credited to your account.</h4>
<br>
<h3 class="text-dark mb-5 fw-boldest">Why does WrencBoard have this policy?</h3>
<h4>Buyers and sellers enter a contract when they complete transactions, so it's necessary to have precise details on what the transaction entails to guarantee satisfaction. This policy also helps sellers meet our performance standards.</h4>
</div>
<!--end::Tap pane-->
<div class="tab-pane fade show active" id="kt_table_widget_5_tab_1" style=" padding-top: 35px; text-align: right">
<form action="/jobs/jobagree" onclick="start_agree();"> <a class="btn btn-sm btn-primary">Agree to Terms <i class="icon-arrow-right14 position-right"></i></a> </form>
</div>
<div class="tab-pane fade show active" id="kt_table_widget_5_tab_1" style=" padding-top: 35px; text-align: right">
<div id="agree-result"></div> <form method="post" id="agreeForm" action="/jobs/agreejobterms" > <a onclick="start_agree();" class="btn btn-sm btn-primary">Agree to Terms <i class="icon-arrow-right14 position-right"></i></a> </form>
</div>
</div>
</div>
<!--end::Body-->
</div>
@@ -79,12 +71,35 @@
<!--
function start_agree() {
alert(100);
// alert(100);
if(confirm("Please confirm Terms Agreement?")) {
// do something
} else {
return false;
}
// $("#agreeForm").submit();
document.getElementById('agreeForm').submit();
return false;
//return true;
/*
$.ajax({
url: "/jobs/agreejobterms?interest_id=0"
}).done(function (data) {
$('#modal-content').html(data);
if (data == 0 ){
var url = "/jobs/create";
$(location).attr('href',url)
}
else
{
$('#agree-result').html(data);
}
});
*/
}