1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-16 16:13:20 +01:00
Commit Graph

1081 Commits

Author SHA1 Message Date
Benjamin Beganović
3cf168d67d Update classes for mobile PDF viewing (proper hiding cases) 2021-03-03 08:51:32 +01:00
Benjamin Beganović
fe2bfc3c84 Change default scale to .75 for mobile PDF viewing 2021-03-03 08:51:10 +01:00
=
c23b9b147d Fixes for attaching a user to different companies 2021-03-03 18:22:14 +11:00
Benjamin Beganović
dd71f28f87 Invoices: Removed superfluous text under the invoice number 2021-03-02 18:30:44 +01:00
Benjamin Beganović
9b227010b2 Quotes: Remove "drafts" 2021-03-02 18:29:44 +01:00
Benjamin Beganović
51be97d981 - Quotes: Waiting for approval -> Pending Approval
- Quotes: Remove superfluous text under Waiting for approval
2021-03-02 16:29:24 +01:00
Benjamin Beganović
4f95e39c28 Credits table: Add credit number column 2021-03-02 16:27:06 +01:00
Benjamin Beganović
168f08abba Credits table: Public notes -> Notes 2021-03-02 16:24:15 +01:00
Benjamin Beganović
9278c1966a Add example URL for the Website field in the client portal settings page 2021-03-02 16:22:40 +01:00
Benjamin Beganović
05118ad880 Client profile settings page: Remove sub-instructional text 2021-03-02 16:20:27 +01:00
Benjamin Beganović
f27645062c Add "Secure 256-Bit Encryption" on the payment pages 2021-03-02 15:53:13 +01:00
Benjamin Beganović
463f16d14a Update the invoice terms label text (By clicking "Next step" you accept terms -> Click "Agree" to accept terms) 2021-03-02 15:32:20 +01:00
Benjamin Beganović
d96d2887c6 Hipster: Push the company logo to top right edge 2021-03-02 14:40:43 +01:00
Benjamin Beganović
5870d8c241 Modern: Add borders between header columns (for product, tasks & delivery notes table) 2021-03-02 14:28:33 +01:00
Benjamin Beganović
cb0231a1ec Business: Reduce padding in client & company details section 2021-03-02 14:06:42 +01:00
Benjamin Beganović
dfee4d718b Change "Overdue" to "Past due" in invoices table 2021-03-02 13:43:41 +01:00
Benjamin Beganović
4992da6270 Highlight & make links in terms pop up clickable 2021-03-02 13:42:25 +01:00
Benjamin Beganović
8254aa231b E-mails: Replace primary-color variable with real value 2021-02-22 11:32:52 +01:00
Benjamin Beganović
7990ca22ec Centralize "Pay now" button 2021-02-18 13:37:27 +01:00
Benjamin Beganović
40bf73cd9a Remove redundant views 2021-02-18 13:20:26 +01:00
Benjamin Beganović
3cb6d07c20 Change default full-screen view for invoices & quotes:
- New $url property for file_path() for invoices & quotes
- "Full screen" mode now returns raw file
- Show default browser viewer for desktop devices
2021-02-18 13:18:41 +01:00
Benjamin Beganović
b52cb6def1 Fix last_name field 2021-02-17 12:19:16 +01:00
Benjamin Beganović
82412684fa Fix padding & spacing issue for mobile devices 2021-02-17 11:49:21 +01:00
Benjamin Beganović
5ba725d5e4 approve quote with one click, instead of pushing to another page 2021-02-17 11:39:22 +01:00
Benjamin Beganović
6872057207
Merge pull request #4912 from beganovich/v5-1502-client-portal-documents
(v5) Client portal: "Documents" improvements & bug fixes
2021-02-17 11:26:08 +01:00
Benjamin Beganović
deb0cd345a
Merge pull request #4923 from beganovich/v5-1602-invoice-footer-variable-parsing
(v5) PDF: Support for dynamic variables in invoice footer, public notes & terms
2021-02-17 11:25:28 +01:00
Joshua Dwire
10462cdeb4 Merge remote-tracking branch 'origin/v5-develop' into v5-develop
# Conflicts:
#	resources/views/email/import/completed.blade.php
2021-02-16 18:20:27 -05:00
Benjamin Beganović
001b6902f2 wip 2021-02-16 14:42:35 +01:00
Benjamin Beganović
e7e65e128a wip 2021-02-16 13:24:09 +01:00
Benjamin Beganović
22bd29f8fc wip 2021-02-16 13:16:22 +01:00
Benjamin Beganović
aacc3b6602 wip 2021-02-15 15:52:13 +01:00
Benjamin Beganović
63060cd878 Stripe: Show required fields if enabled in admin panel 2021-02-15 14:58:25 +01:00
Benjamin Beganović
f8403addd6 fix endless for -1 2021-02-15 13:21:52 +01:00
David Bomba
4ff96c0f58
Merge pull request #4908 from turbo124/v5-develop
Refactoring emails
2021-02-15 22:40:12 +11:00
David Bomba
120d2c21ab Refactor password reset for admin users 2021-02-15 10:39:40 +11:00
David Bomba
71d643070b Update texts 2021-02-15 07:55:09 +11:00
Joshua Dwire
ac99b0039d Import functionality updates 2021-02-12 19:20:15 -05:00
Benjamin Beganović
72cdc3fc5c Hide payment methods button if not gateways 2021-02-12 12:38:31 +01:00
Benjamin Beganović
9bc03ced3b show favicon if no whitelabel 2021-02-11 14:26:37 +01:00
Benjamin Beganović
4969b32ccd Add target=_blank to social links 2021-02-11 14:21:58 +01:00
Benjamin Beganović
c4d5004df8
Merge pull request #4868 from beganovich/v5-0902-design-updates
(v5) PDF design updates
2021-02-10 13:51:24 +01:00
Benjamin Beganović
6607442740 wip 2021-02-10 12:31:14 +01:00
David Bomba
7981093d97 Working on migration email notifications 2021-02-10 17:08:16 +11:00
David Bomba
313488dc60 Working on handling check data within migrations" 2021-02-10 12:59:30 +11:00
Benjamin Beganović
d8c6d40cab wip 2021-02-09 16:47:41 +01:00
Benjamin Beganović
e13bebf5e7 Change quotes.balance to quotes.amount in quotes table & approve page 2021-02-09 11:50:26 +01:00
Benjamin Beganović
91e9321049 wip 2021-02-05 13:06:47 +01:00
Benjamin Beganović
66c81d9b51 wip 2021-02-04 17:19:28 +01:00
David Bomba
d347a344ba Texts upate 2021-02-04 13:24:54 +11:00
Benjamin Beganović
aec701040a
Merge pull request #4828 from beganovich/v5-0302-cypress-checkout
(v5) Fixes & tests for gateways
2021-02-03 17:02:09 +01:00
Benjamin Beganović
6a972ba378 wip 2021-02-03 16:49:29 +01:00
David Bomba
fc79835ed6
Merge pull request #4825 from turbo124/v5-develop
Working on migrations.
2021-02-03 23:30:31 +11:00
Benjamin Beganović
83a42cf410 wip 2021-02-03 12:36:10 +01:00
David Bomba
d26e347d6d Working on migrations 2021-02-03 10:59:58 +11:00
David Bomba
7711a21429
Merge pull request #4820 from turbo124/v5-develop
Generic payment failure notifications.
2021-02-03 09:26:16 +11:00
Benjamin Beganović
862bbec4f5 -1 to ♾ 2021-02-02 14:59:10 +01:00
=
545ebd40dd Fixes for generic blade 2021-02-02 21:45:21 +11:00
David Bomba
1797cac1a9 Refactoring email 2021-02-02 16:11:33 +11:00
David Bomba
2474507790 Working on generic payment failure notification 2021-02-02 12:04:52 +11:00
David Bomba
5bc8f4d1dc Fixes for texts 2021-02-01 21:07:00 +11:00
David Bomba
6e8b876ec5 Update lang files 2021-02-01 09:01:19 +11:00
David Bomba
d48756ea79 Improvements to migration email 2021-01-31 16:07:45 +11:00
David Bomba
2190aadf9e minor fixes for texts 2021-01-29 07:44:56 +11:00
Benjamin Beganović
5c3ee01663
Merge pull request #4777 from beganovich/v5-2701-checkout-disable-submit-while-request
(v5) Checkout: Disable submit button while sending backend request
2021-01-28 15:45:25 +01:00
Benjamin Beganović
e2d1c7ac43
Merge pull request #4778 from beganovich/v5-2701-ach-blank-screen
(v5) ACH: Fix blank screen after payment
2021-01-28 15:45:14 +01:00
Benjamin Beganović
3b31953d14
Merge branch 'v5-develop' into v5-2701-payable-draft-invoices 2021-01-28 15:44:22 +01:00
Benjamin Beganović
615ef1e780 Allow payments of draft invoices:
- Remove processing overlay scripts
- Add flash message to clean layout
- Remove $balance > 0 check from filtered invoices
- Only show the payment methods if total is bigger than 0
- Change flash message from "warning" to "message"
- Show message for $1 payments
2021-01-27 14:10:24 +01:00
Benjamin Beganović
0ff531fafa ACH: Fix white screen
- Pass token hashed_id instead of token value
2021-01-27 13:07:01 +01:00
Benjamin Beganović
11ac939571 Checkout: Disable submit button while sending backend request 2021-01-27 12:57:05 +01:00
Benjamin Beganović
84e888863f Authorize.net: Throw a PaymentFailed exception if token not found
Checkout.com: Throw a PaymentFailed exception if token not found
- Show "Client portal" button even when invoice is paid
- Authorize.net: Pass token hashed_id instead of token to frontend
- Checkout.com: Pass token hashed_id instead of token to frontend
- Show "Paid" label for paid invoices
- Translation for not found token
2021-01-27 12:45:38 +01:00
David Bomba
d492d6c12f
Merge pull request #4774 from turbo124/v5-develop
Payment notifications for autobilling
2021-01-27 21:57:16 +11:00
Benjamin Beganović
e6b6175ee5
Merge pull request #4770 from beganovich/v5-2601-show-save-card-programatically
(v5) Show save card if token billing isn't always
2021-01-27 11:55:18 +01:00
David Bomba
cf0e086d2a Reduce test data client numbers 2021-01-27 20:57:12 +11:00
David Bomba
af47c504e4 Working on payment failed emails 2021-01-27 19:45:55 +11:00
Benjamin Beganović
9f8df64289 - Only show save card component if token billing isn't always
- Only show "Refunded" if amount is > 0
- Stripe: Grab only :checked checkbox
2021-01-26 17:21:12 +01:00
Benjamin Beganović
792db3c262 acceptjs errors 2021-01-26 14:31:52 +01:00
Benjamin Beganović
0f638ff2c3 Hide "save card" section when paying with token 2021-01-26 13:55:32 +01:00
Benjamin Beganović
d537d012a1 fix instance 2021-01-26 13:29:27 +01:00
Benjamin Beganović
64e6dad248
Merge branch 'v5-develop' into v5-2001-gateways-and-new-tokens 2021-01-25 16:47:58 +01:00
Benjamin Beganović
fb66bfbe71 wip 2021-01-25 16:46:40 +01:00
Benjamin Beganović
f5f257292c wip 2021-01-25 16:12:21 +01:00
David Bomba
6540a25531 Refactor client numbering 2021-01-25 21:34:12 +11:00
David Bomba
269f83f317 Translations 2021-01-25 11:57:49 +11:00
David Bomba
af19afedb5 Translations 2021-01-25 10:04:50 +11:00
David Bomba
a0d0c77630 translations 2021-01-25 09:24:13 +11:00
David Bomba
c4db674fae Translate migration email 2021-01-25 08:08:29 +11:00
=
04d1a43dfe Remove strings and replace with translations 2021-01-24 22:48:09 +11:00
Benjamin Beganović
4930b7b658 wip 2021-01-22 22:49:26 +01:00
Benjamin Beganović
713a95d3b2 ACH (Stripe):
- Pass instance of $gateway to authorize page for fields  verification
- Support for multiple tokens
2021-01-21 15:53:37 +01:00
Benjamin Beganović
056bee1c47 Credit card (Stripe):
- Wrapped Stripe card widget into div
- Default intent option is setup_future_use now
- Support for token billing
2021-01-21 14:03:38 +01:00
Benjamin Beganović
f27f5f8e97 remove from passed data 2021-01-21 10:41:05 +01:00
David Bomba
62bc55cf0b Fixes for client authentication to client portal 2021-01-21 10:01:13 +11:00
David Bomba
cb959fd3a3
Merge branch 'v5-develop' into v5-develop 2021-01-21 07:58:58 +11:00
Benjamin Beganović
2fccfe2df1 - Rewrite of checkout-credit-card.js
- Fixed bug with detach() on driver class
- Changed the way token checking works from frontend
- Support for multiple payment methods on payment page
- Changed save card label to "Save payment method details"
- Updated relevant Javascript assets
2021-01-20 16:19:01 +01:00
Benjamin Beganović
c4defd55d8 Change quotes terminology:
- Changed "balance" to "amount" in approve page & quotes-table
2021-01-20 13:32:49 +01:00
Benjamin Beganović
e5c7fc4416 E-mail improvements:
- Removed injection of Tailwind CSS in the TemplateEngine.php
- Removed tailwindcss@1.4.6.css & tailwind-1.2.0.css
- Updated master template of e-mails for greeting, signature & footer sections
- Updated generic template for emails
- Updated footer (clean up)
- Fixed EntitySentObject.php class name
- Removed css-inliner.php config file
- Updated button component for e-mails
2021-01-20 13:18:17 +01:00
David Bomba
ea20c55468
Merge pull request #4726 from louis-lau/v5-fix-smtp-tls-wording
Fix mail TLS options wording
2021-01-20 20:15:36 +11:00
Benjamin Beganović
52d4911042
Merge pull request #4723 from beganovich/v5-1901-cp-messages
(v5) Client portal: Set a background & center a header message
2021-01-20 09:54:29 +01:00
David Bomba
a021bd83d9 Clean up emails 2021-01-20 14:49:22 +11:00
David Bomba
92e5465679 Entity mail failure email 2021-01-20 12:59:39 +11:00
David Bomba
656d7941cb
Merge pull request #4727 from turbo124/v5-develop
Fixes for Migration
2021-01-20 09:41:53 +11:00
Louis Laureys
50ec039f3e Fix mail TLS options wording 2021-01-19 21:31:39 +01:00
Benjamin Beganović
4413580b39 Add authorize view for SOFORT 2021-01-19 16:07:58 +01:00
Benjamin Beganović
c1bf3e5044 double-check 2021-01-19 15:27:35 +01:00
Benjamin Beganović
ee8e75e8f7 Set a background & center a header message 2021-01-19 15:23:10 +01:00
Benjamin Beganović
617cc54de9 - Pass instance of AuthorizePaymentDriver.php as $gateway instead of CompanyGateway record
- Define required fields for AuthorizePaymentDriver.php
- Update references to $gateway (CompanyGateway)
- Pass $countries to required-client-info.blade.php
- Handle country submission for required-client-info.blade.php
- Only show non-filled fields in RequiredClientInfo.php
2021-01-19 14:36:07 +01:00
Benjamin Beganović
8ed701519b Change views to authorize.blade & pay.blade
Change structure to use the new one
Add $data to pay now button
2021-01-19 14:03:18 +01:00
Benjamin Beganović
6295a2647d refactor authorize.blade.php 2021-01-19 13:43:03 +01:00
Benjamin Beganović
bc8d77fec2 design fixes 2021-01-19 12:37:27 +01:00
Benjamin Beganović
b8d8f977cc Update e-mail templates
Removed fedeisas/laravel-mail-css-inliner
2021-01-19 11:05:47 +01:00
David Bomba
cfbf6e8f4e Working on email failure notifications 2021-01-19 20:16:29 +11:00
Benjamin Beganović
ad76bb561e master 2021-01-18 15:27:32 +01:00
Benjamin Beganović
4c34bc2177 Refactor emails to plain CSS + table structure 2021-01-18 15:25:51 +01:00
Benjamin Beganović
4cfc2384c2 Only show the verification screen if method exists 2021-01-17 23:54:56 +01:00
David Bomba
8c8509ca40
Merge pull request #4703 from turbo124/v5-develop
Refactor alternateSave() in BaseRepo
2021-01-16 08:45:37 +11:00
David Bomba
cbce8c8a46 minor fixes for client portal 2021-01-15 22:19:34 +11:00
Benjamin Beganović
bc584c387c merge upstream/v5-develop 2021-01-15 11:03:40 +01:00
David Bomba
fc6384f051
Merge pull request #4690 from beganovich/v5-0114-design-improvements
(v5) Invoices/quotes design improvements
2021-01-15 08:34:03 +11:00
David Bomba
e9b9ea642c
Merge pull request #4686 from beganovich/v5-0114-show-required-gateway
(v5) Change the way required fields are displayed
2021-01-15 08:33:20 +11:00
Benjamin Beganović
ec80d925a4 change task-duration to task-time-details 2021-01-14 15:58:29 +01:00
Benjamin Beganović
1c5c7250ee Unified margin across designs 2021-01-14 15:57:14 +01:00
Benjamin Beganović
2a193c97ea Show quotes/invoices in full-screen by default 2021-01-14 13:29:46 +01:00
Benjamin Beganović
59fd38fc3d change the way required fields are displayed 2021-01-14 12:24:45 +01:00
Benjamin Beganović
d0000de269 add todo 2021-01-14 11:08:15 +01:00
Benjamin Beganović
a5995546bc increase upload space 2021-01-14 10:37:45 +01:00
David Bomba
c49fbedcde Add entity number to header on client portal 2021-01-14 13:57:05 +11:00
David Bomba
435365b32b Add youtube channel to client portal 2021-01-14 13:43:08 +11:00
David Bomba
a140870473 Clean up dashboard message 2021-01-14 08:17:47 +11:00
David Bomba
ee85a6487c
Merge pull request #4670 from beganovich/v5-jan12-required-fields
(v5) Required fields for gateways
2021-01-14 07:55:27 +11:00
David Bomba
cfc8c248cd
Merge pull request #4678 from beganovich/v5-0113-fix-authorize
(v5) Fix Authorize.net
2021-01-14 07:55:18 +11:00
David Bomba
c7375decf3
Merge pull request #4679 from beganovich/v5-0113-show-refunded-amount
(v5) Client portal: Show refunded amount
2021-01-14 07:54:33 +11:00
David Bomba
eebfa3e949
Merge pull request #4677 from beganovich/v5-0113-fullscreen-invoices
(v5) Change default view for invoices as full-screen
2021-01-14 07:54:12 +11:00
Benjamin Beganović
d1e3f8f274 show refunded amount 2021-01-13 16:20:19 +01:00
Benjamin Beganović
0c91226352 fix authorize 2021-01-13 15:36:28 +01:00
Benjamin Beganović
6526e5e378 Show default view as full-screen for invoices 2021-01-13 14:46:41 +01:00
Benjamin Beganović
0d0e3510db fix issue with button 2021-01-13 14:31:28 +01:00
Benjamin Beganović
b014aecc7d - Add getClientRequiredFields in BaseDriver.php
- Pass $fields in @required-client-info
- Don't show form if fields are satisfied
- Remove $gateway reference in RequiredClientInfo.php
- StripePaymentDriver.php required fields
- Removed old-redirect logic for required fields
2021-01-13 13:31:00 +01:00
David Bomba
c18c9e5a66 Update copyright + remove minor text from footer 2021-01-13 19:22:36 +11:00
David Bomba
75081cf95a Fix for displaying company logo in portal 2021-01-13 18:32:35 +11:00
David Bomba
eb7cee706d Fixes for displaying company logo in email templates 2021-01-13 12:22:23 +11:00
David Bomba
249c0e8b2b fix for presenting company logo in portal 2021-01-13 12:15:04 +11:00
Benjamin Beganović
cdd62f7e2a wip 2021-01-12 16:23:39 +01:00
Benjamin Beganović
ff3ee60cf9 wip 2021-01-12 15:43:07 +01:00
Benjamin Beganović
9b9c9434db - Show currency on the invoices/payment page
- Disable form submitting with enter
2021-01-11 15:34:46 +01:00
David Bomba
13420a93b9 Fixes for validation 2021-01-08 21:19:26 +11:00
Benjamin Beganović
e1df465883 Show the message if invoice is unpayable 2021-01-06 14:22:48 +01:00
David Bomba
3ee3f67c8c Fixes for over payments 2021-01-06 16:14:20 +11:00
David Bomba
5fc9a89009
Merge pull request #4625 from beganovich/v5-fix-issue-with-remaining-cylces
(v5) Show endless for recurring invoices with -1 cycles
2021-01-05 09:16:06 +11:00
Benjamin Beganović
cb928833c5 Show endless for recurring invoices with -1 cycles 2021-01-04 14:24:30 +01:00
Benjamin Beganović
b266def75b Remove debug from the setup page 2021-01-04 13:42:31 +01:00
Benjamin Beganović
14efcc77e6 Support for database port on the setup 2021-01-04 13:36:47 +01:00
David Bomba
15b2ee6642 Add additional mimes 2021-01-04 21:49:28 +11:00
David Bomba
ad57469ee4 Flutter Service Worker 2021-01-04 20:53:58 +11:00
Benjamin Beganović
0e57869a15
Merge pull request #4588 from beganovich/v5-app-url-prefix-on-setup
(v5) Require https?://  format for the APP_URL value
2020-12-30 11:05:56 +01:00
Benjamin Beganović
06dbb1dcf2 Break words on e-mail 2020-12-29 15:14:42 +01:00
Benjamin Beganović
6b34bb551f Require https?:// format for the APP_URL value 2020-12-29 11:35:22 +01:00
Benjamin Beganović
77a8771c78 Setup improvements:
- Disable Test PDF button while network request loading
- Return correct public/test.pdf file path
2020-12-24 12:25:22 +01:00
David Bomba
ef9c0d4975
Merge pull request #4555 from turbo124/v5-develop
Fixes for import / texts
2020-12-23 08:38:32 +11:00
=
383d3ab8c1 Fixes for import / texts 2020-12-23 08:38:13 +11:00
Benjamin Beganović
09a5ab4fad Merge remote-tracking branch 'upstream/v5-develop' into v5-amount-with-fee 2020-12-21 12:14:43 +01:00
Benjamin Beganović
7764833037 Update Stripe's amount with fee:
- Update Sofort to support latest architecture for payments
2020-12-21 11:46:10 +01:00
David Bomba
950a057496
Merge pull request #4545 from turbo124/v5-develop
Fix for preview
2020-12-21 20:59:17 +11:00
Benjamin Beganović
2b2c8b5d83 fix setup issue with smtp testing, #4533 2020-12-21 08:45:39 +01:00
David Bomba
309bead374 completed email for import 2020-12-21 13:24:09 +11:00
David Bomba
ea360cead4 Import notifications 2020-12-21 12:52:33 +11:00
David Bomba
2347b9db7a Import notification 2020-12-21 12:16:26 +11:00
David Bomba
23a534ee73 Fixes for seeding countries 2020-12-21 09:47:39 +11:00
Benjamin Beganović
e51b220295 Add a note about PhantomJSCloud 2020-12-16 16:55:33 +01:00
Benjamin Beganović
75b28e8799 Update setup to show step by step before letting user submit everything 2020-12-15 16:10:50 +01:00
Benjamin Beganović
7ccd10adf9 - Change $global-margin to $global_margin to keep consistency
- Update designs accordingly
- Update ChromiumPdf version
- Apply php-cs-fixer
2020-12-15 11:45:04 +01:00
Benjamin Beganović
3b5c592f25
Merge pull request #4492 from beganovich/v5-experimental-chromiumpdf-support
Experimental PDF rendering
2020-12-15 10:47:39 +01:00
David Bomba
3c9a8fdd35 Fixes for query filters 2020-12-15 20:38:12 +11:00
Benjamin Beganović
dcd6574b2d Experimental PDF rendering:
- Added experimental flag in ninja.php
- Added experimental rendering in PdfMaker.php
- Added dynamic $global-margin for 1cm/0cm based on PDF method
2020-12-14 17:23:04 +01:00
David Bomba
05f4572454
Merge branch 'v5-develop' into v5-develop 2020-12-14 21:44:01 +11:00
David Bomba
64b9f94299 Working on Import / Export 2020-12-14 21:43:07 +11:00
Benjamin Beganović
e6890e5430
Merge branch 'v5-develop' into v5-custom-payment-driver 2020-12-10 12:40:27 +01:00
Benjamin Beganović
5c776d4911 show custom driver with its label 2020-12-10 12:38:07 +01:00
Benjamin Beganović
37f79247ac remove payment options from custom driver 2020-12-10 12:19:13 +01:00
Benjamin Beganović
d45571d7f9 wip 2020-12-09 15:17:48 +01:00
David Bomba
7ba78cc342 Reduce notification emails to one per entity 2020-12-09 20:52:08 +11:00
David Bomba
6a03bcc546
Merge branch 'v5-develop' into v5-develop 2020-12-09 07:25:16 +11:00
David Bomba
ed3061fa7d Remove html tags from texts 2020-12-09 07:22:35 +11:00
Benjamin Beganović
5d1349393a update designs to suppport entity string 2020-12-08 16:45:24 +01:00
Benjamin Beganović
68a84df0dd prefix all smtp fields with mail_ 2020-12-08 14:29:15 +01:00
Benjamin Beganović
3ffb600117 prefix all db field with db_ 2020-12-08 14:21:00 +01:00
David Bomba
594dda9b65 fixes for delivery notes{ 2020-12-08 20:18:17 +11:00
David Bomba
8107a49677 remove trailing slash from app url 2020-12-08 07:21:08 +11:00
Benjamin Beganović
81a58d89f9 update label for checkout authorization 2020-12-07 10:15:43 +01:00
Benjamin Beganović
1f2c3f2823 update pagination links & apply php-cs-fixer 2020-12-05 14:24:21 +01:00
Benjamin Beganović
3b9e813751 bump alpinejs version 2020-12-05 13:55:29 +01:00
Benjamin Beganović
458e207fe3 fixes for smtp testing on setup 2020-12-03 14:10:40 +01:00
Benjamin Beganović
d84f5bc5bb Fixes for Checkout.com refunding 2020-12-03 13:38:57 +01:00
Benjamin Beganović
00ab670d71 Checkout.com migration to Frames:
- Changed cardToken to token in CreditCard reference
- Updated checkout.com.js
- Added "Pay" translation
- Fix issue with switching between token & credt card
2020-12-02 15:33:43 +01:00
David Bomba
66fc75bb83
Merge pull request #4410 from turbo124/v5-develop
V5 develop
2020-12-02 08:32:45 +11:00
Benjamin Beganović
1a066f2f9f add alias to task searvice from task product 2020-12-01 15:18:48 +01:00
Benjamin Beganović
35fe90fc9f update whitelabeling partials 2020-12-01 14:44:35 +01:00
David Bomba
704ed8349e Fix for flutter path 2020-11-30 21:04:41 +11:00
Benjamin Beganović
2618a1d3b8 add ability to edit client's phone 2020-11-27 12:08:39 +01:00
Benjamin Beganović
372ab5cdd9 fix word-brekaing 2020-11-27 11:38:22 +01:00
Benjamin Beganović
6420abd429
Merge pull request #4366 from beganovich/v5-fix-confirmation-page
(v5) Fix buttons on user pages
2020-11-26 12:43:48 +01:00
David Bomba
1181f9de62
Merge branch 'v5-develop' into authorize_refactor 2020-11-26 22:43:25 +11:00
Benjamin Beganović
1aeae756fa blue background for buttons 2020-11-26 12:42:20 +01:00
David Bomba
a8daa31167 Fixes for authorize 2020-11-26 21:12:36 +11:00
Benjamin Beganović
169e5ba93e support for checking requirements based on gateway 2020-11-25 14:38:49 +01:00
David Bomba
efbf8069b5
Merge pull request #4360 from turbo124/v5-develop
Fixes for migrations
2020-11-25 20:24:06 +11:00
Benjamin Beganović
242d48cd1a update variables for .env instead of writing completely new file 2020-11-24 11:45:27 +01:00
Benjamin Beganović
3b765d32c1 log as an option for mail driver 2020-11-24 11:12:44 +01:00
David Bomba
b5fe5070b5 Working on migrations 2020-11-23 23:55:04 +11:00
David Maksimov
12427cd64f Remove spaces from credit card number 2020-11-20 16:22:57 -06:00
Benjamin Beganović
7e750cd510 set dynamic margin 2020-11-19 15:03:18 +01:00
Benjamin Beganović
458535a46d fix designs border 2020-11-19 15:02:29 +01:00
Benjamin Beganović
014652cf1c cookies 👨‍🍳🍪 2020-11-19 13:41:19 +01:00
Benjamin Beganović
b9598d6321 short 2020-11-18 15:14:59 +01:00
Benjamin Beganović
748a083dda invert image to white for dark templates 2020-11-18 15:12:52 +01:00
Benjamin Beganović
de15e9d1ce render terms & policy under conidition 2020-11-18 14:55:46 +01:00
David Bomba
6376d5fa98
Merge pull request #4325 from turbo124/v5-develop
Minor fixes for client portal
2020-11-18 08:00:02 +11:00
Benjamin Beganović
e4eb70ab1a remove referneces to gateway in cp 2020-11-17 17:23:58 +01:00
Benjamin Beganović
a4de32482c fix translation for authroize buttons 2020-11-17 17:17:28 +01:00
Benjamin Beganović
f81526af2d
Merge pull request #4322 from beganovich/v5-display-signature-and-terms-on-quotes
(v5) Display signatures & accepting terms for invoices & quotes
2020-11-17 17:00:59 +01:00
Benjamin Beganović
d64308fdd1 production builds 2020-11-17 16:57:42 +01:00
Benjamin Beganović
a9cb656000 By clicking "Next step" you accept terms. & Not specified translations 2020-11-17 16:57:18 +01:00
Benjamin Beganović
fef76271d2 beautify signature template 2020-11-17 16:56:59 +01:00
Benjamin Beganović
d9c430423a accept entities in array 2020-11-17 16:56:44 +01:00
Benjamin Beganović
0357b041e1 adapt payment & approve views for new terms component 2020-11-17 16:56:36 +01:00
Benjamin Beganović
8a6873354f fix flashing cancellation modal & user dropdwon 2020-11-17 15:52:40 +01:00
David Bomba
8255ffc0cf Minor tests for client portal 2020-11-17 21:26:45 +11:00
Benjamin Beganović
52c51f34af
Merge pull request #4310 from beganovich/v5-cp-terms-and-privacy
(v5) Support for client portal terms & privacy policy
2020-11-16 22:19:54 +01:00
Benjamin Beganović
8080dffa85 show custom messages in cp 2020-11-16 15:37:09 +01:00
Benjamin Beganović
134fe6bfee support for privacy policy & temrs in cp 2020-11-16 13:06:26 +01:00
David Bomba
0e8bfa18a9 Use full namespace when calling from resources 2020-11-16 09:21:38 +11:00
David Bomba
87ca437d1a Fix for company logo not displaying in emails 2020-11-16 08:31:38 +11:00
David Bomba
b1591632d8 Refactor defaults for invoice PDF 2020-11-13 22:52:11 +11:00
David Bomba
a160efc6e5
Merge pull request #4298 from beganovich/v5-display-credit-pdfs
(v5) Show credit's PDF in the client portal
2020-11-13 07:18:39 +11:00
Benjamin Beganović
8324724df0 Client Portal Custom Inclusions 2020-11-12 12:29:16 +01:00
Benjamin Beganović
7937dd7df4 Show credit's PDF in the client portal 2020-11-12 12:17:49 +01:00
David Bomba
c5643bea7b
Merge pull request #4287 from turbo124/v5-develop
Fixes for reminder templates
2020-11-10 19:32:44 +11:00
David Bomba
284bb9be9f
Merge pull request #4283 from beganovich/v5-fix-quote-approval-status
(v5) Fix quotes approval process in client portal
2020-11-10 07:29:14 +11:00
Benjamin Beganović
4dc3443d16 fix quotes not approving 2020-11-09 16:37:53 +01:00
Benjamin Beganović
1be0d2435b Fix designs' tag 2020-11-09 16:23:27 +01:00
Benjamin Beganović
0751a44d21 Update designs to support delivery-notes 2020-11-09 15:44:21 +01:00
David Bomba
be2f83cfea Endless reminder activity 2020-11-09 16:00:15 +11:00
David Bomba
fcef2c72b3 Working on payment emails 2020-11-09 13:39:42 +11:00
David Bomba
087c442a64 Add custom values to payments table 2020-11-09 08:21:52 +11:00
Benjamin Beganović
40b3a45642 update the designs & fix huge gap between tables 2020-11-06 13:12:28 +01:00
Benjamin Beganović
fd8ea38580 plain 2020-11-05 14:47:28 +01:00
Benjamin Beganović
d9f915bb37 modern 2020-11-05 14:47:24 +01:00
Benjamin Beganović
bb76cec267 hipster 2020-11-05 14:47:20 +01:00
Benjamin Beganović
054998ff06 elegant 2020-11-05 14:47:17 +01:00
Benjamin Beganović
64ec10279c creative 2020-11-05 14:47:14 +01:00
Benjamin Beganović
4ee36307f9 playful 2020-11-05 14:47:09 +01:00
Benjamin Beganović
100898e530 clean 2020-11-05 14:25:48 +01:00
Benjamin Beganović
88f881faf7 business 2020-11-05 14:13:28 +01:00
Benjamin Beganović
6bd28ebbfb bold 2020-11-05 13:33:43 +01:00
David Bomba
100207f4cb
Merge pull request #4267 from turbo124/v5-develop
Company Settings Implmentation
2020-11-05 07:49:10 +11:00
Benjamin Beganović
a01c57bd61 Plain: Update references to #task-table 2020-11-04 14:42:29 +01:00
Benjamin Beganović
e222aa8620 Refactor 'product-table-footer' to 'table-totals' 2020-11-04 11:23:06 +01:00
David Bomba
c995ac5f44 Add API Documentation to repo 2020-11-04 12:27:07 +11:00
David Bomba
a98e9c3b68
Merge pull request #4252 from beganovich/v5-ach-refactor
(v5) ACH payments with Stripe
2020-11-03 23:14:02 +11:00
Benjamin Beganović
f50bbd1900 Fix issue with the form 2020-11-02 16:29:02 +01:00
Benjamin Beganović
0942169d4f Handle Alipay payments
- Refactored main Alipay class
- Added new N/A translation
- Fixed issue with alipay.js
2020-11-02 16:20:38 +01:00
Benjamin Beganović
7f3c4ada5a Merge remote-tracking branch 'upstream/v5-develop' into v2-frontend-refactor 2020-11-01 19:26:43 +01:00
Benjamin Beganović
4c27652545 ACH payments 2020-11-01 19:21:31 +01:00
Benjamin Beganović
1ae2649be6 Stripe ACH authorization & verification 2020-11-01 18:47:48 +01:00
Benjamin Beganović
99c30846ad Stripe: Payments with tokens & error handling 2020-11-01 16:52:37 +01:00
Benjamin Beganović
7e30093429 Checkout.com payments with token:
- Convert "true" from frontend to boolean in PaymentResponseRequest
- Reference correct 'transaction_reference' in BaseDriver & Checkout\Utilities
- Frontend switching between token & credit card when making payments with Checkout.com
- New 'pay_with' translation string
- Added 'save-card--container' to save card partial
- Ensure we show whole transaction reference string in payments/show.blade
2020-11-01 15:56:17 +01:00
Benjamin Beganović
d2e677cb9d Merge remote-tracking branch 'origin/v5-stripe-backend-refactor' into v2-frontend-refactor 2020-11-01 14:49:11 +01:00
David Bomba
b267353ced Fixes for credits view in portal 2020-10-29 21:19:10 +11:00
David Bomba
d555796418
Merge pull request #4213 from beganovich/v5-checkout-token-billing
(v5) Checkout.com payments using token
2020-10-28 09:37:00 +11:00
David Bomba
7a67b8ded0
Merge pull request #4214 from beganovich/v5-fix-setup-javascript
(v5) Fix setup issue with opening new PDFs
2020-10-28 09:36:41 +11:00
David Bomba
f855ba7231
Merge pull request #4215 from beganovich/v5-remove-deprecated-design-classes
(v5) Remove old invoice/quotes/tasks design classes & client portal theme
2020-10-28 09:36:16 +11:00
Benjamin Beganović
e78aacdcfc Password reset e-mai l& fix for button 2020-10-27 16:04:28 +01:00
Benjamin Beganović
99bfadc0dc Remove old designs & old bootstrap theme 2020-10-27 14:44:12 +01:00
Benjamin Beganović
8270762311 Fix setup issue with opening new PDFs 2020-10-27 14:02:36 +01:00
Benjamin Beganović
88b428aae0 checkout.com payments using token 2020-10-27 13:44:16 +01:00
David Bomba
97db2ad3b6
Merge pull request #4202 from beganovich/v2-checkout-refactor
(v5) Checkout.com refactor
2020-10-27 23:18:42 +11:00
Benjamin Beganović
488b8d859d Move saving methods into BaseDriver 2020-10-26 14:40:50 +01:00
David Bomba
1b2922b57c credit payment type 2020-10-26 11:58:08 +11:00
Benjamin Beganović
dcb48297fb wip refactor 2020-10-22 15:24:18 +02:00
David Bomba
6f84e07c10 Fixes for schema, fixes for recurring invoice markViewed() 2020-10-21 08:15:11 +11:00
Benjamin Beganović
b4b6bd3ae0 ach adding & verify, todo: payment 2020-10-20 17:54:08 +02:00
Benjamin Beganović
d26565b5ad stripe alipay 2020-10-20 17:15:55 +02:00
Benjamin Beganović
024d839038 stripe sofort 2020-10-20 17:12:53 +02:00
Benjamin Beganović
9e8ccf9eb7 remove unused js 2020-10-20 16:12:59 +02:00
Benjamin Beganović
cd4ed74d5c set only-authorization to false in pay.blade 2020-10-20 16:09:46 +02:00
Benjamin Beganović
c82e5b2647 stripe adding credit card 2020-10-20 16:08:21 +02:00
Benjamin Beganović
9420f23081 stripe: pay with credit card token & credit 2020-10-20 15:19:21 +02:00
Benjamin Beganović
08501cceb6 stripe credit card 2020-10-20 14:58:48 +02:00
Benjamin Beganović
6af7aa7dc0 checkout: push aditional page 2020-10-19 23:49:17 +02:00
Benjamin Beganović
810f342907 checkout.com - authorize 2020-10-19 23:02:18 +02:00
Benjamin Beganović
4f9d9c106c checkout 2020-10-19 14:18:00 +02:00
David Bomba
3d40df6264 Fixes for ledger id in transformer 2020-10-16 08:55:24 +11:00
Benjamin Beganović
97aad702c9 extract stripe payments into partials 2020-10-15 12:23:45 +02:00
David Bomba
bf592b0805
Merge pull request #4168 from beganovich/v2-cypress-payments-tests
(v5) Stripe testing using Cypress
2020-10-15 20:16:50 +11:00
Benjamin Beganović
b03387c571 Merge remote-tracking branch 'upstream/v2' into v2-cypress-payments-tests 2020-10-15 10:27:32 +02:00
David Bomba
52558d5b41 Credit view 2020-10-15 15:08:01 +11:00
David Bomba
901f7c4117 Working on credit payments 2020-10-15 14:35:35 +11:00
David Bomba
1e10f0297b
Merge pull request #4162 from beganovich/v2-fix-setup-buttons
(v5) Setup fixes & improvements
2020-10-15 08:15:31 +11:00
Benjamin Beganović
db196911cc Fix error while adding Stripe CC 2020-10-14 22:32:43 +02:00
Benjamin Beganović
1d89656bad Setup changes:
- Return actual SQL error when connection is failing
- Update buttons on setup with correct color
2020-10-14 13:40:00 +02:00
Benjamin Beganović
89b950cbfd Testing Stripe:
- Changed baseUrl to more generic localhost:8000
- Testing adding Stripe card & paying with it
- Added iframe helper functions
- Fix issue with processingOverlay when adding stripe credit card
- Added few selectors to pages for easier testing
2020-10-13 13:36:56 +02:00