Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
flexydial
/
hdfc-beu-v2
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
474f8146
authored
2019-02-13 15:30:50 +0530
by
Manish Mihsra
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Resolved all error after merging master into predictive branch
1 parent
d2f726c4
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
10 deletions
application/app/Console/Commands/CreateCall.php
application/app/Console/Commands/PredictiveCallHangUp.php
application/app/Http/Controllers/SmsController.php
application/app/Jobs/KFormLib.php
application/app/Jobs/KHRMSLib.php
application/public/assets/js/dialer.js
application/app/Console/Commands/CreateCall.php
View file @
474f814
...
...
@@ -87,7 +87,6 @@ class CreateCall extends Command {
}
catch
(
Exception
$e
)
{
Log
::
useFiles
(
storage_path
()
.
"/logs/predictive_"
.
date
(
"Y_m_d"
)
.
".log"
);
Log
::
error
(
$e
);
continue
;
}
}
...
...
application/app/Console/Commands/PredictiveCallHangUp.php
View file @
474f814
...
...
@@ -80,7 +80,6 @@ class PredictiveCallHangUp extends Command {
}
catch
(
Exception
$e
)
{
Log
::
useFiles
(
storage_path
()
.
"/logs/predictive_"
.
date
(
"Y_m_d"
)
.
".log"
);
Log
::
error
(
$e
);
continue
;
}
}
}
\ No newline at end of file
...
...
application/app/Http/Controllers/SmsController.php
View file @
474f814
...
...
@@ -5,6 +5,7 @@ use App\Http\Requests;
use
Auth
;
use
Log
;
use
DB
;
use
App\Models\CRMCall
;
class
SmsController
extends
Controller
{
public
$smsUrl
=
'https://10.2.55.165:443/servlet/com.aclwireless.pushconnectivity.listeners.TextListener?'
;
...
...
application/app/Jobs/KFormLib.php
View file @
474f814
...
...
@@ -1770,7 +1770,6 @@ function createQaireHistTab()
$bulkCallID
=
DB
::
table
(
"questionaire_details"
)
->
where
(
'user_id'
,
'='
,
$user_id
)
->
where
(
'cust_id'
,
'='
,
$cust_id
)
->
orderBy
(
'id'
,
'desc'
)
->
select
(
'call_id'
)
->
distinct
()
->
get
();
dy
>
$custIdArr
=
array
();
foreach
(
$bulkCallID
as
$key
=>
$callID
){
...
...
application/app/Jobs/KHRMSLib.php
View file @
474f814
...
...
@@ -972,7 +972,10 @@ function popMail($userid)
$spostvars
=serialize(
$personarr['peopledata']
);
$screatedlog
=serialize(
$personarr['modifylog']
);
$sfdirty
=serialize(
$personarr['dirty']
);
if(sizeof(
$personarr['peopledata'])!=sizeof(unserialize($spostvars))||sizeof($personarr['modifylog'])!=sizeof(unserialize($screatedlog))||sizeof($personarr['dirty']
)!=sizeof(unserialize(
$sfdirty
)))
if(sizeof(
$personarr['peopledata']
)!=sizeof(unserialize(
$spostvars
))
// ||sizeof(
$personarr['modifylog']
)!=sizeof(unserialize(
$screatedlog
))
// ||sizeof(
$personarr['dirty']
)!=sizeof(unserialize(
$sfdirty
))
)
{
return -2;
}
...
...
application/public/assets/js/dialer.js
View file @
474f814
...
...
@@ -1252,11 +1252,6 @@ function dialerTimersUpdate()
saveCloseDialerCall
(
'AUTOWRAPUP'
);
}
if
(
thiswraptime
==
90
||
thiswraptime
==
300
)
{
showWrapUp
();
}
dispD
=
"Wrapup : "
+
thiswraptime
;
$
(
"#spandialer_ts"
).
html
(
dispD
);
$
(
"#dialertimes1"
).
removeClass
(
"btn-default"
).
addClass
(
"btn-primary"
);
...
...
@@ -2252,7 +2247,7 @@ function dialerSipMsg(omsg)
{
try
{
if
(
omsg
.
ao_headers
[
6
].
s_name
==
'kstych-
d
ata'
)
if
(
omsg
.
ao_headers
[
6
].
s_name
==
'kstych-
D
ata'
)
{
var
vparts
=
omsg
.
ao_headers
[
6
].
s_value
.
split
(
"|"
);
...
...
Write
Preview
Styling with
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment