5b9eb6dd by prami

Campaigns: Campaigns can be manually active and inactive

1 parent d63f82f3
......@@ -1389,6 +1389,7 @@ function popMail($userid)
{
$companyarr=$this->loadAllDBMasters($company,'company');//$this->LoadSingle("select * from hrms_masters where mkey='$company' and mtype='company';");
$mastersdata=array();
$mastersdata['status'] = $companyarr["status"];
if(!isset($companyarr["mvalue"]))$companyarr["mvalue"]="";
$companymasters=explode("|",$companyarr["mvalue"]);
......@@ -1630,7 +1631,7 @@ function popMail($userid)
}
else
{
$companyarr=$this->LoadAll("select * from hrms_masters where mtype='company'");
$companyarr=$this->LoadAll("select * from hrms_masters where mtype='company' and status='active'");
foreach($companyarr as $tcompany)$clientlst[]=$tcompany['mkey'];
$selectarr=$this->loadAllDBMasters("client",'select');
......
<?php
$client=Input::get("client");
$status=Input::get("status");
$monthworkdays=base64_encode(Input::get("monthworkdays"));
$agencyfeesvalue=base64_encode(Input::get("agencyfeesvalue"));
$agencyfeefunction=base64_encode(Input::get("agencyfeefunction"));
//$status=base64_encode(Input::get("status"));
$contractstartdate=base64_encode(Input::get("contractstartdate"));
$contractenddate=base64_encode(Input::get("contractenddate"));
......@@ -41,6 +44,7 @@ $developerparam=base64_encode(str_replace('\n',"\n",Input::get("developerparam")
$mvalue ="monthworkdays~$monthworkdays|";
$mvalue.="agencyfeesvalue~$agencyfeesvalue|";
$mvalue.="agencyfeefunction~$agencyfeefunction|";
//$mvalue.="status~$status|";
$mvalue.="contractstartdate~$contractstartdate|";
$mvalue.="contractenddate~$contractenddate|";
......@@ -73,9 +77,9 @@ $mvalue.="developerparam~$developerparam|";
$mvalue.="trackerfields~$trackerfields|";
if($wakka->getCount("hrms_masters","mkey='$client' and mtype='company'")==0)$companyarr=$wakka->Query("insert into hrms_masters set mvalue='',mkey='$client',mtype='company';");
if($wakka->getCount("hrms_masters","mkey='$client' and mtype='company'")==0)$companyarr=$wakka->Query("insert into hrms_masters set mvalue='',mkey='$client',mtype='company', status='$status';");
$companyarr=$wakka->Query("update hrms_masters set mvalue='$mvalue' where mkey='$client' and mtype='company';");
$companyarr=$wakka->Query("update hrms_masters set mvalue='$mvalue', status='$status' where mkey='$client' and mtype='company';");
//if(!Auth::user()->moduleACL("Admin",true,true,true))$wakka->createMailQueue("system",$wakka->getEmailIdsFromList('HRManagerUsers'),Config::get("app.name").": Client Master Changed","[".$wakka->GetUserName()."] Has changed Clients [$client] Master Data");
echo "<div class='message success close'><h2>Success!</h2><p>Data Saved</p></div>";
......
......@@ -4,10 +4,10 @@ if(Input::has('addcompany'))
$company=trim(Input::get("addcompany"));
if($company!="")
{
$companyarr=$wakka->LoadSingle("select * from hrms_masters where mtype='company' and mkey='$company'");
$companyarr=$wakka->LoadSingle("select * from hrms_masters where mtype='company' and mkey='$company' and status='active'");
if(!$companyarr)
{
$wakka->Query("insert into hrms_masters set mvalue='',mkey='$company',mtype='company';");
$wakka->Query("insert into hrms_masters set mvalue='',mkey='$company',mtype='company',status='active';");
}
}
......@@ -45,8 +45,13 @@ foreach($workflowarr as $wfline)
if($client!="")
{
$mastersdata=$wakka->getCompanyMaster($client);
$mastersdata["status"] = ucfirst($mastersdata["status"]);
echo "<br>";
echo "<p><label class='label-small_new' style='width:15%'>Status:</label><select class='form_hrm_select' name=status id=status>
<option value='".($mastersdata["status"])."'>".($mastersdata["status"])."</option>
<option value=active>Active</option>
<option value=inactive>Inactive</option>
</select></p>";
echo "<p><label class='label-small_new' style='width:15%'>Contract Start Date :</label><input type=text class='form_new form_new_amend' name=contractstartdate id=contractstartdate value='".($mastersdata["contractstartdate"])."'></p>";
echo "<p><label class='label-small_new' style='width:15%'>Contract End Date :</label><input type=text class='form_new form_new_amend' name=contractenddate id=contractenddate value='".($mastersdata["contractenddate"])."'></p>";
......
......@@ -426,6 +426,8 @@ function saveCompanies()
{
var vardata="client="+$("#companyselect").val();
vardata+="&status="+encodeURIComponent($("#status").val());
vardata+="&agencyfeesvalue="+encodeURIComponent($("#agencyfeesvalue").val());
vardata+="&agencyfeefunction="+encodeURIComponent($("#agencyfeefunction").val());
vardata+="&contractstartdate="+encodeURIComponent($("#contractstartdate").val());
......
......@@ -203,7 +203,7 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro
<div class="col-md-8 controls">
<select id="clientslist" multiple="" data-rel="chosen" style='width:100%' class=select2multi>
<?php
$companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company'");
$companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'");
foreach($companyarr as $tcompany)
{
$seltxt='';
......@@ -219,7 +219,7 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro
<div class="col-md-8 controls">
<select id="clientsownerlist" multiple="" data-rel="chosen" style='width:100%' class=select2multi>
<?php
$companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company'");
$companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'");
foreach($companyarr as $tcompany)
{
$seltxt='';
......@@ -235,7 +235,7 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro
<div class="col-md-8 controls">
<select id="roclientsownerlist" multiple="" data-rel="chosen" style='width:100%' class=select2multi>
<?php
$companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company'");
$companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'");
foreach($companyarr as $tcompany)
{
$seltxt='';
......@@ -260,7 +260,7 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro
<div class="col-md-8 controls">
<select id="accclientsownerlist" multiple="" data-rel="chosen" style='width:100%' class=select2multi>
<?php
$companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company'");
$companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'");
foreach($companyarr as $tcompany)
{
$seltxt='';
......@@ -276,7 +276,7 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro
<div class="col-md-8 controls">
<select id="recclientsownerlist" multiple="" data-rel="chosen" style='width:100%' class=select2multi>
<?php
$companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company'");
$companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'");
foreach($companyarr as $tcompany)
{
$seltxt='';
......@@ -292,7 +292,7 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro
<div class="col-md-8 controls">
<select id="bdmclientsownerlist" multiple="" data-rel="chosen" style='width:100%' class=select2multi>
<?php
$companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company'");
$companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'");
foreach($companyarr as $tcompany)
{
$seltxt='';
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!