Browse Source

Apply fixes from StyleCI

pull/1/head
Nafies Luthfi 9 years ago
committed by StyleCI Bot
parent
commit
75a73dfe02
  1. 12
      app/Cart/CartCollection.php
  2. 4
      app/Cart/CashDraft.php
  3. 4
      app/Cart/CreditDraft.php
  4. 18
      app/Cart/Item.php
  5. 11
      app/Cart/TransactionDraft.php
  6. 3
      app/Console/Kernel.php
  7. 13
      app/Exceptions/Handler.php
  8. 18
      app/Http/Controllers/Auth/RegisterController.php
  9. 24
      app/Http/Controllers/CartController.php
  10. 4
      app/Http/Controllers/Controller.php
  11. 2
      app/Http/Controllers/HomeController.php
  12. 10
      app/Http/Kernel.php
  13. 7
      app/Http/Middleware/RedirectIfAuthenticated.php
  14. 5
      app/Product.php
  15. 1
      app/Providers/AuthServiceProvider.php
  16. 2
      app/Providers/BroadcastServiceProvider.php
  17. 2
      app/Providers/EventServiceProvider.php
  18. 2
      app/Providers/RouteServiceProvider.php
  19. 2
      app/User.php
  20. 64
      config/app.php
  21. 12
      config/auth.php
  22. 10
      config/broadcasting.php
  23. 16
      config/cache.php
  24. 44
      config/database.php
  25. 10
      config/filesystems.php
  26. 2
      config/mail.php
  27. 24
      config/queue.php
  28. 6
      config/services.php
  29. 14
      database/factories/ModelFactory.php
  30. 4
      database/migrations/2014_10_12_000000_create_users_table.php
  31. 4
      database/migrations/2017_04_09_013901_create_products_table.php
  32. 2
      database/seeds/UsersTableSeeder.php
  33. 3
      public/index.php
  34. 2
      resources/lang/en/auth.php
  35. 2
      resources/lang/en/pagination.php
  36. 8
      resources/lang/en/passwords.php
  37. 2
      routes/web.php
  38. 4
      server.php
  39. 4
      tests/Feature/Auth/UserLoginTest.php
  40. 42
      tests/Feature/Cart/CartControllerTest.php
  41. 12
      tests/Feature/TransactionEntryTest.php
  42. 55
      tests/Unit/CartCollectionTest.php
  43. 2
      tests/Unit/Integration/ProductTest.php

12
app/Cart/CartCollection.php

@ -2,12 +2,11 @@
namespace App\Cart;
use App\Product;
use Illuminate\Support\Collection;
/**
* Cart Collection Class
*/
* Cart Collection Class.
*/
class CartCollection
{
private $instance;
@ -47,10 +46,9 @@ class CartCollection
public function get($draftKey)
{
$content = $this->getContent();
if (isset($content[$draftKey]))
if (isset($content[$draftKey])) {
return $content[$draftKey];
return null;
}
}
public function updateDraftAttributes($draftKey, $draftAttributes)
@ -112,6 +110,7 @@ class CartCollection
$content[$draftKey]->addItem($item);
$this->session->put($this->instance, $content);
return $item->product;
}
@ -145,5 +144,4 @@ class CartCollection
{
return !$this->isEmpty();
}
}

4
app/Cart/CashDraft.php

@ -3,8 +3,8 @@
namespace App\Cart;
/**
* Cash Draft
*/
* Cash Draft.
*/
class CashDraft extends TransactionDraft
{
public $draftKey;

4
app/Cart/CreditDraft.php

@ -3,8 +3,8 @@
namespace App\Cart;
/**
* Credit Draft
*/
* Credit Draft.
*/
class CreditDraft extends TransactionDraft
{
public $draftKey;

18
app/Cart/Item.php

@ -5,8 +5,8 @@ namespace App\Cart;
use App\Product;
/**
* Draft Item class
*/
* Draft Item class.
*/
class Item
{
public $id;
@ -20,24 +20,24 @@ class Item
public function __construct(Product $product, $qty)
{
$this->id = $product->id;
$this->product = $product;
$this->qty = $qty;
$this->price = $product->getPrice();
$this->id = $product->id;
$this->product = $product;
$this->qty = $qty;
$this->price = $product->getPrice();
$this->subtotal = $product->getPrice() * $qty;
}
public function updateAttribute(array $newItemData)
{
if (isset($newItemData['qty'])) {
$this->qty = $newItemData['qty'];
$this->qty = $newItemData['qty'];
$this->subtotal = $this->price * $this->qty;
}
if (isset($newItemData['item_discount'])) {
$this->item_discount = $newItemData['item_discount'];
$this->item_discount = $newItemData['item_discount'];
$this->item_discount_subtotal = $this->item_discount * $this->qty;
$this->subtotal = $this->subtotal - $this->item_discount_subtotal;
$this->subtotal = $this->subtotal - $this->item_discount_subtotal;
}
return $this;

11
app/Cart/TransactionDraft.php

@ -2,11 +2,9 @@
namespace App\Cart;
use App\Product;
/**
* Transaction Draft Interface
*/
* Transaction Draft Interface.
*/
abstract class TransactionDraft
{
public $items = [];
@ -65,8 +63,9 @@ abstract class TransactionDraft
public function updateItem($itemKey, $newItemData)
{
if (!isset($this->items[$itemKey]))
return null;
if (!isset($this->items[$itemKey])) {
return;
}
$item = $this->items[$itemKey];

3
app/Console/Kernel.php

@ -19,7 +19,8 @@ class Kernel extends ConsoleKernel
/**
* Define the application's command schedule.
*
* @param \Illuminate\Console\Scheduling\Schedule $schedule
* @param \Illuminate\Console\Scheduling\Schedule $schedule
*
* @return void
*/
protected function schedule(Schedule $schedule)

13
app/Exceptions/Handler.php

@ -27,7 +27,8 @@ class Handler extends ExceptionHandler
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $exception
* @param \Exception $exception
*
* @return void
*/
public function report(Exception $exception)
@ -38,8 +39,9 @@ class Handler extends ExceptionHandler
/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
*
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $exception)
@ -50,8 +52,9 @@ class Handler extends ExceptionHandler
/**
* Convert an authentication exception into an unauthenticated response.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Auth\AuthenticationException $exception
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Auth\AuthenticationException $exception
*
* @return \Illuminate\Http\Response
*/
protected function unauthenticated($request, AuthenticationException $exception)

18
app/Http/Controllers/Auth/RegisterController.php

@ -2,10 +2,10 @@
namespace App\Http\Controllers\Auth;
use App\User;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Validator;
use App\User;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Support\Facades\Validator;
class RegisterController extends Controller
{
@ -42,14 +42,15 @@ class RegisterController extends Controller
/**
* Get a validator for an incoming registration request.
*
* @param array $data
* @param array $data
*
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
return Validator::make($data, [
'name' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'name' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed',
]);
}
@ -57,14 +58,15 @@ class RegisterController extends Controller
/**
* Create a new user instance after a valid registration.
*
* @param array $data
* @param array $data
*
* @return User
*/
protected function create(array $data)
{
return User::create([
'name' => $data['name'],
'email' => $data['email'],
'name' => $data['name'],
'email' => $data['email'],
'password' => bcrypt($data['password']),
]);
}

24
app/Http/Controllers/CartController.php

@ -15,7 +15,7 @@ class CartController extends Controller
public function __construct()
{
$this->cart = new CartCollection;
$this->cart = new CartCollection();
}
public function index(Request $request)
@ -27,21 +27,22 @@ class CartController extends Controller
public function show(Request $request, $draftKey)
{
$queriedProducts = Product::where(function($query) use ($request) {
return $query->where('name', 'like', '%' . $request->get('query') . '%');
$queriedProducts = Product::where(function ($query) use ($request) {
return $query->where('name', 'like', '%'.$request->get('query').'%');
})->get();
$draft = $this->cart->get($draftKey);
return view('cart.index', compact('draft','queriedProducts'));
return view('cart.index', compact('draft', 'queriedProducts'));
}
public function add(Request $request)
{
if ($request->has('create-cash-draft'))
$this->cart->add(new CashDraft);
else
$this->cart->add(new CreditDraft);
if ($request->has('create-cash-draft')) {
$this->cart->add(new CashDraft());
} else {
$this->cart->add(new CreditDraft());
}
return redirect()->route('cart.show', $this->cart->content()->last()->draftKey);
}
@ -56,31 +57,36 @@ class CartController extends Controller
public function updateDraftItem(Request $request, $draftKey)
{
$this->cart->updateDraftItem($draftKey, $request->item_key, $request->only('qty','item_discount'));
$this->cart->updateDraftItem($draftKey, $request->item_key, $request->only('qty', 'item_discount'));
return redirect()->route('cart.index', $draftKey);
}
public function removeDraftItem(Request $request, $draftKey)
{
$this->cart->removeItemFromDraft($draftKey, $request->item_index);
return redirect()->route('cart.index', $draftKey);
}
public function empty($draftKey)
{
$this->cart->emptyDraft($draftKey);
return redirect()->route('cart.index', $draftKey);
}
public function remove(Request $request)
{
$this->cart->removeDraft($request->draft_key);
return redirect()->route('cart.index');
}
public function destroy()
{
$this->cart->destroy();
return redirect()->route('cart.index');
}
}

4
app/Http/Controllers/Controller.php

@ -2,10 +2,10 @@
namespace App\Http\Controllers;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Routing\Controller as BaseController;
class Controller extends BaseController
{

2
app/Http/Controllers/HomeController.php

@ -2,8 +2,6 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class HomeController extends Controller
{
/**

10
app/Http/Kernel.php

@ -50,11 +50,11 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
];
}

7
app/Http/Middleware/RedirectIfAuthenticated.php

@ -10,9 +10,10 @@ class RedirectIfAuthenticated
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
*
* @return mixed
*/
public function handle($request, Closure $next, $guard = null)

5
app/Product.php

@ -6,12 +6,13 @@ use Illuminate\Database\Eloquent\Model;
class Product extends Model
{
protected $fillable = ['cash_price','credit_price'];
protected $fillable = ['cash_price', 'credit_price'];
public function getPrice($type = 'cash')
{
if ($type == 'credit')
if ($type == 'credit') {
return $this->credit_price;
}
return $this->cash_price;
}

1
app/Providers/AuthServiceProvider.php

@ -2,7 +2,6 @@
namespace App\Providers;
use Illuminate\Support\Facades\Gate;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
class AuthServiceProvider extends ServiceProvider

2
app/Providers/BroadcastServiceProvider.php

@ -2,8 +2,8 @@
namespace App\Providers;
use Illuminate\Support\ServiceProvider;
use Illuminate\Support\Facades\Broadcast;
use Illuminate\Support\ServiceProvider;
class BroadcastServiceProvider extends ServiceProvider
{

2
app/Providers/EventServiceProvider.php

@ -2,8 +2,8 @@
namespace App\Providers;
use Illuminate\Support\Facades\Event;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Event;
class EventServiceProvider extends ServiceProvider
{

2
app/Providers/RouteServiceProvider.php

@ -2,8 +2,8 @@
namespace App\Providers;
use Illuminate\Support\Facades\Route;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Route;
class RouteServiceProvider extends ServiceProvider
{

2
app/User.php

@ -2,8 +2,8 @@
namespace App;
use Illuminate\Notifications\Notifiable;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
class User extends Authenticatable
{

64
config/app.php

@ -192,39 +192,39 @@ return [
'aliases' => [
'App' => Illuminate\Support\Facades\App::class,
'Artisan' => Illuminate\Support\Facades\Artisan::class,
'Auth' => Illuminate\Support\Facades\Auth::class,
'Blade' => Illuminate\Support\Facades\Blade::class,
'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
'Bus' => Illuminate\Support\Facades\Bus::class,
'Cache' => Illuminate\Support\Facades\Cache::class,
'Config' => Illuminate\Support\Facades\Config::class,
'Cookie' => Illuminate\Support\Facades\Cookie::class,
'Crypt' => Illuminate\Support\Facades\Crypt::class,
'DB' => Illuminate\Support\Facades\DB::class,
'Eloquent' => Illuminate\Database\Eloquent\Model::class,
'Event' => Illuminate\Support\Facades\Event::class,
'File' => Illuminate\Support\Facades\File::class,
'Gate' => Illuminate\Support\Facades\Gate::class,
'Hash' => Illuminate\Support\Facades\Hash::class,
'Lang' => Illuminate\Support\Facades\Lang::class,
'Log' => Illuminate\Support\Facades\Log::class,
'Mail' => Illuminate\Support\Facades\Mail::class,
'App' => Illuminate\Support\Facades\App::class,
'Artisan' => Illuminate\Support\Facades\Artisan::class,
'Auth' => Illuminate\Support\Facades\Auth::class,
'Blade' => Illuminate\Support\Facades\Blade::class,
'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
'Bus' => Illuminate\Support\Facades\Bus::class,
'Cache' => Illuminate\Support\Facades\Cache::class,
'Config' => Illuminate\Support\Facades\Config::class,
'Cookie' => Illuminate\Support\Facades\Cookie::class,
'Crypt' => Illuminate\Support\Facades\Crypt::class,
'DB' => Illuminate\Support\Facades\DB::class,
'Eloquent' => Illuminate\Database\Eloquent\Model::class,
'Event' => Illuminate\Support\Facades\Event::class,
'File' => Illuminate\Support\Facades\File::class,
'Gate' => Illuminate\Support\Facades\Gate::class,
'Hash' => Illuminate\Support\Facades\Hash::class,
'Lang' => Illuminate\Support\Facades\Lang::class,
'Log' => Illuminate\Support\Facades\Log::class,
'Mail' => Illuminate\Support\Facades\Mail::class,
'Notification' => Illuminate\Support\Facades\Notification::class,
'Password' => Illuminate\Support\Facades\Password::class,
'Queue' => Illuminate\Support\Facades\Queue::class,
'Redirect' => Illuminate\Support\Facades\Redirect::class,
'Redis' => Illuminate\Support\Facades\Redis::class,
'Request' => Illuminate\Support\Facades\Request::class,
'Response' => Illuminate\Support\Facades\Response::class,
'Route' => Illuminate\Support\Facades\Route::class,
'Schema' => Illuminate\Support\Facades\Schema::class,
'Session' => Illuminate\Support\Facades\Session::class,
'Storage' => Illuminate\Support\Facades\Storage::class,
'URL' => Illuminate\Support\Facades\URL::class,
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,
'Password' => Illuminate\Support\Facades\Password::class,
'Queue' => Illuminate\Support\Facades\Queue::class,
'Redirect' => Illuminate\Support\Facades\Redirect::class,
'Redis' => Illuminate\Support\Facades\Redis::class,
'Request' => Illuminate\Support\Facades\Request::class,
'Response' => Illuminate\Support\Facades\Response::class,
'Route' => Illuminate\Support\Facades\Route::class,
'Schema' => Illuminate\Support\Facades\Schema::class,
'Session' => Illuminate\Support\Facades\Session::class,
'Storage' => Illuminate\Support\Facades\Storage::class,
'URL' => Illuminate\Support\Facades\URL::class,
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,
],

12
config/auth.php

@ -14,7 +14,7 @@ return [
*/
'defaults' => [
'guard' => 'web',
'guard' => 'web',
'passwords' => 'users',
],
@ -37,12 +37,12 @@ return [
'guards' => [
'web' => [
'driver' => 'session',
'driver' => 'session',
'provider' => 'users',
],
'api' => [
'driver' => 'token',
'driver' => 'token',
'provider' => 'users',
],
],
@ -67,7 +67,7 @@ return [
'providers' => [
'users' => [
'driver' => 'eloquent',
'model' => App\User::class,
'model' => App\User::class,
],
// 'users' => [
@ -94,8 +94,8 @@ return [
'passwords' => [
'users' => [
'provider' => 'users',
'table' => 'password_resets',
'expire' => 60,
'table' => 'password_resets',
'expire' => 60,
],
],

10
config/broadcasting.php

@ -31,17 +31,17 @@ return [
'connections' => [
'pusher' => [
'driver' => 'pusher',
'key' => env('PUSHER_APP_KEY'),
'secret' => env('PUSHER_APP_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'driver' => 'pusher',
'key' => env('PUSHER_APP_KEY'),
'secret' => env('PUSHER_APP_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'options' => [
//
],
],
'redis' => [
'driver' => 'redis',
'driver' => 'redis',
'connection' => 'default',
],

16
config/cache.php

@ -39,20 +39,20 @@ return [
],
'database' => [
'driver' => 'database',
'table' => 'cache',
'driver' => 'database',
'table' => 'cache',
'connection' => null,
],
'file' => [
'driver' => 'file',
'path' => storage_path('framework/cache/data'),
'path' => storage_path('framework/cache/data'),
],
'memcached' => [
'driver' => 'memcached',
'driver' => 'memcached',
'persistent_id' => env('MEMCACHED_PERSISTENT_ID'),
'sasl' => [
'sasl' => [
env('MEMCACHED_USERNAME'),
env('MEMCACHED_PASSWORD'),
],
@ -61,15 +61,15 @@ return [
],
'servers' => [
[
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
'port' => env('MEMCACHED_PORT', 11211),
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
'port' => env('MEMCACHED_PORT', 11211),
'weight' => 100,
],
],
],
'redis' => [
'driver' => 'redis',
'driver' => 'redis',
'connection' => 'default',
],

44
config/database.php

@ -34,37 +34,37 @@ return [
'connections' => [
'sqlite' => [
'driver' => 'sqlite',
'driver' => 'sqlite',
'database' => env('DB_DATABASE', database_path('database.sqlite')),
'prefix' => '',
'prefix' => '',
],
'mysql' => [
'driver' => 'mysql',
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'driver' => 'mysql',
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'unix_socket' => env('DB_SOCKET', ''),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => true,
'engine' => null,
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => true,
'engine' => null,
],
'pgsql' => [
'driver' => 'pgsql',
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '5432'),
'driver' => 'pgsql',
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '5432'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8',
'prefix' => '',
'schema' => 'public',
'sslmode' => 'prefer',
'charset' => 'utf8',
'prefix' => '',
'schema' => 'public',
'sslmode' => 'prefer',
],
],
@ -98,9 +98,9 @@ return [
'client' => 'predis',
'default' => [
'host' => env('REDIS_HOST', '127.0.0.1'),
'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379),
'port' => env('REDIS_PORT', 6379),
'database' => 0,
],

10
config/filesystems.php

@ -45,19 +45,19 @@ return [
'local' => [
'driver' => 'local',
'root' => storage_path('app'),
'root' => storage_path('app'),
],
'public' => [
'driver' => 'local',
'root' => storage_path('app/public'),
'url' => env('APP_URL').'/storage',
'driver' => 'local',
'root' => storage_path('app/public'),
'url' => env('APP_URL').'/storage',
'visibility' => 'public',
],
's3' => [
'driver' => 's3',
'key' => env('AWS_KEY'),
'key' => env('AWS_KEY'),
'secret' => env('AWS_SECRET'),
'region' => env('AWS_REGION'),
'bucket' => env('AWS_BUCKET'),

2
config/mail.php

@ -57,7 +57,7 @@ return [
'from' => [
'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),
'name' => env('MAIL_FROM_NAME', 'Example'),
'name' => env('MAIL_FROM_NAME', 'Example'),
],
/*

24
config/queue.php

@ -35,32 +35,32 @@ return [
],
'database' => [
'driver' => 'database',
'table' => 'jobs',
'queue' => 'default',
'driver' => 'database',
'table' => 'jobs',
'queue' => 'default',
'retry_after' => 90,
],
'beanstalkd' => [
'driver' => 'beanstalkd',
'host' => 'localhost',
'queue' => 'default',
'driver' => 'beanstalkd',
'host' => 'localhost',
'queue' => 'default',
'retry_after' => 90,
],
'sqs' => [
'driver' => 'sqs',
'key' => 'your-public-key',
'key' => 'your-public-key',
'secret' => 'your-secret-key',
'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id',
'queue' => 'your-queue-name',
'queue' => 'your-queue-name',
'region' => 'us-east-1',
],
'redis' => [
'driver' => 'redis',
'connection' => 'default',
'queue' => 'default',
'driver' => 'redis',
'connection' => 'default',
'queue' => 'default',
'retry_after' => 90,
],
@ -79,7 +79,7 @@ return [
'failed' => [
'database' => env('DB_CONNECTION', 'mysql'),
'table' => 'failed_jobs',
'table' => 'failed_jobs',
],
];

6
config/services.php

@ -20,7 +20,7 @@ return [
],
'ses' => [
'key' => env('SES_KEY'),
'key' => env('SES_KEY'),
'secret' => env('SES_SECRET'),
'region' => 'us-east-1',
],
@ -30,8 +30,8 @@ return [
],
'stripe' => [
'model' => App\User::class,
'key' => env('STRIPE_KEY'),
'model' => App\User::class,
'key' => env('STRIPE_KEY'),
'secret' => env('STRIPE_SECRET'),
],

14
database/factories/ModelFactory.php

@ -13,21 +13,19 @@
/** @var \Illuminate\Database\Eloquent\Factory $factory */
$factory->define(App\User::class, function (Faker\Generator $faker) {
return [
'name' => $faker->name,
'username' => $faker->unique()->username,
'password' => 'secret',
'name' => $faker->name,
'username' => $faker->unique()->username,
'password' => 'secret',
'remember_token' => str_random(10),
];
});
/** @var \Illuminate\Database\Eloquent\Factory $factory */
/* @var \Illuminate\Database\Eloquent\Factory $factory */
$factory->define(App\Product::class, function (Faker\Generator $faker) {
return [
'name' => $faker->name,
'cash_price' => 2000,
'name' => $faker->name,
'cash_price' => 2000,
'credit_price' => 1000,
];
});

4
database/migrations/2014_10_12_000000_create_users_table.php

@ -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 CreateUsersTable extends Migration
{

4
database/migrations/2017_04_09_013901_create_products_table.php

@ -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 CreateProductsTable extends Migration
{

2
database/seeds/UsersTableSeeder.php

@ -13,7 +13,7 @@ class UsersTableSeeder extends Seeder
public function run()
{
factory(User::class)->create([
'name' => 'Administrator',
'name' => 'Administrator',
'username' => 'admin',
]);
}

3
public/index.php

@ -1,9 +1,8 @@
<?php
/**
* Laravel - A PHP Framework For Web Artisans
* Laravel - A PHP Framework For Web Artisans.
*
* @package Laravel
* @author Taylor Otwell <taylor@laravel.com>
*/

2
resources/lang/en/auth.php

@ -13,7 +13,7 @@ return [
|
*/
'failed' => 'These credentials do not match our records.',
'failed' => 'These credentials do not match our records.',
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
];

2
resources/lang/en/pagination.php

@ -14,6 +14,6 @@ return [
*/
'previous' => '&laquo; Previous',
'next' => 'Next &raquo;',
'next' => 'Next &raquo;',
];

8
resources/lang/en/passwords.php

@ -14,9 +14,9 @@ return [
*/
'password' => 'Passwords must be at least six characters and match the confirmation.',
'reset' => 'Your password has been reset!',
'sent' => 'We have e-mailed your password reset link!',
'token' => 'This password reset token is invalid.',
'user' => "We can't find a user with that e-mail address.",
'reset' => 'Your password has been reset!',
'sent' => 'We have e-mailed your password reset link!',
'token' => 'This password reset token is invalid.',
'user' => "We can't find a user with that e-mail address.",
];

2
routes/web.php

@ -18,7 +18,7 @@ Route::get('/', function () {
Auth::routes();
Route::get('/home', 'HomeController@index')->name('home');
Route::group(['middleware' => 'auth'], function() {
Route::group(['middleware' => 'auth'], function () {
Route::get('drafts', 'CartController@index')->name('cart.index');
Route::get('drafts/{draftKey}', 'CartController@show')->name('cart.show');
Route::post('cart/add-draft', 'CartController@add')->name('cart.add');

4
server.php

@ -1,12 +1,10 @@
<?php
/**
* Laravel - A PHP Framework For Web Artisans
* Laravel - A PHP Framework For Web Artisans.
*
* @package Laravel
* @author Taylor Otwell <taylor@laravel.com>
*/
$uri = urldecode(
parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
);

4
tests/Feature/Auth/UserLoginTest.php

@ -28,8 +28,8 @@ class UserLoginTest extends BrowserKitTestCase
$user = factory(User::class)->create(['password' => '123456']);
$this->visit(route('login'));
$this->type($user->username,'username');
$this->type('123456','password');
$this->type($user->username, 'username');
$this->type('123456', 'password');
$this->press('Login');
$this->seePageIs(route('home'));

42
tests/Feature/Cart/CartControllerTest.php

@ -19,7 +19,7 @@ class CartControllerTest extends TestCase
{
$this->loginAsUser();
$cart = new CartCollection;
$cart = new CartCollection();
$response = $this->post(route('cart.add'), ['create-cash-draft'=> trans('transaction.create')]);
$response = $this->post(route('cart.add'), ['create-credit-draft'=> trans('transaction.create_credit')]);
@ -37,8 +37,8 @@ class CartControllerTest extends TestCase
{
$this->loginAsUser();
$cart = new CartCollection;
$draft = new CashDraft;
$cart = new CartCollection();
$draft = new CashDraft();
$cart->add($draft);
// Add Product to database
@ -47,7 +47,7 @@ class CartControllerTest extends TestCase
// Add Product as CashDraft item
$response = $this->post(route('cart.add-draft-item', [$draft->draftKey, $product->id]), [
'qty' => $itemQty
'qty' => $itemQty,
]);
$cashDraft = $cart->content()->first();
@ -60,10 +60,10 @@ class CartControllerTest extends TestCase
{
$this->loginAsUser();
$cart = new CartCollection;
$cashDraft = new CashDraft;
$cart = new CartCollection();
$cashDraft = new CashDraft();
$product = factory(Product::class)->create(['cash_price' => 1100], ['credit_price' => 1000]);
$item = new Item($product, 2);
$item = new Item($product, 2);
$cashDraft->addItem($item);
$cart->add($cashDraft);
@ -73,7 +73,7 @@ class CartControllerTest extends TestCase
// Remove Item Product from CashDraft
$response = $this->delete(route('cart.remove-draft-item', [$cashDraft->draftKey]), [
'item_index' => 0
'item_index' => 0,
]);
$this->assertEquals(0, $cashDraft->getTotalQty());
@ -86,8 +86,8 @@ class CartControllerTest extends TestCase
{
$this->loginAsUser();
$cart = new CartCollection;
$cashDraft = new CashDraft;
$cart = new CartCollection();
$cashDraft = new CashDraft();
$cart->add($cashDraft);
$this->assertFalse($cart->isEmpty());
@ -95,7 +95,7 @@ class CartControllerTest extends TestCase
// Remove a transaction draft
$response = $this->delete(route('cart.remove'), [
'draft_key' => $cashDraft->draftKey
'draft_key' => $cashDraft->draftKey,
]);
$this->assertTrue($cart->isEmpty());
@ -106,8 +106,8 @@ class CartControllerTest extends TestCase
{
$this->loginAsUser();
$cart = new CartCollection;
$cashDraft = new CashDraft;
$cart = new CartCollection();
$cashDraft = new CashDraft();
$cart->add($cashDraft);
$cart->add($cashDraft);
@ -125,10 +125,10 @@ class CartControllerTest extends TestCase
{
$this->loginAsUser();
$cart = new CartCollection;
$cashDraft = new CashDraft;
$cart = new CartCollection();
$cashDraft = new CashDraft();
$product = factory(Product::class)->create(['cash_price' => 1100], ['credit_price' => 1000]);
$item = new Item($product, 2);
$item = new Item($product, 2);
$cashDraft->addItem($item);
$cart->add($cashDraft);
@ -149,10 +149,10 @@ class CartControllerTest extends TestCase
{
$this->loginAsUser();
$cart = new CartCollection;
$cashDraft = new CashDraft;
$cart = new CartCollection();
$cashDraft = new CashDraft();
$product = factory(Product::class)->create(['cash_price' => 1100], ['credit_price' => 1000]);
$item = new Item($product, 2);
$item = new Item($product, 2);
$cashDraft->addItem($item);
$cart->add($cashDraft);
@ -162,8 +162,8 @@ class CartControllerTest extends TestCase
// Update draft item on a transaction draft
$response = $this->patch(route('cart.update-draft-item', [$cashDraft->draftKey]), [
'item_key' => 0,
'qty' => 3,
'item_key' => 0,
'qty' => 3,
'item_discount' => 100,
]);

12
tests/Feature/TransactionEntryTest.php

@ -19,8 +19,8 @@ class TransactionEntryTest extends BrowserKitTestCase
$this->loginAsUser();
// Add new draft to collection
$cart = new CartCollection;
$draft = $cart->add(new CashDraft);
$cart = new CartCollection();
$draft = $cart->add(new CashDraft());
$this->visit(route('cart.index'));
@ -35,12 +35,12 @@ class TransactionEntryTest extends BrowserKitTestCase
$this->visit(route('home'));
$this->press(trans('transaction.create'));
$cart = new CartCollection;
$cart = new CartCollection();
$draft = $cart->content()->last();
$this->seePageIs(route('cart.show', $draft->draftKey));
$this->press(trans('transaction.create_credit'));
$cart = new CartCollection;
$cart = new CartCollection();
$draft = $cart->content()->last();
$this->seePageIs(route('cart.show', $draft->draftKey));
}
@ -51,8 +51,8 @@ class TransactionEntryTest extends BrowserKitTestCase
$product = factory(Product::class)->create(['name' => 'Testing Produk 1']);
$this->loginAsUser();
$cart = new CartCollection;
$draft = new CreditDraft;
$cart = new CartCollection();
$draft = new CreditDraft();
$cart->add($draft);
// Visit cart index page

55
tests/Unit/CartCollectionTest.php

@ -14,17 +14,17 @@ class CartCollectionTest extends TestCase
/** @test */
public function it_has_a_default_instance()
{
$cart = new CartCollection;
$cart = new CartCollection();
$this->assertEquals('drafts', $cart->currentInstance());
}
/** @test */
public function it_can_have_multiple_instances()
{
$cart = new CartCollection;
$cart = new CartCollection();
$cashDraft = new CashDraft;
$creditDraft = new CreditDraft;
$cashDraft = new CashDraft();
$creditDraft = new CreditDraft();
$cart->add($cashDraft);
$cart->add($creditDraft);
@ -39,9 +39,9 @@ class CartCollectionTest extends TestCase
/** @test */
public function cart_collection_consist_of_transacion_draft()
{
$cart = new CartCollection;
$cashDraft = new CashDraft;
$creditDraft = new CreditDraft;
$cart = new CartCollection();
$cashDraft = new CashDraft();
$creditDraft = new CreditDraft();
$cart->add($cashDraft);
$cart->add($creditDraft);
@ -53,8 +53,8 @@ class CartCollectionTest extends TestCase
/** @test */
public function it_can_get_a_draft_by_key()
{
$draft = new CashDraft;
$cart = new CartCollection;
$draft = new CashDraft();
$cart = new CartCollection();
$cart->add($draft);
$gottenDraft = $cart->get($draft->draftKey);
@ -67,9 +67,9 @@ class CartCollectionTest extends TestCase
/** @test */
public function it_can_remove_draft_from_draft_collection()
{
$cart = new CartCollection;
$cashDraft = new CashDraft;
$creditDraft = new CreditDraft;
$cart = new CartCollection();
$cashDraft = new CashDraft();
$creditDraft = new CreditDraft();
$cart->add($cashDraft);
$cart->add($creditDraft);
@ -82,10 +82,10 @@ class CartCollectionTest extends TestCase
/** @test */
public function it_can_be_empty_out()
{
$cart = new CartCollection;
$cart = new CartCollection();
$cashDraft = new CashDraft;
$creditDraft = new CreditDraft;
$cashDraft = new CashDraft();
$creditDraft = new CreditDraft();
$cart->add($cashDraft);
$cart->add($cashDraft);
@ -103,10 +103,10 @@ class CartCollectionTest extends TestCase
/** @test */
public function it_has_content_keys()
{
$cart = new CartCollection;
$cart = new CartCollection();
$cashDraft = new CashDraft;
$creditDraft = new CreditDraft;
$cashDraft = new CashDraft();
$creditDraft = new CreditDraft();
$cart->add($cashDraft);
$cart->add($creditDraft);
@ -119,9 +119,9 @@ class CartCollectionTest extends TestCase
/** @test */
public function it_can_update_a_draft_attributes()
{
$cart = new CartCollection;
$cart = new CartCollection();
$draft = $cart->add(new CashDraft);
$draft = $cart->add(new CashDraft());
$this->assertCount(1, $cart->content());
$newDraftAttribute = [
@ -151,9 +151,9 @@ class CartCollectionTest extends TestCase
/** @test */
public function it_can_add_product_to_draft()
{
$cart = new CartCollection;
$cart = new CartCollection();
$draft = $cart->add(new CashDraft);
$draft = $cart->add(new CashDraft());
$count = 2;
$item = new Item(new Product(['cash_price' => 1000]), $count);
@ -164,9 +164,9 @@ class CartCollectionTest extends TestCase
/** @test */
public function it_can_remove_item_from_draft()
{
$cart = new CartCollection;
$cart = new CartCollection();
$draft = $cart->add(new CashDraft);
$draft = $cart->add(new CashDraft());
$item = new Item(new Product(['cash_price' => 1000]), 3);
$cart->addItemToDraft($draft->draftKey, $item);
@ -179,9 +179,9 @@ class CartCollectionTest extends TestCase
/** @test */
public function it_can_update_an_item_of_draft()
{
$cart = new CartCollection;
$cart = new CartCollection();
$draft = $cart->add(new CashDraft);
$draft = $cart->add(new CashDraft());
$item = new Item(new Product(['cash_price' => 1100]), 3);
$cart->addItemToDraft($draft->draftKey, $item);
@ -189,12 +189,11 @@ class CartCollectionTest extends TestCase
$this->assertEquals(3300, $draft->getTotal());
$newItemData = [
'qty' => 2,
'qty' => 2,
'item_discount' => 100,
];
$cart->updateDraftItem($draft->draftKey, 0, $newItemData);
$this->assertEquals(2000, $draft->getTotal());
}
}

2
tests/Unit/Integration/ProductTest.php

@ -3,8 +3,6 @@
namespace Tests\Unit\Integration;
use App\Product;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Tests\TestCase;
class ProductTest extends TestCase

Loading…
Cancel
Save