Browse Source

Apply fixes from StyleCI (#4)

pull/5/head
Nafies Luthfi 9 years ago
committed by GitHub
parent
commit
672721abbf
  1. 23
      app/Helpers/helpers.php
  2. 9
      app/Http/Controllers/BackupsController.php
  3. 5
      app/Http/Controllers/ProductsController.php
  4. 1
      app/Http/Controllers/TransactionsController.php
  5. 7
      app/Http/Controllers/UnitsController.php
  6. 5
      app/Http/Requests/BackupUploadRequest.php
  7. 3
      app/Providers/AppServiceProvider.php
  8. 1
      app/Transaction.php
  9. 4
      database/migrations/2017_05_02_211915_create_product_units_table.php
  10. 12
      routes/web.php
  11. 8
      tests/Feature/ManageProductsTest.php
  12. 6
      tests/Feature/ManageUnitsTest.php
  13. 4
      tests/Unit/Integration/TransactionTest.php

23
app/Helpers/helpers.php

@ -33,28 +33,17 @@ function html_link_to_route($name, $title = null, $parameters = [], $attributes
function formatSizeUnits($bytes) function formatSizeUnits($bytes)
{ {
if ($bytes >= 1073741824)
{
if ($bytes >= 1073741824) {
$bytes = number_format($bytes / 1073741824, 2).' GB'; $bytes = number_format($bytes / 1073741824, 2).' GB';
}
elseif ($bytes >= 1048576)
{
} elseif ($bytes >= 1048576) {
$bytes = number_format($bytes / 1048576, 2).' MB'; $bytes = number_format($bytes / 1048576, 2).' MB';
}
elseif ($bytes >= 1024)
{
} elseif ($bytes >= 1024) {
$bytes = number_format($bytes / 1024, 2).' KB'; $bytes = number_format($bytes / 1024, 2).' KB';
}
elseif ($bytes > 1)
{
} elseif ($bytes > 1) {
$bytes = $bytes.' bytes'; $bytes = $bytes.' bytes';
}
elseif ($bytes == 1)
{
} elseif ($bytes == 1) {
$bytes = $bytes.' byte'; $bytes = $bytes.' byte';
}
else
{
} else {
$bytes = '0 bytes'; $bytes = '0 bytes';
} }

9
app/Http/Controllers/BackupsController.php

@ -30,7 +30,7 @@ class BackupsController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$this->validate($request, [ $this->validate($request, [
'file_name' => 'nullable|max:30|regex:/^[\w._-]+$/'
'file_name' => 'nullable|max:30|regex:/^[\w._-]+$/',
]); ]);
try { try {
@ -38,7 +38,7 @@ class BackupsController extends Controller
$fileName = $request->get('file_name') ?: date('Y-m-d_Hi'); $fileName = $request->get('file_name') ?: date('Y-m-d_Hi');
$manager->makeBackup()->run('mysql', [ $manager->makeBackup()->run('mysql', [
new Destination('local', 'backup/db/' . $fileName)
new Destination('local', 'backup/db/'.$fileName),
], 'gzip'); ], 'gzip');
return redirect()->route('backups.index'); return redirect()->route('backups.index');
@ -52,6 +52,7 @@ class BackupsController extends Controller
if (file_exists(storage_path('app/backup/db/').$fileName)) { if (file_exists(storage_path('app/backup/db/').$fileName)) {
unlink(storage_path('app/backup/db/').$fileName); unlink(storage_path('app/backup/db/').$fileName);
} }
return redirect()->route('backups.index'); return redirect()->route('backups.index');
} }
@ -65,7 +66,8 @@ class BackupsController extends Controller
try { try {
$manager = app()->make(Manager::class); $manager = app()->make(Manager::class);
$manager->makeRestore()->run('local', 'backup/db/'.$fileName, 'mysql', 'gzip'); $manager->makeRestore()->run('local', 'backup/db/'.$fileName, 'mysql', 'gzip');
} catch (FileNotFoundException $e) {}
} catch (FileNotFoundException $e) {
}
return redirect()->route('backups.index'); return redirect()->route('backups.index');
} }
@ -80,5 +82,4 @@ class BackupsController extends Controller
return redirect()->route('backups.index'); return redirect()->route('backups.index');
} }
} }

5
app/Http/Controllers/ProductsController.php

@ -20,8 +20,9 @@ class ProductsController extends Controller
->with('unit') ->with('unit')
->paginate(25); ->paginate(25);
if (in_array($request->get('action'), ['edit','delete']) && $request->has('id'))
if (in_array($request->get('action'), ['edit', 'delete']) && $request->has('id')) {
$editableProduct = Product::find($request->get('id')); $editableProduct = Product::find($request->get('id'));
}
return view('products.index', compact('products', 'editableProduct')); return view('products.index', compact('products', 'editableProduct'));
} }
@ -69,10 +70,12 @@ class ProductsController extends Controller
if ($request->get('product_id') == $productId && Product::findOrFail($productId)->delete()) { if ($request->get('product_id') == $productId && Product::findOrFail($productId)->delete()) {
flash(trans('product.deleted'), 'success'); flash(trans('product.deleted'), 'success');
return redirect()->route('products.index', $routeParam); return redirect()->route('products.index', $routeParam);
} }
flash(trans('product.undeleted'), 'error'); flash(trans('product.undeleted'), 'error');
return back(); return back();
} }
} }

1
app/Http/Controllers/TransactionsController.php

@ -10,6 +10,7 @@ class TransactionsController extends Controller
public function index(Request $request) public function index(Request $request)
{ {
$transactions = Transaction::orderBy('invoice_no', 'desc')->paginate(24); $transactions = Transaction::orderBy('invoice_no', 'desc')->paginate(24);
return view('transactions.index', compact('transactions')); return view('transactions.index', compact('transactions'));
} }

7
app/Http/Controllers/UnitsController.php

@ -12,8 +12,9 @@ class UnitsController extends Controller
$editableUnit = null; $editableUnit = null;
$units = Unit::withCount('products')->get(); $units = Unit::withCount('products')->get();
if (in_array($request->get('action'), ['edit','delete']) && $request->has('id'))
if (in_array($request->get('action'), ['edit', 'delete']) && $request->has('id')) {
$editableUnit = Unit::find($request->get('id')); $editableUnit = Unit::find($request->get('id'));
}
return view('units.index', compact('units', 'editableUnit')); return view('units.index', compact('units', 'editableUnit'));
} }
@ -49,15 +50,17 @@ class UnitsController extends Controller
$this->validate($request, [ $this->validate($request, [
'unit_id' => 'required|exists:product_units,id|not_exists:products,unit_id', 'unit_id' => 'required|exists:product_units,id|not_exists:products,unit_id',
], [ ], [
'unit_id.not_exists' => trans('unit.undeleted')
'unit_id.not_exists' => trans('unit.undeleted'),
]); ]);
if ($request->get('unit_id') == $unit->id && $unit->delete()) { if ($request->get('unit_id') == $unit->id && $unit->delete()) {
flash(trans('unit.deleted'), 'success'); flash(trans('unit.deleted'), 'success');
return redirect()->route('units.index'); return redirect()->route('units.index');
} }
flash(trans('unit.undeleted'), 'error'); flash(trans('unit.undeleted'), 'error');
return back(); return back();
} }
} }

5
app/Http/Requests/BackupUploadRequest.php

@ -24,7 +24,7 @@ class BackupUploadRequest extends FormRequest
public function rules() public function rules()
{ {
return [ return [
'backup_file' => 'required|sql_gz'
'backup_file' => 'required|sql_gz',
]; ];
} }
@ -40,8 +40,9 @@ class BackupUploadRequest extends FormRequest
$validator = parent::getValidatorInstance(); $validator = parent::getValidatorInstance();
$validator->addImplicitExtension('sql_gz', function ($attribute, $value, $parameters) { $validator->addImplicitExtension('sql_gz', function ($attribute, $value, $parameters) {
if ($value)
if ($value) {
return $value->getClientOriginalExtension() == 'gz'; return $value->getClientOriginalExtension() == 'gz';
}
return false; return false;
}); });

3
app/Providers/AppServiceProvider.php

@ -14,8 +14,7 @@ class AppServiceProvider extends ServiceProvider
public function boot() public function boot()
{ {
require_once app_path().'/Helpers/helpers.php'; require_once app_path().'/Helpers/helpers.php';
\Validator::extend('not_exists', function($attribute, $value, $parameters)
{
\Validator::extend('not_exists', function ($attribute, $value, $parameters) {
return \DB::table($parameters[0]) return \DB::table($parameters[0])
->where($parameters[1], $value) ->where($parameters[1], $value)
->count() < 1; ->count() < 1;

1
app/Transaction.php

@ -22,6 +22,7 @@ class Transaction extends Model
foreach ($this->items as $item) { foreach ($this->items as $item) {
$pcsCount += $item['qty']; $pcsCount += $item['qty'];
} }
return count($this->items).' Item, '.$pcsCount.' Pcs'; return count($this->items).' Item, '.$pcsCount.' Pcs';
} }

4
database/migrations/2017_05_02_211915_create_product_units_table.php

@ -1,8 +1,8 @@
<?php <?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateProductUnitsTable extends Migration class CreateProductUnitsTable extends Migration
{ {

12
routes/web.php

@ -18,12 +18,12 @@ Route::get('/', function () {
Auth::routes(); Auth::routes();
Route::group(['middleware' => 'auth'], function () { Route::group(['middleware' => 'auth'], function () {
/**
/*
* Pages Routes * Pages Routes
*/ */
Route::get('/home', 'CartController@index')->name('home'); Route::get('/home', 'CartController@index')->name('home');
/**
/*
* Cart / Trasanction Draft Routes * Cart / Trasanction Draft Routes
*/ */
Route::get('drafts', 'CartController@index')->name('cart.index'); Route::get('drafts', 'CartController@index')->name('cart.index');
@ -38,24 +38,24 @@ Route::group(['middleware' => 'auth'], function () {
Route::delete('cart/remove', 'CartController@remove')->name('cart.remove'); Route::delete('cart/remove', 'CartController@remove')->name('cart.remove');
Route::delete('cart/destroy', 'CartController@destroy')->name('cart.destroy'); Route::delete('cart/destroy', 'CartController@destroy')->name('cart.destroy');
/**
/*
* Products Routes * Products Routes
*/ */
Route::resource('products', 'ProductsController', ['except' => ['create', 'show', 'edit']]); Route::resource('products', 'ProductsController', ['except' => ['create', 'show', 'edit']]);
/**
/*
* Units Routes * Units Routes
*/ */
Route::resource('units', 'UnitsController', ['except' => ['create', 'show', 'edit']]); Route::resource('units', 'UnitsController', ['except' => ['create', 'show', 'edit']]);
/**
/*
* Transactions Routes * Transactions Routes
*/ */
Route::get('transactions', ['as' => 'transactions.index', 'uses' => 'TransactionsController@index']); Route::get('transactions', ['as' => 'transactions.index', 'uses' => 'TransactionsController@index']);
Route::get('transactions/{transaction}', ['as' => 'transactions.show', 'uses' => 'TransactionsController@show']); Route::get('transactions/{transaction}', ['as' => 'transactions.show', 'uses' => 'TransactionsController@show']);
Route::get('transactions/{transaction}/pdf', ['as' => 'transactions.pdf', 'uses' => 'TransactionsController@pdf']); Route::get('transactions/{transaction}/pdf', ['as' => 'transactions.pdf', 'uses' => 'TransactionsController@pdf']);
/**
/*
* Backup Restore Database Routes * Backup Restore Database Routes
*/ */
Route::post('backups/upload', ['as'=>'backups.upload', 'uses'=>'BackupsController@upload']); Route::post('backups/upload', ['as'=>'backups.upload', 'uses'=>'BackupsController@upload']);

8
tests/Feature/ManageProductsTest.php

@ -151,13 +151,13 @@ class ManageProductsTest extends BrowserKitTestCase
$this->seePageIs(route('products.index', ['action' => 'delete', 'id' => $product->id])); $this->seePageIs(route('products.index', ['action' => 'delete', 'id' => $product->id]));
$this->seeInDatabase('products', [ $this->seeInDatabase('products', [
'id' => $product->id
'id' => $product->id,
]); ]);
$this->press(trans('app.delete_confirm_button')); $this->press(trans('app.delete_confirm_button'));
$this->dontSeeInDatabase('products', [ $this->dontSeeInDatabase('products', [
'id' => $product->id
'id' => $product->id,
]); ]);
} }
@ -172,14 +172,14 @@ class ManageProductsTest extends BrowserKitTestCase
$this->seePageIs(route('products.index', ['action' => 'delete', 'id' => $product->id, 'q' => '123'])); $this->seePageIs(route('products.index', ['action' => 'delete', 'id' => $product->id, 'q' => '123']));
$this->seeInDatabase('products', [ $this->seeInDatabase('products', [
'id' => $product->id
'id' => $product->id,
]); ]);
$this->press(trans('app.delete_confirm_button')); $this->press(trans('app.delete_confirm_button'));
$this->seePageIs(route('products.index', ['q' => '123'])); $this->seePageIs(route('products.index', ['q' => '123']));
$this->dontSeeInDatabase('products', [ $this->dontSeeInDatabase('products', [
'id' => $product->id
'id' => $product->id,
]); ]);
} }
} }

6
tests/Feature/ManageUnitsTest.php

@ -75,13 +75,13 @@ class ManageUnitsTest extends BrowserKitTestCase
$this->seePageIs(route('units.index', ['action' => 'delete', 'id' => $unit->id])); $this->seePageIs(route('units.index', ['action' => 'delete', 'id' => $unit->id]));
$this->seeInDatabase('product_units', [ $this->seeInDatabase('product_units', [
'id' => $unit->id
'id' => $unit->id,
]); ]);
$this->press(trans('app.delete_confirm_button')); $this->press(trans('app.delete_confirm_button'));
$this->dontSeeInDatabase('product_units', [ $this->dontSeeInDatabase('product_units', [
'id' => $unit->id
'id' => $unit->id,
]); ]);
} }
@ -102,7 +102,7 @@ class ManageUnitsTest extends BrowserKitTestCase
$this->seePageIs(route('units.index', ['action' => 'delete', 'id' => $unitId])); $this->seePageIs(route('units.index', ['action' => 'delete', 'id' => $unitId]));
$this->seeInDatabase('product_units', [ $this->seeInDatabase('product_units', [
'id' => $unitId
'id' => $unitId,
]); ]);
} }
} }

4
tests/Unit/Integration/TransactionTest.php

@ -13,7 +13,7 @@ class TransactionTest extends TestCase
/** @test */ /** @test */
public function it_has_items_count_attribute() public function it_has_items_count_attribute()
{ {
$transaction = new Transaction;
$transaction = new Transaction();
$items = [ $items = [
[ [
@ -45,7 +45,7 @@ class TransactionTest extends TestCase
/** @test */ /** @test */
public function it_has_get_exchange_method() public function it_has_get_exchange_method()
{ {
$transaction = new Transaction;
$transaction = new Transaction();
$transaction->payment = 100000; $transaction->payment = 100000;
$transaction->total = 90000; $transaction->total = 90000;

Loading…
Cancel
Save