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-02 15:49:00 -03:00
commit 7f5f72bbb0
6 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
db/migrate/000300_stripe.sql → db/migrate/000301_stripe.sql
View File

1
db/migrate/000302_stripe_admin.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `admin` ADD `stripe_id` VARCHAR(255) NULL DEFAULT NULL AFTER `date_terminated`;

1
db/migrate/000303_admin_dob.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `admin` ADD `dob` DATE NULL AFTER `id_admin_author`;

1
include/controllers/default/cockpit2/api/driver/save/index.php
View File

@ -53,6 +53,7 @@ class Controller_api_driver_save extends Crunchbutton_Controller_RestAccount {
} }
$driver->name = $this->request()[ 'name' ]; $driver->name = $this->request()[ 'name' ];
$driver->dob = $this->request()[ 'dob' ];
$driver->phone = $phone; $driver->phone = $phone;
$driver->txt = $phone; $driver->txt = $phone;
$driver->testphone = $phone; $driver->testphone = $phone;

1
include/library/Cockpit/Admin.php
View File

@ -110,6 +110,7 @@ class Cockpit_Admin extends Crunchbutton_Admin {
$out['referral_admin_credit'] = floatval( $this->referral_admin_credit ); $out['referral_admin_credit'] = floatval( $this->referral_admin_credit );
$out['referral_customer_credit'] = floatval( $this->referral_customer_credit ); $out['referral_customer_credit'] = floatval( $this->referral_customer_credit );
$out['invite_code'] = $this->invite_code; $out['invite_code'] = $this->invite_code;
$out['dob'] = $this->dob;
$author = $this->author(); $author = $this->author();
if( $author->id_admin ){ if( $author->id_admin ){

10
include/views/default/cockpit2/frontend/drivers/drivers-onboarding-form.phtml
View File

@ -78,12 +78,20 @@
<li class="li-input" ng-class="{'error':form.driverEmail.$invalid}"> <li class="li-input" ng-class="{'error':form.driverEmail.$invalid}">
<div class="label">Email:</div> <div class="label">Email:</div>
<div class="input"><input type="email" name="driverEmail" ng-model="driver.email" placeholder="Email"></div> <div class="input"><input type="email" name="driverEmail" ng-model="driver.email" required ng-pattern="/.*@.*/" placeholder="Email"></div>
<div class="box-error"> <div class="box-error">
<small ng-show="form.driverEmail.$invalid">Enter a valid email.</small> <small ng-show="form.driverEmail.$invalid">Enter a valid email.</small>
</div> </div>
</li> </li>
<li class="li-input" ng-class="{'error':form.driverDob.$invalid}">
<div class="label">Date of Birth:</div>
<div class="input"><input type="text" name="driverDob" required ng-pattern="/[0-9]{4}-[0-9]{2}-[0-9]{2}/" ng-model="driver.dob"></div>
<div class="box-error">
<small ng-show="form.driverDob.$invalid">Enter a valid format (YYYY-MM-DD)</small>
</div>
</li>
</ul> </ul>
<br/><br/><br/> <br/><br/><br/>