From d75656fdd5ef8208fd3f1e23f8627917529275c9 Mon Sep 17 00:00:00 2001 From: Mark Date: Fri, 23 Dec 2016 14:57:45 +0200 Subject: [PATCH] sms erros on pin reset --- module/Config/src/Config/Entity/Config.php | 2 +- module/User/src/User/Service/Profile.php | 2 +- module/Utility/src/Utility/Comms/Notification.php | 2 +- public/js/app/admin-workspace/systemuserview.js | 6 ++++-- public/js/app/portal-workspace/stockview.js | 1 + public/js/app/workspace.js | 6 ------ 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/module/Config/src/Config/Entity/Config.php b/module/Config/src/Config/Entity/Config.php index bbd0b6f..3374ed4 100644 --- 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"); */ - protected $smsNewPin = false; + protected $smsNewPin = true; /** * @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 --- 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 ); - \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 --- 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 ) { - \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) diff --git a/public/js/app/admin-workspace/systemuserview.js b/public/js/app/admin-workspace/systemuserview.js index 958e9e6..b167914 100644 --- 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 () { + //( id, data, options, callback, errorCallback, method, direct ) App.API.execTask( 'PinReset:' + _w.systemuserview.itemId, { Reset : { - email : _w.systemuserview.itemData.email + email : _w.systemuserview.itemData.email, + mobile : _w.systemuserview.itemData.mobile } }, {}, function() { - alert('Pin reset successfull.'); + alert('Pin reset successful.'); }, _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 --- 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 ) { + console.log('onstockready'); _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 --- a/public/js/app/workspace.js +++ b/public/js/app/workspace.js @@ -1154,9 +1154,6 @@ 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() { @@ -1177,9 +1174,6 @@ 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() { -- 2.20.1