Skip to content

Commit

Permalink
Merge pull request #23 from poowf/develop
Browse files Browse the repository at this point in the history 
Merging develop into master
  • Loading branch information
@zanechua
zanechua committed Oct 28, 2018
2 parents 7d02f97 + 67563fa commit a1316a7
Show file tree
Hide file tree
Showing 201 changed files with 65,047 additions and 2,047 deletions.
4 changes: 3 additions & 1 deletion .env.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ DB_PASSWORD=secret

BROADCAST_DRIVER=log
CACHE_DRIVER=file
QUEUE_CONNECTION=sync
SESSION_DRIVER=file
QUEUE_DRIVER=sync
SESSION_LIFETIME=120

REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
Expand All @@ -32,6 +33,7 @@ MAIL_ENCRYPTION=null
PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1

MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
69 changes: 62 additions & 7 deletions app/Http/Controllers/ClientController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

use App\Http\Requests\CreateClientRequest;
use App\Http\Requests\UpdateClientRequest;
use App\Library\Poowf\Unicorn;
use Illuminate\Http\Request;
use App\Models\Client;
use App\Models\Company;
use Storage;
use Uuid;
use Image;

class ClientController extends Controller
{
Expand Down Expand Up @@ -39,7 +39,7 @@ public function create()
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param CreateClientRequest $request
* @return \Illuminate\Http\Response
*/
public function store(CreateClientRequest $request)
Expand All @@ -49,6 +49,31 @@ public function store(CreateClientRequest $request)
$client->company_id = auth()->user()->company_id;
$client->save();

$storedirectory = '/perm_store/company/' . $client->company_id . '/clients/' . $client->id . '/photos/';

Storage::makeDirectory($storedirectory);

if ($request->file('logo'))
{
$file = $request->file('logo');
$uuid = str_random(25);
$filename = $uuid . '.png';

if (!Storage::exists($storedirectory . 'logo_' . $filename))
{
$image = Image::make($file)->fit(500, 500, function ($constraint) {
$constraint->upsize();
}, 'center');
Storage::put($storedirectory . 'logo_' . $filename, $image->stream('jpg')->detach());
}

$filepath = $storedirectory . 'logo_' . $filename;

$client->logo = $filepath;
}

$client->save();

flash('Client Created', 'success');

return redirect()->route('client.index');
Expand Down Expand Up @@ -82,15 +107,40 @@ public function edit(Client $client)
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Models\Client $client
* @param UpdateClientRequest $request
* @param \App\Models\Client $client
* @return \Illuminate\Http\Response
*/
public function update(UpdateClientRequest $request, Client $client)
{
$client->fill($request->all());
$client->save();

$storedirectory = '/perm_store/company/' . $client->company_id . '/clients/' . $client->id . '/photos/';

Storage::makeDirectory($storedirectory);

if ($request->file('logo'))
{
$file = $request->file('logo');
$uuid = str_random(25);
$filename = $uuid . '.png';

if (!Storage::exists($storedirectory . 'logo_' . $filename))
{
$image = Image::make($file)->fit(500, 500, function ($constraint) {
$constraint->upsize();
}, 'center');
Storage::put($storedirectory . 'logo_' . $filename, $image->stream('jpg')->detach());
}

$filepath = $storedirectory . 'logo_' . $filename;

$client->logo = $filepath;
}

$client->save();

flash('Client Updated', 'success');

return redirect()->route('client.index');
Expand All @@ -99,8 +149,9 @@ public function update(UpdateClientRequest $request, Client $client)
/**
* Remove the specified resource from storage.
*
* @param \App\Models\Client $client
* @param \App\Models\Client $client
* @return \Illuminate\Http\Response
* @throws \Exception
*/
public function destroy(Client $client)
{
Expand All @@ -111,6 +162,10 @@ public function destroy(Client $client)
return redirect()->back();
}

/**
* @param Client $client
* @return \Illuminate\Http\RedirectResponse
*/
public function invoicecreate(Client $client)
{
return redirect()->route('invoice.create')->withInput([
Expand Down
19 changes: 9 additions & 10 deletions app/Http/Controllers/CompanyAddressController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class CompanyAddressController extends Controller
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
* @return void
*/
public function index()
{
Expand All @@ -23,7 +23,7 @@ public function index()
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
* @return void
*/
public function create()
{
Expand All @@ -33,8 +33,8 @@ public function create()
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
* @param \Illuminate\Http\Request $request
* @return void
*/
public function store(Request $request)
{
Expand All @@ -44,8 +44,8 @@ public function store(Request $request)
/**
* Display the specified resource.
*
* @param \App\Models\CompanyAddress $companyAddress
* @return \Illuminate\Http\Response
* @param \App\Models\CompanyAddress $companyAddress
* @return void
*/
public function show(CompanyAddress $companyAddress)
{
Expand Down Expand Up @@ -77,8 +77,7 @@ public function edit()
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Models\CompanyAddress $companyAddress
* @param UpdateCompanyAddressRequest $request
* @return \Illuminate\Http\Response
*/
public function update(UpdateCompanyAddressRequest $request)
Expand All @@ -100,8 +99,8 @@ public function update(UpdateCompanyAddressRequest $request)
/**
* Remove the specified resource from storage.
*
* @param \App\Models\CompanyAddress $companyAddress
* @return \Illuminate\Http\Response
* @param \App\Models\CompanyAddress $companyAddress
* @return void
*/
public function destroy(CompanyAddress $companyAddress)
{
Expand Down
66 changes: 41 additions & 25 deletions app/Http/Controllers/CompanyController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@
use Illuminate\Http\Request;
use App\Models\Company;
use App\Models\User;
use File;
use Storage;
use Image;
use Log;

class CompanyController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
* @return void
*/
public function index()
{
Expand All @@ -35,7 +36,7 @@ public function create()
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param CreateCompanyRequest $request
* @return \Illuminate\Http\Response
*/
public function store(CreateCompanyRequest $request)
Expand All @@ -49,20 +50,23 @@ public function store(CreateCompanyRequest $request)

$storedirectory = '/perm_store/company/' . $company->id . '/photos/';

if(!File::exists(public_path('/perm_store/company/' . $company->id . '/photos/'))) {
File::makeDirectory(public_path('/perm_store/company/' . $company->id . '/photos/'), 0775, true);
}
Storage::makeDirectory($storedirectory);

if ($request->file('logo'))
{
$file = $request->file('logo');
$uuid = str_random(25);
$filename = $uuid . '.png';

if (!file_exists(public_path($storedirectory . '/logo_' . $filename)))
Image::make($file)->save(public_path($storedirectory . '/logo_' . $filename));
if (!Storage::exists($storedirectory . 'logo_' . $filename))
{
$image = Image::make($file)->fit(420, 220, function ($constraint) {
$constraint->upsize();
}, 'center');
Storage::put($storedirectory . 'logo_' . $filename, $image->stream('jpg')->detach());
}

$filepath = $storedirectory . '/logo_' . $filename;
$filepath = $storedirectory . 'logo_' . $filename;

$company->logo = $filepath;
}
Expand All @@ -73,10 +77,15 @@ public function store(CreateCompanyRequest $request)
$uuid = str_random(25);
$filename = $uuid . '.png';

if (!file_exists(public_path($storedirectory . '/smlogo_' . $filename)))
Image::make($file)->save(public_path($storedirectory . '/smlogo_' . $filename));
if (!Storage::exists($storedirectory . 'smlogo_' . $filename))
{
$image = Image::make($file)->fit(200, 200, function ($constraint) {
$constraint->upsize();
}, 'center');
Storage::put($storedirectory . 'smlogo_' . $filename, $image->stream('jpg')->detach());
}

$filepath = $storedirectory . '/smlogo_' . $filename;
$filepath = $storedirectory . 'smlogo_' . $filename;

$company->smlogo = $filepath;
}
Expand All @@ -102,7 +111,7 @@ public function store(CreateCompanyRequest $request)
/**
* Display the specified resource.
*
* @return \Illuminate\Http\Response
* @return void
*/
public function show()
{
Expand All @@ -123,7 +132,7 @@ public function edit()
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param UpdateCompanyRequest $request
* @return \Illuminate\Http\Response
*/
public function update(UpdateCompanyRequest $request)
Expand All @@ -145,21 +154,23 @@ public function update(UpdateCompanyRequest $request)
$company->save();

$storedirectory = '/perm_store/company/' . $company->id . '/photos/';

if(!File::exists(public_path('/perm_store/company/' . $company->id . '/photos/'))) {
File::makeDirectory(public_path('/perm_store/company/' . $company->id . '/photos/'), 0775, true);
}
Storage::makeDirectory($storedirectory);

if ($request->file('logo'))
{
$file = $request->file('logo');
$uuid = str_random(25);
$filename = $uuid . '.png';

if (!file_exists(public_path($storedirectory . '/logo_' . $filename)))
Image::make($file)->save(public_path($storedirectory . '/logo_' . $filename));
if (!Storage::exists($storedirectory . 'logo_' . $filename))
{
$image = Image::make($file)->fit(420, 220, function ($constraint) {
$constraint->upsize();
}, 'center');
Storage::put($storedirectory . 'logo_' . $filename, $image->stream('jpg')->detach());
}

$filepath = $storedirectory . '/logo_' . $filename;
$filepath = $storedirectory . 'logo_' . $filename;

$company->logo = $filepath;
}
Expand All @@ -170,10 +181,15 @@ public function update(UpdateCompanyRequest $request)
$uuid = str_random(25);
$filename = $uuid . '.png';

if (!file_exists(public_path($storedirectory . '/smlogo_' . $filename)))
Image::make($file)->save(public_path($storedirectory . '/smlogo_' . $filename));
if (!Storage::exists($storedirectory . 'smlogo_' . $filename))
{
$image = Image::make($file)->fit(200, 200, function ($constraint) {
$constraint->upsize();
}, 'center');
Storage::put($storedirectory . 'smlogo_' . $filename, $image->stream('jpg')->detach());
}

$filepath = $storedirectory . '/smlogo_' . $filename;
$filepath = $storedirectory . 'smlogo_' . $filename;

$company->smlogo = $filepath;
}
Expand All @@ -195,7 +211,7 @@ public function update(UpdateCompanyRequest $request)
/**
* Remove the specified resource from storage.
*
* @return \Illuminate\Http\Response
* @return void
*/
public function destroy()
{
Expand Down
Loading

0 comments on commit a1316a7

Please sign in to comment.