From 2a7a163de1ea44a2f9013a688087670f2ff9ca54 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Thu, 18 May 2017 10:44:36 +0700 Subject: [PATCH] Apply fixes from StyleCI (#5) --- app/Http/Controllers/Api/ProductsController.php | 6 +++--- app/Http/Controllers/CartController.php | 4 ++-- app/Http/Controllers/ProductsController.php | 1 + app/Http/Controllers/TransactionsController.php | 2 +- app/Transaction.php | 1 - config/store.php | 6 +++--- resources/lang/id/product.php | 26 ++++++++++++------------- routes/api.php | 3 +-- tests/Feature/Cart/SearchProductsTest.php | 4 ++-- tests/Feature/TransactionEntryTest.php | 8 ++++---- tests/TestCase.php | 16 ++++++++++----- 11 files changed, 41 insertions(+), 36 deletions(-) diff --git a/app/Http/Controllers/Api/ProductsController.php b/app/Http/Controllers/Api/ProductsController.php index 3ef84df..a0a7f51 100644 --- a/app/Http/Controllers/Api/ProductsController.php +++ b/app/Http/Controllers/Api/ProductsController.php @@ -10,9 +10,9 @@ class ProductsController extends Controller { public function search(Request $request) { - $query = $request->get('query'); + $query = $request->get('query'); $draftType = $request->get('draftType'); - $draftKey = $request->get('draftKey'); + $draftKey = $request->get('draftKey'); $formToken = $request->get('formToken'); $queriedProducts = []; if ($query) { @@ -21,6 +21,6 @@ class ProductsController extends Controller })->with('unit')->get(); } - return view('cart.partials.product-search-result-box', compact('queriedProducts','draftType','draftKey','formToken')); + return view('cart.partials.product-search-result-box', compact('queriedProducts', 'draftType', 'draftKey', 'formToken')); } } diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php index d9c829d..ceba4e9 100644 --- a/app/Http/Controllers/CartController.php +++ b/app/Http/Controllers/CartController.php @@ -63,8 +63,8 @@ class CartController extends Controller $this->cart->addItemToDraft($draftKey, $item); flash(trans('cart.item_added', [ - 'product_name' => $product->name . ' (' . $product->unit->name . ')', - 'qty' => $request->qty, + 'product_name' => $product->name.' ('.$product->unit->name.')', + 'qty' => $request->qty, ])); if ($request->has('query')) { diff --git a/app/Http/Controllers/ProductsController.php b/app/Http/Controllers/ProductsController.php index f274829..8fbb063 100644 --- a/app/Http/Controllers/ProductsController.php +++ b/app/Http/Controllers/ProductsController.php @@ -83,6 +83,7 @@ class ProductsController extends Controller public function priceList() { $products = Product::orderBy('name')->with('unit')->get(); + return view('products.price-list', compact('products')); // $pdf = PDF::loadView('products.price-list', compact('products')); diff --git a/app/Http/Controllers/TransactionsController.php b/app/Http/Controllers/TransactionsController.php index 98ed225..f23d3f9 100644 --- a/app/Http/Controllers/TransactionsController.php +++ b/app/Http/Controllers/TransactionsController.php @@ -24,7 +24,7 @@ class TransactionsController extends Controller { // return view('transactions.pdf', compact('transaction')); $pdf = PDF::loadView('transactions.pdf', compact('transaction')); - return $pdf->stream($transaction->invoice_no.'.faktur.pdf'); + return $pdf->stream($transaction->invoice_no.'.faktur.pdf'); } } diff --git a/app/Transaction.php b/app/Transaction.php index ba3b812..3546a45 100644 --- a/app/Transaction.php +++ b/app/Transaction.php @@ -2,7 +2,6 @@ namespace App; -use App\User; use Illuminate\Database\Eloquent\Model; class Transaction extends Model diff --git a/config/store.php b/config/store.php index 0622266..0790ccb 100644 --- a/config/store.php +++ b/config/store.php @@ -1,7 +1,7 @@ env('STORE_NAME','Laravel'), + 'name' => env('STORE_NAME', 'Laravel'), 'address' => env('STORE_ADDRESS'), - 'phone' => env('STORE_PHONE'), -]; \ No newline at end of file + 'phone' => env('STORE_PHONE'), +]; diff --git a/resources/lang/id/product.php b/resources/lang/id/product.php index b6eada4..b722156 100644 --- a/resources/lang/id/product.php +++ b/resources/lang/id/product.php @@ -2,19 +2,19 @@ return [ // Labels - 'product' => 'Produk', - 'list' => 'Daftar Produk', - 'search' => 'Cari Produk', - 'not_found' => 'Produk tidak ditemukan', - 'empty' => 'Belum ada Produk', - 'price' => 'Harga', - 'unit' => 'Satuan', - 'back_to_index' => 'Kembali ke daftar Produk', - 'item_price' => 'Harga Satuan', - 'item_discount' => 'Diskon Item', - 'item_qty' => 'Qty', - 'item_subtotal' => 'Subtotal', - 'price_list' => 'Daftar Harga', + 'product' => 'Produk', + 'list' => 'Daftar Produk', + 'search' => 'Cari Produk', + 'not_found' => 'Produk tidak ditemukan', + 'empty' => 'Belum ada Produk', + 'price' => 'Harga', + 'unit' => 'Satuan', + 'back_to_index' => 'Kembali ke daftar Produk', + 'item_price' => 'Harga Satuan', + 'item_discount' => 'Diskon Item', + 'item_qty' => 'Qty', + 'item_subtotal' => 'Subtotal', + 'price_list' => 'Daftar Harga', 'print_price_list' => 'Cetak Daftar Harga', // Actions diff --git a/routes/api.php b/routes/api.php index d66afdf..e9d0246 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1,7 +1,6 @@ 'v1','namespace' => 'Api', 'as' => 'api.', 'middleware' => []], function() { +Route::group(['prefix' => 'v1', 'namespace' => 'Api', 'as' => 'api.', 'middleware' => []], function () { Route::post('products/search', ['as' => 'products.search', 'uses' => 'ProductsController@search']); }); diff --git a/tests/Feature/Cart/SearchProductsTest.php b/tests/Feature/Cart/SearchProductsTest.php index ac27374..3f59b61 100644 --- a/tests/Feature/Cart/SearchProductsTest.php +++ b/tests/Feature/Cart/SearchProductsTest.php @@ -28,9 +28,9 @@ class SearchProductsTest extends TestCase $user = $this->loginAsUser(); $response = $this->post(route('api.products.search'), [ - 'query'=> 'Bis', + 'query' => 'Bis', 'draftType'=> $draft->type, - 'draftKey'=> $draft->draftKey, + 'draftKey' => $draft->draftKey, ]); $response->assertSuccessful(); diff --git a/tests/Feature/TransactionEntryTest.php b/tests/Feature/TransactionEntryTest.php index 7de0739..4c55dd0 100644 --- a/tests/Feature/TransactionEntryTest.php +++ b/tests/Feature/TransactionEntryTest.php @@ -91,15 +91,15 @@ class TransactionEntryTest extends BrowserKitTestCase $this->type(2, 'qty'); $this->press('add-product-'.$product1->id); $this->see(trans('cart.item_added', [ - 'product_name' => $product1->name . ' (' . $product1->unit->name . ')', - 'qty' => 2 + 'product_name' => $product1->name.' ('.$product1->unit->name.')', + 'qty' => 2, ])); $this->type(3, 'qty'); $this->press('add-product-'.$product2->id); $this->see(trans('cart.item_added', [ - 'product_name' => $product2->name . ' (' . $product2->unit->name . ')', - 'qty' => 3 + 'product_name' => $product2->name.' ('.$product2->unit->name.')', + 'qty' => 3, ])); $this->seePageIs(route('cart.show', [$draft->draftKey, 'query' => 'testing'])); diff --git a/tests/TestCase.php b/tests/TestCase.php index 450b9f8..f9b05dc 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -2,10 +2,10 @@ namespace Tests; -use App\User; -use Illuminate\Foundation\Testing\TestCase as BaseTestCase; use App\Exceptions\Handler; +use App\User; use Illuminate\Contracts\Debug\ExceptionHandler; +use Illuminate\Foundation\Testing\TestCase as BaseTestCase; abstract class TestCase extends BaseTestCase { @@ -23,9 +23,15 @@ abstract class TestCase extends BaseTestCase { // Disable Laravel's default exception handling // and allow exceptions to bubble up the stack - $this->app->instance(ExceptionHandler::class, new class extends Handler { - public function __construct() {} - public function report(\Exception $exception) {} + $this->app->instance(ExceptionHandler::class, new class() extends Handler { + public function __construct() + { + } + + public function report(\Exception $exception) + { + } + public function render($request, \Exception $exception) { throw $exception;