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

Merge branch 'master' into Issue_3545

Browse Source
This commit is contained in:
Daniel Camargo 2014-10-06 08:16:15 -03:00
commit 396d0fda1a
4 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/controllers/default/cockpit/support/phone/connect.php
View File

@ -18,7 +18,7 @@ class Controller_Support_Phone_Connect extends Crunchbutton_Controller_Account {
}
$num = c::admin()->phone;
$host = 'beta._DOMAIN_';
$host = 'beta.crunchr.co';
//c::config()->host_callback
$twilio = new Services_Twilio(c::config()->twilio->live->sid, c::config()->twilio->live->token);

4
include/library/Crunchbutton/Promo.php
View File

@ -314,7 +314,7 @@ class Crunchbutton_Promo extends Cana_Table
if( $env == 'live' ){
$serverUrl = '_DOMAIN_';
} else {
$serverUrl = 'beta._DOMAIN_';
$serverUrl = 'beta.crunchr.co';
}
$url = 'http://' . $serverUrl . '/giftcard/'. $gift->code;
@ -370,7 +370,7 @@ class Crunchbutton_Promo extends Cana_Table
if( $env == 'live' ){
$serverUrl = '_DOMAIN_';
} else {
$serverUrl = 'beta._DOMAIN_';
$serverUrl = 'beta.crunchr.co';
}
$url = $serverUrl . '/giftcard/'. $gift->code;

40
www/assets/cockpit/js/service.push.js
View File

@ -35,7 +35,45 @@ NGApp.factory('PushService', function($http) {
'badge': 'true',
'sound': 'true',
'alert': 'true',
'ecb': 'pushnotification'
'ecb': 'pushnotification',
'categories': [
{
'identifier': 'order-new-test',
'actions': [
{
'title': 'Accept',
'identifier': 'i11',
'authentication': 'false',
'mode': 'background'
},
{
'title': 'View',
'identifier': 'i22',
'authentication': 'false',
'mode': 'foreground'
}
]
},
{
'identifier': 'support-message-test',
'actions': [
{
'title': 'Close',
'identifier': 'i44',
'authentication': 'false',
'destructive': 'true',
'mode': 'background'
},
{
'title': 'View',
'identifier': 'i33',
'authentication': 'false',
'mode': 'foreground'
}
]
}
]
}
);

9
www/assets/cockpit/scss/cockpit.scss
View File

@ -2808,8 +2808,9 @@ body.ng-scope {
}
.tickets-side-item {
padding: 10px 5px 10px 5px;
padding: 10px 7px 7px 7px;
border-bottom: 1px solid #474a53;
line-height: .7em;
}
.tickets-side-name {
@ -2828,7 +2829,7 @@ body.ng-scope {
color: #7e828e;
}
.tickets-side-message {
clear: both;
line-height: 1.4em;
}
.tickets-side-list h1 {
@ -2836,4 +2837,8 @@ body.ng-scope {
font-size: 1.9em;
color: #fff;
padding: 5px;
margin-top: 10px;
}
.tickets-spacer {
margin-top: 1em;
}