projects
/
namibia
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c449ac8
)
sms erros on pin reset
author
Mark
<mark@nirph.com>
Fri, 23 Dec 2016 12:57:45 +0000
(14:57 +0200)
committer
Mark
<mark@nirph.com>
Fri, 23 Dec 2016 12:57:45 +0000
(14:57 +0200)
module/Config/src/Config/Entity/Config.php
patch
|
blob
|
history
module/User/src/User/Service/Profile.php
patch
|
blob
|
history
module/Utility/src/Utility/Comms/Notification.php
patch
|
blob
|
history
public/js/app/admin-workspace/systemuserview.js
patch
|
blob
|
history
public/js/app/portal-workspace/stockview.js
patch
|
blob
|
history
public/js/app/workspace.js
patch
|
blob
|
history
diff --git
a/module/Config/src/Config/Entity/Config.php
b/module/Config/src/Config/Entity/Config.php
index
bbd0b6f
..
3374ed4
100644
(file)
--- a/
module/Config/src/Config/Entity/Config.php
+++ b/
module/Config/src/Config/Entity/Config.php
@@
-82,7
+82,7
@@
class Config
/**
* @ORM\Column(type="boolean", name="sms_new_pin");
*/
/**
* @ORM\Column(type="boolean", name="sms_new_pin");
*/
- protected $smsNewPin =
fals
e;
+ protected $smsNewPin =
tru
e;
/**
* @ORM\Column(type="boolean", name="sms_customer_valuation");
/**
* @ORM\Column(type="boolean", name="sms_customer_valuation");
diff --git
a/module/User/src/User/Service/Profile.php
b/module/User/src/User/Service/Profile.php
index
bb40e11
..
5ffaa7b
100644
(file)
--- a/
module/User/src/User/Service/Profile.php
+++ b/
module/User/src/User/Service/Profile.php
@@
-411,7
+411,7
@@
class Profile extends \User\DataBin\Profile
$templateName,
$params
);
$templateName,
$params
);
- \Utility\Debug::errorLog("
Profile","send from template"
);
+ \Utility\Debug::errorLog("
sendPinResetNotification","sms:".$mobile." email:".$email
);
}
/**
}
/**
diff --git
a/module/Utility/src/Utility/Comms/Notification.php
b/module/Utility/src/Utility/Comms/Notification.php
index
05bddc4
..
818b74e
100644
(file)
--- a/
module/Utility/src/Utility/Comms/Notification.php
+++ b/
module/Utility/src/Utility/Comms/Notification.php
@@
-78,7
+78,7
@@
class Notification
$disableSms = false, $offline = false
)
{
$disableSms = false, $offline = false
)
{
- \Utility\Debug::errorLog("send from template","sms
& email"
);
+ \Utility\Debug::errorLog("send from template","sms
:".$mobile." email:".$email
);
#-> Unsubscribe check.
$em = \Utility\Registry::getEntityManager();
if (!self::$_sendAsNewsletter && !self::$_skipSubscriptionCheck)
#-> Unsubscribe check.
$em = \Utility\Registry::getEntityManager();
if (!self::$_sendAsNewsletter && !self::$_skipSubscriptionCheck)
diff --git
a/public/js/app/admin-workspace/systemuserview.js
b/public/js/app/admin-workspace/systemuserview.js
index
958e9e6
..
b167914
100644
(file)
--- a/
public/js/app/admin-workspace/systemuserview.js
+++ b/
public/js/app/admin-workspace/systemuserview.js
@@
-63,14
+63,16
@@
App.API.getTask(
'PinReset:' + _w.systemuserview.itemId, 'User', 'Profile.ForgotPassword', null,
{}, function () {
App.API.getTask(
'PinReset:' + _w.systemuserview.itemId, 'User', 'Profile.ForgotPassword', null,
{}, function () {
+ //( id, data, options, callback, errorCallback, method, direct )
App.API.execTask(
'PinReset:' + _w.systemuserview.itemId, {
Reset : {
App.API.execTask(
'PinReset:' + _w.systemuserview.itemId, {
Reset : {
- email : _w.systemuserview.itemData.email
+ email : _w.systemuserview.itemData.email,
+ mobile : _w.systemuserview.itemData.mobile
}
}, {},
function() {
}
}, {},
function() {
- alert('Pin reset successful
l
.');
+ alert('Pin reset successful.');
}, _w.taskExecError
);
}, _w.taskContractError
}, _w.taskExecError
);
}, _w.taskContractError
diff --git
a/public/js/app/portal-workspace/stockview.js
b/public/js/app/portal-workspace/stockview.js
index
4807290
..
e3aec03
100644
(file)
--- a/
public/js/app/portal-workspace/stockview.js
+++ b/
public/js/app/portal-workspace/stockview.js
@@
-13,6
+13,7
@@
onStockViewTemplateReady : function( template, event, eventData )
{
onStockViewTemplateReady : function( template, event, eventData )
{
+ console.log('onstockready');
_w.stockview.itemData = null;
_w.stockview.ti = _t[template];
_w.stockview.limited = ('limitedstockview' == template)
_w.stockview.itemData = null;
_w.stockview.ti = _t[template];
_w.stockview.limited = ('limitedstockview' == template)
diff --git
a/public/js/app/workspace.js
b/public/js/app/workspace.js
index
e672f1b
..
2af4f2a
100644
(file)
--- a/
public/js/app/workspace.js
+++ b/
public/js/app/workspace.js
@@
-1154,9
+1154,6
@@
taskContractError : function( response )
{
taskContractError : function( response )
{
- console.log('here2', this.itemId);
- console.log('here2',this.itemData);
- console.log('here2',this.formMeta);
App.API.getTask(
'getActiveAccount', 'User', 'Profile.ActiveAccount', null,
{}, function() {
App.API.getTask(
'getActiveAccount', 'User', 'Profile.ActiveAccount', null,
{}, function() {
@@
-1177,9
+1174,6
@@
taskExecError : function( response )
{
taskExecError : function( response )
{
- console.log('here1', this.itemId);
- console.log('here1',this.itemData);
- console.log('here1',this.formMeta);
App.API.getTask(
'getActiveAccount', 'User', 'Profile.ActiveAccount', null,
{}, function() {
App.API.getTask(
'getActiveAccount', 'User', 'Profile.ActiveAccount', null,
{}, function() {