Browse Source

Composer update lv5.3.31 and laravelcollective 5.3.2

Fixed broken test and script after laravelcollective 5.3.2 (select placeholder)
Added subscription vendor eager load
Added subscription searchable by vendor_id
Added \Hash::setRounds(5); for faster test suite
pull/1/head
Nafies Luthfi 9 years ago
parent
commit
43306e7bb8
  1. 2
      app/Entities/Projects/ProjectsRepository.php
  2. 10
      app/Entities/Subscriptions/SubscriptionsRepository.php
  3. 2
      app/Http/Controllers/PaymentsController.php
  4. 2
      app/Http/Controllers/SubscriptionsController.php
  5. 3
      composer.json
  6. 236
      composer.lock
  7. 136
      database/factories/ModelFactory.php
  8. 11
      phpunit.xml
  9. 2
      resources/views/projects/create.blade.php
  10. 8
      resources/views/subscriptions/index.blade.php
  11. 1
      tests/TestCase.php

2
app/Entities/Projects/ProjectsRepository.php

@ -41,7 +41,7 @@ class ProjectsRepository extends BaseRepository
$projectData['owner_id'] = auth()->id();
DB::beginTransaction();
if ($projectData['customer_id'] == '') {
if (isset($projectData['customer_id']) == false || $projectData['customer_id'] == '') {
$customer = $this->createNewCustomer($projectData['customer_name'], $projectData['customer_email']);
$projectData['customer_id'] = $customer->id;
}

10
app/Entities/Subscriptions/SubscriptionsRepository.php

@ -16,10 +16,16 @@ class SubscriptionsRepository extends BaseRepository
parent::__construct($model);
}
public function getAll($q)
public function getSubscriptions($q, $vendorId)
{
return $this->model->orderBy('due_date')
->where('domain_name','like','%' . $q . '%')
->where(function($query) use ($q, $vendorId) {
if ($vendorId)
$query->where('vendor_id', $vendorId);
if ($q)
$query->where('domain_name','like','%' . $q . '%');
})
->with('vendor')
->paginate($this->_paginate);
}
}

2
app/Http/Controllers/PaymentsController.php

@ -49,7 +49,7 @@ class PaymentsController extends Controller {
{
$payment = $this->repo->requireById($paymentId);
$projects = $this->repo->getProjectsList();
$customers = $this->repo->getCustomersList();
$customers = $this->repo->getCustomersAndVendorsList();
return view('payments.edit',compact('payment','projects','customers'));
}

2
app/Http/Controllers/SubscriptionsController.php

@ -21,7 +21,7 @@ class SubscriptionsController extends Controller {
public function index(Request $req)
{
$subscriptions = $this->repo->getAll($req->get('q'));
$subscriptions = $this->repo->getSubscriptions($req->get('q'), $req->get('vendor_id'));
return view('subscriptions.index',compact('subscriptions'));
}

3
composer.json

@ -22,7 +22,8 @@
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~5.0",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*"
"symfony/dom-crawler": "3.1.*",
"johnkary/phpunit-speedtrap": "^1.0"
},
"autoload": {
"classmap": [

236
composer.lock

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "e674bfaea367a00574973186fc7b6d14",
"content-hash": "96014b5d02e85d8cd81ec766adc2772c",
"packages": [
{
"name": "backup-manager/backup-manager",
@ -130,20 +130,20 @@
},
{
"name": "barryvdh/laravel-debugbar",
"version": "v2.3.2",
"version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-debugbar.git",
"reference": "24e4f0261e352d3fd86d0447791b56ae49398674"
"reference": "de15d00a74696db62e1b4782474c27ed0c4fc763"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/24e4f0261e352d3fd86d0447791b56ae49398674",
"reference": "24e4f0261e352d3fd86d0447791b56ae49398674",
"url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/de15d00a74696db62e1b4782474c27ed0c4fc763",
"reference": "de15d00a74696db62e1b4782474c27ed0c4fc763",
"shasum": ""
},
"require": {
"illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*",
"illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*",
"maximebf/debugbar": "~1.13.0",
"php": ">=5.5.9",
"symfony/finder": "~2.7|~3.0"
@ -151,7 +151,15 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.3-dev"
"dev-master": "2.4-dev"
},
"laravel": {
"providers": [
"Barryvdh\\Debugbar\\ServiceProvider"
],
"aliases": {
"Debugbar": "Barryvdh\\Debugbar\\Facade"
}
}
},
"autoload": {
@ -180,7 +188,7 @@
"profiler",
"webprofiler"
],
"time": "2017-01-19T08:19:49+00:00"
"time": "2017-06-01T17:46:08+00:00"
},
{
"name": "barryvdh/laravel-dompdf",
@ -512,16 +520,16 @@
},
{
"name": "intervention/image",
"version": "2.3.11",
"version": "2.3.13",
"source": {
"type": "git",
"url": "https://github.com/Intervention/image.git",
"reference": "e8881fd99b9804b29e02d6d1c2c15ee459335cf1"
"reference": "15a517f052ee15d373ffa145c9642d5fec7ddf5c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Intervention/image/zipball/e8881fd99b9804b29e02d6d1c2c15ee459335cf1",
"reference": "e8881fd99b9804b29e02d6d1c2c15ee459335cf1",
"url": "https://api.github.com/repos/Intervention/image/zipball/15a517f052ee15d373ffa145c9642d5fec7ddf5c",
"reference": "15a517f052ee15d373ffa145c9642d5fec7ddf5c",
"shasum": ""
},
"require": {
@ -570,7 +578,7 @@
"thumbnail",
"watermark"
],
"time": "2017-02-04T10:37:19+00:00"
"time": "2017-04-23T18:45:36+00:00"
},
{
"name": "jakub-onderka/php-console-color",
@ -808,16 +816,16 @@
},
{
"name": "laravel/framework",
"version": "v5.3.30",
"version": "v5.3.31",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "2d4e8c95f584b38d2279b552e2868fc447b97578"
"reference": "e641e75fc5b26ad0ba8c19b7e83b08cad1d03b89"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/2d4e8c95f584b38d2279b552e2868fc447b97578",
"reference": "2d4e8c95f584b38d2279b552e2868fc447b97578",
"url": "https://api.github.com/repos/laravel/framework/zipball/e641e75fc5b26ad0ba8c19b7e83b08cad1d03b89",
"reference": "e641e75fc5b26ad0ba8c19b7e83b08cad1d03b89",
"shasum": ""
},
"require": {
@ -932,20 +940,20 @@
"framework",
"laravel"
],
"time": "2017-01-26T14:29:55+00:00"
"time": "2017-03-24T16:31:06+00:00"
},
{
"name": "laravelcollective/html",
"version": "v5.3.1",
"version": "v5.3.2",
"source": {
"type": "git",
"url": "https://github.com/LaravelCollective/html.git",
"reference": "2f7f2e127c6fed47f269ea29ab5efeb8f65e9d35"
"reference": "299f3dccd61c3f6d89ebb9b10f36fb2a9aee5206"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/LaravelCollective/html/zipball/2f7f2e127c6fed47f269ea29ab5efeb8f65e9d35",
"reference": "2f7f2e127c6fed47f269ea29ab5efeb8f65e9d35",
"url": "https://api.github.com/repos/LaravelCollective/html/zipball/299f3dccd61c3f6d89ebb9b10f36fb2a9aee5206",
"reference": "299f3dccd61c3f6d89ebb9b10f36fb2a9aee5206",
"shasum": ""
},
"require": {
@ -986,20 +994,20 @@
],
"description": "HTML and Form Builders for the Laravel Framework",
"homepage": "http://laravelcollective.com",
"time": "2016-12-13T14:23:36+00:00"
"time": "2017-05-21T22:00:10+00:00"
},
{
"name": "league/flysystem",
"version": "1.0.36",
"version": "1.0.40",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "d9c1698582dfbfbd092ec9c5c3325f862cdb3297"
"reference": "3828f0b24e2c1918bb362d57a53205d6dc8fde61"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/d9c1698582dfbfbd092ec9c5c3325f862cdb3297",
"reference": "d9c1698582dfbfbd092ec9c5c3325f862cdb3297",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3828f0b24e2c1918bb362d57a53205d6dc8fde61",
"reference": "3828f0b24e2c1918bb362d57a53205d6dc8fde61",
"shasum": ""
},
"require": {
@ -1021,12 +1029,12 @@
"league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
"league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
"league/flysystem-copy": "Allows you to use Copy.com storage",
"league/flysystem-dropbox": "Allows you to use Dropbox storage",
"league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
"league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
"league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
"league/flysystem-webdav": "Allows you to use WebDAV storage",
"league/flysystem-ziparchive": "Allows you to use ZipArchive adapter"
"league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
"spatie/flysystem-dropbox": "Allows you to use Dropbox storage"
},
"type": "library",
"extra": {
@ -1069,7 +1077,7 @@
"sftp",
"storage"
],
"time": "2017-03-18T16:02:30+00:00"
"time": "2017-04-28T10:15:08+00:00"
},
{
"name": "league/fractal",
@ -1136,16 +1144,16 @@
},
{
"name": "maatwebsite/excel",
"version": "2.1.10",
"version": "2.1.17",
"source": {
"type": "git",
"url": "https://github.com/Maatwebsite/Laravel-Excel.git",
"reference": "a544a9b45b971499fb3b0fb7499ba0ac3b430233"
"reference": "14d5abf8e20563c80dd074fd7c8cf1c05bf51f1d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/a544a9b45b971499fb3b0fb7499ba0ac3b430233",
"reference": "a544a9b45b971499fb3b0fb7499ba0ac3b430233",
"url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/14d5abf8e20563c80dd074fd7c8cf1c05bf51f1d",
"reference": "14d5abf8e20563c80dd074fd7c8cf1c05bf51f1d",
"shasum": ""
},
"require": {
@ -1153,6 +1161,7 @@
"illuminate/config": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
"illuminate/filesystem": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
"illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*",
"jeremeamia/superclosure": "^2.3",
"nesbot/carbon": "~1.0",
"php": ">=5.5",
"phpoffice/phpexcel": "1.8.*",
@ -1199,7 +1208,7 @@
"import",
"laravel"
],
"time": "2017-01-20T16:16:51+00:00"
"time": "2017-04-04T18:28:12+00:00"
},
{
"name": "maximebf/debugbar",
@ -1760,16 +1769,16 @@
},
{
"name": "psy/psysh",
"version": "v0.8.3",
"version": "v0.8.5",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
"reference": "1dd4bbbc64d71e7ec075ffe82b42d9e096dc8d5e"
"reference": "38a9d21406597a0440690eafbcb0222f528c8ac6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/1dd4bbbc64d71e7ec075ffe82b42d9e096dc8d5e",
"reference": "1dd4bbbc64d71e7ec075ffe82b42d9e096dc8d5e",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/38a9d21406597a0440690eafbcb0222f528c8ac6",
"reference": "38a9d21406597a0440690eafbcb0222f528c8ac6",
"shasum": ""
},
"require": {
@ -1829,20 +1838,20 @@
"interactive",
"shell"
],
"time": "2017-03-19T21:40:44+00:00"
"time": "2017-05-17T06:49:19+00:00"
},
{
"name": "ramsey/uuid",
"version": "3.6.0",
"version": "3.6.1",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
"reference": "0b7bdfb180e72c8d76e75a649ced67e392201458"
"reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/0b7bdfb180e72c8d76e75a649ced67e392201458",
"reference": "0b7bdfb180e72c8d76e75a649ced67e392201458",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
"reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
"shasum": ""
},
"require": {
@ -1854,9 +1863,9 @@
},
"require-dev": {
"apigen/apigen": "^4.1",
"codeception/aspect-mock": "1.0.0",
"codeception/aspect-mock": "^1.0 | ^2.0",
"doctrine/annotations": "~1.2.0",
"goaop/framework": "1.0.0-alpha.2",
"goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
"ircmaxell/random-lib": "^1.1",
"jakub-onderka/php-parallel-lint": "^0.9.0",
"mockery/mockery": "^0.9.4",
@ -1911,7 +1920,7 @@
"identifier",
"uuid"
],
"time": "2017-03-18T15:38:09+00:00"
"time": "2017-03-26T20:37:53+00:00"
},
{
"name": "spatie/laravel-fractal",
@ -1973,16 +1982,16 @@
},
{
"name": "swiftmailer/swiftmailer",
"version": "v5.4.6",
"version": "v5.4.8",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
"reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e"
"reference": "9a06dc570a0367850280eefd3f1dc2da45aef517"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
"reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/9a06dc570a0367850280eefd3f1dc2da45aef517",
"reference": "9a06dc570a0367850280eefd3f1dc2da45aef517",
"shasum": ""
},
"require": {
@ -2023,7 +2032,7 @@
"mail",
"mailer"
],
"time": "2017-02-13T07:52:53+00:00"
"time": "2017-05-01T15:54:03+00:00"
},
{
"name": "symfony/console",
@ -2198,25 +2207,28 @@
},
{
"name": "symfony/event-dispatcher",
"version": "v3.2.6",
"version": "v3.3.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "b7a1b9e0a0f623ce43b4c8d775eb138f190c9d8d"
"reference": "a9f8b02b0ef07302eca92cd4bba73200b7980e9c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b7a1b9e0a0f623ce43b4c8d775eb138f190c9d8d",
"reference": "b7a1b9e0a0f623ce43b4c8d775eb138f190c9d8d",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a9f8b02b0ef07302eca92cd4bba73200b7980e9c",
"reference": "a9f8b02b0ef07302eca92cd4bba73200b7980e9c",
"shasum": ""
},
"require": {
"php": ">=5.5.9"
},
"conflict": {
"symfony/dependency-injection": "<3.3"
},
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~2.8|~3.0",
"symfony/dependency-injection": "~2.8|~3.0",
"symfony/dependency-injection": "~3.3",
"symfony/expression-language": "~2.8|~3.0",
"symfony/stopwatch": "~2.8|~3.0"
},
@ -2227,7 +2239,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.2-dev"
"dev-master": "3.3-dev"
}
},
"autoload": {
@ -2254,7 +2266,7 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2017-02-21T09:12:04+00:00"
"time": "2017-05-04T12:23:07+00:00"
},
{
"name": "symfony/finder",
@ -3105,6 +3117,54 @@
"time": "2015-05-11T14:41:42+00:00"
},
{
"name": "johnkary/phpunit-speedtrap",
"version": "v1.1.0",
"source": {
"type": "git",
"url": "https://github.com/johnkary/phpunit-speedtrap.git",
"reference": "f7cfe17c5a7076ed0ccca5450fe3bb981ec56361"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/johnkary/phpunit-speedtrap/zipball/f7cfe17c5a7076ed0ccca5450fe3bb981ec56361",
"reference": "f7cfe17c5a7076ed0ccca5450fe3bb981ec56361",
"shasum": ""
},
"require": {
"php": ">=5.6",
"phpunit/phpunit": ">=4.7,<6.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
}
},
"autoload": {
"psr-0": {
"JohnKary": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "John Kary",
"email": "john@johnkary.net"
}
],
"description": "Find slow tests in your PHPUnit test suite",
"homepage": "https://github.com/johnkary/phpunit-speedtrap",
"keywords": [
"phpunit",
"profile",
"slow"
],
"time": "2017-03-25T17:14:26+00:00"
},
{
"name": "mockery/mockery",
"version": "0.9.9",
"source": {
@ -3171,16 +3231,16 @@
},
{
"name": "myclabs/deep-copy",
"version": "1.6.0",
"version": "1.6.1",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
"reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe"
"reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe",
"reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102",
"reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102",
"shasum": ""
},
"require": {
@ -3209,7 +3269,7 @@
"object",
"object graph"
],
"time": "2017-01-26T22:05:40+00:00"
"time": "2017-04-12T18:52:22+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@ -3422,16 +3482,16 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "4.0.7",
"version": "4.0.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "09e2277d14ea467e5a984010f501343ef29ffc69"
"reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/09e2277d14ea467e5a984010f501343ef29ffc69",
"reference": "09e2277d14ea467e5a984010f501343ef29ffc69",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
"reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
"shasum": ""
},
"require": {
@ -3481,7 +3541,7 @@
"testing",
"xunit"
],
"time": "2017-03-01T09:12:17+00:00"
"time": "2017-04-02T07:44:40+00:00"
},
{
"name": "phpunit/php-file-iterator",
@ -3671,16 +3731,16 @@
},
{
"name": "phpunit/phpunit",
"version": "5.7.17",
"version": "5.7.20",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "68752b665d3875f9a38a357e3ecb35c79f8673bf"
"reference": "3cb94a5f8c07a03c8b7527ed7468a2926203f58b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/68752b665d3875f9a38a357e3ecb35c79f8673bf",
"reference": "68752b665d3875f9a38a357e3ecb35c79f8673bf",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3cb94a5f8c07a03c8b7527ed7468a2926203f58b",
"reference": "3cb94a5f8c07a03c8b7527ed7468a2926203f58b",
"shasum": ""
},
"require": {
@ -3698,7 +3758,7 @@
"phpunit/php-timer": "^1.0.6",
"phpunit/phpunit-mock-objects": "^3.2",
"sebastian/comparator": "^1.2.4",
"sebastian/diff": "~1.2",
"sebastian/diff": "^1.4.3",
"sebastian/environment": "^1.3.4 || ^2.0",
"sebastian/exporter": "~2.0",
"sebastian/global-state": "^1.1",
@ -3749,7 +3809,7 @@
"testing",
"xunit"
],
"time": "2017-03-19T16:52:12+00:00"
"time": "2017-05-22T07:42:55+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
@ -3921,23 +3981,23 @@
},
{
"name": "sebastian/diff",
"version": "1.4.1",
"version": "1.4.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
"reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
"reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
"reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
"reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": "^5.3.3 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "~4.8"
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"type": "library",
"extra": {
@ -3969,7 +4029,7 @@
"keywords": [
"diff"
],
"time": "2015-12-08T07:14:41+00:00"
"time": "2017-05-22T07:24:03+00:00"
},
{
"name": "sebastian/environment",
@ -4381,16 +4441,16 @@
},
{
"name": "symfony/yaml",
"version": "v3.2.6",
"version": "v3.3.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a"
"reference": "885db865f6b2b918404a1fae28f9ac640f71f994"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/093e416ad096355149e265ea2e4cc1f9ee40ab1a",
"reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a",
"url": "https://api.github.com/repos/symfony/yaml/zipball/885db865f6b2b918404a1fae28f9ac640f71f994",
"reference": "885db865f6b2b918404a1fae28f9ac640f71f994",
"shasum": ""
},
"require": {
@ -4405,7 +4465,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.2-dev"
"dev-master": "3.3-dev"
}
},
"autoload": {
@ -4432,7 +4492,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2017-03-07T16:47:02+00:00"
"time": "2017-05-28T10:56:20+00:00"
},
{
"name": "webmozart/assert",

136
database/factories/ModelFactory.php

@ -10,12 +10,12 @@ use App\Entities\Users\User;
$factory->define(User::class, function (Faker\Generator $faker) {
return [
'name' => $faker->name,
'username' => $faker->username,
'email' => $email = $faker->email,
'password' => 'member',
'name' => $faker->name,
'username' => $faker->unique()->username,
'email' => $email = $faker->unique()->email,
'password' => 'member',
'remember_token' => str_random(10),
'api_token' => bcrypt($email),
'api_token' => bcrypt($email),
];
});
@ -24,99 +24,115 @@ $factory->define(Project::class, function (Faker\Generator $faker) {
$proposalDate = $faker->dateTimeBetween('-1 year', '-1 month')->format('Y-m-d');
$startDate = Carbon::parse($proposalDate)->addDays(10);
$endDate = $startDate->addDays(rand(1,13) * 7);
$owner = factory(User::class)->create();
$owner->assignRole('admin');
$customer = factory(User::class)->create();
$customer->assignRole('customer');
return [
'name' => $faker->sentence(3),
'description' => $faker->paragraph,
'proposal_date' => $proposalDate,
'start_date' => $startDate->format('Y-m-d'),
'end_date' => $endDate->format('Y-m-d'),
'project_value' => $projectValue = rand(1,10) * 500000,
'name' => $faker->sentence(3),
'description' => $faker->paragraph,
'proposal_date' => $proposalDate,
'start_date' => $startDate->format('Y-m-d'),
'end_date' => $endDate->format('Y-m-d'),
'project_value' => $projectValue = rand(1,10) * 500000,
'proposal_value' => $projectValue,
'status_id' => rand(1,6),
'owner_id' => $owner->id,
'customer_id' => $customer->id
'status_id' => rand(1,6),
'owner_id' => function () {
return factory(User::class)->create()->id;
},
'customer_id' => function () {
return factory(User::class)->create()->id;
},
];
});
$factory->define(Payment::class, function (Faker\Generator $faker) {
return [
'project_id' => factory(Project::class)->create()->id,
'amount' => rand(1,5) * 500000,
'in_out' => rand(0,1),
'type_id' => rand(1,3),
'date' => $faker->dateTimeBetween('-1 year', '-1 month')->format('Y-m-d'),
'project_id' => function () {
return factory(Project::class)->create()->id;
},
'amount' => rand(1,5) * 500000,
'in_out' => rand(0,1),
'type_id' => rand(1,3),
'date' => $faker->dateTimeBetween('-1 year', '-1 month')->format('Y-m-d'),
'description' => $faker->paragraph,
'owner_id' => factory(User::class)->create()->id,
'customer_id' => factory(User::class)->create()->id,
'owner_id' => function () {
return factory(User::class)->create()->id;
},
'customer_id' => function () {
return factory(User::class)->create()->id;
},
];
});
$factory->define(Subscription::class, function (Faker\Generator $faker) {
$customer = factory(User::class)->create();
$customer->assignRole('customer');
$customerId = $customer->id;
$vendor = factory(User::class)->create();
$vendor->assignRole('vendor');
$vendorId = $vendor->id;
$startDate = Carbon::parse($faker->dateTimeBetween('-1 year', '-1 month')->format('Y-m-d'));
return [
'project_id' => factory(Project::class)->create()->id,
'status_id' => 1,
'domain_name' => 'www.' . str_random(10) . '.com',
'domain_price' => 125000,
'epp_code' => str_random(10),
'project_id' => function () {
return factory(Project::class)->create()->id;
},
'status_id' => 1,
'domain_name' => 'www.' . str_random(10) . '.com',
'domain_price' => 125000,
'epp_code' => str_random(10),
'hosting_capacity' => rand(1,3) . ' GB',
'hosting_price' => rand(1,5) * 100000,
'start_date' => $startDate->format('Y-m-d'),
'due_date' => $startDate->addYears(1)->format('Y-m-d'),
'remark' => $faker->paragraph,
'customer_id' => $customerId,
'vendor_id' => $vendorId,
'hosting_price' => rand(1,5) * 100000,
'start_date' => $startDate->format('Y-m-d'),
'due_date' => $startDate->addYears(1)->format('Y-m-d'),
'remark' => $faker->paragraph,
'customer_id' => function () {
return factory(User::class)->create()->id;
},
'vendor_id' => function () {
return factory(User::class)->create()->id;
},
];
});
$factory->define(Feature::class, function (Faker\Generator $faker) {
return [
'project_id' => factory(Project::class)->create()->id,
'name' => $faker->sentence(3),
'price' => rand(1,10) * 100000,
'project_id' => function () {
return factory(Project::class)->create()->id;
},
'name' => $faker->sentence(3),
'price' => rand(1,10) * 100000,
'description' => $faker->paragraph,
'worker_id' => factory(User::class)->create()->id,
'type_id' => rand(1,2),
'position' => rand(1,10),
'worker_id' => function () {
return factory(User::class)->create()->id;
},
'type_id' => rand(1,2),
'position' => rand(1,10),
];
});
$factory->define(Task::class, function (Faker\Generator $faker) {
return [
'feature_id' => factory(Feature::class)->create()->id,
'name' => $faker->sentence(3),
'feature_id' => function () {
return factory(Feature::class)->create()->id;
},
'name' => $faker->sentence(3),
'description' => $faker->paragraph,
'progress' => rand(40,100),
'route_name' => implode('.', $faker->words(3)),
'position' => rand(1,10),
'progress' => rand(40,100),
'route_name' => implode('.', $faker->words(3)),
'position' => rand(1,10),
];
});
$factory->define(Event::class, function (Faker\Generator $faker) {
return [
'user_id' => factory(User::class)->create()->id,
'project_id' => factory(Project::class)->create()->id,
'title' => $faker->words(rand(2,4), true),
'body' => $faker->sentence,
'start' => $faker->dateTimeBetween('-2 months', '-2 months')->format('Y-m-d H:i:s'),
'end' => $faker->dateTimeBetween('-2 months', '-2 months')->format('Y-m-d H:i:s'),
'is_allday' => rand(0,1),
'user_id' => function () {
return factory(User::class)->create()->id;
},
'project_id' => function () {
return factory(Project::class)->create()->id;
},
'title' => $faker->words(rand(2,4), true),
'body' => $faker->sentence,
'start' => $faker->dateTimeBetween('-2 months', '-2 months')->format('Y-m-d H:i:s'),
'end' => $faker->dateTimeBetween('-2 months', '-2 months')->format('Y-m-d H:i:s'),
'is_allday' => rand(0,1),
];
});

11
phpunit.xml

@ -25,4 +25,15 @@
<env name="QUEUE_DRIVER" value="sync"/>
<env name="DB_DATABASE" value="test_lv_myproject"/>
</php>
<listeners>
<listener class="JohnKary\PHPUnit\Listener\SpeedTrapListener">
<arguments>
<array>
<element key="reportLength">
<integer>15</integer>
</element>
</array>
</arguments>
</listener>
</listeners>
</phpunit>

2
resources/views/projects/create.blade.php

@ -15,7 +15,7 @@
<div class="panel-heading"><h3 class="panel-title">{{ trans('project.create') }}</h3></div>
<div class="panel-body">
{!! FormField::text('name',['label'=> trans('project.name')]) !!}
{!! FormField::select('customer_id', $customers,['placeholder' => '-- Customer Baru --']) !!}
{!! FormField::select('customer_id', $customers, ['placeholder' => '-- Customer Baru --']) !!}
<div class="row">
<div class="col-md-6">
{!! FormField::text('customer_name') !!}

8
resources/views/subscriptions/index.blade.php

@ -21,7 +21,7 @@
<th>{{ trans('subscription.domain_name') }}</th>
<th class="text-center">{{ trans('subscription.hosting_capacity') }}</th>
<th>{{ trans('subscription.vendor') }}</th>
<th>{{ trans('subscription.due_date') }}</th>
<th class="text-right">{{ trans('subscription.due_date') }}</th>
<th class="text-right">{{ trans('subscription.extension_price') }}</th>
<th class="text-center">{{ trans('app.status') }}</th>
<th>{{ trans('app.action') }}</th>
@ -33,9 +33,9 @@
<td>{{ $subscription->domain_name }}</td>
<td class="text-center">{{ $subscription->hosting_capacity }}</td>
<td>{{ $subscription->vendor->name }}</td>
<td title="
{{ trans('subscription.start_date') }} : {{ dateId($subscription->start_date) }}
{{ trans('subscription.due_date') }} : {{ dateId($subscription->due_date) }}
<td class="text-right" title="
{{ trans('subscription.start_date') }} : {{ dateId($subscription->start_date) }} \n
{{ trans('subscription.due_date') }} : {{ dateId($subscription->due_date) }}
">{{ dateId($subscription->due_date) }}</td>
<td class="text-right">{{ formatRp($subscription->domain_price + $subscription->hosting_price) }}</td>
<td class="text-center">{{ $subscription->status() }}</td>

1
tests/TestCase.php

@ -21,6 +21,7 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
$app = require __DIR__.'/../bootstrap/app.php';
$app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap();
\Hash::setRounds(5);
return $app;
}

Loading…
Cancel
Save