From 6c88b404169ec1c634ffecc3894ea8ca8138cbee Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 8 Oct 2015 08:36:11 +1100 Subject: [PATCH 1/9] not sure? --- storage/templates/bold.js | 7 ------- storage/templates/clean.js | 9 +-------- storage/templates/modern.js | 8 +------- storage/templates/plain.js | 7 ------- 4 files changed, 2 insertions(+), 29 deletions(-) diff --git a/storage/templates/bold.js b/storage/templates/bold.js index a036f90c1639..361b0f5c1a58 100644 --- a/storage/templates/bold.js +++ b/storage/templates/bold.js @@ -239,13 +239,6 @@ "termsLabel": { "bold": true, "margin": [0, 0, 0, 4] - }, - "header": { - "fontSize": "$fontSizeLargest", - "bold": true - }, - "subheader": { - "fontSize": "$fontSizeLarger" } }, "pageMargins": [0, 80, 0, 40] diff --git a/storage/templates/clean.js b/storage/templates/clean.js index 595a256fe2a3..6ebd34f40ade 100644 --- a/storage/templates/clean.js +++ b/storage/templates/clean.js @@ -185,14 +185,7 @@ }, "termsLabel": { "bold": true - }, - "header": { - "fontSize": "$fontSizeLargest", - "bold": true - }, - "subheader": { - "fontSize": "$fontSizeLarger" - } + } }, "pageMargins": [40, 40, 40, 60] } \ No newline at end of file diff --git a/storage/templates/modern.js b/storage/templates/modern.js index 7ca76715e3f2..74e37bf4ac1e 100644 --- a/storage/templates/modern.js +++ b/storage/templates/modern.js @@ -230,14 +230,8 @@ }, "invoiceNumber": { "bold": true - }, - "header": { - "fontSize": "$fontSizeLargest", - "bold": true - }, - "subheader": { - "fontSize": "$fontSizeLarger" } + }, "pageMargins": [40, 80, 40, 50] } \ No newline at end of file diff --git a/storage/templates/plain.js b/storage/templates/plain.js index fa034ff51270..49a51571ca35 100644 --- a/storage/templates/plain.js +++ b/storage/templates/plain.js @@ -152,13 +152,6 @@ }, "balanceDue": { "fillColor": "#e6e6e6" - }, - "header": { - "fontSize": "$fontSizeLargest", - "bold": true - }, - "subheader": { - "fontSize": "$fontSizeLarger" } }, "pageMargins": [40, 40, 40, 60] From 575ebe32336acb078584de5a7afb972ab5536a51 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 26 Oct 2015 19:41:02 +1100 Subject: [PATCH 2/9] add git ignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 99d2f1b7d773..9705701a1e55 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ /.env /.env.development.php /.env.php +/composer.lock /error_log /auth.json @@ -30,4 +31,4 @@ /.idea /.project tests/_output/ -tests/_bootstrap.php \ No newline at end of file +tests/_bootstrap.php From 07d288b60c65538139e878afcbcb8cd2805f9e64 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 27 Oct 2015 09:58:18 +1100 Subject: [PATCH 3/9] pre merge --- composer.lock | 95 ++++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/composer.lock b/composer.lock index 7c1534c5c2ea..5be1f98db9a0 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,11 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], "hash": "48ed13e4113a177339d3a20f31dbc6bb", + "content-hash": "3d1306c92248f0fe4015c722de827c81", "packages": [ { "name": "alfaproject/omnipay-neteller", @@ -339,7 +340,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Chumper/Datatable/zipball/7fa47cb5469f07c620fb69dee94b8e1a96943ee2", + "url": "https://api.github.com/repos/Chumper/Datatable/zipball/b44834db3d4e560d4368c1a04248b9e6a422ccff", "reference": "7fa47cb", "shasum": "" }, @@ -351,7 +352,7 @@ }, "require-dev": { "mockery/mockery": "dev-master", - "orchestra/testbench": "2.1.*", + "orchestra/testbench": "3.1.*", "phpunit/phpunit": "3.7.*" }, "type": "library", @@ -380,7 +381,7 @@ "jquery", "laravel" ], - "time": "2015-04-20 09:21:21" + "time": "2015-10-26 01:21:31" }, { "name": "classpreloader/classpreloader", @@ -501,16 +502,16 @@ }, { "name": "coatesap/omnipay-paymentsense", - "version": "v2.0.0", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/coatesap/omnipay-paymentsense.git", - "reference": "4a5a87ef140abf8e09ff27cd0e6502ac1e79e434" + "reference": "664e00a726b99b65b08381f8409263795f2986a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/coatesap/omnipay-paymentsense/zipball/4a5a87ef140abf8e09ff27cd0e6502ac1e79e434", - "reference": "4a5a87ef140abf8e09ff27cd0e6502ac1e79e434", + "url": "https://api.github.com/repos/coatesap/omnipay-paymentsense/zipball/664e00a726b99b65b08381f8409263795f2986a2", + "reference": "664e00a726b99b65b08381f8409263795f2986a2", "shasum": "" }, "require": { @@ -530,8 +531,8 @@ } }, "autoload": { - "psr-0": { - "Omnipay\\PaymentSense\\": "src/" + "psr-4": { + "Coatesap\\PaymentSense\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -545,8 +546,9 @@ } ], "description": "PaymentSense driver for the Omnipay payment processing library", - "homepage": "https://github.com/coatesap/paymentsense", + "homepage": "https://github.com/coatesap/omnipay-paymentsense", "keywords": [ + "driver", "gateway", "merchant", "omnipay", @@ -555,7 +557,7 @@ "payment sense", "paymentsense" ], - "time": "2014-03-18 17:17:57" + "time": "2015-10-13 07:08:13" }, { "name": "coatesap/omnipay-realex", @@ -2057,16 +2059,16 @@ }, { "name": "laravel/socialite", - "version": "v2.0.13", + "version": "v2.0.14", "source": { "type": "git", "url": "https://github.com/laravel/socialite.git", - "reference": "5995d2c9c60b47362412a84286e2a0707e0db386" + "reference": "b15f4be0ac739405120d74b837af423aa71502d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/socialite/zipball/5995d2c9c60b47362412a84286e2a0707e0db386", - "reference": "5995d2c9c60b47362412a84286e2a0707e0db386", + "url": "https://api.github.com/repos/laravel/socialite/zipball/b15f4be0ac739405120d74b837af423aa71502d9", + "reference": "b15f4be0ac739405120d74b837af423aa71502d9", "shasum": "" }, "require": { @@ -2107,7 +2109,7 @@ "laravel", "oauth" ], - "time": "2015-09-24 20:59:56" + "time": "2015-10-16 15:39:46" }, { "name": "laravelcollective/html", @@ -2245,16 +2247,16 @@ }, { "name": "league/oauth1-client", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/thephpleague/oauth1-client.git", - "reference": "4d4edd9b6014f882e319231a9b3351e3a1dfdc81" + "reference": "cef3ceda13c78f89c323e4d5e6301c0eb7cea422" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/4d4edd9b6014f882e319231a9b3351e3a1dfdc81", - "reference": "4d4edd9b6014f882e319231a9b3351e3a1dfdc81", + "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/cef3ceda13c78f89c323e4d5e6301c0eb7cea422", + "reference": "cef3ceda13c78f89c323e4d5e6301c0eb7cea422", "shasum": "" }, "require": { @@ -2304,7 +2306,7 @@ "tumblr", "twitter" ], - "time": "2015-08-22 09:49:14" + "time": "2015-10-23 04:02:07" }, { "name": "lokielse/omnipay-alipay", @@ -2357,16 +2359,16 @@ }, { "name": "maximebf/debugbar", - "version": "v1.10.4", + "version": "v1.10.5", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "7b2006e6e095126b5a061ec33fca3d90ea8a8219" + "reference": "30e53e8a28284b69dd223c9f5ee8957befd72636" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/7b2006e6e095126b5a061ec33fca3d90ea8a8219", - "reference": "7b2006e6e095126b5a061ec33fca3d90ea8a8219", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30e53e8a28284b69dd223c9f5ee8957befd72636", + "reference": "30e53e8a28284b69dd223c9f5ee8957befd72636", "shasum": "" }, "require": { @@ -2409,7 +2411,7 @@ "keywords": [ "debug" ], - "time": "2015-02-05 07:51:20" + "time": "2015-10-19 20:35:12" }, { "name": "mfauveau/omnipay-pacnet", @@ -2468,16 +2470,16 @@ }, { "name": "monolog/monolog", - "version": "1.17.1", + "version": "1.17.2", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422" + "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0524c87587ab85bc4c2d6f5b41253ccb930a5422", - "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bee7f0dc9c3e0b69a6039697533dca1e845c8c24", + "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24", "shasum": "" }, "require": { @@ -2491,10 +2493,11 @@ "aws/aws-sdk-php": "^2.4.9", "doctrine/couchdb": "~1.0@dev", "graylog2/gelf-php": "~1.0", + "jakub-onderka/php-parallel-lint": "0.9", "php-console/php-console": "^3.1.3", "phpunit/phpunit": "~4.5", "phpunit/phpunit-mock-objects": "2.3.0", - "raven/raven": "~0.11", + "raven/raven": "^0.13", "ruflin/elastica": ">=0.90 <3.0", "swiftmailer/swiftmailer": "~5.3", "videlalvaro/php-amqplib": "~2.4" @@ -2540,7 +2543,7 @@ "logging", "psr-3" ], - "time": "2015-08-31 09:17:37" + "time": "2015-10-14 12:51:02" }, { "name": "mtdowling/cron-expression", @@ -4826,12 +4829,12 @@ "target-dir": "Symfony/Component/Console", "source": { "type": "git", - "url": "https://github.com/symfony/Console.git", + "url": "https://github.com/symfony/console.git", "reference": "0e5e18ae09d3f5c06367759be940e9ed3f568359" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/0e5e18ae09d3f5c06367759be940e9ed3f568359", + "url": "https://api.github.com/repos/symfony/console/zipball/0e5e18ae09d3f5c06367759be940e9ed3f568359", "reference": "0e5e18ae09d3f5c06367759be940e9ed3f568359", "shasum": "" }, @@ -4884,12 +4887,12 @@ "target-dir": "Symfony/Component/Debug", "source": { "type": "git", - "url": "https://github.com/symfony/Debug.git", + "url": "https://github.com/symfony/debug.git", "reference": "fca5696e0c9787722baa8f2ad6940dfd7a6a6941" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/fca5696e0c9787722baa8f2ad6940dfd7a6a6941", + "url": "https://api.github.com/repos/symfony/debug/zipball/fca5696e0c9787722baa8f2ad6940dfd7a6a6941", "reference": "fca5696e0c9787722baa8f2ad6940dfd7a6a6941", "shasum": "" }, @@ -5102,12 +5105,12 @@ "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", - "url": "https://github.com/symfony/HttpFoundation.git", + "url": "https://github.com/symfony/http-foundation.git", "reference": "e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c", "reference": "e8fd1b73ac1c3de1f76c73801ddf1a8ecb1c1c9c", "shasum": "" }, @@ -5156,12 +5159,12 @@ "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", - "url": "https://github.com/symfony/HttpKernel.git", + "url": "https://github.com/symfony/http-kernel.git", "reference": "a3f0ed713255c0400a2db38b3ed01989ef4b7322" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/a3f0ed713255c0400a2db38b3ed01989ef4b7322", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a3f0ed713255c0400a2db38b3ed01989ef4b7322", "reference": "a3f0ed713255c0400a2db38b3ed01989ef4b7322", "shasum": "" }, @@ -6439,16 +6442,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.8.12", + "version": "4.8.16", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "00194eb95989190a73198390ceca081ad3441a7f" + "reference": "625f8c345606ed0f3a141dfb88f4116f0e22978e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/00194eb95989190a73198390ceca081ad3441a7f", - "reference": "00194eb95989190a73198390ceca081ad3441a7f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/625f8c345606ed0f3a141dfb88f4116f0e22978e", + "reference": "625f8c345606ed0f3a141dfb88f4116f0e22978e", "shasum": "" }, "require": { @@ -6507,7 +6510,7 @@ "testing", "xunit" ], - "time": "2015-10-12 03:36:47" + "time": "2015-10-23 06:48:33" }, { "name": "phpunit/phpunit-mock-objects", From 09ccb88784f24a13b159abd30cecd5a806238769 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 2 Nov 2015 15:29:38 +1100 Subject: [PATCH 4/9] separate API logic --- app/Http/Controllers/Auth/AuthController.php | 33 ++++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 14ef9cf8b446..00153b3b6caa 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -75,6 +75,12 @@ class AuthController extends Controller { public function postLoginWrapper(Request $request) { + /** If request is from API*/ + if($request->api_secret) + { + return $this->postLoginWrapperAPI($request); + } + $userId = Auth::check() ? Auth::user()->id : null; $user = User::where('email', '=', $request->input('email'))->first(); @@ -99,12 +105,7 @@ class AuthController extends Controller { } Session::put(SESSION_USER_ACCOUNTS, $users); - if ($request->create_token) { - if ( ! env(API_SECRET) || $request->api_secret !== env(API_SECRET)) { - return 'Invalid secret'; - } - return $this->accountRepo->createToken($request->token_name); - } + } elseif ($user) { $user->failed_logins = $user->failed_logins + 1; $user->save(); @@ -113,6 +114,26 @@ class AuthController extends Controller { return $response; } + private function postLoginWrapperAPI(Request $request) + { + /**Auth check*/ + + /**Success*/ + /* send back user object along with account token if it exists, + create token only if it does not exist*/ + + /**Failure*/ + /* return json with failure message */ + + if ($request->create_token) { + if ( ! env(API_SECRET) || $request->api_secret !== env(API_SECRET)) { + return 'Invalid secret'; + } + return $this->accountRepo->createToken($request->token_name); + } + } + + public function getLogoutWrapper() { if (Auth::check() && !Auth::user()->registered) { From c3066c824f5e3a3911ee3c7586d744a3d67980ed Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 3 Nov 2015 10:55:31 +1100 Subject: [PATCH 5/9] working on api --- app/Http/Controllers/AccountApiController.php | 10 +++++++++- app/Ninja/Repositories/AccountRepository.php | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php index 65f4eff634c6..18950d814174 100644 --- a/app/Http/Controllers/AccountApiController.php +++ b/app/Http/Controllers/AccountApiController.php @@ -30,7 +30,8 @@ class AccountApiController extends Controller } if (Auth::attempt(['email' => $request->email, 'password' => $request->password])) { - return $this->accountRepo->createToken($request->token_name); + return $this->processLogin($request); + //return $this->accountRepo->createToken($request->token_name); } else { return 'Invalid credentials'; } @@ -50,4 +51,11 @@ class AccountApiController extends Controller return Response::make($response, 200, $headers); } + + private function processLogin(Request $request) + { + + } + + } diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php index c431584b888a..4ba1c66b48f4 100644 --- a/app/Ninja/Repositories/AccountRepository.php +++ b/app/Ninja/Repositories/AccountRepository.php @@ -470,6 +470,6 @@ class AccountRepository $token->token = str_random(RANDOM_KEY_LENGTH); $token->save(); - return $token->token; + return $token; } } From 38c3f140814b0765ac6c2dad2c7555f973458063 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 3 Nov 2015 13:02:15 +1100 Subject: [PATCH 6/9] working on api --- app/Http/Controllers/AccountApiController.php | 19 +++++++++++++++++ app/Models/Account.php | 6 +++++- .../Transformers/AccountTokenTransformer.php | 21 +++++++++++++++++++ app/Ninja/Transformers/AccountTransformer.php | 10 ++++++++- 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 app/Ninja/Transformers/AccountTokenTransformer.php diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php index 18950d814174..a32fe200862f 100644 --- a/app/Http/Controllers/AccountApiController.php +++ b/app/Http/Controllers/AccountApiController.php @@ -6,6 +6,7 @@ use Response; use Input; use App\Models\Client; use App\Models\Account; +use App\Models\AccountToken; use App\Ninja\Repositories\AccountRepository; use Illuminate\Http\Request; use League\Fractal; @@ -54,7 +55,25 @@ class AccountApiController extends Controller private function processLogin(Request $request) { + \Log::info('authed user = '.Auth::user()->email); + //Create a new token only if one does not already exist + if(!AccountToken::where('user_id', '=', Auth::user()->id)->firstOrFail()) + { + $account_token = $this->accountRepo->createToken($request->token_name); + } + + $manager = new Manager(); + $manager->setSerializer(new ArraySerializer()); + + $account = Auth::user()->account->load('users','tokens'); + $resource = new Item($account, new AccountTransformer, 'account'); + + $response = $manager->createData($resource)->toArray(); + $response = json_encode($response, JSON_PRETTY_PRINT); + $headers = Utils::getApiHeaders(); + + return Response::make($response, 200, $headers); } diff --git a/app/Models/Account.php b/app/Models/Account.php index fe16924f682c..0ffacd5051e5 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -41,7 +41,11 @@ class Account extends Eloquent 'invoice_settings' => 'object', ]; */ - + public function tokens() + { + return $this->hasMany('App\Models\AccountToken'); + } + public function users() { return $this->hasMany('App\Models\User'); diff --git a/app/Ninja/Transformers/AccountTokenTransformer.php b/app/Ninja/Transformers/AccountTokenTransformer.php new file mode 100644 index 000000000000..b2022a778286 --- /dev/null +++ b/app/Ninja/Transformers/AccountTokenTransformer.php @@ -0,0 +1,21 @@ + (int) $account_token->id, + 'account_id' =>(int) $account_token->account_id, + 'user_id' => (int) $account_token->user_id, + 'public_id' => (int) $account_token->public_id, + 'name' => $account_token->name, + 'token' => $account_token->token + ]; + } +} \ No newline at end of file diff --git a/app/Ninja/Transformers/AccountTransformer.php b/app/Ninja/Transformers/AccountTransformer.php index 469365d61d77..262a8a19607a 100644 --- a/app/Ninja/Transformers/AccountTransformer.php +++ b/app/Ninja/Transformers/AccountTransformer.php @@ -7,9 +7,17 @@ use League\Fractal\TransformerAbstract; class AccountTransformer extends TransformerAbstract { protected $defaultIncludes = [ - 'users' + 'users', + 'account_tokens' ]; + public function includeAccountTokens($account) + { + $account_tokens = $account->tokens; + + return $this->collection($account_tokens, new AccountTokenTransformer); + + } public function includeUsers($account) { $users = $account->users; From ab930a2dbe0372bafd75545075091ab96d8087f1 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 3 Nov 2015 18:54:57 +1100 Subject: [PATCH 7/9] fixed pr issues --- .gitignore | 1 - storage/templates/bold.js | 7 +++++++ storage/templates/clean.js | 9 ++++++++- storage/templates/modern.js | 8 +++++++- storage/templates/plain.js | 7 +++++++ 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cf43e103bb18..62b2fec899b7 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ Thumbs.db /.env /.env.development.php /.env.php -/composer.lock /error_log /auth.json diff --git a/storage/templates/bold.js b/storage/templates/bold.js index 361b0f5c1a58..a036f90c1639 100644 --- a/storage/templates/bold.js +++ b/storage/templates/bold.js @@ -239,6 +239,13 @@ "termsLabel": { "bold": true, "margin": [0, 0, 0, 4] + }, + "header": { + "fontSize": "$fontSizeLargest", + "bold": true + }, + "subheader": { + "fontSize": "$fontSizeLarger" } }, "pageMargins": [0, 80, 0, 40] diff --git a/storage/templates/clean.js b/storage/templates/clean.js index 6ebd34f40ade..595a256fe2a3 100644 --- a/storage/templates/clean.js +++ b/storage/templates/clean.js @@ -185,7 +185,14 @@ }, "termsLabel": { "bold": true - } + }, + "header": { + "fontSize": "$fontSizeLargest", + "bold": true + }, + "subheader": { + "fontSize": "$fontSizeLarger" + } }, "pageMargins": [40, 40, 40, 60] } \ No newline at end of file diff --git a/storage/templates/modern.js b/storage/templates/modern.js index 74e37bf4ac1e..7ca76715e3f2 100644 --- a/storage/templates/modern.js +++ b/storage/templates/modern.js @@ -230,8 +230,14 @@ }, "invoiceNumber": { "bold": true + }, + "header": { + "fontSize": "$fontSizeLargest", + "bold": true + }, + "subheader": { + "fontSize": "$fontSizeLarger" } - }, "pageMargins": [40, 80, 40, 50] } \ No newline at end of file diff --git a/storage/templates/plain.js b/storage/templates/plain.js index 49a51571ca35..fa034ff51270 100644 --- a/storage/templates/plain.js +++ b/storage/templates/plain.js @@ -152,6 +152,13 @@ }, "balanceDue": { "fillColor": "#e6e6e6" + }, + "header": { + "fontSize": "$fontSizeLargest", + "bold": true + }, + "subheader": { + "fontSize": "$fontSizeLarger" } }, "pageMargins": [40, 40, 40, 60] From 6f320aa62475ba764642dc9d0decdb7e54d858d2 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 3 Nov 2015 19:09:52 +1100 Subject: [PATCH 8/9] merge --- app/Http/Controllers/AccountApiController.php | 7 +------ app/Ninja/Repositories/AccountRepository.php | 2 +- app/Ninja/Transformers/AccountTransformer.php | 5 +++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php index a32fe200862f..619d9652e98d 100644 --- a/app/Http/Controllers/AccountApiController.php +++ b/app/Http/Controllers/AccountApiController.php @@ -32,7 +32,6 @@ class AccountApiController extends Controller if (Auth::attempt(['email' => $request->email, 'password' => $request->password])) { return $this->processLogin($request); - //return $this->accountRepo->createToken($request->token_name); } else { return 'Invalid credentials'; } @@ -55,13 +54,9 @@ class AccountApiController extends Controller private function processLogin(Request $request) { - \Log::info('authed user = '.Auth::user()->email); //Create a new token only if one does not already exist - if(!AccountToken::where('user_id', '=', Auth::user()->id)->firstOrFail()) - { - $account_token = $this->accountRepo->createToken($request->token_name); - } + $this->accountRepo->createToken('ios_api_token'); $manager = new Manager(); $manager->setSerializer(new ArraySerializer()); diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php index 4ba1c66b48f4..a824315e14c4 100644 --- a/app/Ninja/Repositories/AccountRepository.php +++ b/app/Ninja/Repositories/AccountRepository.php @@ -462,7 +462,7 @@ class AccountRepository $name = trim($name) ?: 'TOKEN'; if ($token = AccountToken::scope()->whereName($name)->first()) { - return $token->token; + return $token; } $token = AccountToken::createNew(); diff --git a/app/Ninja/Transformers/AccountTransformer.php b/app/Ninja/Transformers/AccountTransformer.php index 262a8a19607a..616b06dffdfd 100644 --- a/app/Ninja/Transformers/AccountTransformer.php +++ b/app/Ninja/Transformers/AccountTransformer.php @@ -1,6 +1,7 @@ tokens; + $account_token = AccountToken::whereAccountId($account->id)->whereName('ios_api_token')->first(); - return $this->collection($account_tokens, new AccountTokenTransformer); + return $this->collection($account_token, new AccountTokenTransformer); } public function includeUsers($account) From d0f8fca42098145c683ea4bb41cd5fc0f132ee29 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 3 Nov 2015 19:13:15 +1100 Subject: [PATCH 9/9] api --- app/Ninja/Transformers/AccountTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Ninja/Transformers/AccountTransformer.php b/app/Ninja/Transformers/AccountTransformer.php index 616b06dffdfd..f172356eb4d3 100644 --- a/app/Ninja/Transformers/AccountTransformer.php +++ b/app/Ninja/Transformers/AccountTransformer.php @@ -16,7 +16,7 @@ class AccountTransformer extends TransformerAbstract { $account_token = AccountToken::whereAccountId($account->id)->whereName('ios_api_token')->first(); - return $this->collection($account_token, new AccountTokenTransformer); + return $this->Item($account_token, new AccountTokenTransformer); } public function includeUsers($account)