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

Merge branch 'refs/heads/master' into Driver_Onboarding_2969

Browse Source
This commit is contained in:
Daniel Camargo 2014-05-20 20:14:55 -03:00
commit f958a24cfd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/migrate/000189_driver_onboarding.sql
View File

@ -4,13 +4,13 @@ CREATE TABLE `driver_document` (
`name` varchar(40) DEFAULT NULL,
`order` int(4) unsigned DEFAULT NULL,
`url` text DEFAULT NULL,
PRIMARY KEY (`id_drivers_document`)
PRIMARY KEY (`id_driver_document`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
INSERT INTO `driver_document` (`id_driver_document`, `name`, `url` `order`)
INSERT INTO `driver_document` (`id_driver_document`, `name`, `url`, `order`)
VALUES
(1, 'Independant Contractor Agreement', 'https://s3.amazonaws.com/uploads.hipchat.com/41812/283752/6ngjeViT77TalSm/INDEPENDENT%20CONTRACTOR%20AGREEMENT_FINAL_2.4.14.doc' 1),
(1, 'Independant Contractor Agreement', 'https://s3.amazonaws.com/uploads.hipchat.com/41812/283752/6ngjeViT77TalSm/INDEPENDENT%20CONTRACTOR%20AGREEMENT_FINAL_2.4.14.doc', 1),
(2, 'W9', 'https://s3.amazonaws.com/uploads.hipchat.com/41812/283752/R816dLDLvXfD5cM/W9.pdf', 2),
(3, 'Direct Deposit', 'https://s3.amazonaws.com/uploads.hipchat.com/41812/283752/CYoVFxyk8OtNydv/Direct%20Deposit%207.10.pdf', 3),
(4, 'Drivers License', '', 4),

2
www/assets/cockpit/js/service.location.js
View File

@ -81,7 +81,7 @@ NGApp.factory('LocationService', function($http, $resource, $rootScope) {
var track = function() {
// I added this line - it was asking the user to login when he was filling the onboarding/setup form @pererinha
if( !$rootScope.account.user.id_admin ){
if( !$rootScope || !$rootScope.account || !$rootScope.account.user || !$rootScope.account.user.id_admin ){
return;
}