sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/crunchbutton/crunchbutton

Browse Source
This commit is contained in:
Pererinha 2015-04-06 16:50:31 -03:00
commit dce979c294
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/controllers/default/cockpit2/api/test/push.php
View File

@ -1,6 +1,6 @@
<?php <?php
/*
$r = Crunchbutton_Message_Push_Ios::send([ $r = Crunchbutton_Message_Push_Ios::send([
'to' => '8d9b2a99aa4754686eb76ff3a20c007c808470a7327107e786f6cf0e1696f7ac', 'to' => '8d9b2a99aa4754686eb76ff3a20c007c808470a7327107e786f6cf0e1696f7ac',
'message' => 'test', 'message' => 'test',
@ -10,8 +10,10 @@ $r = Crunchbutton_Message_Push_Ios::send([
]); ]);
exit; exit;
*/
$n = Admin_Notification::o(833);
$n = Admin_Notification::o(5701);
$o = Crunchbutton_Order::o(46000); $o = Crunchbutton_Order::o(46000);
$r = $n->send($o); $r = $n->send($o);

4
include/views/default/seven/layout/html.body.phtml
View File

@ -187,8 +187,8 @@
<p> <p>
Push a button. Get food. We find the best food from the top local restaurants so you dont have to. Push a button. Get food. We find the best food from the top local restaurants so you dont have to.
<br><br> <br><br>
Mail us: <a href="mailto:hello@crunchbutton.com">hello@crunchbutton.com</a><br> Mail us: <a href="mailto:{{hello}}">{{hello}}</a><br>
Text us: <a href="tel:+16467831444">(646) 783-1444</a> Text us: <a href="tel:+1{{textUs}}">{{textUsFormatted}}</a>
</p> </p>
</div> </div>
<div class="footer-column-info"> <div class="footer-column-info">

7
www/assets/js/app.js
View File

@ -325,7 +325,12 @@ NGApp.controller('AppController', function ($scope, $route, $http, $routeParams,
App.http = $http; App.http = $http;
$rootScope.hasFacebook = App.hasFacebook; $rootScope.hasFacebook = App.hasFacebook;
$rootScope.topCommunities = App.topCommunities; $rootScope.topCommunities = App.topCommunities;
var hello = 'moc.nottubhcnurc@olleh'.split('').reverse().join('');
$scope.hello = hello;
var textUs = '4441387646'.split('').reverse().join('');
$scope.textUs = textUs;
var textUsFormatted = '4441-387 )646('.split('').reverse().join('');
$scope.textUsFormatted = textUsFormatted;
// hack to fix the phonegap bug at android with soft keyboard #2908 // hack to fix the phonegap bug at android with soft keyboard #2908
$rootScope.softKeyboard = function( e ){ $rootScope.softKeyboard = function( e ){