Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 13:42:49 +01:00
Code Issues Releases Activity
4,395 Commits 7 Branches 919 Tags 2 GiB
b620356db1
Commit Graph

632 Commits

Author SHA1 Message Date
Hillel Coren
293e7cbb61 Support saving credit card and paypal tokens for the same client 2016-08-02 13:40:20 +03:00
Hillel Coren
8f084ddbc1 Set last entered payment method as the default 2016-08-01 15:01:04 +03:00
Hillel Coren
bf5d6ac1ee Set last entered payment method as the default 2016-08-01 15:00:47 +03:00
Hillel Coren
f3419587bf Archive previous payment methods 2016-08-01 14:53:49 +03:00
Hillel Coren
948a3e8911 Archive previous payment methods 2016-08-01 14:53:10 +03:00
Hillel Coren
af78a3dd2d Test Stripe credentials when adding gateway 2016-07-29 14:58:26 +03:00
Hillel Coren
1e7bedd469 Fix for removing payment method 2016-07-27 14:38:44 +03:00
Hillel Coren
903036c02c Fix for removing payment method 2016-07-27 14:37:36 +03:00
Hillel Coren
bb590830cf Fix for upgrading Stripe accounts 2016-07-27 12:53:58 +03:00
Hillel Coren
7c314347db Fix for upgrading Stripe accounts 2016-07-27 12:53:11 +03:00
Hillel Coren
498578cefc Rollback to 2.6.5 2016-07-21 15:35:23 +03:00
Hillel Coren
ee937d9994 Fixes from refactor 2016-07-21 14:28:06 +03:00
Hillel Coren
7b4b84cedd Merge pull request #979 from codedge/Refactoring-docblocks-dead-code-unused-uses 
Refactor docblocks, unused vars, unused uses
 2016-07-20 11:00:03 +03:00
Hillel Coren
7bb8f0ca4a Merge https://github.com/codedge/invoiceninja into codedge-#904-Unify-js-no-public-js 
Conflicts:
	app/Http/Controllers/AccountController.php
	resources/lang/en/texts.php
 2016-07-20 10:49:08 +03:00
Hillel Coren
f42e8158c2 Merge branch 'release-2.6.4' 
Conflicts:
	app/Http/Controllers/AccountController.php
	app/Http/routes.php
	app/Models/User.php
	resources/lang/en/texts.php
 2016-07-19 19:18:24 +03:00
Hillel Coren
e7c8ca50db API optimization 2016-07-19 10:07:56 +03:00
Hillel Coren
109c97dc55 Fix for is_system setting in actvities 2016-07-19 09:57:17 +03:00
Hillel Coren
6cc84ddfab Add link to WePAY TOS 2016-07-18 22:58:56 +03:00
Hillel Coren
ce6068f924 Additional online payment checks 2016-07-18 22:03:28 +03:00
Hillel Coren
078964d297 Improve offsite payment checks 2016-07-18 21:45:32 +03:00
Hillel Coren
0d58e6da94 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-16 23:51:30 +03:00
Hillel Coren
1e568dc408 Fixes for WePay 2016-07-16 23:51:18 +03:00
David Bomba
20c9d661ac Merge pull request #985 from turbo124/develop 
Fix typo
 2016-07-16 07:52:58 +10:00
David Bomba
cfb32f244a Fix typo 2016-07-16 07:52:00 +10:00
Hillel Coren
36e50e7bcb Fixes for the API 2016-07-15 16:47:18 +03:00
Hillel Coren
2440070376 Fix for token billing 2016-07-15 11:25:22 +03:00
Hillel Coren
cf3465b5e2 Fix for token billing 2016-07-15 11:23:19 +03:00
Hillel Coren
c6bf1d5fcc Fix for wepay fee 2016-07-15 10:41:16 +03:00
Holger Lösken
33badc78b7 Fixed wrong overrides, added some more docblocks 2016-07-14 23:20:16 +02:00
Holger Lösken
71ab4dc3d8 Refactor docblocks, unused vars, unused uses 2016-07-14 22:37:04 +02:00
Hillel Coren
431f596d1d Working on new pricing 2016-07-14 22:58:48 +03:00
Hillel Coren
8590f9ad17 Working on new pricing 2016-07-14 12:46:00 +03:00
Hillel Coren
92043afb9c WePay fixes 2016-07-13 16:35:56 +03:00
Hillel Coren
b9f9c0807d WePay fixes 2016-07-13 16:34:26 +03:00
Hillel Coren
fa9b0bf78b Working on buy now buttons 2016-07-13 12:03:39 +03:00
Hillel Coren
401851e212 Working on buy now buttons 2016-07-12 23:46:41 +03:00
Hillel Coren
b233aa0744 Merge branch 'release-2.6' 
Conflicts:
	.travis.yml
	CONTRIBUTING.md
	README.md
	app/Http/Controllers/AccountController.php
	app/Http/Controllers/AppController.php
	app/Http/Controllers/BaseAPIController.php
	app/Http/Controllers/CreditController.php
	app/Http/Controllers/DashboardController.php
	app/Http/Controllers/DocumentController.php
	app/Http/Controllers/PaymentController.php
	app/Http/Controllers/QuoteApiController.php
	app/Http/Requests/EntityRequest.php
	app/Http/routes.php
	app/Listeners/AnalyticsListener.php
	app/Models/Account.php
	app/Models/Credit.php
	app/Models/Document.php
	app/Models/EntityModel.php
	app/Models/Expense.php
	app/Models/Invoice.php
	app/Models/Task.php
	app/Models/VendorContact.php
	app/Ninja/Notifications/PushFactory.php
	app/Ninja/Repositories/DocumentRepository.php
	app/Ninja/Repositories/ExpenseRepository.php
	app/Ninja/Repositories/InvoiceRepository.php
	app/Services/PushService.php
	composer.json
	composer.lock
	database/migrations/2014_05_17_175626_add_quotes.php
	database/seeds/UserTableSeeder.php
	resources/lang/en/texts.php
	resources/views/accounts/customize_design.blade.php
	resources/views/accounts/invoice_design.blade.php
	resources/views/accounts/management.blade.php
	resources/views/expenses/edit.blade.php
	resources/views/header.blade.php
	resources/views/invoices/edit.blade.php
	resources/views/master.blade.php
	resources/views/payments/payment.blade.php
	resources/views/users/edit.blade.php
 2016-07-11 23:33:58 +03:00
Hillel Coren
243005b667 Prevent expense or task invoice item from creating a product 2016-07-11 20:17:41 +03:00
Hillel Coren
986487b4c9 Working on new hosted pricing 2016-07-11 20:08:43 +03:00
Hillel Coren
afb34d1de6 Fix saving task without a client 2016-07-10 13:20:22 +03:00
Hillel Coren
5f8ae65310 Working on expense category permissions 2016-07-07 11:44:15 +03:00
Hillel Coren
cd9aae1e22 Working on expense categories 2016-07-06 21:35:16 +03:00
Hillel Coren
b5f606df47 Added and as email template variables 2016-07-04 21:47:05 +03:00
Hillel Coren
aba50f66dc Added website field to client CSV import 2016-07-04 21:33:50 +03:00
Hillel Coren
251438dc41 Fix for expenseCategories 2016-07-04 20:19:22 +03:00
Hillel Coren
8b14161d0a Fix for expense test 2016-07-04 12:41:44 +03:00
Hillel Coren
6f1776004a Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-04 09:40:06 +03:00
Holger Lösken
0fbda85a59 Code Refactoring 
- Removed unused uses
- Type hinting for method parameters
- Removed commented code
- Introduced comments for classes and methods
- Short array syntax
 2016-07-03 16:19:22 +00:00
Hillel Coren
d2c0003ec9 Fix for should be invoiced option on expense 2016-07-03 16:20:10 +03:00
Hillel Coren
3025fb3f0b Merge pull request #938 from codedge/#426-Translate-hardcoded-string 
Fix hardcoded translations for industry, country and payment types
 2016-07-03 13:16:20 +03:00
Hillel Coren
32a2f6cdc7 Fix for #920 2016-07-03 12:33:35 +03:00
Holger Lösken
337ed1c719 - Fix #426, closes #426 
- Moved translations for industries, countries into texts.php
- Removed nested arrays in texts.php
 2016-07-03 09:26:08 +00:00
Holger Lösken
b13b9a2d7d Fix hardcoded translations for industry, country and payment types 
- Fixes #426, resolves #426
 2016-07-03 09:24:55 +00:00
Hillel Coren
fbdabdee64 Minor formatting change 2016-06-30 21:05:02 +03:00
Holger Lösken
3d3aab41e0 Fixed wrong translation name, need to include the file "texts." 2016-06-30 15:23:45 +02:00
Holger Lösken
1717028d36 Fixed wrong translation name, need to include the file "texts." 2016-06-30 15:21:03 +02:00
Holger Lösken
ae78a177b0 Fix #562 
Make „Manual entry“ translatable
 2016-06-30 14:38:55 +02:00
Hillel Coren
c1713c190c Fix for go pro process 2016-06-28 21:21:54 +03:00
Hillel Coren
d71cf4dd49 Payment fixes 2016-06-26 19:38:36 +03:00
Hillel Coren
15781ff895 Payment token fixes 2016-06-26 13:45:50 +03:00
Hillel Coren
7c0875841a Fixed autobill message in emails 2016-06-26 12:59:42 +03:00
Hillel Coren
45fce3bfe9 Payment webhook fixes 2016-06-24 18:15:51 +03:00
Hillel Coren
406249ef95 Payment webhook fixes 2016-06-24 15:40:10 +03:00
Hillel Coren
d71017e203 Payment webhook bug fixes 2016-06-23 20:17:02 +03:00
Hillel Coren
74a0deb07e Web hook bug fixes 2016-06-23 16:27:54 +03:00
Hillel Coren
6ad49cf281 Fixing payment hooks 2016-06-23 16:15:52 +03:00
Hillel Coren
e36d23fcdc API changes for Zapier 2016-06-23 12:39:07 +03:00
Hillel Coren
725522ea21 API changes for Zapier 2016-06-23 12:38:06 +03:00
Hillel Coren
93c3521952 Improve check for duplicate gateways 2016-06-22 21:42:09 +03:00
Hillel Coren
e2ddabe95d Minor fixes for payments 2016-06-22 12:22:38 +03:00
Hillel Coren
c9a19cbd76 Fixes for WePay 2016-06-21 19:10:22 +03:00
David Bomba
e540e98c80 Add company logo_url to UserAccount Transformer 2016-06-21 19:50:26 +10:00
Hillel Coren
3e068be315 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-21 12:31:47 +03:00
David Bomba
aa3e8e7c67 Merge pull request #924 from turbo124/develop 
Add company logo to UserAccount Transformer
 2016-06-21 19:23:17 +10:00
David Bomba
851b3e963c Add company logo to UserAccount Transformer 2016-06-21 19:21:50 +10:00
Hillel Coren
a2c7a0c12f Improvement to Eway payment process 2016-06-21 12:07:16 +03:00
Hillel Coren
b06b437e27 Fix for tests 2016-06-20 22:26:48 +03:00
Hillel Coren
12b754dc32 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-20 17:14:57 +03:00
Hillel Coren
5ff69c6f29 Payments refactor 2016-06-20 17:14:43 +03:00
David Bomba
5fdfa8c466 Add logo into Transformer 2016-06-18 17:56:09 +10:00
David Bomba
abafc4ce6f typo 2016-06-13 20:29:43 +10:00
David Bomba
fedbd74319 Integrating Expense categories into API 2016-06-13 20:18:30 +10:00
David Bomba
7237f25cba Expense Category Transformer 2016-06-13 20:05:28 +10:00
Hillel Coren
5489ade5ff Fix for tests 2016-06-07 14:40:54 +03:00
Hillel Coren
f4fcc81871 Fix for tests 2016-06-07 14:39:53 +03:00
Hillel Coren
80202b6d92 Added support for searching by invoice number in the API 2016-06-06 19:04:57 +03:00
Hillel Coren
d032ae00fc Added support for searching by invoice number in the API 2016-06-06 19:04:24 +03:00
Hillel Coren
85d94b5a36 Minor fixes 2016-06-05 19:11:37 +03:00
Hillel Coren
5c7a15ff83 Minor fixes 2016-06-05 19:10:15 +03:00
Hillel Coren
a7f92d0726 Merge pull request #901 from joshuadwire/wepay-integration 
Wepay integration
 2016-06-03 11:20:31 +03:00
Hillel Coren
619938bc72 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-02 22:04:12 +03:00
Hillel Coren
0acf4ff1fc Support importing JSON file 2016-06-02 22:03:59 +03:00
Joshua Dwire
49d47bb9e3 Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-06-01 16:46:03 -04:00
David Bomba
8b781746fe Update DocumentTransformer.php 2016-06-01 21:36:27 +10:00
David Bomba
7073343756 Update DocumentTransformer.php 2016-06-01 21:35:53 +10:00
Hillel Coren
17eb2a7a79 Support saving invoice_id and expense_id with the document 2016-06-01 12:39:42 +03:00
Hillel Coren
1760d0e0e4 Prevent converting a qoute from incrementing the counter 2016-06-01 10:58:03 +03:00
Hillel Coren
51d9b2b427 Prevent converting a qoute from incrementing the counter 2016-06-01 10:56:44 +03:00
Hillel Coren
e6a05509b1 Enabled importing products 2016-05-31 23:16:05 +03:00
Hillel Coren
42ac9507e5 Enabled importing products 2016-05-31 23:15:55 +03:00
Hillel Coren
2f3c309d41 Remove fallback support for dropzone 2016-05-30 11:51:41 +03:00
Hillel Coren
d175fc872a Don't render pdf if not attached and fix typo 2016-05-29 19:32:45 +03:00
Hillel Coren
a9302d4d01 Fixes for is_quote 2016-05-29 15:34:44 +03:00
Hillel Coren
59d0a1cb80 Fix to support mobile app 2016-05-29 14:22:25 +03:00
Hillel Coren
cca6dcfc4a Merge pull request #878 from benb969/invoices_types 
add support to multiple invoice types
 2016-05-29 12:21:57 +03:00
ben
dadac05532 add support to multiple invoice types 2016-05-29 12:02:44 +03:00
Joshua Dwire
1c119fe35a ACH autobill bug fixes 2016-05-26 15:22:09 -04:00
Hillel Coren
7599edbc8c Fixed date formatting in document list 2016-05-26 18:28:36 +03:00
Hillel Coren
0da3741b56 Fixed date formatting in document list 2016-05-26 18:28:13 +03:00
Joshua Dwire
c9f00274b1 Support storing WePay bank tokens 2016-05-25 15:04:58 -04:00
Hillel Coren
afd7b7ed38 check document completed upload before user submitted form 2016-05-25 21:44:06 +03:00
Hillel Coren
85184f9a5b check document completed upload before user submitted form 2016-05-25 21:42:22 +03:00
Joshua Dwire
9d4b42a514 Mention in the invoice notification that the invoice will be auto billed on the due date 2016-05-24 23:14:19 -04:00
Joshua Dwire
a5fdb88d79 Add support for auto bill on due date 2016-05-24 22:49:06 -04:00
Joshua Dwire
f8835268b4 Update DB structure 2016-05-24 14:16:42 -04:00
Joshua Dwire
5958cd2c5e Don't request update URI from WePay 2016-05-24 13:04:55 -04:00
Hillel Coren
406df6f3d8 Fix for payment datatable list 2016-05-23 21:10:40 +03:00
Hillel Coren
b2beb8fb73 Updated vendors to new datatable class 2016-05-23 21:07:06 +03:00
Hillel Coren
541b19cd5f Updated vendor expenses to new datatable class 2016-05-23 21:03:01 +03:00
Hillel Coren
e7bf0599db Separated out entity datatable classes 2016-05-23 19:52:20 +03:00
Hillel Coren
4b1b80886d Implemented base entity presenter 2016-05-23 12:26:08 +03:00
Hillel Coren
86240affab Show company name in client portal dashboard activities 2016-05-23 09:02:31 +03:00
Hillel Coren
4aa11be28f Added user permission to tranformer 2016-05-22 22:02:42 +03:00
Hillel Coren
371f224c24 Minor fixes for invoice export 2016-05-22 20:01:37 +03:00
Hillel Coren
990ba1a89c Merge pull request #881 from turbo124/develop 
Include Documents in Invoice transformer
 2016-05-19 10:57:28 +03:00
Hillel Coren
6caf1ff30d Minor fixes 2016-05-19 09:47:57 +03:00
David Bomba
2034c11795 Include Documents in Invoice transformer 2016-05-19 09:43:03 +10:00
Hillel Coren
3ed5fdf09f Disabled iOS push notifications by default 2016-05-17 14:36:12 +03:00
Hillel Coren
38866ff6f0 Disabled iOS push notifications by default 2016-05-17 14:35:16 +03:00
Hillel Coren
a82437b2bc Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 
Conflicts:
	app/Http/routes.php
	resources/lang/en/texts.php
 2016-05-16 11:34:00 +03:00
Joshua Dwire
f6942a199f Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-15 21:21:59 -04:00
Hillel Coren
3df6ad2529 Changes to support transifex.com 2016-05-15 23:16:08 +03:00
Joshua Dwire
d99d81d655 Make autobill setting numbers match token settings 2016-05-14 23:15:22 -04:00
Joshua Dwire
947cb4a6f7 Better WePay configuration support 2016-05-14 17:23:20 -04:00
Hillel Coren
f873998e22 Simplified reseller setup 2016-05-13 12:23:13 +03:00
Joshua Dwire
88c9fc1ac1 Add WePay configuration UI 2016-05-11 22:55:37 -04:00
David Bomba
e738a58a42 Merge pull request #858 from turbo124/develop 
Permissions fields for Invoice Transformer
 2016-05-12 08:29:55 +10:00
Joshua Dwire
41f4c98e08 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 10:25:42 -04:00
David Bomba
050b79cc75 user transformer - add fields 2016-05-10 09:26:44 +10:00
David Bomba
e795ac28cd Merge remote-tracking branch 'upstream/develop' into develop 2016-05-10 09:26:15 +10:00
Joshua Dwire
20f6f32a06 Update UI for configuring auto bill 2016-05-09 16:29:02 -04:00
David Bomba
dbdd1ac155 working with permissions 2016-05-09 10:28:47 +10:00
David Bomba
5233047ab1 working with permissions 2016-05-09 10:09:51 +10:00
David Bomba
985c4eda34 working with permissions 2016-05-09 10:02:15 +10:00
David Bomba
f6abdedfac User Transformer permissions 2016-05-09 09:54:40 +10:00
Hillel Coren
9b0f086cbd Only show user’s own tokens 2016-05-08 21:50:35 +03:00
Hillel Coren
fec948f1e8 Fixed searching for non-admins 2016-05-08 21:29:49 +03:00
Hillel Coren
7c67e66fb0 Sync ninja client when updating plan 2016-05-08 15:37:32 +03:00
Hillel Coren
eff9ba5ac0 Merge pull request #846 from Rayvw/feature/improve-dynamic-dates 
Improved dynamic dates of recurring invoices
 2016-05-08 11:20:18 +03:00
Hillel Coren
89b5d73615 Fix for loading tokens 2016-05-08 10:05:16 +03:00