Skip to content

Commit

Permalink
Modifications made
Browse files Browse the repository at this point in the history
  • Loading branch information
iamwebwiz committed Nov 22, 2017
1 parent ead0cc1 commit 4774c21
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 8 deletions.
2 changes: 1 addition & 1 deletion config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
|
*/

'timezone' => 'UTC',
'timezone' => 'Africa/Lagos',

/*
|--------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ public function up()
$table->string('weight');
$table->string('product');
$table->integer('totalFreight');
$table->date('pickup_date');
$table->time('pickup_time');
$table->date('expected_delivery_date');
$table->string('pickup_date');
$table->string('pickup_time');
$table->string('expected_delivery_date');
$table->integer('quantity');
$table->string('shipment_mode');
$table->string('shipment_status');
Expand Down
1 change: 1 addition & 0 deletions database/seeds/DatabaseSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ class DatabaseSeeder extends Seeder
public function run()
{
$this->call(UsersTableSeeder::class);
$this->call(TrackingsTableSeeder::class);
}
}
38 changes: 38 additions & 0 deletions database/seeds/TrackingsTableSeeder.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?php

use Illuminate\Database\Seeder;

class TrackingsTableSeeder extends Seeder
{
/**
* Run the database seeds.
*
* @return void
*/
public function run()
{
$tracking = new \App\Tracking;

$tracking->trackingID = str_random(7);
$tracking->geolocation = 'Ibadan';
$tracking->shipper_address = 'Lagos';
$tracking->receiver_address = 'Magboro, Lagos';
$tracking->origin = 'Magboro, Lagos';
$tracking->destination = 'Surulere, Lagos';
$tracking->shipment_type = 'Free Shipping via Ferris Air';
$tracking->payment_mode = 'MasterCard Nigeria';
$tracking->departure_time = '08:30';
$tracking->package = 'Silver Items';
$tracking->carrier = 'Ferris Air';
$tracking->weight = '400kg';
$tracking->product = 'Silver Items';
$tracking->totalFreight = '40';
$tracking->pickup_date = '2017-11-22';
$tracking->pickup_time = '08:30';
$tracking->expected_delivery_date = '2017-11-25';
$tracking->quantity = '3';
$tracking->shipment_mode = 'Helicopter';
$tracking->shipment_status = 'Shipping Via Ferris Air';
$tracking->save();
}
}
8 changes: 4 additions & 4 deletions resources/views/tracking/new.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<div class="form-group">
<label for="departure_time" class="control-label col-sm-4">Departure Time</label>
<div class="col-sm-8">
<input type="time" name="departure_time" placeholder="Departure Time" class="form-control">
<input type="text" name="departure_time" placeholder="Departure Time" class="form-control">
</div>
</div>

Expand Down Expand Up @@ -105,21 +105,21 @@
<div class="form-group">
<label for="pickup_date" class="control-label col-sm-4">Pickup Date</label>
<div class="col-sm-8">
<input type="date" name="pickup_date" placeholder="Pickup Date" class="form-control">
<input type="text" name="pickup_date" placeholder="Pickup Date" class="form-control">
</div>
</div>

<div class="form-group">
<label for="pickup_time" class="control-label col-sm-4">Pickup Time</label>
<div class="col-sm-8">
<input type="time" name="pickup_time" placeholder="Pickup Time" class="form-control">
<input type="text" name="pickup_time" placeholder="Pickup Time" class="form-control">
</div>
</div>

<div class="form-group">
<label for="expected_delivery_date" class="control-label col-sm-4">Expected Delivery Date</label>
<div class="col-sm-8">
<input type="date" name="expected_delivery_date" placeholder="Expected Delivery Date" class="form-control">
<input type="text" name="expected_delivery_date" placeholder="Expected Delivery Date" class="form-control">
</div>
</div>

Expand Down
6 changes: 6 additions & 0 deletions resources/views/trackingresult.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@

<hr>

<div class="row">
<img src="https://maps.googleapis.com/maps/api/staticmap?center={{ $tracking->location }}" alt="">
</div>

<hr>

<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
Expand Down

0 comments on commit 4774c21

Please sign in to comment.