70 Commits

Author SHA1 Message Date
MakingCG
350f130d98 Fix backend code styling 2021-05-24 14:48:13 +00:00
Peter Papp
3af8bff13b - removed invoicing from oasis 2021-05-13 09:31:16 +02:00
Peter Papp
a6db642db7 Invoice & Clients sorting 2021-05-11 10:09:50 +02:00
Peter Papp
69deafeda0 Set up billing profile 2021-05-06 09:15:37 +02:00
Peter Papp
599b238ab4 Edit invoice 2021-05-05 17:07:36 +02:00
Peter Papp
3c3e82758d Create invoice form part 1. 2021-04-30 17:53:19 +02:00
Peter Papp
aea4213ec2 Client cards 2021-04-29 15:01:50 +02:00
Peter Papp
31dd782bae Resource refactoring 2021-04-29 12:53:17 +02:00
Peter Papp
1486ce63fa Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
#	app/Console/Commands/SetupDevEnvironment.php
#	app/Console/Kernel.php
#	app/Http/Resources/InvoiceResource.php
#	app/Http/Resources/UserResource.php
#	app/Models/User.php
#	composer.lock
#	config/app.php
#	config/custom-language-translations.php
#	config/language-translations.php
#	public/chunks/admin.js
#	public/chunks/app-language.js
#	public/chunks/dashboard.js
#	public/chunks/files.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js
#	public/chunks/invoices.js
#	public/chunks/pages.js
#	public/chunks/plan-subscribers.js
#	public/chunks/plans.js
#	public/chunks/platform.js
#	public/chunks/settings-invoices.js
#	public/chunks/settings-payment-methods.js
#	public/chunks/settings-subscription.js
#	public/chunks/shared-files.js
#	public/chunks/shared.js
#	public/chunks/shared/file-browser.js
#	public/chunks/user-invoices.js
#	public/chunks/user-subscription.js
#	public/chunks/users.js
#	public/js/main.js
#	public/mix-manifest.json
#	resources/js/components/FilesView/FileItemGrid.vue
#	resources/js/components/FilesView/FileItemList.vue
2021-04-29 11:06:14 +02:00
Peter Papp
834b0ba5e0 Edit client detail 2021-04-29 10:54:10 +02:00
Peter Papp
19bce195b4 Create client frontend 2021-04-29 08:57:53 +02:00
Peter Papp
1e4bbd10f3 update invoice profile 2021-04-28 08:34:37 +02:00
Peter Papp
bcf14595bf store invoice profile 2021-04-28 07:32:40 +02:00
Peter Papp
f7135c9b27 get invoice from url 2021-04-27 08:57:00 +02:00
Peter Papp
644fbaede4 pdf installation 2021-04-26 08:15:11 +02:00
Peter Papp
c47886fb8b code style fix 2021-04-25 09:02:00 +02:00
Peter Papp
4b0e4da013 - Client list
- Context menu
2021-04-22 07:36:52 +02:00
Peter Papp
eae212ac5d - Invoice listing in frontend 2021-04-21 16:53:39 +02:00
Peter Papp
fac75c7e71 Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
#	composer.json
#	public/chunks/admin-account.js
#	public/chunks/admin.js
#	public/chunks/app-appearance.js
#	public/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js
#	public/chunks/app-billings.js
#	public/chunks/app-email.js
#	public/chunks/app-index.js
#	public/chunks/app-language.js
#	public/chunks/app-others.js
#	public/chunks/app-payments.js
#	public/chunks/app-settings.js
#	public/chunks/app-setup.js
#	public/chunks/billings-detail.js
#	public/chunks/contact-us.js
#	public/chunks/create-new-password.js
#	public/chunks/dashboard.js
#	public/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/user-invoices.js
#	public/chunks/database.js
#	public/chunks/dynamic-page.js
#	public/chunks/environment-setup.js
#	public/chunks/files.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js
#	public/chunks/forgotten-password.js
#	public/chunks/homepage.js
#	public/chunks/installation-disclaimer.js
#	public/chunks/invoices.js
#	public/chunks/page-edit.js
#	public/chunks/pages.js
#	public/chunks/plan-create.js
#	public/chunks/plan-delete.js
#	public/chunks/plan-settings.js
#	public/chunks/plan-subscribers.js
#	public/chunks/plan.js
#	public/chunks/plans.js
#	public/chunks/platform.js
#	public/chunks/platform~chunks/shared.js
#	public/chunks/profile.js
#	public/chunks/profile~chunks/settings-password.js
#	public/chunks/purchase-code.js
#	public/chunks/settings-create-payment-methods.js
#	public/chunks/settings-invoices.js
#	public/chunks/settings-password.js
#	public/chunks/settings-payment-methods.js
#	public/chunks/settings-storage.js
#	public/chunks/settings-subscription.js
#	public/chunks/settings.js
#	public/chunks/setup-wizard.js
#	public/chunks/shared-files.js
#	public/chunks/shared.js
#	public/chunks/shared/authenticate.js
#	public/chunks/shared/file-browser.js
#	public/chunks/shared/single-file.js
#	public/chunks/sign-in.js
#	public/chunks/sign-up.js
#	public/chunks/stripe-credentials.js
#	public/chunks/subscription-plans.js
#	public/chunks/subscription-service.js
#	public/chunks/upgrade-billing.js
#	public/chunks/upgrade-plan.js
#	public/chunks/user-create.js
#	public/chunks/user-delete.js
#	public/chunks/user-detail.js
#	public/chunks/user-invoices.js
#	public/chunks/user-password.js
#	public/chunks/user-storage.js
#	public/chunks/user-subscription.js
#	public/chunks/user.js
#	public/chunks/users.js
#	public/css/app.css
#	public/js/main.js
#	public/mix-manifest.json
#	resources/js/router.js
#	resources/js/store/modules/userAuth.js
2021-04-07 07:52:07 +02:00
Peter Papp
30ae2c0a54 - fixes 2021-04-07 07:48:07 +02:00
Peter Papp
7cefcf8dab - fixed setup wizard
- fixed oasis UserAccountTest.php
2021-04-06 10:10:38 +02:00
Peter Papp
5d0348e2d0 Merge remote-tracking branch 'origin/v2' into oasis
# Conflicts:
#	app/Http/Controllers/User/AccountController.php
#	app/Http/helpers.php
#	public/mix-manifest.json
#	resources/js/components/FilesView/Icons/AlphabetIcon.vue
#	resources/js/components/FilesView/MobileActionButton.vue
#	resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
#	resources/js/views/Admin/Users/UserTabs/UserDetail.vue
#	resources/js/views/Upgrade/UpgradeBilling.vue
#	resources/views/index.blade.php
#	resources/views/vuefilemanager/invoice.blade.php
#	resources/views/vuefilemanager/others/color-template.blade.php
2021-04-01 10:45:10 +02:00
Peter Papp
7772ef6b40 Language editor refactoring part 4 (backend + frontend) 2021-04-01 10:40:48 +02:00
Peter Papp
5130082111 Language editor refactoring part 3 (backend + frontend) 2021-04-01 07:50:01 +02:00
Peter Papp
ec51440c3a Language editor refactoring part 1 (nackend) 2021-03-27 18:53:41 +01:00
Peter Papp
a3d4dfec3b - favicon fix
- checkout fix
- stripe prefered locales
- color theme
- stripe card info box in dev version
2021-03-26 16:02:02 +01:00
Peter Papp
af79a28361 - redirect after sign in/up to payment page
- extended /api/oasis/subscribe function
- setup:dev extended data
2021-03-24 11:38:15 +01:00
Peter Papp
19925e398f - refactored PricingResource
- get_tax_rates added into StripeService.php
2021-03-23 09:40:30 +01:00
Peter Papp
97f13c0b62 - added payment page 2021-03-23 09:07:31 +01:00
Peter Papp
0d4b8403ba - email template 2021-03-23 06:47:28 +01:00
Peter Papp
778a94e5ba - Pay and subscribe from generated Subscription Request 2021-03-22 15:41:47 +01:00
Peter Papp
0db55b51d2 - get subscription request api 2021-03-22 12:05:45 +01:00
Peter Papp
db9900fcfb - public sharing refactored part 1 2021-03-19 07:27:15 +01:00
Peter Papp
ce477fdaf1 - authentication fix
- demo helper
2021-03-17 07:34:22 +01:00
Peter Papp
803cc089bd Admin & User account frontend consolidation 2021-03-15 16:56:26 +01:00
Peter Papp
ba902a30b3 Log in functionality 2021-03-15 09:23:53 +01:00
Peter Papp
c5e9d29362 added it_get_all_plans_for_index_page test 2021-03-14 11:36:07 +01:00
Peter Papp
aecdf56304 added it_get_public_file_record_and_download_them, it_try_to_get_protected_file_record, it_get_shared_record, it_get_deleted_shared_record, it_get_shared_page, it_get_deleted_shared_page test 2021-03-10 08:41:21 +01:00
Peter Papp
5660fcd4dc added it_get_all_invoices_from_admin, it_get_single_user_invoice_page test 2021-03-07 09:50:04 +01:00
Peter Papp
e514994b08 added it_get_all_pages, it_get_page, it_update_page test 2021-03-05 11:02:13 +01:00
Peter Papp
779b7fc8ba added it_delete_user_with_all_data test 2021-03-05 10:35:30 +01:00
Peter Papp
350b3cb6b3 added it_get_non_existed_user_subscription, it_get_user_invoices_from_admin test 2021-03-04 17:02:48 +01:00
Peter Papp
b544aa875f added it_get_user_subscription_from_admin test 2021-03-04 16:57:27 +01:00
Peter Papp
9c7d7a336b added it_get_all_users, it_get_single_user, it_get_user_storage_detail test 2021-03-04 16:38:00 +01:00
Peter Papp
d4df26bf35 added it_get_user_invoices test 2021-03-04 14:15:07 +01:00
Peter Papp
b1c15bb6a7 added it_get_user_data test 2021-03-03 09:39:56 +01:00
Peter Papp
b82f34ed4d added ShareTest test methods 2021-02-28 16:45:34 +01:00
Peter Papp
920ee19651 - added model events for generate uuid 2021-02-26 17:19:57 +01:00
Peter Papp
267556b39d - Prevent submit shared form
- Send shared link from FileInfoPanel.vue
2021-01-30 14:01:36 +01:00
Milos Holba
2263cc9511 Make table wrapper and table options components 2021-01-19 18:47:53 +01:00