odon
/
grosir-obat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Apply fixes from StyleCI (#4)

pull/5/head
Nafies Luthfi 9 years ago
committed by GitHub
parent
709eff735a
commit
672721abbf
21 changed files with 106 additions and 108 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  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
View File

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

9
app/Http/Controllers/BackupsController.php
View File

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

5
app/Http/Controllers/ProductsController.php
View File

@ -20,8 +20,9 @@ class ProductsController extends Controller
->with('unit')
->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'));
}
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()) {
flash(trans('product.deleted'), 'success');
return redirect()->route('products.index', $routeParam);
}
flash(trans('product.undeleted'), 'error');
return back();
}
}

1
app/Http/Controllers/TransactionsController.php
View File

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

7
app/Http/Controllers/UnitsController.php
View File

@ -12,8 +12,9 @@ class UnitsController extends Controller
$editableUnit = null;
$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'));
}
return view('units.index', compact('units', 'editableUnit'));
}
@ -49,15 +50,17 @@ class UnitsController extends Controller
$this->validate($request, [
'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()) {
flash(trans('unit.deleted'), 'success');
return redirect()->route('units.index');
}
flash(trans('unit.undeleted'), 'error');
return back();
}
}

5
app/Http/Requests/BackupUploadRequest.php
View File

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

3
app/Providers/AppServiceProvider.php
View File

@ -14,8 +14,7 @@ class AppServiceProvider extends ServiceProvider
public function boot()
{
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])
->where($parameters[1], $value)
->count() < 1;

1
app/Transaction.php
View File

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

4
database/migrations/2017_05_02_211915_create_product_units_table.php
View File

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

12
routes/web.php
View File

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

8
tests/Feature/ManageProductsTest.php
View File

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

6
tests/Feature/ManageUnitsTest.php
View File

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

4
tests/Unit/Integration/TransactionTest.php
View File

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

Write Preview
Loading…
Cancel
Save