Kiosk Checkin / Out #2333
Merged
Kiosk Checkin / Out #2333
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
assigned 
crossan007
changed the title
crossan007
changed the title
crossan007
changed the title
crossan007
commented
May 21, 2017
| @@ -291,6 +291,9 @@ | |||
| <foreign-key foreignTable="group_grp"> | |||
| <reference local="p2g2r_grp_ID" foreign="grp_ID"/> | |||
| </foreign-key> | |||
| <foreign-key foreignTable="list_lst"> | |||
| <reference local="p2g2r_rle_ID" foreign="lst_OptionID"/> | |||
There was a problem hiding this comment.
This is used on line 23 in GroupQuery.php
crossan007
added
Feature: Events / Calendar
Feature: Groups
and removed
do not merge!
labels
DawoudIO
reviewed
May 25, 2017
| public function getTokens() | ||
| { | ||
| $myTokens = [ | ||
| "toName" => "Guardian(s) of ". $this->notificationSource, |
src/ChurchCRM/dto/Notification.php
Outdated
| $message = $client->message()->send([ | ||
| 'to' => $recipient->getNumericCellPhone(), | ||
| 'from' => SystemConfig::getValue("sNexmoFromNumber"), | ||
| 'text' => 'Notification for ' . $this->person->getFullName() |
|
|
||
| public function getNumericCellPhone() | ||
| { | ||
| //return $this->getCellPhone(); |
src/ChurchCRM/utils/MiscUtils.php
Outdated
| <?php | ||
|
|
||
| /* | ||
| * To change this license header, choose License Headers in Project Properties. |
src/ChurchCRM/utils/MiscUtils.php
Outdated
| } | ||
| } | ||
|
|
||
| public static function random_word( $length = 6 ) { |
There was a problem hiding this comment.
Newly registered kiosks get a "random name"
| <?php | ||
| /******************************************************************************* | ||
| * | ||
| * filename : Dashboard.php |
|
|
||
| <script> | ||
|
|
||
| window.CRM.APIRequest = function(options) { |
There was a problem hiding this comment.
should this move to a .js file
There was a problem hiding this comment.
this is going into the crmjsom :-)
src/api/routes/kiosks.php
Outdated
|
|
||
| $this->get('/', function ($request, $response, $args) { | ||
| $Kiosks = KioskDeviceQuery::create() | ||
| ->joinWithKioskAssignment(\Propel\Runtime\ActiveQuery\Criteria::LEFT_JOIN) |
There was a problem hiding this comment.
add a "use" link to cleanup the code
src/api/routes/kiosks.php
Outdated
|
|
||
| $this->post('/{kioskId:[0-9]+}/identifyKiosk', function ($request, $response, $args) { | ||
| $kioskId = $args['kioskId']; | ||
| $identify = \ChurchCRM\KioskDeviceQuery::create() |
| @@ -79,7 +79,8 @@ INSERT INTO `menuconfig_mcf` (`mid`, `name`, `parent`, `ismenu`, `content_englis | |||
|
|
|||
| (80, 'report', 'root', 1, 'Data/Reports', 'Data/Reports', '', '', 'bAll', NULL, 0, 0, NULL, 1, 9, 'fa-file-pdf-o'), | |||
| (81, 'reportmenu', 'report', 0, 'Reports Menu', 'Reports Menu', 'ReportList.php', '', 'bAll', NULL, 0, 0, NULL, 1, 1, NULL), | |||
| (82, 'querymenu', 'report', 0, 'Query Menu', 'Query Menu', 'QueryList.php', '', 'bAll', NULL, 0, 0, NULL, 1, 2, NULL); | |||
| (82, 'querymenu', 'report', 0, 'Query Menu', 'Query Menu', 'QueryList.php', '', 'bAll', NULL, 0, 0, NULL, 1, 2, NULL), | |||
| (83, 'kioskmanager', 'root', 0, 'Kiosk Manager', 'Kiosk Manager', 'KioskManager.php', '', 'bAll', NULL, 0, 0, NULL, 1, 10, 'fa-laptop'); | |||
There was a problem hiding this comment.
i think it should go on the right Nav not the main one and only for admins
DawoudIO
approved these changes
May 27, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related Issues
closes #812
closes #2329
helps with #1144
causes us to look at #462 and #1947
serves as base for #2468
first SMS integration: #2149
Details
Documentation here: https://github.com/ChurchCRM/CRM/wiki/Kiosk-Devices