Hillel Coren
fa5cb690ba
Merge branch 'master' of github.com:invoiceninja/invoiceninja
2020-02-23 12:01:50 +02:00
Hillel Coren
cf873bd197
Fix for calculate payouts
2020-02-23 12:01:37 +02:00
Benjamin Beganović
9085a27361
Export 'documents' ( #3343 )
...
* Export 'documents'
* Export 'invoice_id' & 'expense_id' with documents
* Code cleanup
2020-02-19 07:53:38 +11:00
David Bomba
2a8d2c7f5e
additional fixes for Checkout
2020-02-17 06:52:00 +11:00
David Bomba
ac11681073
fixes for checkout.com ( #3336 )
2020-02-16 17:41:00 +11:00
WillieWookiee
1ab5bc1f6b
Fixing cancel button. ( #3309 )
...
This fix addresses a bug where if you create a quote and then go into the client portal to add a credit card, the cancel button will take you back to the first quote of the client regardless if it is a draft or not. This will now take you back to the previous page.
2020-02-12 07:53:06 +11:00
Benjamin Beganović
6defaebf34
Export settings with company array ( #3264 ) ( #3268 )
2020-01-30 14:34:58 +11:00
Hillel Coren
ae8457c588
Fix for postmark logs
2020-01-28 19:53:59 +02:00
Benjamin Beganović
e31ab11364
Export contacts with client array ( #3251 )
2020-01-28 07:54:54 +11:00
David Bomba
24daf955d8
Fix taxes ( #3246 )
2020-01-25 14:19:22 +11:00
David Bomba
c2dfc3055c
Remove last_login from migration array of clients
2020-01-24 13:17:51 +11:00
Benjamin Beganović
b67b97430c
Export data for the migration (master) ( #3239 )
...
* Scaffold migration controller & steps
* - Basic controller scaffold
- Intro step
- Downloading data
* Import step for the v2
* Export file using account_key property
* Fix button displaying
* Client export mappings
* Company export mappings
* Add withTrashed() for clients
* Export users mappings
* Export invoices mappings
* Export company properties as array
* add withTrashed() for invoices
* Downloading the json file
* Fix 'account_id' for company export
- Code cleanup & leftovers
* Creating zip for logo & storing json as file (wip)
* Zipping & sending migration files (wip)
* Exporting & mappings for quotes
* Re-enable headers for downloading
* Mappings for tax rates
* Mappings for the products
* Fix formattings & php doc messages
* Bring back headers for downloading
* Export 'company_id', 'user_id' with clients
* Export 'id' with users resource
* Remove unused parameter
* Export mappings for payments
* Export 'line_items' with invoices
* Export credits & export client id
* Export 'credits' within main JSON
* Mappings for line_items
* Fix 'is_amount_discount' for invoice export
* Exporting migration file as .zip archive
* Improve settings card for migration
* Removed duplicated keys in texts.php for en
* Fix formatting in en/texts.php
* Integrate the migration part with rest of UI
* Export company as object, not array
* Clean up
* Fixes for V1
* Apply formatting
* Remove comments
- Added 'ext-zip' in composer.json
- Fixed $credits transform
* Remove unused params
Co-authored-by: David Bomba <turbo124@gmail.com>
2020-01-24 07:34:30 +11:00
trevDev()
0dfaf043bf
allow scrolling in time-tracker task form ( #3211 )
2020-01-15 21:24:28 +10:00
Hillel Coren
6b4d8fba4a
Update check data
2019-12-22 10:16:22 +02:00
Hillel Coren
e702f24937
Merge branch 'master' of github.com:invoiceninja/invoiceninja
2019-12-22 08:54:22 +02:00
Hillel Coren
d9d949666f
Update prices
2019-12-22 08:54:13 +02:00
David Bomba
755c1f75d1
Fix for Istanbul timezone ( #3164 )
2019-12-19 21:51:23 +11:00
Hillel Coren
8a5621396b
Add IP exception
2019-12-15 14:33:46 +02:00
Hillel Coren
618743ea1a
Update version
2019-12-03 11:53:50 +02:00
Hillel Coren
69e8f9a2f3
Minor fixes
2019-12-03 11:50:38 +02:00
Hillel Coren
17c36b351d
Minor fixes
2019-12-03 11:27:30 +02:00
Hillel Coren
893d200e2c
Merge branch 'master' of github.com:invoiceninja/invoiceninja
2019-11-20 08:43:14 +02:00
Hillel Coren
a9b511738f
Import currency fix
2019-11-20 08:43:05 +02:00
David Bomba
2ec4d6702c
Fix for regression ( #3070 )
2019-11-14 22:07:23 +11:00
Hillel Coren
202d644d53
Update lang files
2019-11-04 11:01:18 +02:00
Hillel Coren
6ebc492454
Update lang files
2019-10-27 11:53:22 +02:00
Hillel Coren
22bc25253e
Merge branch 'master' of github.com:invoiceninja/invoiceninja
2019-10-27 11:41:28 +02:00
Hillel Coren
5959eb8eb5
Minor fixes
2019-10-27 11:41:19 +02:00
Hillel Coren
0524ac764d
Merge pull request #3011 from dicarlosystems/allow-mtrans-to-replace
...
Allow module trans helper to replace values (#3006 )
2019-10-23 16:33:12 +03:00
Christopher Di Carlo
e6e690b32f
Allow module trans helper to replace values ( #3006 )
2019-10-23 07:17:48 -04:00
Hillel Coren
e763a2b233
Update lang files
2019-10-06 12:25:40 +03:00
Hillel Coren
29ed0dd94b
Bug fixes
2019-09-29 12:28:34 +03:00
Hillel Coren
fbb5826178
Duplicate payments
2019-09-29 12:02:30 +03:00
Hillel Coren
0054616020
Update GrapesJS
2019-09-29 10:27:15 +03:00
Hillel Coren
416da8b98d
Merge pull request #2952 from joshuadwire/master
...
Upgrade to Laravel 5.5 and PHP 7.3
2019-09-15 12:23:45 +03:00
Joshua Dwire
8ce81d15ba
Upgrade modules and debugbar dependencies
2019-09-14 14:37:51 -04:00
Joshua Dwire
f222390ce8
Upgrade to Laravel 5.5 and PHP 7.3
2019-09-12 19:30:10 -04:00
Hillel Coren
49c4aa6a75
Updated readme
2019-09-05 12:14:33 +03:00
Hillel Coren
d6f2859d3d
Merge branch 'master' of github.com:invoiceninja/invoiceninja
2019-09-05 07:14:50 +03:00
Hillel Coren
c0300c9e0d
Update docs
2019-09-05 07:14:40 +03:00
Hillel Coren
36290336c3
Merge pull request #2944 from joshuadwire/master
...
Fix support for currencies with varying precisions
2019-08-30 10:56:32 +03:00
Joshua Dwire
20c12533f8
Fix support for currencies with varying precisions
2019-08-29 17:15:58 -04:00
Hillel Coren
34600446d9
Update lang files
2019-08-29 13:18:02 +03:00
Hillel Coren
96991da621
IAP
2019-08-29 13:12:27 +03:00
Hillel Coren
a4a757f288
Fix for ninja Stripe payments
2019-08-29 13:10:09 +03:00
Hillel Coren
0ee357e97a
In app purchase
2019-08-28 10:14:05 +03:00
Hillel Coren
c1fa41ee30
Update lang file
2019-08-20 22:05:14 +03:00
Hillel Coren
195074a4b0
Working on tests
2019-08-12 12:09:40 +03:00
Hillel Coren
790a2a8a2d
Merge branch 'master' of github.com:invoiceninja/invoiceninja
2019-08-12 12:01:43 +03:00
Hillel Coren
16623103cd
Working on tests
2019-08-12 12:01:34 +03:00
